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.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.3 to 1.0.3.1
app/code/local/Send24/Shipping/Model/Carrier.php
CHANGED
|
@@ -231,7 +231,7 @@ class Send24_Shipping_Model_Carrier extends Mage_Shipping_Model_Carrier_Abstract
|
|
| 231 |
break;
|
| 232 |
case 'send24_shipping_send24':
|
| 233 |
if($is_available_denmark == true){
|
| 234 |
-
$insurance_price =
|
| 235 |
$discount = "false";
|
| 236 |
$type = $price_need = '';
|
| 237 |
|
|
@@ -503,12 +503,10 @@ class Send24_Shipping_Model_Carrier extends Mage_Shipping_Model_Carrier_Abstract
|
|
| 503 |
$billing_country = 'Denmark';
|
| 504 |
}
|
| 505 |
|
| 506 |
-
|
| 507 |
-
|
| 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 |
|
| 513 |
// Get billing coordinates.
|
| 514 |
$billing_url = "http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=".urlencode($full_billing_address);
|
|
@@ -641,8 +639,8 @@ class Send24_Shipping_Model_Carrier extends Mage_Shipping_Model_Carrier_Abstract
|
|
| 641 |
if ($send24_countries[$i]->product_id == $this->product_id_danmark )
|
| 642 |
{
|
| 643 |
// Insurance.
|
| 644 |
-
$insurance_price = $this->getConfigData('select_insurance');
|
| 645 |
-
$this->price_denmark = $send24_countries[$i]->price
|
| 646 |
$is_available = true;
|
| 647 |
break;
|
| 648 |
}else{
|
| 231 |
break;
|
| 232 |
case 'send24_shipping_send24':
|
| 233 |
if($is_available_denmark == true){
|
| 234 |
+
$insurance_price = 0;
|
| 235 |
$discount = "false";
|
| 236 |
$type = $price_need = '';
|
| 237 |
|
| 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 |
// Get billing coordinates.
|
| 512 |
$billing_url = "http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=".urlencode($full_billing_address);
|
| 639 |
if ($send24_countries[$i]->product_id == $this->product_id_danmark )
|
| 640 |
{
|
| 641 |
// Insurance.
|
| 642 |
+
// $insurance_price = $this->getConfigData('select_insurance');
|
| 643 |
+
$this->price_denmark = $send24_countries[$i]->price;
|
| 644 |
$is_available = true;
|
| 645 |
break;
|
| 646 |
}else{
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 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>
|
|
@@ -33,8 +33,8 @@ Register your free account on Send24.
|
|
| 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:
|
| 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="
|
| 38 |
<compatible/>
|
| 39 |
<dependencies><required><php><min>5.1.0</min><max>7.0.0</max></php></required></dependencies>
|
| 40 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>4f4e331f92f560de38f6bc2b5501d8cb</name>
|
| 4 |
+
<version>1.0.3.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>GNU General Public License (GPL)</license>
|
| 7 |
<channel>community</channel>
|
| 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:32:43</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="d2799f993f6f49e0411dd0905ea6aeca"/><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>
|
