add file RescheduleTransportDateFormComponent

export-arrived-parcel

See merge request CIEFWorldwideSdnBhd/shipping-portal!130

app/Classes/Modules/Accounts/ControllersLogic/GeneratePasswordResetLogic.php

@@ -12,6 +12,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class GeneratePasswordResetLogic extends AbstractControllerLogic
 {

app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php

@@ -70,7 +70,9 @@ class GeneratesAuthenticationToken {
             $claims = array_merge($claims, [
                 'company_id' => $companyModule->company_id,
                 'company_module_id' => $companyModule->id,
-                'company_module_type' => $companyModule->type
+                'company_module_type' => $companyModule->type,
+                'company_name' => $companyModule->name,
+                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
             ]);
         }
 

app/Classes/Modules/Delivery/ControllersLogic/CreateDeliveryCustomerLogic.php

@@ -32,6 +32,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use Illuminate\Support\Facades\Log;
 
 class CreateDeliveryCustomerLogic extends AbstractControllerLogic
 {
@@ -132,9 +133,9 @@ class CreateDeliveryCustomerLogic extends AbstractControllerLogic
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::ONLINE_SELLER);
 
-        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'LMD']);
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'HWT']);
 
-        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'LMD');
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'HWT');
 
         $connection = $this->createsCompanyConnection->execute($connectionObject);
 

app/Classes/Modules/Delivery/ControllersLogic/CreateDeliveryOrderLogic.php

@@ -129,7 +129,7 @@ class CreateDeliveryOrderLogic extends AbstractControllerLogic
         $order = $this->createsOrder->execute($companyModule, $orderObject);
 
         $senderAddressObject = new AddressObject($senderAddress->street_one, $senderAddress->street_two, $senderAddress->country_id, $senderAddress->state_id, $senderAddress->district_id, $senderAddress->postcode, $senderAddress->type, ApprovalStatus::APPROVED, $senderAddress->reference);
-        $deliveryAddressObject = new AddressObject($deliveryAddress->street_one, $deliveryAddress->street_two, $deliveryAddress->country_id, $deliveryAddress->state_id, $deliveryAddress->district_id, $deliveryAddress->postcode, $deliveryAddress->type, ApprovalStatus::APPROVED, $senderAddress->reference);
+        $deliveryAddressObject = new AddressObject($deliveryAddress->street_one, $deliveryAddress->street_two, $deliveryAddress->country_id, $deliveryAddress->state_id, $deliveryAddress->district_id, $deliveryAddress->postcode, $deliveryAddress->type, ApprovalStatus::APPROVED, $deliveryAddress->reference);
 
         /** @var Address $orderSenderAddress */
         $orderSenderAddress = $this->createAddress->execute($order, $senderAddressObject);

app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'ORDER NUMBER',
+            'Marking',
+            'Warehouse',
+            'Cbm',
+            'Description',
+            'quantity',
+            'Received Date',
+            'Remarks'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $returnArray = collect();
+
+        $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->get();
+        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+
+        foreach($packingLists as $packingList){
+            $packages = !$packingList->packingLists()->exists() || $exceptionUsers ? $packingList->packages : $packingList->packingLists->first()->packages;
+            foreach ($packages as $package) {
+                $returnArray->push($package);
+            }
+        }
+        
+        return $returnArray;
+    }
+
+    /**
+     * @param ReturnArray $returnArray
+     *
+     * @return array
+     */
+    public function map($package): array
+    {
+        $packingList = $package->packingList;
+        $order = $packingList->owner;
+
+        $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
+
+        $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+
+        $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y');
+
+        return [
+            $packingList->owner->reference,
+            $marking,
+            $warehouse->reference,
+            $cbm,
+            $package->description,
+            $package->quantity,
+            $arrival_date,
+            ''
+        ];
+    }
+}

app/Classes/Modules/Exports/Services/ExportsDeliveryOrders.php

@@ -91,16 +91,16 @@ class ExportsDeliveryOrders implements FromQuery, WithHeadings, WithHeadingRow,
             'Domestic Shipment',
             'ST00000020',
             $senderAddress->contacts()->first()->reference,
-            $order->companyModule->name,
-            '*',
-            $senderAddress->street_one.', '.$senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name,
+            $senderAddress->reference ? $senderAddress->reference : $order->companyModule->name,
+            $senderAddress->street_one,
+            $senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name,
             '',
             $senderAddress->postcode,
             $senderAddress->contacts()->first()->phone,
             $deliveryAddress->contacts()->first()->reference,
-            '',
-            '*',
-            $deliveryAddress->street_one.', '.$deliveryAddress->street_two.' '.$deliveryAddress->district->name.' '.$deliveryAddress->postcode.' '.$deliveryAddress->state->name.' '.$deliveryAddress->country->name,
+            $deliveryAddress->reference,
+            $deliveryAddress->street_one,
+            $deliveryAddress->street_two.' '.$deliveryAddress->district->name.' '.$deliveryAddress->postcode.' '.$deliveryAddress->state->name.' '.$deliveryAddress->country->name,
             '',
             $deliveryAddress->postcode,
             $deliveryAddress->contacts()->first()->phone,

app/Classes/Modules/Exports/Services/ExportsOnHoldPackingList.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsOnHoldPackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
+            'Marking',
+            'Order Number'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereIn('status', [4, 5])->whereHas('containers');
+    }
+
+    /**
+     * @param PackingList $packingList
+     *
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
+        $order = $packingList->owner;
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            $container->reference,
+            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a',
+            $ContainerTransport ? $ContainerTransport->drop_date : 'n/a',
+            $marking,
+            $order->reference,
+        ];
+    }
+}

app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php

@@ -25,7 +25,8 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
             'Unstuffing',
             'Marking',
             'Order Number',
-            'Delay Days',
+            'status',
+            'Delay Days / delivery date',
             'Quantity',
             'State',
             'Postcode',
@@ -43,7 +44,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
     {
         return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
             $query->where('containers.status', ApprovalStatus::COMPLETED);
-        })->whereDoesntHave('transports');
+        });
     }
 
     /**
@@ -61,6 +62,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
         $contacts = $address->contacts->first() ? $address->contacts->first(): '';
         $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
         $transport = $originalPackingList->containers()->first()->transports()->first();
+        $deliveryTransport = $originalPackingList->transports()->first();
 
         return [
             $container->reference,
@@ -68,7 +70,8 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
             $ContainerTransport->drop_date,
             $marking,
             $order->reference,
-            $transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : '',
+            $deliveryTransport ? (Carbon::parse($deliveryTransport->schedules()->first()->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
+            $deliveryTransport ? $deliveryTransport->schedules()->first()->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
             $packingList->packages()->sum('quantity'),
             $address->state->name,
             $address->postcode,

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

@@ -67,7 +67,7 @@ class CreateOrderLogic extends AbstractControllerLogic
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
         if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU_2 : WarehouseReferences::YD_YIWU]);
         }
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {

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

@@ -56,28 +56,23 @@ class ReschedulePackingListLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $transport = $packing_list->transports()->first();
+        $transport = $packing_list->transports()->first();
 
-            $old_sechedule = $transport->schedules()->first();
+        $old_sechedule = $transport->schedules()->first();
 
-            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
+        $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
 
-            $scheduleObject = new ScheduleObject(
-                Carbon::parse($request->input('eta')), 
-                Carbon::parse($request->input('etd')), 
-                ApprovalStatus::APPROVED
-             );
-            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-            return $this->resourceResponse(new PackingListResource($packing_list));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $scheduleObject = new ScheduleObject(
+            Carbon::parse($request->input('eta')), 
+            Carbon::parse($request->input('etd')), 
+            ApprovalStatus::APPROVED
+        );
+        
+        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
 
+        return $this->resourceResponse(new PackingListResource($packing_list));
     }
 
 }

app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php

@@ -6,6 +6,8 @@ namespace App\Classes\Modules\PackingLists\Processors;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanCreatePackage;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;
 
 class CreatePackageProcessor
@@ -48,6 +50,11 @@ class CreatePackageProcessor
 
         if($replica) {
             $modificationValue = 1;
+
+            if($replica->owner->owner instanceof Order){
+                $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1;
+            }
+
             $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
             $package = $this->createsPackage->execute($packageObject, $replica);
         }

app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php

@@ -10,7 +10,10 @@ use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;
+use function PHPUnit\Framework\isInstanceOf;
 
 class CreatePackingListProcessor
 {
@@ -51,6 +54,7 @@ class CreatePackingListProcessor
         $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
         $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
+
         /** create packing list replica */
         $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);

app/Classes/ValueObjects/Constants/WarehouseReferences.php

@@ -8,6 +8,8 @@ final class WarehouseReferences {
 
     public const YD_GUANG_ZHOU = 'GZ-V02';
 
+    public const YD_GUANG_ZHOU_2 = 'GZ-V03';
+
     public const VT_YIWU = 'YW-V01';
 
     public const YD_YIWU = 'YW-V02';
@@ -43,6 +45,8 @@ final class WarehouseReferences {
 
     public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726];
 
+    public const REPLICA_WHITE_LIST = [502];
+
     //2376 qce
 
 }

app/Http/Controllers/Delivery/ExportDeliveryOrdersToExcelController.php

@@ -25,7 +25,7 @@ class ExportDeliveryOrdersToExcelController
 
     public function lineClear(Request $request){
         $exportsTransactions = new ExportsMultipleDeliveryOrders($request);
-        $response = $exportsTransactions->download('line-clear-export.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        $response = $exportsTransactions->download('line-clear-export.xlsx', Excel::XLSX, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         ob_end_clean();
         return $response;
     }

app/Http/Controllers/Exports/ExportArrivedParcelController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsArrivedParcel;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportArrivedParcelController
+{
+    /**
+     * ExportArrivedParcelController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function export(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsArrivedParcel($request);
+        $response = $exportsPendingArrangementDeliveryList->download('arrived-parcel.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}

app/Http/Controllers/Exports/ExportPendingArrangementPackingListController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Exports;
 
+use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
 use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -22,7 +23,14 @@ class ExportPendingArrangementPackingListController
 
     public function export(Request $request) {
         $exportsPendingArrangementDeliveryList = new ExportsPendingArrangementDeliveryList($request);
-        $response = $exportsPendingArrangementDeliveryList->download('pending-arrangement-packing-list.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        $response = $exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
+    public function onHold(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsOnHoldPackingList($request);
+        $response = $exportsPendingArrangementDeliveryList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         ob_end_clean();
         return $response;
     }

app/Http/Controllers/Orders/DownloadOrderQrPdfController.php

@@ -41,7 +41,7 @@ class DownloadOrderQrPdfController
             $warehousePrefix = 'YW/';
         }
 
-        if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){
+        if(in_array($warehouse->reference,[WarehouseReferences::YD_GUANG_ZHOU, WarehouseReferences::YD_GUANG_ZHOU_2])){
             $warehousePrefix = 'YD/';
 
             if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan' || in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) {

database/seeders/LastMileDeliveryTableSeeder.php

@@ -114,7 +114,7 @@ class LastMileDeliveryTableSeeder extends Seeder
     {
 
         $companies = [
-            new CompanyObject('Last Mile Delivery', 'LMD', CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED),
+            new CompanyObject('Last Mile Delivery', 'HWT', CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED),
         ];
 
 

database/seeders/ModernWarehouseTableSeeder.php

@@ -105,10 +105,10 @@ class ModernWarehouseTableSeeder extends Seeder
 
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::WAREHOUSE);
-        $companyModule->update(['name' => 'Yiwu', 'reference' => 'YW-V02']);
+        $companyModule->update(['name' => 'Guangzhou', 'reference' => 'GZ-V02']);
 
-        $address = new AddressObject('义乌市 后宅街道 起航路233号百汇科创园园区里面', '（进口处进来第一个路口左转至出口处右手边国际物流仓库)', 2, 27, 532, 322000, AddressType::BILLING, ApprovalStatus::APPROVED);
-        $contact = new ContactObject('韩成名', '18058489899 / 18058929899', '', '');
+        $address = new AddressObject('广东省 广州市 白云区 江高镇松岗街七横63号', '', 2, 35, 633, 510450, AddressType::BILLING, ApprovalStatus::APPROVED);
+        $contact = new ContactObject('郑先生', '13719211997', '', '');
 
         $this->createsAddress->execute($companyModule, $address);
         $this->createsContact->execute($companyModule, $contact);

resources/assets/vue/components/addresses/forms/AddressFormComponent.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="row p-t-25 text-left">
         <div class="col">
-            <div class="row">
+            <div class="row" v-if="![7,8].includes($store.getters.getCompanyModuleType)">
                 <div class="col">
                     <div class="row m-b-15">
                         <div class="col">
@@ -73,6 +73,68 @@
                     </div>
                 </div>
             </div>
+            <div class="row" v-if="[7,8].includes($store.getters.getCompanyModuleType)">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.reference">
+                                <label>Company Name</label>
+                                <input class="form-control" name="reference" v-model="parameters.reference">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.person_in_charge">
+                                <label>Name</label>
+                                <input class="form-control" name="person_in_charge" v-model="parameters.person_in_charge">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                <label>Phone</label>
+                                <input class="form-control" name="phone" v-model="parameters.phone">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md-3 pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.street_one">
+                                <label>Unit No.</label>
+                                <input class="form-control" name="street_one" v-model="parameters.street_one">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.street_two">
+                                <label>Street Address</label>
+                                <input class="form-control" name="street_two" v-model="parameters.street_two">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                            <validation-wrapper-component selectable :validator="$v.parameters.district_id">
+                                <label>City/Town</label>
+                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md pl-md-1">
+                            <validation-wrapper-component :validator="$v.parameters.post_code">
+                                <label>Post Code</label>
+                                <input class="form-control" name="post_code" v-model="parameters.post_code">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.remark">
+                                <label>Remark</label>
+                                <input class="form-control" name="remark" v-model="parameters.remark">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div class="col">
                     <div class="row">

resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue

@@ -8,8 +8,8 @@
             </div>
             <div class="row" v-show="!$store.getters.isShowing('createOrderForm')">
                 <div class="col">
-                    <on-boarding-section-component v-if="company.last_order && company.status === 0"></on-boarding-section-component>
-                    <div class="row" v-if="company.last_order && company.status !== 0">
+                    <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>
+                    <div class="row" v-if="company.last_order">
                         <div class="col">
                             <div class="row m-b-30 relative">
                                 <div class="col">
@@ -67,7 +67,7 @@
                     </div>
                 </div>
             </div>
-            <order-form-component v-show="$store.getters.isShowing('createOrderForm') || (!company.last_order && company.status === 0)" :company="company" :section="section"></order-form-component>
+            <order-form-component v-show="$store.getters.isShowing('createOrderForm')" :company="company" :section="section"></order-form-component>
         </div>
     </div>
 </template>

resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="row">
         <div class="col">
-            <div class="row m-b-20 hide">
+            <div class="row m-b-20">
                 <div class="col">
                     <div class="row m-b-50 text-center" v-if="!$store.getters.isAdmin">
                         <div class="col">
@@ -97,109 +97,6 @@
                     </div>
                 </div>
             </div>
-            <div class="row align-items-center justify-content-center m-b-30">
-                <div class="col-10 bg-master-lightest padding-25">
-                    <div class="row align-items-center">
-                        <div class="col-12 col-lg-3">
-                            <div class="row justify-content-center">
-                                <div class="col-10">
-                                    <a :href="route('order.qr.download', 3362)" target="_blank">
-                                        <div class="peelable-corner overflow-hidden relative">
-                                            <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:3362}'" class="w-100">
-                                        </div>
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col">
-                            <div class="row align-items-center">
-                                <div class="col">
-                                    <h4 class="text-success bold">Hooray! You have successfully created your first order.</h4>
-                                </div>
-                            </div>
-                            <div class="row m-b-20">
-                                <div class="col-auto">
-                                    <h3 class="no-margin"><b>Order No.</b> 636295692</h3>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row align-items-center justify-content-center m-b-50">
-                <div class="col-10">
-                    <div class="row">
-                        <div class="col p-t-10 p-b-25 p-l-25 p-r-25 bg-master-lightest b-r b-grey">
-                            <div class="row m-b-15">
-                                <div class="col text-center">
-                                    <img src="/images/qr-box.svg" width="150" height="150">
-                                </div>
-                            </div>
-                            <div class="row justify-content-center">
-                                <div class="col">
-                                    <div class="row m-b-10">
-                                        <div class="col">
-                                            <div class="bold all-caps fs-10"><i class="fa fa-circle text-primary m-r-10"></i>Step 1</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <p class="no-margin">Send the QR Code label to your supplier to attach to your parcel</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col p-t-10 p-b-25 p-l-25 p-r-25 bg-master-lightest b-r b-grey">
-                            <div class="row m-b-15">
-                                <div class="col text-center">
-                                    <img src="/images/package.svg" width="120" height="150">
-                                </div>
-                            </div>
-                            <div class="row justify-content-center">
-                                <div class="col">
-                                    <div class="row m-b-10">
-                                        <div class="col">
-                                            <div class="bold all-caps fs-10"><i class="fa fa-circle text-primary m-r-10"></i>Step 2</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <p class="no-margin">We receive your packages at our warehouse, and arrange for shipping.</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col p-t-10 p-b-25 p-l-25 p-r-25 bg-master-lightest">
-                            <div class="row m-b-15">
-                                <div class="col">
-                                    <img src="/images/package_hands.svg" width="160" height="150">
-                                </div>
-                            </div>
-                            <div class="row justify-content-center">
-                                <div class="col">
-                                    <div class="row m-b-10">
-                                        <div class="col">
-                                            <div class="bold all-caps fs-10"><i class="fa fa-circle text-primary m-r-10"></i>Step 3</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <p class="no-margin">Track your parcel to your doorsteps at your selected delivery address.</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row align-items-center justify-content-center">
-                <div class="col-10">
-                    <complete-registration-form-component></complete-registration-form-component>
-                </div>
-            </div>
         </div>
     </div>
 </template>

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

@@ -25,6 +25,10 @@
         <div class="col">
             <p class="no-margin" v-if="item.transport">{{ item.transport.current_schedule.eta }}</p>
             <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a'}}</p>
+            <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="rescheduleTransport">Reschedule Transport</div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="rescheduleTransport">
+                <reschedule-transport-date-form-component :data="item"></reschedule-transport-date-form-component>
+            </modal-component>
         </div>
         <div class="col-auto text-right" v-if="!item.transport">
             <div class="row m-b-5">

resources/assets/vue/components/containers/forms/RescheduleTransportDateFormComponent.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <p>Plese set the approximate dates of below.</p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="row m-auto mt-10 mb-10">
+                        <div class="col p-l-0 p-r-10">
+                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.etd">
+                                <label class="text-primary">Etd</label>
+                                <date-picker-component v-model="parameters.etd"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col p-r-0 p-l-10">
+                            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.eta">
+                                <label class="text-primary">Eta</label>
+                                <date-picker-component v-model="parameters.eta"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.reschedule', data.id), 'put', section, true, true)">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            section:{
+                type: String,
+                default: ''
+            },
+        },
+        data() {
+            return {
+                parameters: {
+                    etd: this.etd, 
+                    eta: this.eta, 
+                }
+            };
+        },
+        validations: {
+            parameters: {
+                etd: { required },
+                eta: { required },
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>

resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js

@@ -1,11 +1,19 @@
-import { required, numeric } from "vuelidate/lib/validators";
+import { required, requiredIf, numeric } from "vuelidate/lib/validators";
 import addressFormHandler from '../addressFormHandler'
 export default {
     validations: {
         parameters: {
-            reference: { required },
+            reference: {
+                required: requiredIf(function(){
+                    return ![7,8].includes(this.$store.getters.getCompanyModuleType);
+                })
+            },
             street_one: { required },
-            street_two: {},
+            street_two: {
+                required: requiredIf(function(){
+                    return [7,8].includes(this.$store.getters.getCompanyModuleType);
+                })
+            },
             district_id: { required },
             post_code: { required },
             remark: {},

resources/assets/vue/general/mixins/request.js

@@ -27,7 +27,6 @@ export default {
 
                 });
             }).catch((error) => {
-                console.log(error);
                 this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});
             }).then(() => {
                 if (section) {

resources/assets/vue/vuex/modules/authentication.js

@@ -9,7 +9,6 @@ export default {
     },
     getters: {
         isAuthenticated: state => !!state.authentication.access_token,
-        getAccessToken: state => state.authentication.access_token,
         isSuperAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1,
         isAdmin: (state, getters) => getters.getDecodedAccessToken.user.type === 0 || getters.getDecodedAccessToken.user.type === 1 || getters.getDecodedAccessToken.user.type === 2,
         getUserName: (state, getters) => getters.getUpdatedFullname || getters.getDecodedAccessToken.user.name,
@@ -19,7 +18,25 @@ export default {
         getCompanyModuleId: (state, getters) => getters.getDecodedAccessToken.user.company_module_id,
         getCompanyModuleType: (state, getters) => getters.getDecodedAccessToken.user.company_module_type,
         getOrder: (state, getters) => getters.getDecodedAccessToken.user.order,
+        getAccessToken(state, getters) {
 
+            if(getters.isAuthenticated){
+                $crisp.push(["set", "user:email", getters.getUserEmail]);
+                if(getters.isAdmin){
+                    $crisp.push(["set", "user:nickname", getters.getUserName]);
+                }
+                if(getters.getCompanyModuleType === 1){
+                    $crisp.push(["set", "user:nickname", getters.getDecodedAccessToken.user.company_marking]);
+                    $crisp.push(["set", "session:data", [
+                        [
+                            ["company name", getters.getDecodedAccessToken.user.company_name],
+                        ]
+                    ]]);
+                }
+            }
+
+            return state.authentication.access_token
+        },
         getDecodedAccessToken(state) {
             try{
                 return jwt_decode(state.authentication.access_token);

resources/assets/vue/vuex/modules/crudRequest.js

@@ -10,7 +10,7 @@ export default {
                     'Authorization': 'Bearer '+getters.getAccessToken
                 }
             }).then(response => {
-                if(response.status === 401 && (window.location.href !== route('login') || window.location.href.indexOf(this.route('last_mile_delivery.login')) <= -1)){
+                if(response.status === 401 && window.location.href !== route('login') && window.location.href.indexOf(route('last_mile_delivery.login')) <= -1){
                     dispatch('userAuthentication', {access_token: '', redirect_url: [7, 8].includes(getters.getCompanyModuleType) ? route('last_mile_delivery.login') : route('login')});
                 }
 

resources/views/pages/warehouse_list.blade.php

@@ -7,7 +7,17 @@
                     <h6>Arrived Parcel</h6>
                 </div>
             </div>
-            <list-component section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 1, packing_list_status: 2, per_page: 20, order_by: {column: 'arrival_date', DESC: true}, with_arrival_date: true}" >
+            <a href="{{route('packing_list.arrived_parcel.export')}}" target="_blank">
+                <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none">
+                    <div class="row align-items-center">
+                        <div class="col-auto p-r-0 p-l-0">
+                            <i class="fa fa-file-excel-o fs-16"></i>
+                        </div>
+                        <div class="col p-r-5">Export To Excel</div>
+                    </div>
+                </button>
+            </a>
+            <list-component section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 1, per_page: 20, order_by: {column: 'arrival_date', DESC: true}, with_arrival_date: true}" >
                 <template slot="list" slot-scope="{data}">
                     <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
                 </template>

resources/views/pdfs/qr.blade.php

@@ -32,15 +32,15 @@
                         <tbody>
                         <tr>
                             <td style="border-bottom: solid 2px #000000;">
-                                <h1 style="font-size: 50px; line-height: 70px">{{$marking}}{{$order->reference}}</h1>
+                                <h3 style="font-size: 35px; line-height: 70px">{{$marking}}{{$order->reference}}</h3>
                             </td>
                         </tr>
                         <tr>
                             <td>
-                                <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>
+                                <p style="font-size: 25px; 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: 25px;">{{$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: 25px;">联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach</p>
+                                <p style="font-style: italic; font-weight: bold; margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">{!! $remark !!}</p>
                             </td>
                         </tr>
                         </tbody>

resources/views/vendor/js.blade.php

@@ -6,19 +6,7 @@
 	'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; })
 ]) !!};
 </script>
-@if(!App::environment('production'))
-<script type="text/javascript">
-    var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
-    (function(){
-        var s1=document.createElement("script"),s0=document.getElementsByTagName("script")[0];
-        s1.async=true;
-        s1.src='https://embed.tawk.to/623d8cdd2abe5b455fc195aa/1fv06sgtf';
-        s1.charset='UTF-8';
-        s1.setAttribute('crossorigin','*');
-        s0.parentNode.insertBefore(s1,s0);
-    })();
-</script>
-@endif
+<script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="665dcd41-1edf-4451-8cb9-f1cf9ed35e15";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
 <script src="{{ asset('js/vendor.js') }}" type="text/javascript"></script>
 <script src="{{mix('vue/app.js')}}"></script>
 <script src="{{ asset('js/site.js') }}" type="text/javascript"></script>

routes/web.php

@@ -260,6 +260,8 @@ Route::get('/warehouse/{id}/show', function ($id) {
 Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
 Route::get('/export/packing-list/{id}', 'Exports\ExportContainerPackingListController@export')->name('container.packaging_list.export');
 Route::get('/export/pending-arrangement-delivery-list', 'Exports\ExportPendingArrangementPackingListController@export')->name('packaging_list.pending_arrangement.export');
+Route::get('/export/on-hold-packing-list', 'Exports\ExportPendingArrangementPackingListController@onHold')->name('packaging_list.on_hold.export');
+Route::get('/export/arrived-parcel', 'Exports\ExportArrivedParcelController@export')->name('packing_list.arrived_parcel.export');
 
 Route::get('/settings', function () {
     return view('pages.settings');