Version Notes
- Refactored javascript.
- Fixed minor bugs with region field.
- Refactored PHP code, implemented new model which handles all session's changes.
- Implemented ability to specify default shipping method.
- Implemented ability to specify default payment method.
- Added possibility to specify which sections should be updated when shipping/payment method is changed
Version 1.2.4 released
2013/03/31
Version number: 1.2.4
Stability: stable
Compatibility: 1.5, 1.6, 1.6.0.0, 1.6.1, 1.6.2.0, 1.7
Download this release
Release Info
Developer | Sergiy Stotskiy |
Extension | FI_Checkout |
Version | 1.2.4 |
Comparing to | |
See all releases |
Code changes from version 1.2.3 to 1.2.4
app/code/community/FI/Checkout/Block/Block/Info.php
CHANGED
@@ -272,4 +272,9 @@ class FI_Checkout_Block_Block_Info extends Mage_Checkout_Block_Onepage_Abstract
|
|
272 |
|
273 |
return $select;
|
274 |
}
|
|
|
|
|
|
|
|
|
|
|
275 |
}
|
272 |
|
273 |
return $select;
|
274 |
}
|
275 |
+
|
276 |
+
public function getSecureUrl($path)
|
277 |
+
{
|
278 |
+
return $this->getUrl($path, array('_secure' => true));
|
279 |
+
}
|
280 |
}
|
app/code/community/FI/Checkout/Helper/Data.php
CHANGED
@@ -478,4 +478,12 @@ class FI_Checkout_Helper_Data extends Mage_Core_Helper_Abstract
|
|
478 |
}
|
479 |
return $methods;
|
480 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
481 |
}
|
478 |
}
|
479 |
return $methods;
|
480 |
}
|
481 |
+
|
482 |
+
public function getUpdateUrl() {
|
483 |
+
return $this->_getUrl('fi_order/checkout/update', array('_secure' => true));
|
484 |
+
}
|
485 |
+
|
486 |
+
public function getPlaceUrl() {
|
487 |
+
return $this->_getUrl('fi_order/checkout/place', array('_secure' => true));
|
488 |
+
}
|
489 |
}
|
app/design/frontend/default/default/template/freaks/checkout/block/info.phtml
CHANGED
@@ -3,7 +3,7 @@ $isLoggedIn = $this->getFilled() && $this->isCustomerLoggedIn();
|
|
3 |
$prefix = $isLoggedIn ? 'logged' : 'new';
|
4 |
$isLocationAsOneField = $this->helper('fi_checkout')->isLocationAsOneField();
|
5 |
?>
|
6 |
-
<form id="<?php echo $isLoggedIn ? 'registered-user-form' : 'new-user-form' ?>" action="<?php echo $this->
|
7 |
<div class="col2-set">
|
8 |
<div class="col-1 user-general">
|
9 |
<p class="required">* <?php echo $this->__('Required Fields') ?></p>
|
@@ -35,7 +35,7 @@ $isLocationAsOneField = $this->helper('fi_checkout')->isLocationAsOneField();
|
|
35 |
<div class="col-2">
|
36 |
<?php if (!$this->getQuote()->getIsVirtual()): ?>
|
37 |
<label class="tab-title"><?php echo $this->__('Shipping Methods') ?>*</label>
|
38 |
-
<div id="shipping-method-load" class="shipping-methods" data-action="<?php echo $this->
|
39 |
<?php echo $this->getChildHtml('available_shipping_methods') ?>
|
40 |
</div>
|
41 |
<div id="shipping-method-additional-load">
|
@@ -56,7 +56,7 @@ $isLocationAsOneField = $this->helper('fi_checkout')->isLocationAsOneField();
|
|
56 |
<input type="text" name="user[address][postcode]" class="input-text postcode w-30" value="<?php echo $this->htmlEscape($this->getCustomerZip()) ?>" />
|
57 |
<p class="help"><?php echo $this->helper('checkout')->__('Zip/Post') ?></p>
|
58 |
</div>
|
59 |
-
<div class="f-left no-mr" data-action="<?php echo $this->
|
60 |
<input id="<?php echo $prefix ?>_user_location" type="text" class="input-select input-text required-entry" name="user[address][location]" value="<?php echo $this->htmlEscape($this->getCustomerLocation()) ?>" />
|
61 |
<a href="#" class="select-tip" tabindex="-1"></a>
|
62 |
<div id="<?php echo $prefix ?>_user_loc_update" class="autocomplete"></div>
|
@@ -65,7 +65,7 @@ $isLocationAsOneField = $this->helper('fi_checkout')->isLocationAsOneField();
|
|
65 |
<?php else: ?>
|
66 |
<div class="f-left loc-diff-fields">
|
67 |
<?php if (!$this->helper('fi_checkout')->useOnlyDefaultCountry()): ?>
|
68 |
-
<div class="f-left" data-action="<?php echo $this->
|
69 |
<?php echo $this->getCountryBlock()->setName('user[address][country_id]')->getHtml() ?>
|
70 |
<p class="help"><?php echo $this->helper('checkout')->__('Country') ?>*</p>
|
71 |
</div>
|
3 |
$prefix = $isLoggedIn ? 'logged' : 'new';
|
4 |
$isLocationAsOneField = $this->helper('fi_checkout')->isLocationAsOneField();
|
5 |
?>
|
6 |
+
<form id="<?php echo $isLoggedIn ? 'registered-user-form' : 'new-user-form' ?>" action="<?php echo $this->helper('fi_checkout')->getPlaceUrl() ?>" method="post" name="user_info">
|
7 |
<div class="col2-set">
|
8 |
<div class="col-1 user-general">
|
9 |
<p class="required">* <?php echo $this->__('Required Fields') ?></p>
|
35 |
<div class="col-2">
|
36 |
<?php if (!$this->getQuote()->getIsVirtual()): ?>
|
37 |
<label class="tab-title"><?php echo $this->__('Shipping Methods') ?>*</label>
|
38 |
+
<div id="shipping-method-load" class="shipping-methods" data-action="<?php echo $this->helper('fi_checkout')->getUpdateUrl() ?>" data-update-sections="<?php echo $this->helper('fi_checkout')->shippingDependentSections() ?>">
|
39 |
<?php echo $this->getChildHtml('available_shipping_methods') ?>
|
40 |
</div>
|
41 |
<div id="shipping-method-additional-load">
|
56 |
<input type="text" name="user[address][postcode]" class="input-text postcode w-30" value="<?php echo $this->htmlEscape($this->getCustomerZip()) ?>" />
|
57 |
<p class="help"><?php echo $this->helper('checkout')->__('Zip/Post') ?></p>
|
58 |
</div>
|
59 |
+
<div class="f-left no-mr" data-action="<?php echo $this->getSecureUrl('fi_order/checkout/locationAutocomplete') ?>">
|
60 |
<input id="<?php echo $prefix ?>_user_location" type="text" class="input-select input-text required-entry" name="user[address][location]" value="<?php echo $this->htmlEscape($this->getCustomerLocation()) ?>" />
|
61 |
<a href="#" class="select-tip" tabindex="-1"></a>
|
62 |
<div id="<?php echo $prefix ?>_user_loc_update" class="autocomplete"></div>
|
65 |
<?php else: ?>
|
66 |
<div class="f-left loc-diff-fields">
|
67 |
<?php if (!$this->helper('fi_checkout')->useOnlyDefaultCountry()): ?>
|
68 |
+
<div class="f-left" data-action="<?php echo $this->getSecureUrl('fi_order/checkout/regions')?>">
|
69 |
<?php echo $this->getCountryBlock()->setName('user[address][country_id]')->getHtml() ?>
|
70 |
<p class="help"><?php echo $this->helper('checkout')->__('Country') ?>*</p>
|
71 |
</div>
|
app/design/frontend/default/default/template/freaks/checkout/payment.phtml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<div id="payment-methods" class="discount">
|
2 |
<h2><?php echo $this->__('Choose Payment Method') ?>*</h2>
|
3 |
<div>
|
4 |
-
<div id="payment-form" data-action="<?php echo $this->
|
5 |
<?php echo $this->getChildHtml('methods') ?>
|
6 |
</div>
|
7 |
</div>
|
1 |
<div id="payment-methods" class="discount">
|
2 |
<h2><?php echo $this->__('Choose Payment Method') ?>*</h2>
|
3 |
<div>
|
4 |
+
<div id="payment-form" data-action="<?php echo $this->helper('fi_checkout')->getUpdateUrl() ?>" data-update-sections="<?php echo $this->helper('fi_checkout')->paymentDependentSections() ?>">
|
5 |
<?php echo $this->getChildHtml('methods') ?>
|
6 |
</div>
|
7 |
</div>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FI_Checkout</name>
|
4 |
-
<version>1.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/MIT">MIT License</license>
|
7 |
<channel>community</channel>
|
@@ -15,15 +15,15 @@
|
|
15 |
- Implemented ability to specify default payment method.
|
16 |
- Added possibility to specify which sections should be updated when shipping/payment method is changed
|
17 |

|
18 |
-
Version 1.2.
|
19 |
2013/03/31
|
20 |
-
Version number: 1.2.
|
21 |
Stability: stable
|
22 |
Compatibility: 1.5, 1.6, 1.6.0.0, 1.6.1, 1.6.2.0, 1.7</notes>
|
23 |
<authors><author><name>Sergiy Stotskiy</name><user>sergiy_stotskiy</user><email>sergiy.stotskiy@freaksidea.com</email></author></authors>
|
24 |
-
<date>2013-04-
|
25 |
-
<time>
|
26 |
-
<contents><target name="magecommunity"><dir name="FI"><dir name="Checkout"><dir name="Block"><dir name="Block"><file name="Info.php" hash="
|
27 |
<compatible/>
|
28 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
29 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FI_Checkout</name>
|
4 |
+
<version>1.2.4</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/MIT">MIT License</license>
|
7 |
<channel>community</channel>
|
15 |
- Implemented ability to specify default payment method.
|
16 |
- Added possibility to specify which sections should be updated when shipping/payment method is changed
|
17 |

|
18 |
+
Version 1.2.4 released
|
19 |
2013/03/31
|
20 |
+
Version number: 1.2.4
|
21 |
Stability: stable
|
22 |
Compatibility: 1.5, 1.6, 1.6.0.0, 1.6.1, 1.6.2.0, 1.7</notes>
|
23 |
<authors><author><name>Sergiy Stotskiy</name><user>sergiy_stotskiy</user><email>sergiy.stotskiy@freaksidea.com</email></author></authors>
|
24 |
+
<date>2013-04-05</date>
|
25 |
+
<time>19:21:50</time>
|
26 |
+
<contents><target name="magecommunity"><dir name="FI"><dir name="Checkout"><dir name="Block"><dir name="Block"><file name="Info.php" hash="1fd221f5b1c6e0314532b06ebe3e937f"/></dir><file name="Block.php" hash="e96feb1510b4bdc5ba4513e7f98490cf"/><file name="Newsletter.php" hash="19d5938be8caac3eb661fb1f45af66f3"/><dir name="Payment"><file name="Methods.php" hash="c42b6ba6678ab68312fba904cc01e2c1"/></dir></dir><dir name="Helper"><file name="Data.php" hash="91c55a29e2d69c6e5759a50cf474b5be"/></dir><dir name="Model"><file name="Observer.php" hash="e8e5db2033b58b953bf1ad456022fb12"/><file name="Order.php" hash="c11f5e4d2402f1d910ee869fb4e2274c"/><file name="Page.php" hash="2d8eb0a98862271c6d4f654ccf639a50"/><dir name="Resource"><file name="Countries.php" hash="0913ec95198690e5cb81ec8fe4208307"/></dir><dir name="Source"><file name="PaymentMethods.php" hash="151bcf53d0a59172f8a72299133b4555"/><file name="ShippingMethods.php" hash="c682744b99466d3046b53a8d5a63e965"/></dir><file name="Source.php" hash="d68bc03d7e145b866ece607042cb5a35"/><file name="Subscriber.php" hash="e0d4206673e616a136322537264f03cf"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="2281102415ca74f1d8a033b676a67f1f"/></dir><dir name="etc"><file name="config.xml" hash="baa0ff5e90bf38822e235806ff2985d2"/><file name="system.xml" hash="328d2c8415444ff7f989ba2e62267f67"/></dir><dir name="sql"><dir name="fi_checkout_setup"><file name="mysql4-install-1.0.0.php" hash="1f0f6b7d41cff2569cde4c724f2909b4"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><dir name="freaks"><file name="checkout.xml" hash="3b565b258eae1f7dda4d80d9ee281642"/></dir></dir><dir name="template"><dir name="freaks"><file name="autocomplete.phtml" hash="bce316a1d37a91ed952bdb3fb87998bc"/><dir name="checkout"><file name="agreements.phtml" hash="72495b7d2cf6632a9ac9d266d045a3d8"/><dir name="block"><file name="info.phtml" hash="a46d74f99de1b2db5673bd89be446b3a"/></dir><file name="block.phtml" hash="1c172112b2272a41a6ffce4985c791d0"/><dir name="centinel"><file name="authentication.phtml" hash="fe87fdc373fe0cdbcc25141f5e2696c7"/><file name="complete.phtml" hash="83f6e30a7445f8b8b8c343e9fa02b983"/></dir><file name="coupon.phtml" hash="b70b6766d72d16c2357f29453a386b98"/><file name="link.phtml" hash="e12f971b4ab1cb43bb252bada257f2af"/><file name="newsletter.phtml" hash="ecd6f19fcf11b41bedcf18cf0cdbee44"/><file name="payment.phtml" hash="df9c32da22ab3994433a757f8b164b4c"/><file name="payment_methods.phtml" hash="422e71395d2e99ffa74dd9649046a28b"/><dir name="shipping"><file name="available.phtml" hash="d48bc2c689d7e5b3fa68bcbaddfae4b4"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FI_Checkout.xml" hash="0843e490529db978b5c4a16aa9b820d9"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="js"><file name="freaks_checkout.js" hash="a3c8a7959958dc3f811a09f62f3ccc2c"/></dir><dir name="css"><file name="freaks.css" hash="1b66a0f2df69524c4af78385711024c4"/></dir><dir name="images"><dir name="fi"><file name="button.jpg" hash="fcdf2df5b1c714a7c39c61a1be387033"/><file name="loader-old.gif" hash="cf46f7db4c452ea2a94d33eabca8ba93"/><file name="loader.gif" hash="7b9776076d5fceef4993b55c9383dedd"/><file name="popup_arrow-blue.gif" hash="051e0d2ab1f2ef9df98c347b1d7c1a24"/><file name="popup_arrow-white.gif" hash="86a112b675b3a9ed5168d4309170d732"/><file name="select-loader-old.gif" hash="55ded965cfe6095ed8c49f9f980de32a"/><file name="select-loader.gif" hash="a045769166b4cad098ffe7d5aefe95e9"/><file name="select-tip.gif" hash="196ba8fe47100e603ffdd731b6d47d90"/></dir></dir></dir></dir></dir></target></contents>
|
27 |
<compatible/>
|
28 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
29 |
</package>
|