fermopoint - Version 1.3.7

Version Notes

* Support for Amasty One Step Checkout

Download this release

Release Info

Developer Fermo!Point
Extension fermopoint
Version 1.3.7
Comparing to
See all releases


Code changes from version 1.3.6 to 1.3.7

Files changed (8) hide show
  1. app/code/community/FermoPoint/StorePickup/Block/AmCheckout/Billing/Js.php +11 -0
  2. app/code/community/FermoPoint/StorePickup/Block/AmCheckout/Billing/Radio.php +11 -0
  3. app/code/community/FermoPoint/StorePickup/Model/Observer.php +90 -13
  4. app/code/community/FermoPoint/StorePickup/etc/config.xml +9 -1
  5. app/design/frontend/base/default/template/fpstorepickup/amcheckout/onepage/billing/js.phtml +51 -0
  6. app/design/frontend/base/default/template/fpstorepickup/amcheckout/onepage/billing/radio.phtml +8 -0
  7. package.xml +6 -6
  8. skin/frontend/base/default/fermopoint/css/storepickup.css +2 -0
app/code/community/FermoPoint/StorePickup/Block/AmCheckout/Billing/Js.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class FermoPoint_StorePickup_Block_AmCheckout_Billing_Js extends Mage_Core_Block_Template {
4
+
5
+ public function __construct()
6
+ {
7
+ parent::__construct();
8
+ $this->setTemplate('fpstorepickup/amcheckout/onepage/billing/js.phtml');
9
+ }
10
+
11
+ }
app/code/community/FermoPoint/StorePickup/Block/AmCheckout/Billing/Radio.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class FermoPoint_StorePickup_Block_AmCheckout_Billing_Radio extends Mage_Core_Block_Template {
4
+
5
+ public function __construct()
6
+ {
7
+ parent::__construct();
8
+ $this->setTemplate('fpstorepickup/amcheckout/onepage/billing/radio.phtml');
9
+ }
10
+
11
+ }
app/code/community/FermoPoint/StorePickup/Model/Observer.php CHANGED
@@ -18,7 +18,34 @@ class FermoPoint_StorePickup_Model_Observer
18
  $controller->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
19
  $controller->setFlag('', Mage_Core_Controller_Varien_Action::FLAG_NO_DISPATCH, true);
20
  }
21
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
22
  protected function _returnFirecheckoutError($controller, $message)
23
  {
24
  $controller->getResponse()->setBody(Mage::helper('core')->jsonEncode(array(
@@ -39,6 +66,12 @@ class FermoPoint_StorePickup_Model_Observer
39
  $controller = $observer->getEvent()->getControllerAction();
40
  $this->_onSaveShippingMethodBefore($controller, array($this, '_returnError'));
41
  }
 
 
 
 
 
 
42
 
43
  public function onIdevcheckoutSaveOrderBefore($observer)
44
  {
@@ -135,9 +168,9 @@ class FermoPoint_StorePickup_Model_Observer
135
  return call_user_func($callback, $controller, Mage::helper('fpstorepickup')->__('Invalid phone number'));
136
  */
137
  }
138
-
139
- public function onSaveShippingMethodAfter($event)
140
- {
141
  $quote = $event->getQuote();
142
  if ($quote->getShippingAddress()->getShippingMethod() !== 'fpstorepickup_fpstorepickup')
143
  {
@@ -167,11 +200,11 @@ class FermoPoint_StorePickup_Model_Observer
167
 
168
  $quote->collectTotals()->save();
169
  }
170
- }
171
-
172
- public function onSaveOrderAfter($event)
173
- {
174
- $order = $event->getOrder();
175
  $orderPoint = Mage::getModel('fpstorepickup/order_point')->load($order->getId(), 'order_id');
176
  if ($orderPoint->getId())
177
  return;
@@ -206,7 +239,7 @@ class FermoPoint_StorePickup_Model_Observer
206
  }
207
 
208
  Mage::helper('fpstorepickup')->setUseMethod(false);
209
- }
210
 
211
  protected function _insertRadioJs(Mage_Core_Block_Abstract $block, Varien_Object $transport)
212
  {
@@ -237,6 +270,41 @@ class FermoPoint_StorePickup_Model_Observer
237
  $html .= $block->getLayout()->createBlock('fpstorepickup/fireCheckout_billing_js')->toHtml();
238
  $transport->setHtml($html);
239
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
240
 
241
  protected function _insertIdevCheckoutCheckbox(Mage_Core_Block_Abstract $block, Varien_Object $transport)
242
  {
@@ -315,15 +383,24 @@ class FermoPoint_StorePickup_Model_Observer
315
  || ! Mage::getStoreConfig('carriers/fpstorepickup/accept')
316
  )
317
  return;
318
-
319
  $block = $event->getBlock();
320
  if ( ! $block)
321
  return;
322
-
323
  switch ($block->getType())
324
  {
 
 
 
 
 
325
  case 'checkout/onepage_billing':
326
- $this->_insertRadioJs($block, $event->getTransport());
 
 
 
 
327
  break;
328
  case 'firecheckout/checkout_shipping':
329
  $this->_insertFirecheckoutRadioJs($block, $event->getTransport());
18
  $controller->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
19
  $controller->setFlag('', Mage_Core_Controller_Varien_Action::FLAG_NO_DISPATCH, true);
20
  }
21
+
22
+
23
+ protected function _returnAmcheckoutError($controller, $message)
24
+ {
25
+
26
+ $amResponse = Mage::getModel("amscheckout/response");
27
+
28
+ $messagesBlock = Mage::app()->getLayout()->getMessagesBlock();
29
+
30
+ if ($amResponse->getErrorsCount() != 0) {
31
+ foreach($amResponse->getErrors() as $error)
32
+ $messagesBlock->addError($error);
33
+ }
34
+
35
+ $messagesBlock->addError($message);
36
+ $amResponse->setError($message);
37
+
38
+ $result = array(
39
+ "status" => "error",
40
+ "errorsHtml" => $messagesBlock->toHtml(),
41
+ "errors" => implode("\n", $amResponse->getErrors())
42
+ );
43
+
44
+
45
+ $controller->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
46
+ $controller->setFlag('', Mage_Core_Controller_Varien_Action::FLAG_NO_DISPATCH, true);
47
+ }
48
+
49
  protected function _returnFirecheckoutError($controller, $message)
50
  {
51
  $controller->getResponse()->setBody(Mage::helper('core')->jsonEncode(array(
66
  $controller = $observer->getEvent()->getControllerAction();
67
  $this->_onSaveShippingMethodBefore($controller, array($this, '_returnError'));
68
  }
69
+
70
+ public function onAmcheckoutSaveOrderBefore($observer)
71
+ {
72
+ $controller = $observer->getEvent()->getControllerAction();
73
+ $this->_onSaveShippingMethodBefore($controller, array($this, '_returnAmcheckoutError'));
74
+ }
75
 
76
  public function onIdevcheckoutSaveOrderBefore($observer)
77
  {
168
  return call_user_func($callback, $controller, Mage::helper('fpstorepickup')->__('Invalid phone number'));
169
  */
170
  }
171
+
172
+ public function onSaveShippingMethodAfter($event)
173
+ {
174
  $quote = $event->getQuote();
175
  if ($quote->getShippingAddress()->getShippingMethod() !== 'fpstorepickup_fpstorepickup')
176
  {
200
 
201
  $quote->collectTotals()->save();
202
  }
203
+ }
204
+
205
+ public function onSaveOrderAfter($event)
206
+ {
207
+ $order = $event->getOrder();
208
  $orderPoint = Mage::getModel('fpstorepickup/order_point')->load($order->getId(), 'order_id');
209
  if ($orderPoint->getId())
210
  return;
239
  }
240
 
241
  Mage::helper('fpstorepickup')->setUseMethod(false);
242
+ }
243
 
244
  protected function _insertRadioJs(Mage_Core_Block_Abstract $block, Varien_Object $transport)
245
  {
270
  $html .= $block->getLayout()->createBlock('fpstorepickup/fireCheckout_billing_js')->toHtml();
271
  $transport->setHtml($html);
272
  }
273
+
274
+ protected function _insertAmcheckoutValidator(Mage_Core_Block_Abstract $block, Varien_Object $transport)
275
+ {
276
+
277
+ $html = $transport->getHtml();
278
+
279
+ if ( ! preg_match('#(amscheckoutForm.validator.validate.+?\))\s*\)\{#ius', $html, $matches))
280
+ return;
281
+
282
+ $html = str_replace(
283
+ $matches[1],
284
+ '(' . $matches[1] . ' && fpStorePickup.validateShippingMethod())',
285
+ $html
286
+ );
287
+
288
+ $transport->setHtml($html);
289
+ }
290
+
291
+ protected function _insertAmcheckoutRadioJs(Mage_Core_Block_Abstract $block, Varien_Object $transport)
292
+ {
293
+
294
+ $html = $transport->getHtml();
295
+
296
+ if ( ! preg_match('#(<ul>.+?use_for_shipping.+?)</ul>#ius', $html, $matches))
297
+ return;
298
+
299
+ $html = str_replace(
300
+ $matches[1],
301
+ $matches[1] . $block->getLayout()->createBlock('fpstorepickup/amCheckout_billing_radio')->toHtml(),
302
+ $html
303
+ );
304
+
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
  {
383
  || ! Mage::getStoreConfig('carriers/fpstorepickup/accept')
384
  )
385
  return;
386
+
387
  $block = $event->getBlock();
388
  if ( ! $block)
389
  return;
390
+
391
  switch ($block->getType())
392
  {
393
+ case 'checkout/onepage':
394
+ if (Mage::app()->getRequest()->getControllerModule()=="Amasty_Scheckout_Rewrite") {
395
+ $this->_insertAmcheckoutValidator($block, $event->getTransport());
396
+ }
397
+ break;
398
  case 'checkout/onepage_billing':
399
+ if (Mage::app()->getRequest()->getControllerModule()=="Amasty_Scheckout_Rewrite") {
400
+ $this->_insertAmcheckoutRadioJs($block, $event->getTransport());
401
+ } else {
402
+ $this->_insertRadioJs($block, $event->getTransport());
403
+ }
404
  break;
405
  case 'firecheckout/checkout_shipping':
406
  $this->_insertFirecheckoutRadioJs($block, $event->getTransport());
app/code/community/FermoPoint/StorePickup/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <FermoPoint_StorePickup>
5
- <version>1.3.5</version>
6
  </FermoPoint_StorePickup>
7
  </modules>
8
  <global>
@@ -181,6 +181,14 @@
181
  </fermopoint_storepickup_observer>
182
  </observers>
183
  </controller_action_predispatch_firecheckout_index_saveShippingMethod>
 
 
 
 
 
 
 
 
184
  <controller_action_predispatch_checkout_onepage_saveShippingMethod>
185
  <observers>
186
  <fermopoint_storepickup_observer>
2
  <config>
3
  <modules>
4
  <FermoPoint_StorePickup>
5
+ <version>1.3.7</version>
6
  </FermoPoint_StorePickup>
7
  </modules>
8
  <global>
181
  </fermopoint_storepickup_observer>
182
  </observers>
183
  </controller_action_predispatch_firecheckout_index_saveShippingMethod>
184
+ <controller_action_predispatch_amscheckoutfront_onepage_checkout>
185
+ <observers>
186
+ <fermopoint_storepickup_observer>
187
+ <class>fpstorepickup/observer</class>
188
+ <method>onAmcheckoutSaveOrderBefore</method>
189
+ </fermopoint_storepickup_observer>
190
+ </observers>
191
+ </controller_action_predispatch_amscheckoutfront_onepage_checkout>
192
  <controller_action_predispatch_checkout_onepage_saveShippingMethod>
193
  <observers>
194
  <fermopoint_storepickup_observer>
app/design/frontend/base/default/template/fpstorepickup/amcheckout/onepage/billing/js.phtml ADDED
@@ -0,0 +1,51 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
+ updateCheckout('billing');
26
+ });
27
+ });
28
+
29
+ Event.observe('billing:use_for_shipping_no', 'click', function(event){
30
+ fpStorePickup.setUseStorePickup(false, function (flag) {
31
+ updateCheckout('billing');
32
+ });
33
+ });
34
+
35
+
36
+ Event.observe('billing:use_for_shipping_point', 'click', function(event){
37
+ fpStorePickup.setUseStorePickup(true, function (flag) {
38
+ updateCheckout('billing');
39
+ });
40
+ });
41
+
42
+ document.observe('click', function(event) {
43
+ var _element = $(Event.element(event));
44
+ if(_element.id == 'fermopoint_accept_terms'){
45
+ updateCheckout('shipping_method');
46
+ }
47
+ });
48
+
49
+
50
+ //]]>
51
+ </script>
app/design/frontend/base/default/template/fpstorepickup/amcheckout/onepage/billing/radio.phtml ADDED
@@ -0,0 +1,8 @@
 
 
 
 
 
 
 
 
1
+ <li class="amscheckout-row" style="width:100%;">
2
+ <div>
3
+ <label for="billing:use_for_shipping_point" class="amscheckout-label amscheckout-label-radio"><?php echo $this->__('Fermo!Point Store Pickup') ?></label>
4
+ <div class="amscheckout-control amscheckout-control-radio">
5
+ <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;$('shipping_area').hide();" class="radio" />
6
+ </div>
7
+ </div>
8
+ </li>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>fermopoint</name>
4
- <version>1.3.6</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>* Fixes for multistore installations</notes>
12
  <authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
13
- <date>2017-01-27</date>
14
- <time>15:11:53</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="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="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="c80781f017440bf1528c99c505423158"/><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="3e412d2786a121543906c77762546c5f"/><dir name="Carrier"><file name="Storepickup.php" hash="0497c47334f60d7cd81cc4f0e81e56a2"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="cd8a906ca0da5c79712b9f382fa50b38"/><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="1572704560ae35965d184bfa25fef23c"/></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="b0a3e570cb17c6503a360bce1aa72103"/><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="layout"><file name="fpstorepickup.xml" hash="9794c462a8b296bce412094a4d581c0a"/></dir><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></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fpstorepickup.xml" hash="865e2e52da6d1dbe1cde3f354865861c"/></dir><dir name="template"><dir name="fpstorepickup"><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="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></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="8adbb580e7b0d7a5ce0025a9ae3a1a04"/></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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>fermopoint</name>
4
+ <version>1.3.7</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 Amasty One Step Checkout</notes>
12
  <authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
13
+ <date>2017-03-24</date>
14
+ <time>13:39:55</time>
15
+ <contents><target name="magecommunity"><dir name="FermoPoint"><dir name="StorePickup"><dir><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="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><dir name="Helper"><file name="Config.php" hash="c80781f017440bf1528c99c505423158"/><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="3e412d2786a121543906c77762546c5f"/><dir name="Carrier"><file name="Storepickup.php" hash="0497c47334f60d7cd81cc4f0e81e56a2"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="13888da2b76fc2245f819ef2e9adb66c"/><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="1572704560ae35965d184bfa25fef23c"/></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="1a324d01b45dbf5f6fbcb57b78eba847"/><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><file name="Exception.php" hash="5d30b0aa037248c2709775c8485d5fff"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fpstorepickup.xml" hash="9794c462a8b296bce412094a4d581c0a"/></dir><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></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fpstorepickup.xml" hash="865e2e52da6d1dbe1cde3f354865861c"/></dir><dir name="template"><dir name="fpstorepickup"><dir><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="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></dir><file name="map.phtml" hash="5cfb0cbb2c3bc438b8148f7f6f89e463"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="FermoPoint_StorePickup.xml" hash="88569786925f04dade3952d7951f0fca"/></dir></dir></dir><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><dir name="media"><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></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.5.0</max></php></required></dependencies>
18
  </package>
skin/frontend/base/default/fermopoint/css/storepickup.css CHANGED
@@ -104,3 +104,5 @@
104
  .onestepcheckout-index-index .address-information .shipping_other_address + .shipping_other_address {margin-top: 0;}
105
 
106
  .onestepcheckout-index-index #fermopoint_point label {max-width: 90%; float:left;}
 
 
104
  .onestepcheckout-index-index .address-information .shipping_other_address + .shipping_other_address {margin-top: 0;}
105
 
106
  .onestepcheckout-index-index #fermopoint_point label {max-width: 90%; float:left;}
107
+
108
+ .amscheckout-row label[for="billing:use_for_shipping_point"] { max-width: 85%; }