v1.2.3: Fixes for the WooCommerce subscriptions plugin

includes/wc-internal/index.php

@@ -6,3 +6,4 @@
 require_once('track-trace.php');
 require_once('trunkrs-order.php');
 require_once('shipment-tracking.php');
+require_once('subscriptions.php');

includes/wc-internal/subscriptions.php

@@ -13,12 +13,11 @@ public function renewalPaymentComplete($subscription, $order)
       if (!TRUNKRS_WC_Settings::getUseSubscriptionRenewals())
         return;
 
-      $initialOrder = new TRUNKRS_WC_Order($subscription);
-
+      $initialOrder = new TRUNKRS_WC_Order($subscription, true, true);
       if (!$initialOrder->isTrunkrsOrder) return;
 
       $newOrder = new TRUNKRS_WC_Order($order);
-      $newOrder->announceShipment();
+      $newOrder->announceShipment(true);
     }
   }
 }

includes/wc-internal/trunkrs-order.php

@@ -126,11 +126,18 @@ private function getDeliveryDate($item)
 
       if (isset($deliveryDatePlugin)) {
         $parsed = DateTime::createFromFormat('U', $deliveryDatePlugin['value']);
-        if ($parsed === false) return $item->get_meta(self::DELIVERY_DATE_KEY);
+        if ($parsed === false) {
+          return !isset($item)
+            ? null
+            : $item->get_meta(self::DELIVERY_DATE_KEY);
+        }
+
         return TRUNKRS_WC_Utils::format8601Date($parsed);
       }
 
-      return $item->get_meta(self::DELIVERY_DATE_KEY);
+      return !isset($item)
+        ? null
+        : $item->get_meta(self::DELIVERY_DATE_KEY);
     }
 
     /**
@@ -187,10 +194,12 @@ public function announceShipment(bool $force = false)
       $reference = $this->order->get_order_key();
       $shipment = TRUNKRS_WC_Api::announceShipment($this->order, $reference, $deliveryDate);
 
-      $shippingItem->delete_meta_data(self::DELIVERY_DATE_KEY);
-      $shippingItem->delete_meta_data(self::CUT_OFF_TIME_KEY);
+      if (isset($shippingItem)) {
+        $shippingItem->delete_meta_data(self::DELIVERY_DATE_KEY);
+        $shippingItem->delete_meta_data(self::CUT_OFF_TIME_KEY);
 
-      $shippingItem->save_meta_data();
+        $shippingItem->save_meta_data();
+      }
 
       if (is_null($shipment)) {
         $this->isAnnounceFailed = true;

readme.txt

@@ -3,7 +3,7 @@ Contributors: fean
 Tags: delivery, packages, woocommerce, trunkrs, sameday, delivery
 Requires at least: 3.6 & WooCommerce 3.0+
 Tested up to: 5.9
-Stable tag: 1.2.0
+Stable tag: 1.2.3
 Requires PHP: 7.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -41,6 +41,12 @@ Reach out to your customer success manager or account manager to get started, th
 
 == Changelog ==
 
+= 1.2.3 =
+We fixed an issue with the WooCommerce subscriptions plugin where we didn't pick up the correct shipment details on subscription renewals.
+
+= 1.2.2 =
+Several small fixes to the new plugin features. Support for both the lite and pro versions of the Order Delivery Date plugin.
+
 = 1.2.0 =
 This is a big release with lots of new and cool features you will love!
 We added the following features:

trunkrs-woocommerce.php

@@ -5,7 +5,7 @@
  * Description: Add excellent consumer focused shipping to your WooCommerce store.
  * Author: Trunkrs
  * Author URI: https://trunkrs.nl
- * Version: 1.2.0
+ * Version: 1.2.3
  * Requires at least: 3.6 & WooCommerce 3.0+
  * Requires PHP: 7.1
  * License: GPLv3
@@ -23,7 +23,7 @@ class TRUNKRS_WC_Bootstrapper
     /**
      * @var string The semver version of the plugin.
      */
-    public $version = '1.1.0';
+    public $version = '1.2.3';
 
     /**
      * @var TRUNKRS_WC_Bootstrapper The shared plugin instance.