Version Notes
Did we add new features?
Yes
Did you fix a bunch of Bugs?
No
Well then, what in funkytown did you do?
There is now the option to replace the default Magento login step with a radically different, more user intuitive form.
You now have the option to remove the telephone/fax input field from the checkout process.
Updated licences Creative Commons (CC BY-ND 3.0)
Download this release
Release Info
Developer | Gareth Price |
Extension | Clearandfizzy_Reducedcheckout |
Version | 1.6.3 |
Comparing to | |
See all releases |
Code changes from version 1.6.0 to 1.6.3
- app/code/community/Clearandfizzy/Reducedcheckout/Helper/Data.php +36 -2
- app/code/community/Clearandfizzy/Reducedcheckout/Helper/Order.php +30 -1
- app/code/community/Clearandfizzy/Reducedcheckout/Model/Observer.php +57 -9
- app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Carrier/TablerateFix.php +31 -2
- app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Setup.php +35 -4
- app/code/community/Clearandfizzy/Reducedcheckout/Model/Signup/Observer.php +30 -1
- app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Cms/Block.php +30 -0
- app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Login/Step.php +30 -1
- app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Payment/EnabledMethods.php +29 -0
- app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Shipping/EnabledMethods.php +30 -1
- app/code/community/Clearandfizzy/Reducedcheckout/controllers/OnepageController.php +61 -18
- app/code/community/Clearandfizzy/Reducedcheckout/controllers/SignupController.php +27 -2
- app/code/community/Clearandfizzy/Reducedcheckout/etc/config.xml +5 -8
- app/code/community/Clearandfizzy/Reducedcheckout/etc/system.xml +12 -1
- app/code/community/Clearandfizzy/Reducedcheckout/sql/reducedcheckout_setup/install-1.5.1.php +30 -2
- app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml +40 -2
- app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage.phtml +38 -4
- app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage/login.phtml +27 -4
- app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/success/wrapper.phtml +32 -0
- app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/success/wrapper/signup.phtml +32 -0
- js/clearandfizzy/reducedcheckout/hidetelephonefax.js +33 -0
- package.xml +9 -7
app/code/community/Clearandfizzy/Reducedcheckout/Helper/Data.php
CHANGED
@@ -1,5 +1,34 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Clearandfizzy_Reducedcheckout_Helper_Data extends Mage_Core_Helper_Abstract {
|
4 |
|
5 |
const LOGIN_STEP_DEFAULT = 0;
|
@@ -37,7 +66,12 @@ class Clearandfizzy_Reducedcheckout_Helper_Data extends Mage_Core_Helper_Abstrac
|
|
37 |
$value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/enable28112fix');
|
38 |
return $value;
|
39 |
} // end
|
40 |
-
|
|
|
|
|
|
|
|
|
|
|
41 |
public function guestsCanRegisterOnOrderSuccess() {
|
42 |
$value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/register_on_order_success');
|
43 |
return $value;
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Helper_Data extends Mage_Core_Helper_Abstract {
|
33 |
|
34 |
const LOGIN_STEP_DEFAULT = 0;
|
66 |
$value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/enable28112fix');
|
67 |
return $value;
|
68 |
} // end
|
69 |
+
|
70 |
+
public function hideTelephoneAndFax() {
|
71 |
+
$value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/hide_telephone_fax');
|
72 |
+
return $value;
|
73 |
+
} // end
|
74 |
+
|
75 |
public function guestsCanRegisterOnOrderSuccess() {
|
76 |
$value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/register_on_order_success');
|
77 |
return $value;
|
app/code/community/Clearandfizzy/Reducedcheckout/Helper/Order.php
CHANGED
@@ -1,5 +1,34 @@
|
|
1 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Clearandfizzy_Reducedcheckout_Helper_Order extends Mage_Core_Helper_Abstract {
|
4 |
|
5 |
/**
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Helper_Order extends Mage_Core_Helper_Abstract {
|
33 |
|
34 |
/**
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/Observer.php
CHANGED
@@ -1,7 +1,43 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Observer {
|
4 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
5 |
public function checkReducedCheckout(Varien_Event_Observer $observer) {
|
6 |
|
7 |
$enabled = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/isenabled');
|
@@ -43,23 +79,36 @@ class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Obser
|
|
43 |
$update->addHandle('clearandfizzy_checkout_reduced_skip_paymentmethod');
|
44 |
} // end
|
45 |
|
|
|
|
|
|
|
|
|
|
|
46 |
} // end
|
47 |
|
48 |
-
|
49 |
//checkout_onepage_success
|
50 |
if ( array_search('checkout_onepage_success', $handles) == true ) {
|
51 |
-
|
52 |
-
$update = $observer->getEvent()->getLayout()->getUpdate();
|
53 |
-
$update->addHandle('clearandfizzy_checkout_reduced');
|
54 |
-
|
55 |
// enable register on order success..
|
56 |
// only change the handle
|
57 |
if ( $this->_isValidGuest() && Mage::helper('clearandfizzy_reducedcheckout/data')->guestsCanRegisterOnOrderSuccess() == true) {
|
|
|
58 |
$update->addHandle('clearandfizzy_checkout_reduced_success_register');
|
59 |
} // end
|
60 |
|
61 |
} // end if
|
62 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
63 |
return;
|
64 |
|
65 |
} // end
|
@@ -94,8 +143,7 @@ class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Obser
|
|
94 |
|
95 |
return false;
|
96 |
|
97 |
-
}
|
98 |
-
|
99 |
|
100 |
} // end
|
101 |
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Observer {
|
33 |
|
34 |
+
/**
|
35 |
+
* Use Layout Handles to apply logic.
|
36 |
+
*
|
37 |
+
* @see etc/config.xml <events>
|
38 |
+
* @todo we need to break this out into further methods to improve maintainability
|
39 |
+
* @param Varien_Event_Observer $observer
|
40 |
+
*/
|
41 |
public function checkReducedCheckout(Varien_Event_Observer $observer) {
|
42 |
|
43 |
$enabled = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/isenabled');
|
79 |
$update->addHandle('clearandfizzy_checkout_reduced_skip_paymentmethod');
|
80 |
} // end
|
81 |
|
82 |
+
if (Mage::helper('clearandfizzy_reducedcheckout/data')->hideTelephoneAndFax() == true) {
|
83 |
+
$update = $observer->getEvent()->getLayout()->getUpdate();
|
84 |
+
$update->addHandle('clearandfizzy_checkout_reduced_hide_telephonefax');
|
85 |
+
} // end
|
86 |
+
|
87 |
} // end
|
88 |
|
|
|
89 |
//checkout_onepage_success
|
90 |
if ( array_search('checkout_onepage_success', $handles) == true ) {
|
91 |
+
|
|
|
|
|
|
|
92 |
// enable register on order success..
|
93 |
// only change the handle
|
94 |
if ( $this->_isValidGuest() && Mage::helper('clearandfizzy_reducedcheckout/data')->guestsCanRegisterOnOrderSuccess() == true) {
|
95 |
+
$update = $observer->getEvent()->getLayout()->getUpdate();
|
96 |
$update->addHandle('clearandfizzy_checkout_reduced_success_register');
|
97 |
} // end
|
98 |
|
99 |
} // end if
|
100 |
+
|
101 |
+
|
102 |
+
// hide the telphone input fields
|
103 |
+
if ( array_search('customer_address_form', $handles) == true ) {
|
104 |
+
|
105 |
+
if (Mage::helper('clearandfizzy_reducedcheckout/data')->hideTelephoneAndFax() == true) {
|
106 |
+
$update = $observer->getEvent()->getLayout()->getUpdate();
|
107 |
+
$update->addHandle('clearandfizzy_checkout_reduced_hide_telephonefax');
|
108 |
+
} // end
|
109 |
+
|
110 |
+
} // end if
|
111 |
+
|
112 |
return;
|
113 |
|
114 |
} // end
|
143 |
|
144 |
return false;
|
145 |
|
146 |
+
} // end
|
|
|
147 |
|
148 |
} // end
|
149 |
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Carrier/TablerateFix.php
CHANGED
@@ -1,6 +1,35 @@
|
|
1 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
|
3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
4 |
{
|
5 |
|
6 |
/**
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
+
class Clearandfizzy_Reducedcheckout_Model_Resource_Carrier_TablerateFix extends Mage_Shipping_Model_Resource_Carrier_Tablerate
|
33 |
{
|
34 |
|
35 |
/**
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Setup.php
CHANGED
@@ -1,12 +1,43 @@
|
|
1 |
-
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
-
*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
5 |
*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
6 |
*/
|
7 |
class Clearandfizzy_Reducedcheckout_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup
|
8 |
{
|
9 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
10 |
public function addBlock($string) {
|
11 |
|
12 |
$cms_block = Mage::getModel('cms/block');
|
1 |
+
<?php
|
2 |
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup
|
33 |
{
|
34 |
+
|
35 |
+
/**
|
36 |
+
* This is called during the setep process,
|
37 |
+
* @see etc/config.xml
|
38 |
+
* @see sql/reducecheckout_setup/*.php
|
39 |
+
* @param unknown $string
|
40 |
+
*/
|
41 |
public function addBlock($string) {
|
42 |
|
43 |
$cms_block = Mage::getModel('cms/block');
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/Signup/Observer.php
CHANGED
@@ -1,5 +1,34 @@
|
|
1 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Clearandfizzy_Reducedcheckout_Model_Signup_Observer extends Mage_Core_Model_Observer {
|
4 |
|
5 |
protected $_helper;
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Model_Signup_Observer extends Mage_Core_Model_Observer {
|
33 |
|
34 |
protected $_helper;
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Cms/Block.php
CHANGED
@@ -1,4 +1,34 @@
|
|
1 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Cms_Block
|
3 |
{
|
4 |
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Cms_Block
|
33 |
{
|
34 |
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Login/Step.php
CHANGED
@@ -1,5 +1,34 @@
|
|
1 |
-
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Login_Step {
|
4 |
|
5 |
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Login_Step {
|
33 |
|
34 |
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Payment/EnabledMethods.php
CHANGED
@@ -1,5 +1,34 @@
|
|
1 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Payment_EnabledMethods {
|
4 |
|
5 |
public function toOptionArray()
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Payment_EnabledMethods {
|
33 |
|
34 |
public function toOptionArray()
|
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Shipping/EnabledMethods.php
CHANGED
@@ -1,5 +1,34 @@
|
|
1 |
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Shipping_EnabledMethods {
|
4 |
|
5 |
public function toOptionArray()
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Shipping_EnabledMethods {
|
33 |
|
34 |
public function toOptionArray()
|
app/code/community/Clearandfizzy/Reducedcheckout/controllers/OnepageController.php
CHANGED
@@ -1,4 +1,34 @@
|
|
1 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
require_once "Mage/Checkout/controllers/OnepageController.php";
|
3 |
class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_OnepageController
|
4 |
{
|
@@ -6,13 +36,18 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
6 |
protected $_helper;
|
7 |
|
8 |
|
|
|
|
|
|
|
|
|
9 |
public function _construct() {
|
10 |
parent::_construct();
|
11 |
$this->_helper = Mage::helper('clearandfizzy_reducedcheckout');
|
12 |
} // end
|
13 |
|
14 |
/**
|
15 |
-
*
|
|
|
16 |
*/
|
17 |
public function saveMethodAction()
|
18 |
{
|
@@ -20,7 +55,7 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
20 |
return;
|
21 |
} // end if
|
22 |
|
23 |
-
|
24 |
if ($this->getRequest()->isPost()) {
|
25 |
$method = $this->getCheckoutMethod();
|
26 |
$result = $this->getOnepage()->saveCheckoutMethod($method);
|
@@ -29,6 +64,12 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
29 |
} // end if
|
30 |
|
31 |
|
|
|
|
|
|
|
|
|
|
|
|
|
32 |
private function getCheckoutMethod() {
|
33 |
|
34 |
switch ( $this->_helper->isLoginStepGuestOnly() ) {
|
@@ -49,11 +90,9 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
49 |
|
50 |
|
51 |
/**
|
52 |
-
*
|
53 |
-
* $gotonext = false forces the method not to go to the next section and returning to the calling method
|
54 |
-
*
|
55 |
* (non-PHPdoc)
|
56 |
* @see Mage_Checkout_OnepageController::saveShippingMethodAction()
|
|
|
57 |
*/
|
58 |
public function saveShippingMethodAction($gotonext = true ) {
|
59 |
|
@@ -126,7 +165,10 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
126 |
|
127 |
} // end
|
128 |
|
129 |
-
|
|
|
|
|
|
|
130 |
public function saveShippingAction($gotonext = true) {
|
131 |
|
132 |
if ($this->_expireAjax()) {
|
@@ -140,9 +182,7 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
140 |
|
141 |
// save the billing address info
|
142 |
$result = $this->getOnepage()->saveShipping($data, $customerAddressId);
|
143 |
-
|
144 |
-
|
145 |
-
}
|
146 |
|
147 |
// attempt to load the next section
|
148 |
if ( $gotonext == true ) {
|
@@ -150,12 +190,11 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
150 |
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
|
151 |
} // end if
|
152 |
|
153 |
-
|
154 |
-
|
155 |
} // end
|
156 |
|
157 |
/**
|
158 |
-
*
|
|
|
159 |
*/
|
160 |
public function saveBillingAction()
|
161 |
{
|
@@ -227,6 +266,10 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
227 |
|
228 |
} // end
|
229 |
|
|
|
|
|
|
|
|
|
230 |
public function progressAction()
|
231 |
{
|
232 |
$layout = $this->getLayout();
|
@@ -238,11 +281,12 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
238 |
$this->renderLayout();
|
239 |
}
|
240 |
|
241 |
-
|
242 |
/**
|
243 |
-
*
|
244 |
-
*
|
245 |
-
* @
|
|
|
|
|
246 |
*/
|
247 |
private function getNextSection($result, $current) {
|
248 |
|
@@ -327,5 +371,4 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
|
|
327 |
} // end
|
328 |
|
329 |
|
330 |
-
} // end class
|
331 |
-
|
1 |
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
require_once "Mage/Checkout/controllers/OnepageController.php";
|
33 |
class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_OnepageController
|
34 |
{
|
36 |
protected $_helper;
|
37 |
|
38 |
|
39 |
+
/**
|
40 |
+
* (non-PHPdoc)
|
41 |
+
* @see Mage_Core_Controller_Varien_Action::_construct()
|
42 |
+
*/
|
43 |
public function _construct() {
|
44 |
parent::_construct();
|
45 |
$this->_helper = Mage::helper('clearandfizzy_reducedcheckout');
|
46 |
} // end
|
47 |
|
48 |
/**
|
49 |
+
* (non-PHPdoc)
|
50 |
+
* @see Mage_Checkout_OnepageController::saveMethodAction()
|
51 |
*/
|
52 |
public function saveMethodAction()
|
53 |
{
|
55 |
return;
|
56 |
} // end if
|
57 |
|
58 |
+
// set the checkout method
|
59 |
if ($this->getRequest()->isPost()) {
|
60 |
$method = $this->getCheckoutMethod();
|
61 |
$result = $this->getOnepage()->saveCheckoutMethod($method);
|
64 |
} // end if
|
65 |
|
66 |
|
67 |
+
/**
|
68 |
+
* Checks the System > Configuration Setting for this extension and sets the
|
69 |
+
* CheckoutMethod as appropriate
|
70 |
+
*
|
71 |
+
* @return Ambigous <mixed, unknown>
|
72 |
+
*/
|
73 |
private function getCheckoutMethod() {
|
74 |
|
75 |
switch ( $this->_helper->isLoginStepGuestOnly() ) {
|
90 |
|
91 |
|
92 |
/**
|
|
|
|
|
|
|
93 |
* (non-PHPdoc)
|
94 |
* @see Mage_Checkout_OnepageController::saveShippingMethodAction()
|
95 |
+
* $gotonext = false forces the method not to go to the next section and return to the calling method
|
96 |
*/
|
97 |
public function saveShippingMethodAction($gotonext = true ) {
|
98 |
|
165 |
|
166 |
} // end
|
167 |
|
168 |
+
/**
|
169 |
+
* (non-PHPdoc)
|
170 |
+
* @see Mage_Checkout_OnepageController::saveShippingAction()
|
171 |
+
*/
|
172 |
public function saveShippingAction($gotonext = true) {
|
173 |
|
174 |
if ($this->_expireAjax()) {
|
182 |
|
183 |
// save the billing address info
|
184 |
$result = $this->getOnepage()->saveShipping($data, $customerAddressId);
|
185 |
+
} // end
|
|
|
|
|
186 |
|
187 |
// attempt to load the next section
|
188 |
if ( $gotonext == true ) {
|
190 |
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
|
191 |
} // end if
|
192 |
|
|
|
|
|
193 |
} // end
|
194 |
|
195 |
/**
|
196 |
+
* (non-PHPdoc)
|
197 |
+
* @see Mage_Checkout_OnepageController::saveBillingAction()
|
198 |
*/
|
199 |
public function saveBillingAction()
|
200 |
{
|
266 |
|
267 |
} // end
|
268 |
|
269 |
+
/**
|
270 |
+
* (non-PHPdoc)
|
271 |
+
* @see Mage_Checkout_OnepageController::progressAction()
|
272 |
+
*/
|
273 |
public function progressAction()
|
274 |
{
|
275 |
$layout = $this->getLayout();
|
281 |
$this->renderLayout();
|
282 |
}
|
283 |
|
|
|
284 |
/**
|
285 |
+
* Returns html for the next step to display depending on logic set in the System > Configuration
|
286 |
+
*
|
287 |
+
* @param array $result
|
288 |
+
* @param string $current Current step code
|
289 |
+
* @return multitype:string html <string, unknown>
|
290 |
*/
|
291 |
private function getNextSection($result, $current) {
|
292 |
|
371 |
} // end
|
372 |
|
373 |
|
374 |
+
} // end class
|
|
app/code/community/Clearandfizzy/Reducedcheckout/controllers/SignupController.php
CHANGED
@@ -1,8 +1,33 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
-
*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
5 |
*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
6 |
*/
|
7 |
class Clearandfizzy_Reducedcheckout_SignupController extends Mage_Core_Controller_Front_Action
|
8 |
{
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
*/
|
32 |
class Clearandfizzy_Reducedcheckout_SignupController extends Mage_Core_Controller_Front_Action
|
33 |
{
|
app/code/community/Clearandfizzy/Reducedcheckout/etc/config.xml
CHANGED
@@ -23,7 +23,7 @@
|
|
23 |
|
24 |
<shipping_resource>
|
25 |
<rewrite>
|
26 |
-
<carrier_tablerate>
|
27 |
</rewrite>
|
28 |
</shipping_resource>
|
29 |
|
@@ -105,19 +105,16 @@
|
|
105 |
<loginstep_type>0</loginstep_type>
|
106 |
<default_shipping>noskip</default_shipping>
|
107 |
<default_payment>noskip</default_payment>
|
108 |
-
|
|
|
|
|
109 |
</reducedcheckout>
|
110 |
|
111 |
<reducedcheckout_customergroups>
|
112 |
<customergroups_enabled>0</customergroups_enabled>
|
113 |
</reducedcheckout_customergroups>
|
114 |
|
115 |
-
<reducedcheckout_order_success>
|
116 |
-
<register_on_order_success>0</register_on_order_success>
|
117 |
-
<register_on_order_success_cms_block>reducedcheckout_success_form_register</register_on_order_success_cms_block>
|
118 |
-
</reducedcheckout_order_success>
|
119 |
-
|
120 |
</clearandfizzy_reducedcheckout_settings>
|
121 |
</default>
|
122 |
|
123 |
-
</config>
|
23 |
|
24 |
<shipping_resource>
|
25 |
<rewrite>
|
26 |
+
<carrier_tablerate>Clearandfizzy_Reducedcheckout_Model_Resource_Carrier_TablerateFix</carrier_tablerate>
|
27 |
</rewrite>
|
28 |
</shipping_resource>
|
29 |
|
105 |
<loginstep_type>0</loginstep_type>
|
106 |
<default_shipping>noskip</default_shipping>
|
107 |
<default_payment>noskip</default_payment>
|
108 |
+
<hide_telephone_fax>0</hide_telephone_fax>
|
109 |
+
<register_on_order_success>0</register_on_order_success>
|
110 |
+
<register_on_order_success_cms_block>reducedcheckout_success_form_register</register_on_order_success_cms_block>
|
111 |
</reducedcheckout>
|
112 |
|
113 |
<reducedcheckout_customergroups>
|
114 |
<customergroups_enabled>0</customergroups_enabled>
|
115 |
</reducedcheckout_customergroups>
|
116 |
|
|
|
|
|
|
|
|
|
|
|
117 |
</clearandfizzy_reducedcheckout_settings>
|
118 |
</default>
|
119 |
|
120 |
+
</config>
|
app/code/community/Clearandfizzy/Reducedcheckout/etc/system.xml
CHANGED
@@ -92,6 +92,17 @@
|
|
92 |
<show_in_website>1</show_in_website>
|
93 |
<show_in_store>1</show_in_store>
|
94 |
</loginstep_type>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
95 |
|
96 |
<!-- todo: Gp - make this into a drop down menu -->
|
97 |
<default_shipping>
|
@@ -210,4 +221,4 @@
|
|
210 |
</clearandfizzy_reducedcheckout_settings>
|
211 |
</sections>
|
212 |
|
213 |
-
</config>
|
92 |
<show_in_website>1</show_in_website>
|
93 |
<show_in_store>1</show_in_store>
|
94 |
</loginstep_type>
|
95 |
+
|
96 |
+
<hide_telephone_fax>
|
97 |
+
<label>Hide Telephone and Fax</label>
|
98 |
+
<frontend_type>select</frontend_type>
|
99 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
100 |
+
<comment>Removes Telephone and Fax from Billing & Shipping steps, hides & defaults these required fields to 00</comment>
|
101 |
+
<sort_order>21</sort_order>
|
102 |
+
<show_in_default>1</show_in_default>
|
103 |
+
<show_in_website>1</show_in_website>
|
104 |
+
<show_in_store>1</show_in_store>
|
105 |
+
</hide_telephone_fax>
|
106 |
|
107 |
<!-- todo: Gp - make this into a drop down menu -->
|
108 |
<default_shipping>
|
221 |
</clearandfizzy_reducedcheckout_settings>
|
222 |
</sections>
|
223 |
|
224 |
+
</config>
|
app/code/community/Clearandfizzy/Reducedcheckout/sql/reducedcheckout_setup/install-1.5.1.php
CHANGED
@@ -1,6 +1,34 @@
|
|
1 |
-
<?php
|
2 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
4 |
$installer = $this;
|
5 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
6 |
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
$installer = $this;
|
33 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
34 |
|
app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml
CHANGED
@@ -1,4 +1,36 @@
|
|
1 |
<?xml version="1.0"?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
<layout version="0.1.0">
|
3 |
|
4 |
<clearandfizzy_checkout_reduced>
|
@@ -44,7 +76,7 @@
|
|
44 |
|
45 |
</clearandfizzy_checkout_reduced_skip_shippingmethod>
|
46 |
|
47 |
-
<clearandfizzy_checkout_reduced_success_register
|
48 |
<reference name="head">
|
49 |
<action method="addCss"><stylesheet>css/clearandfizzy/reducedcheckout.css</stylesheet></action>
|
50 |
</reference>
|
@@ -58,5 +90,11 @@
|
|
58 |
</reference>
|
59 |
|
60 |
</clearandfizzy_checkout_reduced_success_register>
|
|
|
|
|
|
|
|
|
|
|
|
|
61 |
|
62 |
-
</layout>
|
1 |
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* Clearandfizzy
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
*
|
9 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
10 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
11 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
12 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
13 |
+
|
14 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
15 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
16 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
17 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
18 |
+
* CONDITIONS.
|
19 |
+
*
|
20 |
+
* DISCLAIMER
|
21 |
+
*
|
22 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
23 |
+
* versions in the future. If you wish to customize this extension for your
|
24 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
25 |
+
*
|
26 |
+
* @category Community
|
27 |
+
* @package Clearandfizzy_Reducedcheckout
|
28 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
29 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
30 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
31 |
+
*
|
32 |
+
*/
|
33 |
+
-->
|
34 |
<layout version="0.1.0">
|
35 |
|
36 |
<clearandfizzy_checkout_reduced>
|
76 |
|
77 |
</clearandfizzy_checkout_reduced_skip_shippingmethod>
|
78 |
|
79 |
+
<clearandfizzy_checkout_reduced_success_register>
|
80 |
<reference name="head">
|
81 |
<action method="addCss"><stylesheet>css/clearandfizzy/reducedcheckout.css</stylesheet></action>
|
82 |
</reference>
|
90 |
</reference>
|
91 |
|
92 |
</clearandfizzy_checkout_reduced_success_register>
|
93 |
+
|
94 |
+
<clearandfizzy_checkout_reduced_hide_telephonefax>
|
95 |
+
<reference name="head">
|
96 |
+
<action method="addJs"><stylesheet>clearandfizzy/reducedcheckout/hidetelephonefax.js</stylesheet></action>
|
97 |
+
</reference>
|
98 |
+
</clearandfizzy_checkout_reduced_hide_telephonefax>
|
99 |
|
100 |
+
</layout>
|
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage.phtml
CHANGED
@@ -1,3 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<?php /* -- START SAGEPAY INTEGRATION -- */ ?>
|
2 |
<div class="multiple-checkout">
|
3 |
<span></span>
|
@@ -24,6 +57,11 @@
|
|
24 |
failure: '<?php echo $this->getUrl('checkout/cart') ?>'}
|
25 |
);
|
26 |
|
|
|
|
|
|
|
|
|
|
|
27 |
<?php
|
28 |
// this is to enable forced guest checkout
|
29 |
if (Mage::getSingleton('customer/session')->isLoggedIn() == false &&
|
@@ -35,10 +73,6 @@
|
|
35 |
<?php
|
36 |
} // end if
|
37 |
?>
|
38 |
-
var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('reducedcheckout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('reducedcheckout/onepage/saveBilling') ?>');
|
39 |
-
var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('reducedcheckout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('reducedcheckout/onepage/saveShipping') ?>','<?php echo $this->getUrl('reducedcheckout/onepage/shippingMethod') ?>');
|
40 |
-
var shippingMethod = new ShippingMethod('co-shipping-method-form', "<?php echo $this->getUrl('reducedcheckout/onepage/saveShippingMethod') ?>");
|
41 |
-
var payment = new Payment('co-payment-form', '<?php echo $this->getUrl('reducedcheckout/onepage/savePayment') ?>');
|
42 |
|
43 |
//]]>
|
44 |
</script>
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
+
?>
|
33 |
+
|
34 |
<?php /* -- START SAGEPAY INTEGRATION -- */ ?>
|
35 |
<div class="multiple-checkout">
|
36 |
<span></span>
|
57 |
failure: '<?php echo $this->getUrl('checkout/cart') ?>'}
|
58 |
);
|
59 |
|
60 |
+
var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('reducedcheckout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('reducedcheckout/onepage/saveBilling') ?>');
|
61 |
+
var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('reducedcheckout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('reducedcheckout/onepage/saveShipping') ?>','<?php echo $this->getUrl('reducedcheckout/onepage/shippingMethod') ?>');
|
62 |
+
var shippingMethod = new ShippingMethod('co-shipping-method-form', "<?php echo $this->getUrl('reducedcheckout/onepage/saveShippingMethod') ?>");
|
63 |
+
var payment = new Payment('co-payment-form', '<?php echo $this->getUrl('reducedcheckout/onepage/savePayment') ?>');
|
64 |
+
|
65 |
<?php
|
66 |
// this is to enable forced guest checkout
|
67 |
if (Mage::getSingleton('customer/session')->isLoggedIn() == false &&
|
73 |
<?php
|
74 |
} // end if
|
75 |
?>
|
|
|
|
|
|
|
|
|
76 |
|
77 |
//]]>
|
78 |
</script>
|
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage/login.phtml
CHANGED
@@ -1,10 +1,33 @@
|
|
1 |
<?php
|
2 |
/**
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
|
4 |
-
*
|
5 |
-
*
|
6 |
-
*
|
7 |
-
*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
8 |
*/
|
9 |
?>
|
10 |
<?php
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
*/
|
32 |
?>
|
33 |
<?php
|
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/success/wrapper.phtml
CHANGED
@@ -1,3 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<div id="clearandfizzy_reducedcheckout_wrapper">
|
2 |
<?php echo $this->getChildHtml('',true, true); ?>
|
3 |
</div>
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
+
?>
|
33 |
<div id="clearandfizzy_reducedcheckout_wrapper">
|
34 |
<?php echo $this->getChildHtml('',true, true); ?>
|
35 |
</div>
|
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/success/wrapper/signup.phtml
CHANGED
@@ -1,3 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<?php
|
2 |
/*
|
3 |
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Clearandfizzy
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
*
|
8 |
+
* THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
|
9 |
+
* COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
|
10 |
+
* COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
|
11 |
+
* AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
|
12 |
+
|
13 |
+
* BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
|
14 |
+
* TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
|
15 |
+
* BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
|
16 |
+
* CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
|
17 |
+
* CONDITIONS.
|
18 |
+
*
|
19 |
+
* DISCLAIMER
|
20 |
+
*
|
21 |
+
* Do not edit or add to this file if you wish to upgrade this extension to newer
|
22 |
+
* versions in the future. If you wish to customize this extension for your
|
23 |
+
* needs please refer to http://www.clearandfizzy.com for more information.
|
24 |
+
*
|
25 |
+
* @category Community
|
26 |
+
* @package Clearandfizzy_Reducedcheckout
|
27 |
+
* @copyright Copyright (c) 2013 Clearandfizzy Ltd. (http://www.clearandfizzy.com)
|
28 |
+
* @license http://creativecommons.org/licenses/by-nd/3.0/ Creative Commons (CC BY-ND 3.0)
|
29 |
+
* @author Gareth Price <gareth@clearandfizzy.com>
|
30 |
+
*
|
31 |
+
*/
|
32 |
+
?>
|
33 |
<?php
|
34 |
/*
|
35 |
|
js/clearandfizzy/reducedcheckout/hidetelephonefax.js
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
/**
|
2 |
+
*
|
3 |
+
* @author Gareth Price gareth@clearandfizzy.com
|
4 |
+
*/
|
5 |
+
|
6 |
+
|
7 |
+
var clearandfizzy_reducedcheckout_hidetelephonefax = {
|
8 |
+
|
9 |
+
/* Hide the form elements and default to 0 (zero) to prevent any problems with validation on the admin panel */
|
10 |
+
init: function() {
|
11 |
+
this.hideField('telephone');
|
12 |
+
this.hideField('billing\:telephone');
|
13 |
+
this.hideField('shipping\:telephone');
|
14 |
+
}, // end
|
15 |
+
|
16 |
+
hideField: function(name) {
|
17 |
+
|
18 |
+
if ( $(name) ) {
|
19 |
+
$(name).up('li').hide();
|
20 |
+
|
21 |
+
if ( $(name).value == '') {
|
22 |
+
$(name).value = '00';
|
23 |
+
} // end if
|
24 |
+
} // end if
|
25 |
+
|
26 |
+
},
|
27 |
+
|
28 |
+
|
29 |
+
};
|
30 |
+
|
31 |
+
document.observe("dom:loaded", function() {
|
32 |
+
clearandfizzy_reducedcheckout_hidetelephonefax.init();
|
33 |
+
}); // end
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Clearandfizzy_Reducedcheckout</name>
|
4 |
-
<version>1.6.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://creativecommons.org/licenses/by-nd/3.0/">CC BY-ND 3.0</license>
|
7 |
<channel>community</channel>
|
@@ -25,13 +25,15 @@ No<br />
|
|
25 |
<br />
|
26 |
Well then, what in funkytown did you do?<br />
|
27 |
There is now the option to replace the default Magento login step with a radically different, more user intuitive form. 
|
28 |
-
<br />
|
29 |
-
|
30 |
-
|
|
|
|
|
31 |
<authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
|
32 |
-
<date>2013-
|
33 |
-
<time>
|
34 |
-
<contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="Reducedcheckout"><dir name="Helper"><file name="Data.php" hash="
|
35 |
<compatible/>
|
36 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
37 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Clearandfizzy_Reducedcheckout</name>
|
4 |
+
<version>1.6.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://creativecommons.org/licenses/by-nd/3.0/">CC BY-ND 3.0</license>
|
7 |
<channel>community</channel>
|
25 |
<br />
|
26 |
Well then, what in funkytown did you do?<br />
|
27 |
There is now the option to replace the default Magento login step with a radically different, more user intuitive form. 
|
28 |
+
<br /><br />
|
29 |
+
You now have the option to remove the telephone/fax input field from the checkout process.
|
30 |
+
<br /><br />
|
31 |
+
Updated licences Creative Commons (CC BY-ND 3.0) 
|
32 |
+
<br /></notes>
|
33 |
<authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
|
34 |
+
<date>2013-10-13</date>
|
35 |
+
<time>02:50:07</time>
|
36 |
+
<contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="Reducedcheckout"><dir name="Helper"><file name="Data.php" hash="360bcfcda7ab1d8a480cff94a2fc2f38"/><file name="Order.php" hash="e1610d6ea46019208c191e19a84bf757"/></dir><dir name="Model"><file name="Observer.php" hash="a9660f900cc765f09f8ef88acc54ac91"/><dir name="Resource"><dir name="Carrier"><file name="TablerateFix.php" hash="0147e5bbe44453db8d41b6cb874a4300"/></dir><file name="Setup.php" hash="c0fea228b595d0c53e2b130d4d9a4630"/></dir><dir name="Signup"><file name="Observer.php" hash="0597c69154bd1782c8c2de2226773cca"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Cms"><file name="Block.php" hash="827584b6c6d7a4654cadb4e7da661547"/></dir><dir name="Login"><file name="Step.php" hash="29a78add4acfcdbc66a9face419567e9"/></dir><dir name="Payment"><file name="EnabledMethods.php" hash="9cabd7136cf931202d50ccea396cbac7"/></dir><dir name="Shipping"><file name="EnabledMethods.php" hash="f5f6439e922886159da6794d7e08e10f"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="OnepageController.php" hash="622673dd942996b0c5bc06f1c76913ed"/><file name="SignupController.php" hash="fedc8303a528adb123f141e275538af3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0bb1372118e88ad09fbd1b1d5113dea7"/><file name="config.xml" hash="fd6f40e6e45095bb015c6144f64af08f"/><file name="system.xml" hash="46ff680291aadba3c5302e722e2f1168"/></dir><dir name="sql"><dir name="reducedcheckout_setup"><file name="install-1.5.1.php" hash="a59ae107fe18b60fbf32746517e9fb5e"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Clearandfizzy_ReducedCheckout.xml" hash="9cb58e8121e0c0e294f10a3595b2be7d"/></dir></target><target name="magedesign"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="clearandfizzy"><dir name="reducedcheckout"><file name="reducedcheckout.xml" hash="fa90b42f02f7f8d50e202666220ace2e"/></dir></dir></dir><dir name="template"><dir name="clearandfizzy"><dir name="reducedcheckout"><dir name="onepage"><file name="login.phtml" hash="e53a5d4bdafd9072e7975366441dafbf"/></dir><file name="onepage.phtml" hash="53b4539f4d6eeb92a2cbbfa1672790ad"/><dir name="success"><dir name="wrapper"><file name="signup.phtml" hash="07fd56d049be3b0e23fd1f4abca5b621"/></dir><file name="wrapper.phtml" hash="61e0eb83322fa2a4851fdca2010a1662"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="clearandfizzy"><file name="reducedcheckout.css" hash="2122ca5de41c9e6a7b7bd9d6531e82a0"/></dir></dir></dir></dir></dir></dir></target><target name="mageweb"><dir><dir name="js"><dir name="clearandfizzy"><dir name="reducedcheckout"><file name="hidetelephonefax.js" hash="321ce2ed89d3a1958a487c5fd0445d23"/></dir></dir></dir></dir></target></contents>
|
37 |
<compatible/>
|
38 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
39 |
</package>
|