Clearandfizzy_Reducedcheckout - Version 1.8.1

Version Notes

Did we add new features?

Yes



Did you fix a bunch of Bugs?

Yes



Refactored some code.
Updated the system configuration settings for this extension.
Fixed some possible MAMP file-naming convention issues.


Download this release

Release Info

Developer Gareth Price
Extension Clearandfizzy_Reducedcheckout
Version 1.8.1
Comparing to
See all releases


Code changes from version 1.7.2 to 1.8.1

Files changed (19) hide show
  1. app/code/community/Clearandfizzy/Reducedcheckout/Helper/Data.php +1 -1
  2. app/code/community/Clearandfizzy/Reducedcheckout/Helper/Order.php +1 -1
  3. app/code/community/Clearandfizzy/Reducedcheckout/Model/Observer.php +90 -68
  4. app/code/community/Clearandfizzy/Reducedcheckout/Model/{Signup/Observer.php → Observer/Signup.php} +105 -102
  5. app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Carrier/TablerateFix.php +1 -1
  6. app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Setup.php +1 -1
  7. app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Login/Step.php +1 -1
  8. app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Payment/{EnabledMethods.php → Enabledmethods.php} +2 -2
  9. app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Shipping/{EnabledMethods.php → Enabledmethods.php} +2 -2
  10. app/code/community/Clearandfizzy/Reducedcheckout/controllers/Adminhtml/ReducedcheckoutController.php +48 -0
  11. app/code/community/Clearandfizzy/Reducedcheckout/controllers/OnepageController.php +1 -1
  12. app/code/community/Clearandfizzy/Reducedcheckout/controllers/SignupController.php +1 -1
  13. app/code/community/Clearandfizzy/Reducedcheckout/etc/adminhtml.xml +33 -0
  14. app/code/community/Clearandfizzy/Reducedcheckout/etc/config.xml +73 -4
  15. app/code/community/Clearandfizzy/Reducedcheckout/etc/system.xml +394 -144
  16. app/code/community/Clearandfizzy/Reducedcheckout/sql/reducedcheckout_setup/install-1.5.1.php +1 -1
  17. app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml +1 -1
  18. app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage.phtml +3 -1
  19. package.xml +9 -8
app/code/community/Clearandfizzy/Reducedcheckout/Helper/Data.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/code/community/Clearandfizzy/Reducedcheckout/Helper/Order.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/code/community/Clearandfizzy/Reducedcheckout/Model/Observer.php CHANGED
@@ -24,7 +24,7 @@
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
  *
@@ -33,86 +33,88 @@ class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Obser
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');
44
-
45
- // return early if we're not enabled
46
- if ($enabled != true) {
47
  return;
48
- } // end
49
-
50
  $handles = $observer->getEvent()->getLayout()->getUpdate()->getHandles();
51
-
 
52
  // find the handle we're looking for
53
  if ( array_search('checkout_onepage_index', $handles) == true ) {
54
-
55
- $update = $observer->getEvent()->getLayout()->getUpdate();
56
- $update->addHandle('clearandfizzy_checkout_reduced');
57
-
58
- // should we remove the login step..
59
- if (
60
- Mage::getSingleton('customer/session')->isLoggedIn() == false &&
61
- Mage::helper('clearandfizzy_reducedcheckout/data')->isLoginStepGuestOnly() == true) {
62
- $update->addHandle('clearandfizzy_checkout_reduced_forceguestonly');
63
- } // end
64
-
65
- // should we remove the login step..
66
- if (
67
- Mage::getSingleton('customer/session')->isLoggedIn() == false &&
68
- Mage::helper('clearandfizzy_reducedcheckout/data')->isLoginStepCustom() == true) {
69
- $update->addHandle('clearandfizzy_checkout_reduced_login_custom');
70
- } // end
71
-
72
- // should we remove the payment method step..
73
- if (Mage::helper('clearandfizzy_reducedcheckout/data')->skipShippingMethod() == true) {
74
- $update->addHandle('clearandfizzy_checkout_reduced_skip_shippingmethod');
75
- } // end
76
-
77
- // should we remove the shipping method step..
78
- if (Mage::helper('clearandfizzy_reducedcheckout/data')->skipPaymentMethod() == true) {
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
115
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
116
  /**
117
  * Returns true if the the user is not logged in and email doesn't already exist.
118
  * @return boolean
@@ -145,5 +147,25 @@ class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Obser
145
 
146
  } // end
147
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
148
  } // end
149
 
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
33
 
34
  /**
35
  * Use Layout Handles to apply logic.
36
+ *
37
  * @see etc/config.xml <events>
38
+ * @see app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml
39
  * @param Varien_Event_Observer $observer
40
  */
41
  public function checkReducedCheckout(Varien_Event_Observer $observer) {
42
+
43
+ // exit now if reduced checkout is not enabled or this is not checkout_onepage_index
44
+ if ($this->isReducedCheckoutEnabled() == false) {
 
 
45
  return;
46
+ }
47
+
48
  $handles = $observer->getEvent()->getLayout()->getUpdate()->getHandles();
49
+ $this->_update = $observer->getEvent()->getLayout()->getUpdate();
50
+
51
  // find the handle we're looking for
52
  if ( array_search('checkout_onepage_index', $handles) == true ) {
53
+ $this->_update->addHandle('clearandfizzy_checkout_reduced');
54
+
55
+ $this->_loginStepHandle();
56
+ $this->_paymentStepHandle();
57
+ $this->_shippingStepHandle();
58
+ $this->_telephoneFaxHandle();
59
+ return;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  } // end
61
+
62
+ // find the handle we're looking for
 
 
 
 
 
 
 
 
 
 
 
 
 
63
  if ( array_search('customer_address_form', $handles) == true ) {
64
+ $this->_telephoneFaxHandle();
65
+ return;
66
+ } // end
67
+
 
 
 
 
68
  return;
69
+
70
+ } // end
71
 
72
+ /**
73
+ * Adds the handle "clearandfizzy_checkout_reduced_forceguestonly"
74
+ * @see app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml
75
+ */
76
+ protected function _loginStepHandle() {
77
+ // should we remove the login step..
78
+ if ( Mage::getSingleton('customer/session')->isLoggedIn() == false &&
79
+ Mage::helper('clearandfizzy_reducedcheckout/data')->isLoginStepGuestOnly() == true) {
80
+ $this->getUpdate()->addHandle('clearandfizzy_checkout_reduced_forceguestonly');
81
+ } // end
82
  } // end
83
+
84
+ /**
85
+ * Adds the Handle "clearandfizzy_checkout_reduced_skip_shippingmethod"
86
+ * @see app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml
87
+ */
88
+ protected function _paymentStepHandle() {
89
+ // should we remove the payment method step..
90
+ if (Mage::helper('clearandfizzy_reducedcheckout/data')->skipShippingMethod() == true) {
91
+ $this->getUpdate()->addHandle('clearandfizzy_checkout_reduced_skip_shippingmethod');
92
+ } // end
93
+ } // end
94
+
95
+ /**
96
+ * Adds the Handle "clearandfizzy_checkout_reduced_skip_paymentmethod"
97
+ * @see app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml
98
+ */
99
+ protected function _shippingStepHandle() {
100
+ // should we remove the shipping method step..
101
+ if (Mage::helper('clearandfizzy_reducedcheckout/data')->skipPaymentMethod() == true) {
102
+ $this->getUpdate()->addHandle('clearandfizzy_checkout_reduced_skip_paymentmethod');
103
+ } // end
104
+
105
+ } // end
106
+
107
+ /**
108
+ * Adds the Handle "clearandfizzy_checkout_reduced_hide_telephonefax"
109
+ * @see app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml
110
+ */
111
+ protected function _telephoneFaxHandle(){
112
+ // hide the telphone input fields
113
+ if (Mage::helper('clearandfizzy_reducedcheckout/data')->hideTelephoneAndFax() == true) {
114
+ $this->getUpdate()->addHandle('clearandfizzy_checkout_reduced_hide_telephonefax');
115
+ } // end
116
+ } // end
117
+
118
  /**
119
  * Returns true if the the user is not logged in and email doesn't already exist.
120
  * @return boolean
147
 
148
  } // end
149
 
150
+ /**
151
+ * Returns true if Reduced Checkout is Enabled in the Admin Configuration
152
+ *
153
+ * @return boolean
154
+ */
155
+ protected function isReducedCheckoutEnabled() {
156
+ $enabled = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/isenabled');
157
+
158
+ // return early if we're not enabled
159
+ if ($enabled != true) {
160
+ return false;
161
+ } // end
162
+
163
+ return true;
164
+ } // end
165
+
166
+ protected function getUpdate() {
167
+ return $this->_update;
168
+ } // end
169
+
170
  } // end
171
 
app/code/community/Clearandfizzy/Reducedcheckout/Model/{Signup/Observer.php → Observer/Signup.php} RENAMED
@@ -1,103 +1,106 @@
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;
35
-
36
- public function __construct() {
37
- $this->_helper = Mage::helper('clearandfizzy_reducedcheckout/order');
38
- } // end
39
-
40
- /**
41
- * Observes the user register event.
42
- * @param Varien_Event_Observer $observer
43
- */
44
- public function checkCustomerCreated(Varien_Event_Observer $observer) {
45
- $helper = $this->_helper;
46
-
47
- // if this session key does not exist then we have nothing to do
48
- if (Mage::registry($helper->getSessionKey()) == false) {
49
- return;
50
- } // end if
51
-
52
- $customer = $observer->getCustomer();
53
- $order = $helper->getOrder();
54
-
55
- $address = Mage::getModel('customer/address');
56
- $billing = $order->getBillingAddress();
57
- $shipping = $order->getShippingAddress();
58
-
59
- // assign this order to the current customer
60
- $order = $this->_assignCustomerToOrder($order, $customer);
61
-
62
- // assign bill and shipping to the customer
63
- $billing = $this->_prepareAddress($billing, $customer);
64
- $address->setData($billing->getData());
65
- $customer->addAddress($address);
66
- $customer->save();
67
-
68
- // un-register this key
69
- Mage::unregister($helper->getSessionKey());
70
-
71
- return true;
72
- } // end
73
-
74
- /**
75
- * Assign a customer to an order
76
- * @param unknown $order
77
- * @param unknown $customer
78
- * @return unknown
79
- */
80
- protected function _assignCustomerToOrder($order, $customer) {
81
-
82
- // assign the customer to the order
83
- $order->setCustomerId($customer->getId());
84
- $order->save();
85
-
86
- return $order;
87
- }
88
-
89
- /**
90
- * Remove some values from the address
91
- * @param unknown $address
92
- * @param unknown $customer
93
- * @return unknown
94
- */
95
- protected function _prepareAddress($address, $customer) {
96
- $address->unsetData('entity_id');
97
- $address->setCustomerId($customer->getId());
98
- $address->setIsDefaultBilling(true);
99
-
100
- return $address;
101
- } // end
102
-
 
 
 
103
  } // end
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) 2014 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_Signup extends Mage_Core_Model_Observer {
33
+
34
+ protected $_helper;
35
+
36
+ public function __construct() {
37
+ $this->_helper = Mage::helper('clearandfizzy_reducedcheckout/order');
38
+ } // end
39
+
40
+ /**
41
+ * Observes the user register event.
42
+ * If a guest customer decides to register then we should assign the order to that new customer account
43
+ *
44
+ * @param Varien_Event_Observer $observer
45
+ */
46
+
47
+ public function checkCustomerCreated(Varien_Event_Observer $observer) {
48
+ $helper = $this->_helper;
49
+
50
+ // if this session key does not exist then we have nothing to do
51
+ if (Mage::registry($helper->getSessionKey()) == false) {
52
+ return;
53
+ } // end if
54
+
55
+ $customer = $observer->getCustomer();
56
+ $order = $helper->getOrder();
57
+
58
+ $address = Mage::getModel('customer/address');
59
+ $billing = $order->getBillingAddress();
60
+ $shipping = $order->getShippingAddress();
61
+
62
+ // assign this order to the current customer
63
+ $order = $this->_assignCustomerToOrder($order, $customer);
64
+
65
+ // assign bill and shipping to the customer
66
+ $billing = $this->_prepareAddress($billing, $customer);
67
+ $address->setData($billing->getData());
68
+ $customer->addAddress($address);
69
+ $customer->save();
70
+
71
+ // un-register this key
72
+ Mage::unregister($helper->getSessionKey());
73
+
74
+ return true;
75
+ } // end
76
+
77
+ /**
78
+ * Assign a customer to an order
79
+ * @param unknown $order
80
+ * @param unknown $customer
81
+ * @return unknown
82
+ */
83
+ protected function _assignCustomerToOrder($order, $customer) {
84
+
85
+ // assign the customer to the order
86
+ $order->setCustomerId($customer->getId());
87
+ $order->save();
88
+
89
+ return $order;
90
+ }
91
+
92
+ /**
93
+ * Remove some values from the address
94
+ * @param unknown $address
95
+ * @param unknown $customer
96
+ * @return unknown
97
+ */
98
+ protected function _prepareAddress($address, $customer) {
99
+ $address->unsetData('entity_id');
100
+ $address->setCustomerId($customer->getId());
101
+ $address->setIsDefaultBilling(true);
102
+
103
+ return $address;
104
+ } // end
105
+
106
  } // end
app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Carrier/TablerateFix.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/code/community/Clearandfizzy/Reducedcheckout/Model/Resource/Setup.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Login/Step.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Payment/{EnabledMethods.php → Enabledmethods.php} RENAMED
@@ -24,12 +24,12 @@
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()
35
  {
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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()
35
  {
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Shipping/{EnabledMethods.php → Enabledmethods.php} RENAMED
@@ -24,12 +24,12 @@
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()
35
  {
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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()
35
  {
app/code/community/Clearandfizzy/Reducedcheckout/controllers/Adminhtml/ReducedcheckoutController.php ADDED
@@ -0,0 +1,48 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class Clearandfizzy_Reducedcheckout_Adminhtml_ReducedcheckoutController extends
4
+ Mage_Adminhtml_Controller_Action {
5
+
6
+ /**
7
+ *
8
+ */
9
+ public function issecureenabledAction() {
10
+ $value = Mage::getStoreConfig(
11
+ 'web/secure/base_url',
12
+ Mage::app()->getStore()
13
+ );
14
+
15
+ echo $value;
16
+ return;
17
+ } // end
18
+
19
+
20
+
21
+ /**
22
+ *
23
+ */
24
+ public function isfrontendsslAction() {
25
+ $value = Mage::getStoreConfig(
26
+ 'web/secure/use_in_frontend',
27
+ Mage::app()->getStore()
28
+ );
29
+
30
+ switch ($value) {
31
+
32
+ case "1":
33
+ $value = 'Enabled';
34
+ break;
35
+
36
+ default:
37
+ $value = 'Disabled';
38
+ break;
39
+ } // end
40
+
41
+ echo $value;
42
+ return;
43
+ } // end
44
+
45
+
46
+
47
+
48
+ } // end
app/code/community/Clearandfizzy/Reducedcheckout/controllers/OnepageController.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/code/community/Clearandfizzy/Reducedcheckout/controllers/SignupController.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/code/community/Clearandfizzy/Reducedcheckout/etc/adminhtml.xml CHANGED
@@ -1,4 +1,37 @@
1
  <?xml version="1.0"?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <config>
3
  <acl>
4
  <resources>
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) 2014 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
+
35
  <config>
36
  <acl>
37
  <resources>
app/code/community/Clearandfizzy/Reducedcheckout/etc/config.xml CHANGED
@@ -1,9 +1,42 @@
1
  <?xml version="1.0"?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <config>
3
 
4
  <modules>
5
  <Clearandfizzy_Reducedcheckout>
6
- <version>1.5.3</version>
7
  </Clearandfizzy_Reducedcheckout>
8
  </modules>
9
 
@@ -49,7 +82,7 @@
49
  <customer_register_success>
50
  <observers>
51
  <checkCustomerCreated>
52
- <class>Clearandfizzy_Reducedcheckout_Model_Signup_Observer</class>
53
  <method>checkCustomerCreated</method>
54
  </checkCustomerCreated>
55
  </observers>
@@ -64,10 +97,32 @@
64
  </checkReducedCheckout>
65
  </observers>
66
  </controller_action_layout_load_before>
67
- </events>
68
 
69
  </global>
70
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
71
  <frontend>
72
  <routers>
73
 
@@ -110,6 +165,20 @@
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>
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) 2014 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
+
35
  <config>
36
 
37
  <modules>
38
  <Clearandfizzy_Reducedcheckout>
39
+ <version>1.8.1</version>
40
  </Clearandfizzy_Reducedcheckout>
41
  </modules>
42
 
82
  <customer_register_success>
83
  <observers>
84
  <checkCustomerCreated>
85
+ <class>Clearandfizzy_Reducedcheckout_Model_Observer_Signup</class>
86
  <method>checkCustomerCreated</method>
87
  </checkCustomerCreated>
88
  </observers>
97
  </checkReducedCheckout>
98
  </observers>
99
  </controller_action_layout_load_before>
100
+ </events>
101
 
102
  </global>
103
+
104
+ <admin>
105
+ <routers>
106
+ <adminhtml>
107
+ <args>
108
+ <modules>
109
+ <clearandfizzy_reducedcheckout before="Mage_Adminhtml">Clearandfizzy_Reducedcheckout_Adminhtml</clearandfizzy_reducedcheckout>
110
+ </modules>
111
+ </args>
112
+ </adminhtml>
113
+ </routers>
114
+ </admin>
115
+
116
+ <adminhtml>
117
+ <layout>
118
+ <updates>
119
+ <clearandfizzy_reducedcheckout>
120
+ <file>clearandfizzy/reducedcheckout.xml</file>
121
+ </clearandfizzy_reducedcheckout>
122
+ </updates>
123
+ </layout>
124
+ </adminhtml>
125
+
126
  <frontend>
127
  <routers>
128
 
165
  <register_on_order_success_cms_block>reducedcheckout_success_form_register</register_on_order_success_cms_block>
166
  </reducedcheckout>
167
 
168
+ <reducedcheckout_focus>
169
+ <tidy_header>0</tidy_header>
170
+ <onecolumn>0</onecolumn>
171
+ <hide_edityourcart>0</hide_edityourcart>
172
+ </reducedcheckout_focus>
173
+
174
+ <reducedcheckout_cart>
175
+ <hide_emptycart>0</hide_emptycart>
176
+ <hide_crosssells>0</hide_crosssells>
177
+ <hide_estimateshipping>0</hide_estimateshipping>
178
+ <hide_discountcode>0</hide_discountcode>
179
+ </reducedcheckout_cart>
180
+
181
+
182
  <reducedcheckout_customergroups>
183
  <customergroups_enabled>0</customergroups_enabled>
184
  </reducedcheckout_customergroups>
app/code/community/Clearandfizzy/Reducedcheckout/etc/system.xml CHANGED
@@ -5,16 +5,30 @@
5
  *
6
  * NOTICE OF LICENSE
7
  *
8
- * This source file is subject to the Academic Free License (AFL 3.0)
9
- * that is bundled with this package in the file LICENSE_AFL.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/afl-3.0.php
12
  *
13
- * @category Clearandfizzy
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
14
  * @package Clearandfizzy_Reducedcheckout
15
- * @copyright Copyright (c) 2012 Clearandfizzy ltd. (http://www.clearandfizzy.com/)
16
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
17
- * @description This file configures the Clearandfizzy tab and any default menus in the magento admin
 
18
  */
19
  -->
20
  <config>
@@ -27,7 +41,6 @@
27
  </clearandfizzy>
28
  </tabs>
29
 
30
-
31
  <!-- Group appears as a heading on the right hand side of the screen -->
32
  <sections>
33
  <clearandfizzy_reducedcheckout_settings>
@@ -40,144 +53,359 @@
40
  <show_in_website>1</show_in_website>
41
  <show_in_store>1</show_in_store>
42
 
43
- <groups>
44
- <reducedcheckout_about>
45
- <label>Reduced Checkout</label>
46
- <frontend_type>text</frontend_type>
47
- <sort_order>10</sort_order>
48
- <show_in_default>1</show_in_default>
49
- <show_in_website>1</show_in_website>
50
- <show_in_store>1</show_in_store>
51
- <comment><![CDATA[ <ol>
52
- <li><h3>About</h3></li>
53
- <li>Quick checkout method without changing the Magento checkout workflow </li>
54
- <li>Allows forced Guest Registration.</li>
55
- <li>Allows forced Payment method.</li>
56
- <li>Allows forced Shipping method.</li>
57
- <li>Fix for Magento Shipping Tablerates in 1.7.0.2 <a target="_blank" href="http://www.magentocommerce.com/bug-tracking/issue?issue=14069">http://www.magentocommerce.com/bug-tracking/issue?issue=14069</a></li>
58
- <li>Allows you to setup rules based on Customer groups.</li>
59
- <li>For support and tons more features <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li>
60
- </ol> ]]></comment>
61
- <expanded>1</expanded>
62
- </reducedcheckout_about>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
63
 
64
- <reducedcheckout>
65
- <label>Reduced Checkout Settings </label>
66
- <frontend_type>text</frontend_type>
67
- <sort_order>20</sort_order>
68
- <show_in_default>1</show_in_default>
69
- <show_in_website>1</show_in_website>
70
- <show_in_store>1</show_in_store>
71
- <expanded>1</expanded>
72
-
73
- <fields>
74
- <isenabled>
75
- <label>Enable Reduced Checkout</label>
76
- <frontend_type>select</frontend_type>
77
- <source_model>adminhtml/system_config_source_yesno</source_model>
78
- <comment>Enable reduced checkout functionality</comment>
79
- <sort_order>10</sort_order>
80
- <show_in_default>1</show_in_default>
81
- <show_in_website>1</show_in_website>
82
- <show_in_store>1</show_in_store>
83
- </isenabled>
84
-
85
- <loginstep_type>
86
- <label>Login Step</label>
87
- <frontend_type>select</frontend_type>
88
- <source_model>clearandfizzy_reducedcheckout/system_config_source_login_step</source_model>
89
- <comment>
90
  <![CDATA[
91
  <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
92
- Select the look of of the login step of the checkout process. For support and tons more features.
93
 
94
- <script>
95
- $$('select#clearandfizzy_reducedcheckout_settings_reducedcheckout_loginstep_type option').each(function(o) {
96
- if(o.readAttribute('value') == '2') {
97
- o.disabled = true;
98
- } // end if
99
- });
100
  </script>
101
 
102
  ]]>
103
- </comment>
104
- <sort_order>20</sort_order>
105
- <show_in_default>1</show_in_default>
106
- <show_in_website>1</show_in_website>
107
- <show_in_store>1</show_in_store>
108
- </loginstep_type>
109
-
110
- <hide_telephone_fax>
111
- <label>Hide Telephone and Fax</label>
112
- <frontend_type>select</frontend_type>
113
- <source_model>adminhtml/system_config_source_yesno</source_model>
114
- <comment>Removes Telephone and Fax from Billing &amp; Shipping steps, hides &amp; defaults these required fields to 00</comment>
115
- <sort_order>21</sort_order>
116
- <show_in_default>1</show_in_default>
117
- <show_in_website>1</show_in_website>
118
- <show_in_store>1</show_in_store>
119
- </hide_telephone_fax>
120
-
121
- <!-- todo: Gp - make this into a drop down menu -->
122
- <default_shipping>
123
- <label>Shipping Method Step</label>
124
- <frontend_type>select</frontend_type>
125
- <source_model>clearandfizzy_reducedcheckout/system_config_source_shipping_enabledMethods</source_model>
126
- <comment>The code for the default shipping method</comment>
127
- <sort_order>30</sort_order>
128
- <show_in_default>1</show_in_default>
129
- <show_in_website>1</show_in_website>
130
- <show_in_store>1</show_in_store>
131
- </default_shipping>
132
 
133
- <default_payment>
134
- <!-- todo: Gp - make this into a drop down menu -->
135
- <label>Payment Method Step</label>
136
- <frontend_type>select</frontend_type>
137
- <source_model>clearandfizzy_reducedcheckout/system_config_source_payment_enabledMethods</source_model>
138
- <comment>The code for the default payment method</comment>
139
- <sort_order>40</sort_order>
140
- <show_in_default>1</show_in_default>
141
- <show_in_website>1</show_in_website>
142
- <show_in_store>1</show_in_store>
143
- </default_payment>
144
-
145
- <register_on_order_success>
146
- <label>Order Success page - Guest to Customer Converter</label>
147
- <frontend_type>select</frontend_type>
148
- <source_model>adminhtml/system_config_source_yesno</source_model>
149
- <comment>
150
- <![CDATA[<a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a><br />
151
- Enable "Register now" Form on Order Success page - Displays a form encouraging guest users to register.
152
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
153
  <script>
154
- Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_register_on_order_success');
155
  </script>
156
- ]]>
157
- </comment>
158
- <sort_order>50</sort_order>
159
- <show_in_default>1</show_in_default>
160
- <show_in_website>1</show_in_website>
161
- <show_in_store>1</show_in_store>
162
- </register_on_order_success>
163
-
164
- <enable28112fix>
165
- <label>Enable Shipping Tablerates Bug #28112 fix</label>
166
- <frontend_type>select</frontend_type>
167
- <source_model>adminhtml/system_config_source_yesno</source_model>
168
- <comment>Enable fix for Magento bug #28112 Shipping tablerates</comment>
169
- <sort_order>70</sort_order>
170
- <show_in_default>1</show_in_default>
171
- <show_in_website>1</show_in_website>
172
- <show_in_store>1</show_in_store>
173
- </enable28112fix>
174
 
175
- </fields>
176
- </reducedcheckout>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
177
 
178
  <reducedcheckout_customergroups>
179
  <label>Reduced Checkout Customer Group Settings </label>
180
- <sort_order>40</sort_order>
181
  <show_in_default>1</show_in_default>
182
  <show_in_website>1</show_in_website>
183
  <show_in_store>1</show_in_store>
@@ -186,7 +414,7 @@
186
  <ol>
187
  <li><h3>Customer Groups Rules</h3></li>
188
  <li>This feature will not work if you have chosen to "Hide login step" in the login step options above. This is because a customer needs to login before we can see what group they are in.</li>
189
- <li>For support and tons more features <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li>
190
  </ol> ]]></comment>
191
 
192
  <fields>
@@ -194,13 +422,12 @@
194
  <label>Enabled Customer Groups</label>
195
  <frontend_type>select</frontend_type>
196
  <source_model>adminhtml/system_config_source_yesno</source_model>
197
- <comment>
198
  <![CDATA[
199
- <script>
200
- Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_customergroups_customergroups_enabled');
201
- </script>
202
-
203
- ]]>
204
  </comment>
205
  <sort_order>1</sort_order>
206
  <show_in_default>1</show_in_default>
@@ -212,24 +439,47 @@
212
  <label>Do not skip Shipping Method for Customer Groups</label>
213
  <frontend_type>multiselect</frontend_type>
214
  <source_model>adminhtml/system_config_source_customer_group</source_model>
215
- <comment></comment>
216
- <depends><customergroups_enabled>1</customergroups_enabled></depends>
217
  <sort_order>20</sort_order>
218
  <show_in_default>1</show_in_default>
219
  <show_in_website>1</show_in_website>
220
- <show_in_store>1</show_in_store>
 
 
 
 
 
 
 
 
 
 
 
 
 
221
  </shipping_noskip_customergroups>
222
 
223
  <payment_noskip_customergroups>
224
  <label>Do not skip Payment Method for Customer Groups</label>
225
  <frontend_type>multiselect</frontend_type>
226
  <source_model>adminhtml/system_config_source_customer_group</source_model>
227
- <comment></comment>
228
- <depends><customergroups_enabled>1</customergroups_enabled></depends>
229
  <sort_order>30</sort_order>
230
  <show_in_default>1</show_in_default>
231
  <show_in_website>1</show_in_website>
232
  <show_in_store>1</show_in_store>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
233
  </payment_noskip_customergroups>
234
  </fields>
235
 
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) 2014 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
  <config>
41
  </clearandfizzy>
42
  </tabs>
43
 
 
44
  <!-- Group appears as a heading on the right hand side of the screen -->
45
  <sections>
46
  <clearandfizzy_reducedcheckout_settings>
53
  <show_in_website>1</show_in_website>
54
  <show_in_store>1</show_in_store>
55
 
56
+ <groups>
57
+ <reducedcheckout_about>
58
+ <label>Reduced Checkout</label>
59
+ <frontend_type>text</frontend_type>
60
+ <sort_order>10</sort_order>
61
+ <show_in_default>1</show_in_default>
62
+ <show_in_website>1</show_in_website>
63
+ <show_in_store>1</show_in_store>
64
+ <comment><![CDATA[ <ol>
65
+ <li><h3>About</h3></li>
66
+ <li>Quick checkout without changing the Magento checkout workflow </li>
67
+ <li>Allows forced Guest Registration.</li>
68
+ <li>Allows forced Payment method.</li>
69
+ <li>Allows forced Shipping method.</li>
70
+ <li>Fix for Magento Shipping Tablerates in 1.7.0.2 <a target="_blank" href="http://www.magentocommerce.com/bug-tracking/issue?issue=14069">http://www.magentocommerce.com/bug-tracking/issue?issue=14069</a></li>
71
+ <li>Allows you to setup rules based on Customer groups.</li>
72
+ <li>Focus Checkout mode, configure the checkout page to have reduced clutter.</li>
73
+ <li>For support and buckets more features <a target="_blank" style="color: blue;" href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li>
74
+ <li>&nbsp;</li>
75
+ <li><h3>Systems Check</h3></li>
76
+ <li>Web &gt; Secure &gt; Base URL: <strong id="is-enabled"></span></strong>
77
+ <li>Web &gt; Secure &gt; Use Secure URLs in Frontend: <strong id="is-secure"></span></strong>
78
+ <li>&nbsp;</li>
79
+ <script>
80
+ var request_enabled = new Ajax.Request('/admin/reducedcheckout/issecureenabled', {
81
+ parameters: {isAjax: 1, method: 'POST'},
82
+ onLoading: function(){$('is-enabled').show();},
83
+ onSuccess: function(transport) {
84
+ $('is-enabled').innerHTML = transport.responseText;
85
+ }
86
+ });
87
+
88
+ var request_secureurl = new Ajax.Request('/admin/reducedcheckout/isfrontendssl', {
89
+ parameters: {isAjax: 1, method: 'POST'},
90
+ onLoading: function(){$('is-secure').show();},
91
+ onSuccess: function(transport) {
92
+ $('is-secure').innerHTML = transport.responseText;
93
+ }
94
+ });
95
+
96
+
97
+ </script>
98
+
99
+ </ol> ]]></comment>
100
+ <expanded>1</expanded>
101
+ </reducedcheckout_about>
102
+
103
+ <reducedcheckout>
104
+ <label>Reduced Checkout Settings </label>
105
+ <frontend_type>text</frontend_type>
106
+ <sort_order>20</sort_order>
107
+ <show_in_default>1</show_in_default>
108
+ <show_in_website>1</show_in_website>
109
+ <show_in_store>1</show_in_store>
110
+ <expanded>1</expanded>
111
+
112
+ <fields>
113
+ <isenabled>
114
+ <label>Enable Reduced Checkout</label>
115
+ <frontend_type>select</frontend_type>
116
+ <source_model>adminhtml/system_config_source_yesno</source_model>
117
+ <comment>Enable reduced checkout functionality</comment>
118
+ <sort_order>10</sort_order>
119
+ <show_in_default>1</show_in_default>
120
+ <show_in_website>1</show_in_website>
121
+ <show_in_store>1</show_in_store>
122
+ </isenabled>
123
+
124
+ <loginstep_type>
125
+ <label>Login Step</label>
126
+ <frontend_type>select</frontend_type>
127
+ <source_model>clearandfizzy_reducedcheckout/system_config_source_login_step</source_model>
128
+ <comment>
129
+ <![CDATA[
130
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
131
+ Select the look of of the login step of the checkout process.
132
+
133
+ <script>
134
+ $$('select#clearandfizzy_reducedcheckout_settings_reducedcheckout_loginstep_type option').each(function(o) {
135
+ if(o.readAttribute('value') == '2') {
136
+ o.disabled = true;
137
+ } // end if
138
+ });
139
+ </script>
140
+
141
+ ]]>
142
+ </comment>
143
+ <sort_order>20</sort_order>
144
+ <show_in_default>1</show_in_default>
145
+ <show_in_website>1</show_in_website>
146
+ <show_in_store>1</show_in_store>
147
+ </loginstep_type>
148
+
149
+ <hide_telephone_fax>
150
+ <label>Hide Telephone and Fax</label>
151
+ <frontend_type>select</frontend_type>
152
+ <source_model>adminhtml/system_config_source_yesno</source_model>
153
+ <comment>Removes Telephone and Fax from Billing &amp; Shipping steps, hides &amp; defaults these required fields to 00</comment>
154
+ <sort_order>21</sort_order>
155
+ <show_in_default>1</show_in_default>
156
+ <show_in_website>1</show_in_website>
157
+ <show_in_store>1</show_in_store>
158
+ </hide_telephone_fax>
159
+
160
+ <!-- todo: Gp - make this into a drop down menu -->
161
+ <default_shipping>
162
+ <label>Shipping Method Step</label>
163
+ <frontend_type>select</frontend_type>
164
+ <source_model>clearandfizzy_reducedcheckout/system_config_source_shipping_enabledmethods</source_model>
165
+ <comment>The code for the default shipping method</comment>
166
+ <sort_order>30</sort_order>
167
+ <show_in_default>1</show_in_default>
168
+ <show_in_website>1</show_in_website>
169
+ <show_in_store>1</show_in_store>
170
+ </default_shipping>
171
+
172
+ <default_payment>
173
+ <!-- todo: Gp - make this into a drop down menu -->
174
+ <label>Payment Method Step</label>
175
+ <frontend_type>select</frontend_type>
176
+ <source_model>clearandfizzy_reducedcheckout/system_config_source_payment_enabledmethods</source_model>
177
+ <comment>The code for the default payment method</comment>
178
+ <sort_order>40</sort_order>
179
+ <show_in_default>1</show_in_default>
180
+ <show_in_website>1</show_in_website>
181
+ <show_in_store>1</show_in_store>
182
+ </default_payment>
183
+
184
+ <register_on_order_success>
185
+ <label>Order Success page - Guest to Customer Converter</label>
186
+ <frontend_type>select</frontend_type>
187
+ <source_model>adminhtml/system_config_source_yesno</source_model>
188
+ <comment>
189
+ <![CDATA[<a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a><br />
190
+ Enable "Register now" Form on Order Success page - Displays a form encouraging guest users to register.
191
+
192
+ <script>
193
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_register_on_order_success');
194
+ </script>
195
+ ]]>
196
+ </comment>
197
+ <sort_order>50</sort_order>
198
+ <show_in_default>1</show_in_default>
199
+ <show_in_website>1</show_in_website>
200
+ <show_in_store>1</show_in_store>
201
+ </register_on_order_success>
202
+
203
+ <enable28112fix>
204
+ <label>Enable Shipping Tablerates Bug #28112 fix</label>
205
+ <frontend_type>select</frontend_type>
206
+ <source_model>adminhtml/system_config_source_yesno</source_model>
207
+ <comment>Enable fix for Magento bug #28112 Shipping tablerates</comment>
208
+ <sort_order>70</sort_order>
209
+ <show_in_default>1</show_in_default>
210
+ <show_in_website>1</show_in_website>
211
+ <show_in_store>1</show_in_store>
212
+ </enable28112fix>
213
+
214
+ </fields>
215
+ </reducedcheckout>
216
+
217
+ <reducedcheckout_focus>
218
+ <label>Focus Checkout Settings </label>
219
+ <sort_order>30</sort_order>
220
+ <show_in_default>1</show_in_default>
221
+ <show_in_website>1</show_in_website>
222
+ <show_in_store>1</show_in_store>
223
+ <expanded>1</expanded>
224
+ <comment><![CDATA[ <ol>
225
+ <li><h3>Focus Checkout Settings</h3></li>
226
+ <li>Streamline the checkout process further by removing as many outbound links / checkout distractions as possible.</li>
227
+ <li>&nbsp;</li>
228
+ <li><b>PLEASE NOTE:</b> These settings will work in the majority of cases however be aware that customised themes may not adhere to best practice guidelines. For support and buckets more features <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li>
229
+
230
+ </ol> ]]></comment>
231
 
232
+ <fields>
233
+ <tidy_header>
234
+ <label>Clear the Header block of links</label>
235
+ <frontend_type>select</frontend_type>
236
+ <source_model>adminhtml/system_config_source_yesno</source_model>
237
+ <sort_order>10</sort_order>
238
+ <show_in_default>1</show_in_default>
239
+ <show_in_website>1</show_in_website>
240
+ <show_in_store>1</show_in_store>
241
+ <comment>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
242
  <![CDATA[
243
  <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
244
+ Removed all child blocks from within the "Header" Block.
245
 
246
+ <script>
247
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_focus_tidy_header');
 
 
 
 
248
  </script>
249
 
250
  ]]>
251
+ </comment>
252
+ </tidy_header>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
253
 
254
+ <onecolumn>
255
+ <label>Enabled One Column Layout</label>
256
+ <frontend_type>select</frontend_type>
257
+ <source_model>adminhtml/system_config_source_yesno</source_model>
258
+ <sort_order>20</sort_order>
259
+ <show_in_default>1</show_in_default>
260
+ <show_in_website>1</show_in_website>
261
+ <show_in_store>1</show_in_store>
262
+ <comment>
263
+ <![CDATA[
264
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
265
+ Put the Checkout into a One Column Layout removing any links on the left and right columns.
266
+
267
+ <script>
268
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_focus_onecolumn');
269
+ </script>
270
+
271
+ ]]>
272
+ </comment>
273
 
274
+ </onecolumn>
275
+
276
+ <hide_edityourcart>
277
+ <label>Hide "Edit Your Cart" on checkout</label>
278
+ <frontend_type>select</frontend_type>
279
+ <source_model>adminhtml/system_config_source_yesno</source_model>
280
+ <sort_order>30</sort_order>
281
+ <show_in_default>1</show_in_default>
282
+ <show_in_website>1</show_in_website>
283
+ <show_in_store>1</show_in_store>
284
+ <comment>
285
+ <![CDATA[
286
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
287
+ Hides the "Edit Your Cart" link on the final step of the checkout process - forcusing the user on proceeding onto completing the order.
288
+
289
+ <script>
290
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_focus_hide_edityourcart');
291
+ </script>
292
+
293
+ ]]>
294
+ </comment>
295
+ </hide_edityourcart>
296
+
297
+ </fields>
298
+ </reducedcheckout_focus>
299
+
300
+ <reducedcheckout_cart>
301
+ <label>Cart Settings</label>
302
+ <sort_order>40</sort_order>
303
+ <show_in_default>1</show_in_default>
304
+ <show_in_website>1</show_in_website>
305
+ <show_in_store>1</show_in_store>
306
+ <expanded>1</expanded>
307
+ <comment><![CDATA[ <ol>
308
+ <li><h3>Focus Cart Settings</h3></li>
309
+ <li>Streamline the shopping cart by removing checkout distractions.</li>
310
+ <li>&nbsp;</li>
311
+ <li><b>PLEASE NOTE:</b> These settings will work in the majority of cases however be aware that customised themes may not adhere to best practice guidelines. For support and buckets more features <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li>
312
+ </ol> ]]></comment>
313
+
314
+ <fields>
315
+ <hide_emptycart>
316
+ <label>Hide Empty-Cart Button</label>
317
+ <frontend_type>select</frontend_type>
318
+ <source_model>adminhtml/system_config_source_yesno</source_model>
319
+ <sort_order>1</sort_order>
320
+ <show_in_default>1</show_in_default>
321
+ <show_in_website>1</show_in_website>
322
+ <show_in_store>1</show_in_store>
323
+ <comment>
324
+ <![CDATA[
325
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
326
+ Remove the "Empty Cart" button focusing the customer to proceed with purchasing all items.
327
+
328
  <script>
329
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_cart_hide_emptycart');
330
  </script>
331
+
332
+ ]]>
333
+ </comment>
334
+ </hide_emptycart>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
335
 
336
+ <hide_crosssells>
337
+ <label>Hide Cross-sells block</label>
338
+ <frontend_type>select</frontend_type>
339
+ <source_model>adminhtml/system_config_source_yesno</source_model>
340
+ <sort_order>2</sort_order>
341
+ <show_in_default>1</show_in_default>
342
+ <show_in_website>1</show_in_website>
343
+ <show_in_store>1</show_in_store>
344
+ <comment>
345
+ <![CDATA[
346
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
347
+ Removes the "Cross Sells" block.
348
+
349
+ <script>
350
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_cart_hide_crosssells');
351
+ </script>
352
+
353
+ ]]>
354
+ </comment>
355
+ </hide_crosssells>
356
+
357
+ <hide_estimateshipping>
358
+ <label>Hide Estimate Delivery block</label>
359
+ <frontend_type>select</frontend_type>
360
+ <source_model>adminhtml/system_config_source_yesno</source_model>
361
+ <sort_order>3</sort_order>
362
+ <show_in_default>1</show_in_default>
363
+ <show_in_website>1</show_in_website>
364
+ <show_in_store>1</show_in_store>
365
+ <comment>
366
+ <![CDATA[
367
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
368
+ Remove the "Estimate Delivery" Form
369
+
370
+ <script>
371
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_cart_hide_estimateshipping');
372
+ </script>
373
+
374
+ ]]>
375
+ </comment>
376
+
377
+ </hide_estimateshipping>
378
+
379
+ <hide_discountcode>
380
+ <label>Hide Discount Code block</label>
381
+ <frontend_type>select</frontend_type>
382
+ <source_model>adminhtml/system_config_source_yesno</source_model>
383
+ <sort_order>4</sort_order>
384
+ <show_in_default>1</show_in_default>
385
+ <show_in_website>1</show_in_website>
386
+ <show_in_store>1</show_in_store>
387
+ <comment>
388
+ <![CDATA[
389
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
390
+ Remove the "Discount Code" Block
391
+
392
+ <script>
393
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_cart_hide_discountcode');
394
+ </script>
395
+
396
+ ]]>
397
+ </comment>
398
+
399
+ </hide_discountcode>
400
+
401
+ </fields>
402
+
403
+ </reducedcheckout_cart>
404
+
405
 
406
  <reducedcheckout_customergroups>
407
  <label>Reduced Checkout Customer Group Settings </label>
408
+ <sort_order>50</sort_order>
409
  <show_in_default>1</show_in_default>
410
  <show_in_website>1</show_in_website>
411
  <show_in_store>1</show_in_store>
414
  <ol>
415
  <li><h3>Customer Groups Rules</h3></li>
416
  <li>This feature will not work if you have chosen to "Hide login step" in the login step options above. This is because a customer needs to login before we can see what group they are in.</li>
417
+ <li>For support and buckets more features <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li>
418
  </ol> ]]></comment>
419
 
420
  <fields>
422
  <label>Enabled Customer Groups</label>
423
  <frontend_type>select</frontend_type>
424
  <source_model>adminhtml/system_config_source_yesno</source_model>
425
+ <comment>
426
  <![CDATA[
427
+ <script>
428
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_customergroups_customergroups_enabled');
429
+ </script>
430
+ ]]>
 
431
  </comment>
432
  <sort_order>1</sort_order>
433
  <show_in_default>1</show_in_default>
439
  <label>Do not skip Shipping Method for Customer Groups</label>
440
  <frontend_type>multiselect</frontend_type>
441
  <source_model>adminhtml/system_config_source_customer_group</source_model>
 
 
442
  <sort_order>20</sort_order>
443
  <show_in_default>1</show_in_default>
444
  <show_in_website>1</show_in_website>
445
+ <show_in_store>1</show_in_store>
446
+ <comment>
447
+
448
+ <![CDATA[
449
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
450
+ Do not skip the shipping method step for these Customer Groups (Useful for b2b or premium customers that need Next Day couriers).
451
+
452
+ <script>
453
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_customergroups_shipping_noskip_customergroups');
454
+ </script>
455
+
456
+ ]]>
457
+
458
+ </comment>
459
  </shipping_noskip_customergroups>
460
 
461
  <payment_noskip_customergroups>
462
  <label>Do not skip Payment Method for Customer Groups</label>
463
  <frontend_type>multiselect</frontend_type>
464
  <source_model>adminhtml/system_config_source_customer_group</source_model>
 
 
465
  <sort_order>30</sort_order>
466
  <show_in_default>1</show_in_default>
467
  <show_in_website>1</show_in_website>
468
  <show_in_store>1</show_in_store>
469
+ <comment>
470
+
471
+ <![CDATA[
472
+ <a target="_blank" style="color: blue;"href="http://www.magentocommerce.com/magento-connect/reduced-checkout-pro-guest-converter.html">Upgrade to the PRO version</a></li><br />
473
+ Do not skip the payment method step for these Customer Groups (Useful for b2b customers that have a non-standard / alternative way of paying).
474
+
475
+ <script>
476
+ Form.Element.disable('clearandfizzy_reducedcheckout_settings_reducedcheckout_customergroups_payment_noskip_customergroups');
477
+ </script>
478
+
479
+ ]]>
480
+
481
+ </comment>
482
+
483
  </payment_noskip_customergroups>
484
  </fields>
485
 
app/code/community/Clearandfizzy/Reducedcheckout/sql/reducedcheckout_setup/install-1.5.1.php CHANGED
@@ -24,7 +24,7 @@
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
  *
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml CHANGED
@@ -25,7 +25,7 @@
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
  *
25
  *
26
  * @category Community
27
  * @package Clearandfizzy_Reducedcheckout
28
+ * @copyright Copyright (c) 2014 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
  *
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage.phtml CHANGED
@@ -24,7 +24,7 @@
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
  *
@@ -48,6 +48,8 @@
48
  </fieldset>
49
  </form>
50
 
 
 
51
  <script type="text/javascript">
52
  //<![CDATA[
53
 
24
  *
25
  * @category Community
26
  * @package Clearandfizzy_Reducedcheckout
27
+ * @copyright Copyright (c) 2014 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
  *
48
  </fieldset>
49
  </form>
50
 
51
+ <!-- Clearandfizzy_Reducedcheckout V<?php echo Mage::getConfig()->getNode()->modules->Clearandfizzy_Reducedcheckout->version; ?> -->
52
+
53
  <script type="text/javascript">
54
  //<![CDATA[
55
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Clearandfizzy_Reducedcheckout</name>
4
- <version>1.7.2</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>
@@ -17,18 +17,19 @@ Also&#xD;
17
  * Contains a fix for Magento bug #28112 with regards to Shipping Tablerates.&#xD;
18
  </description>
19
  <notes>Did we add new features?&lt;br /&gt;&#xD;
20
- No&lt;br /&gt;&#xD;
21
  &lt;br /&gt;&#xD;
22
  Did you fix a bunch of Bugs?&lt;br /&gt;&#xD;
23
  Yes&lt;br /&gt;&#xD;
24
  &lt;br /&gt;&#xD;
25
- Some customers were having issues with secure pages, we now detect if the website is in secure mode and return the correct url. Those clients that don't use secure pages will remain unaffected.&#xD;
26
- &lt;br/&gt;&lt;br/&gt;&#xD;
27
- </notes>
 
28
  <authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
29
- <date>2014-08-19</date>
30
- <time>15:33:49</time>
31
- <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"/><file name="Url.php" hash="3a677deb280b517358a5f5c1dc8d1857"/></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="Login"><file name="Step.php" hash="c59f321d3158fd1727b0774293956b1c"/></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="f1143caa3efb8d7f1b8259119a357b73"/><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="7ad27d73f4203d34d616d1770057c7a9"/></dir><dir name="sql"><dir name="reducedcheckout_setup"><file name="install-1.5.1.php" hash="65c07c4b4b932f673ea3d7184a9121f7"/></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="eaf9b776a4a941a1f5a68d22dcad620d"/></dir></dir></dir><dir name="template"><dir name="clearandfizzy"><dir name="reducedcheckout"><file name="onepage.phtml" hash="b3d7c56bab358d0e2b5784efaf2656b1"/></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>
32
  <compatible/>
33
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
34
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Clearandfizzy_Reducedcheckout</name>
4
+ <version>1.8.1</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>
17
  * Contains a fix for Magento bug #28112 with regards to Shipping Tablerates.&#xD;
18
  </description>
19
  <notes>Did we add new features?&lt;br /&gt;&#xD;
20
+ Yes&lt;br /&gt;&#xD;
21
  &lt;br /&gt;&#xD;
22
  Did you fix a bunch of Bugs?&lt;br /&gt;&#xD;
23
  Yes&lt;br /&gt;&#xD;
24
  &lt;br /&gt;&#xD;
25
+ Refactored some code.&#xD;
26
+ Updated the system configuration settings for this extension.&#xD;
27
+ Fixed some possible MAMP file-naming convention issues.&#xD;
28
+ &lt;br/&gt;&lt;br/&gt;</notes>
29
  <authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
30
+ <date>2014-09-12</date>
31
+ <time>22:01:24</time>
32
+ <contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="Reducedcheckout"><dir name="Helper"><file name="Data.php" hash="3333138ea2455b067cde52dbaafb6212"/><file name="Order.php" hash="e7bbafca24bc69261dcd4c07ebb12fb1"/><file name="Url.php" hash="3a677deb280b517358a5f5c1dc8d1857"/></dir><dir name="Model"><dir name="Observer"><file name="Signup.php" hash="501c83854ebdaeb317c5b11941c39ec5"/></dir><file name="Observer.php" hash="6d8ecda31a5bc342ae8cb3ab8ad84952"/><dir name="Resource"><dir name="Carrier"><file name="TablerateFix.php" hash="6d26ad82a5b4f06bf3cab195c6e98143"/></dir><file name="Setup.php" hash="9fe77e3bd30eef93159e13e7adebbc6a"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Login"><file name="Step.php" hash="5656c264fabdfa10feafee8dbf4d4e9b"/></dir><dir name="Payment"><file name="Enabledmethods.php" hash="c9fa4757eb7f0749dc2f5c54b3a9e8c6"/></dir><dir name="Shipping"><file name="Enabledmethods.php" hash="73167e4e131763f79200b99a62e9a958"/></dir></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ReducedcheckoutController.php" hash="825f7e381698ecf47e405f634d950c61"/></dir><file name="OnepageController.php" hash="1e43896dbdbab3b9280b1bc1b0ee9efc"/><file name="SignupController.php" hash="c58bba3bd7635f83e37c4823e49fc3a5"/></dir><dir name="etc"><file name="adminhtml.xml" hash="99867899c77202db229c5b68c386be56"/><file name="config.xml" hash="c2c0e1079f174ee4a425ffd11d6f60ad"/><file name="system.xml" hash="dc3ae29c51b1bc24a48363465aa2e82a"/></dir><dir name="sql"><dir name="reducedcheckout_setup"><file name="install-1.5.1.php" hash="80c42e796ed6b65be99b7c512c571960"/></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="c9922370b7af71406b8c9f379ec7afc4"/></dir></dir></dir><dir name="template"><dir name="clearandfizzy"><dir name="reducedcheckout"><file name="onepage.phtml" hash="3c4091adf90ddc32542c22182874c4ad"/></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>
33
  <compatible/>
34
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
35
  </package>