Fix: Fixe for delivery date plugin

Trunkrs · Jan 31, 2022 · 0937417 · 0937417
1 parent c53f4e9
commit 0937417
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/includes/api.php b/includes/api.php
@@ -155,7 +155,9 @@ public static function getShippingRates(array $orderDetails, bool $includeAll =
 
       $rates = json_decode($response['body']);
       // For now only take the first one
-      return empty($rates) ? $rates : $includeAll ? $rates : [$rates[0]];
+      return empty($rates)
+        ? $rates
+        : ($includeAll ? $rates : [$rates[0]]);
     }
 
     /**

diff --git a/includes/wc-internal/trunkrs-order.php b/includes/wc-internal/trunkrs-order.php
@@ -109,22 +109,23 @@ private function getTychePluginMeta()
       $meta = TRUNKRS_WC_Utils::findInArray(
         $this->order->get_meta_data(),
         function ($metaItem) {
-          $startsWithPrefix = substr($metaItem['key'], 0, strlen(self::TYCHE_DELIVERY_DATE_PREFIX)) === self::TYCHE_DELIVERY_DATE_PREFIX;
-          $endsWithPostFix = substr($metaItem['key'], -strlen(self::TYCHE_DELIVERY_DATE_TIMESTAMP_POSTFIX)) === self::TYCHE_DELIVERY_DATE_TIMESTAMP_POSTFIX;
+          $data = $metaItem->get_data();
+          $startsWithPrefix = substr($data['key'], 0, strlen(self::TYCHE_DELIVERY_DATE_PREFIX)) === self::TYCHE_DELIVERY_DATE_PREFIX;
+          $endsWithPostFix = substr($data['key'], -strlen(self::TYCHE_DELIVERY_DATE_TIMESTAMP_POSTFIX)) === self::TYCHE_DELIVERY_DATE_TIMESTAMP_POSTFIX;
 
           return $startsWithPrefix && $endsWithPostFix;
         }
       );
 
-      return $meta;
+      return is_null($meta) ? null : $meta->get_data();
     }
 
     private function getDeliveryDate($item)
     {
       $deliveryDatePlugin = $this->getTychePluginMeta();
 
       if (isset($deliveryDatePlugin)) {
-        $parsed = DateTime::createFromFormat('U', $deliveryDatePlugin);
+        $parsed = DateTime::createFromFormat('U', $deliveryDatePlugin['value']);
         if ($parsed === false) return $item->get_meta(self::DELIVERY_DATE_KEY);
         return TRUNKRS_WC_Utils::format8601Date($parsed);
       }