fermopoint - Version 1.3.4

Version Notes

* Support for MageStore One Step Checkout

Download this release

Release Info

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


Code changes from version 1.3.3 to 1.3.4

Files changed (14) hide show
  1. app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Billing/Js.php +11 -0
  2. app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Billing/Radio.php +11 -0
  3. app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Js.php +11 -0
  4. app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Onepage/Payment/Methods.php +39 -0
  5. app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Onepage/Shipping/Method/Available.php +46 -0
  6. app/code/community/FermoPoint/StorePickup/Model/Observer.php +42 -0
  7. app/code/community/FermoPoint/StorePickup/etc/config.xml +1 -1
  8. app/design/frontend/base/default/layout/fpstorepickup.xml +4 -0
  9. app/design/frontend/base/default/template/fpstorepickup/magestorecheckout/onepage/billing/js.phtml +63 -0
  10. app/design/frontend/base/default/template/fpstorepickup/magestorecheckout/onepage/billing/radio.phtml +16 -0
  11. app/design/frontend/base/default/template/fpstorepickup/magestorecheckout/onepage/js.phtml +35 -0
  12. js/fermopoint/storepickup.js +7 -1
  13. package.xml +5 -5
  14. skin/frontend/base/default/fermopoint/css/storepickup.css +5 -1
app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Billing/Js.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class FermoPoint_StorePickup_Block_MagestoreCheckout_Billing_Js extends Mage_Core_Block_Template {
4
+
5
+ public function __construct()
6
+ {
7
+ parent::__construct();
8
+ $this->setTemplate('fpstorepickup/magestorecheckout/onepage/billing/js.phtml');
9
+ }
10
+
11
+ }
app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Billing/Radio.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class FermoPoint_StorePickup_Block_MagestoreCheckout_Billing_Radio extends Mage_Core_Block_Template {
4
+
5
+ public function __construct()
6
+ {
7
+ parent::__construct();
8
+ $this->setTemplate('fpstorepickup/magestorecheckout/onepage/billing/radio.phtml');
9
+ }
10
+
11
+ }
app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/Js.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class FermoPoint_StorePickup_Block_MagestoreCheckout_Js extends Mage_Core_Block_Template {
4
+
5
+ public function __construct()
6
+ {
7
+ parent::__construct();
8
+ $this->setTemplate('fpstorepickup/magestorecheckout/onepage/js.phtml');
9
+ }
10
+
11
+ }
app/code/community/FermoPoint/StorePickup/Block/MagestoreCheckout/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/MagestoreCheckout/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/Model/Observer.php CHANGED
@@ -232,6 +232,34 @@ class FermoPoint_StorePickup_Model_Observer
232
  $transport->setHtml($html);
233
  }
234
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
235
  protected function _insertMap(Mage_Core_Block_Abstract $block, Varien_Object $transport)
236
  {
237
  if ( ! Mage::helper('fpstorepickup')->getIsOneStepCheckout())
@@ -241,6 +269,16 @@ class FermoPoint_StorePickup_Model_Observer
241
  $transport->setHtml($html);
242
  }
243
 
 
 
 
 
 
 
 
 
 
 
244
  public function onBlockToHtmlAfter($event)
245
  {
246
  if ( ! Mage::getStoreConfig('carriers/fpstorepickup/active')
@@ -263,6 +301,10 @@ class FermoPoint_StorePickup_Model_Observer
263
  case 'checkout/onepage_shipping_method_additional':
264
  $this->_insertMap($block, $event->getTransport());
265
  break;
 
 
 
 
266
  }
267
  }
268
 
232
  $transport->setHtml($html);
233
  }
234
 
235
+ protected function _insertMagestoreCheckoutRadioJs(Mage_Core_Block_Abstract $block, Varien_Object $transport)
236
+ {
237
+ if ($block->getNameInLayout() != 'onestepcheckout_billing')
238
+ return;
239
+ $html = $transport->getHtml();
240
+
241
+ $radio = $block->getLayout()->createBlock('fpstorepickup/magestoreCheckout_billing_radio');
242
+ if (preg_match('#(<li class="shipping_other_address">.+?</li>)#ius', $html, $matches))
243
+ {
244
+ $html = str_replace(
245
+ $matches[1],
246
+ $radio->toHtml() . $matches[1],
247
+ $html
248
+ );
249
+ }
250
+ else
251
+ {
252
+ $radio->setUseWrapper(true);
253
+ $html = str_replace(
254
+ '</fieldset>',
255
+ '</fieldset>' . $radio->toHtml(),
256
+ $html
257
+ );
258
+ }
259
+ $html .= $block->getLayout()->createBlock('fpstorepickup/magestoreCheckout_billing_js')->toHtml();
260
+ $transport->setHtml($html);
261
+ }
262
+
263
  protected function _insertMap(Mage_Core_Block_Abstract $block, Varien_Object $transport)
264
  {
265
  if ( ! Mage::helper('fpstorepickup')->getIsOneStepCheckout())
269
  $transport->setHtml($html);
270
  }
271
 
272
+ protected function _changeMapsLibraries(Mage_Core_Block_Abstract $block, Varien_Object $transport)
273
+ {
274
+ if ($block->getNameInLayout() != 'onestepcheckout')
275
+ return;
276
+ $html = $transport->getHtml();
277
+ $html = str_replace('libraries=places', 'libraries=places,geometry', $html);
278
+ $html .= $block->getLayout()->createBlock('fpstorepickup/magestoreCheckout_js')->toHtml();
279
+ $transport->setHtml($html);
280
+ }
281
+
282
  public function onBlockToHtmlAfter($event)
283
  {
284
  if ( ! Mage::getStoreConfig('carriers/fpstorepickup/active')
301
  case 'checkout/onepage_shipping_method_additional':
302
  $this->_insertMap($block, $event->getTransport());
303
  break;
304
+ case 'onestepcheckout/onestepcheckout':
305
+ $this->_insertMagestoreCheckoutRadioJs($block, $event->getTransport());
306
+ $this->_changeMapsLibraries($block, $event->getTransport());
307
+ break;
308
  }
309
  }
310
 
app/code/community/FermoPoint/StorePickup/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <FermoPoint_StorePickup>
5
- <version>1.3.3</version>
6
  </FermoPoint_StorePickup>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <FermoPoint_StorePickup>
5
+ <version>1.3.4</version>
6
  </FermoPoint_StorePickup>
7
  </modules>
8
  <global>
app/design/frontend/base/default/layout/fpstorepickup.xml CHANGED
@@ -17,6 +17,10 @@
17
  <update handle="fermopoint_scripts" />
18
  </checkout_onepage_index>
19
 
 
 
 
 
20
  <firecheckout_index_index>
21
  <update handle="fermopoint_scripts" />
22
  <reference name="head">
17
  <update handle="fermopoint_scripts" />
18
  </checkout_onepage_index>
19
 
20
+ <onestepcheckout_index_index>
21
+ <update handle="fermopoint_scripts" />
22
+ </onestepcheckout_index_index>
23
+
24
  <firecheckout_index_index>
25
  <update handle="fermopoint_scripts" />
26
  <reference name="head">
app/design/frontend/base/default/template/fpstorepickup/magestorecheckout/onepage/billing/js.phtml ADDED
@@ -0,0 +1,63 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <script type="text/javascript">
2
+ //<![CDATA[
3
+ var fpStorePickup = new FermopointStorePickup(
4
+ '<?php echo Mage::helper('fpstorepickup')->getChangeMethodUrl(); ?>',
5
+ '<?php echo Mage::helper('fpstorepickup')->getSearchUrl(); ?>',
6
+ '<?php echo Mage::helper('fpstorepickup')->getMediaUrl(); ?>',
7
+ function (point) {
8
+ var days = [];
9
+ for (var i = 0; i < point.hours.length; i++) {
10
+ days.push('<span class="dow">' + point.hours[i].day + '</span>' + point.hours[i].hours.join(', '));
11
+ }
12
+ return '<div class="fermopoint-info-window">' +
13
+ '<div class="fermopoint-info-row title">' + point.name + '</div>' +
14
+ '<div class="fermopoint-info-row select"><a class="fermopoint-select-me" rel="' + point.id + '" href="#">' + Translator.translate('Select this pick-up point') + '</a></div>' +
15
+ '<div class="fermopoint-info-row"></div>' +
16
+ '<div class="fermopoint-info-row address">' + point.street + ', ' + point.city + ', ' + point.postcode + ', ' + point.region + '</div>' +
17
+ '<div class="fermopoint-info-row distance"><strong>' + Translator.translate('Distance') + ': </strong>' + point.distance + ' km </div>' +
18
+ '<div class="fermopoint-info-row hours"><div class="hours-list">' + days.join('<br />') + '</div></div></div>';
19
+ }
20
+ );
21
+
22
+ function initStorePickup() {
23
+ var element = $('shipping:use_store_pickup'),
24
+ control = $('shipping:different_shipping');
25
+ if (element && control) {
26
+ if (element.checked) {
27
+ update_address_payment = 1;
28
+ control.up('li').hide();
29
+ control.checked = false;
30
+ } else {
31
+ control.up('li').show();
32
+ }
33
+ }
34
+ }
35
+ initStorePickup();
36
+
37
+ function useStorePickup(element) {
38
+ var control,
39
+ old_update_address_payment;
40
+ control = $('shipping:different_shipping');
41
+ if (control) {
42
+ if (element.checked) {
43
+ control.up('li').hide();
44
+ control.checked = false;
45
+ } else {
46
+ control.up('li').show();
47
+ }
48
+ }
49
+ fpStorePickup.setUseStorePickup(element.checked, function (flag) {
50
+ if (control) {
51
+ old_update_address_payment = update_address_payment;
52
+ update_address_payment = 1;
53
+ showDifferentAdress();
54
+ update_address_payment = old_update_address_payment;
55
+ } else {
56
+ save_address_information(save_address_url, true, true, true);
57
+ }
58
+ });
59
+
60
+ }
61
+
62
+ //]]>
63
+ </script>
app/design/frontend/base/default/template/fpstorepickup/magestorecheckout/onepage/billing/radio.phtml ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php if ($this->getUseWrapper()) : ?>
2
+ <ul>
3
+ <?php endif ?>
4
+ <li class="shipping_other_address">
5
+ <div class="input-box input-different-shipping checkbox-group">
6
+ <input onclick="useStorePickup(this);" type="checkbox" name="shipping[use_store_pickup]" id="shipping:use_store_pickup" value="1" <?php if (Mage::helper('fpstorepickup')->getUseMethod()) : ?> checked="checked" <?php endif ?> />
7
+ <label for="shipping:use_store_pickup" class="label--checkbox">
8
+ <span class="check"></span>
9
+ <span class="box-check"></span>
10
+ <?php echo $this->__('Fermo!Point Store Pickup'); ?>
11
+ </label>
12
+ </div>
13
+ </li>
14
+ <?php if ($this->getUseWrapper()) : ?>
15
+ </ul>
16
+ <?php endif ?>
app/design/frontend/base/default/template/fpstorepickup/magestorecheckout/onepage/js.phtml ADDED
@@ -0,0 +1,35 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <script type="text/javascript">
2
+ //<![CDATA[
3
+ ;(function () {
4
+ var oldHandler = oscPlaceOrder;
5
+ function validateFpOsc() {
6
+ var methods;
7
+ var pointId;
8
+ methods = document.getElementsByName('shipping_method');
9
+ for (var i=0; i<methods.length; i++) {
10
+ if (methods[i].checked && methods[i].value !== 'fpstorepickup_fpstorepickup') {
11
+ return true;
12
+ }
13
+ }
14
+
15
+ pointId = parseInt($('fermopoint_point_id').value, 10);
16
+ if (pointId <= 0) {
17
+ alert(Translator.translate('You should select one of available pick-up points to continue').stripTags());
18
+ return false;
19
+ }
20
+
21
+ return true;
22
+ }
23
+
24
+ oscPlaceOrder = function (element) {
25
+ var validator = new Validation('one-step-checkout-form');
26
+ var form = $('one-step-checkout-form');
27
+
28
+ if (validator.validate() && validateFpOsc()) {
29
+ return oldHandler.apply(window, arguments);
30
+ }
31
+ return false;
32
+ }
33
+ })();
34
+ //]]>
35
+ </script>
js/fermopoint/storepickup.js CHANGED
@@ -395,7 +395,7 @@ FermopointStorePickup.prototype = {
395
  document.body.appendChild(script);
396
  },
397
 
398
- setUseStorePickup: function(flag)
399
  {
400
  var url = this.changeMethodUrl;
401
 
@@ -407,6 +407,12 @@ FermopointStorePickup.prototype = {
407
  var request = new Ajax.Request(url, {
408
  method: 'get',
409
  onSuccess: function () {
 
 
 
 
 
 
410
  try {
411
  var url = flag ? checkout.urls.billing_address : checkout.urls.shipping_address,
412
  sections = FireCheckout.Ajax.getSectionsToUpdate('shipping');
395
  document.body.appendChild(script);
396
  },
397
 
398
+ setUseStorePickup: function(flag, callback)
399
  {
400
  var url = this.changeMethodUrl;
401
 
407
  var request = new Ajax.Request(url, {
408
  method: 'get',
409
  onSuccess: function () {
410
+ try {
411
+ if (typeof callback === 'function')
412
+ callback.apply(this, [flag]);
413
+ } catch (e) {
414
+
415
+ }
416
  try {
417
  var url = flag ? checkout.urls.billing_address : checkout.urls.shipping_address,
418
  sections = FireCheckout.Ajax.getSectionsToUpdate('shipping');
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>fermopoint</name>
4
- <version>1.3.3</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 free shipping promotions</notes>
12
  <authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
13
- <date>2016-03-14</date>
14
- <time>12:33:13</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="9dcea09a45c0dabe2931380a20a97b9b"/></dir><file name="Remote.php" hash="71367be2fb6723af4ff91b8207209ab0"/><file name="Stats.php" hash="e5f884c631ab63546570ab35e0a8336c"/></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><file name="Map.php" hash="4d6c24521489ea192bc1f0c0d3cbaf26"/></dir><dir name="Helper"><file name="Config.php" hash="9c0f83eb482fb69375a184c11360dae6"/><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="ea72b53b180c5d9a9e44f40bc413e881"/><dir name="Carrier"><file name="Storepickup.php" hash="0497c47334f60d7cd81cc4f0e81e56a2"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="c2f888154071aefbe61594abdc07da74"/><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="2a2213f3b7832f8891d147015c0361cd"/><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="af1732102e5d153fae5c54d022d1605a"/><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="e753271157b0dfbba46396a5046efdee"/></dir><dir name="template"><dir name="fpstorepickup"><file name="array.phtml" hash="76208141443ee6424b2a41aae63dcdf5"/><file name="stats.phtml" hash="977cf97e8e340abdc86825c4e853195c"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fpstorepickup.xml" hash="ba7e537b0d17993a5cc7ab95765296ad"/></dir><dir name="template"><dir name="fpstorepickup"><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><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="39eb87a1815ae491c3eb263b4fd69451"/></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="cbaa015c86386833206af782606b37aa"/></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="c7b2d42d974a3c19bc447925fc8222e0"/></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>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>fermopoint</name>
4
+ <version>1.3.4</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 MageStore One Step Checkout</notes>
12
  <authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
13
+ <date>2016-06-24</date>
14
+ <time>07:01:43</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="9dcea09a45c0dabe2931380a20a97b9b"/></dir><file name="Remote.php" hash="71367be2fb6723af4ff91b8207209ab0"/><file name="Stats.php" hash="e5f884c631ab63546570ab35e0a8336c"/></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="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="9c0f83eb482fb69375a184c11360dae6"/><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="ea72b53b180c5d9a9e44f40bc413e881"/><dir name="Carrier"><file name="Storepickup.php" hash="0497c47334f60d7cd81cc4f0e81e56a2"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="e4f23d3a1a526aad11f813519eeb0dda"/><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="2a2213f3b7832f8891d147015c0361cd"/><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="60d9c2b0c46b37f80c4dd90cff0b7b0a"/><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="e753271157b0dfbba46396a5046efdee"/></dir><dir name="template"><dir name="fpstorepickup"><file name="array.phtml" hash="76208141443ee6424b2a41aae63dcdf5"/><file name="stats.phtml" hash="977cf97e8e340abdc86825c4e853195c"/></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="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="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="b37be11cc8da9970e7dee1f1ed623035"/></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="cbaa015c86386833206af782606b37aa"/></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>6.0.0</max></php></required></dependencies>
18
  </package>
skin/frontend/base/default/fermopoint/css/storepickup.css CHANGED
@@ -99,4 +99,8 @@
99
  .firecheckout-index-index .fermopoint-info-window { min-width: 0px; }
100
  .firecheckout-index-index .fermopoint-info-window { font-size: 11px; line-height: 14px;}
101
  .firecheckout-index-index .fermopoint-info-window .fermopoint-info-row.title {font-size: 12px; margin-bottom: 5px;}
102
- .firecheckout-index-index .fermopoint-info-window .fermopoint-info-row a {font-size: 12px;}
 
 
 
 
99
  .firecheckout-index-index .fermopoint-info-window { min-width: 0px; }
100
  .firecheckout-index-index .fermopoint-info-window { font-size: 11px; line-height: 14px;}
101
  .firecheckout-index-index .fermopoint-info-window .fermopoint-info-row.title {font-size: 12px; margin-bottom: 5px;}
102
+ .firecheckout-index-index .fermopoint-info-window .fermopoint-info-row a {font-size: 12px;}
103
+
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;}