query fix for pallet audit

inikoo · Feb 21, 2025 · d09c9b3 · d09c9b3
1 parent 283ca71
commit d09c9b3
Showing 1 changed file with 42 additions and 4 deletions.
diff --git a/app/Actions/Fulfilment/StoredItemAudit/UI/ShowStoredItemAuditForPallet.php b/app/Actions/Fulfilment/StoredItemAudit/UI/ShowStoredItemAuditForPallet.php
@@ -84,8 +84,46 @@ public function htmlResponse(StoredItemAudit $storedItemAudit, ActionRequest $re
                     'label' => __('Add SKU'),
                 ]
             ];
-            $editDeltas = StoredItemDeltasInProcessForPalletResource::collection(IndexStoredItemDeltasInProcessForPallet::run($storedItemAudit, 'edit_stored_item_deltas'));
-            $editNewDeltas = NewStoredItemDeltasInProcessForPalletResource::collection(IndexNewStoredItemDeltasInProcessForPallet::run($storedItemAudit, 'new_stored_item_deltas'));
+            $editDeltas = $pallet->getEditStoredItemDeltasQuery($pallet->id, $storedItemAudit->id)
+                ->where('pallet_stored_items.pallet_id', $this->id)
+                ->get()->map(fn ($item) => [
+                    'stored_item_audit_id'       => $this->stored_item_audit_id,
+                    'pallet_id'                  => $item->pallet_id,
+                    'stored_item_id'             => $item->stored_item_id,
+                    'reference'                  => $item->stored_item_reference,
+                    'quantity'                   => (int)$item->quantity,
+                    'audited_quantity'           => (int)$item->audited_quantity,
+                    'audit_notes'                => $item->audit_notes,
+                    'stored_item_audit_delta_id' => $item->stored_item_audit_delta_id,
+                    'audit_type'                 => $item->audit_type,
+                    'update_routes'              => [
+                        'name'       => 'grp.models.stored_item_audit_delta.update',
+                        'parameters' => [
+                            $item->stored_item_audit_delta_id
+                        ]
+                    ],
+                    'type'                       => 'current_item',
+                ]);
+            $editNewDeltas = $pallet->getEditNewStoredItemDeltasQuery($pallet->id)
+            ->where('stored_item_audit_deltas.pallet_id', $pallet->id)
+            ->where('stored_item_audit_deltas.stored_item_audit_id', $storedItemAudit->id)
+                ->get()->map(fn ($item) => [
+                    'stored_item_audit_id'    => $this->stored_item_audit_id,
+                    'stored_item_id'          => $item->stored_item_id,
+                    'reference'               => $item->stored_item_reference,
+                    'quantity'                => 0,
+                    'audited_quantity'        => (int)$item->audited_quantity,
+                    'stored_item_audit_delta_id' => $item->audit_id,
+                    'audit_type'                 => $item->audit_type,
+                    'update_routes'           => [
+                        'name'       => 'grp.models.stored_item_audit_delta.update',
+                        'parameters' => [
+                            $item->audit_id
+                        ]
+                    ],
+                    'audit_notes'             => $item->audit_notes,
+                    'type'                    => 'new_item'
+                ]);
         } else {
             $deltas = StoredItemAuditDeltasResource::collection(IndexStoredItemAuditDeltas::run($storedItemAudit, 'stored_item_deltas'));
         }
@@ -165,8 +203,8 @@ public function htmlResponse(StoredItemAudit $storedItemAudit, ActionRequest $re
                 ],
 
                 'data'                    => StoredItemAuditResource::make($storedItemAudit),
-                'edit_stored_item_deltas' => $editDeltas,
-                'edit_new_stored_item_deltas' => $editNewDeltas,
+                'xstored_items' => $editDeltas,
+                'xnew_stored_items' => $editNewDeltas,
                 'stored_item_deltas'      => $deltas,
                 'fulfilment_customer'     => FulfilmentCustomerResource::make($storedItemAudit->fulfilmentCustomer)->getArray()
             ]