diff --git a/app/Actions/Fulfilment/Fulfilment/UI/ShowFulfilment.php b/app/Actions/Fulfilment/Fulfilment/UI/ShowFulfilment.php
index fac32300dd..b0983985b6 100644
--- a/app/Actions/Fulfilment/Fulfilment/UI/ShowFulfilment.php
+++ b/app/Actions/Fulfilment/Fulfilment/UI/ShowFulfilment.php
@@ -9,6 +9,7 @@
 namespace App\Actions\Fulfilment\Fulfilment\UI;
 
 use App\Actions\OrgAction;
+use App\Actions\Traits\WithDashboard;
 use App\Actions\UI\Dashboards\ShowGroupDashboard;
 use App\Actions\UI\WithInertia;
 use App\Enums\Catalogue\Shop\ShopTypeEnum;
@@ -27,6 +28,8 @@ class ShowFulfilment extends OrgAction
 {
     use AsAction;
     use WithInertia;
+    use WithDashboard;
+
 
     public function handle(Fulfilment $fulfilment): Fulfilment
     {
@@ -50,9 +53,239 @@ public function asController(Organisation $organisation, Fulfilment $fulfilment,
 
     private function getDashboard(Fulfilment $fulfilment): array
     {
-        // dd($this->organisation->fulfilmentStats);
 
         return [
+
+
+            'dashboard_stats' => [
+                'widgets' => [
+                    'column_count'    => 4 ,
+                    'components' => [
+
+                        $this->getWidget(
+                            colSpan: 1,
+                            data: [
+                                'value'       => $fulfilment->shop->orderingStats->number_invoices,
+                                'description' => __('invoices'),
+                                'type'        => 'number',
+                                'route'         => [
+                                    'name'       => 'grp.org.fulfilments.show.operations.invoices.all_invoices.index',
+                                    'parameters' => [
+                                        $fulfilment->organisation->slug,
+                                        $fulfilment->slug
+                                    ]
+                                ]
+                            ],
+                            visual: [
+                                'label' => __('Paid'),
+                                'type'  => 'MeterGroup',
+                                'value' => $fulfilment->shop->orderingStats->number_invoices - $fulfilment->shop->orderingStats->number_unpaid_invoices,
+                                'max'   => $fulfilment->shop->orderingStats->number_invoices,
+                                'color' => 'bg-blue-500',
+                                'right_label' => [
+                                    'label' => __('Unpaid').' '.$fulfilment->shop->orderingStats->number_unpaid_invoices,
+                                    'route'         => [
+                                        'name'       => 'grp.org.fulfilments.show.operations.invoices.unpaid_invoices.index',
+                                        'parameters' => [
+                                            $fulfilment->organisation->slug,
+                                            $fulfilment->slug
+                                        ]
+                                    ]
+                                ]
+
+
+
+                            ],
+                        ),
+
+
+                        $this->getWidget(
+                            colSpan: 1,
+                            data: [
+                                'value'         => $fulfilment->stats->current_recurring_bills_amount,
+                                'description'   => __('Next Bills'),
+                                'type'          => 'currency',
+                                'status'        => $fulfilment->stats->current_recurring_bills_amount < 0 ? 'danger' : '',
+                                'currency_code' => $fulfilment->shop->currency->code,
+                                'route'         => [
+                                    'name'       => 'grp.org.fulfilments.show.operations.recurring_bills.current.index',
+                                    'parameters' => [
+                                        $fulfilment->organisation->slug,
+                                        $fulfilment->slug
+                                    ]
+                                ]
+                            ],
+                            visual: [
+                                'label' => __('Bills'),
+                                'type'  => 'number',
+                                'value' => $fulfilment->stats->number_recurring_bills_status_current,
+                                'route'         => [
+                                    'name'       => 'grp.org.fulfilments.show.operations.recurring_bills.current.index',
+                                    'parameters' => [
+                                        $fulfilment->organisation->slug,
+                                        $fulfilment->slug
+                                    ]
+                                ]
+                            ],
+                        ),
+
+                        $this->getWidget(
+                            rowSpan: 1,
+                            data: [
+                                'value'       => $fulfilment->stats->number_customers_status_active,
+                                'description' => __('Active Customers'),
+                                'type'        => 'number',
+                                'route'         => [
+                                    'name'       => 'grp.org.fulfilments.show.crm.customers.index',
+                                    'parameters' => [
+                                        $fulfilment->organisation->slug,
+                                        $fulfilment->slug
+                                    ]
+                                ]
+                            ]
+                        ),
+
+                        //                            $this->getWidget(
+                        //                                colSpan: 2,
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->current_recurring_bills_amount,
+                        //                                    'description'   => __('Amount Bills'),
+                        //                                    'type'          => 'currency',
+                        //                                    'status'        => $fulfilment->stats->current_recurring_bills_amount < 0 ? 'danger' : '',
+                        //                                    'currency_code' => $fulfilment->shop->currency->code,
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_customers_status_inactive,
+                        //                                    'description'   => __('Inactive Customers'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->shop->orderingStats->number_unpaid_invoices,
+                        //                                    'description'   => __('Total Unpaid Invoices'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->shop->orderingStats->unpaid_invoices_amount,
+                        //                                    'description'   => __('Amount Unpaid Invoices'),
+                        //                                    'type'          => 'currency',
+                        //                                    'status'        => $fulfilment->shop->orderingStats->unpaid_invoices_amount < 0 ? 'danger' : '',
+                        //                                    'currency_code' => $fulfilment->shop->currency->code,
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                colSpan: 2,
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_pallet_deliveries,
+                        //                                    'description'   => __('Deliveries'),
+                        //                                    'type'          => 'number',
+                        //                                ],
+                        //                                visual: [
+                        //                                    'type' => 'MeterGroup',
+                        //                                    'value' => 382,
+                        //                                    'max' => 500,
+                        //                                    'color' => 'bg-blue-500',
+                        //                                ],
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_pallet_returns,
+                        //                                    'description'   => __('Returns'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_pallets,
+                        //                                    'description'   => __('Pallets'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_pallets_with_stored_items,
+                        //                                    'description'   => __('Pallets with items'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_pallets_type_pallet,
+                        //                                    'description'   => __('Pallets type pallet'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_pallets_type_box,
+                        //                                    'description'   => __('Pallets type box'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_pallets_type_oversize,
+                        //                                    'description'   => __('Pallets type oversize'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_stored_items,
+                        //                                    'description'   => __('Stored items'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_recurring_bills,
+                        //                                    'description'   => __('Recurring Bills'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_recurring_bills_status_current,
+                        //                                    'description'   => __('Current Recurring Bills'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->stats->number_recurring_bills_status_former,
+                        //                                    'description'   => __('Former Recurring Bills'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                        //
+                        //                            $this->getWidget(
+                        //                                data: [
+                        //                                    'value'         => $fulfilment->shop->orderingStats->number_invoices,
+                        //                                    'description'   => __('Total Invoices'),
+                        //                                    'type'          => 'number',
+                        //                                ]
+                        //                            ),
+                    ]
+                ]
+            ],
             'flatTreeMaps' => [
 
 
diff --git a/app/Actions/Fulfilment/PalletReturn/AddAddressToPalletReturn.php b/app/Actions/Fulfilment/PalletReturn/AddAddressToPalletReturn.php
index 45adb6df1c..7c2815a034 100644
--- a/app/Actions/Fulfilment/PalletReturn/AddAddressToPalletReturn.php
+++ b/app/Actions/Fulfilment/PalletReturn/AddAddressToPalletReturn.php
@@ -16,7 +16,6 @@
 use App\Actions\Traits\WithModelAddressActions;
 use App\Http\Resources\Fulfilment\PalletReturnResource;
 use App\Models\CRM\WebUser;
-use App\Models\Fulfilment\FulfilmentCustomer;
 use App\Models\Fulfilment\PalletReturn;
 use App\Rules\ValidAddress;
 use Lorisleiva\Actions\ActionRequest;
@@ -26,29 +25,17 @@ class AddAddressToPalletReturn extends OrgAction
     use WithActionUpdate;
     use WithModelAddressActions;
 
-    public function handle(FulfilmentCustomer $fulfilmentCustomer, PalletReturn $palletReturn, array $modelData): PalletReturn
+    public function handle(PalletReturn $palletReturn, array $modelData): PalletReturn
     {
-        if ($modelData == []) {
-            $address = $fulfilmentCustomer->customer->address->toArray();
-            $palletReturn = $this->addAddressToModelFromArray(
-                model: $palletReturn,
-                addressData: $address,
-                scope: 'delivery',
-                updateLocation: false,
-                updateAddressField:false
-            );
-        } else {
-            $palletReturn = $this->addAddressToModelFromArray(
-                model: $palletReturn,
-                addressData: $modelData['delivery_address'],
-                scope: 'delivery',
-                updateLocation: false,
-                updateAddressField:false
-            );
-        }
+        $palletReturn = $this->addAddressToModelFromArray(
+            model: $palletReturn,
+            addressData: $modelData['delivery_address'],
+            scope: 'delivery',
+            updateLocation: false,
+            updateAddressField:false
+        );
 
         $palletReturn->refresh();
-        $palletReturn->update(['delivery_address_id' =>  null]);
         PalletReturnRecordSearch::dispatch($palletReturn);
 
         return $palletReturn;
@@ -76,14 +63,14 @@ public function rules(): array
     }
 
 
-    public function asController(FulfilmentCustomer $fulfilmentCustomer, PalletReturn $palletReturn, ActionRequest $request): PalletReturn
+    public function asController(PalletReturn $palletReturn, ActionRequest $request): PalletReturn
     {
         $this->initialisationFromFulfilment($palletReturn->fulfilment, $request);
 
-        return $this->handle($fulfilmentCustomer, $palletReturn, $this->validatedData);
+        return $this->handle($palletReturn, $this->validatedData);
     }
 
-    public function action(FulfilmentCustomer $fulfilmentCustomer, PalletReturn $palletReturn, array $modelData, int $hydratorsDelay = 0, bool $strict = true): PalletReturn
+    public function action(PalletReturn $palletReturn, array $modelData, int $hydratorsDelay = 0, bool $strict = true): PalletReturn
     {
         $this->asAction       = true;
         $this->hydratorsDelay = $hydratorsDelay;
@@ -91,20 +78,9 @@ public function action(FulfilmentCustomer $fulfilmentCustomer, PalletReturn $pal
         $this->initialisationFromFulfilment($palletReturn->fulfilment, $modelData);
 
 
-        return $this->handle($fulfilmentCustomer, $palletReturn, $this->validatedData);
+        return $this->handle($palletReturn, $this->validatedData);
     }
 
-    public function fromRetina(PalletReturn $palletReturn, ActionRequest $request): PalletReturn
-    {
-        $customer = $request->user()->customer;
-        $palletReturn = $request->user()->customer->palletReturn;
-
-        $this->initialisation($request->get('website')->organisation, $request);
-
-        return $this->handle($customer, $palletReturn, $this->validatedData);
-    }
-
-
     public function jsonResponse(PalletReturn $palletReturn): PalletReturnResource
     {
         return new PalletReturnResource($palletReturn);
diff --git a/app/Actions/Fulfilment/PalletReturn/DeletePalletReturnAddress.php b/app/Actions/Fulfilment/PalletReturn/DeletePalletReturnAddress.php
index 87220a8c4b..9510a2500e 100644
--- a/app/Actions/Fulfilment/PalletReturn/DeletePalletReturnAddress.php
+++ b/app/Actions/Fulfilment/PalletReturn/DeletePalletReturnAddress.php
@@ -12,7 +12,6 @@
 
 use App\Actions\Helpers\Address\Hydrators\AddressHydrateUsage;
 use App\Actions\OrgAction;
-use App\Models\Fulfilment\FulfilmentCustomer;
 use App\Models\Fulfilment\PalletReturn;
 use App\Models\Helpers\Address;
 use Illuminate\Support\Facades\DB;
@@ -31,7 +30,6 @@ public function handle(PalletReturn $palletreturn, Address $address): PalletRetu
         $address->delete();
 
         $palletreturn->refresh();
-        $palletreturn->update(['is_collection' => true]);
         return $palletreturn;
     }
 
@@ -44,10 +42,10 @@ public function afterValidator(Validator $validator): void
 
     }
 
-    public function asController(FulfilmentCustomer $fulfilmentCustomer, PalletReturn $palletReturn, Address $address, ActionRequest $request): void
+    public function asController(PalletReturn $palletReturn, Address $address, ActionRequest $request): void
     {
         $this->address = $address;
-        $this->initialisationFromFulfilment($fulfilmentCustomer->fulfilment, $request);
+        $this->initialisationFromFulfilment($palletReturn->fulfilment, $request);
         $this->handle($palletReturn, $address);
     }
 
@@ -57,14 +55,4 @@ public function action(PalletReturn $palletreturn, Address $address): PalletRetu
         $this->initialisationFromShop($palletreturn->shop, []);
         return $this->handle($palletreturn, $address);
     }
-
-    public function fromRetina(FulfilmentCustomer $fulfilmentCustomer, PalletReturn $palletreturn, Address $address, ActionRequest $request): PalletReturn
-    {
-        $this->address = $address;
-        $palletreturn      = $request->user()->palletreturn;
-
-        $this->initialisation($request->get('website')->organisation, $request);
-
-        return $this->handle($palletreturn, $address);
-    }
 }
diff --git a/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php b/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
index de2afc7b79..8f5a8d1515 100644
--- a/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
+++ b/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
@@ -494,63 +494,40 @@ public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request)
                         FulfilmentCustomerResource::make($palletReturn->fulfilmentCustomer)->getArray(),
                         [
                             'address'      => [
-                                'value'   => $palletReturn->is_collection ? [] : AddressResource::make($palletReturn->deliveryAddress),
+                                'value'   => $palletReturn->is_collection ?
+                                    [] :
+                                    AddressResource::make($palletReturn->deliveryAddress),
                                 'options' => [
                                     'countriesAddressData' => GetAddressData::run()
                                 ],
-                                // 'address'                   => $palletReturn->is_collection ? [] : AddressResource::make($palletReturn->deliveryAddress),
-                                // 'address_list'                   => AddressResource::make($palletReturn->deliveryAddress),
+                                'address_customer' => [
+                                    'value'   => AddressResource::make($palletReturn->fulfilmentCustomer->customer->address),
+                                    'options' => [
+                                        'countriesAddressData' => GetAddressData::run()
+                                    ],
+                                ],
                                 'pinned_address_id'              => $palletReturn->fulfilmentCustomer->customer->delivery_address_id,
                                 'home_address_id'                => $palletReturn->fulfilmentCustomer->customer->address_id,
                                 'current_selected_address_id'    => $palletReturn->delivery_address_id,
-                                // 'selected_delivery_addresses_id' => $palletReturnDeliveryAddressIds,
-                                // 'routes_list'                    => [
-                                //     'pinned_route'                   => [
-                                //         'method'     => 'patch',
-                                //         'name'       => 'grp.models.customer.delivery-address.update',
-                                //         'parameters' => [
-                                //             'customer' => $palletReturn->fulfilmentCustomer->customer_id
-                                //         ]
-                                //     ],
-                                //     'delete_route'  => [
-                                //         'method'     => 'delete',
-                                //         'name'       => 'grp.models.fulfilment-customer.pallet-return-address.delete',
-                                //         'parameters' => [
-                                //             'fulfilmentCustomer' => $palletReturn->fulfilmentCustomer->id,
-                                //             'palletReturn'       => $palletReturn->id
-                                //         ]
-                                //     ],
-                                //     'store_route' => [
-                                //         'method'      => 'post',
-                                //         'name'        => 'grp.models.fulfilment-customer.pellet-return-address.store',
-                                //         'parameters'  => [
-                                //             'fulfilmentCustomer' => $palletReturn->fulfilmentCustomer->id,
-                                //             'palletReturn'       => $palletReturn->id
-                                //         ]
-                                //     ],
-                                // ]
                                 'routes_address' => [
                                     'store'  => [
                                         'method'     => 'post',
-                                        'name'       => 'grp.models.fulfilment-customer.pallet-return-address.store',
+                                        'name'       => 'grp.models.pallet-return.address.store',
                                         'parameters' => [
-                                            'fulfilmentCustomer' => $palletReturn->fulfilmentCustomer->id,
                                             'palletReturn'       => $palletReturn->id
                                         ]
                                     ],
                                     'delete'  => [
                                         'method'     => 'delete',
-                                        'name'       => 'grp.models.fulfilment-customer.pallet-return-address.delete',
+                                        'name'       => 'grp.models.pallet-return.address.delete',
                                         'parameters' => [
-                                            'fulfilmentCustomer' => $palletReturn->fulfilmentCustomer->id,
                                             'palletReturn'       => $palletReturn->id
                                         ]
                                     ],
                                     'update' => [
                                         'method'     => 'patch',
-                                        'name'       => 'grp.models.fulfilment-customer.pallet-return-address.update',
+                                        'name'       => 'grp.models.pallet-return.address.update',
                                         'parameters' => [
-                                            'fulfilmentCustomer' => $palletReturn->fulfilmentCustomer->id,
                                             'palletReturn'       => $palletReturn->id
                                         ]
                                     ]
diff --git a/app/Actions/Fulfilment/PalletReturn/UpdatePalletReturnDeliveryAddress.php b/app/Actions/Fulfilment/PalletReturn/UpdatePalletReturnDeliveryAddress.php
index 3fb5f03c80..a10ca2c200 100644
--- a/app/Actions/Fulfilment/PalletReturn/UpdatePalletReturnDeliveryAddress.php
+++ b/app/Actions/Fulfilment/PalletReturn/UpdatePalletReturnDeliveryAddress.php
@@ -21,9 +21,12 @@
 
 class UpdatePalletReturnDeliveryAddress extends OrgAction
 {
-    public function handle(FulfilmentCustomer $fulfilmentcustomer, PalletReturn $palletReturn, array $modelData): void
+    public function handle(PalletReturn $palletReturn, array $modelData): void
     {
-        if (Arr::get($modelData, 'is_collection', true)) {
+        $isCollection = Arr::get($modelData, 'is_collection', true);
+        $palletReturn->update(['is_collection' => $isCollection]);
+
+        if (!$isCollection) {
             $addressData = Arr::get($modelData, 'address');
             $countryCode = Country::find($addressData['country_id'])->code;
             data_set($addressData, 'country_code', $countryCode);
@@ -37,8 +40,8 @@ public function handle(FulfilmentCustomer $fulfilmentcustomer, PalletReturn $pal
                 $updatedAddress->id,
                 $pivotData
             );
-        } else {
-            DeletePalletReturnAddress::run($palletReturn, Address::find($fulfilmentcustomer->palletReturn->delivery_address_id));
+        } elseif ($palletReturn->delivery_address_id) {
+            DeletePalletReturnAddress::run($palletReturn, Address::find($palletReturn->delivery_address_id));
         }
     }
 
@@ -64,27 +67,19 @@ public function authorize(ActionRequest $request): bool
         return false;
     }
 
-    public function asController(FulfilmentCustomer $fulfilmentcustomer, PalletReturn $palletReturn, ActionRequest $request): void
+    public function asController(PalletReturn $palletReturn, ActionRequest $request): void
     {
-        $this->scope = $fulfilmentcustomer;
-        $this->initialisationFromShop($fulfilmentcustomer->shop, $request);
+        $this->scope = $palletReturn->customer;
+        $this->initialisationFromShop($palletReturn->shop, $request);
 
-        $this->handle($fulfilmentcustomer, $palletReturn, $this->validatedData);
+        $this->handle($palletReturn, $this->validatedData);
     }
 
-    // public function fromFulfilmentFulfilmentCustomer(FulfilmentFulfilmentCustomer $fulfilmentFulfilmentCustomer, ActionRequest $request): void
-    // {
-    //     $this->scope = $fulfilmentFulfilmentCustomer;
-    //     $this->initialisationFromFulfilment($fulfilmentFulfilmentCustomer->fulfilment, $request);
-
-    //     $this->handle($fulfilmentFulfilmentCustomer->fulfilmentcustomer, $this->validatedData);
-    // }
-
-    public function action(FulfilmentCustomer $fulfilmentcustomer, PalletReturn $palletReturn, $modelData): void
+    public function action(PalletReturn $palletReturn, $modelData): void
     {
         $this->asAction = true;
-        $this->initialisationFromShop($fulfilmentcustomer->shop, $modelData);
+        $this->initialisationFromShop($palletReturn->shop, $modelData);
 
-        $this->handle($fulfilmentcustomer, $palletReturn, $this->validatedData);
+        $this->handle($palletReturn, $this->validatedData);
     }
 }
diff --git a/app/Actions/Retina/Fulfilment/FulfilmentTransaction/StoreRetinaFulfilmentTransaction.php b/app/Actions/Retina/Fulfilment/FulfilmentTransaction/StoreRetinaFulfilmentTransaction.php
index 0c84d99d1f..46c7272b27 100644
--- a/app/Actions/Retina/Fulfilment/FulfilmentTransaction/StoreRetinaFulfilmentTransaction.php
+++ b/app/Actions/Retina/Fulfilment/FulfilmentTransaction/StoreRetinaFulfilmentTransaction.php
@@ -101,10 +101,10 @@ public function fromRetinaInPalletReturn(PalletReturn $palletReturn, ActionReque
         $this->handle($palletReturn, $this->validatedData);
     }
 
-    public function action(PalletReturn|PalletDelivery $parent, array $modelData): void
+    public function action(PalletReturn|PalletDelivery $parent, array $modelData): FulfilmentTransaction
     {
         $this->initialisationFulfilmentActions($parent->fulfilmentCustomer, $modelData);
 
-        $this->handle($parent, $this->validatedData);
+        return $this->handle($parent, $this->validatedData);
     }
 }
diff --git a/app/Actions/Retina/Fulfilment/PalletReturn/AttachRetinaPalletsToReturn.php b/app/Actions/Retina/Fulfilment/PalletReturn/AttachRetinaPalletsToReturn.php
index e9f28f21f2..11029fffbe 100644
--- a/app/Actions/Retina/Fulfilment/PalletReturn/AttachRetinaPalletsToReturn.php
+++ b/app/Actions/Retina/Fulfilment/PalletReturn/AttachRetinaPalletsToReturn.php
@@ -13,6 +13,7 @@
 use App\Actions\RetinaAction;
 use App\Enums\Fulfilment\Pallet\PalletStateEnum;
 use App\Enums\Fulfilment\Pallet\PalletStatusEnum;
+use App\Models\CRM\WebUser;
 use App\Models\Fulfilment\Pallet;
 use App\Models\Fulfilment\PalletReturn;
 use Illuminate\Http\RedirectResponse;
@@ -27,7 +28,7 @@ class AttachRetinaPalletsToReturn extends RetinaAction
 
 
     private PalletReturn $parent;
-
+    private bool $action = false;
     public function handle(PalletReturn $palletReturn, array $modelData): PalletReturn
     {
 
@@ -56,7 +57,7 @@ public function handle(PalletReturn $palletReturn, array $modelData): PalletRetu
             Pallet::whereIn('id', $palletsToSelect)->update([
                 'pallet_return_id' => $palletReturn->id,
                 'status'           => PalletStatusEnum::RETURNING,
-                'state'            => PalletStateEnum::REQUEST_RETURN
+                'state'            => PalletStateEnum::REQUEST_RETURN_IN_PROCESS
             ]);
 
             $pallets = Pallet::findOrFail($palletsToSelect);
@@ -100,7 +101,15 @@ public function unselectPallets(PalletReturn $palletReturn, array $palletIds): v
 
     public function authorize(ActionRequest $request): bool
     {
-        return true;
+        if ($this->action) {
+            return true;
+        }
+
+        if ($request->user() instanceof WebUser) {
+            return true;
+        }
+
+        return false;
     }
 
     public function rules(): array
@@ -118,6 +127,14 @@ public function asController(PalletReturn $palletReturn, ActionRequest $request)
         return $this->handle($palletReturn, $this->validatedData);
     }
 
+    public function action(PalletReturn $palletReturn, array $modelData): PalletReturn
+    {
+        $this->action = true;
+        $this->initialisationFulfilmentActions($palletReturn->fulfilmentCustomer, $modelData);
+
+        return $this->handle($palletReturn, $this->validatedData);
+    }
+
     public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request): RedirectResponse
     {
         return Redirect::route('retina.fulfilment.storage.pallet-returns.show', [
diff --git a/app/Actions/Retina/Fulfilment/PalletReturn/CancelRetinaPalletReturn.php b/app/Actions/Retina/Fulfilment/PalletReturn/CancelRetinaPalletReturn.php
index b7e4e3e7aa..1dba4b8770 100644
--- a/app/Actions/Retina/Fulfilment/PalletReturn/CancelRetinaPalletReturn.php
+++ b/app/Actions/Retina/Fulfilment/PalletReturn/CancelRetinaPalletReturn.php
@@ -29,7 +29,7 @@ class CancelRetinaPalletReturn extends RetinaAction
 {
     use WithActionUpdate;
 
-
+    private bool $action = false;
     public function handle(PalletReturn $palletReturn, array $modelData): PalletReturn
     {
         $modelData[PalletReturnStateEnum::CANCEL->value.'_at']    = now();
@@ -55,6 +55,9 @@ public function handle(PalletReturn $palletReturn, array $modelData): PalletRetu
 
     public function authorize(ActionRequest $request): bool
     {
+        if ($this->action) {
+            return true;
+        }
         return true;
     }
 
@@ -68,4 +71,11 @@ public function asController(PalletReturn $palletReturn, ActionRequest $request)
         $this->initialisation($request);
         return $this->handle($palletReturn, $this->validatedData);
     }
+
+    public function action(PalletReturn $palletReturn, array $modelData): PalletReturn
+    {
+        $this->action = true;
+        $this->initialisationFulfilmentActions($palletReturn->fulfilmentCustomer, $modelData);
+        return $this->handle($palletReturn, $this->validatedData);
+    }
 }
diff --git a/app/Actions/Retina/Fulfilment/PalletReturn/DetachRetinaPalletFromReturn.php b/app/Actions/Retina/Fulfilment/PalletReturn/DetachRetinaPalletFromReturn.php
index 015344bfa0..a7f4fffc4b 100644
--- a/app/Actions/Retina/Fulfilment/PalletReturn/DetachRetinaPalletFromReturn.php
+++ b/app/Actions/Retina/Fulfilment/PalletReturn/DetachRetinaPalletFromReturn.php
@@ -27,6 +27,7 @@ class DetachRetinaPalletFromReturn extends RetinaAction
 
 
     private Pallet $pallet;
+    private bool $action = false;
 
     public function handle(PalletReturn $palletReturn, Pallet $pallet): bool
     {
@@ -48,6 +49,9 @@ public function handle(PalletReturn $palletReturn, Pallet $pallet): bool
 
     public function authorize(ActionRequest $request): bool
     {
+        if ($this->action) {
+            return true;
+        }
         return true;
     }
 
@@ -58,6 +62,14 @@ public function asController(PalletReturn $palletReturn, Pallet $pallet, ActionR
         return $this->handle($palletReturn, $pallet);
     }
 
+    public function action(PalletReturn $palletReturn, Pallet $pallet, array $modelData): bool
+    {
+        $this->action = true;
+        $this->initialisationFulfilmentActions($palletReturn->fulfilmentCustomer, $modelData);
+
+        return $this->handle($palletReturn, $pallet);
+    }
+
     public function jsonResponse(Pallet $pallet): PalletResource
     {
         return new PalletResource($pallet);
diff --git a/app/Actions/Retina/Fulfilment/PalletReturn/StoreRetinaStoredItemsToReturn.php b/app/Actions/Retina/Fulfilment/PalletReturn/StoreRetinaStoredItemsToReturn.php
index 7f268386fc..cc75ca6267 100644
--- a/app/Actions/Retina/Fulfilment/PalletReturn/StoreRetinaStoredItemsToReturn.php
+++ b/app/Actions/Retina/Fulfilment/PalletReturn/StoreRetinaStoredItemsToReturn.php
@@ -9,6 +9,7 @@
 namespace App\Actions\Retina\Fulfilment\PalletReturn;
 
 use App\Actions\Fulfilment\PalletReturn\Hydrators\PalletReturnHydratePallets;
+use App\Actions\Fulfilment\PalletReturn\Hydrators\PalletReturnHydrateStoredItems;
 use App\Actions\RetinaAction;
 use App\Models\Fulfilment\FulfilmentCustomer;
 use App\Models\Fulfilment\Pallet;
@@ -25,8 +26,8 @@ class StoreRetinaStoredItemsToReturn extends RetinaAction
 {
     use AsCommand;
 
-    public $commandSignature = 'stored-item:store-to-return {palletReturn}';
     private PalletReturn $parent;
+    private bool $action = false;
 
     public function handle(PalletReturn $palletReturn, array $modelData): PalletReturn
     {
@@ -73,7 +74,7 @@ public function handle(PalletReturn $palletReturn, array $modelData): PalletRetu
         $palletReturn->refresh();
 
         PalletReturnHydratePallets::run($palletReturn);
-
+        PalletReturnHydrateStoredItems::run($palletReturn);
         return $palletReturn;
     }
 
@@ -120,6 +121,15 @@ public function asController(PalletReturn $palletReturn, ActionRequest $request)
         return $this->handle($palletReturn, $this->validatedData);
     }
 
+    public function action(PalletReturn $palletReturn, array $modelData): PalletReturn
+    {
+        /** @var FulfilmentCustomer $fulfilmentCustomer */
+        $this->action       = true;
+        $this->parent       = $palletReturn;
+        $this->initialisationFulfilmentActions($palletReturn->fulfilmentCustomer, $modelData);
+        return $this->handle($palletReturn, $this->validatedData);
+    }
+
     public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request): RedirectResponse
     {
         return Redirect::route('retina.fulfilment.storage.pallet-returns.show', [
diff --git a/app/Actions/Retina/Fulfilment/PalletReturn/SubmitRetinaPalletReturn.php b/app/Actions/Retina/Fulfilment/PalletReturn/SubmitRetinaPalletReturn.php
index b44a6dbf57..4b55604949 100644
--- a/app/Actions/Retina/Fulfilment/PalletReturn/SubmitRetinaPalletReturn.php
+++ b/app/Actions/Retina/Fulfilment/PalletReturn/SubmitRetinaPalletReturn.php
@@ -23,7 +23,6 @@
 use App\Enums\Fulfilment\PalletReturn\PalletReturnStateEnum;
 use App\Enums\Helpers\SerialReference\SerialReferenceModelEnum;
 use App\Http\Resources\Fulfilment\PalletReturnResource;
-use App\Models\CRM\WebUser;
 use App\Models\Fulfilment\PalletReturn;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Lorisleiva\Actions\ActionRequest;
@@ -34,17 +33,12 @@ class SubmitRetinaPalletReturn extends RetinaAction
 
 
     private bool $sendNotifications = false;
+    private bool $action = false;
 
     public function handle(PalletReturn $palletReturn, array $modelData): PalletReturn
     {
         $modelData[PalletReturnStateEnum::SUBMITTED->value.'_at'] = now();
-
-        if (!request()->user() instanceof WebUser) {
-            $modelData[PalletReturnStateEnum::CONFIRMED->value.'_at'] = now();
-            $modelData['state']                                       = PalletReturnStateEnum::CONFIRMED;
-        } else {
-            $modelData['state'] = PalletReturnStateEnum::SUBMITTED;
-        }
+        $modelData['state'] = PalletReturnStateEnum::SUBMITTED;
 
         foreach ($palletReturn->pallets as $pallet) {
             UpdatePallet::run($pallet, [
@@ -79,6 +73,9 @@ public function handle(PalletReturn $palletReturn, array $modelData): PalletRetu
 
     public function authorize(ActionRequest $request): bool
     {
+        if ($this->action) {
+            return true;
+        }
         return true;
     }
 
@@ -94,4 +91,12 @@ public function asController(PalletReturn $palletReturn, ActionRequest $request)
 
         return $this->handle($palletReturn, $this->validatedData);
     }
+
+    public function action(PalletReturn $palletReturn, array $modelData): PalletReturn
+    {
+        $this->action = true;
+        $this->initialisationFulfilmentActions($palletReturn->fulfilmentCustomer, $modelData);
+
+        return $this->handle($palletReturn, $this->validatedData);
+    }
 }
diff --git a/app/Actions/Retina/Fulfilment/PalletReturn/UpdateRetinaPalletReturn.php b/app/Actions/Retina/Fulfilment/PalletReturn/UpdateRetinaPalletReturn.php
index 8cff5e938d..1d8a857e3d 100644
--- a/app/Actions/Retina/Fulfilment/PalletReturn/UpdateRetinaPalletReturn.php
+++ b/app/Actions/Retina/Fulfilment/PalletReturn/UpdateRetinaPalletReturn.php
@@ -78,6 +78,9 @@ public function handle(PalletReturn $palletReturn, array $modelData): PalletRetu
 
     public function authorize(ActionRequest $request): bool
     {
+        if ($this->action) {
+            return true;
+        }
         return true;
     }
 
@@ -96,4 +99,11 @@ public function asController(Organisation $organisation, PalletReturn $palletRet
 
         return $this->handle($palletReturn, $this->validatedData);
     }
+
+    public function action(PalletReturn $palletReturn, array $modelData): PalletReturn
+    {
+        $this->action = true;
+        $this->initialisationFulfilmentActions($palletReturn->fulfilmentCustomer, $modelData);
+        return $this->handle($palletReturn, $modelData);
+    }
 }
diff --git a/resources/js/Components/CMS/Webpage/Overview/OverviewIris.vue b/resources/js/Components/CMS/Webpage/Overview/OverviewIris.vue
index f1e72b7d9a..3db46b92d2 100644
--- a/resources/js/Components/CMS/Webpage/Overview/OverviewIris.vue
+++ b/resources/js/Components/CMS/Webpage/Overview/OverviewIris.vue
@@ -23,7 +23,7 @@ const props = defineProps<{
 <template>
 	<div
 		ref="_parentComponent"
-		class="relative isolate transition-all"
+		class="relative isolate transition-all hidden md:block"
 		:style="getStyles(fieldValue.container.properties)">
 		<!-- Render text elements -->
 		<div v-for="(text, index) in fieldValue.texts.values" :key="index">
diff --git a/resources/js/Components/CreateStoredItems.vue b/resources/js/Components/CreateStoredItems.vue
index 8d50645949..016250c672 100644
--- a/resources/js/Components/CreateStoredItems.vue
+++ b/resources/js/Components/CreateStoredItems.vue
@@ -301,8 +301,8 @@ const onSaved = async () => {
 	</div>
 
 	<div v-if="!messageMode" class="flex gap-3 mt-5">
-		<Button type="tertiary" label="Cancel" @click="onCancel"></Button>
-		<Button full @click="onSaved" type="save" :loading="props.form.processing" :disabled="!(props.form.id || props.form.oldData?.id)"></Button>		
+		<Button type="tertiary" :label="trans('Cancel')" @click="onCancel" class="select-none" />
+		<Button full @click="onSaved" type="save" :loading="props.form.processing" :disabled="!(props.form.id || props.form.oldData?.id)" />
 	</div>
 
 	<div v-else class="grid grid-cols-2 gap-3">
diff --git a/resources/js/Components/MobileMenu.vue b/resources/js/Components/MobileMenu.vue
index e2aecf52ef..c23bdd5b96 100644
--- a/resources/js/Components/MobileMenu.vue
+++ b/resources/js/Components/MobileMenu.vue
@@ -1,25 +1,23 @@
 <script setup lang="ts">
 import Drawer from 'primevue/drawer';
-import Accordion from 'primevue/accordion';
-import AccordionPanel from 'primevue/accordionpanel';
-import AccordionHeader from 'primevue/accordionheader';
-import AccordionContent from 'primevue/accordioncontent';
-import { ref } from 'vue';
+import { ref, inject } from 'vue';
+import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue';
 import Image from "@/Components/Image.vue";
-
-import { library } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { faBars } from '@fortawesome/free-solid-svg-icons'; // Ensure correct icon import
-
-library.add(faBars);
+import { faBars, faSignIn, faSignOut, faTimesCircle } from '@fortawesome/free-solid-svg-icons';
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faChevronCircleDown } from '@fal';
+// Add icons to library
+library.add(faBars, faSignIn, faSignOut, faTimesCircle);
 
 const props = defineProps<{
-   header: { logo?: { source: string } },
-   menu: { data: Array<{ type: string, label: string }> }
+    header: { logo?: { source: string } },
+    menu: { data: Array<{ type: string, label: string, subnavs?: Array<{ title: string, link: { href: string, target: string } }> }> }
 }>();
 
 const visible = ref(false);
-
+const isLoggedIn = inject('isPreviewLoggedIn', false)
+const onLogout = inject('onLogout')
 </script>
 
 <template>
@@ -28,29 +26,91 @@ const visible = ref(false);
             <FontAwesomeIcon :icon="faBars" class="text-xl" />
         </button>
         <Drawer v-model:visible="visible" :header="''">
+            <template #closeicon>
+                <FontAwesomeIcon :icon="faTimesCircle" @click="visible = false" />
+            </template>
             <template #header>
-                <img v-if="!props.header.logo"
-                    src="https://d19ayerf5ehaab.cloudfront.net/assets/store-18687/18687-logo-1642004490.png"
-                    alt="Ancient Wisdom Logo" class="h-12">
-                <Image v-else :src="props.header.logo.source" class="h-12"></Image>
+                <img :src="header?.logo?.image?.source?.original" :alt="header?.logo?.alt" class="h-12" />
             </template>
 
-            <Accordion>
-                <template v-for="(item, index) in props.menu.data" :key="index">
-                    <AccordionPanel v-if="item.type === 'multiple'" :value="index">
-                        <AccordionHeader ><span class="font-bold text-gray-500">{{ item.label }}</span></AccordionHeader>
-                        <AccordionContent>
-                            <div v-for="(submenu, indexSub) in item.subnavs">
-                                <div class="p-4 text-sm font-semibold text-gray-500">{{ submenu.title }}</div>
-                            </div>
-                        </AccordionContent>
-                    </AccordionPanel>
-
-                    <div v-else class='py-4 px-5 border-b-2'>
-                        <div class="font-bold text-gray-500">{{item.label}}</div>
+            <div class="menu-container">
+                <div class="menu-content">
+                    <div v-for="(item, index) in props.menu" :key="index">
+                        <Disclosure v-if="item.type === 'multiple'">
+                            <DisclosureButton class="w-full text-left p-4 font-semibold text-gray-500 border-b-2">
+                                <div class="w-full flex justify-between items-center">
+                                    <div>{{ item.label }}</div>
+                                    <div>
+                                        <FontAwesomeIcon :icon="faChevronCircleDown" />
+                                    </div>
+                                </div>
+                            </DisclosureButton>
+
+                            <DisclosurePanel>
+                                <div v-for="(submenu, indexSub) in item.subnavs" :key="indexSub">
+                                    <span :href="submenu?.link?.href" :target="submenu?.link?.target"
+                                        class="p-4 text-sm font-semibold text-gray-500 block">{{ submenu.title }}</span>
+
+                                    <div v-for="(menu, indexMenu) in submenu.links" :key="indexSub">
+
+                                        <a :href="menu?.link?.href" :target="menu?.link?.target"
+                                            class="p-4 text-sm font-semibold text-gray-600 block">- {{ menu.label }}</a>
+                                    </div>
+                                </div>
+                            </DisclosurePanel>
+                        </Disclosure>
+
+                        <!-- Single link items -->
+                        <div v-else class="py-4 px-5 border-b-2">
+                            <a :href="item?.link?.href" :target="item?.link?.target" class="font-bold text-gray-500">
+                                {{ item.label }}
+                            </a>
+                        </div>
                     </div>
-                </template>
-            </Accordion>
+                </div>
+
+                <!-- Login section -->
+                <div class="login-section">
+                    <a v-if="!isLoggedIn" href="/app" class="font-bold text-gray-500">
+                        <FontAwesomeIcon :icon="faSignIn" class="mr-3"></FontAwesomeIcon>Login
+                    </a>
+                    <div v-else @click="onLogout()" class="font-bold text-red-500">
+                        <FontAwesomeIcon :icon="faSignOut" class="mr-3"></FontAwesomeIcon>LogOut
+                    </div>
+                </div>
+            </div>
         </Drawer>
     </div>
 </template>
+
+<style scoped>
+.menu-container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+.menu-content {
+    flex: 0 0 80%;
+    overflow-y: auto;
+}
+
+.login-section {
+    flex: 0 0 20%;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    border-top: 1px solid #e5e5e5;
+}
+
+.disclosure-button {
+    padding: 1rem;
+    font-weight: bold;
+    color: #4B5563;
+}
+
+.disclosure-panel {
+    padding: 0.5rem 1rem;
+    background-color: #F9FAFB;
+}
+</style>
diff --git a/resources/js/Components/Showcases/Org/FulfilmentShowcase.vue b/resources/js/Components/Showcases/Org/FulfilmentShowcase.vue
index 50370d646c..7292b812d7 100644
--- a/resources/js/Components/Showcases/Org/FulfilmentShowcase.vue
+++ b/resources/js/Components/Showcases/Org/FulfilmentShowcase.vue
@@ -12,14 +12,16 @@ import { faTruck, faSignOut, faDollarSign } from '@fas'
 import { library } from '@fortawesome/fontawesome-svg-core'
 library.add(faNarwhal, faBusinessTime, faUserTie, falSignout, faTruck, faSignOut, faDollarSign)
 
-import { Line } from 'vue-chartjs'
 import { Chart as ChartJS, CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend } from 'chart.js'
 import { inject } from 'vue'
 import {trans} from "laravel-vue-i18n";
+import Dashboard from "@/Components/DataDisplay/Dashboard/Dashboard.vue";
 ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip, Legend)
 
 const props = defineProps<{
     data: {
+
+        dashboard_stats: {}
         flatTreeMaps: {}
         scheduledActivities: {
             icon: string
@@ -76,7 +78,11 @@ const stats = [
 </script>
 
 <template>
-    <!-- <pre>{{ data.scheduledActivities }}</pre> -->
+
+
+  <Dashboard class="p-4"
+    :dashboard="data.dashboard_stats"
+  />
 
     <div class="mt-2">
         <FlatTreeMap class="mx-4" v-for="(treeMap, idx) in data.flatTreeMaps" :key="idx" :nodes="treeMap" mode="compact" />
diff --git a/resources/js/Components/Tables/Grp/Org/Fulfilment/TableEditStoredItemAuditDeltas.vue b/resources/js/Components/Tables/Grp/Org/Fulfilment/TableEditStoredItemAuditDeltas.vue
index 21e296feea..5f507834ce 100644
--- a/resources/js/Components/Tables/Grp/Org/Fulfilment/TableEditStoredItemAuditDeltas.vue
+++ b/resources/js/Components/Tables/Grp/Org/Fulfilment/TableEditStoredItemAuditDeltas.vue
@@ -118,7 +118,6 @@ interface StoredItemsQuantity {
         [key: string]: number  // stored item id
     }
 }
-const storedItemsQuantity = reactive<StoredItemsQuantity>({})
 const statesBoxEdit = reactive<StoredItemsQuantity>({})
 
 const isLoading = ref(false)
@@ -200,6 +199,7 @@ const debounceStoreStoredItem = debounce((row: number, idPallet: number, idStore
 
 
 // Section: Update quantity stored item
+const isStoredItemEdited = reactive<StoredItemsQuantity>({})
 const isLoadingQuantity = reactive<StoredItemsQuantity>({})
 const onChangeQuantity = (row: number, idStoredItemAuditDelta: number | null, quantity: number) => {
     console.log('onChangeQuantity')
@@ -233,6 +233,8 @@ const onChangeQuantity = (row: number, idStoredItemAuditDelta: number | null, qu
             },
             onFinish: () => {
                 set(isLoadingQuantity, `${row}.${idStoredItemAuditDelta}`, false)
+                set(isStoredItemEdited, [(row+1)?.toString(), `id${idStoredItemAuditDelta?.toString()}`], true)
+                // isStoredItemEdited["1"]["256"] = true
             }
         }
     )
@@ -243,8 +245,8 @@ const debounceChangeQuantity = debounce((row: number, idStoredItemAuditDelta: nu
 const stateStoredItemEdited = reactive<StoredItemsQuantity>({})
 
 
-const edit_block = (audit_type: string, is_edit: boolean) => {
-    return audit_type === 'no_change' ? 'checked' : audit_type || is_edit ? 'edit' : false
+const edit_block = (audit_type: string, is_edit: boolean, keep_is_edit: boolean) => {
+    return keep_is_edit ? 'edit' : audit_type === 'no_change' ? 'checked' : audit_type || is_edit ? 'edit' : false
 }
 </script>
 
@@ -327,23 +329,25 @@ const edit_block = (audit_type: string, is_edit: boolean) => {
 
 
                     <template #body="{ data }">
-                        <pre>{{ data }}</pre>
+                        <!-- <pre>{{ data }}</pre>
                         stored_item_audit_id: {{ data.stored_item_audit_id || '-' }} <br />
                         stored_item_id: {{ data.stored_item_id || '-' }} <br />
                         audit_type: {{ data.audit_type || '-' }} <br />
-                        stored_item_audit_delta_id: {{ data.stored_item_audit_delta_id || '-' }} <br />
-                        edit_block: {{ edit_block(data.audit_type, data.is_edit) }}
+                        stored_item_audit_delta_id: {{ data.stored_item_audit_delta_id || '-' }} <br /> -->
+                        <!-- edit_block: {{ edit_block(data.audit_type, data.is_edit, !!get(isStoredItemEdited, [(item.rowIndex+1)?.toString(), `id${data.stored_item_audit_delta_id?.toString()}`], false)) }} -->
 
-                      <pre>{{ props.route_list?.stored_item_audit_delta?.store }}</pre>
-                      <pre>{{ data }}</pre>
+                      <!-- <pre>{{ props.route_list?.stored_item_audit_delta?.store }}</pre>
+                      <pre>{{ data }}</pre> -->
                         <div class="relative">
-                            <div v-if="get(isLoadingQuantity, [item.rowIndex, data.stored_item_audit_delta_id], false) || get(isLoadingUnselect, [item.rowIndex, data.stored_item_audit_delta_id], false)"
+                            <!-- <div 
                                 class="z-10 opacity-60 absolute w-full h-full top-0 left-0">
                                 <div class="skeleton h-full w-full"></div>
-                            </div>
+                            </div> -->
+
 
                             <div class="flex gap-x-2.5 items-center w-64">
-                                <div v-if="data.audit_type === 'no_change'">
+                                <!-- Check green -->
+                                <div v-if="data.audit_type === 'no_change' && edit_block(data.audit_type, data.is_edit, !!get(isStoredItemEdited, [(item.rowIndex+1)?.toString(), `id${data.stored_item_audit_delta_id?.toString()}`], false)) != 'edit'">
                                     <Button 
                                         type="tertiary"
                                         icon="fas fa-check-circle"
@@ -353,7 +357,7 @@ const edit_block = (audit_type: string, is_edit: boolean) => {
 
                                 <div class="flex justify-center border border-gray-300 rounded gap-y-1">
                                     <!-- Button: Check -->
-                                    <Button v-if="data.type !== 'new_item' && data.audit_type !== 'no_change' && data.audit_type !== 'addition' && !get(data, ['is_edit'], false)"
+                                    <Button v-if="data.type !== 'new_item' && data.audit_type !== 'no_change' && data.audit_type !== 'addition' && !get(data, ['is_edit'], false) && edit_block(data.audit_type, data.is_edit, !!get(isStoredItemEdited, [(item.rowIndex+1)?.toString(), `id${data.stored_item_audit_delta_id?.toString()}`], false)) != 'edit'"
                                         @click="() => data.audit_type === 'no_change' ? null : onStoreStoredItem(item.rowIndex, item.id, data.stored_item_id, data.quantity, data.stored_item_audit_id)"
                                         type="tertiary"
                                         :icon="data.audit_type === 'no_change' ? 'fas fa-check-circle' : 'fal fa-check-circle'"
@@ -363,23 +367,24 @@ const edit_block = (audit_type: string, is_edit: boolean) => {
                                     />
 
                                     <!-- Edit button -->
-                                    <div v-if="!data.stored_item_audit_delta_id" @click="() => set(data, ['is_edit'], !(get(data, ['is_edit'], false)))" class="px-2 flex items-center hover:bg-gray-200 cursor-pointer">
+                                    <div v-if="!data.stored_item_audit_delta_id && edit_block(data.audit_type, data.is_edit, !!get(isStoredItemEdited, [(item.rowIndex+1)?.toString(), `id${data.stored_item_audit_delta_id?.toString()}`], false)) != 'edit'" @click="() => set(data, ['is_edit'], !(get(data, ['is_edit'], false)))" class="px-2 flex items-center hover:bg-gray-200 cursor-pointer">
                                         <FontAwesomeIcon icon='far fa-edit' class='' fixed-width aria-hidden='true' />
                                     </div>
                                     
                                     <!-- Section: - and + -->
-                                    <template v-if=" (!data.stored_item_audit_delta_id && get(data, ['is_edit'], false)) || (data.audit_type && data.audit_type != 'no_change')">
+                                    <template v-if=" (!data.stored_item_audit_delta_id && get(data, ['is_edit'], false)) || (data.audit_type && data.audit_type != 'no_change') || edit_block(data.audit_type, data.is_edit, !!get(isStoredItemEdited, [(item.rowIndex+1)?.toString(), `id${data.stored_item_audit_delta_id?.toString()}`], false)) == 'edit'">
                                         <div class="transition-all relative inline-flex items-center justify-center "
                                             :class="!get('statesBoxEdit', `${item.rowIndex}.${data.id}`, false) ? 'w-28' : 'w-14'">
                                             <transition>
                                                 <div v-if="!get('statesBoxEdit', `${item.rowIndex}.${data.id}`, false)"
                                                     class="relative flex flex-nowrap items-center justify-center gap-y-1 gap-x-1">
                                                     <!-- Button: Minus -->
-                                                    <div  @click="() => (
+                                                    <div  @click="async () => (
                                                             set(data, `${data.stored_item_audit_delta_id ? 'audited_quantity' : 'quantity'}`, ((data.stored_item_audit_delta_id ? data.audited_quantity : data.quantity) - 1) >= 0 ? ((data.stored_item_audit_delta_id ? data.audited_quantity : data.quantity) - 1) : 0),
                                                             data.stored_item_audit_delta_id
                                                                 ? debounceChangeQuantity(item.rowIndex, data.stored_item_audit_delta_id, get(data, `audited_quantity`, data.quantity))
                                                                 : debounceStoreStoredItem(item.rowIndex, item.id, data.stored_item_id, get(data, `quantity`, data.quantity), data.stored_item_audit_id)
+                                                            
                                                         )"
                                                         class="leading-4 cursor-pointer inline-flex items-center gap-x-2 font-medium focus:outline-none disabled:cursor-not-allowed min-w-max bg-transparent border border-gray-300 text-gray-700 hover:bg-gray-200/70 disabled:bg-gray-200/70 rounded px-1 py-1.5 text-xs justify-self-center">
                                                         <FontAwesomeIcon icon='fas fa-minus' class='' fixed-width aria-hidden='true' />
@@ -387,7 +392,7 @@ const edit_block = (audit_type: string, is_edit: boolean) => {
                                                     <div class="text-center tabular-nums border border-transparent hover:border-dashed hover:border-gray-300 group-focus:border-dashed group-focus:border-gray-300">
                                         
                                                         <InputNumber
-                                                            :modelValue="data.stored_item_audit_delta_id ? data.audited_quantity : data.quantity ||   edit_block(data.audit_type, data.is_edit) =='edit'  "
+                                                            :modelValue="data.stored_item_audit_delta_id ? data.audited_quantity : data.quantity ||   edit_block(data.audit_type, data.is_edit, !!get(isStoredItemEdited, [(item.rowIndex+1)?.toString(), `id${data.stored_item_audit_delta_id?.toString()}`], false)) =='edit'  "
                                                             @update:modelValue="(e) => debounceChangeQuantity(item.rowIndex, data.stored_item_audit_delta_id, e)"
                                                             buttonLayout="horizontal" :min="0" style="width: 100%"
                                                             :inputStyle="{
@@ -397,7 +402,7 @@ const edit_block = (audit_type: string, is_edit: boolean) => {
                                                             }" />
                                                     </div>
                                                     <!-- Button: Plus -->
-                                                    <div  @click="() => (
+                                                    <div  @click="async () => (
                                                             set(data, `${data.stored_item_audit_delta_id ? 'audited_quantity' : 'quantity'}`, (data.stored_item_audit_delta_id ? data.audited_quantity : data.quantity) + 1),
                                                             data.stored_item_audit_delta_id
                                                                 ? debounceChangeQuantity(item.rowIndex, data.stored_item_audit_delta_id, get(data, `audited_quantity`, data.quantity))
@@ -444,6 +449,10 @@ const edit_block = (audit_type: string, is_edit: boolean) => {
                                   />
                                 </div>
 
+                                <LoadingIcon v-if="get(isLoadingQuantity, [item.rowIndex, data.stored_item_audit_delta_id], false) || get(isLoadingUnselect, [item.rowIndex, data.stored_item_audit_delta_id], false)" class="-ml-1 text-xs" />
+
+                                <!-- {{ isStoredItemEdited }} -->
+
                                 <!-- <FontAwesomeIcon v-tooltip="trans('Close')"
                                     @click="() => set(statesBoxEdit, `${item.rowIndex}.${data.id}`, false)"
                                     icon='fal fa-arrow-to-left'
diff --git a/resources/js/Components/Utils/ModalAddressCollection.vue b/resources/js/Components/Utils/ModalAddressCollection.vue
new file mode 100644
index 0000000000..7410bca0c1
--- /dev/null
+++ b/resources/js/Components/Utils/ModalAddressCollection.vue
@@ -0,0 +1,230 @@
+<script setup lang="ts">
+import PureAddress from '@/Components/Pure/PureAddress.vue'
+import Button from '@/Components/Elements/Buttons/Button.vue'
+import { Link, router } from '@inertiajs/vue3'
+import { notify } from '@kyvg/vue3-notification'
+import { ref } from 'vue'
+import { routeType } from '@/types/route'
+import { trans } from 'laravel-vue-i18n'
+import { Address, AddressManagement } from "@/types/PureComponent/Address"
+
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { faThumbtack, faPencil, faHouse, faTrashAlt, faTruck, faTruckCouch } from '@fal'
+import { faCheckCircle } from '@fas'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import LoadingIcon from '@/Components/Utils/LoadingIcon.vue'
+import { useTruncate } from '@/Composables/useTruncate'
+library.add(faThumbtack, faPencil, faHouse, faTrashAlt, faTruck, faTruckCouch, faCheckCircle)
+
+import { Switch, SwitchGroup, SwitchLabel } from '@headlessui/vue'
+
+const enabled = ref(false)
+
+const props = defineProps<{
+    updateRoute: routeType
+    addresses: AddressManagement
+    keyPayloadEdit?: string
+}>()
+
+// const emits = defineEmits<{
+//     (e: 'setModal', value: boolean): void
+// }>()
+// console.log('address list', props.addresses.address_list)
+const homeAddress = props.addresses.address_list?.data.find(address => address.id === props.addresses.home_address_id)
+
+
+// Method: Create new address
+const isSubmitAddressLoading = ref(false)
+const onSubmitNewAddress = async (address: Address) => {
+    // console.log(props.addresses.value)
+    const filterDataAdddress = {...address}
+    delete filterDataAdddress.formatted_address
+    delete filterDataAdddress.country
+    delete filterDataAdddress.id  // Remove id cuz create new one
+
+    router[props.addresses.routes_list.store_route.method || 'post'](
+        route(props.addresses.routes_list.store_route.name, props.addresses.routes_list.store_route.parameters),
+        {
+            delivery_address: filterDataAdddress
+        },
+        {
+            preserveScroll: true,
+            onStart: () => isSubmitAddressLoading.value = true,
+            onFinish: () => {
+                isSubmitAddressLoading.value = false,
+                isCreateNewAddress.value = false
+                // isModalAddress.value = false
+                // emits('setModal', false)
+            },
+            onSuccess: () => {
+                notify({
+                    title: trans("Success"),
+                    text: trans("Successfully create new address."),
+                    type: "success",
+                })
+            },
+            onError: () => notify({
+                title: trans("Failed"),
+                text: trans("Failed to submit the address, try again"),
+                type: "error",
+            })
+        }
+    )
+
+}
+
+// Method: Edit address history
+const isEditAddress = ref(false)
+const selectedAddress = ref<Address | { country_id: null }>({
+    country_id: null
+})
+const onEditAddress = (address: Address) => {
+    isEditAddress.value = true
+    selectedAddress.value = {...address}
+}
+const onSubmitEditAddress = (address: Address) => {
+    // console.log(props.addresses.value)
+    const filterDataAdddress = {...address}
+    delete filterDataAdddress.formatted_address
+    delete filterDataAdddress.country
+    delete filterDataAdddress.country_code
+
+    router.patch(
+        route(props.updateRoute.name, props.updateRoute.parameters),
+        {
+            [props.keyPayloadEdit || 'address']: filterDataAdddress
+        },
+        {
+            preserveScroll: true,
+            onStart: () => isSubmitAddressLoading.value = true,
+            onFinish: () => {
+                isSubmitAddressLoading.value = false
+                isCreateNewAddress.value = false
+                // isModalAddress.value = false
+            },
+            onSuccess: () => {
+                notify({
+                    title: trans("Success"),
+                    text: trans("Successfully update the address."),
+                    type: "success",
+                })
+            },
+            onError: () => notify({
+                title: trans("Failed"),
+                text: trans("Failed to update the address, try again."),
+                type: "error",
+            })
+        }
+    )
+}
+
+// Method: Select address history
+const isCreateNewAddress = ref(false)
+const isSelectAddressLoading = ref<number | boolean | null | undefined>(false)
+const onSelectAddress = (selectedAddress: Address) => {
+    router.patch(
+        route(props.updateRoute.name, props.updateRoute.parameters),
+        {
+            delivery_address_id: selectedAddress.id
+        },
+        {
+            onStart: () => isSelectAddressLoading.value = selectedAddress.id,
+            onFinish: () => isSelectAddressLoading.value = false
+        }
+    )
+    // props.addresses.value = selectedAddress
+}
+
+const isLoading = ref<string | boolean>(false)
+// Method: Pinned address
+const onPinnedAddress = (addressID: number) => {
+    router[props.addresses.routes_list.pinned_route.method || 'patch'](
+        route(props.addresses.routes_list.pinned_route.name, props.addresses.routes_list.pinned_route.parameters),
+        {
+            delivery_address_id: addressID
+        },
+        {
+            preserveScroll: true,
+            onStart: () => isLoading.value = 'onPinned' + addressID,
+            onFinish: () => {
+                isLoading.value = false
+            },
+            onError: () => notify({
+                title: trans("Failed"),
+                text: "Failed to pinned the address, try again.",
+                type: "error",
+            })
+        }
+    )
+}
+// Method: Delete address
+const onDeleteAddress = (addressID: number) => {
+    // console.log('vvcxvcxvcx', props.addressesList.delete_route.method, route(props.addressesList.delete_route.name, props.addressesList.delete_route.parameters))
+    router.delete(
+        route(props.addresses.routes_list.delete_route.name, {
+            ...props.addresses.routes_list.delete_route.parameters,
+            address: addressID
+        }),
+        {
+            preserveScroll: true,
+            onStart: () => isLoading.value = 'onDelete' + addressID,
+            onFinish: () => {
+                isLoading.value = false
+            },
+            onError: () => notify({
+                title: trans("Failed"),
+                text: trans("Failed to delete the address, try again"),
+                type: "error",
+            })
+        }
+    )
+}
+
+
+</script>
+
+<template>
+    <div class="h-[600px] px-2 py-1 overflow-auto">
+    <!-- <pre>current selected {{ addresses.current_selected_address_id }}</pre>
+    <pre>pinned address {{ addresses.pinned_address_id }}</pre>
+    <pre>home {{ addresses.home_address_id }}</pre> -->
+        <div class="flex justify-between border-b border-gray-300">
+            <div class="text-2xl font-bold text-center mb-2 flex gap-x-2">
+                {{ trans('Delivery Address ') }}
+
+
+                <div class="relative">
+                    <Transition name="slide-to-right">
+                        <div v-if="isEditAddress" class="inline text-gray-400 italic text-base font-normal">({{ trans('Edit') }})</div>
+                        <div v-else-if="isCreateNewAddress" class="inline text-gray-400 italic text-base font-normal">({{ trans('Create new') }})</div>
+                        <div v-else></div>
+                    </Transition>
+                </div>
+            </div>
+            
+            <div class="flex gap-x-2 h-fit">
+                <Button v-if="isCreateNewAddress || isEditAddress" type="cancel" @click="() => (selectedAddress = {country_id: null}, isCreateNewAddress = false, isEditAddress = false)"></Button>
+                <Button v-else label="New address" type="create" @click="() => (selectedAddress = {country_id: null}, isCreateNewAddress = true)"></Button>
+            </div>
+        </div>
+
+        <div class="relative transition-all">
+
+        </div>
+
+      <SwitchGroup as="div" class="flex items-center p-10">
+        <Switch v-model="enabled" :class="[enabled ? 'bg-indigo-600' : 'bg-gray-200', 'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2 focus:outline-hidden']">
+          <span aria-hidden="true" :class="[enabled ? 'translate-x-5' : 'translate-x-0', 'pointer-events-none inline-block size-5 transform rounded-full bg-white ring-0 shadow-sm transition duration-200 ease-in-out']" />
+        </Switch>
+        <SwitchLabel as="span" class="ml-3 text-sm">
+          <span class="font-medium text-gray-900">{{trans('Collection')}}</span>
+          {{ ' ' }}
+
+        </SwitchLabel>
+      </SwitchGroup>
+
+
+    </div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/resources/js/Layouts/Iris/Header.vue b/resources/js/Layouts/Iris/Header.vue
index 041bec504c..9f7124c1f3 100644
--- a/resources/js/Layouts/Iris/Header.vue
+++ b/resources/js/Layouts/Iris/Header.vue
@@ -9,7 +9,7 @@ import { faUserCircle } from '@fal'
 import { router } from '@inertiajs/vue3'
 import { notify } from "@kyvg/vue3-notification"
 import { trans } from "laravel-vue-i18n"
-
+import Image from '@/Components/Image.vue'
 
 const props = defineProps<{
     data: {
@@ -35,7 +35,6 @@ const isLoggedIn = ref(layout.iris.user_auth ? true : false)
 provide('isPreviewLoggedIn', isLoggedIn)
 
 const onLogoutAuth = (link) => {
-    console.log('logout')
     router.post(route('retina.logout'), {},
         {
             onSuccess: () => {
@@ -95,14 +94,15 @@ provide('onLogout', onLogoutAuth)
         :is="getIrisComponent(menu?.code)" 
         :navigations="menu.data.fieldValue.navigation"
         :colorThemed="colorThemed" 
-          class="hidden md:block"
+        class="hidden md:block"
     />
 
     <div class="block md:hidden p-3">
             <div class="flex justify-between items-center">
-                <MobileMenu :header="data.header.data.fieldValue" :menu="data.header.data.fieldValue" />
+                <MobileMenu :header="data.header.data.fieldValue" :menu="menu.data.fieldValue.navigation" />
                 <!-- Logo for Mobile -->
-                <Image  :src="data.header.data.fieldValue?.logo?.source" class="h-10 mx-2"></Image>
+           <!-- <pre> {{ data.header.data.fieldValue?.logo.image.source }}</pre>  -->
+                <img  :src="data.header.data.fieldValue?.logo.image.source.original" :alt="data.header.data.fieldValue?.logo.alt" class="h-10 mx-2"></img>
 
                 <!-- Profile Icon with Dropdown Menu -->
                 <div @click="toggle" class="flex items-center cursor-pointer">
@@ -116,11 +116,11 @@ provide('onLogout', onLogoutAuth)
             </div>
 
             <!-- Mobile Search Bar -->
-            <div class="relative mt-2">
+           <!--  <div class="relative mt-2">
                 <input type="text" placeholder="Search Products"
                     class="border border-gray-300 py-2 px-4 rounded-md w-full shadow-inner focus:outline-none focus:border-gray-500">
                 <FontAwesomeIcon icon="fas fa-search" class="absolute top-1/2 -translate-y-1/2 right-4 text-gray-500"
                     fixed-width />
-            </div>
+            </div> -->
     </div>
 </template>
\ No newline at end of file
diff --git a/resources/js/Pages/Grp/Org/Fulfilment/Fulfilment.vue b/resources/js/Pages/Grp/Org/Fulfilment/Fulfilment.vue
index 28c53b5fb2..282eb2993e 100644
--- a/resources/js/Pages/Grp/Org/Fulfilment/Fulfilment.vue
+++ b/resources/js/Pages/Grp/Org/Fulfilment/Fulfilment.vue
@@ -18,6 +18,7 @@ import ModelDetails from "@/Components/ModelDetails.vue"
 import TableHistories from "@/Components/Tables/Grp/Helpers/TableHistories.vue"
 import FulfilmentShowcase from "@/Components/Showcases/Org/FulfilmentShowcase.vue"
 import TablePallets from "@/Components/Tables/Grp/Org/Fulfilment/TablePallets.vue"
+import Dashboard from "@/Components/DataDisplay/Dashboard/Dashboard.vue";
 
 library.add(faTachometerAlt, faHandHoldingBox)
 
@@ -59,5 +60,7 @@ const component = computed(() => {
     <Head :title="capitalize(title)" />
     <PageHeading :data="pageHead"></PageHeading>
     <Tabs :current="currentTab" :navigation="tabs['navigation']" @update:tab="handleTabUpdate" />
+
+
     <component :is="component" :tab="currentTab" :data="props[currentTab]"></component>
 </template>
diff --git a/resources/js/Pages/Grp/Org/Fulfilment/FulfilmentDashboard.vue b/resources/js/Pages/Grp/Org/Fulfilment/FulfilmentDashboard.vue
index e129123867..512c6d030d 100644
--- a/resources/js/Pages/Grp/Org/Fulfilment/FulfilmentDashboard.vue
+++ b/resources/js/Pages/Grp/Org/Fulfilment/FulfilmentDashboard.vue
@@ -6,7 +6,6 @@ import { library } from "@fortawesome/fontawesome-svg-core"
 import { faTruckCouch } from "@fal"
 import { capitalize } from "@/Composables/capitalize"
 import { Chart as ChartJS, ArcElement, Tooltip, Legend, Colors } from "chart.js"
-import { ref, computed } from "vue"
 import Dashboard from "@/Components/DataDisplay/Dashboard/Dashboard.vue"
 
 library.add(faTruckCouch)
diff --git a/resources/js/Pages/Grp/Org/Fulfilment/Return/BoxStatsPalletReturn.vue b/resources/js/Pages/Grp/Org/Fulfilment/Return/BoxStatsPalletReturn.vue
index 8a04287a61..c5472f1335 100644
--- a/resources/js/Pages/Grp/Org/Fulfilment/Return/BoxStatsPalletReturn.vue
+++ b/resources/js/Pages/Grp/Org/Fulfilment/Return/BoxStatsPalletReturn.vue
@@ -10,10 +10,8 @@ import { onMounted, ref } from 'vue'
 import { capitalize } from '@/Composables/capitalize'
 import ModalAddress from '@/Components/Utils/ModalAddress.vue'
 
-
-
 import { PalletReturn, BoxStats } from '@/types/Pallet'
-import { Link, router } from '@inertiajs/vue3'
+import { Link } from '@inertiajs/vue3'
 import BoxStatPallet from '@/Components/Pallet/BoxStatPallet.vue'
 import { trans } from 'laravel-vue-i18n'
 
@@ -22,11 +20,12 @@ import { routeType } from '@/types/route'
 import OrderSummary from '@/Components/Summary/OrderSummary.vue'
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { faQuestionCircle, faPencil } from '@fal'
+import { faQuestionCircle, faPencil ,faPenSquare} from '@fal'
 import { library } from '@fortawesome/fontawesome-svg-core'
-library.add(faQuestionCircle, faPencil)
+import ModalAddressCollection from '@/Components/Utils/ModalAddressCollection.vue'
+library.add(faQuestionCircle, faPencil, faPenSquare)
 
-const props = defineProps<{
+defineProps<{
     dataPalletReturn: PalletReturn
     boxStats: BoxStats
     updateRoute: routeType
@@ -44,6 +43,7 @@ onMounted(() => {
 
 // Method: Create new address
 const isModalAddress = ref(false)
+const isModalAddressCollection = ref(false)
 </script>
 
 <template>
@@ -59,7 +59,7 @@ const isModalAddress = ref(false)
                     <FontAwesomeIcon icon='fal fa-id-card-alt' size="xs" class='text-gray-400' fixed-width
                         aria-hidden='true' />
                 </dt>
-                <dd class="text-xs text-gray-500">{{ boxStats.fulfilment_customer.customer.reference }}</dd>
+                <dd >{{ boxStats.fulfilment_customer.customer.reference }}</dd>
             </Link>
 
             <!-- Field: Contact name -->
@@ -70,7 +70,7 @@ const isModalAddress = ref(false)
                     <FontAwesomeIcon icon='fal fa-user' size="xs" class='text-gray-400' fixed-width
                         aria-hidden='true' />
                 </dt>
-                <dd class="text-xs text-gray-500">{{ boxStats.fulfilment_customer.customer.contact_name }}</dd>
+                <dd >{{ boxStats.fulfilment_customer.customer.contact_name }}</dd>
             </div>
 
 
@@ -82,7 +82,7 @@ const isModalAddress = ref(false)
                     <FontAwesomeIcon icon='fal fa-building' size="xs" class='text-gray-400' fixed-width
                         aria-hidden='true' />
                 </dt>
-                <dd class="text-xs text-gray-500">{{ boxStats.fulfilment_customer.customer.company_name }}</dd>
+                <dd>{{ boxStats.fulfilment_customer.customer.company_name }}</dd>
             </div>
 
             <!-- Field: Email -->
@@ -92,7 +92,7 @@ const isModalAddress = ref(false)
                     <FontAwesomeIcon icon='fal fa-envelope' size="xs" class='text-gray-400' fixed-width
                         aria-hidden='true' />
                 </dt>
-                <a :href="`mailto:${boxStats.fulfilment_customer?.customer.email}`" class="hover:underline text-xs text-gray-500 w-full pr-4 break-words leading-none">
+                <a :href="`mailto:${boxStats.fulfilment_customer?.customer.email}`" class="hover:underline  w-full pr-4 break-words leading-none">
                     {{ boxStats.fulfilment_customer?.customer.email }}
                 </a>
             </div>
@@ -104,7 +104,7 @@ const isModalAddress = ref(false)
                     <FontAwesomeIcon icon='fal fa-phone' size="xs" class='text-gray-400' fixed-width
                         aria-hidden='true' />
                 </dt>
-                <a class="text-xs text-gray-500">{{ boxStats.fulfilment_customer?.customer.phone }}</a>
+                <a >{{ boxStats.fulfilment_customer?.customer.phone }}</a>
             </div>
 
             <!-- Field: Delivery Address -->
@@ -115,7 +115,7 @@ const isModalAddress = ref(false)
                         aria-hidden='true' />
                 </dt>
 
-                <dd v-if="boxStats.fulfilment_customer.address.value" class="w-full text-xs text-gray-500">
+                <dd v-if="dataPalletReturn.is_collection !== true" class="w-full text-xs text-gray-500">
                     <div class="relative px-2.5 py-2 ring-1 ring-gray-300 rounded bg-gray-50">
                         <span class="" v-html="boxStats.fulfilment_customer.address.value.formatted_address" />
 
@@ -126,8 +126,12 @@ const isModalAddress = ref(false)
                         </div>
                     </div>
                 </dd>
-                <div v-else @click="() => isModalAddress = true" class="text-xs inline whitespace-nowrap select-none text-gray-500 hover:text-blue-600 underline cursor-pointer">
-                    <span>Setup delivery address</span>
+                <div v-else>
+                    <span>For collection </span>
+                  <span
+                            @click="() => isModalAddressCollection = true" > <FontAwesomeIcon icon='fal fa-pen-square' size="sm" class='text-gray-400 cursor-pointer' fixed-width
+                                                                                              aria-hidden='true' />
+                  </span>
                 </div>
             </div>
         </BoxStatPallet>
@@ -200,6 +204,13 @@ const isModalAddress = ref(false)
             :updateRoute    
         />
 	</Modal>
+
+    <Modal :isOpen="isModalAddressCollection" @onClose="() => (isModalAddressCollection = false)">
+        <ModalAddressCollection
+            :addresses="boxStats.fulfilment_customer.address"
+            :updateRoute    
+        />
+    </Modal>
 </template>
 
 <style scoped lang="scss">
diff --git a/routes/grp/web/models.php b/routes/grp/web/models.php
index 333029a438..b8eec4bf70 100644
--- a/routes/grp/web/models.php
+++ b/routes/grp/web/models.php
@@ -84,9 +84,12 @@
 use App\Actions\Fulfilment\PalletDelivery\StartBookingPalletDelivery;
 use App\Actions\Fulfilment\PalletDelivery\SubmitAndConfirmPalletDelivery;
 use App\Actions\Fulfilment\PalletDelivery\UpdatePalletDelivery;
+use App\Actions\Fulfilment\PalletReturn\AddAddressToPalletReturn;
+use App\Actions\Fulfilment\PalletReturn\DeletePalletReturnAddress;
 use App\Actions\Fulfilment\PalletReturn\DispatchPalletReturn;
 use App\Actions\Fulfilment\PalletReturn\Pdf\PdfPalletReturn;
 use App\Actions\Fulfilment\PalletReturn\UpdatePalletReturn;
+use App\Actions\Fulfilment\PalletReturn\UpdatePalletReturnDeliveryAddress;
 use App\Actions\Fulfilment\PalletReturnItem\NotPickedPalletFromReturn;
 use App\Actions\Fulfilment\PalletReturnItem\SyncPalletReturnItem;
 use App\Actions\Fulfilment\PalletReturnItem\UndoPickingPalletFromReturn;
@@ -369,6 +372,9 @@
 
 Route::name('pallet-return.')->prefix('pallet-return/{palletReturn:id}')->group(function () {
 
+    Route::post('address', AddAddressToPalletReturn::class)->name('address.store');
+    Route::patch('address/update', UpdatePalletReturnDeliveryAddress::class)->name('address.update');
+    Route::delete('address/delete', DeletePalletReturnAddress::class)->name('address.delete');
 
     Route::post('dispatch', DispatchPalletReturn::class)->name('dispatch');
 
diff --git a/routes/grp/web/models/fulfilment/fulfilment_customer.php b/routes/grp/web/models/fulfilment/fulfilment_customer.php
index e3ee18fa17..3cdb84ef5c 100644
--- a/routes/grp/web/models/fulfilment/fulfilment_customer.php
+++ b/routes/grp/web/models/fulfilment/fulfilment_customer.php
@@ -15,16 +15,13 @@
 use App\Actions\Fulfilment\PalletDelivery\Pdf\PdfPalletDelivery;
 use App\Actions\Fulfilment\PalletDelivery\StorePalletDelivery;
 use App\Actions\Fulfilment\PalletDelivery\UpdatePalletDeliveryTimeline;
-use App\Actions\Fulfilment\PalletReturn\AddAddressToPalletReturn;
 use App\Actions\Fulfilment\PalletReturn\ConfirmPalletReturn;
-use App\Actions\Fulfilment\PalletReturn\DeletePalletReturnAddress;
 use App\Actions\Fulfilment\PalletReturn\DetachPalletFromReturn;
 use App\Actions\Fulfilment\PalletReturn\DispatchPalletReturn;
 use App\Actions\Fulfilment\PalletReturn\PickedPalletReturn;
 use App\Actions\Fulfilment\PalletReturn\PickingPalletReturn;
 use App\Actions\Fulfilment\PalletReturn\StorePalletReturn;
 use App\Actions\Fulfilment\PalletReturn\SubmitAndConfirmPalletReturn;
-use App\Actions\Fulfilment\PalletReturn\UpdatePalletReturnDeliveryAddress;
 use App\Actions\Fulfilment\RentalAgreement\StoreRentalAgreement;
 use App\Actions\Fulfilment\StoredItem\DeleteStoredItemFromReturn;
 use App\Actions\Fulfilment\StoredItem\StoreStoredItem;
@@ -43,9 +40,6 @@
     // pallet return
     Route::post('pallet-return', StorePalletReturn::class)->name('pallet-return.store');
     Route::post('pallet-return-stored-items', [StorePalletReturn::class,'withStoredItems'])->name('pallet-return-stored-items.store');
-    Route::post('pallet-return/address/{palletReturn:id}', AddAddressToPalletReturn::class)->name('pallet-return-address.store');
-    Route::patch('pallet-return/address/{palletReturn:id}/update', UpdatePalletReturnDeliveryAddress::class)->name('pallet-return-address.update');
-    Route::delete('pallet-return/{palletReturn:id}/address/{address:id}/delete', DeletePalletReturnAddress::class)->name('pallet-return-address.delete');
     Route::post('', [StoreWebUser::class, 'inFulfilmentCustomer'])->name('web-user.store');
 
 
diff --git a/tests/Feature/Retina/RetinaFulfilmentTest.php b/tests/Feature/Retina/RetinaFulfilmentTest.php
index 28cb4ebed3..da9418fab5 100644
--- a/tests/Feature/Retina/RetinaFulfilmentTest.php
+++ b/tests/Feature/Retina/RetinaFulfilmentTest.php
@@ -27,8 +27,14 @@
 use App\Actions\Retina\Fulfilment\PalletDelivery\StoreRetinaPalletDelivery;
 use App\Actions\Retina\Fulfilment\PalletDelivery\SubmitRetinaPalletDelivery;
 use App\Actions\Retina\Fulfilment\PalletDelivery\UpdateRetinaPalletDelivery;
+use App\Actions\Retina\Fulfilment\PalletReturn\AttachRetinaPalletsToReturn;
+use App\Actions\Retina\Fulfilment\PalletReturn\CancelRetinaPalletReturn;
+use App\Actions\Retina\Fulfilment\PalletReturn\DetachRetinaPalletFromReturn;
 use App\Actions\Retina\Fulfilment\PalletReturn\ImportRetinaPalletReturnItem;
 use App\Actions\Retina\Fulfilment\PalletReturn\StoreRetinaPalletReturn;
+use App\Actions\Retina\Fulfilment\PalletReturn\StoreRetinaStoredItemsToReturn;
+use App\Actions\Retina\Fulfilment\PalletReturn\SubmitRetinaPalletReturn;
+use App\Actions\Retina\Fulfilment\PalletReturn\UpdateRetinaPalletReturn;
 use App\Actions\Retina\Fulfilment\StoredItem\StoreRetinaStoredItem;
 use App\Actions\Retina\Fulfilment\StoredItem\SyncRetinaStoredItemToPallet;
 use App\Actions\Retina\UI\Profile\UpdateRetinaProfile;
@@ -49,6 +55,7 @@
 use App\Models\Billables\Rental;
 use App\Models\Billables\Service;
 use App\Models\CRM\WebUser;
+use App\Models\Fulfilment\FulfilmentTransaction;
 use App\Models\Fulfilment\Pallet;
 use App\Models\Fulfilment\PalletDelivery;
 use App\Models\Fulfilment\PalletReturn;
@@ -435,6 +442,23 @@
     return $palletReturn;
 });
 
+test('Update Retina Pallet Return', function (PalletReturn $palletReturn) {
+
+    $palletReturn = UpdateRetinaPalletReturn::make()->action(
+        $palletReturn,
+        [
+            'public_notes' => 'this notes',
+        ]
+    );
+
+    $palletReturn->refresh();
+
+    expect($palletReturn)->toBeInstanceOf(PalletReturn::class)
+        ->and($palletReturn->public_notes)->toBe('this notes');
+
+    return $palletReturn;
+})->depends('Create Retina Pallet Return');
+
 test('import pallets in return (xlsx)', function (PalletReturn $palletReturn) {
     Storage::fake('local');
 
@@ -462,6 +486,86 @@
     return $palletReturn;
 })->depends('Create Retina Pallet Return');
 
+test('Attach Pallet to Retina Pallet Return', function (PalletReturn $palletReturn) {
+    $palletReturn = AttachRetinaPalletsToReturn::make()->action(
+        $palletReturn,
+        [
+            'pallets' => [2,3]
+        ]
+    );
+
+    $palletReturn->refresh();
+
+    expect($palletReturn)->toBeInstanceOf(PalletReturn::class)
+        ->and($palletReturn->stats->number_pallets)->toBe(2);
+
+    return $palletReturn;
+})->depends('import pallets in return (xlsx)');
+
+test('Detach Pallet to Retina Pallet Return', function (PalletReturn $palletReturn) {
+    $pallet = $palletReturn->pallets()->first();
+    DetachRetinaPalletFromReturn::make()->action(
+        $palletReturn,
+        $pallet,
+        []
+    );
+
+    $palletReturn->refresh();
+
+    expect($palletReturn)->toBeInstanceOf(PalletReturn::class)
+        ->and($palletReturn->stats->number_pallets)->toBe(1);
+
+    return $palletReturn;
+})->depends('Attach Pallet to Retina Pallet Return');
+
+test('Add Transaction to Retina Pallet Return', function (PalletReturn $palletReturn) {
+    $fulfilmentTransaction = StoreRetinaFulfilmentTransaction::make()->action(
+        $palletReturn,
+        [
+            'quantity' => 10,
+            'historic_asset_id' => $this->product->current_historic_asset_id
+        ]
+    );
+
+    $fulfilmentTransaction->refresh();
+    $palletReturn->refresh();
+    expect($fulfilmentTransaction)->toBeInstanceOf(FulfilmentTransaction::class)
+        ->and(intval($fulfilmentTransaction->quantity))->toBe(10)
+        ->and($palletReturn->stats->number_physical_goods)->toBe(1);
+
+    return $fulfilmentTransaction;
+})->depends('Attach Pallet to Retina Pallet Return');
+
+test('Submit Retina Pallet Return', function (PalletReturn $palletReturn) {
+
+    $palletReturn = SubmitRetinaPalletReturn::make()->action(
+        $palletReturn,
+        []
+    );
+
+    $palletReturn->refresh();
+
+    expect($palletReturn)->toBeInstanceOf(PalletReturn::class)
+        ->and($palletReturn->state)->toBe(PalletReturnStateEnum::SUBMITTED);
+
+    return $palletReturn;
+})->depends('Detach Pallet to Retina Pallet Return');
+
+test('Cancel Retina Pallet Return', function (PalletReturn $palletReturn) {
+
+    $palletReturn = CancelRetinaPalletReturn::make()->action(
+        $palletReturn,
+        []
+    );
+
+    $palletReturn->refresh();
+
+    expect($palletReturn)->toBeInstanceOf(PalletReturn::class)
+        ->and($palletReturn->state)->toBe(PalletReturnStateEnum::CANCEL);
+
+    return $palletReturn;
+})->depends('Submit Retina Pallet Return');
+
 test('Create Retina Pallet Return (with stored item)', function (PalletReturn $palletReturn) {
 
     $fulfilmentCustomer = $this->fulfilmentCustomer;
@@ -481,3 +585,23 @@
 
     return $palletReturn;
 })->depends('Create Retina Pallet Return');
+
+test('Attach Stored Item to Retina Pallet Return (with stored item)', function (PalletReturn $palletReturn) {
+    $palletReturn = StoreRetinaStoredItemsToReturn::make()->action(
+        $palletReturn,
+        [
+            'stored_items' => [
+                2 => [
+                    'quantity' => 200
+                ]
+            ]
+        ]
+    );
+
+    $palletReturn->refresh();
+
+    expect($palletReturn)->toBeInstanceOf(PalletReturn::class)
+        ->and($palletReturn->stats->number_stored_items)->toBe(1);
+
+    return $palletReturn;
+})->depends('Create Retina Pallet Return (with stored item)');
diff --git a/vite.retina.config.js b/vite.retina.config.js
index 59abc47a1f..11c758375e 100644
--- a/vite.retina.config.js
+++ b/vite.retina.config.js
@@ -15,7 +15,7 @@ import path from "node:path";
 export default defineConfig(
   {
     server : {
-      cors : true,
+      cors   : true,
       watch: {
         ignored: ["**/storage/media/**"]
       }