Changeset 3191344

Timestamp:

11/18/2024 02:32:39 PM (17 months ago)

Author:

seuroficial

Message:

v2.2.17

Location:

seur/trunk

Files:

• classes/class-seur-collections.php (modified) (2 diffs)
• classes/class-seur-global.php (modified) (1 diff)
• classes/class-seur-seguimiento.php (modified) (2 diffs)
• core/labels-cpt/labels-cpt.php (modified) (2 diffs)
• core/pages/seur-get-labels.php (modified) (1 diff)
• core/tracking/back/tracking-back.php (modified) (1 diff)
• loader.php (modified) (2 diffs)
• readme.txt (modified) (4 diffs)

seur/trunk/classes/class-seur-collections.php

@@ -188 +188 @@
                 'timeout'     => 45,
                 'httpversion' => '1.0',
-                'user-agent'  => 'WooCommerce',
+                'user-agent'  => 'WooCommerce - Seur '.SEUR_OFFICIAL_VERSION,
                 'headers'     => array(
                     'Content-Type'  => 'application/json;charset=UTF-8',
@@ -246 +246 @@
             'timeout'     => 45,
             'httpversion' => '1.0',
-            'user-agent'  => 'WooCommerce',
+            'user-agent'  => 'WooCommerce - Seur '.SEUR_OFFICIAL_VERSION,
             'headers'     => $headers,
             'body'        => $data,

seur/trunk/classes/class-seur-global.php

@@ -217 +217 @@
                 'timeout'     => 45,
                 'httpversion' => '1.0',
-                'user-agent'  => 'WooCommerce',
+                'user-agent'  => 'WooCommerce - Seur '.SEUR_OFFICIAL_VERSION,
                 'headers'     => array(
                     'Content-Type' => 'application/x-www-form-urlencoded;charset=utf-8',

seur/trunk/classes/class-seur-seguimiento.php

@@ -175 +175 @@
 function getStatusExpedition($eventCode) {
     global $wpdb;
-    $tabla  = $wpdb->prefix . 'seur_status';
     $result = $wpdb->get_results($wpdb->prepare(
-        "SELECT * FROM %s WHERE cod_situ = %s",
-        [$tabla, $eventCode]));
+        "SELECT * FROM {$wpdb->prefix}seur_status WHERE cod_situ = %s",
+        [$eventCode]));
     return $result ? (array)$result[0] : [];
 }
@@ -196 +195 @@
     global $wpdb;
     $order_id = get_post_meta( $label_id, '_seur_shipping_order_id', true);
-    $tabla  = $wpdb->prefix . 'wc_order_stats';
     if ($expeditionStatusKey = getExpeditionStatusKey($expeditionStatus)) {
         $wpdb->query($wpdb->prepare(
-            "UPDATE %s SET status=%s WHERE order_id = %d",
-            [$tabla, $expeditionStatusKey, $order_id])
+            "UPDATE {$wpdb->prefix}wc_order_stats SET status=%s WHERE order_id = %d",
+            [$expeditionStatusKey, $order_id])
         );
         $order = wc_get_order($order_id);
         $order->update_status($expeditionStatusKey);
+        update_post_meta( $label_id, '_seur_shipping_tracking_state_name', $expeditionStatus );
     }
     return false;

seur/trunk/core/labels-cpt/labels-cpt.php

@@ -105 +105 @@
  * @param int $order_id get order tracking by Order ID.
  */
-function seur_get_order_tracking( $order_id ) {
+function seur_get_label_tracking( $label_id ) {
 
     if ( seur()->log_is_acive() ) {
-        seur()->slog( 'seur_get_order_tracking( $order_id )' );
-        seur()->slog( '$order_id: ', $order_id ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
+        seur()->slog( 'seur_get_label_tracking( $label_id )' );
+        seur()->slog( '$label_id: ', $label_id ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
     }
 
-    $order = seur_get_order($order_id);
-    $order_tracking = $order->get_meta( '_seur_shipping_tracking_state', true );
+    $label_tracking = get_post_meta( $label_id, '_seur_shipping_tracking_state', true );
+    $label_tracking_name = get_post_meta( $label_id, '_seur_shipping_tracking_state_name', true );
 
     if ( seur()->log_is_acive() ) {
-        seur()->slog( '$order_tracking: ' . $order_tracking );
+        seur()->slog( '$label_tracking: ' . $label_tracking );
     }
 
-    if ( ! empty( $order_tracking ) ) {
-        return '<br />' . $order_tracking;
+    if (! empty( $label_tracking_name ) ) {
+        return $label_tracking_name;
+    }
+    if ( ! empty( $label_tracking ) ) {
+        return $label_tracking;
     }
     return __( 'Waiting Collection', 'seur' );
@@ -159 +162 @@
             break;
         case 'seur-tracking':
-            echo esc_html( seur_get_order_tracking( $order_id ) );
+            echo esc_html( seur_get_label_tracking( $label_id ) );
             break;
         case 'weight':

seur/trunk/core/pages/seur-get-labels.php

@@ -106 +106 @@
         if ( 'yes' !== $has_label ) {
             $label = seur_api_get_label( $order_id, $numpackages, $weight, true, $changeService );
-            $new_status = seur_after_get_label();
-            seur_api_set_label_result( $order_id, $label, $new_status);
-
             if ( $label['status'] ) {
+                $new_status = seur_after_get_label();
+                seur_api_set_label_result( $order_id, $label, $new_status);
                 echo esc_html__( 'Label dowloaded, the Label ID is ', 'seur' ) . esc_html( seur_api_get_label_ids($label, true) );
                 ?>

seur/trunk/core/tracking/back/tracking-back.php

@@ -137 +137 @@
 
     $shipmentStatus = $state['description'];
-    updateShipmentStatus($label_id, $shipmentStatus);
-
+    if (isset($shipmentStatus) && !empty($shipmentStatus)) {
+        updateShipmentStatus($label_id, $shipmentStatus);
+    }
     $eventCode = $state['eventCode'];
     $expeditionStatus = getStatusExpedition($eventCode);

seur/trunk/loader.php

@@ -4 +4 @@
  * Plugin URI: http://www.seur.com/
  * Description: Add SEUR shipping method to WooCommerce. The SEUR plugin for WooCommerce allows you to manage your order dispatches in a fast and easy way
- * Version: 2.2.16
+ * Version: 2.2.17
  * Author: SEUR Oficial
  * Author URI: http://www.seur.com/
@@ -20 +20 @@
 use Automattic\WooCommerce\Utilities\FeaturesUtil;
 
-define( 'SEUR_OFFICIAL_VERSION', '2.2.16' );
+define( 'SEUR_OFFICIAL_VERSION', '2.2.17' );
 define( 'SEUR_DB_VERSION', '1.0.4' );
 define( 'SEUR_TABLE_VERSION', '1.0.5' );

seur/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.0
 Tested up to: 6.6.2
-Stable tag: 2.2.16
+Stable tag: 2.2.17
 WC requires at least: 3.0
 WC tested up to: 9.1.4
@@ -39 +39 @@
 = Quick set-up =
 
-[Leave your details here](https://pub.s7.exacttarget.com/thi131hffjt). Ask SEUR for your registration details, fill in the configuration form and set the transport rate for your buyers. Trust your shipments to the leading e-commerce logistics partner in just 3 steps.
+[Leave your details here](https://info.notificaciones.e-seur.com/Formulario-Web-Seur). Ask SEUR for your registration details, fill in the configuration form and set the transport rate for your buyers. Trust your shipments to the leading e-commerce logistics partner in just 3 steps.
 
 
@@ -84 +84 @@
 = What is the cargo manifest and how can I generate it? =
 
-The cargo manifest is a record of the packages given to our SEUR agent for delivery; this document can be downloaded in the "Manifest" section via the SEUR menu. Remember to print two copies: one for you and one for the driver.
+The cargo manifest is a record of the packages given to our SEUR agent for delivery; this document can be downloaded in the "SEUR > Shipments" section via the SEUR menu. Remember to print two copies: one for you and one for the driver.
 
 = How can I track my Shipments? =
@@ -93 +93 @@
 
 == Changelog ==
+
+== 2.2.17 ==
+
+* FIXED: Tracking status update
 
 == 2.2.16 ==