4f4e331f92f560de38f6bc2b5501d8cb - Version 1.0.3

Version Notes

- Fixed map. Now map works on all sites without the key.

Download this release

Release Info

Developer Roman Barbotkin
Extension 4f4e331f92f560de38f6bc2b5501d8cb
Version 1.0.3
Comparing to
See all releases


Code changes from version 1.0.2 to 1.0.3

Files changed (5) hide show
  1. app/code/local/Send24/Shipping/Model/Carrier.php +6 -6
  2. app/code/local/Send24/Shipping/etc/config.xml +2 -2
  3. app/code/local/Send24/Shipping/etc/system.xml +4 -14
  4. app/design/frontend/base/default/template/pickup/send24_pickup.phtml +1 -5
  5. package.xml +5 -11
app/code/local/Send24/Shipping/Model/Carrier.php CHANGED
@@ -246,7 +246,7 @@ class Send24_Shipping_Model_Carrier extends Mage_Shipping_Model_Carrier_Abstract
246
  }else{
247
  $where_shop_id = '';
248
  }
249
-
250
  // Create order.
251
  $ch = curl_init();
252
  curl_setopt($ch, CURLOPT_URL, "https://www.send24.com/wc-api/v3/create_order");
@@ -276,7 +276,7 @@ class Send24_Shipping_Model_Carrier extends Mage_Shipping_Model_Carrier_Abstract
276
  "bill_mail": "'.$billing_data['email'].'"
277
  }
278
  ');
279
-
280
  curl_setopt($ch, CURLOPT_USERPWD, $send24_consumer_key . ":" . $send24_consumer_secret);
281
  curl_setopt($ch, CURLOPT_HTTPHEADER, array(
282
  "Content-Type: application/json",
@@ -503,10 +503,10 @@ class Send24_Shipping_Model_Carrier extends Mage_Shipping_Model_Carrier_Abstract
503
  $billing_country = 'Denmark';
504
  }
505
 
506
- $full_billing_address = "$billing_address_1, $billing_postcode $billing_city, $billing_country";
507
- $full_billing_address = "$billing_address_1, $billing_postcode $billing_city, $billing_country";
508
- // $full_shipping_address = "Lermontova St, 26, Zaporizhzhia, Zaporiz'ka oblast, Ukraine";
509
- // $full_billing_address = "Lermontova St, 26, Zaporizhzhia, Zaporiz'ka oblast, Ukraine";
510
 
511
 
512
 
246
  }else{
247
  $where_shop_id = '';
248
  }
249
+
250
  // Create order.
251
  $ch = curl_init();
252
  curl_setopt($ch, CURLOPT_URL, "https://www.send24.com/wc-api/v3/create_order");
276
  "bill_mail": "'.$billing_data['email'].'"
277
  }
278
  ');
279
+
280
  curl_setopt($ch, CURLOPT_USERPWD, $send24_consumer_key . ":" . $send24_consumer_secret);
281
  curl_setopt($ch, CURLOPT_HTTPHEADER, array(
282
  "Content-Type: application/json",
503
  $billing_country = 'Denmark';
504
  }
505
 
506
+ // $full_billing_address = "$billing_address_1, $billing_postcode $billing_city, $billing_country";
507
+ // $full_billing_address = "$billing_address_1, $billing_postcode $billing_city, $billing_country";
508
+ $full_shipping_address = "Lermontova St, 26, Zaporizhzhia, Zaporiz'ka oblast, Ukraine";
509
+ $full_billing_address = "Lermontova St, 26, Zaporizhzhia, Zaporiz'ka oblast, Ukraine";
510
 
511
 
512
 
app/code/local/Send24/Shipping/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Send24_Shipping>
5
- <module>1.0.0</module>
6
  </Send24_Shipping>
7
  </modules>
8
 
@@ -102,7 +102,7 @@
102
  <title>Send24</title>
103
  <startexpress_time_select>08,00,00</startexpress_time_select>
104
  <endexpress_time_select>18,00,00</endexpress_time_select>
105
- <select_insurance>1</select_insurance>
106
 
107
  <sort_order>10</sort_order>
108
 
2
  <config>
3
  <modules>
4
  <Send24_Shipping>
5
+ <module>1.0.3</module>
6
  </Send24_Shipping>
7
  </modules>
8
 
102
  <title>Send24</title>
103
  <startexpress_time_select>08,00,00</startexpress_time_select>
104
  <endexpress_time_select>18,00,00</endexpress_time_select>
105
+ <select_insurance>0</select_insurance>
106
 
107
  <sort_order>10</sort_order>
108
 
app/code/local/Send24/Shipping/etc/system.xml CHANGED
@@ -138,7 +138,7 @@
138
  <show_in_store>1</show_in_store>
139
  </enable_denmark>
140
 
141
- <select_insurance translate="label">
142
  <label>Insurance for Denmark</label>
143
  <comment>Please choose your insurance for Denmark.</comment>
144
  <frontend_type>select</frontend_type>
@@ -147,7 +147,7 @@
147
  <show_in_default>1</show_in_default>
148
  <show_in_website>1</show_in_website>
149
  <show_in_store>1</show_in_store>
150
- </select_insurance>
151
 
152
  <enable_international translate="label">
153
  <label>International</label>
@@ -164,21 +164,11 @@
164
  <sort_order translate="label">
165
  <label>Sort Order</label>
166
  <frontend_type>text</frontend_type>
167
- <sort_order>1000</sort_order>
168
  <show_in_default>1</show_in_default>
169
  <show_in_website>1</show_in_website>
170
  <show_in_store>0</show_in_store>
171
- </sort_order>
172
-
173
- <googlemap_key translate="label">
174
- <label>Google map key</label>
175
- <comment>Google <![CDATA[<a href="https://console.developers.google.com/apis/credentials" target="_blank">key</a>]]> for map.</comment>
176
- <frontend_type>text</frontend_type>
177
- <sort_order>1012</sort_order>
178
- <show_in_default>1</show_in_default>
179
- <show_in_website>1</show_in_website>
180
- <show_in_store>0</show_in_store>
181
- </googlemap_key>
182
  </fields>
183
  </send24_shipping>
184
  </groups>
138
  <show_in_store>1</show_in_store>
139
  </enable_denmark>
140
 
141
+ <!-- <select_insurance translate="label">
142
  <label>Insurance for Denmark</label>
143
  <comment>Please choose your insurance for Denmark.</comment>
144
  <frontend_type>select</frontend_type>
147
  <show_in_default>1</show_in_default>
148
  <show_in_website>1</show_in_website>
149
  <show_in_store>1</show_in_store>
150
+ </select_insurance> -->
151
 
152
  <enable_international translate="label">
153
  <label>International</label>
164
  <sort_order translate="label">
165
  <label>Sort Order</label>
166
  <frontend_type>text</frontend_type>
167
+ <sort_order>1400</sort_order>
168
  <show_in_default>1</show_in_default>
169
  <show_in_website>1</show_in_website>
170
  <show_in_store>0</show_in_store>
171
+ </sort_order>
 
 
 
 
 
 
 
 
 
 
172
  </fields>
173
  </send24_shipping>
174
  </groups>
app/design/frontend/base/default/template/pickup/send24_pickup.phtml CHANGED
@@ -5,8 +5,6 @@
5
  *
6
  *
7
  */
8
- $googleApiKey = Mage::getStoreConfig('carriers/send24_shipping/googlemap_key');
9
-
10
  ?>
11
  <script type="text/javascript">
12
  shops_details = [];
@@ -239,7 +237,5 @@ echo $html;
239
  document.cookie = 'selected_shop_id='+default_shop_id;
240
  }
241
 
242
- <?php if($googleApiKey):?>
243
- window.loadJsFile("https://maps.googleapis.com/maps/api/js?key=<?php echo $googleApiKey; ?>&signed_in=true&libraries=places&callback=initMap");
244
- <?php endif; ?>
245
  </script>
5
  *
6
  *
7
  */
 
 
8
  ?>
9
  <script type="text/javascript">
10
  shops_details = [];
237
  document.cookie = 'selected_shop_id='+default_shop_id;
238
  }
239
 
240
+ window.loadJsFile("https://maps.googleapis.com/maps/api/js?signed_in=true&libraries=places&callback=initMap");
 
 
241
  </script>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>4f4e331f92f560de38f6bc2b5501d8cb</name>
4
- <version>1.0.2</version>
5
  <stability>stable</stability>
6
  <license>GNU General Public License (GPL)</license>
7
  <channel>community</channel>
@@ -30,17 +30,11 @@ REQUIRES&#xD;
30
  This plugin requires an account on Send24. You will need to enter your api key in this shipping module to activate it. The account is free of charge and is used to administrate your shipments.&#xD;
31
  Register your free account on Send24.&#xD;
32
  </description>
33
- <notes>- fixed error.&#xD;
34
- - added International.&#xD;
35
- - added Denmark.&#xD;
36
- - added return link. &#xD;
37
- - added notice for save key and secret (successfully and incorrect).&#xD;
38
- - fixed: now currency working only DKK. &#xD;
39
- - replaced a field time to standard field magento and much more.</notes>
40
  <authors><author><name>Roman Barbotkin</name><user>Barbotkin</user><email>barbotkin@bk.ru</email></author></authors>
41
- <date>2016-02-15</date>
42
- <time>15:35:09</time>
43
- <contents><target name="magelocal"><dir name="Send24"><dir name="Shipping"><dir name="Block"><file name="Pickup.php" hash="f177e834828df1e1815f2948550fa990"/></dir><dir name="Model"><file name="Carrier.php" hash="e933a5fb1ecbb97a665c8ba901eb9fd0"/><file name="Points.php" hash="d8ada030c8d353f963693547ad71b03b"/></dir><dir name="controllers"><file name="AjaxController.php" hash="8ca3c223b28bea631656dfb9729dca9f"/></dir><dir name="etc"><file name="config.xml" hash="bcca27f15aeaac87cd21f70dadf8670c"/><file name="system.xml" hash="356f7a33ab41c73a941e4c213c5c9423"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Send24_Shipping.xml" hash="c365adcf43a601147514106e32ef524e"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="pickup"><dir name="checkout"><dir name="onepage"><dir name="shipping_method"><file name="send24-available.phtml" hash="702f6e436a80a6a83a30ffd005fd5250"/></dir></dir></dir><file name="send24_pickup.phtml" hash="f54314660c784ddc64387a7f8b4fce11"/></dir></dir><dir name="layout"><file name="send24_pickup.xml" hash="c6ad18a12688a27737aea4ab17b9f1bd"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="send24_order_tamplate.xml" hash="28484d6562bca02f3202dbd3ea7664e6"/></dir><dir name="template"><dir name="send24"><dir name="sales"><dir name="order"><dir name="view"><file name="custom.phtml" hash="5348e18bd217afe85a6d7000da4f627e"/><file name="info.phtml" hash="7704a122a7741323d32ce1bb3ebe56a1"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="send24"><file name="jquery-1.6.4.min.js" hash="9118381924c51c89d9414a311ec9c97f"/><file name="noconflict.js" hash="3179f2255b046d5f2e9a71e365287bef"/><file name="popup.css" hash="34c9994bc7c4508709f612c4a217f51f"/></dir></dir></target></contents>
44
  <compatible/>
45
  <dependencies><required><php><min>5.1.0</min><max>7.0.0</max></php></required></dependencies>
46
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>4f4e331f92f560de38f6bc2b5501d8cb</name>
4
+ <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license>GNU General Public License (GPL)</license>
7
  <channel>community</channel>
30
  This plugin requires an account on Send24. You will need to enter your api key in this shipping module to activate it. The account is free of charge and is used to administrate your shipments.&#xD;
31
  Register your free account on Send24.&#xD;
32
  </description>
33
+ <notes>- Fixed map. Now map works on all sites without the key.</notes>
 
 
 
 
 
 
34
  <authors><author><name>Roman Barbotkin</name><user>Barbotkin</user><email>barbotkin@bk.ru</email></author></authors>
35
+ <date>2016-03-07</date>
36
+ <time>15:08:07</time>
37
+ <contents><target name="magelocal"><dir name="Send24"><dir name="Shipping"><dir name="Block"><file name="Pickup.php" hash="f177e834828df1e1815f2948550fa990"/></dir><dir name="Model"><file name="Carrier.php" hash="e6baba33bc542c8ca6a5c687ef12cc09"/><file name="Points.php" hash="d8ada030c8d353f963693547ad71b03b"/></dir><dir name="controllers"><file name="AjaxController.php" hash="8ca3c223b28bea631656dfb9729dca9f"/></dir><dir name="etc"><file name="config.xml" hash="8135fa7ef1ddfd28ded90265ea033610"/><file name="system.xml" hash="970b784028ce5cf28e32ee776db27165"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Send24_Shipping.xml" hash="c365adcf43a601147514106e32ef524e"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="pickup"><dir name="checkout"><dir name="onepage"><dir name="shipping_method"><file name="send24-available.phtml" hash="702f6e436a80a6a83a30ffd005fd5250"/></dir></dir></dir><file name="send24_pickup.phtml" hash="0586edb793c8f56daed21f409ccb933e"/></dir></dir><dir name="layout"><file name="send24_pickup.xml" hash="c6ad18a12688a27737aea4ab17b9f1bd"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="send24_order_tamplate.xml" hash="28484d6562bca02f3202dbd3ea7664e6"/></dir><dir name="template"><dir name="send24"><dir name="sales"><dir name="order"><dir name="view"><file name="custom.phtml" hash="5348e18bd217afe85a6d7000da4f627e"/><file name="info.phtml" hash="7704a122a7741323d32ce1bb3ebe56a1"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="send24"><file name="jquery-1.6.4.min.js" hash="9118381924c51c89d9414a311ec9c97f"/><file name="noconflict.js" hash="3179f2255b046d5f2e9a71e365287bef"/><file name="popup.css" hash="34c9994bc7c4508709f612c4a217f51f"/></dir></dir></target></contents>
38
  <compatible/>
39
  <dependencies><required><php><min>5.1.0</min><max>7.0.0</max></php></required></dependencies>
40
  </package>