Version Notes
Did we add new features?
No
Did you fix a bunch of Bugs?
Yes
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.
Download this release
Release Info
Developer | Gareth Price |
Extension | Clearandfizzy_Reducedcheckout |
Version | 1.7.1 |
Comparing to | |
See all releases |
Code changes from version 1.7.0 to 1.7.1
app/code/community/Clearandfizzy/Reducedcheckout/Helper/Url.php
ADDED
@@ -0,0 +1,81 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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_Helper_Url extends Mage_Core_Helper_Abstract {
|
33 |
+
|
34 |
+
protected $is_secure;
|
35 |
+
|
36 |
+
public function _construct() {
|
37 |
+
parent::_construct();
|
38 |
+
$this->is_secure = Mage::app()->getStore()->isCurrentlySecure();
|
39 |
+
} // end
|
40 |
+
|
41 |
+
|
42 |
+
/**
|
43 |
+
*
|
44 |
+
*/
|
45 |
+
public function getProgressUrl() {
|
46 |
+
return Mage::getUrl('reducedcheckout/onepage/progress', array("_secure" => $this->is_secure));
|
47 |
+
} // end
|
48 |
+
|
49 |
+
public function getReviewUrl() {
|
50 |
+
return Mage::getUrl('reducedcheckout/onepage/review', array("_secure" => $this->is_secure));
|
51 |
+
} // end
|
52 |
+
|
53 |
+
public function getSaveMethodUrl() {
|
54 |
+
return Mage::getUrl('reducedcheckout/onepage/saveMethod', array("_secure" => $this->is_secure));
|
55 |
+
}
|
56 |
+
|
57 |
+
public function getFailureUrl() {
|
58 |
+
return Mage::getUrl('checkout/cart', array("_secure" => $this->is_secure));
|
59 |
+
}
|
60 |
+
|
61 |
+
public function getAddressUrl() {
|
62 |
+
return Mage::getUrl('reducedcheckout/onepage/getAddress', array("_secure" => $this->is_secure));
|
63 |
+
} // end
|
64 |
+
|
65 |
+
public function getSaveBillingUrl() {
|
66 |
+
return Mage::getUrl('reducedcheckout/onepage/saveBilling', array("_secure" => $this->is_secure));
|
67 |
+
} // end
|
68 |
+
|
69 |
+
public function getSaveShippingUrl() {
|
70 |
+
return Mage::getUrl('reducedcheckout/onepage/saveShipping', array("_secure" => $this->is_secure));
|
71 |
+
}
|
72 |
+
|
73 |
+
public function getSaveShippingMethod() {
|
74 |
+
return Mage::getUrl('reducedcheckout/onepage/saveShippingMethod', array("_secure" => $this->is_secure));
|
75 |
+
}
|
76 |
+
|
77 |
+
public function getSavePaymentUrl() {
|
78 |
+
return Mage::getUrl('reducedcheckout/onepage/savePayment', array("_secure" => $this->is_secure));
|
79 |
+
}
|
80 |
+
|
81 |
+
} // end class
|
app/design/frontend/base/default/template/clearandfizzy/reducedcheckout/onepage.phtml
CHANGED
@@ -50,17 +50,23 @@
|
|
50 |
|
51 |
<script type="text/javascript">
|
52 |
//<![CDATA[
|
53 |
-
|
54 |
-
|
55 |
-
|
56 |
-
|
57 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
58 |
);
|
59 |
|
60 |
-
var billing = new Billing('co-billing-form', '<?php echo $
|
61 |
-
var shipping = new Shipping('co-shipping-form', '<?php echo $
|
62 |
-
var shippingMethod = new ShippingMethod('co-shipping-method-form', "<?php echo $this->getUrl('reducedcheckout/onepage/saveShippingMethod') ?>");
|
63 |
-
var payment = new Payment('co-payment-form', '<?php echo $
|
64 |
|
65 |
<?php
|
66 |
// this is to enable forced guest checkout
|
50 |
|
51 |
<script type="text/javascript">
|
52 |
//<![CDATA[
|
53 |
+
|
54 |
+
<?php // get an instance of the URL helper class
|
55 |
+
$url_helper = $this->helper('clearandfizzy_reducedcheckout/url');
|
56 |
+
?>
|
57 |
+
|
58 |
+
|
59 |
+
var checkout = new Checkout(accordion,{
|
60 |
+
progress: '<?php echo $url_helper->getProgressUrl(); ?>',
|
61 |
+
review: '<?php echo $url_helper->getReviewUrl(); ?>',
|
62 |
+
saveMethod: '<?php echo $url_helper->getSaveMethodUrl(); ?>',
|
63 |
+
failure: '<?php echo $url_helper->getFailureUrl(); ?>'}
|
64 |
);
|
65 |
|
66 |
+
var billing = new Billing('co-billing-form', '<?php echo $url_helper->getAddressUrl(); ?>address/', '<?php echo $url_helper->getSaveBillingUrl(); ?>');
|
67 |
+
var shipping = new Shipping('co-shipping-form', '<?php echo $url_helper->getAddressUrl(); ?>address/', '<?php echo $url_helper->getSaveShippingUrl(); ?>','<?php echo $url_helper->getSaveShippingMethod(); ?>');
|
68 |
+
var shippingMethod = new ShippingMethod('co-shipping-method-form', "<?php echo $this->getUrl('reducedcheckout/onepage/saveShippingMethod', array("_secure"=>true)) ?>");
|
69 |
+
var payment = new Payment('co-payment-form', '<?php echo $url_helper->getSavePaymentUrl(); ?>');
|
70 |
|
71 |
<?php
|
72 |
// this is to enable forced guest checkout
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Clearandfizzy_Reducedcheckout</name>
|
4 |
-
<version>1.7.
|
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,21 +17,18 @@ Also
|
|
17 |
* Contains a fix for Magento bug #28112 with regards to Shipping Tablerates.
|
18 |
</description>
|
19 |
<notes>Did we add new features?<br />
|
20 |
-
|
21 |
<br />
|
22 |
Did you fix a bunch of Bugs?<br />
|
23 |
-
|
24 |
<br />
|
25 |
-
|
26 |
<br/><br/>
|
27 |
-
|
28 |
-
* Amazon style Logins.<br/>
|
29 |
-
* Success page guest to customer create account form.<br/>
|
30 |
-
* Customer Groups.<br/></notes>
|
31 |
<authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
|
32 |
-
<date>2014-
|
33 |
-
<time>
|
34 |
-
<contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="Reducedcheckout"><dir name="Helper"><file name="Data.php" hash="360bcfcda7ab1d8a480cff94a2fc2f38"/><file name="Order.php" hash="e1610d6ea46019208c191e19a84bf757"/></dir><dir name="Model"><file name="Observer.php" hash="a9660f900cc765f09f8ef88acc54ac91"/><dir name="Resource"><dir name="Carrier"><file name="TablerateFix.php" hash="0147e5bbe44453db8d41b6cb874a4300"/></dir><file name="Setup.php" hash="c0fea228b595d0c53e2b130d4d9a4630"/></dir><dir name="Signup"><file name="Observer.php" hash="0597c69154bd1782c8c2de2226773cca"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="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="
|
35 |
<compatible/>
|
36 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
37 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Clearandfizzy_Reducedcheckout</name>
|
4 |
+
<version>1.7.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.
|
18 |
</description>
|
19 |
<notes>Did we add new features?<br />
|
20 |
+
No<br />
|
21 |
<br />
|
22 |
Did you fix a bunch of Bugs?<br />
|
23 |
+
Yes<br />
|
24 |
<br />
|
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.
|
26 |
<br/><br/>
|
27 |
+
</notes>
|
|
|
|
|
|
|
28 |
<authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
|
29 |
+
<date>2014-06-03</date>
|
30 |
+
<time>11:26:24</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="f9c99ac64a6063ae47ec9caadea25adb"/></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>
|