Changeset 2692952

Timestamp:

03/12/2022 01:56:01 PM (4 years ago)

Author:

louiscollarsmith

Message:

Updated to v1.0.1

Location:

quiver-delivery/trunk

Files:

• includes/class-quiver-delivery-shipping-method.php (modified) (6 diffs)
• quiver-delivery.php (modified) (2 diffs)
• readme.md (modified) (1 diff)
• readme.txt (modified) (1 diff)

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

@@ -16 +16 @@
         'QUI-WN' => 'WINDOW'
     ];
-    private $BATCH_CREATE_QUOTE_URL = 'https://api.quiver.london/delivery/quotes:batchCreate';
-    private $CREATE_DELIVERY_URL = 'https://api.quiver.london/delivery/deliveries';
+    // private $BATCH_CREATE_QUOTE_URL = 'https://api.quiver.london/delivery/quotes:batchCreate';
+    // private $CREATE_DELIVERY_URL = 'https://api.quiver.london/delivery/deliveries';
+    private $BATCH_CREATE_QUOTE_URL = 'http://localhost:2002/delivery/quotes:batchCreate';
+    private $CREATE_DELIVERY_URL = 'http://localhost:2002/delivery/deliveries';
 
     /**
@@ -90 +92 @@
                 'postcode' => array_key_exists('postcode', $destination) ? $destination['postcode'] : '',
             ];
+
+            if (empty($address['postcode'])) {
+                return;
+            }
             
             $lineItems = [];
@@ -97 +103 @@
             }
 
+            $order = [
+                'subtotalPrice' => (float) WC()->cart->get_subtotal()
+            ];
+
             $request = [
                 'address' => $address,
                 'lineItems' => $lineItems,
+                'order' => $order
             ];
 
@@ -148 +159 @@
                 $quiver_line_items = $this->order_to_line_items($order);
                 $quiver_customer = $this->order_to_quiver_customer($order);
+                $quiver_purchaser = $this->order_to_quiver_purchaser($order);
                 $quiver_address = $this->order_to_quiver_address($order);
 
@@ -157 +169 @@
                     'address' => $quiver_address,
                 ];
+
+                if ($quiver_purchaser['firstName'] != $quiver_customer['firstName'] 
+                    || $quiver_purchaser['lastName'] != $quiver_customer['lastName']
+                    || $quiver_purchaser['company'] != $quiver_customer['company']) {
+                    $request['purchaser'] = $quiver_purchaser;
+                }
+
                 $response = $this->post_request($this->CREATE_DELIVERY_URL, $request);
                 if (!$response) {
@@ -214 +233 @@
             'firstName' => $order->get_shipping_first_name(),
             'lastName' => $order->get_shipping_last_name(),
+            'company' => $order->get_shipping_company(),
+            'emailAddress' => $order->get_billing_email(),
+            'phoneNumber' => $order->get_billing_phone()
+        ];
+    }
+
+        /**
+     * @param WC_Order $order
+     * @return array
+    */
+    private function order_to_quiver_purchaser( $order ) {
+        return [
+            'firstName' => $order->get_billing_first_name(),
+            'lastName' => $order->get_billing_last_name(),
+            'company' => $order->get_billing_company(),
             'emailAddress' => $order->get_billing_email(),
             'phoneNumber' => $order->get_billing_phone()

quiver-delivery/trunk/quiver-delivery.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/quiver-delivery/
  * Description: Quiver provides fast and emissionless urban delivery. Magic.
- * Version: 1.0.0
+ * Version: 1.0.1
  * Author: Quiver
  * Author URI: https://getquiver.co.uk/
@@ -22 +22 @@
 class Quiver_Delivery {
 
-    private $version = "1.0.0";
+    private $version = "1.0.1";
 
     /**

quiver-delivery/trunk/readme.md

@@ -6 +6 @@
 Requires PHP: 5.6
 Tested up to: 5.8.1
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 WC requires at least: 3.0.0
 WC tested up to: 5.8.0

quiver-delivery/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 5.6
 Tested up to: 5.8.1
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 WC requires at least: 3.0.0
 WC tested up to: 5.8.0