Version Notes
* Support for IWD One Step Checkout
Download this release
Release Info
Developer | Fermo!Point |
Extension | fermopoint |
Version | 1.3.8 |
Comparing to | |
See all releases |
Code changes from version 1.3.7 to 1.3.8
- app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Billing/Js.php +11 -0
- app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Billing/Radio.php +11 -0
- app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Onepage/Payment/Methods.php +39 -0
- app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Onepage/Shipping/Method/Available.php +46 -0
- app/code/community/FermoPoint/StorePickup/Helper/Config.php +2 -2
- app/code/community/FermoPoint/StorePickup/Model/Api.php +6 -4
- app/code/community/FermoPoint/StorePickup/Model/Observer.php +32 -0
- app/code/community/FermoPoint/StorePickup/controllers/Adminhtml/RemoteController.php +8 -0
- app/code/community/FermoPoint/StorePickup/etc/config.xml +26 -10
- app/design/frontend/base/default/layout/fpstorepickup.xml +4 -0
- app/design/frontend/base/default/template/fpstorepickup/iwdcheckout/onepage/billing/js.phtml +43 -0
- app/design/frontend/base/default/template/fpstorepickup/iwdcheckout/onepage/billing/radio.phtml +4 -0
- package.xml +6 -6
app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Billing/Js.php
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class FermoPoint_StorePickup_Block_IwdCheckout_Billing_Js extends Mage_Core_Block_Template {
|
4 |
+
|
5 |
+
public function __construct()
|
6 |
+
{
|
7 |
+
parent::__construct();
|
8 |
+
$this->setTemplate('fpstorepickup/iwdcheckout/onepage/billing/js.phtml');
|
9 |
+
}
|
10 |
+
|
11 |
+
}
|
app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Billing/Radio.php
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class FermoPoint_StorePickup_Block_IwdCheckout_Billing_Radio extends Mage_Core_Block_Template {
|
4 |
+
|
5 |
+
public function __construct()
|
6 |
+
{
|
7 |
+
parent::__construct();
|
8 |
+
$this->setTemplate('fpstorepickup/iwdcheckout/onepage/billing/radio.phtml');
|
9 |
+
}
|
10 |
+
|
11 |
+
}
|
app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Onepage/Payment/Methods.php
ADDED
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class FermoPoint_StorePickup_Block_Checkout_Onepage_Payment_Methods extends Mage_Checkout_Block_Onepage_Payment_Methods
|
4 |
+
{
|
5 |
+
public function getMethods()
|
6 |
+
{
|
7 |
+
$methods = $this->getData('methods');
|
8 |
+
if (is_null($methods))
|
9 |
+
{
|
10 |
+
$store = $this->getQuote() ? $this->getQuote()->getStoreId() : null;
|
11 |
+
$methods = $this->helper('payment')->getStoreMethods($store, $this->getQuote());
|
12 |
+
foreach ($methods as $key => $method) {
|
13 |
+
if ($this->_canUseMethod($method)) {
|
14 |
+
$this->_assignMethod($method);
|
15 |
+
}
|
16 |
+
else {
|
17 |
+
unset($methods[$key]);
|
18 |
+
}
|
19 |
+
}
|
20 |
+
|
21 |
+
if ($this->getQuote()->getShippingAddress()->getShippingMethod() === 'fpstorepickup_fpstorepickup'
|
22 |
+
&& Mage::helper('fpstorepickup/config')->getAllowSpecificPayments()
|
23 |
+
)
|
24 |
+
{
|
25 |
+
$allowed = array_flip(Mage::helper('fpstorepickup/config')->getSpecificPayments());
|
26 |
+
foreach ($methods as $key => $method)
|
27 |
+
{
|
28 |
+
if ( ! isset($allowed[$method->getCode()]))
|
29 |
+
unset($methods[$key]);
|
30 |
+
}
|
31 |
+
|
32 |
+
$methods = array_values($methods);
|
33 |
+
}
|
34 |
+
|
35 |
+
$this->setData('methods', $methods);
|
36 |
+
}
|
37 |
+
return $methods;
|
38 |
+
}
|
39 |
+
}
|
app/code/community/FermoPoint/StorePickup/Block/IwdCheckout/Onepage/Shipping/Method/Available.php
ADDED
@@ -0,0 +1,46 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class FermoPoint_StorePickup_Block_Checkout_Onepage_Shipping_Method_Available extends Mage_Checkout_Block_Onepage_Shipping_Method_Available {
|
4 |
+
|
5 |
+
protected $_storePickupAvailable = false;
|
6 |
+
|
7 |
+
protected function _filterGroups($groups)
|
8 |
+
{
|
9 |
+
$useStorePickup = Mage::helper('fpstorepickup')->getUseMethod();
|
10 |
+
foreach ($groups as $group => $rates)
|
11 |
+
{
|
12 |
+
if ($group === 'fpstorepickup' && $useStorePickup)
|
13 |
+
$this->_storePickupAvailable = true;
|
14 |
+
|
15 |
+
if ($group !== 'fpstorepickup' && $useStorePickup
|
16 |
+
|| $group === 'fpstorepickup' && ! $useStorePickup
|
17 |
+
)
|
18 |
+
unset($groups[$group]);
|
19 |
+
}
|
20 |
+
|
21 |
+
return $groups;
|
22 |
+
}
|
23 |
+
|
24 |
+
public function getShippingRates()
|
25 |
+
{
|
26 |
+
if (empty($this->_rates)) {
|
27 |
+
$this->getAddress()->collectShippingRates()->save();
|
28 |
+
|
29 |
+
$groups = $this->getAddress()->getGroupedAllShippingRates();
|
30 |
+
|
31 |
+
$this->_rates = $this->_filterGroups($groups);
|
32 |
+
}
|
33 |
+
|
34 |
+
return $this->_rates;
|
35 |
+
}
|
36 |
+
|
37 |
+
protected function _afterToHtml($html)
|
38 |
+
{
|
39 |
+
if ($this->_storePickupAvailable)
|
40 |
+
$html .= $this->getLayout()->createBlock('fpstorepickup/map')->toHtml();
|
41 |
+
|
42 |
+
return $html;
|
43 |
+
}
|
44 |
+
|
45 |
+
}
|
46 |
+
|
app/code/community/FermoPoint/StorePickup/Helper/Config.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
class FermoPoint_StorePickup_Helper_Config extends Mage_Core_Helper_Abstract
|
4 |
{
|
5 |
|
6 |
-
const API_VERSION = '1.
|
7 |
|
8 |
const ENDPOINT_PRODUCTION = 'http://api.fermopoint.it/api/v:api_version/:api_method';
|
9 |
const ENDPOINT_SANDBOX = 'http://sandbox.fermopoint.it/api/v:api_version/:api_method';
|
@@ -77,7 +77,7 @@ class FermoPoint_StorePickup_Helper_Config extends Mage_Core_Helper_Abstract
|
|
77 |
return explode(',', Mage::getStoreConfig(self::XML_PATH_SPECIFICPAYMENTS));
|
78 |
}
|
79 |
|
80 |
-
public function getClientSecret($store_id)
|
81 |
{
|
82 |
return (string) Mage::getStoreConfig(self::XML_PATH_CLIENTSECRET, $store_id);
|
83 |
}
|
3 |
class FermoPoint_StorePickup_Helper_Config extends Mage_Core_Helper_Abstract
|
4 |
{
|
5 |
|
6 |
+
const API_VERSION = '1.2';
|
7 |
|
8 |
const ENDPOINT_PRODUCTION = 'http://api.fermopoint.it/api/v:api_version/:api_method';
|
9 |
const ENDPOINT_SANDBOX = 'http://sandbox.fermopoint.it/api/v:api_version/:api_method';
|
77 |
return explode(',', Mage::getStoreConfig(self::XML_PATH_SPECIFICPAYMENTS));
|
78 |
}
|
79 |
|
80 |
+
public function getClientSecret($store_id = 0)
|
81 |
{
|
82 |
return (string) Mage::getStoreConfig(self::XML_PATH_CLIENTSECRET, $store_id);
|
83 |
}
|
app/code/community/FermoPoint/StorePickup/Model/Api.php
CHANGED
@@ -54,12 +54,14 @@ class FermoPoint_StorePickup_Model_Api {
|
|
54 |
|
55 |
public function call($method, $data = array(), $params = array())
|
56 |
{
|
57 |
-
if ($method == 'orders'
|
|
|
58 |
$website = Mage::app()->getRequest()->getParam('website', null);
|
59 |
-
if (
|
60 |
-
|
|
|
|
|
61 |
}
|
62 |
-
$store_id = Mage::app()->getWebsite($website)->getDefaultStore()->getId();
|
63 |
} else {
|
64 |
$store_id = Mage::app()->getStore()->getStoreId();
|
65 |
}
|
54 |
|
55 |
public function call($method, $data = array(), $params = array())
|
56 |
{
|
57 |
+
if ($method == 'orders' ||
|
58 |
+
$method == 'merchant' ) {
|
59 |
$website = Mage::app()->getRequest()->getParam('website', null);
|
60 |
+
if ($website) {
|
61 |
+
$store_id = Mage::app()->getWebsite($website)->getDefaultStore()->getId();
|
62 |
+
} else {
|
63 |
+
$store_id = Mage::app()->getStore()->getStoreId();
|
64 |
}
|
|
|
65 |
} else {
|
66 |
$store_id = Mage::app()->getStore()->getStoreId();
|
67 |
}
|
app/code/community/FermoPoint/StorePickup/Model/Observer.php
CHANGED
@@ -90,6 +90,18 @@ class FermoPoint_StorePickup_Model_Observer
|
|
90 |
$controller = $observer->getEvent()->getControllerAction();
|
91 |
$this->_onSaveShippingMethodBefore($controller, array($this, '_muteError'));
|
92 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
93 |
|
94 |
protected function _onSaveShippingMethodBefore($controller, $callback)
|
95 |
{
|
@@ -305,6 +317,23 @@ class FermoPoint_StorePickup_Model_Observer
|
|
305 |
$html .= $block->getLayout()->createBlock('fpstorepickup/amCheckout_billing_js')->toHtml();
|
306 |
$transport->setHtml($html);
|
307 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
308 |
|
309 |
protected function _insertIdevCheckoutCheckbox(Mage_Core_Block_Abstract $block, Varien_Object $transport)
|
310 |
{
|
@@ -415,6 +444,9 @@ class FermoPoint_StorePickup_Model_Observer
|
|
415 |
$this->_insertMagestoreCheckoutRadioJs($block, $event->getTransport());
|
416 |
$this->_changeMapsLibraries($block, $event->getTransport());
|
417 |
break;
|
|
|
|
|
|
|
418 |
}
|
419 |
}
|
420 |
|
90 |
$controller = $observer->getEvent()->getControllerAction();
|
91 |
$this->_onSaveShippingMethodBefore($controller, array($this, '_muteError'));
|
92 |
}
|
93 |
+
|
94 |
+
public function onIwdSaveOrderBefore($observer)
|
95 |
+
{
|
96 |
+
$controller = $observer->getEvent()->getControllerAction();
|
97 |
+
$this->_onSaveShippingMethodBefore($controller, array($this, '_returnIwdError'));
|
98 |
+
}
|
99 |
+
|
100 |
+
public function onIwdSaveShippingMethodBefore($observer)
|
101 |
+
{
|
102 |
+
$controller = $observer->getEvent()->getControllerAction();
|
103 |
+
$this->_onSaveShippingMethodBefore($controller, array($this, '_muteError'));
|
104 |
+
}
|
105 |
|
106 |
protected function _onSaveShippingMethodBefore($controller, $callback)
|
107 |
{
|
317 |
$html .= $block->getLayout()->createBlock('fpstorepickup/amCheckout_billing_js')->toHtml();
|
318 |
$transport->setHtml($html);
|
319 |
}
|
320 |
+
|
321 |
+
protected function _insertIwdcheckoutRadioJs(Mage_Core_Block_Abstract $block, Varien_Object $transport)
|
322 |
+
{
|
323 |
+
$html = $transport->getHtml();
|
324 |
+
|
325 |
+
if ( ! preg_match('#(<ul>.+?use_for_shipping.+?)</ul>#ius', $html, $matches))
|
326 |
+
return;
|
327 |
+
|
328 |
+
$html = str_replace(
|
329 |
+
$matches[1],
|
330 |
+
$matches[1] . $block->getLayout()->createBlock('fpstorepickup/iwdCheckout_billing_radio')->toHtml(),
|
331 |
+
$html
|
332 |
+
);
|
333 |
+
|
334 |
+
$html .= $block->getLayout()->createBlock('fpstorepickup/iwdCheckout_billing_js')->toHtml();
|
335 |
+
$transport->setHtml($html);
|
336 |
+
}
|
337 |
|
338 |
protected function _insertIdevCheckoutCheckbox(Mage_Core_Block_Abstract $block, Varien_Object $transport)
|
339 |
{
|
444 |
$this->_insertMagestoreCheckoutRadioJs($block, $event->getTransport());
|
445 |
$this->_changeMapsLibraries($block, $event->getTransport());
|
446 |
break;
|
447 |
+
case 'opc/onepage_billing':
|
448 |
+
$this->_insertIwdcheckoutRadioJs($block, $event->getTransport());
|
449 |
+
break;
|
450 |
}
|
451 |
}
|
452 |
|
app/code/community/FermoPoint/StorePickup/controllers/Adminhtml/RemoteController.php
CHANGED
@@ -9,6 +9,14 @@ class FermoPoint_StorePickup_Adminhtml_RemoteController extends Mage_Adminhtml_C
|
|
9 |
|
10 |
public function indexAction()
|
11 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
12 |
if ($this->getRequest()->getQuery('ajax')) {
|
13 |
$this->_forward('grid');
|
14 |
return;
|
9 |
|
10 |
public function indexAction()
|
11 |
{
|
12 |
+
if (!$this->getRequest()->getParam('website')) {
|
13 |
+
$websites = Mage::app()->getWebsites();
|
14 |
+
foreach ($websites as $websiteId => $website) {
|
15 |
+
$this->_redirect('*/*/*', array('website' => $websiteId));
|
16 |
+
return;
|
17 |
+
break;
|
18 |
+
}
|
19 |
+
}
|
20 |
if ($this->getRequest()->getQuery('ajax')) {
|
21 |
$this->_forward('grid');
|
22 |
return;
|
app/code/community/FermoPoint/StorePickup/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<FermoPoint_StorePickup>
|
5 |
-
<version>1.3.
|
6 |
</FermoPoint_StorePickup>
|
7 |
</modules>
|
8 |
<global>
|
@@ -101,6 +101,15 @@
|
|
101 |
</fermopoint_storepickup_observer>
|
102 |
</observers>
|
103 |
</order_cancel_after>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
104 |
</events>
|
105 |
</global>
|
106 |
<frontend>
|
@@ -139,15 +148,6 @@
|
|
139 |
</fermopoint_storepickup_observer>
|
140 |
</observers>
|
141 |
</core_block_abstract_to_html_after>
|
142 |
-
<checkout_type_onepage_save_order_after>
|
143 |
-
<observers>
|
144 |
-
<fermopoint_storepickup_observer>
|
145 |
-
<type>singleton</type>
|
146 |
-
<class>fpstorepickup/observer</class>
|
147 |
-
<method>onSaveOrderAfter</method>
|
148 |
-
</fermopoint_storepickup_observer>
|
149 |
-
</observers>
|
150 |
-
</checkout_type_onepage_save_order_after>
|
151 |
<checkout_controller_onepage_save_shipping_method>
|
152 |
<observers>
|
153 |
<fermopoint_storepickup_observer>
|
@@ -197,6 +197,22 @@
|
|
197 |
</fermopoint_storepickup_observer>
|
198 |
</observers>
|
199 |
</controller_action_predispatch_checkout_onepage_saveShippingMethod>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
200 |
</events>
|
201 |
</frontend>
|
202 |
<admin>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<FermoPoint_StorePickup>
|
5 |
+
<version>1.3.8</version>
|
6 |
</FermoPoint_StorePickup>
|
7 |
</modules>
|
8 |
<global>
|
101 |
</fermopoint_storepickup_observer>
|
102 |
</observers>
|
103 |
</order_cancel_after>
|
104 |
+
<sales_order_place_before>
|
105 |
+
<observers>
|
106 |
+
<fermopoint_storepickup_observer>
|
107 |
+
<type>singleton</type>
|
108 |
+
<class>fpstorepickup/observer</class>
|
109 |
+
<method>onSaveOrderAfter</method>
|
110 |
+
</fermopoint_storepickup_observer>
|
111 |
+
</observers>
|
112 |
+
</sales_order_place_before>
|
113 |
</events>
|
114 |
</global>
|
115 |
<frontend>
|
148 |
</fermopoint_storepickup_observer>
|
149 |
</observers>
|
150 |
</core_block_abstract_to_html_after>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
151 |
<checkout_controller_onepage_save_shipping_method>
|
152 |
<observers>
|
153 |
<fermopoint_storepickup_observer>
|
197 |
</fermopoint_storepickup_observer>
|
198 |
</observers>
|
199 |
</controller_action_predispatch_checkout_onepage_saveShippingMethod>
|
200 |
+
<controller_action_predispatch_opc_json_saveOrder>
|
201 |
+
<observers>
|
202 |
+
<fermopoint_storepickup_observer>
|
203 |
+
<class>fpstorepickup/observer</class>
|
204 |
+
<method>onIwdSaveOrderBefore</method>
|
205 |
+
</fermopoint_storepickup_observer>
|
206 |
+
</observers>
|
207 |
+
</controller_action_predispatch_opc_json_saveOrder>
|
208 |
+
<controller_action_predispatch_opc_json_saveShippingMethod>
|
209 |
+
<observers>
|
210 |
+
<fermopoint_storepickup_observer>
|
211 |
+
<class>fpstorepickup/observer</class>
|
212 |
+
<method>onIwdSaveShippingMethodBefore</method>
|
213 |
+
</fermopoint_storepickup_observer>
|
214 |
+
</observers>
|
215 |
+
</controller_action_predispatch_opc_json_saveShippingMethod>
|
216 |
</events>
|
217 |
</frontend>
|
218 |
<admin>
|
app/design/frontend/base/default/layout/fpstorepickup.xml
CHANGED
@@ -20,6 +20,10 @@
|
|
20 |
<onestepcheckout_index_index>
|
21 |
<update handle="fermopoint_scripts" />
|
22 |
</onestepcheckout_index_index>
|
|
|
|
|
|
|
|
|
23 |
|
24 |
<firecheckout_index_index>
|
25 |
<update handle="fermopoint_scripts" />
|
20 |
<onestepcheckout_index_index>
|
21 |
<update handle="fermopoint_scripts" />
|
22 |
</onestepcheckout_index_index>
|
23 |
+
|
24 |
+
<opc_index_index>
|
25 |
+
<update handle="fermopoint_scripts" />
|
26 |
+
</opc_index_index>
|
27 |
|
28 |
<firecheckout_index_index>
|
29 |
<update handle="fermopoint_scripts" />
|
app/design/frontend/base/default/template/fpstorepickup/iwdcheckout/onepage/billing/js.phtml
ADDED
@@ -0,0 +1,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<script type="text/javascript">
|
2 |
+
//<![CDATA[
|
3 |
+
|
4 |
+
var fpStorePickup = new FermopointStorePickup(
|
5 |
+
'<?php echo Mage::helper('fpstorepickup')->getChangeMethodUrl(); ?>',
|
6 |
+
'<?php echo Mage::helper('fpstorepickup')->getSearchUrl(); ?>',
|
7 |
+
'<?php echo Mage::helper('fpstorepickup')->getMediaUrl(); ?>',
|
8 |
+
function (point) {
|
9 |
+
var days = [];
|
10 |
+
for (var i = 0; i < point.hours.length; i++) {
|
11 |
+
days.push('<span class="dow">' + point.hours[i].day + '</span>' + point.hours[i].hours.join(', '));
|
12 |
+
}
|
13 |
+
return '<div class="fermopoint-info-window">' +
|
14 |
+
'<div class="fermopoint-info-row title">' + point.name + '</div>' +
|
15 |
+
'<div class="fermopoint-info-row select"><a class="fermopoint-select-me" rel="' + point.id + '" href="#">' + Translator.translate('Select this pick-up point') + '</a></div>' +
|
16 |
+
'<div class="fermopoint-info-row"></div>' +
|
17 |
+
'<div class="fermopoint-info-row address">' + point.street + ', ' + point.city + ', ' + point.postcode + ', ' + point.region + '</div>' +
|
18 |
+
'<div class="fermopoint-info-row distance"><strong>' + Translator.translate('Distance') + ': </strong>' + point.distance + ' km </div>' +
|
19 |
+
'<div class="fermopoint-info-row hours"><div class="hours-list">' + days.join('<br />') + '</div></div></div>';
|
20 |
+
}
|
21 |
+
);
|
22 |
+
|
23 |
+
Event.observe('billing:use_for_shipping_yes', 'click', function(event){
|
24 |
+
fpStorePickup.setUseStorePickup(false, function (flag) {
|
25 |
+
IWD.OPC.Checkout.reloadShippingsPayments();
|
26 |
+
});
|
27 |
+
});
|
28 |
+
|
29 |
+
Event.observe('billing:use_for_shipping_point', 'click', function(event){
|
30 |
+
fpStorePickup.setUseStorePickup(true, function (flag) {
|
31 |
+
IWD.OPC.Checkout.reloadShippingsPayments();
|
32 |
+
});
|
33 |
+
});
|
34 |
+
|
35 |
+
document.observe('click', function(event) {
|
36 |
+
var _element = $(Event.element(event));
|
37 |
+
if(_element.id == 'fermopoint_accept_terms'){
|
38 |
+
IWD.OPC.Checkout.reloadShippingsPayments();
|
39 |
+
}
|
40 |
+
});
|
41 |
+
|
42 |
+
//]]>
|
43 |
+
</script>
|
app/design/frontend/base/default/template/fpstorepickup/iwdcheckout/onepage/billing/radio.phtml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<li class="control">
|
2 |
+
<input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_point" value="1"<?php if (Mage::helper('fpstorepickup')->getUseMethod()) : ?> checked="checked" <?php endif ?> onclick="$('shipping:same_as_billing').checked = true;" class="radio" />
|
3 |
+
<label for="billing:use_for_shipping_point"><?php echo $this->__('Fermo!Point Store Pickup') ?></label>
|
4 |
+
</li>
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>fermopoint</name>
|
4 |
-
<version>1.3.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Fermo!Points</summary>
|
10 |
<description>Module for integrating Fermo!Points collecting points system.</description>
|
11 |
-
<notes>* Support for
|
12 |
<authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
|
13 |
-
<date>2017-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="FermoPoint"><dir name="StorePickup"><dir
|
16 |
<compatible/>
|
17 |
-
<dependencies><required><php><min>5.2.0</min><max>7.
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>fermopoint</name>
|
4 |
+
<version>1.3.8</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Fermo!Points</summary>
|
10 |
<description>Module for integrating Fermo!Points collecting points system.</description>
|
11 |
+
<notes>* Support for IWD One Step Checkout</notes>
|
12 |
<authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
|
13 |
+
<date>2017-06-26</date>
|
14 |
+
<time>14:07:48</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="FermoPoint"><dir name="StorePickup"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Cost"><file name="Subtotal.php" hash="b3bf25953e7884456c37f73990cd27e8"/><file name="Weight.php" hash="b59ef2fdfdd1c3423dcda8cbafbf5c47"/></dir></dir><dir name="Configuration"><file name="Disabled.php" hash="27fc2af187259bddd66552c84231f5f5"/><file name="Manual.php" hash="132e7c4a9f89ad71dccb4ce1b2c4c242"/></dir><dir name="Remote"><dir name="Grid"><dir name="Renderer"><file name="Notes.php" hash="0d3427070e683a438abdabc1926cf316"/></dir></dir><file name="Grid.php" hash="4c566d367a7ee4e2e964d5b6e3d5e270"/></dir><file name="Remote.php" hash="71efb0d0be217aa1131d310aa7bfb313"/><file name="Stats.php" hash="e5f884c631ab63546570ab35e0a8336c"/><file name="Switcher.php" hash="d2e56a62f7314a219a5106e9ca9d2b0b"/></dir><dir name="AmCheckout"><dir name="Billing"><file name="Js.php" hash="9700ecacfe0976575c94fe0d0bcc1fca"/><file name="Radio.php" hash="bac2994a261f02891ad79755c4112fd8"/></dir></dir><dir name="Checkout"><dir name="Billing"><file name="Js.php" hash="6be3156e2bb484852a9d5b0e9aa7eee2"/><file name="Radio.php" hash="6839fed605f95a79537e09467a578e58"/></dir><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="aa8e5a31eb2ce85672e0f8aa290b4759"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="59f7cea723940a81ab4a849b0dccca4f"/></dir></dir></dir></dir><dir name="FireCheckout"><dir name="Billing"><file name="Js.php" hash="dc5d3d07ad298c28a0651d6c090d7ef6"/><file name="Radio.php" hash="d85b3da0d7755b3e272a1102325815bf"/></dir><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="aa8e5a31eb2ce85672e0f8aa290b4759"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="dc6592a6ed82b51a6eb8e44272a6248d"/></dir></dir></dir></dir><dir name="IdevCheckout"><dir name="Billing"><file name="Js.php" hash="403e96b8cbb6207c8bce59dbace08ed8"/><file name="Radio.php" hash="91f805ce7e956dd255b79217b8cf7510"/></dir></dir><dir name="IwdCheckout"><dir name="Billing"><file name="Js.php" hash="f24a359b82c9839270701d1b05acc4a0"/><file name="Radio.php" hash="ef681b36cf7872208ef99b5991ea5264"/></dir><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="aa8e5a31eb2ce85672e0f8aa290b4759"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="dc6592a6ed82b51a6eb8e44272a6248d"/></dir></dir></dir></dir><dir name="MagestoreCheckout"><dir name="Billing"><file name="Js.php" hash="2873610ad826a26e078f85b048fde3e4"/><file name="Radio.php" hash="26775b177ea8b6b6baebdf1b7aa0f253"/></dir><file name="Js.php" hash="af0a81738f18a071f7bf98bd98ef3c4c"/><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="aa8e5a31eb2ce85672e0f8aa290b4759"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="dc6592a6ed82b51a6eb8e44272a6248d"/></dir></dir></dir></dir><file name="Map.php" hash="4d6c24521489ea192bc1f0c0d3cbaf26"/></dir><file name="Exception.php" hash="5d30b0aa037248c2709775c8485d5fff"/><dir name="Helper"><file name="Config.php" hash="4d7bdfb0ddc3ed150d580c6794ff9c5a"/><file name="Data.php" hash="8eb4e5eb32709e5dae4b19d506044a1e"/><dir name="Firecheckout"><file name="Ajax.php" hash="3378c6cfd23447b88c10d9d2f1f3bf77"/></dir></dir><dir name="Model"><dir name="Api"><file name="OrderCollection.php" hash="f43b08d838be60a4e923fd8e3373356f"/><file name="SearchData.php" hash="ccbba430222bdfd145db0536914c7cc3"/></dir><file name="Api.php" hash="d7f0b659957736fe8871d5c6f825fdaa"/><dir name="Carrier"><file name="Storepickup.php" hash="0497c47334f60d7cd81cc4f0e81e56a2"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="97a9eb23ca389ee9d75c9fc0df623ad4"/><dir name="Order"><file name="Point.php" hash="e5d033a2ee6add18f52bd0068102b22f"/></dir><file name="Point.php" hash="b5924ba282ad76dffc269b9c13b823f9"/><file name="Points.php" hash="74965213fce4342cae2fb1dc243fda36"/><dir name="Resource"><dir name="Order"><dir name="Point"><file name="Collection.php" hash="294427a66e6588ec4a5ef9af18eecd01"/></dir><file name="Point.php" hash="6c02668768be696fa833bab39fe3f9db"/></dir><dir name="Point"><file name="Collection.php" hash="9745e0182402f72ee43ce6cd7834afce"/></dir><file name="Point.php" hash="6b8e4a20dbda96bdf1c71bf56fcf8c31"/></dir><dir name="Source"><file name="Costmode.php" hash="2d1a5efc5339270fc9ba3e0acce47ef3"/><file name="Payment.php" hash="dd79d15249c29f888b047c9e29ffcfaa"/><file name="Selectorpayment.php" hash="8448ba93eb8ebe2c25eeeef100ff47f9"/><file name="State.php" hash="6a3f558509964600aa9491fbc7b5a15d"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="RemoteController.php" hash="02d469dccd6859dbb64e8902cd3bd2ca"/></dir><file name="IndexController.php" hash="c35f79f12a2d78a38fd6b3cfa81f50ee"/><file name="ValidateController.php" hash="81869825387f94dfaa8475408edf054f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f790d0329024eba67a9018fd782a763a"/><file name="config.xml" hash="7e7f26e39540e53a48a8d5fbd57707f8"/><file name="jstranslator.xml" hash="f6340ca99cf070450e94d3f0c8f86da2"/><file name="system.xml" hash="0438f4b55be6633b39576704153b7bb3"/></dir><dir name="sql"><dir name="fpstorepickup_setup"><file name="mysql4-install-1.0.0.php" hash="c48472469c87f9975c4b203715e0137c"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="4801c11b1c8698ecbf9b4d857b055c33"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="21b100d87f0d3820e6317774c5ed273d"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="a120ae850a03a56010cf9576715beabd"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="fpstorepickup"><file name="array.phtml" hash="76208141443ee6424b2a41aae63dcdf5"/><file name="array2.phtml" hash="4e437681d64d0fdd1e8acc660eaafed2"/><file name="stats.phtml" hash="977cf97e8e340abdc86825c4e853195c"/><file name="switcher.phtml" hash="4ccf6f023cd99db830f292f4bb3f37f6"/></dir></dir><dir name="layout"><file name="fpstorepickup.xml" hash="9794c462a8b296bce412094a4d581c0a"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="fpstorepickup"><dir name="amcheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="ab0130625ccdea1fe719c693d54dccb9"/><file name="radio.phtml" hash="06b0f1a6d795d2fe12c7f5a17f4714df"/></dir></dir></dir><dir name="checkout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="0d0d4fa1a2a807ececff43ffad03e322"/><file name="radio.phtml" hash="975e2309308ae63914aa16b9ad81ea47"/></dir></dir></dir><dir name="firecheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="b5127c0c43885449bd5e65ffa54f0bc1"/><file name="radio.phtml" hash="a40fd64f5cdd9e35dcd4d8997cf22b13"/></dir></dir></dir><dir name="idevcheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="fdcc04e0c817d74e350a7dd8b5803690"/><file name="radio.phtml" hash="452a613dbd563d793298f7c2389c7332"/></dir></dir></dir><dir name="iwdcheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="c1d96accb99275ca3ff96e5efbc5388b"/><file name="radio.phtml" hash="975e2309308ae63914aa16b9ad81ea47"/></dir></dir></dir><dir name="magestorecheckout"><dir name="onepage"><dir name="billing"><file name="js.phtml" hash="aea7698098b5af66ed82690565e8295f"/><file name="radio.phtml" hash="35b6589f396285800d04e0906b156bad"/></dir><file name="js.phtml" hash="8dffc297071ac7d454a04cc69a41a947"/></dir></dir><file name="map.phtml" hash="5cfb0cbb2c3bc438b8148f7f6f89e463"/></dir></dir><dir name="layout"><file name="fpstorepickup.xml" hash="5b367bfa5798fe0a4b4738c0f8ec44bd"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FermoPoint_StorePickup.xml" hash="88569786925f04dade3952d7951f0fca"/></dir></target><target name="mage"><dir name="js"><dir name="fermopoint"><file name="firecheckout.js" hash="c573c6f2f7a05998a9ed17c59bed749c"/><file name="markerclusterer.js" hash="b623ac6d39ea8ed99d179db49b7b0bab"/><file name="storepickup.js" hash="5bab453f59cb76a6e3e2ae27bae9ecb0"/></dir></dir></target><target name="magemedia"><dir name="fermopoint"><file name="cluster1.png" hash="545e7decba75c26883195707a1caf453"/><file name="cluster2.png" hash="1a2554261502135f8699081f7b7dfc15"/><file name="cluster3.png" hash="381dc5802ac150d868bab1edee7cba6c"/><file name="cluster4.png" hash="5fad1a5d344e178f587c759d9466a937"/><file name="marker_location.png" hash="000a6513abbe2c9683b19f49873710c5"/><file name="marker_point.png" hash="9b4dd5a4dd6ace99004ee529a9097de8"/></dir></target><target name="magelocale"><dir name="it_IT"><file name="FermoPoint_StorePickup.csv" hash="777860e413fd571bf005f77a8fe09fec"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="fermopoint"><dir name="css"><file name="storepickup.css" hash="a09638f35ea45f3780a210234a0c590f"/></dir><dir name="images"><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
+
<dependencies><required><php><min>5.2.0</min><max>7.9.9</max></php></required></dependencies>
|
18 |
</package>
|