indabox - Version 1.0.1.3

Version Notes

Improved compatibility with old Magento versions

Download this release

Release Info

Developer IndaBox
Extension indabox
Version 1.0.1.3
Comparing to
See all releases


Code changes from version 1.0.1.2 to 1.0.1.3

Files changed (8) hide show
  1. app/code/local/IndaBox/StorePickup/Block/Adminhtml/Configuration/Disabled.php +12 -0
  2. app/code/local/IndaBox/StorePickup/Model/Point.php +1 -0
  3. app/code/local/IndaBox/StorePickup/etc/config.xml +2 -1
  4. app/code/local/IndaBox/StorePickup/etc/jstranslator.xml +3 -0
  5. app/code/local/IndaBox/StorePickup/etc/system.xml +5 -3
  6. app/locale/it_IT/IndaBox_StorePickup.csv +2 -1
  7. js/indabox/storepickup.js +1 -0
  8. package.xml +4 -4
app/code/local/IndaBox/StorePickup/Block/Adminhtml/Configuration/Disabled.php ADDED
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class IndaBox_StorePickup_Block_Adminhtml_Configuration_Disabled extends Mage_Adminhtml_Block_System_Config_Form_Field
4
+ {
5
+
6
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
7
+ {
8
+ $element->setReadonly(true);
9
+ return parent::_getElementHtml($element);
10
+ }
11
+
12
+ }
app/code/local/IndaBox/StorePickup/Model/Point.php CHANGED
@@ -127,6 +127,7 @@ class IndaBox_StorePickup_Model_Point extends Varien_Object {
127
  'longitude' => $this->getLongitude(),
128
  'distance' => $this->getDistance(),
129
  'url' => $this->getUri(),
 
130
  ));
131
 
132
  return $result;
127
  'longitude' => $this->getLongitude(),
128
  'distance' => $this->getDistance(),
129
  'url' => $this->getUri(),
130
+ 'hours' => $this->getHours(),
131
  ));
132
 
133
  return $result;
app/code/local/IndaBox/StorePickup/etc/config.xml CHANGED
@@ -157,13 +157,14 @@
157
  <accept>0</accept>
158
  <active>0</active>
159
  <model>ibstorepickup/carrier_storepickup</model>
160
- <title>IndaBox StorePickup</title>
161
  <sandbox>1</sandbox>
162
  <debug>1</debug>
163
  <cost>0</cost>
164
  <maximum_subtotal>500</maximum_subtotal>
165
  <maximum_weight>15</maximum_weight>
166
  <tos_url>http://www.indabox.it/condizioni-prestashop/</tos_url>
 
167
  </ibstorepickup>
168
  </carriers>
169
  </default>
157
  <accept>0</accept>
158
  <active>0</active>
159
  <model>ibstorepickup/carrier_storepickup</model>
160
+ <title>Corriere con consegna presso IndaBox Point</title>
161
  <sandbox>1</sandbox>
162
  <debug>1</debug>
163
  <cost>0</cost>
164
  <maximum_subtotal>500</maximum_subtotal>
165
  <maximum_weight>15</maximum_weight>
166
  <tos_url>http://www.indabox.it/condizioni-prestashop/</tos_url>
167
+ <allowspecific_payment>1</allowspecific_payment>
168
  </ibstorepickup>
169
  </carriers>
170
  </default>
app/code/local/IndaBox/StorePickup/etc/jstranslator.xml CHANGED
@@ -18,4 +18,7 @@
18
  <indabox-telephone translate="message" module="ibstorepickup">
19
  <message>Telephone</message>
20
  </indabox-telephone>
 
 
 
21
  </jstranslator>
18
  <indabox-telephone translate="message" module="ibstorepickup">
19
  <message>Telephone</message>
20
  </indabox-telephone>
21
+ <indabox-hours translate="message" module="ibstorepickup">
22
+ <message>Hours</message>
23
+ </indabox-hours>
24
  </jstranslator>
app/code/local/IndaBox/StorePickup/etc/system.xml CHANGED
@@ -123,6 +123,7 @@
123
  <tos_url translate="label">
124
  <label>Terms and Conditions Url</label>
125
  <frontend_type>text</frontend_type>
 
126
  <sort_order>40</sort_order>
127
  <show_in_default>1</show_in_default>
128
  <show_in_website>1</show_in_website>
@@ -146,12 +147,12 @@
146
  <sort_order>100</sort_order>
147
  <source_model>ibstorepickup/source_selectorpayment</source_model>
148
  <show_in_default>1</show_in_default>
149
- <show_in_website>1</show_in_website>
150
  <show_in_store>0</show_in_store>
151
  <depends><accept>1</accept></depends>
152
  </allowspecific_payment>
153
 
154
- <specificpayment translate="label">
155
  <label>Specific payments</label>
156
  <frontend_type>multiselect</frontend_type>
157
  <sort_order>110</sort_order>
@@ -159,7 +160,8 @@
159
  <show_in_default>1</show_in_default>
160
  <show_in_website>1</show_in_website>
161
  <show_in_store>0</show_in_store>
162
- <depends><allowspecific_payment>1</allowspecific_payment></depends>
 
163
  </specificpayment>
164
 
165
  </fields>
123
  <tos_url translate="label">
124
  <label>Terms and Conditions Url</label>
125
  <frontend_type>text</frontend_type>
126
+ <frontend_model>ibstorepickup/adminhtml_configuration_disabled</frontend_model>
127
  <sort_order>40</sort_order>
128
  <show_in_default>1</show_in_default>
129
  <show_in_website>1</show_in_website>
147
  <sort_order>100</sort_order>
148
  <source_model>ibstorepickup/source_selectorpayment</source_model>
149
  <show_in_default>1</show_in_default>
150
+ <show_in_website>0</show_in_website>
151
  <show_in_store>0</show_in_store>
152
  <depends><accept>1</accept></depends>
153
  </allowspecific_payment>
154
 
155
+ <specificpayment translate="label comment">
156
  <label>Specific payments</label>
157
  <frontend_type>multiselect</frontend_type>
158
  <sort_order>110</sort_order>
160
  <show_in_default>1</show_in_default>
161
  <show_in_website>1</show_in_website>
162
  <show_in_store>0</show_in_store>
163
+ <depends><accept>1</accept><allowspecific_payment>1</allowspecific_payment></depends>
164
+ <comment>Warning! Do not select "Cash on Delivery" methods, as we do not support them</comment>
165
  </specificpayment>
166
 
167
  </fields>
app/locale/it_IT/IndaBox_StorePickup.csv CHANGED
@@ -35,4 +35,5 @@
35
  "Accept TOS","Accettare Termini di Servizio"
36
  "IndaBox Point","IndaBox Point"
37
  "For all the information on installing and configuring the module and IndaBox Merchant Account, you can refer to <a href=""%s"" target=""_blank"">this page</a>","Per tutte le informazioni sull´installazione e la configurazione del modulo e IndaBox Merchant Account, è possibile fare riferimento a <a href=""%s"" target=""_blank"">questa pagina</a>"
38
-
 
35
  "Accept TOS","Accettare Termini di Servizio"
36
  "IndaBox Point","IndaBox Point"
37
  "For all the information on installing and configuring the module and IndaBox Merchant Account, you can refer to <a href=""%s"" target=""_blank"">this page</a>","Per tutte le informazioni sull´installazione e la configurazione del modulo e IndaBox Merchant Account, è possibile fare riferimento a <a href=""%s"" target=""_blank"">questa pagina</a>"
38
+ "Hours","Orari"
39
+ "Warning! Do not select ""Cash on Delivery"" methods, as we do not support them","Attenzione! Non selezionare il contrassegno come metodo di pagamento compatibile, la merce non verrà ritirata"
js/indabox/storepickup.js CHANGED
@@ -86,6 +86,7 @@ IndaboxStorePickup.prototype = {
86
  '<div class="row"></div>' +
87
  '<div class="row distance"><strong>' + Translator.translate('Distance') + ': </strong>' + point.distance + ' km </div>' +
88
  '<div class="row telephone"><strong>' + Translator.translate('Telephone') + ': </strong>' + point.telephone + '</div>'+
 
89
  '<div class="row select"><a class="indabox-select-me" rel="' + idx + '" href="#">' + Translator.translate('Select this pick-up point') + '</a></div>'
90
  );
91
  this.infoWindow.open(this.map, marker);
86
  '<div class="row"></div>' +
87
  '<div class="row distance"><strong>' + Translator.translate('Distance') + ': </strong>' + point.distance + ' km </div>' +
88
  '<div class="row telephone"><strong>' + Translator.translate('Telephone') + ': </strong>' + point.telephone + '</div>'+
89
+ '<div class="row hours"><strong>' + Translator.translate('Hours') + ': </strong>' + point.hours + '</div>'+
90
  '<div class="row select"><a class="indabox-select-me" rel="' + idx + '" href="#">' + Translator.translate('Select this pick-up point') + '</a></div>'
91
  );
92
  this.infoWindow.open(this.map, marker);
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>indabox</name>
4
- <version>1.0.1.2</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>
@@ -10,9 +10,9 @@
10
  <description>Allow to use shipping with IndaBox</description>
11
  <notes>Improved compatibility with old Magento versions</notes>
12
  <authors><author><name>IndaBox</name><user>indabox</user><email>info@indabox.it</email></author><author><name>Advanced Logic</name><user>alogic</user><email>advancedlogiceu@gmail.com</email></author></authors>
13
- <date>2014-07-16</date>
14
- <time>10:24:22</time>
15
- <contents><target name="magelocal"><dir name="IndaBox"><dir name="StorePickup"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><file name="Manual.php" hash="c30c06ac6e4df05cf041fc22dc643854"/></dir></dir><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="340a0a40207e30252a4fc08671be8a46"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="967c98f5c0bcd57ca8c793e1f8de2498"/></dir></dir></dir></dir><file name="Map.php" hash="2c644a416a2ffa7b23a19ed6ef701690"/></dir><file name="Exception.php" hash="a7e958b8282d8bd49d658edfad5df19e"/><dir name="Helper"><file name="Config.php" hash="31dba4d9d880082528218bbcd843db2c"/><file name="Data.php" hash="40a1bb55faa368ea74ac3b8cbf5a430f"/></dir><dir name="Model"><file name="Api.php" hash="585755e2c2658c18f5192ad619a339d4"/><dir name="Carrier"><file name="Storepickup.php" hash="04c74ad0e3390b6f1f5d7d3f66cb4b98"/></dir><file name="GoogleMaps.php" hash="c2eb3bceb545b0e10b689f7de0866778"/><file name="Observer.php" hash="68789fa99acefc675193032da3f720bd"/><dir name="Order"><file name="Point.php" hash="657eda40931dd6feb86b974bb36f5d96"/></dir><file name="Point.php" hash="cedd47800610db090a8937cbe8066571"/><file name="Points.php" hash="784d98055d815e48f20a4c302304d817"/><dir name="Resource"><dir name="Order"><dir name="Point"><file name="Collection.php" hash="2c7417314e0d254ef77e12329f813207"/></dir><file name="Point.php" hash="da6e3f1c3caaf9b0365c7cdc8fcba644"/></dir></dir><dir name="Source"><file name="Payment.php" hash="f223a5951a18f2b293656fb696d4ac57"/><file name="Selectorpayment.php" hash="82f18db0f8be393a01d234d4f9c4fbc4"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="8891642df2404ab74d5804a8a74ffe5d"/></dir><dir name="etc"><file name="config.xml" hash="d43d0246f5911707f2f513ae2a89e729"/><file name="jstranslator.xml" hash="8ec2ada62b1484f3c6141006a3c4d184"/><file name="system.xml" hash="68c44ba242835e97869be4f578885b61"/></dir><dir name="sql"><dir name="ibstorepickup_setup"><file name="install-0.1.0.php" hash="32c4475a704617e53a92dad17a91000e"/><file name="mysql4-install-0.1.0.php" hash="20ad32797a42d074579aa372479e94df"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="indabox"><file name="markerclusterer.js" hash="1bcedf8ebca05ff5737878116582f629"/><file name="storepickup.js" hash="efe49a4d3b914bc8d79eb0cb33ff8680"/></dir></dir><dir name="app"><dir name="etc"><dir name="modules"><file name="IndaBox_StorePickup.xml" hash="bc600feadf12b176c134158ca2f12726"/></dir></dir></dir></target><target name="magemedia"><dir name="indabox"><file name="marker_location.png" hash="000a6513abbe2c9683b19f49873710c5"/><file name="marker_point.png" hash="ea488afc95fd4713c3ecbfcb7a0cfb38"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="ibstorepickup"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="b5ceae67cd76b024f3e9de05acc817a5"/><file name="billing_15.phtml" hash="86da377bf97808c083a6c7d63f054e23"/><file name="billing_17.phtml" hash="8a55e9a25f24f50a534f9e095ce958f9"/></dir></dir><file name="map.phtml" hash="d60d7afa71cdbf48a9c7c5577849e21f"/></dir></dir><dir name="layout"><file name="ibstorepickup.xml" hash="a8fd146391dc8ece400893e4034344ec"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="indabox"><dir><dir name="css"><file name="storepickup.css" hash="30f63f16089efea263bb247e9e8888bd"/></dir><dir name="images"><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="it_IT"><file name="IndaBox_StorePickup.csv" hash="11bf579e01afd50d5207ddda8f9d56f4"/></dir><dir name="en_US"><file name="IndaBox_StorePickup.csv" hash="86bdcd9e56711b3f98461a5e1ef2e41a"/></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>indabox</name>
4
+ <version>1.0.1.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>
10
  <description>Allow to use shipping with IndaBox</description>
11
  <notes>Improved compatibility with old Magento versions</notes>
12
  <authors><author><name>IndaBox</name><user>indabox</user><email>info@indabox.it</email></author><author><name>Advanced Logic</name><user>alogic</user><email>advancedlogiceu@gmail.com</email></author></authors>
13
+ <date>2014-07-17</date>
14
+ <time>11:06:56</time>
15
+ <contents><target name="magelocal"><dir name="IndaBox"><dir name="StorePickup"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><file name="Disabled.php" hash="7ea2062a9e26689f8d95e5a613a6963e"/><file name="Manual.php" hash="c30c06ac6e4df05cf041fc22dc643854"/></dir></dir><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="340a0a40207e30252a4fc08671be8a46"/></dir><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="967c98f5c0bcd57ca8c793e1f8de2498"/></dir></dir></dir></dir><file name="Map.php" hash="2c644a416a2ffa7b23a19ed6ef701690"/></dir><file name="Exception.php" hash="a7e958b8282d8bd49d658edfad5df19e"/><dir name="Helper"><file name="Config.php" hash="31dba4d9d880082528218bbcd843db2c"/><file name="Data.php" hash="40a1bb55faa368ea74ac3b8cbf5a430f"/></dir><dir name="Model"><file name="Api.php" hash="585755e2c2658c18f5192ad619a339d4"/><dir name="Carrier"><file name="Storepickup.php" hash="04c74ad0e3390b6f1f5d7d3f66cb4b98"/></dir><file name="GoogleMaps.php" hash="c2eb3bceb545b0e10b689f7de0866778"/><file name="Observer.php" hash="68789fa99acefc675193032da3f720bd"/><dir name="Order"><file name="Point.php" hash="657eda40931dd6feb86b974bb36f5d96"/></dir><file name="Point.php" hash="fd7d0ca0db6fff6a55efd1c274a05bc5"/><file name="Points.php" hash="784d98055d815e48f20a4c302304d817"/><dir name="Resource"><dir name="Order"><dir name="Point"><file name="Collection.php" hash="2c7417314e0d254ef77e12329f813207"/></dir><file name="Point.php" hash="da6e3f1c3caaf9b0365c7cdc8fcba644"/></dir></dir><dir name="Source"><file name="Payment.php" hash="f223a5951a18f2b293656fb696d4ac57"/><file name="Selectorpayment.php" hash="82f18db0f8be393a01d234d4f9c4fbc4"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="8891642df2404ab74d5804a8a74ffe5d"/></dir><dir name="etc"><file name="config.xml" hash="2da2a6ed613c1106fbdf4ce647428b25"/><file name="jstranslator.xml" hash="7dcdf5d87e41ea9dcfd4b5ef75d6021c"/><file name="system.xml" hash="91b83a3848a838d072ff9e0a69a293d4"/></dir><dir name="sql"><dir name="ibstorepickup_setup"><file name="install-0.1.0.php" hash="32c4475a704617e53a92dad17a91000e"/><file name="mysql4-install-0.1.0.php" hash="20ad32797a42d074579aa372479e94df"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="indabox"><file name="markerclusterer.js" hash="1bcedf8ebca05ff5737878116582f629"/><file name="storepickup.js" hash="31c133ee1c8609770637f71ca7d1868f"/></dir></dir><dir name="app"><dir name="etc"><dir name="modules"><file name="IndaBox_StorePickup.xml" hash="bc600feadf12b176c134158ca2f12726"/></dir></dir></dir></target><target name="magemedia"><dir name="indabox"><file name="marker_location.png" hash="000a6513abbe2c9683b19f49873710c5"/><file name="marker_point.png" hash="ea488afc95fd4713c3ecbfcb7a0cfb38"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="ibstorepickup"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="b5ceae67cd76b024f3e9de05acc817a5"/><file name="billing_15.phtml" hash="86da377bf97808c083a6c7d63f054e23"/><file name="billing_17.phtml" hash="8a55e9a25f24f50a534f9e095ce958f9"/></dir></dir><file name="map.phtml" hash="d60d7afa71cdbf48a9c7c5577849e21f"/></dir></dir><dir name="layout"><file name="ibstorepickup.xml" hash="a8fd146391dc8ece400893e4034344ec"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="indabox"><dir><dir name="css"><file name="storepickup.css" hash="30f63f16089efea263bb247e9e8888bd"/></dir><dir name="images"><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="it_IT"><file name="IndaBox_StorePickup.csv" hash="25ccbb2f2715aa5d98247a8601e8cd15"/></dir><dir name="en_US"><file name="IndaBox_StorePickup.csv" hash="86bdcd9e56711b3f98461a5e1ef2e41a"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>