Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development

app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php

@@ -63,10 +63,12 @@ class CreateOrderLogic extends AbstractControllerLogic
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
         
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
-        
+
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => in_array($company->id, [2376]) ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]);
+        if(!in_array($company->id, WarehouseReferences::YD_EXEMPT_LIST)){
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+        }
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
             throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');

app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php

@@ -72,8 +72,16 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
 
     /**
      * CreateRemarkLogic constructor.
-     * @param CanCreateRemark $canCreateRemark
-     * @param CreatesPackingListRemark $createsPackingListRemark
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesOrder $fetchesOrder
+     * @param UpdatesPackingListOwner $updatesPackingListOwner
+     * @param UpdatesTransportStatus $updatesTransportStatus
+     * @param CreatesContract $unityCreateContract
+     * @param ActivateContractProcessor $unityActivateContract
+     * @param CreateContractEntityProcessor $unityCreateContractEntity
+     * @param AssignContractEntityProcessor $unityAssignContractEntity
+     * @param UpdatesPackingListContractReference $updatesPackingListContractReference
+     * @param CreatesStep $createsStep
      */
     public function __construct(FetchesPackingList $fetchesPackingList, FetchesOrder $fetchesOrder, UpdatesPackingListOwner $updatesPackingListOwner, UpdatesTransportStatus $updatesTransportStatus, CreatesContract $unityCreateContract,  ActivateContractProcessor $unityActivateContract, CreateContractEntityProcessor $unityCreateContractEntity, AssignContractEntityProcessor $unityAssignContractEntity, UpdatesPackingListContractReference $updatesPackingListContractReference, CreatesStep $createsStep)
     {

app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php

@@ -12,14 +12,12 @@ class UpdatesPackingListOwner extends AbstractUpdateRelationshipRecord
 
     /**
      * @param PackingList $model
-     * @param int $status
+     * @param Packable $packable
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function execute(PackingList $model, Packable $packable) {
 
-        $model->status = ApprovalStatus::APPROVED;
-
         return $this->handler($packable->packingLists(), $model);
 
     }

app/Classes/ValueObjects/Constants/WarehouseReferences.php

@@ -41,5 +41,8 @@ final class WarehouseReferences {
 
     public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG;
 
+    public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726];
+
+    //2376 qce
 
 }

app/Http/Controllers/Orders/DownloadOrderQrPdfController.php

@@ -25,6 +25,7 @@ class DownloadOrderQrPdfController
         $deliveryPrefix = '';
 
         if($warehouse->reference === WarehouseReferences::VT_GUANG_ZHOU || $warehouse->reference === WarehouseReferences::VT_YIWU) {
+            $remark = '周一 至 周六 , 早上八点到下午六点';
             if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
                 $deliveryPrefix = 'SB/';
             }
@@ -35,10 +36,12 @@ class DownloadOrderQrPdfController
         }
 
         if($warehouse->reference === WarehouseReferences::YD_YIWU){
+            $remark = '周一 至 周六 , 早上九点到下午六点';
             $warehousePrefix = 'YW/';
         }
 
         if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){
+            $remark = '周日 至 周五 , 早上八点到下午六点';
             $warehousePrefix = 'YD/';
 
             if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
@@ -57,6 +60,7 @@ class DownloadOrderQrPdfController
             'delivery_address' => $deliveryAddress,
             'warehouse_address' => $warehouseAddress,
             'warehouse_contacts' => $warehouseContacts,
+            'remark' => $remark
         ];
 
         $pdf = LaravelMpdf::loadView('pdfs.qr', $data, [], [

resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-b-15">
+    <div class="row m-b-15" @keyup.enter="updateFilters()">
         <div class="col no-margin">
             <div class="row m-b-15">
                 <div class="col col-sm-12 col-md-4">

resources/views/pdfs/qr.blade.php

@@ -40,6 +40,7 @@
                                 <p style="font-size: 30px; margin-bottom: 0 !important; margin-top: 10px !important;">仓库地址:</p>
                                 <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 30px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two.' 邮编:'.$warehouse_address->postcode}}</p>
                                 <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 30px;">联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach</p>
+                                <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 30px;">{{$remark}}</p>
                             </td>
                         </tr>
                         </tbody>