fermopoint - Version 1.2.1

Version Notes

* Some improvements

Download this release

Release Info

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


Code changes from version 1.2.0 to 1.2.1

Files changed (9) hide show
  1. app/code/community/FermoPoint/StorePickup/Block/FireCheckout/Onepage/Payment/Methods.php +39 -0
  2. app/code/community/FermoPoint/StorePickup/Block/FireCheckout/Onepage/Shipping/Method/Available.php +46 -0
  3. app/code/community/FermoPoint/StorePickup/Model/Api.php +1 -2
  4. app/code/community/FermoPoint/StorePickup/etc/config.xml +1 -1
  5. app/design/frontend/base/default/template/fpstorepickup/firecheckout/onepage/billing/js.phtml +14 -1
  6. js/fermopoint/firecheckout.js +6 -0
  7. js/fermopoint/storepickup.js +11 -7
  8. package.xml +5 -5
  9. skin/frontend/base/default/fermopoint/css/storepickup.css +5 -1
app/code/community/FermoPoint/StorePickup/Block/FireCheckout/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/FireCheckout/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/Api.php CHANGED
@@ -67,7 +67,7 @@ class FermoPoint_StorePickup_Model_Api {
67
  $client->setHeaders(array('Accept-Encoding: identity'));
68
  $client->setConfig(array('strictredirects' => true));
69
  $client->setRawData(json_encode($signedData), 'application/json');
70
-
71
  try {
72
  $response = $client->request(Zend_Http_Client::POST);
73
  } catch (Zend_Http_Client_Exception $e) {
@@ -75,7 +75,6 @@ class FermoPoint_StorePickup_Model_Api {
75
  throw new FermoPoint_StorePickup_Exception(Mage::helper('fpstorepickup')->__('Could not communicate with server'));
76
  }
77
  $body = $response->getBody();
78
-
79
  $json = json_decode($body, true);
80
  if ($json === null)
81
  {
67
  $client->setHeaders(array('Accept-Encoding: identity'));
68
  $client->setConfig(array('strictredirects' => true));
69
  $client->setRawData(json_encode($signedData), 'application/json');
70
+
71
  try {
72
  $response = $client->request(Zend_Http_Client::POST);
73
  } catch (Zend_Http_Client_Exception $e) {
75
  throw new FermoPoint_StorePickup_Exception(Mage::helper('fpstorepickup')->__('Could not communicate with server'));
76
  }
77
  $body = $response->getBody();
 
78
  $json = json_decode($body, true);
79
  if ($json === null)
80
  {
app/code/community/FermoPoint/StorePickup/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <FermoPoint_StorePickup>
5
- <version>1.2.0</version>
6
  </FermoPoint_StorePickup>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <FermoPoint_StorePickup>
5
+ <version>1.2.1</version>
6
  </FermoPoint_StorePickup>
7
  </modules>
8
  <global>
app/design/frontend/base/default/template/fpstorepickup/firecheckout/onepage/billing/js.phtml CHANGED
@@ -3,7 +3,20 @@
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
  );
8
 
9
  Event.observe('shipping:same_as_billing_point', 'click', function(event){
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, idx) {
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="' + idx + '" 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
  Event.observe('shipping:same_as_billing_point', 'click', function(event){
js/fermopoint/firecheckout.js CHANGED
@@ -17,6 +17,12 @@
17
  var result = oldResponseHandler.apply(this, arguments);
18
  try {
19
  fpStorePickup.forceMapUpdate();
 
 
 
 
 
 
20
  } catch (e) {
21
  }
22
  return result;
17
  var result = oldResponseHandler.apply(this, arguments);
18
  try {
19
  fpStorePickup.forceMapUpdate();
20
+ setTimeout(function () {
21
+ fpStorePickup.forceMapUpdate();
22
+ }, 1);
23
+ setTimeout(function () {
24
+ fpStorePickup.forceMapUpdate();
25
+ }, 100);
26
  } catch (e) {
27
  }
28
  return result;
js/fermopoint/storepickup.js CHANGED
@@ -1,10 +1,11 @@
1
  var FermopointStorePickup = Class.create();
2
  FermopointStorePickup.prototype = {
3
 
4
- initialize: function(changeMethodUrl, searchUrl, mediaUrl) {
5
  this.changeMethodUrl = changeMethodUrl;
6
  this.searchUrl = searchUrl;
7
  this.mediaUrl = mediaUrl;
 
8
 
9
  this.error = false;
10
  this.points = [];
@@ -180,21 +181,24 @@ FermopointStorePickup.prototype = {
180
 
181
  showPointInfo: function (marker, idx) {
182
  var point = this.points[idx],
183
- days = [];
 
184
  for (var i = 0; i < point.hours.length; i++) {
185
  days.push('<span class="dow">' + point.hours[i].day + '</span>' + point.hours[i].hours.join(', '));
186
  }
187
- this.infoWindow.setContent(
188
- '<div class="fermopoint-info-window">' +
 
 
189
  '<div class="fermopoint-info-row title">' + point.name + '</div>' +
190
  '<div class="fermopoint-info-row select"><a class="fermopoint-select-me" rel="' + idx + '" href="#">' + Translator.translate('Select this pick-up point') + '</a></div>' +
191
  '<div class="fermopoint-info-row"></div>' +
192
  '<div class="fermopoint-info-row distance"><strong>' + Translator.translate('Distance') + ': </strong>' + point.distance + ' km </div>' +
193
  '<div class="fermopoint-info-row contact"><strong>' + Translator.translate('Contact') + ': </strong>' + point.contact + '</div>'+
194
  '<div class="fermopoint-info-row category"><strong>' + Translator.translate('Category') + ': </strong>' + point.category + '</div>'+
195
- '<div class="fermopoint-info-row hours"><!--strong>' + Translator.translate('Hours') + ': </strong--><div class="hours-list">' + days.join('<br />') + '</div></div>'
196
-
197
- );
198
  this.infoWindow.open(this.map, marker);
199
  },
200
 
1
  var FermopointStorePickup = Class.create();
2
  FermopointStorePickup.prototype = {
3
 
4
+ initialize: function(changeMethodUrl, searchUrl, mediaUrl, infoCallback) {
5
  this.changeMethodUrl = changeMethodUrl;
6
  this.searchUrl = searchUrl;
7
  this.mediaUrl = mediaUrl;
8
+ this.infoCallback = infoCallback;
9
 
10
  this.error = false;
11
  this.points = [];
181
 
182
  showPointInfo: function (marker, idx) {
183
  var point = this.points[idx],
184
+ days = [],
185
+ content;
186
  for (var i = 0; i < point.hours.length; i++) {
187
  days.push('<span class="dow">' + point.hours[i].day + '</span>' + point.hours[i].hours.join(', '));
188
  }
189
+ if (typeof this.infoCallback === 'function')
190
+ content = this.infoCallback(point, idx);
191
+ else
192
+ content = '<div class="fermopoint-info-window">' +
193
  '<div class="fermopoint-info-row title">' + point.name + '</div>' +
194
  '<div class="fermopoint-info-row select"><a class="fermopoint-select-me" rel="' + idx + '" href="#">' + Translator.translate('Select this pick-up point') + '</a></div>' +
195
  '<div class="fermopoint-info-row"></div>' +
196
  '<div class="fermopoint-info-row distance"><strong>' + Translator.translate('Distance') + ': </strong>' + point.distance + ' km </div>' +
197
  '<div class="fermopoint-info-row contact"><strong>' + Translator.translate('Contact') + ': </strong>' + point.contact + '</div>'+
198
  '<div class="fermopoint-info-row category"><strong>' + Translator.translate('Category') + ': </strong>' + point.category + '</div>'+
199
+ '<div class="fermopoint-info-row hours"><!--strong>' + Translator.translate('Hours') + ': </strong--><div class="hours-list">' + days.join('<br />') + '</div></div></div>'
200
+ ;
201
+ this.infoWindow.setContent(content);
202
  this.infoWindow.open(this.map, marker);
203
  },
204
 
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>fermopoint</name>
4
- <version>1.2.0</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>+ Compatibility with TM FireCheckout</notes>
12
  <authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
13
- <date>2015-10-15</date>
14
- <time>13:32:37</time>
15
- <contents><target name="magecommunity"><dir name="FermoPoint"><dir name="StorePickup"><dir><dir name="Block"><dir name="Adminhtml"><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><file name="Map.php" hash="546a20b5c8477952392fdf7d90635e04"/></dir><dir name="Helper"><file name="Config.php" hash="976bccea81cde416e6c7ccdecbc174ee"/><file name="Data.php" hash="2cf93d2c91bdb35f6b69a6850358365c"/></dir><dir name="Model"><dir name="Api"><file name="OrderCollection.php" hash="f43b08d838be60a4e923fd8e3373356f"/><file name="SearchData.php" hash="97543705dfb6ff16c64761d566ff30f7"/></dir><file name="Api.php" hash="f80281ef215ae86396c02bd7e8839a3b"/><dir name="Carrier"><file name="Storepickup.php" hash="fe1eba536223f737c90b6ee1019d89e8"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="c7403a99deffd0cabc38bc64c274e417"/><dir name="Order"><file name="Point.php" hash="e5d033a2ee6add18f52bd0068102b22f"/></dir><file name="Point.php" hash="b5924ba282ad76dffc269b9c13b823f9"/><file name="Points.php" hash="37f236eabd20c5f91dc6958b600d5d21"/><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="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="339258a7f63260b5dfa7706058d08c5d"/><file name="ValidateController.php" hash="81869825387f94dfaa8475408edf054f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f790d0329024eba67a9018fd782a763a"/><file name="config.xml" hash="62c255d6e76d223a0c6a34723cecfd17"/><file name="jstranslator.xml" hash="f6340ca99cf070450e94d3f0c8f86da2"/><file name="system.xml" hash="4585c331972160f8c6f9d26f2bb36476"/></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="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="7b2a9f3f2e75d8fd6ade7c363077b963"/><file name="radio.phtml" hash="a40fd64f5cdd9e35dcd4d8997cf22b13"/></dir></dir></dir></dir><file name="map.phtml" hash="1749388c6101314b73939c7a0c47983c"/></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="41f93eaa23e8ccdcb1e403f396c86da8"/><file name="markerclusterer.js" hash="b623ac6d39ea8ed99d179db49b7b0bab"/><file name="storepickup.js" hash="3f3bc937af937212c7a799d4d59183e0"/></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="c0619cfa9fd6f2edf4c363120c54dbff"/></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.2.1</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>* Some improvements</notes>
12
  <authors><author><name>Fermo!Point</name><user>fermopoint</user><email>support@fermopoint.it</email></author></authors>
13
+ <date>2015-10-20</date>
14
+ <time>06:37:12</time>
15
+ <contents><target name="magecommunity"><dir name="FermoPoint"><dir name="StorePickup"><dir><dir name="Block"><dir name="Adminhtml"><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="546a20b5c8477952392fdf7d90635e04"/></dir><dir name="Helper"><file name="Config.php" hash="976bccea81cde416e6c7ccdecbc174ee"/><file name="Data.php" hash="2cf93d2c91bdb35f6b69a6850358365c"/></dir><dir name="Model"><dir name="Api"><file name="OrderCollection.php" hash="f43b08d838be60a4e923fd8e3373356f"/><file name="SearchData.php" hash="97543705dfb6ff16c64761d566ff30f7"/></dir><file name="Api.php" hash="ea72b53b180c5d9a9e44f40bc413e881"/><dir name="Carrier"><file name="Storepickup.php" hash="fe1eba536223f737c90b6ee1019d89e8"/></dir><file name="GoogleMaps.php" hash="57e207c865f97f5eb7c2832862a052d1"/><file name="Observer.php" hash="c7403a99deffd0cabc38bc64c274e417"/><dir name="Order"><file name="Point.php" hash="e5d033a2ee6add18f52bd0068102b22f"/></dir><file name="Point.php" hash="b5924ba282ad76dffc269b9c13b823f9"/><file name="Points.php" hash="37f236eabd20c5f91dc6958b600d5d21"/><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="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="339258a7f63260b5dfa7706058d08c5d"/><file name="ValidateController.php" hash="81869825387f94dfaa8475408edf054f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f790d0329024eba67a9018fd782a763a"/><file name="config.xml" hash="eba098a2b77f0cc8fb2829d4a40cd4c9"/><file name="jstranslator.xml" hash="f6340ca99cf070450e94d3f0c8f86da2"/><file name="system.xml" hash="4585c331972160f8c6f9d26f2bb36476"/></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="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="0f6cf600a3ceec97b94f85c3b52a9c68"/><file name="radio.phtml" hash="a40fd64f5cdd9e35dcd4d8997cf22b13"/></dir></dir></dir></dir><file name="map.phtml" hash="1749388c6101314b73939c7a0c47983c"/></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="d69054fc484ec4da120b2602adeb3323"/></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>
skin/frontend/base/default/fermopoint/css/storepickup.css CHANGED
@@ -91,8 +91,12 @@
91
  .input-box .ajax-validate {display: none;}
92
  .input-box.loading .ajax-validate {display: inline; position: relative; left: -25px;}
93
 
 
94
  .firecheckout-index-index .col3-set.firecheckout-set .form-list .control label[for="shipping:same_as_billing_point"] { width: 90% !important; }
95
  .firecheckout-index-index .fermopoint .form-list .fields .field { width: 100%; }
96
  .firecheckout-index-index #shipping:same_as_billing_point { vertical-align: top; }
97
  .firecheckout-index-index #fermopoint_search_address { display: block; }
98
- .firecheckout-index-index .fermopoint-info-window { min-width: 220px; }
 
 
 
91
  .input-box .ajax-validate {display: none;}
92
  .input-box.loading .ajax-validate {display: inline; position: relative; left: -25px;}
93
 
94
+ /* Fire Checkout specific styles */
95
  .firecheckout-index-index .col3-set.firecheckout-set .form-list .control label[for="shipping:same_as_billing_point"] { width: 90% !important; }
96
  .firecheckout-index-index .fermopoint .form-list .fields .field { width: 100%; }
97
  .firecheckout-index-index #shipping:same_as_billing_point { vertical-align: top; }
98
  .firecheckout-index-index #fermopoint_search_address { display: block; }
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;}