Changeset 2010491

Timestamp:

01/11/2019 10:28:15 AM (7 years ago)

Author:

SmartSend

Message:

Tagging version 8.0.12

Location:

smart-send-logistics

Files:

• assets/screenshot-1.jpg (modified) (previous)
• assets/screenshot-2.jpg (modified) (previous)
• assets/screenshot-3.jpg (modified) (previous)
• assets/screenshot-5.jpg (modified) (previous)
• assets/screenshot-6.jpg (added)
• tags/8.0.12 (copied) (copied from smart-send-logistics/trunk)
• tags/8.0.12/api (deleted)
• tags/8.0.12/assets (copied) (copied from smart-send-logistics/trunk/assets)
• tags/8.0.12/assets/css/ss-shipping-frontend.css (copied) (copied from smart-send-logistics/trunk/assets/css/ss-shipping-frontend.css)
• tags/8.0.12/assets/js/ss-shipping-label.js (copied) (copied from smart-send-logistics/trunk/assets/js/ss-shipping-label.js)
• tags/8.0.12/carriers (deleted)
• tags/8.0.12/class.smartsend.bring.php (deleted)
• tags/8.0.12/class.smartsend.gls.php (deleted)
• tags/8.0.12/class.smartsend.postdanmark.php (deleted)
• tags/8.0.12/class.smartsend.posten.php (deleted)
• tags/8.0.12/class.smartsend.primary.php (deleted)
• tags/8.0.12/css (deleted)
• tags/8.0.12/includes (copied) (copied from smart-send-logistics/trunk/includes)
• tags/8.0.12/includes/class-ss-shipping-autoloader.php (copied) (copied from smart-send-logistics/trunk/includes/class-ss-shipping-autoloader.php)
• tags/8.0.12/includes/class-ss-shipping-logger.php (copied) (copied from smart-send-logistics/trunk/includes/class-ss-shipping-logger.php)
• tags/8.0.12/includes/class-ss-shipping-shipment.php (copied) (copied from smart-send-logistics/trunk/includes/class-ss-shipping-shipment.php)
• tags/8.0.12/includes/class-ss-shipping-wc-method.php (copied) (copied from smart-send-logistics/trunk/includes/class-ss-shipping-wc-method.php)
• tags/8.0.12/includes/class-ss-shipping-wc-order.php (copied) (copied from smart-send-logistics/trunk/includes/class-ss-shipping-wc-order.php)
• tags/8.0.12/includes/class-ss-shipping-wc-product.php (copied) (copied from smart-send-logistics/trunk/includes/class-ss-shipping-wc-product.php)
• tags/8.0.12/includes/frontend/class-ss-shipping-frontend.php (copied) (copied from smart-send-logistics/trunk/includes/frontend/class-ss-shipping-frontend.php) (2 diffs)
• tags/8.0.12/includes/lib/Smartsend/Api.php (modified) (3 diffs)
• tags/8.0.12/includes/lib/Smartsend/Client.php (copied) (copied from smart-send-logistics/trunk/includes/lib/Smartsend/Client.php) (1 diff)
• tags/8.0.12/includes/lib/Smartsend/Models/Shipment/Agent.php (copied) (copied from smart-send-logistics/trunk/includes/lib/Smartsend/Models/Shipment/Agent.php)
• tags/8.0.12/lang (deleted)
• tags/8.0.12/readme.txt (copied) (copied from smart-send-logistics/trunk/readme.txt) (2 diffs)
• tags/8.0.12/settings.php (deleted)
• tags/8.0.12/smart-send-logistics.php (copied) (copied from smart-send-logistics/trunk/smart-send-logistics.php) (3 diffs)
• tags/8.0.12/smartsend-api-functions.php (deleted)
• tags/8.0.12/smartsend-flexdelivery.php (deleted)
• tags/8.0.12/smartsend-pickuppoint.php (deleted)
• tags/8.0.12/woocommerce-smartsend-logistics.php (deleted)
• trunk/includes/frontend/class-ss-shipping-frontend.php (modified) (2 diffs)
• trunk/includes/lib/Smartsend/Api.php (modified) (3 diffs)
• trunk/includes/lib/Smartsend/Client.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/smart-send-logistics.php (modified) (3 diffs)

smart-send-logistics/tags/8.0.12/includes/frontend/class-ss-shipping-frontend.php

@@ -75 +75 @@
                     $country = wc_clean($_POST['s_country']);
                     $postal_code = wc_clean($_POST['s_postcode']);
+                    $city = (empty($_POST['s_city']) ? wc_clean($_POST['s_city']) : null);//not required but preferred
                     $street = wc_clean($_POST['s_address']);
 
                     $carrier = SS_SHIPPING_WC()->get_shipping_method_carrier($meta_data['smart_send_shipping_method']);
 
-                    $ss_agents = $this->find_closest_agents_by_address($carrier, $country, $postal_code,
-                        $street);
+                    $ss_agents = $this->find_closest_agents_by_address($carrier, $country, $postal_code, $city, $street);
 
                     if (!empty($ss_agents)) {
@@ -120 +120 @@
          * @param $country string | ISO3166-A2 Country code
          * @param $postal_code string
+         * @param $city string
          * @param $street string
          *
          * @return array
          */
-        public function find_closest_agents_by_address($carrier, $country, $postal_code, $street)
-        {
-            SS_SHIPPING_WC()->log_msg('Called "findClosestAgentByAddress" with carrier = "' . $carrier . '", country = "' . $country . '", postcode = "' . $postal_code . '", street = "' . $street . '"');
-
-            if (SS_SHIPPING_WC()->get_api_handle()->findClosestAgentByAddress($carrier, $country, $postal_code,
-                $street)) {
+        public function find_closest_agents_by_address($carrier, $country, $postal_code, $city, $street)
+        {
+            SS_SHIPPING_WC()->log_msg('Called "findClosestAgentByAddress" with carrier = "' . $carrier . '", country = "' . $country . '", postcode = "' . $postal_code . '", city = "' . $city . '", street = "' . $street . '"');
+
+            if (SS_SHIPPING_WC()->get_api_handle()->findClosestAgentByAddress($carrier, $country, $postal_code, $city, $street)) {
 
                 $ss_agents = SS_SHIPPING_WC()->get_api_handle()->getData();

smart-send-logistics/tags/8.0.12/includes/lib/Smartsend/Api.php

@@ -116 +116 @@
             $args = array(), $headers = array(), $body=null, $timeout=$this->getAgentTimeout());
     }
-    
+
     /*
      * Get agents located within an area
@@ -131 +131 @@
     public function getAgentsInArea($carrier, $country=null, $min_latitude, $max_latitude,$min_longitude, $max_longitude)
     {
-        if($country) {
+        if ($country) {
             $method = 'agents/carrier/'.$carrier.'/country/'.$country
-            .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
-            .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
+                .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
+                .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
         } else {
             $method = 'agents/carrier/'.$carrier
-            .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
-            .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
+                .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
+                .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
         }
 
@@ -165 +165 @@
      * @param string $country is the country in which the agents should be located
      * @param string $postal_code is the postal code to search for close agents from
+     * @param string $city is the city to search for close agents from
      * @param string $street is the street name to search for close agents from
      *
      * return array of agent objects
      */
-    public function findClosestAgentByAddress($carrier, $country, $postal_code, $street)
-    {
-        return $this->httpGet($method='agents/closest/carrier/'.$carrier.'/country/'.$country.'/postalcode/'.$postal_code.'/street/'.$street,
+    public function findClosestAgentByAddress($carrier, $country, $postal_code, $city=null, $street)
+    {
+        $method = 'agents/closest/carrier/'.$carrier.'/country/'.$country.'/postalcode/'.$postal_code;
+        if ($city) {
+            $method .= '/city/'.$city;
+        }
+        $method .= '/street/'.$street;
+        return $this->httpGet($method,
             $args = array(), $headers = array(), $body=null, $timeout=$this->getAgentTimeout());
     }

smart-send-logistics/tags/8.0.12/includes/lib/Smartsend/Client.php

@@ -12 +12 @@
     const TIMEOUT = 30;
 
-    private $api_host = 'https://smartsend-prod.apigee.net/api/v1/';
+    private $api_host = 'https://app.smartsend.io/api/v1/';
     private $website;
     private $api_token;

smart-send-logistics/tags/8.0.12/readme.txt

@@ -9 +9 @@
 Requires at least: 3.0.1
 Tested up to: 5.0
-Stable tag: 8.0.11
+Stable tag: 8.0.12
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
-WC requires at least: 2.7.0
+WC requires at least: 3.0.0
 WC tested up to: 3.5
 Requires PHP: 5.6.0
@@ -182 +182 @@
 == Screenshots ==
 
-1. Add shipping methods to WooCommerce Shipping Zones
-2. Connect WooCommerce to Smart Send by entering the API Token
-3. Create PDF shipping labels from backend with just one click
+1. Show closest pick-up points during checkout
+2. Create PDF shipping labels from backend with just one click
+3. Save tracking information automatically after creating shipping labels
 4. Get detailed error description if something is incorrect
-5. Save tracking information automatically after creating shipping labels
+5. Add shipping methods to WooCommerce Shipping Zones
+6. Connect WooCommerce to Smart Send by entering the API Token
+
 
 == Changelog ==
+
+= 8.0.12 =
+* Add city to request when searching for closest agents for improved accuracy
+* Change WooCommerce minimum requirement to WC 3.0
 
 = 8.0.11 =

smart-send-logistics/tags/8.0.12/smart-send-logistics.php

@@ -7 +7 @@
  * Author URI: https://www.smartsend.io
  * Text Domain: smart-send-logistics
- * Version: 8.0.11
+ * Version: 8.0.12
  * WC requires at least: 2.6.0
  * WC tested up to: 3.5
@@ -35 +35 @@
     {
 
-        private $version = "8.0.11";
+        private $version = "8.0.12";
 
         /**
@@ -512 +512 @@
          * Find the closest agents by address - Convenience wrapper
          *
-         * @param $carrier string | unique carrier code
-         * @param $country string | ISO3166-A2 Country code
+         * @param $carrier string unique carrier code
+         * @param $country string ISO3166-A2 Country code
          * @param $postal_code string
          * @param $street string
+         * @param $city string optional but providing a city yields better accuracy for geocoding
          *
          * @return array
          */
-        public function ss_find_closest_agents_by_address($carrier, $country, $postal_code, $street) {
+        public function ss_find_closest_agents_by_address($carrier, $country, $postal_code, $street, $city=null) {
             return $this->ss_shipping_frontend
-                ->find_closest_agents_by_address($carrier, $country, $postal_code, $street);
+                ->find_closest_agents_by_address($carrier, $country, $postal_code, $city, $street);
         }
 

smart-send-logistics/trunk/includes/frontend/class-ss-shipping-frontend.php

@@ -75 +75 @@
                     $country = wc_clean($_POST['s_country']);
                     $postal_code = wc_clean($_POST['s_postcode']);
+                    $city = (empty($_POST['s_city']) ? wc_clean($_POST['s_city']) : null);//not required but preferred
                     $street = wc_clean($_POST['s_address']);
 
                     $carrier = SS_SHIPPING_WC()->get_shipping_method_carrier($meta_data['smart_send_shipping_method']);
 
-                    $ss_agents = $this->find_closest_agents_by_address($carrier, $country, $postal_code,
-                        $street);
+                    $ss_agents = $this->find_closest_agents_by_address($carrier, $country, $postal_code, $city, $street);
 
                     if (!empty($ss_agents)) {
@@ -120 +120 @@
          * @param $country string | ISO3166-A2 Country code
          * @param $postal_code string
+         * @param $city string
          * @param $street string
          *
          * @return array
          */
-        public function find_closest_agents_by_address($carrier, $country, $postal_code, $street)
-        {
-            SS_SHIPPING_WC()->log_msg('Called "findClosestAgentByAddress" with carrier = "' . $carrier . '", country = "' . $country . '", postcode = "' . $postal_code . '", street = "' . $street . '"');
-
-            if (SS_SHIPPING_WC()->get_api_handle()->findClosestAgentByAddress($carrier, $country, $postal_code,
-                $street)) {
+        public function find_closest_agents_by_address($carrier, $country, $postal_code, $city, $street)
+        {
+            SS_SHIPPING_WC()->log_msg('Called "findClosestAgentByAddress" with carrier = "' . $carrier . '", country = "' . $country . '", postcode = "' . $postal_code . '", city = "' . $city . '", street = "' . $street . '"');
+
+            if (SS_SHIPPING_WC()->get_api_handle()->findClosestAgentByAddress($carrier, $country, $postal_code, $city, $street)) {
 
                 $ss_agents = SS_SHIPPING_WC()->get_api_handle()->getData();

smart-send-logistics/trunk/includes/lib/Smartsend/Api.php

@@ -116 +116 @@
             $args = array(), $headers = array(), $body=null, $timeout=$this->getAgentTimeout());
     }
-    
+
     /*
      * Get agents located within an area
@@ -131 +131 @@
     public function getAgentsInArea($carrier, $country=null, $min_latitude, $max_latitude,$min_longitude, $max_longitude)
     {
-        if($country) {
+        if ($country) {
             $method = 'agents/carrier/'.$carrier.'/country/'.$country
-            .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
-            .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
+                .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
+                .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
         } else {
             $method = 'agents/carrier/'.$carrier
-            .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
-            .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
+                .'/area/latitude/min/'.$min_latitude.'/max/'.$max_latitude
+                .'/longitude/min/'.$min_longitude.'/max/'.$max_longitude;
         }
 
@@ -165 +165 @@
      * @param string $country is the country in which the agents should be located
      * @param string $postal_code is the postal code to search for close agents from
+     * @param string $city is the city to search for close agents from
      * @param string $street is the street name to search for close agents from
      *
      * return array of agent objects
      */
-    public function findClosestAgentByAddress($carrier, $country, $postal_code, $street)
-    {
-        return $this->httpGet($method='agents/closest/carrier/'.$carrier.'/country/'.$country.'/postalcode/'.$postal_code.'/street/'.$street,
+    public function findClosestAgentByAddress($carrier, $country, $postal_code, $city=null, $street)
+    {
+        $method = 'agents/closest/carrier/'.$carrier.'/country/'.$country.'/postalcode/'.$postal_code;
+        if ($city) {
+            $method .= '/city/'.$city;
+        }
+        $method .= '/street/'.$street;
+        return $this->httpGet($method,
             $args = array(), $headers = array(), $body=null, $timeout=$this->getAgentTimeout());
     }

smart-send-logistics/trunk/includes/lib/Smartsend/Client.php

@@ -12 +12 @@
     const TIMEOUT = 30;
 
-    private $api_host = 'https://smartsend-prod.apigee.net/api/v1/';
+    private $api_host = 'https://app.smartsend.io/api/v1/';
     private $website;
     private $api_token;

smart-send-logistics/trunk/readme.txt

@@ -9 +9 @@
 Requires at least: 3.0.1
 Tested up to: 5.0
-Stable tag: 8.0.11
+Stable tag: 8.0.12
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
-WC requires at least: 2.7.0
+WC requires at least: 3.0.0
 WC tested up to: 3.5
 Requires PHP: 5.6.0
@@ -182 +182 @@
 == Screenshots ==
 
-1. Add shipping methods to WooCommerce Shipping Zones
-2. Connect WooCommerce to Smart Send by entering the API Token
-3. Create PDF shipping labels from backend with just one click
+1. Show closest pick-up points during checkout
+2. Create PDF shipping labels from backend with just one click
+3. Save tracking information automatically after creating shipping labels
 4. Get detailed error description if something is incorrect
-5. Save tracking information automatically after creating shipping labels
+5. Add shipping methods to WooCommerce Shipping Zones
+6. Connect WooCommerce to Smart Send by entering the API Token
+
 
 == Changelog ==
+
+= 8.0.12 =
+* Add city to request when searching for closest agents for improved accuracy
+* Change WooCommerce minimum requirement to WC 3.0
 
 = 8.0.11 =

smart-send-logistics/trunk/smart-send-logistics.php

@@ -7 +7 @@
  * Author URI: https://www.smartsend.io
  * Text Domain: smart-send-logistics
- * Version: 8.0.11
+ * Version: 8.0.12
  * WC requires at least: 2.6.0
  * WC tested up to: 3.5
@@ -35 +35 @@
     {
 
-        private $version = "8.0.11";
+        private $version = "8.0.12";
 
         /**
@@ -512 +512 @@
          * Find the closest agents by address - Convenience wrapper
          *
-         * @param $carrier string | unique carrier code
-         * @param $country string | ISO3166-A2 Country code
+         * @param $carrier string unique carrier code
+         * @param $country string ISO3166-A2 Country code
          * @param $postal_code string
          * @param $street string
+         * @param $city string optional but providing a city yields better accuracy for geocoding
          *
          * @return array
          */
-        public function ss_find_closest_agents_by_address($carrier, $country, $postal_code, $street) {
+        public function ss_find_closest_agents_by_address($carrier, $country, $postal_code, $street, $city=null) {
             return $this->ss_shipping_frontend
-                ->find_closest_agents_by_address($carrier, $country, $postal_code, $street);
+                ->find_closest_agents_by_address($carrier, $country, $postal_code, $city, $street);
         }