Changeset 2809158

Timestamp:

11/01/2022 09:17:54 PM (3 years ago)

Author:

louiscollarsmith

Message:

v1.0.11 More flexibility with delivery date meta fields

Location:

quiver-delivery

Files:

• tags/1.0.11 (added)
• tags/1.0.11/includes (added)
• tags/1.0.11/includes/class-quiver-delivery-logger.php (added)
• tags/1.0.11/includes/class-quiver-delivery-shipping-method.php (added)
• tags/1.0.11/quiver-delivery.php (added)
• tags/1.0.11/readme.md (added)
• tags/1.0.11/readme.txt (added)
• trunk/includes/class-quiver-delivery-shipping-method.php (modified) (4 diffs)
• trunk/quiver-delivery.php (modified) (2 diffs)
• trunk/readme.md (modified) (2 diffs)
• trunk/readme.txt (modified) (1 diff)

quiver-delivery/trunk/includes/class-quiver-delivery-shipping-method.php

@@ -173 +173 @@
 
         $code = $shippingMethod->get_meta('code');
-
         $delivery_type = $this->CODE_DELIVERY_TYPE_MAP[$code];
         $quiver_order = $this->order_to_quiver_order($order);
@@ -208 +207 @@
     }
 
+    private $DELIVERY_DATE_META_FIELDS = [
+        '_delivery_date_', 
+        '_delivery_date',
+        'delivery_date',
+        'delivery-date',
+        'delivery date',
+        'Delivery Date', 
+    ];
+
+    /**
+     * @param WC_Order $order
+     * @return array
+     */
+    private function order_to_delivery_date($order)
+    {
+        // 1. Check Order Meta
+        // 1.1 Direct access
+        foreach ($this->DELIVERY_DATE_META_FIELDS as $metaKey) {
+            $value = $order->get_meta($metaKey);
+            if ($value !== "") {
+                return $this->toDateStr($value);
+            }
+        }
+        // 1.2 Loop access
+        foreach ($order->get_meta_data() as $meta) {
+            $key = strtolower($meta->key);
+            if (str_contains($key, 'delivery') && str_contains($key, 'date')) {
+                $value = $meta->value;
+                if ($value !== "") {
+                    return $this->toDateStr($value);
+                }
+            }
+        }
+        // 2. Check Order Line Items
+        // 2.1 Direct access
+        $deliveryDates = [];
+        foreach ($order->get_items() as $lineItem) {
+            foreach ($this->DELIVERY_DATE_META_FIELDS as $metaKey) {
+                $value = $lineItem->get_meta($metaKey);
+                if ($value !== "") {
+                    array_push($deliveryDates, $this->toDateStr($value));
+                }
+            }
+        }
+        if (count($deliveryDates) !== 0) {
+            return min($deliveryDates);
+        }
+        // 2.2 Loop access
+        foreach ($order->get_items() as $lineItem) {
+            foreach ($lineItem->get_meta_data() as $meta) {
+                $key = strtolower($meta->key);
+                if (str_contains($key, 'delivery') && str_contains($key, 'date')) {
+                    $value = $meta->value;
+                    if ($value !== "") {
+                        array_push($deliveryDates, $this->toDateStr($value));
+                    }
+                }
+            }
+        }
+        if (count($deliveryDates) !== 0) {
+            return min($deliveryDates);
+        }
+    }
+    
+    /**
+     * @param string $value
+     * @return string
+     */
+    private function toDateStr($value) {
+        $unixTimestamp = strtotime($value);
+        return date('Y-m-d', $unixTimestamp);
+    }
+
     /**
      * @param WC_Order $order
@@ -234 +306 @@
         $lineItems = [];
         $fulfilmentLocationId = null;
-        foreach ($order->get_items()  as $item_id => $item) {
+        foreach ($order->get_items() as $item_id => $item) {
             $productId = $item['product_id'];
             $product = wc_get_product( $productId );
@@ -269 +341 @@
             'postcode' => $order->get_shipping_postcode(),
         ];
-    }
-
-
-    private $DELIVERY_DATE_META_FIELDS = [
-        '_delivery_date_', 
-        'delivery_date',
-        'Delivery Date', 
-        'delivery date',
-    ];
-
-    /**
-     * @param WC_Order $order
-     * @return string
-     */
-    private function order_to_delivery_date($order)
-    {
-        foreach ($this->DELIVERY_DATE_META_FIELDS as $metaField) {
-            $value = $order->get_meta($metaField);
-            if ($value !== "") {
-                $unixTimestamp = strtotime($value);
-                return date('Y-m-d', $unixTimestamp);
-            }
-        }
-        return null;
     }
 

quiver-delivery/trunk/quiver-delivery.php

@@ -5 +5 @@
  * Plugin URI: https://wordpress.org/plugins/quiver-delivery/
  * Description: Quiver provides fast and emissionless urban delivery. Magic.
- * Version: 1.0.10
+ * Version: 1.0.11
  * Author: Quiver
  * Author URI: https://quiver.co.uk/
@@ -24 +24 @@
     {
 
-        private $version = "1.0.10";
+        private $version = "1.0.11";
 
         /**

quiver-delivery/trunk/readme.md

@@ -6 +6 @@
 Tested up to: 6.0
 Requires PHP: 7.0
-Stable tag: 1.0.10
+Stable tag: 1.0.11
 WC requires at least: 3.0.0
 WC tested up to: 6.6.1
@@ -116 +116 @@
 
 - More delivery date meta field options added.
+
+= 1.0.11 =
+
+- More flexibility with Delivery Date meta fields. Specify a delivery date by adding a new field to your order or order line items' meta data. The key must contain 'delivery' and 'date' to be recognised.

quiver-delivery/trunk/readme.txt

@@ -116 +116 @@
 
 - More delivery date meta field options added.
+
+= 1.0.11 =
+
+- More flexibility with Delivery Date meta fields. Specify a delivery date by adding a new field to your order or order line items' meta data. The key must contain 'delivery' and 'date' to be recognised.