Merge pull request #130 from sameday-courier/SIP-648

SIP-648
sameday-courier · Sep 20, 2024 · af29ba1 · af29ba1
2 parents 7cc3857 + 7c49afd
commit af29ba1
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/samedaycourier.php b/samedaycourier.php
@@ -107,7 +107,7 @@ public function __construct()
         $this->name = 'samedaycourier';
         $this->tab = 'shipping_logistics';
 
-        $this->version = '1.7.1';
+        $this->version = '1.7.2';
         $this->author = 'Sameday Courier';
         $this->need_instance = 0;
         $this->bootstrap = true;
@@ -2002,13 +2002,25 @@ private function addAwb($order)
             );
         }
 
+        if ('' === $phone = !empty($address->phone_mobile) ? $address->phone_mobile : $address->phone) {
+            $this->addMessage('danger', [$this->l('Must complete phone number!')]);
+        }
+
+        if ('' === $email = $customer->email ?? '') {
+            $this->addMessage('danger', [$this->l('Must complete email!')]);
+        }
+
+        if (!empty($this->messages)) {
+            return null;
+        }
+
         $recipient = new \Sameday\Objects\PostAwb\Request\AwbRecipientEntityObject(
             $address->city,
             $stateName,
             trim($address->address1 . ' ' . $address->address2),
             $address->firstname . ' ' . $address->lastname,
-            !empty($address->phone_mobile) ? $address->phone_mobile : $address->phone,
-            $customer->email,
+            $phone,
+            $email,
             $company,
             (!empty($address->postcode)) ? $address->postcode : null
         ); 

diff --git a/views/templates/front/checkout_lockers.v16.tpl b/views/templates/front/checkout_lockers.v16.tpl
@@ -27,7 +27,7 @@
 <table class="resume table table-bordered">
     <tbody>
         <tr>
-            <td>{l s='Select locker' mod='samedaycourier'}</td>
+            <td>{l s='Select location' mod='samedaycourier'}</td>
             <td>
                 <button type="button"
                     name="samedaycourier_locker_id"

diff --git a/views/templates/front/checkout_lockers.v17.tpl b/views/templates/front/checkout_lockers.v17.tpl
@@ -26,7 +26,7 @@
 
 {include file='./_partials/checkout_lockers.tpl'}
 <div class="col-sm-2">
-    {l s='Select locker' mod='samedaycourier'}
+    {l s='Select location' mod='samedaycourier'}
 </div>
 <div class="col-sm-8">
     <button type="button" style="display:inline-block"

diff --git a/views/templates/front/checkout_lockers_selector.v16.tpl b/views/templates/front/checkout_lockers_selector.v16.tpl
@@ -27,10 +27,10 @@
     <table class="resume table table-bordered">
         <tbody>
             <tr>
-                <td>{l s='Select locker' mod='samedaycourier'}</td>
+                <td>{l s='Select location' mod='samedaycourier'}</td>
                 <td>
                     <select name="samedaycourier_locker_id" id="lockerIdSelector">
-                        <option value=""> {l s='Select locker' mod='samedaycourier'} </option>
+                        <option value=""> {l s='Select location' mod='samedaycourier'} </option>
                         {foreach from=$lockers key=city item = cityLockers}
                             <optgroup label="{$city|escape:'htmlall':'UTF-8'}">
                             {foreach from=$cityLockers item=locker}

diff --git a/views/templates/front/checkout_lockers_selector.v17.tpl b/views/templates/front/checkout_lockers_selector.v17.tpl
@@ -25,11 +25,11 @@
 {include file='./_partials/checkout_lockers.tpl'}
 {if isset($lockers) }
     <div class="col-sm-2">
-        {l s='Select locker' mod='samedaycourier'}
+        {l s='Select location' mod='samedaycourier'}
     </div>
     <div class="col-sm-10"> 
         <select name="samedaycourier_locker_id" class="form-control" id="lockerIdSelector">
-            <option value=""> {l s='Select locker' mod='samedaycourier'} </option>
+            <option value=""> {l s='Select location' mod='samedaycourier'} </option>
             {foreach from=$lockers key=city item = cityLockers}
                 <optgroup label="{$city|escape:'htmlall':'UTF-8'}">
                 {foreach from=$cityLockers item=locker}

diff --git a/views/templates/hook/displayAdminOrder.tpl b/views/templates/hook/displayAdminOrder.tpl
@@ -447,7 +447,7 @@
                                         id="select_locker"
                                         style="margin-left: 0px !important; margin-top: 10px;"
                                 >
-                                    {l s='Change locker' mod='samedaycourier'}
+                                    {l s='Change location' mod='samedaycourier'}
                                 </button>
                             </div>
                         </div>