Merge branch 'main' of https://github.com/inikoo/aiku into main

inikoo · Feb 12, 2025 · c748804 · c748804
2 parents aa70963 + 431fe1c
commit c748804
Show file tree

Hide file tree

Showing 15 changed files with 303 additions and 566 deletions.
diff --git a/app/Actions/Fulfilment/Pallet/AttachPalletToReturn.php b/app/Actions/Fulfilment/Pallet/AttachPalletToReturn.php
@@ -67,7 +67,8 @@ public function rules(): array
                 'required',
                 'string',
                 Rule::exists('pallets', 'reference')->where(function ($query) {
-                    $query->where('fulfilment_customer_id', $this->parent->fulfilment_customer_id);
+                    $query->where('fulfilment_customer_id', $this->parent->fulfilment_customer_id)
+                    ->where('status', PalletStatusEnum::STORING);
                 })
             ],
         ];

diff --git a/app/Actions/Fulfilment/PalletDelivery/UI/ShowPalletDelivery.php b/app/Actions/Fulfilment/PalletDelivery/UI/ShowPalletDelivery.php
diff --git a/app/Actions/Fulfilment/PalletReturn/IndexPalletsInReturnPalletWholePallets.php b/app/Actions/Fulfilment/PalletReturn/IndexPalletsInReturnPalletWholePallets.php
@@ -12,11 +12,10 @@
 use App\Enums\Fulfilment\Pallet\PalletStateEnum;
 use App\Enums\Fulfilment\Pallet\PalletStatusEnum;
 use App\Enums\Fulfilment\PalletReturn\PalletReturnStateEnum;
-use App\Enums\Fulfilment\StoredItem\StoredItemInReturnOptionEnum;
+use App\Enums\Fulfilment\PalletReturn\PalletsInPalletReturnWholePalletsOptionEnum;
 use App\Http\Resources\Fulfilment\PalletsResource;
 use App\InertiaTable\InertiaTable;
 use App\Models\CRM\WebUser;
-use App\Models\Fulfilment\FulfilmentCustomer;
 use App\Models\Fulfilment\Pallet;
 use App\Models\Fulfilment\PalletReturn;
 use App\Services\QueryBuilder;
@@ -34,15 +33,13 @@ protected function getElementGroups(PalletReturn $palletReturn): array
             'option' => [
                 'label'    => __('Option'),
                 'elements' => array_merge_recursive(
-                    StoredItemInReturnOptionEnum::labels(),
-                    StoredItemInReturnOptionEnum::count()
+                    PalletsInPalletReturnWholePalletsOptionEnum::labels(),
+                    PalletsInPalletReturnWholePalletsOptionEnum::count($palletReturn)
                 ),
                 'engine' => function ($query, $elements) use ($palletReturn) {
-                    if (in_array(StoredItemInReturnOptionEnum::SELECTED->value, $elements)) {
+
+                    if (in_array(PalletsInPalletReturnWholePalletsOptionEnum::SELECTED->value, $elements)) {
                         $query->where('pallet_return_items.pallet_return_id', $palletReturn->id);
-                    } elseif (in_array(StoredItemInReturnOptionEnum::UNSELECTED->value, $elements)) {
-                        $query->whereNull('pallets.pallet_return_id')
-                            ->where('pallets.state', PalletStateEnum::STORING);
                     }
                 }
             ],
@@ -75,7 +72,7 @@ public function handle(PalletReturn $palletReturn, $prefix = null): LengthAwareP
         if ($palletReturn->state !== PalletReturnStateEnum::DISPATCHED) {
             $query->where('pallets.status', '!=', PalletStatusEnum::RETURNED);
         } elseif ($palletReturn->state === PalletReturnStateEnum::IN_PROCESS) {
-            $query->where('pallets.state', PalletStatusEnum::STORING);
+            $query->where('pallets.status', PalletStatusEnum::STORING);
         }
 
         if ($palletReturn->state !== PalletReturnStateEnum::IN_PROCESS) {
@@ -95,7 +92,6 @@ public function handle(PalletReturn $palletReturn, $prefix = null): LengthAwareP
                 );
             }
         }
-        $query->distinct('pallets.id');
 
         $query->defaultSort('pallets.id')
             ->select(
@@ -143,12 +139,6 @@ public function jsonResponse(LengthAwarePaginator $pallets): AnonymousResourceCo
         return PalletsResource::collection($pallets);
     }
 
-    public function asController(FulfilmentCustomer $fulfilmentCustomer, ActionRequest $request): LengthAwarePaginator
-    {
-        $this->initialisationFromFulfilment($fulfilmentCustomer->fulfilment, $request);
-
-        return $this->handle($fulfilmentCustomer);
-    }
 
     public function tableStructure(PalletReturn $palletReturn, $request, $prefix = null, $modelOperations = []): Closure
     {

diff --git a/app/Actions/Fulfilment/PalletReturn/Json/GetReturnPalletsWithStoredItems.php b/app/Actions/Fulfilment/PalletReturn/Json/GetReturnPalletsWithStoredItems.php
diff --git a/app/Actions/Fulfilment/PalletReturn/Json/GetReturnStoredItems.php b/app/Actions/Fulfilment/PalletReturn/Json/GetReturnStoredItems.php