diff --git a/app/Classes/General/Eloquent/Filters/OwneId.php b/app/Classes/General/Eloquent/Filters/OwneId.php new file mode 100644 index 00000000..eac7e32d --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/OwneId.php @@ -0,0 +1,20 @@ +where('owner_id', $value); + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index 15b852f6..64683721 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -106,7 +106,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic 'status' => ApprovalStatus::REJECTED ]); - $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]); + $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]); $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order); diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php index 7d4a9531..b9e3142d 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php @@ -50,23 +50,11 @@ class ListPackingListsLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - try { + $this->canListPackingLists->passes(); - $this->canListPackingLists->passes(); - - $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters'))); - - if ($request->input('null_order')) { - return $this->collectionResponse(PackingListNullOrderResource::collection($query)); - } - else { - return $this->collectionResponse(PackingListResource::collection($query)); - } - - } catch (\Exception $exception){ - throw new ErrorException($exception->getMessage(), $exception->getCode()); - } + $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters'))); + return $this->collectionResponse(PackingListResource::collection($query)); } } diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue new file mode 100644 index 00000000..f6dd6d47 --- /dev/null +++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue @@ -0,0 +1,62 @@ + + diff --git a/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue b/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue new file mode 100644 index 00000000..afa6384c --- /dev/null +++ b/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue @@ -0,0 +1,58 @@ + + \ No newline at end of file diff --git a/resources/views/pages/unclaimed_packinglist.blade.php b/resources/views/pages/unclaimed_packinglist.blade.php new file mode 100644 index 00000000..4971569e --- /dev/null +++ b/resources/views/pages/unclaimed_packinglist.blade.php @@ -0,0 +1,8 @@ +@extends('layouts.base_portal') +@section('inner_content') +
+
+ +
+
+@endsection \ No newline at end of file diff --git a/routes/packing_list.php b/routes/packing_list.php index 475613dd..fe889ddb 100644 --- a/routes/packing_list.php +++ b/routes/packing_list.php @@ -17,7 +17,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' = Route::put('/update-drop-date/{id}', 'UpdateDropDatePackingListController@update')->name('update_drop_date'); Route::put('/complete/{id}', 'CompletePackingListController@complete')->name('complete'); Route::put('/assign-remark/{id}', 'AssignPackingListRemarkController@create')->name('assign.remark'); - Route::put('/assign-order/{id}', 'AssignPackingListOrderController@assign')->name('assign.order'); + Route::put('/assign-order/{id}/{reference}', 'AssignPackingListOrderController@assign')->name('assign.order'); Route::group(['namespace' => 'Containers', 'prefix' => 'container', 'as' => 'container.'], function () { diff --git a/routes/web.php b/routes/web.php index 6b9ae1d0..118661c3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -73,6 +73,10 @@ Route::get('/warehouse-list', function () { return view('pages.warehouse_list'); })->name('warehouse.list'); +Route::get('/unclaimed-packinglist', function () { + return view('pages.unclaimed_packinglist'); +})->name('warehouse.list'); + Route::get('/containers', function () { return view('pages.containers'); })->name('containers');