Clearandfizzy_Reducedcheckout - Version 1.6.0

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.

Download this release

Release Info

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


Code changes from version 1.5.3 to 1.6.0

Files changed (11) hide show
  1. app/code/community/Clearandfizzy/Reducedcheckout/Helper/Data.php +27 -12
  2. app/code/community/Clearandfizzy/Reducedcheckout/Model/Observer.php +10 -3
  3. app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Login/Step.php +15 -0
  4. app/code/community/Clearandfizzy/Reducedcheckout/controllers/OnepageController.php +2 -2
  5. app/code/community/Clearandfizzy/Reducedcheckout/etc/config.xml +1 -1
  6. app/code/community/Clearandfizzy/Reducedcheckout/etc/system.xml +43 -61
  7. app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml +7 -0
  8. app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage.phtml +1 -1
  9. app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage/login.phtml +126 -0
  10. package.xml +6 -7
  11. skin/frontend/base/default/css/clearandfizzy/reducedcheckout.css +4 -0
app/code/community/Clearandfizzy/Reducedcheckout/Helper/Data.php CHANGED
@@ -2,6 +2,10 @@
2
 
3
  class Clearandfizzy_Reducedcheckout_Helper_Data extends Mage_Core_Helper_Abstract {
4
 
 
 
 
 
5
  public function getPaymentMethod() {
6
  $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/default_payment');
7
  return $value;
@@ -12,32 +16,43 @@ class Clearandfizzy_Reducedcheckout_Helper_Data extends Mage_Core_Helper_Abstrac
12
  return $value;
13
  } // end
14
 
15
- public function isGuestCheckoutOnly() {
16
- $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/guestcheckoutonly');
17
- return $value;
18
  } // end
19
-
 
 
 
 
 
 
 
 
 
 
 
 
 
20
  public function isFix28112Enabled() {
21
  $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/enable28112fix');
22
  return $value;
23
  } // end
24
-
25
- public function getCustomerGroupsEnabled() {
26
- $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout_customergroups/customergroups_enabled');
27
- return $value;
28
- }
29
 
30
  public function guestsCanRegisterOnOrderSuccess() {
31
- $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout_order_success/register_on_order_success');
32
  return $value;
33
  } // end
34
 
35
  public function getCMSBlockIdForOrderSuccessForm() {
36
- $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout_order_success/register_on_order_success_cms_block');
37
  return $value;
38
  } // end
39
 
40
-
 
 
 
 
41
  public function getShippingCustomerGroups() {
42
 
43
  if ($this->getCustomerGroupsEnabled() == 0) {
2
 
3
  class Clearandfizzy_Reducedcheckout_Helper_Data extends Mage_Core_Helper_Abstract {
4
 
5
+ const LOGIN_STEP_DEFAULT = 0;
6
+ const LOGIN_STEP_GUESTONLY = 1;
7
+ const LOGIN_STEP_CUSTOM = 2;
8
+
9
  public function getPaymentMethod() {
10
  $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/default_payment');
11
  return $value;
16
  return $value;
17
  } // end
18
 
19
+ public function isLoginStepDefault() {
20
+ return ( $this->getLoginStepType() == self::LOGIN_STEP_DEFAULT);
 
21
  } // end
22
+
23
+ public function isLoginStepGuestOnly() {
24
+ return ( $this->getLoginStepType() == self::LOGIN_STEP_GUESTONLY);
25
+ } // end
26
+
27
+ public function isLoginStepCustom() {
28
+ return ( $this->getLoginStepType() == self::LOGIN_STEP_CUSTOM);
29
+ } // end
30
+
31
+ protected function getLoginStepType() {
32
+ $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/loginstep_type');
33
+ return $value;
34
+ } // end
35
+
36
  public function isFix28112Enabled() {
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;
44
  } // end
45
 
46
  public function getCMSBlockIdForOrderSuccessForm() {
47
+ $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout/register_on_order_success_cms_block');
48
  return $value;
49
  } // end
50
 
51
+ public function getCustomerGroupsEnabled() {
52
+ $value = Mage::getStoreConfig('clearandfizzy_reducedcheckout_settings/reducedcheckout_customergroups/customergroups_enabled');
53
+ return $value;
54
+ } // end
55
+
56
  public function getShippingCustomerGroups() {
57
 
58
  if ($this->getCustomerGroupsEnabled() == 0) {
app/code/community/Clearandfizzy/Reducedcheckout/Model/Observer.php CHANGED
@@ -22,10 +22,17 @@ class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Obser
22
  // should we remove the login step..
23
  if (
24
  Mage::getSingleton('customer/session')->isLoggedIn() == false &&
25
- Mage::helper('clearandfizzy_reducedcheckout/data')->isGuestCheckoutOnly() == true) {
26
- $update->addHandle('clearandfizzy_checkout_reduced_forceguestonly');
27
  } // end
28
 
 
 
 
 
 
 
 
29
  // should we remove the payment method step..
30
  if (Mage::helper('clearandfizzy_reducedcheckout/data')->skipShippingMethod() == true) {
31
  $update->addHandle('clearandfizzy_checkout_reduced_skip_shippingmethod');
@@ -44,7 +51,7 @@ class Clearandfizzy_Reducedcheckout_Model_Observer extends Mage_Core_Model_Obser
44
 
45
  $update = $observer->getEvent()->getLayout()->getUpdate();
46
  $update->addHandle('clearandfizzy_checkout_reduced');
47
-
48
  // enable register on order success..
49
  // only change the handle
50
  if ( $this->_isValidGuest() && Mage::helper('clearandfizzy_reducedcheckout/data')->guestsCanRegisterOnOrderSuccess() == true) {
22
  // should we remove the login step..
23
  if (
24
  Mage::getSingleton('customer/session')->isLoggedIn() == false &&
25
+ Mage::helper('clearandfizzy_reducedcheckout/data')->isLoginStepGuestOnly() == true) {
26
+ $update->addHandle('clearandfizzy_checkout_reduced_forceguestonly');
27
  } // end
28
 
29
+ // should we remove the login step..
30
+ if (
31
+ Mage::getSingleton('customer/session')->isLoggedIn() == false &&
32
+ Mage::helper('clearandfizzy_reducedcheckout/data')->isLoginStepCustom() == true) {
33
+ $update->addHandle('clearandfizzy_checkout_reduced_login_custom');
34
+ } // end
35
+
36
  // should we remove the payment method step..
37
  if (Mage::helper('clearandfizzy_reducedcheckout/data')->skipShippingMethod() == true) {
38
  $update->addHandle('clearandfizzy_checkout_reduced_skip_shippingmethod');
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) {
app/code/community/Clearandfizzy/Reducedcheckout/Model/System/Config/Source/Login/Step.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class Clearandfizzy_Reducedcheckout_Model_System_Config_Source_Login_Step {
4
+
5
+
6
+ public function toOptionArray() {
7
+ return array ( "0" => "Default Magento",
8
+ "1" => "Skip [Force Guest Checkout]",
9
+ "2" => "Custom Login Step",
10
+ );
11
+
12
+ } // end
13
+
14
+ }
15
+
app/code/community/Clearandfizzy/Reducedcheckout/controllers/OnepageController.php CHANGED
@@ -31,7 +31,7 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
31
 
32
  private function getCheckoutMethod() {
33
 
34
- switch ( $this->_helper->isGuestCheckoutOnly() ) {
35
 
36
  case true:
37
  $method = "guest";
@@ -166,7 +166,7 @@ class Clearandfizzy_Reducedcheckout_OnepageController extends Mage_Checkout_Onep
166
 
167
  if ($this->getRequest()->isPost()) {
168
 
169
- if ( $this->_helper->isGuestCheckoutOnly() == true) {
170
  // set the checkout method
171
  $this->saveMethodAction();
172
  } // end if
31
 
32
  private function getCheckoutMethod() {
33
 
34
+ switch ( $this->_helper->isLoginStepGuestOnly() ) {
35
 
36
  case true:
37
  $method = "guest";
166
 
167
  if ($this->getRequest()->isPost()) {
168
 
169
+ if ( $this->_helper->isLoginStepGuestOnly() == true) {
170
  // set the checkout method
171
  $this->saveMethodAction();
172
  } // end if
app/code/community/Clearandfizzy/Reducedcheckout/etc/config.xml CHANGED
@@ -102,7 +102,7 @@
102
  <reducedcheckout>
103
  <isenabled>0</isenabled>
104
  <enable28112fix>0</enable28112fix>
105
- <guestcheckoutonly>0</guestcheckoutonly>
106
  <default_shipping>noskip</default_shipping>
107
  <default_payment>noskip</default_payment>
108
 
102
  <reducedcheckout>
103
  <isenabled>0</isenabled>
104
  <enable28112fix>0</enable28112fix>
105
+ <loginstep_type>0</loginstep_type>
106
  <default_shipping>noskip</default_shipping>
107
  <default_payment>noskip</default_payment>
108
 
app/code/community/Clearandfizzy/Reducedcheckout/etc/system.xml CHANGED
@@ -76,33 +76,22 @@
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>1</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
- <enable28112fix>
86
- <label>Enable Shipping Tablerates Bug #28112 fix</label>
87
- <frontend_type>select</frontend_type>
88
- <source_model>adminhtml/system_config_source_yesno</source_model>
89
- <comment>Enable fix for Magento bug #28112 Shipping tablerates</comment>
90
- <sort_order>1</sort_order>
91
- <show_in_default>1</show_in_default>
92
- <show_in_website>1</show_in_website>
93
- <show_in_store>1</show_in_store>
94
- </enable28112fix>
95
-
96
- <guestcheckoutonly>
97
- <label>Force guest checkout only</label>
98
  <frontend_type>select</frontend_type>
99
- <source_model>adminhtml/system_config_source_yesno</source_model>
100
- <comment>If guest checkout isn't forced the standard magento login/register step is displayed.</comment>
101
- <sort_order>1</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
- </guestcheckoutonly>
106
 
107
  <!-- todo: Gp - make this into a drop down menu -->
108
  <default_shipping>
@@ -110,7 +99,7 @@
110
  <frontend_type>select</frontend_type>
111
  <source_model>clearandfizzy_reducedcheckout/system_config_source_shipping_enabledMethods</source_model>
112
  <comment>The code for the default shipping method</comment>
113
- <sort_order>2</sort_order>
114
  <show_in_default>1</show_in_default>
115
  <show_in_website>1</show_in_website>
116
  <show_in_store>1</show_in_store>
@@ -122,56 +111,49 @@
122
  <frontend_type>select</frontend_type>
123
  <source_model>clearandfizzy_reducedcheckout/system_config_source_payment_enabledMethods</source_model>
124
  <comment>The code for the default payment method</comment>
125
- <sort_order>3</sort_order>
126
  <show_in_default>1</show_in_default>
127
  <show_in_website>1</show_in_website>
128
  <show_in_store>1</show_in_store>
129
  </default_payment>
 
 
 
 
 
 
 
 
 
 
 
130
 
131
-
132
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
133
  </fields>
134
  </reducedcheckout>
135
 
136
- <reducedcheckout_order_success>
137
- <label>Reduced Checkout Order Success page Settings </label>
138
- <sort_order>30</sort_order>
139
- <show_in_default>1</show_in_default>
140
- <show_in_website>1</show_in_website>
141
- <show_in_store>1</show_in_store>
142
- <expanded>1</expanded>
143
- <comment><![CDATA[ <ol>
144
-
145
- </ol> ]]></comment>
146
-
147
- <fields>
148
-
149
- <register_on_order_success>
150
- <label>Enable "Register now" Form on Order Success page</label>
151
- <frontend_type>select</frontend_type>
152
- <source_model>adminhtml/system_config_source_yesno</source_model>
153
- <comment>Displays a form encouraging guest users to register</comment>
154
- <sort_order>4</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
- </register_on_order_success>
159
-
160
- <register_on_order_success_cms_block>
161
- <label>CMS Static Block</label>
162
- <frontend_type>select</frontend_type>
163
- <source_model>clearandfizzy_reducedcheckout/system_config_source_cms_block</source_model>
164
- <comment></comment>
165
- <depends><register_on_order_success>1</register_on_order_success></depends>
166
- <sort_order>5</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
- </register_on_order_success_cms_block>
171
- </fields>
172
-
173
- </reducedcheckout_order_success>
174
-
175
  <reducedcheckout_customergroups>
176
  <label>Reduced Checkout Customer Group Settings </label>
177
  <sort_order>40</sort_order>
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>Select the look of of the login step of the checkout process</comment>
90
+ <sort_order>20</sort_order>
91
  <show_in_default>1</show_in_default>
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>
99
  <frontend_type>select</frontend_type>
100
  <source_model>clearandfizzy_reducedcheckout/system_config_source_shipping_enabledMethods</source_model>
101
  <comment>The code for the default shipping method</comment>
102
+ <sort_order>30</sort_order>
103
  <show_in_default>1</show_in_default>
104
  <show_in_website>1</show_in_website>
105
  <show_in_store>1</show_in_store>
111
  <frontend_type>select</frontend_type>
112
  <source_model>clearandfizzy_reducedcheckout/system_config_source_payment_enabledMethods</source_model>
113
  <comment>The code for the default payment method</comment>
114
+ <sort_order>40</sort_order>
115
  <show_in_default>1</show_in_default>
116
  <show_in_website>1</show_in_website>
117
  <show_in_store>1</show_in_store>
118
  </default_payment>
119
+
120
+ <register_on_order_success>
121
+ <label>Enable "Register now" Form on Order Success page</label>
122
+ <frontend_type>select</frontend_type>
123
+ <source_model>adminhtml/system_config_source_yesno</source_model>
124
+ <comment>Displays a form encouraging guest users to register</comment>
125
+ <sort_order>50</sort_order>
126
+ <show_in_default>1</show_in_default>
127
+ <show_in_website>1</show_in_website>
128
+ <show_in_store>1</show_in_store>
129
+ </register_on_order_success>
130
 
131
+ <register_on_order_success_cms_block>
132
+ <label>CMS Static Block</label>
133
+ <frontend_type>select</frontend_type>
134
+ <source_model>clearandfizzy_reducedcheckout/system_config_source_cms_block</source_model>
135
+ <comment></comment>
136
+ <depends><register_on_order_success>1</register_on_order_success></depends>
137
+ <sort_order>60</sort_order>
138
+ <show_in_default>1</show_in_default>
139
+ <show_in_website>1</show_in_website>
140
+ <show_in_store>1</show_in_store>
141
+ </register_on_order_success_cms_block>
142
+
143
+ <enable28112fix>
144
+ <label>Enable Shipping Tablerates Bug #28112 fix</label>
145
+ <frontend_type>select</frontend_type>
146
+ <source_model>adminhtml/system_config_source_yesno</source_model>
147
+ <comment>Enable fix for Magento bug #28112 Shipping tablerates</comment>
148
+ <sort_order>70</sort_order>
149
+ <show_in_default>1</show_in_default>
150
+ <show_in_website>1</show_in_website>
151
+ <show_in_store>1</show_in_store>
152
+ </enable28112fix>
153
+
154
  </fields>
155
  </reducedcheckout>
156
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
157
  <reducedcheckout_customergroups>
158
  <label>Reduced Checkout Customer Group Settings </label>
159
  <sort_order>40</sort_order>
app/design/frontend/base/default/layout/clearandfizzy/reducedcheckout/reducedcheckout.xml CHANGED
@@ -6,6 +6,13 @@
6
  <block type="checkout/onepage" name="checkout.onepage.reduced.setup" template="clearandfizzy/reducedcheckout/onepage.phtml" />
7
  </reference>
8
  </clearandfizzy_checkout_reduced>
 
 
 
 
 
 
 
9
 
10
  <clearandfizzy_checkout_reduced_forceguestonly>
11
 
6
  <block type="checkout/onepage" name="checkout.onepage.reduced.setup" template="clearandfizzy/reducedcheckout/onepage.phtml" />
7
  </reference>
8
  </clearandfizzy_checkout_reduced>
9
+
10
+ <clearandfizzy_checkout_reduced_login_custom>
11
+ <reference name="checkout.onepage.login">
12
+ <action method="setTemplate"><template>clearandfizzy/reducedcheckout/onepage/login.phtml</template> </action>
13
+ </reference>
14
+ </clearandfizzy_checkout_reduced_login_custom>
15
+
16
 
17
  <clearandfizzy_checkout_reduced_forceguestonly>
18
 
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage.phtml CHANGED
@@ -27,7 +27,7 @@
27
  <?php
28
  // this is to enable forced guest checkout
29
  if (Mage::getSingleton('customer/session')->isLoggedIn() == false &&
30
- $this->helper('clearandfizzy_reducedcheckout/data')->isGuestCheckoutOnly() == true
31
  ) {
32
  ?>
33
  Element.hide('register-customer-password');
27
  <?php
28
  // this is to enable forced guest checkout
29
  if (Mage::getSingleton('customer/session')->isLoggedIn() == false &&
30
+ $this->helper('clearandfizzy_reducedcheckout/data')->isLoginStepGuestOnly() == true
31
  ) {
32
  ?>
33
  Element.hide('register-customer-password');
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage/login.phtml ADDED
@@ -0,0 +1,126 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+
4
+ * @category design
5
+ * @package base_default
6
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
7
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
8
+ */
9
+ ?>
10
+ <?php
11
+ ?>
12
+ <div id="clearandfizzy_reducedcheckout_login" class="">
13
+ <?php echo $this->getChildHtml('login_before')?>
14
+ <div class="">
15
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
16
+ <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
17
+
18
+ <div class="">
19
+
20
+ <ul class="form-list">
21
+ <li class="fields">
22
+ <h2><?php echo $this->__('My Email Address');?></h2>
23
+ <div class="">
24
+ <div class="input-box">
25
+ <input type="text" name="login[username]" class="input-text required-entry validate-email" id="login-email" title="Email" value="" />
26
+ </div>
27
+ </div>
28
+ </li>
29
+ <li class="fields">&nbsp;</li>
30
+ <li class="fields">
31
+ <h2 class=""><?php echo $this->__('Are you already a customer?') ?></h2>
32
+ </li>
33
+ <li class="fields">
34
+ <ul class="form-list">
35
+ <li class="control">
36
+ <input type="radio" name="checkout_method" id="login:guest" value="guest" class="radio" /><label for="login:guest"><?php echo $this->__("No, I'm a new customer") ?></label>
37
+ </li>
38
+ <li class="control">
39
+ <div>
40
+ <input type="radio" name="checkout_method" id="login:login" value="login" class="radio" checked="checked" /><label for="login:login"><?php echo $this->__('Yes, and my password is') ?></label>
41
+ <div class="">
42
+ <div class="input-box">
43
+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="login-password" title="Password" value="" />
44
+ <input name="context" type="hidden" value="checkout" />
45
+ </div>
46
+ </div>
47
+ </li>
48
+ </ul>
49
+ </li>
50
+
51
+ <li class="fields">
52
+ <div class="">
53
+ <button id="submit" type="submit" title="Continue" class="button"><span><span>Continue</span></span></button>
54
+ </div>
55
+ </li>
56
+ </ul>
57
+ </div>
58
+ </form>
59
+ </div>
60
+ </div>
61
+
62
+ <script type="text/javascript">
63
+ //<![CDATA[
64
+ var loginForm = new VarienForm('login-form', true);
65
+
66
+ $('login-password').observe('keypress', bindLoginPost);
67
+ $('submit').observe('click', submitCheckout);
68
+
69
+ function bindLoginPost(evt){
70
+ if (evt.keyCode == Event.KEY_RETURN) {
71
+ loginForm.submit();
72
+ }
73
+ }
74
+ function submitLoginCheckout()
75
+ {
76
+ if(loginForm.validator && loginForm.validator.validate()){
77
+ //$('submit').disabled = true;
78
+
79
+ $('login-form').submit();
80
+ }
81
+ }
82
+
83
+ $('login\:guest').observe('click', bindRadioClick);
84
+ $('login\:login').observe('click', bindRadioClick);
85
+
86
+ function bindRadioClick(e) {
87
+
88
+ switch (this.identify()) {
89
+
90
+ case "login:guest":
91
+ $('login-password').value = '';
92
+ $('login-password').addClassName('disabled');
93
+ $('login-password').removeClassName('required-entry');
94
+ $('login-password').removeClassName('validate-password');
95
+ $('login-password').disable();
96
+ break;
97
+
98
+ case "login:login":
99
+ $('login-password').removeClassName('disabled');
100
+ $('login-password').addClassName('required-entry');
101
+ $('login-password').addClassName('validate-password');
102
+ $('login-password').enable();
103
+ break;
104
+
105
+ } // end switch
106
+
107
+ } // end function
108
+
109
+ function submitCheckout(e) {
110
+
111
+ if ( $('login\:guest').checked == true ) {
112
+ submitGuestCheckout(e);
113
+ } else {
114
+ submitLoginCheckout();
115
+ }
116
+ } // end
117
+
118
+ function submitGuestCheckout(e) {
119
+ $('billing:email').value = $('login-email').value;
120
+ checkout.setMethod();
121
+ Event.stop(e);
122
+ } // end fun
123
+
124
+
125
+ //]]>
126
+ </script>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Clearandfizzy_Reducedcheckout</name>
4
- <version>1.5.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>
@@ -21,18 +21,17 @@ Also&#xD;
21
  Yes&lt;br /&gt;&#xD;
22
  &lt;br /&gt;&#xD;
23
  Did you fix a bunch of Bugs?&lt;br /&gt;&#xD;
24
- Yes&lt;br /&gt;&#xD;
25
  &lt;br /&gt;&#xD;
26
  Well then, what in funkytown did you do?&lt;br /&gt;&#xD;
27
- Added a fix for logged in users when forceguest checkout was enabled.&lt;br /&gt;&lt;br /&gt;&#xD;
28
- You can now enable a Registration form on the order success page to convert those guest checkout people.&lt;br /&gt;&#xD;
29
  &lt;br /&gt;&#xD;
30
  &#xD;
31
  </notes>
32
  <authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
33
- <date>2013-09-16</date>
34
- <time>23:23:28</time>
35
- <contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="Reducedcheckout"><dir name="Helper"><file name="Data.php" hash="3d2c90f0621f5eaf5f83d4b2907bef1b"/><file name="Order.php" hash="7767797ecc49d77744772711edc34309"/></dir><dir name="Model"><file name="Observer.php" hash="2c060b32f5fd0be45e936d83e6f410f1"/><dir name="Resource"><dir name="Carrier"><file name="TablerateFix.php" hash="0a8685c145d95ae76b838d2af2b88638"/></dir><file name="Setup.php" hash="c662c93dc0cd9a1dc40b39ccd07a155d"/></dir><dir name="Signup"><file name="Observer.php" hash="dae40c461569f1d47032fa7490aea1e3"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Cms"><file name="Block.php" hash="c81fc3cf02fe8eed1685c2db80c84198"/></dir><dir name="Payment"><file name="EnabledMethods.php" hash="f6b69e6fc6697870c53c6c86dbd68e98"/></dir><dir name="Shipping"><file name="EnabledMethods.php" hash="5cf16d02a105f9699e4258bb5bc57364"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="OnepageController.php" hash="8d8d7ee733035d27a202cbd277041267"/><file name="SignupController.php" hash="aa5a86065a4722d069627635188b72e4"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0bb1372118e88ad09fbd1b1d5113dea7"/><file name="config.xml" hash="203e5ad70b071a364d66a2dcda175ae6"/><file name="system.xml" hash="aaf0aa503322d55543ba741d07fa759b"/></dir><dir name="sql"><dir name="reducedcheckout_setup"><file name="install-1.5.1.php" hash="c938aa01bcb1c36461fb9f3e2145ec03"/></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="7613031b17573e99fda0cdc79437d9f7"/></dir></dir></dir><dir name="template"><dir name="clearandfizzy"><dir name="reducedcheckout"><file name="onepage.phtml" hash="df2ff5c95137c2260b0f718790a67cff"/><dir name="success"><dir name="wrapper"><file name="signup.phtml" hash="e9268dd4f9857a78a50ccbab3a084cb0"/></dir><file name="wrapper.phtml" hash="5adda37a860234711644153b757ad53e"/></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="4a00abdcb804c0c08efec311acc320cb"/></dir></dir></dir></dir></dir></dir></target></contents>
36
  <compatible/>
37
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
38
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Clearandfizzy_Reducedcheckout</name>
4
+ <version>1.6.0</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>
21
  Yes&lt;br /&gt;&#xD;
22
  &lt;br /&gt;&#xD;
23
  Did you fix a bunch of Bugs?&lt;br /&gt;&#xD;
24
+ No&lt;br /&gt;&#xD;
25
  &lt;br /&gt;&#xD;
26
  Well then, what in funkytown did you do?&lt;br /&gt;&#xD;
27
+ There is now the option to replace the default Magento login step with a radically different, more user intuitive form. &#xD;
 
28
  &lt;br /&gt;&#xD;
29
  &#xD;
30
  </notes>
31
  <authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
32
+ <date>2013-09-28</date>
33
+ <time>21:21:07</time>
34
+ <contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="Reducedcheckout"><dir name="Helper"><file name="Data.php" hash="34d948c219dc1c8b5dd5b882d7efbf71"/><file name="Order.php" hash="7767797ecc49d77744772711edc34309"/></dir><dir name="Model"><file name="Observer.php" hash="07cd9fa66f128536dade1cb3cc609a52"/><dir name="Resource"><dir name="Carrier"><file name="TablerateFix.php" hash="0a8685c145d95ae76b838d2af2b88638"/></dir><file name="Setup.php" hash="c662c93dc0cd9a1dc40b39ccd07a155d"/></dir><dir name="Signup"><file name="Observer.php" hash="dae40c461569f1d47032fa7490aea1e3"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Cms"><file name="Block.php" hash="c81fc3cf02fe8eed1685c2db80c84198"/></dir><dir name="Login"><file name="Step.php" hash="2b8c0e914162df6b00ac01266e483344"/></dir><dir name="Payment"><file name="EnabledMethods.php" hash="f6b69e6fc6697870c53c6c86dbd68e98"/></dir><dir name="Shipping"><file name="EnabledMethods.php" hash="5cf16d02a105f9699e4258bb5bc57364"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="OnepageController.php" hash="76e4dc6d958c6dc88faad67ef7cb9804"/><file name="SignupController.php" hash="aa5a86065a4722d069627635188b72e4"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0bb1372118e88ad09fbd1b1d5113dea7"/><file name="config.xml" hash="27d6073c2573d94e1fed784cbfce25b1"/><file name="system.xml" hash="4b5255c38793bfd5541b5fe1de199cd4"/></dir><dir name="sql"><dir name="reducedcheckout_setup"><file name="install-1.5.1.php" hash="c938aa01bcb1c36461fb9f3e2145ec03"/></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="b2b9db7b2a92638cd790ef6af03c4b7b"/></dir></dir></dir><dir name="template"><dir name="clearandfizzy"><dir name="reducedcheckout"><dir name="onepage"><file name="login.phtml" hash="7a38ba2f1934d247dd560f7c143fb14c"/></dir><file name="onepage.phtml" hash="b2ebadc621ffec653b9ab501509b723f"/><dir name="success"><dir name="wrapper"><file name="signup.phtml" hash="e9268dd4f9857a78a50ccbab3a084cb0"/></dir><file name="wrapper.phtml" hash="5adda37a860234711644153b757ad53e"/></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></contents>
35
  <compatible/>
36
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
37
  </package>
skin/frontend/base/default/css/clearandfizzy/reducedcheckout.css CHANGED
@@ -16,3 +16,7 @@ margin: 1em 0 0;
16
  padding: 8px 0 0;
17
  }
18
 
 
 
 
 
16
  padding: 8px 0 0;
17
  }
18
 
19
+ #clearandfizzy_reducedcheckout_login .form-list input.input-text {
20
+ margin-left: 25px;
21
+ }
22
+