Changeset 3145874

Timestamp:

09/03/2024 10:28:56 AM (17 months ago)

Author:

revolutbusiness

Message:

Update plugin sources to version 4.17.2

Location:

revolut-gateway-for-woocommerce/trunk

Files:

• gateway-revolut.php (modified) (2 diffs)
• includes/abstract/class-wc-payment-gateway-revolut.php (modified) (5 diffs)
• includes/traits/wc-revolut-helper-trait.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

revolut-gateway-for-woocommerce/trunk/gateway-revolut.php

@@ -7 +7 @@
  * Author URI: https://www.revolut.com/business/online-payments
  * Text Domain: revolut-gateway-for-woocommerce
- * Version: 4.17.1
+ * Version: 4.17.2
  * Requires at least: 4.4
  * Tested up to: 6.5.4
@@ -16 +16 @@
 defined( 'ABSPATH' ) || exit;
 define( 'REVOLUT_PATH', plugin_dir_path( __FILE__ ) );
-define( 'WC_GATEWAY_REVOLUT_VERSION', '4.17.1' );
+define( 'WC_GATEWAY_REVOLUT_VERSION', '4.17.2' );
 define( 'WC_GATEWAY_PUBLIC_KEY_ENDPOINT', '/public-key/latest' );
 define( 'WC_GATEWAY_REVPAY_INDEX', 'USE_REVOLUT_PAY_2_0' );

revolut-gateway-for-woocommerce/trunk/includes/abstract/class-wc-payment-gateway-revolut.php

@@ -92 +92 @@
         add_action( 'add_option_woocommerce_revolut_settings', array( $this, 'request_available_payment_methods_and_brand_logos' ) );
         add_action( 'update_option_woocommerce_revolut_settings', array( $this, 'request_available_payment_methods_and_brand_logos' ) );
-        add_action( 'added_post_meta', array( $this, 'save_shipments_information' ), 10, 4 );
-        add_action( 'added_order_meta', array( $this, 'save_shipments_information' ), 10, 4 );
-        add_action( 'updated_post_meta', array( $this, 'save_shipments_information' ), 10, 4 );
-        add_action( 'updated_order_meta', array( $this, 'save_shipments_information' ), 10, 4 );
+        add_action( 'woocommerce_update_order', array( $this, 'save_shipments_information' ), 10, 1 );
     }
 
@@ -110 +107 @@
             $shipments        = array(
                 array(
-                    'tracking_number'  => $tracking_item['tracking_number'],
-                    'shipping_company' => $tracking_item['tracking_provider'],
+                    'tracking_number'       => $tracking_item['tracking_number'],
+                    'shipping_company_name' => $tracking_item['tracking_provider'],
                 ),
             );
@@ -124 +121 @@
      * Fires immediately after updating metadata.
      *
-     * @param int    $meta_id    ID of updated metadata entry.
-     * @param int    $order_id   Order Object ID.
-     * @param string $meta_key   Metadata key.
-     * @param mixed  $meta_value Metadata value.
-     */
-    public function save_shipments_information( $meta_id, $order_id = 0, $meta_key = '', $meta_value = '' ) {
+     * @param int $order_id Order Object ID.
+     */
+    public function save_shipments_information( $order_id = 0 ) {
         try {
-            if ( ! $order_id || ( strpos( $meta_key, 'tracking_code' ) === false && strpos( $meta_key, 'tracking_number' ) === false && strpos( $meta_key, 'tracking_provider' ) === false ) ) {
-                return;
-            }
-
             $wc_order                = wc_get_order( $order_id );
             $revolut_order_id        = $wc_order->get_meta( 'revolut_payment_order_id', true );
@@ -143 +133 @@
             }
 
-            if ( strpos( $meta_key, 'tracking_number' ) !== false ) {
-                $shipping_company = $this->get_order_meta_by_partial_key( $wc_order, 'shipping_company' );
-                $tracking_number  = $meta_value;
-            }
-
-            if ( strpos( $meta_key, 'tracking_code' ) !== false ) {
-                $shipping_company = $this->get_order_meta_by_partial_key( $wc_order, 'shipping_company' );
-                $tracking_number  = $meta_value;
-            }
-
-            if ( strpos( $meta_key, 'tracking_provider' ) !== false ) {
-                $shipping_company = $meta_value;
-                $tracking_number  = $this->get_order_meta_by_partial_key( $wc_order, 'tracking_number' );
-            }
+            $shipping_company = $this->get_order_meta_by_partial_key( $wc_order, array( 'shipping_company', 'shipping_provider', 'tracking_provider' ) );
+            $tracking_number  = $this->get_order_meta_by_partial_key( $wc_order, array( 'tracking_number', 'tracking_code' ) );
 
             if ( empty( $shipping_company ) || empty( $tracking_number ) ) {
@@ -166 +144 @@
             $shipping['shipments'] = array(
                 array(
-                    'tracking_number'  => $tracking_number,
-                    'shipping_company' => $shipping_company,
+                    'tracking_number'       => $tracking_number,
+                    'shipping_company_name' => $shipping_company,
                 ),
             );
 
-            $this->api_client->patch( "/orders/$revolut_order_id", $shipping, false, true );
+            $order_details = array( 'shipping' => $shipping );
+
+            $this->api_client->patch( "/orders/$revolut_order_id", $order_details, false, true );
 
             $wc_order->update_meta_data( 'is_rev_shipments_info_saved', true );

revolut-gateway-for-woocommerce/trunk/includes/traits/wc-revolut-helper-trait.php

@@ -170 +170 @@
      */
     public function collect_order_shipping_info( $order ) {
-        $shipping_address = $order->get_address( 'shipping' );
+        $shipping_address     = $order->get_address( 'shipping' );
+        $billing_phone_number = preg_replace( '/[^0-9]/', '', $order->get_billing_phone() );
 
             $shipping = array(
@@ -184 +185 @@
                     'name'  => $shipping_address['first_name'] . ' ' . $shipping_address['last_name'],
                     'email' => $order->get_billing_email(),
-                    'phone' => $order->get_billing_phone(),
+                    'phone' => empty( $billing_phone_number ) ? null : $billing_phone_number,
                 ),
             );
@@ -215 +216 @@
             $product_url       = get_permalink( $product_id );
             $image_urls        = $this->get_product_images( $product );
+
+            if ( ! empty( $description ) && strlen( $description ) > 1024 ) {
+                $description = substr( $description, 0, 1024 );
+            }
 
             $line_items[] = array(
@@ -1108 +1113 @@
      *
      * @param object $order WC Order object.
-     * @param string $meta_key ket of meta data.
-     */
-    public function get_order_meta_by_partial_key( $order, $meta_key ) {
+     * @param array  $metakey_list key of meta data.
+     */
+    public function get_order_meta_by_partial_key( $order, $metakey_list ) {
         foreach ( $order->get_meta_data() as $meta ) {
-            if ( strpos( $meta->key, $meta_key ) !== false ) {
-                return $meta->value;
+            foreach ( $metakey_list as $meta_key ) {
+                if ( strpos( $meta->key, $meta_key ) !== false ) {
+                    return $meta->value;
+                }
             }
         }

revolut-gateway-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.4
 Tested up to: 6.5
-Stable tag: 4.17.1
+Stable tag: 4.17.2
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -99 +99 @@
 
 == Changelog ==
+= 4.17.2 =
+* Added logic for collecting line items & proof of shipping
+
 = 4.17.1 =
 * Fixed Woo Blocks order processing