hold and release goods for delivery

2026-08-22 22:14:26 +00:00 · 2021-09-09 04:05:51 +08:00
parent a531361514
commit 8dab2a09ff
10 changed files with 133 additions and 8 deletions
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingListStatus;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanUpdatePackingList;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Http\Resources\PackingListResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdatePackingListStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated PackingList Status',
+            'message' => 'You have successfully updated the PackingList status'
+        ];
+    }
+
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var UpdatesPackingListStatus */
+    private $updatesPackingListStatus;
+
+    /**
+     * UpdatePackingListStatusLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param UpdatesPackingListStatus $updatesPackingListStatus
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesPackingListStatus $updatesPackingListStatus)
+    {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->updatesPackingListStatus = $updatesPackingListStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+
+        $query = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+
+        return $this->resourceResponse(new PackingListResource($query));
+    }
+
+}
@@ -65,7 +65,6 @@ class FetchContainersStatusUpdateFromVTPortalProcessor

    /**
     * @return array
-     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
    public function execute(){

@@ -122,9 +121,15 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                    if($containerStatus === 'Unstuffing'){
                        $container->update(['status' => ApprovalStatus::COMPLETED]);
                        $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
-                        $container->packingLists()->update(['status' => ApprovalStatus::APPROVED]);
+
                        /** @var PackingList $packingList */
                        foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
                            $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
                            foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
                                $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
@@ -3,8 +3,6 @@
 namespace App\Classes\Modules\PackingLists\Processors;

 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
@@ -12,7 +10,6 @@ use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\PackingList;
@@ -199,7 +199,10 @@ class FetchLoadedContainersFromVTPortalProcessor

                        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);

-                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION, $contractReference);
+                        $connection = $order->companyModule->connections()->first();
+                        $marking = $connection->invitee_reference;
+
+                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, (int) filter_var($marking, FILTER_SANITIZE_NUMBER_INT) <= 1000 ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::SUSPENDED, $contractReference);

                        /** @var PackingList $packingList */
                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
@@ -46,7 +46,7 @@ class FetchPackingListFromVTPortalProcessor
     */
    public function execute(){

-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('status', '=', ApprovalStatus::PENDING_VERIFICATION)->get();
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->get();

        foreach($packingLists as $packingList){

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PackingList;
+
+class UpdatesPackingListStatus extends AbstractUpdateRecord
+{
+
+    /**
+     * @param PackingList $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $model, int $status) {
+
+        $model->status = $status;
+
+        return $this->handler($model);
+
+    }
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\UpdatePackingListStatusLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdatePackingListStatusController
+{
+    /**
+     * @param Request $request
+     * @param UpdatePackingListStatusLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdatePackingListStatusLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
@@ -43,6 +43,7 @@
                                <div class="col-2">Customer Marking</div>
                                <div class="col-1 text-center">Quantity</div>
                                <div class="col-1">CBM</div>
+                                <div class="col-1 text-center">status</div>
                                <div class="col">Delivery Address</div>
                            </div>
                        </div>
@@ -56,7 +57,12 @@
                                        <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a></div>
                                        <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
                                        <div class="col-1">{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
+                                        <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
                                        <div class="col">{{packingList.order.address.street_one+' '+(packingList.order.address.street_two ? packingList.order.address.street_two : '')+', '+ packingList.order.address.district.name+', '+packingList.order.address.post_code+' '+packingList.order.address.state.name+', '+packingList.order.address.country.name}}</div>
+                                        <div class="col-auto" v-if="!packingList.transport">
+                                            <div class="btn btn-xs btn-success pointer" v-if="packingList.status === 5" @click="submit(route('api.packing_list.status.update', packingList.id, item.status === 1 ? 1 : 2), 'put', 'containerListSection', true, true)"><i class="fa fa-check m-r-5"></i>Release</div>
+                                            <div class="btn btn-xs btn-danger pointer" v-if="packingList.status !== 5" @click="submit(route('api.packing_list.status.update', packingList.id, 5), 'put', 'containerListSection', true, true)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
+                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -75,6 +81,11 @@
                expanded: false
            }
        },
+        methods: {
+            successHandler(){
+                this.$store.dispatch('reloadList', {'name': 'containerListSection'});
+            }
+        },
        mixins: [componentHandler]
    }
 </script>
@@ -7,6 +7,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
    Route::get('/list', 'ListPackingListsController@list')->name('list');
    Route::post('/create', 'CreatePackingListController@create')->name('create');
    Route::put('/update/{id}', 'UpdatePackingListController@update')->name('update');
+    Route::put('/status/{id}/update/{status}', 'UpdatePackingListStatusController@update')->name('status.update');
    Route::delete('/delete/{id}', 'DeletePackingListController@delete')->name('delete');

    Route::group(['namespace' => 'Containers', 'prefix' => 'container', 'as' => 'container.'], function () {
@@ -77,6 +77,7 @@ Route::get('/customer/{marking}', function ($marking) {
 })->name('customer.profile');

 Route::get('/orders/refresh', function(){
+
    FetchWarehouseReceiveListFromVTPortalJob::withChain([
        new FetchLoadedContainersFromVTPortalJob,
        new FetchPackingListFromVTPortalJob,
@@ -84,7 +85,8 @@ Route::get('/orders/refresh', function(){
        new FetchDeliveryListFromVTPortalJob
    ])->dispatch();

-    return redirect('orders');
+    return redirect()->back();
+
 })->name('orders.refresh');

 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');