From 170510169d8a1c69576e10ebb78689963fd1da81 Mon Sep 17 00:00:00 2001
From: aqordeon <aqordivika@yahoo.co.id>
Date: Wed, 19 Feb 2025 10:34:08 +0800
Subject: [PATCH 1/9] perf: PR Stored Item: change quantity to axios

---
 .../Elements/Buttons/ButtonWithLink.vue       |  2 +-
 .../js/Components/NumberWithButtonSave.vue    | 49 ++++++++++++++-----
 .../TableStoredItemReturnStoredItems.vue      | 25 ++++++++--
 3 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/resources/js/Components/Elements/Buttons/ButtonWithLink.vue b/resources/js/Components/Elements/Buttons/ButtonWithLink.vue
index 291e7b678a..49653cbff0 100644
--- a/resources/js/Components/Elements/Buttons/ButtonWithLink.vue
+++ b/resources/js/Components/Elements/Buttons/ButtonWithLink.vue
@@ -25,7 +25,7 @@ const props = defineProps<{
     disabled?: boolean
     noHover?: boolean
     routeTarget?: routeType
-    bindToLink: {
+    bindToLink?: {
         preserveScroll?: boolean
         preserveState?: boolean
     }
diff --git a/resources/js/Components/NumberWithButtonSave.vue b/resources/js/Components/NumberWithButtonSave.vue
index c4b40c04f2..5616764e17 100644
--- a/resources/js/Components/NumberWithButtonSave.vue
+++ b/resources/js/Components/NumberWithButtonSave.vue
@@ -18,6 +18,7 @@ import { useForm } from "@inertiajs/vue3"
 import LoadingIcon from "./Utils/LoadingIcon.vue"
 import { routeType } from "@/types/route"
 import { trans } from "laravel-vue-i18n"
+import axios from "axios"
 
 library.add( faRobot, faPlus, faMinus, faUndoAlt, faAsterisk, faQuestion, falSave, faInfoCircle, fadSave, faSpinner, fasMinus, fasPlus )
 
@@ -37,11 +38,14 @@ const props = defineProps<{
         step?: number
     }
     colorTheme?: string  // '#374151'
+    isUseAxios?: boolean
 }>()
 
 const emits = defineEmits<{
     (e: 'onSave', value: string | number): void
     (e: 'update:modelValue', value: number): void
+    (e: 'onSuccess', newValue: number, oldValue: number): void
+    (e: 'onError', value: {}): void
 }>()
 
 const model = defineModel()
@@ -49,21 +53,42 @@ const model = defineModel()
 const form = useForm({
     quantity: props.modelValue,
 })
+const formDefaultValue = ref({
+    quantity: props.modelValue,
+})
 
-const onSaveViaForm = () => {
+const onSaveViaForm = async () => {
     if(!props.routeSubmit?.name) return
-    
-    form
-    .transform((data) => ({
-        [props.keySubmit || 'quantity']: data.quantity
-    }))
-    .submit(
-        props.routeSubmit?.method || 'post',
-        route(props.routeSubmit?.name, props.routeSubmit?.parameters),
-        {
-            preserveScroll: true,
+
+    if (props.isUseAxios) {
+        try {
+            form.processing = true
+            await axios[props.routeSubmit?.method || 'post'](route(props.routeSubmit?.name, props.routeSubmit?.parameters), {
+                [props.keySubmit || 'quantity']: form.quantity
+            })
+
+            form.defaults('quantity', form.quantity)
+            emits('onSuccess', form.quantity, formDefaultValue.value.quantity)
+            formDefaultValue.value.quantity = form.quantity
+            // console.log('ee', form.processing)
+        } catch (error) {
+            emits('onError', error)
+        } finally {
+            form.processing = false
         }
-    )
+    } else {
+        form
+        .transform((data) => ({
+            [props.keySubmit || 'quantity']: data.quantity
+        }))
+        .submit(
+            props.routeSubmit?.method || 'post',
+            route(props.routeSubmit?.name, props.routeSubmit?.parameters),
+            {
+                preserveScroll: true,
+            }
+        )
+    }
 }
 
 const keyIconUndo = ref(0)
diff --git a/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue b/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue
index 7c5faad627..097e367382 100644
--- a/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue
+++ b/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue
@@ -210,7 +210,7 @@ const generateLinkPalletLocation = (pallet: any) => {
             </Link>
         </template>
         
-        <!-- Column: Stored items -->
+        <!-- Column: Pallet of Stored items -->
         <template #cell(pallet_stored_items)="{ item: value, proxyItem }">
             <div class="grid gap-y-1">
                 <template v-for="pallet_stored_item in value.pallet_stored_items" :key="pallet_stored_item.id">
@@ -245,9 +245,18 @@ const generateLinkPalletLocation = (pallet: any) => {
                                 <div v-if="palletReturn.state === 'in_process'" v-tooltip="trans('Available quantity')" class="text-base">{{ pallet_stored_item.available_quantity }}</div>
                                 <!-- <div v-else-if="palletReturn.state === 'picking'" v-tooltip="trans('Quantity of Customer\'s SKU that should be picked')" class="text-base">{{ pallet_stored_item.selected_quantity }}</div> -->
     
+                                <!-- Button: input number (in_process) -->
                                 <NumberWithButtonSave
                                     v-if="palletReturn.state === 'in_process'"
+                                    key="in_process"
                                     noUndoButton
+                                    isUseAxios
+                                    @onSuccess="(newVal: number, oldVal: number) => {
+                                        proxyItem.total_quantity_ordered += newVal - oldVal
+                                        // router.reload({
+                                        //     only: ['box_stats.order_summary'],
+                                        // })
+                                    }"
                                     :modelValue="pallet_stored_item.selected_quantity"
                                     saveOnForm
                                     :routeSubmit="{
@@ -267,14 +276,16 @@ const generateLinkPalletLocation = (pallet: any) => {
                                 >
                                 </NumberWithButtonSave>
 
-                                <div v-else-if="palletReturn.state === 'submitted'" class="flex flex-nowrap gap-x-1 items-center">
+                                <div v-else-if="palletReturn.state === 'submitted' || palletReturn.state === 'confirmed'" class="flex flex-nowrap gap-x-1 items-center">
                                     {{ pallet_stored_item.selected_quantity }}
                                 </div>
     
-                                <!-- Picking: input number -->
+                                <!-- Button: input number (picking) -->
                                 <template v-else-if="palletReturn.state === 'picking' && pallet_stored_item.state !== 'picked'">
                                     <NumberWithButtonSave
+                                        key="pickingpicked"
                                         noUndoButton
+                                        xisUseAxios
                                         :modelValue="pallet_stored_item.selected_quantity"
                                         saveOnForm
                                         :routeSubmit="
@@ -405,6 +416,14 @@ const generateLinkPalletLocation = (pallet: any) => {
             </div>
         </template>
 
+        <template #cell(total_quantity_ordered)="{ item }">
+            <div class="">
+                <Transition name="spin-to-right">
+                    <span :key="item.total_quantity_ordered">{{ item.total_quantity_ordered }}</span>
+                </Transition>
+            </div>
+        </template>
+
         <!-- Column: Actions -->
         <template #cell(actions)="{ item: pallet }" v-if="props.state == 'in_process' || props.state == 'picking'">
             <div v-if="props.state == 'picking' && layout.app.name == 'Aiku'" class="flex gap-x-2 relative">

From 6475df49e65363dab6f32280e053e0ff910e1f04 Mon Sep 17 00:00:00 2001
From: Raul Perusquia <raul@inikoo.com>
Date: Wed, 19 Feb 2025 13:30:35 +0800
Subject: [PATCH 2/9] =?UTF-8?q?pint=20=F0=9F=8D=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PalletReturn/UI/IndexPalletReturns.php    | 31 ++++++++++---------
 .../UI/IndexSupplierProducts.php              |  2 +-
 .../WithAccountingAuthorisation.php           |  1 +
 app/Models/CRM/Customer.php                   |  2 +-
 app/Models/Fulfilment/StoredItem.php          |  2 ++
 app/Models/Helpers/Upload.php                 |  4 +--
 app/Models/ShopifyUserHasFulfilment.php       |  7 ++++-
 ...ent_id_to_shopify_user_has_fulfilments.php | 21 ++++++-------
 ...reason_to_shopify_user_has_fulfilments.php | 23 ++++++--------
 ...anisation_id_nullable_in_uploads_table.php | 24 ++++++--------
 10 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php b/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php
index 20cd39f3d9..11db57dbcb 100644
--- a/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php
+++ b/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php
@@ -212,15 +212,15 @@ protected function getElementGroups(Organisation|FulfilmentCustomer|Fulfilment|W
     {
         $allowedStates = PalletReturnStateEnum::labels(forElements: true);
         $countStates   = PalletReturnStateEnum::count($parent, forElements: true);
-    
+
         if ($this->restriction === 'new') {
-            $allowedStates = array_filter($allowedStates, fn($key) => in_array($key, ['in_process', 'submitted', 'confirmed']), ARRAY_FILTER_USE_KEY);
-            $countStates   = array_filter($countStates, fn($key) => in_array($key, ['in_process', 'submitted', 'confirmed']), ARRAY_FILTER_USE_KEY);
+            $allowedStates = array_filter($allowedStates, fn ($key) => in_array($key, ['in_process', 'submitted', 'confirmed']), ARRAY_FILTER_USE_KEY);
+            $countStates   = array_filter($countStates, fn ($key) => in_array($key, ['in_process', 'submitted', 'confirmed']), ARRAY_FILTER_USE_KEY);
         } elseif ($this->parent instanceof Warehouse && $this->restriction === 'all') {
-            $allowedStates = array_filter($allowedStates, fn($key) => !in_array($key, ['in_process', 'submitted']), ARRAY_FILTER_USE_KEY);
-            $countStates   = array_filter($countStates, fn($key) => !in_array($key, ['in_process', 'submitted']), ARRAY_FILTER_USE_KEY);
+            $allowedStates = array_filter($allowedStates, fn ($key) => !in_array($key, ['in_process', 'submitted']), ARRAY_FILTER_USE_KEY);
+            $countStates   = array_filter($countStates, fn ($key) => !in_array($key, ['in_process', 'submitted']), ARRAY_FILTER_USE_KEY);
         }
-    
+
         return [
             'state' => [
                 'label'    => __('State'),
@@ -263,8 +263,8 @@ public function handle(Fulfilment|Warehouse|FulfilmentCustomer|RecurringBill $pa
         if ($this->type) {
             $queryBuilder->where('type', $this->type);
         }
-        
-        if($this->restriction == 'all' || $this->restriction == 'new') {
+
+        if ($this->restriction == 'all' || $this->restriction == 'new') {
             foreach ($this->getElementGroups($parent) as $key => $elementGroup) {
                 $queryBuilder->whereElementGroup(
                     key: $key,
@@ -328,13 +328,14 @@ public function tableStructure(Fulfilment|Warehouse|FulfilmentCustomer|Recurring
                     ->pageName($prefix.'Page');
             }
 
-            if($restriction == 'all' || $this->parent instanceof Fulfilment && $restriction == 'new')
-            foreach ($this->getElementGroups($parent) as $key => $elementGroup) {
-                $table->elementGroup(
-                    key: $key,
-                    label: $elementGroup['label'],
-                    elements: $elementGroup['elements']
-                );
+            if ($restriction == 'all' || $this->parent instanceof Fulfilment && $restriction == 'new') {
+                foreach ($this->getElementGroups($parent) as $key => $elementGroup) {
+                    $table->elementGroup(
+                        key: $key,
+                        label: $elementGroup['label'],
+                        elements: $elementGroup['elements']
+                    );
+                }
             }
 
             $table
diff --git a/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php b/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php
index b59c85f1eb..325d5def6f 100644
--- a/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php
+++ b/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php
@@ -231,7 +231,7 @@ public function htmlResponse(LengthAwarePaginator $supplier_products, ActionRequ
                                     ]
                 ]
             ];
-            $attachRoutes =[
+            $attachRoutes = [
                 'importRoute' => [
                     'name'       => 'grp.models.supplier.supplier-product.import',
                     'parameters' => [
diff --git a/app/Actions/Traits/Authorisations/WithAccountingAuthorisation.php b/app/Actions/Traits/Authorisations/WithAccountingAuthorisation.php
index fd8d425180..e1a3b6c6ec 100644
--- a/app/Actions/Traits/Authorisations/WithAccountingAuthorisation.php
+++ b/app/Actions/Traits/Authorisations/WithAccountingAuthorisation.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Author: Raul Perusquia <raul@inikoo.com>
  * Created: Wed, 19 Feb 2025 11:08:12 Central Indonesia Time, Sanur, Bali, Indonesia
diff --git a/app/Models/CRM/Customer.php b/app/Models/CRM/Customer.php
index 36aec1e734..70eaf7a7ca 100644
--- a/app/Models/CRM/Customer.php
+++ b/app/Models/CRM/Customer.php
@@ -111,7 +111,7 @@
  * @property string|null $rejected_notes
  * @property \Illuminate\Support\Carbon|null $rejected_at
  * @property bool $is_vip VIP customer
- * @property int|null $as_organisation_id Indicate if customer is a organisation in this group
+ * @property int|null $as_organisation_id Indicate customer is a organisation in this group
  * @property int|null $as_employee_id Indicate customer is a employee
  * @property-read Address|null $address
  * @property-read Collection<int, Address> $addresses
diff --git a/app/Models/Fulfilment/StoredItem.php b/app/Models/Fulfilment/StoredItem.php
index 3eb94468c5..e6cd20dfd1 100644
--- a/app/Models/Fulfilment/StoredItem.php
+++ b/app/Models/Fulfilment/StoredItem.php
@@ -63,7 +63,9 @@
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Fulfilment\PalletReturn> $palletReturns
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Fulfilment\PalletStoredItem> $palletStoredItems
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Fulfilment\Pallet> $pallets
+ * @property-read Portfolio|null $portfolio
  * @property-read \App\Models\Helpers\RetinaSearch|null $retinaSearch
+ * @property-read ShopifyUserHasProduct|null $shopifyPortfolio
  * @property-read \App\Models\Helpers\UniversalSearch|null $universalSearch
  * @property-read Warehouse|null $warehouse
  * @method static Builder<static>|StoredItem newModelQuery()
diff --git a/app/Models/Helpers/Upload.php b/app/Models/Helpers/Upload.php
index 896e4dddbb..7de8fb97e8 100644
--- a/app/Models/Helpers/Upload.php
+++ b/app/Models/Helpers/Upload.php
@@ -23,7 +23,7 @@
  *
  * @property int $id
  * @property int $group_id
- * @property int $organisation_id
+ * @property int|null $organisation_id
  * @property int|null $shop_id
  * @property int|null $user_id
  * @property string $model
@@ -47,7 +47,7 @@
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Helpers\Audit> $audits
  * @property-read \App\Models\Helpers\TFactory|null $use_factory
  * @property-read \App\Models\SysAdmin\Group $group
- * @property-read \App\Models\SysAdmin\Organisation $organisation
+ * @property-read \App\Models\SysAdmin\Organisation|null $organisation
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Helpers\UploadRecord> $records
  * @property-read \App\Models\Catalogue\Shop|null $shop
  * @property-read User|null $user
diff --git a/app/Models/ShopifyUserHasFulfilment.php b/app/Models/ShopifyUserHasFulfilment.php
index 41104cf64f..40d277e30d 100644
--- a/app/Models/ShopifyUserHasFulfilment.php
+++ b/app/Models/ShopifyUserHasFulfilment.php
@@ -22,7 +22,12 @@
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property string $model_type
- * @property string $state
+ * @property ShopifyFulfilmentStateEnum $state
+ * @property int|null $customer_client_id
+ * @property string|null $no_fulfilment_reason
+ * @property string|null $no_fulfilment_reason_notes
+ * @property ShopifyFulfilmentReasonEnum $reason
+ * @property-read CustomerClient|null $customerClient
  * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $model
  * @property-read ShopifyUser $shopifyUser
  * @method static \Illuminate\Database\Eloquent\Builder<static>|ShopifyUserHasFulfilment newModelQuery()
diff --git a/database/migrations/2025_02_18_081452_add_customer_client_id_to_shopify_user_has_fulfilments.php b/database/migrations/2025_02_18_081452_add_customer_client_id_to_shopify_user_has_fulfilments.php
index d26840a008..280f877f43 100644
--- a/database/migrations/2025_02_18_081452_add_customer_client_id_to_shopify_user_has_fulfilments.php
+++ b/database/migrations/2025_02_18_081452_add_customer_client_id_to_shopify_user_has_fulfilments.php
@@ -1,16 +1,17 @@
 <?php
 
+/*
+ * Author: Raul Perusquia <raul@inikoo.com>
+ * Created: Wed, 19 Feb 2025 13:20:43 Central Indonesia Time, Sanur, Bali, Indonesia
+ * Copyright (c) 2025, Raul A Perusquia Flores
+ */
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class () extends Migration {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
+    public function up(): void
     {
         Schema::table('shopify_user_has_fulfilments', function (Blueprint $table) {
             $table->unsignedBigInteger('customer_client_id')->nullable();
@@ -18,12 +19,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
+
+    public function down(): void
     {
         Schema::table('shopify_user_has_fulfilments', function (Blueprint $table) {
             $table->dropForeign(['customer_client_id']);
diff --git a/database/migrations/2025_02_19_032625_add_reason_to_shopify_user_has_fulfilments.php b/database/migrations/2025_02_19_032625_add_reason_to_shopify_user_has_fulfilments.php
index 2e911645e4..ac292d2ebc 100644
--- a/database/migrations/2025_02_19_032625_add_reason_to_shopify_user_has_fulfilments.php
+++ b/database/migrations/2025_02_19_032625_add_reason_to_shopify_user_has_fulfilments.php
@@ -1,29 +1,26 @@
 <?php
 
+/*
+ * Author: Raul Perusquia <raul@inikoo.com>
+ * Created: Wed, 19 Feb 2025 13:28:45 Central Indonesia Time, Sanur, Bali, Indonesia
+ * Copyright (c) 2025, Raul A Perusquia Flores
+ */
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 return new class () extends Migration {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
+    public function up(): void
     {
         Schema::table('shopify_user_has_fulfilments', function (Blueprint $table) {
             $table->string('no_fulfilment_reason')->nullable();
-            $table->string('no_fulfilment_reason_notes')->nullable();
+            $table->text('no_fulfilment_reason_notes')->nullable();
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
+
+    public function down(): void
     {
         Schema::table('shopify_user_has_fulfilments', function (Blueprint $table) {
             $table->dropColumn(['no_fulfilment_reason', 'no_fulfilment_reason_notes']);
diff --git a/database/migrations/2025_02_19_050857_make_organisation_id_nullable_in_uploads_table.php b/database/migrations/2025_02_19_050857_make_organisation_id_nullable_in_uploads_table.php
index 350d00c92f..da4a5cd98f 100644
--- a/database/migrations/2025_02_19_050857_make_organisation_id_nullable_in_uploads_table.php
+++ b/database/migrations/2025_02_19_050857_make_organisation_id_nullable_in_uploads_table.php
@@ -1,29 +1,25 @@
 <?php
 
+/*
+ * Author: Raul Perusquia <raul@inikoo.com>
+ * Created: Wed, 19 Feb 2025 13:27:44 Central Indonesia Time, Sanur, Bali, Indonesia
+ * Copyright (c) 2025, Raul A Perusquia Flores
+ */
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
+return new class () extends Migration {
+    public function up(): void
     {
         Schema::table('uploads', function (Blueprint $table) {
             $table->unsignedSmallInteger('organisation_id')->nullable()->change();
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
+
+    public function down(): void
     {
         Schema::table('uploads', function (Blueprint $table) {
             $table->dropForeign(['organisation_id']);

From c1002f071f1b1b9b4dc3a5ee4a7c52abb7c02860 Mon Sep 17 00:00:00 2001
From: Raul Perusquia <raul@inikoo.com>
Date: Wed, 19 Feb 2025 13:32:21 +0800
Subject: [PATCH 3/9] fixing warnings

---
 .../PalletReturn/UI/IndexPalletReturns.php    | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php b/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php
index 11db57dbcb..4d92f4605f 100644
--- a/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php
+++ b/app/Actions/Fulfilment/PalletReturn/UI/IndexPalletReturns.php
@@ -48,7 +48,6 @@ class IndexPalletReturns extends OrgAction
     private ?string $type = null;
 
 
-
     public function authorize(ActionRequest $request): bool
     {
         if ($this->parent instanceof Fulfilment or $this->parent instanceof FulfilmentCustomer) {
@@ -67,61 +66,67 @@ public function authorize(ActionRequest $request): bool
 
     public function asController(Organisation $organisation, Fulfilment $fulfilment, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilment;
+        $this->parent      = $fulfilment;
         $this->restriction = 'all';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
         return $this->handle($fulfilment, PalletReturnsTabsEnum::RETURNS->value);
     }
 
+    /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentConfirmed(Organisation $organisation, Fulfilment $fulfilment, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilment;
+        $this->parent      = $fulfilment;
         $this->restriction = 'confirmed';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
         return $this->handle($fulfilment, PalletReturnsTabsEnum::RETURNS->value);
     }
 
+    /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentNew(Organisation $organisation, Fulfilment $fulfilment, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilment;
+        $this->parent      = $fulfilment;
         $this->restriction = 'new';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
         return $this->handle($fulfilment, PalletReturnsTabsEnum::RETURNS->value);
     }
 
+    /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentPicking(Organisation $organisation, Fulfilment $fulfilment, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilment;
+        $this->parent      = $fulfilment;
         $this->restriction = 'picking';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
         return $this->handle($fulfilment, PalletReturnsTabsEnum::RETURNS->value);
     }
 
+    /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentPicked(Organisation $organisation, Fulfilment $fulfilment, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilment;
+        $this->parent      = $fulfilment;
         $this->restriction = 'picked';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
         return $this->handle($fulfilment, PalletReturnsTabsEnum::RETURNS->value);
     }
 
+    /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentDispatched(Organisation $organisation, Fulfilment $fulfilment, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilment;
+        $this->parent      = $fulfilment;
         $this->restriction = 'dispatched';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
         return $this->handle($fulfilment, PalletReturnsTabsEnum::RETURNS->value);
     }
 
+    /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentCancelled(Organisation $organisation, Fulfilment $fulfilment, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilment;
+        $this->parent      = $fulfilment;
         $this->restriction = 'cancelled';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
@@ -131,7 +136,7 @@ public function inFulfilmentCancelled(Organisation $organisation, Fulfilment $fu
     /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentCustomer(Organisation $organisation, Fulfilment $fulfilment, FulfilmentCustomer $fulfilmentCustomer, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $fulfilmentCustomer;
+        $this->parent      = $fulfilmentCustomer;
         $this->restriction = 'all';
         $this->initialisationFromFulfilment($fulfilment, $request)->withTab(PalletReturnsTabsEnum::values());
 
@@ -141,7 +146,7 @@ public function inFulfilmentCustomer(Organisation $organisation, Fulfilment $ful
     /** @noinspection PhpUnusedParameterInspection */
     public function inWarehouse(Organisation $organisation, Warehouse $warehouse, ActionRequest $request): LengthAwarePaginator
     {
-        $this->parent = $warehouse;
+        $this->parent      = $warehouse;
         $this->restriction = 'all';
         $this->initialisationFromWarehouse($warehouse, $request)->withTab(PalletReturnsTabsEnum::values());
 
@@ -198,6 +203,7 @@ public function inWarehouseDispatched(Organisation $organisation, Warehouse $war
 
         return $this->handle($warehouse, PalletReturnsTabsEnum::RETURNS->value);
     }
+
     /** @noinspection PhpUnusedParameterInspection */
     public function inWarehouseCancelled(Organisation $organisation, Warehouse $warehouse, ActionRequest $request): LengthAwarePaginator
     {
@@ -225,7 +231,7 @@ protected function getElementGroups(Organisation|FulfilmentCustomer|Fulfilment|W
             'state' => [
                 'label'    => __('State'),
                 'elements' => array_merge_recursive($allowedStates, $countStates),
-                'engine' => function ($query, $elements) {
+                'engine'   => function ($query, $elements) {
                     $query->whereIn('pallet_returns.state', $elements);
                 }
             ],
@@ -289,9 +295,6 @@ public function handle(Fulfilment|Warehouse|FulfilmentCustomer|RecurringBill $pa
                 case 'picked':
                     $queryBuilder->where('state', PalletReturnStateEnum::PICKED);
                     break;
-                case 'dispatched':
-                    $queryBuilder->where('state', PalletReturnStateEnum::DISPATCHED);
-                    break;
                 case 'cancelled':
                     $queryBuilder->where('state', PalletReturnStateEnum::CANCEL);
                     break;
@@ -311,9 +314,10 @@ public function handle(Fulfilment|Warehouse|FulfilmentCustomer|RecurringBill $pa
         }
 
         $queryBuilder->defaultSort('-date');
+
         return $queryBuilder
             ->select('pallet_returns.id', 'state', 'slug', 'reference', 'customer_reference', 'number_pallets', 'number_services', 'number_physical_goods', 'date', 'dispatched_at', 'type', 'total_amount', 'currencies.code as currency_code')
-            ->allowedSorts(['reference','customer_reference','number_pallets','date','state'])
+            ->allowedSorts(['reference', 'customer_reference', 'number_pallets', 'date', 'state'])
             ->allowedFilters([$globalSearch, 'type'])
             ->withPaginator($prefix, tableName: request()->route()->getName())
             ->withQueryString();
@@ -403,12 +407,12 @@ public function htmlResponse(LengthAwarePaginator $returns, ActionRequest $reque
                 'label' => __('returns')
             ];
         } elseif ($this->parent instanceof Fulfilment) {
-            $model = __('Operations');
+            $model         = __('Operations');
             $subNavigation = $this->getPalletReturnSubNavigation($this->parent, $request);
         } elseif ($this->parent instanceof Warehouse) {
-            $icon      = ['fal', 'fa-arrow-from-left'];
-            $model     = __('Goods Out');
-            $iconRight = ['fal', 'fa-sign-out-alt'];
+            $icon          = ['fal', 'fa-arrow-from-left'];
+            $model         = __('Goods Out');
+            $iconRight     = ['fal', 'fa-sign-out-alt'];
             $subNavigation = $this->getPalletReturnSubNavigation($this->parent, $request);
         }
 
@@ -416,9 +420,6 @@ public function htmlResponse(LengthAwarePaginator $returns, ActionRequest $reque
         $actions = [];
 
 
-
-
-
         if ($this->parent->number_pallets_status_storing) {
             $actions[] = [
                 'type'        => 'button',

From c56bbcbae6978aa64b81457e4941df0b2ca10c62 Mon Sep 17 00:00:00 2001
From: KirinZero0 <aryapermana02@gmail.com>
Date: Wed, 19 Feb 2025 13:32:27 +0800
Subject: [PATCH 4/9] import route

---
 .../UI/IndexSupplierProducts.php              | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php b/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php
index b59c85f1eb..ac91738ab2 100644
--- a/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php
+++ b/app/Actions/SupplyChain/SupplierProduct/UI/IndexSupplierProducts.php
@@ -231,12 +231,17 @@ public function htmlResponse(LengthAwarePaginator $supplier_products, ActionRequ
                                     ]
                 ]
             ];
-            $attachRoutes =[
-                'importRoute' => [
-                    'name'       => 'grp.models.supplier.supplier-product.import',
-                    'parameters' => [
-                        'supplier' => $this->scope->id,
-                    ]
+            //'grp.models.supplier.supplier-product.import' import route
+            $spreadsheetRoute = [
+                'event'           => 'action-progress',
+                'channel'         => 'grp.personal.'.$this->group->id,
+                'route'           => [
+                    'upload'   => [
+                        'name'       => 'grp.models.supplier.supplier-product.import',
+                        'parameters' => [
+                            'supplier' => $this->scope->id
+                        ]
+                    ],
                 ],
             ];
         }
@@ -258,7 +263,7 @@ public function htmlResponse(LengthAwarePaginator $supplier_products, ActionRequ
                     'subNavigation' => $subNavigation,
                     'actions'       => $actions
                 ],
-                'importRoutes' => $attachRoutes,
+                'upload_spreadsheet' => $spreadsheetRoute,
                 'data'        => SupplierProductsResource::collection($supplier_products),
             ]
         )->table($this->tableStructure());

From 148ed3e25633759b93c4e8b428ba5b3c97d16fc4 Mon Sep 17 00:00:00 2001
From: dandiAW <dandiferrari75@gmail.com>
Date: Wed, 19 Feb 2025 13:43:16 +0800
Subject: [PATCH 5/9] Payment: place right amount

---
 .../Accounting/PaymentAccount/UI/IndexPaymentAccounts.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Actions/Accounting/PaymentAccount/UI/IndexPaymentAccounts.php b/app/Actions/Accounting/PaymentAccount/UI/IndexPaymentAccounts.php
index 261f4a3a58..cdabfd68a9 100644
--- a/app/Actions/Accounting/PaymentAccount/UI/IndexPaymentAccounts.php
+++ b/app/Actions/Accounting/PaymentAccount/UI/IndexPaymentAccounts.php
@@ -140,7 +140,7 @@ public function tableStructure(Group|Shop|Organisation|OrgPaymentServiceProvider
             $table->column(key: 'number_pas_state_active', label: __('shops'), canBeHidden: false, sortable: true, searchable: true);
 
             $table->column(key: 'number_payments', label: __('payments'), canBeHidden: false, sortable: true, searchable: true);
-            $table->column(key: 'org_amount_successfully_paid', label: __('amount'), canBeHidden: false, sortable: true, searchable: true);
+            $table->column(key: 'org_amount_successfully_paid', label: __('amount'), canBeHidden: false, sortable: true, searchable: true, type:'number');
 
             $table->defaultSort('code');
         };

From 756d821bff21892fc321f04c59aa206310154008 Mon Sep 17 00:00:00 2001
From: aqordeon <aqordivika@yahoo.co.id>
Date: Wed, 19 Feb 2025 13:47:45 +0800
Subject: [PATCH 6/9] perf: PR Stored Item: manipulation quantity on In Process

---
 .../PalletReturn/UI/ShowStoredItemReturn.php  |   3 +-
 .../js/Components/NumberWithButtonSave.vue    |  13 +-
 .../TableStoredItemReturnStoredItems.vue      | 173 +++++++++++-------
 .../Pages/Grp/Org/Fulfilment/PalletReturn.vue |  23 ++-
 4 files changed, 143 insertions(+), 69 deletions(-)

diff --git a/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php b/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php
index ba9e62003b..defc975a8c 100644
--- a/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php
+++ b/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php
@@ -105,7 +105,7 @@ public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request)
             'type'    => 'button',
             'style'   => 'save',
             'tooltip' => $tooltipSubmit,
-            'label'   => __('Confirm') . ' (' . $palletReturn->storedItems()->count() . ')',
+            // 'label'   => __('Confirm') . ' (' . $palletReturn->storedItems()->count() . ')',
             'key'     => 'submit',
             'route'   => [
                 'method'     => 'post',
@@ -624,6 +624,7 @@ public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request)
                         'code' => 'Other'
                     ]
                 ],
+                'stored_items_count' => $palletReturn->storedItems()->count(),
 
                 PalletReturnTabsEnum::STORED_ITEMS->value => $this->tab == PalletReturnTabsEnum::STORED_ITEMS->value ?
                     fn () => PalletReturnItemsWithStoredItemsResource::collection(IndexStoredItemsInReturn::run($palletReturn, PalletReturnTabsEnum::STORED_ITEMS->value)) //todo idk if this is right
diff --git a/resources/js/Components/NumberWithButtonSave.vue b/resources/js/Components/NumberWithButtonSave.vue
index 5616764e17..0691d25958 100644
--- a/resources/js/Components/NumberWithButtonSave.vue
+++ b/resources/js/Components/NumberWithButtonSave.vue
@@ -19,6 +19,7 @@ import LoadingIcon from "./Utils/LoadingIcon.vue"
 import { routeType } from "@/types/route"
 import { trans } from "laravel-vue-i18n"
 import axios from "axios"
+import { notify } from "@kyvg/vue3-notification"
 
 library.add( faRobot, faPlus, faMinus, faUndoAlt, faAsterisk, faQuestion, falSave, faInfoCircle, fadSave, faSpinner, fasMinus, fasPlus )
 
@@ -39,6 +40,7 @@ const props = defineProps<{
     }
     colorTheme?: string  // '#374151'
     isUseAxios?: boolean
+    parentClass?: string
 }>()
 
 const emits = defineEmits<{
@@ -70,9 +72,14 @@ const onSaveViaForm = async () => {
             form.defaults('quantity', form.quantity)
             emits('onSuccess', form.quantity, formDefaultValue.value.quantity)
             formDefaultValue.value.quantity = form.quantity
-            // console.log('ee', form.processing)
+            // console.log('ee axios', form.processing)
         } catch (error) {
-            emits('onError', error)
+            emits('onError', error?.response?.data)
+            notify({
+                title: trans('Something went wrong'),
+                text: error?.response?.data?.message || error?.response?.data,
+                type: 'error',
+            })
         } finally {
             form.processing = false
         }
@@ -123,7 +130,7 @@ const onClickPlusButton = () => {
 </script>
 
 <template>
-    <div class="relative w-full">
+    <div class="relative w-full" :class="parentClass">
         <div class="flex items-center justify-center border border-gray-300 rounded gap-y-1 px-1 py-0.5">
             <!-- Button: Save -->
             <button v-if="!noUndoButton"
diff --git a/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue b/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue
index 097e367382..f9586c5bd0 100644
--- a/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue
+++ b/resources/js/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue
@@ -21,6 +21,8 @@ import { faCheck, faUndoAlt, faArrowDown } from '@fal'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import ButtonWithLink from '@/Components/Elements/Buttons/ButtonWithLink.vue'
 import { Collapse } from 'vue-collapsed'
+import { aikuLocaleStructure } from '@/Composables/useLocaleStructure'
+import axios from 'axios'
 library.add(faCheck, faUndoAlt, faArrowDown)
 
 const props = defineProps<{
@@ -35,6 +37,11 @@ const props = defineProps<{
     }
 }>();
 
+const emits = defineEmits<{
+    (e: 'isStoredItemAdded', value: boolean): void
+}>()
+
+const locale = inject('locale', aikuLocaleStructure)
 const layout = inject('layout', layoutStructure)
 const selectedRow = ref({});
 const _table = ref(null);
@@ -190,6 +197,25 @@ const generateLinkPalletLocation = (pallet: any) => {
     }
 }
 
+// Button: undo pick
+const isLoadingUndoPick = reactive({})
+const onUndoPick = async (routeTarget: routeType, pallet_stored_item: any, loadingKey: string) => {
+    try {
+        pallet_stored_item.isLoadingUndo = true
+        set(isLoadingUndoPick, loadingKey, true)
+        await axios[routeTarget.method || 'get'](
+            route(routeTarget.name, routeTarget.parameters)
+        )
+        pallet_stored_item.state = 'picking'
+        // console.log('qqqqq', pallet_stored_item)
+    } catch (error) {
+        console.error('hehehe', error)
+        
+    } finally {
+        set(isLoadingUndoPick, loadingKey, false)
+    }
+    
+}
 </script>
 
 <template>
@@ -215,7 +241,7 @@ const generateLinkPalletLocation = (pallet: any) => {
             <div class="grid gap-y-1">
                 <template v-for="pallet_stored_item in value.pallet_stored_items" :key="pallet_stored_item.id">
                     <Teleport v-if="isMounted" :to="`#row-${value.id}`" :disabled="palletReturn.state == 'in_process' || pallet_stored_item.selected_quantity > 0">
-                        <div class="rounded p-1 flex justify-between gap-x-4 items-center">
+                        <div class="rounded p-1 flex justify-between gap-x-6 items-center">
                             <!-- <Tag :label="pallet_stored_item.reference" stringToColor>
                                 <template #label>
                                     <div class="">
@@ -233,6 +259,7 @@ const generateLinkPalletLocation = (pallet: any) => {
                                 </span>
                                 <span v-else class="text-gray-400 italic">({{ trans('No reference') }})</span>
                                 <span v-if="pallet_stored_item.location?.code" v-tooltip="trans('Location code of the pallet')" class="text-gray-400"> [{{ pallet_stored_item.location?.code }}]</span>
+                                <FontAwesomeIcon v-if="pallet_stored_item.selected_quantity && palletReturn.state === 'in_process'" v-tooltip="trans('Will be picked')" icon='fas fa-circle' class='text-[7px] ml-1 mb-1 text-blue-500 animate-pulse' fixed-width aria-hidden='true' />
                                 <div v-if="palletReturn.state === 'picking'"
                                     @xxclick="() => pallet_stored_item.picked_quantity = pallet_stored_item.quantity_in_pallet"
                                     v-tooltip="trans('Total Customer\'s SKU in this pallet')"
@@ -253,6 +280,8 @@ const generateLinkPalletLocation = (pallet: any) => {
                                     isUseAxios
                                     @onSuccess="(newVal: number, oldVal: number) => {
                                         proxyItem.total_quantity_ordered += newVal - oldVal
+                                        pallet_stored_item.selected_quantity = newVal
+                                        emits('isStoredItemAdded', newVal > 0 ? true : false)
                                         // router.reload({
                                         //     only: ['box_stats.order_summary'],
                                         // })
@@ -277,70 +306,75 @@ const generateLinkPalletLocation = (pallet: any) => {
                                 </NumberWithButtonSave>
 
                                 <div v-else-if="palletReturn.state === 'submitted' || palletReturn.state === 'confirmed'" class="flex flex-nowrap gap-x-1 items-center">
-                                    {{ pallet_stored_item.selected_quantity }}
+                                    {{ locale.number(pallet_stored_item.selected_quantity) }}
                                 </div>
     
                                 <!-- Button: input number (picking) -->
                                 <template v-else-if="palletReturn.state === 'picking' && pallet_stored_item.state !== 'picked'">
-                                    <NumberWithButtonSave
-                                        key="pickingpicked"
-                                        noUndoButton
-                                        xisUseAxios
-                                        :modelValue="pallet_stored_item.selected_quantity"
-                                        saveOnForm
-                                        :routeSubmit="
-                                            pallet_stored_item.pallet_return_item_id
-                                                ? pallet_stored_item.updateRoute
-                                                : pallet_stored_item.newPickRoute
-                                        "
-                                        :keySubmit="
-                                            pallet_stored_item.pallet_return_item_id
-                                                ? 'quantity_picked'
-                                                : 'quantity_ordered'
-                                        "
-                                        :bindToTarget="{
-                                            step: 1,
-                                            min: 0,
-                                            max: pallet_stored_item.max_quantity
-                                        }"
-                                        :xxcolorTheme="
-                                            pallet_stored_item.selected_quantity == pallet_stored_item.picked_quantity
-                                                ? '#374151'
-                                                : pallet_stored_item.selected_quantity < pallet_stored_item.picked_quantity
-                                                    ? '#22c55e'
-                                                    : '#ff0000'
-                                        "
-                                    >
-                                        <template #save="{ isProcessing, isDirty, onSaveViaForm }">
-                                            <Button
-                                                v-if="pallet_stored_item.selected_quantity > 0"
-                                                @click="() => onSaveViaForm()"
-                                                icon="fal fa-save"
-                                                :label="trans('pick')"
-                                                size="xs"
-                                                :xdisabled="!isDirty"
-                                                type="secondary"
-                                                :loading="isProcessing"
-                                                class="py-0"
-                                            />
-                                            <Button
-                                                v-else
-                                                @click="() => onSaveViaForm()"
-                                                icon="fal fa-save"
-                                                :label="trans('pick')"
-                                                size="xs"
-                                                :xdisabled="!isDirty"
-                                                type="secondary"
-                                                :loading="isProcessing"
-                                                class="py-0"
-                                            />
-                                        </template>
-                                    </NumberWithButtonSave>
+                                    <div>
+                                        <NumberWithButtonSave
+                                            key="pickingpicked"
+                                            noUndoButton
+                                            isUseAxios
+                                            @onSuccess="(newVal: number, oldVal: number) => {
+                                                pallet_stored_item.state = 'picked',
+                                                pallet_stored_item.picked_quantity = newVal
+                                            }"
+                                            @xxonError="(error: any) => {
+                                                pallet_stored_item.error = error.message
+                                            }"
+                                            :modelValue="pallet_stored_item.selected_quantity"
+                                            saveOnForm
+                                            :routeSubmit="
+                                                pallet_stored_item.pallet_return_item_id
+                                                    ? pallet_stored_item.updateRoute
+                                                    : pallet_stored_item.newPickRoute
+                                            "
+                                            :keySubmit="
+                                                pallet_stored_item.pallet_return_item_id
+                                                    ? 'quantity_picked'
+                                                    : 'quantity_ordered'
+                                            "
+                                            :bindToTarget="{
+                                                step: 1,
+                                                min: 0,
+                                                max: pallet_stored_item.max_quantity
+                                            }"
+                                            :xxcolorTheme="
+                                                pallet_stored_item.selected_quantity == pallet_stored_item.picked_quantity
+                                                    ? '#374151'
+                                                    : pallet_stored_item.selected_quantity < pallet_stored_item.picked_quantity
+                                                        ? '#22c55e'
+                                                        : '#ff0000'
+                                            "
+                                            :xxparentClass="''
+                                                // pallet_stored_item.error ? 'errorShake' : ''
+                                            "
+                                        >
+                                            <template #save="{ isProcessing, isDirty, onSaveViaForm }">
+                                                <Button
+                                                    v-if="pallet_stored_item.selected_quantity > 0"
+                                                    @click="() => (
+                                                        // pallet_stored_item.error = null,  // make slow a little bit
+                                                        onSaveViaForm()
+                                                    )"
+                                                    icon="fal fa-save"
+                                                    :label="trans('pick')"
+                                                    size="xs"
+                                                    :xdisabled="!isDirty"
+                                                    type="secondary"
+                                                    :loading="isProcessing"
+                                                    class="py-0"
+                                                />
+                                            </template>
+                                        </NumberWithButtonSave>
+                                        <!-- <p v-if="pallet_stored_item.error" class="text-xs text-red-500 italic">*{{ pallet_stored_item.error }}</p> -->
+                                    </div>
                                 </template>
     
                                 <div v-else class="flex flex-nowrap gap-x-1 items-center tabular-nums">
-                                    <ButtonWithLink
-                                        v-if="palletReturn.state == 'picking' && pallet_stored_item.state == 'picked'"
+                                    <!-- <ButtonWithLink
+                                        
                                         icon="fal fa-undo-alt"
                                         :label="trans('Undo pick')"
                                         size="xs"
@@ -348,14 +382,24 @@ const generateLinkPalletLocation = (pallet: any) => {
                                         :key="2"
                                         class="py-0 mr-1"
                                         :routeTarget="pallet_stored_item.undoRoute"
+                                    /> -->
+                                    <Button
+                                        v-if="palletReturn.state == 'picking' && pallet_stored_item.state == 'picked'"
+                                        @click="() => onUndoPick(pallet_stored_item.undoRoute, pallet_stored_item, `row${value.rowIndex}.id${pallet_stored_item.id}`)"
+                                        icon="fal fa-undo-alt"
+                                        :label="trans('Undo pick')"
+                                        size="xs"
+                                        :loading="get(isLoadingUndoPick, [`row${value.rowIndex}`, `id${pallet_stored_item.id}`], false)"
+                                        type="tertiary"
                                     />
-                                    {{ pallet_stored_item.picked_quantity }}/{{ pallet_stored_item.selected_quantity }}
+                                    {{ locale.number(pallet_stored_item.picked_quantity) }}/{{ locale.number(pallet_stored_item.selected_quantity) }}
                                     <FontAwesomeIcon v-if="pallet_stored_item.state == 'picked'" v-tooltip="trans('Picked')" icon='fal fa-check' class='text-green-500' fixed-width aria-hidden='true' />
                                 </div>
     
                                 
                             </div>
-                            <!-- {{ pallet_stored_item.pallet_return_item_id }} -->
+                            <!-- {{ get(isLoadingUndoPick, [`row${value.rowIndex}.id${pallet_stored_item.id}`], '000') }} --  -->
+                            <!-- {{ pallet_stored_item.isLoadingUndo }} -->
                             
                         </div>
                     </Teleport>
@@ -373,7 +417,12 @@ const generateLinkPalletLocation = (pallet: any) => {
                         </div>
                     </Collapse>
                     <div class="w-full mt-2">
-                        <Button v-if="!value.pallet_stored_items.every(val => {return val.selected_quantity > 0})" @click="() => set(proxyItem, ['is_open_collapsed'], !get(proxyItem, ['is_open_collapsed'], false))" type="dashed" full size="sm">
+                        <Button
+                            v-if="!value.pallet_stored_items.every(val => {return val.selected_quantity > 0})" @click="() => set(proxyItem, ['is_open_collapsed'], !get(proxyItem, ['is_open_collapsed'], false))"
+                            type="dashed"
+                            full
+                            size="sm"
+                        >
                             <div class="py-1 text-gray-500">
                                 <FontAwesomeIcon icon='fal fa-arrow-down' class="transition-all" :class="get(proxyItem, ['is_open_collapsed'], false) ? 'rotate-180' : ''" fixed-width aria-hidden='true' />
                                 {{ get(proxyItem, ['is_open_collapsed'], false) ? 'Close' : 'Open hidden pallets' }}
@@ -419,7 +468,7 @@ const generateLinkPalletLocation = (pallet: any) => {
         <template #cell(total_quantity_ordered)="{ item }">
             <div class="">
                 <Transition name="spin-to-right">
-                    <span :key="item.total_quantity_ordered">{{ item.total_quantity_ordered }}</span>
+                    <span :key="item.total_quantity_ordered">{{ locale.number(item.total_quantity_ordered) }}</span>
                 </Transition>
             </div>
         </template>
diff --git a/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue b/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue
index 589afd81f6..4565234d76 100644
--- a/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue
+++ b/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue
@@ -26,9 +26,9 @@ import Tag from "@/Components/Tag.vue"
 import { BoxStats, PDRNotes, PalletReturn, UploadPallet } from '@/types/Pallet'
 import BoxStatsPalletReturn from '@/Pages/Grp/Org/Fulfilment/Return/BoxStatsPalletReturn.vue'
 import UploadExcel from '@/Components/Upload/UploadExcel.vue'
-
+import ButtonWithLink from '@/Components/Elements/Buttons/ButtonWithLink.vue'
 import { trans } from "laravel-vue-i18n"
-import TableStoredItems from "@/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue"
+import TableStoredItemReturnStoredItems from "@/Components/Tables/Grp/Org/Fulfilment/TableStoredItemReturnStoredItems.vue"
 import { get } from "lodash"
 import PureInput from "@/Components/Pure/PureInput.vue"
 import PureMultiselect from "@/Components/Pure/PureMultiselect.vue"
@@ -88,9 +88,11 @@ const props = defineProps<{
 		name: string
 		code: string
 	}[]
+    stored_items_count?: number
 }>()
 
 const locale = inject('locale', aikuLocaleStructure)
+const xstored_items_count = ref(props.stored_items_count || 0)
 
 const currentTab = ref(props.tabs.current)
 const handleTabUpdate = (tabSlug: string) => useTabChange(tabSlug, currentTab)
@@ -108,7 +110,7 @@ const formAddPhysicalGood = useForm({ outer_id: '', quantity: 1, historic_asset_
 const component = computed(() => {
     const components: Component = {
         pallets: TablePalletReturnPallets,
-        stored_items: TableStoredItems,
+        stored_items: TableStoredItemReturnStoredItems,
         services: TableFulfilmentTransactions,
         physical_goods: TableFulfilmentTransactions,
         history: TableHistories,
@@ -441,6 +443,20 @@ const isModalUploadFileOpen = ref(false)
        
         </template>
 
+        <template #button-submit="{ action }">
+            <ButtonWithLink
+                :routeTarget="action.route"
+                :label="`${trans('Submit')} (${xstored_items_count})`"
+                :icon="action.icon"
+                :iconRight="action.iconRight"
+                :style="action.style"
+                :tooltip="xstored_items_count ? '' : action.tooltip"
+                :disabled="
+                    !xstored_items_count  // Need to improve
+                "   
+            />
+        </template>
+
         <template #other>
             <Button
                 v-if="currentTab === 'attachments'"
@@ -476,6 +492,7 @@ const isModalUploadFileOpen = ref(false)
         :route_checkmark="currentTab == 'pallets' ? routeStorePallet : route_check_stored_items" 
         :palletReturn="data?.data"
         :detachRoute="attachmentRoutes.detachRoute"
+        @isStoredItemAdded="(e: boolean) => (console.log(e), e ? xstored_items_count++ : xstored_items_count--)"
     >
         <template #button-empty-state-attachments="{ action }">
             <Button

From 01c66db706439d56e95023e4771300ca1c18efca Mon Sep 17 00:00:00 2001
From: Ganes556 <gustiganes@gmail.com>
Date: Wed, 19 Feb 2025 14:00:14 +0800
Subject: [PATCH 7/9] index payment link & currency code

---
 app/Actions/Accounting/Payment/UI/IndexPayments.php | 3 +++
 app/Http/Resources/Accounting/PaymentsResource.php  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/Actions/Accounting/Payment/UI/IndexPayments.php b/app/Actions/Accounting/Payment/UI/IndexPayments.php
index 0fb906a757..9da2394b77 100644
--- a/app/Actions/Accounting/Payment/UI/IndexPayments.php
+++ b/app/Actions/Accounting/Payment/UI/IndexPayments.php
@@ -78,6 +78,7 @@ public function handle(Group|Organisation|PaymentAccount|Shop|OrgPaymentServiceP
 
         $queryBuilder->leftjoin('organisations', 'payments.organisation_id', '=', 'organisations.id');
         $queryBuilder->leftjoin('shops', 'payments.shop_id', '=', 'shops.id');
+        $queryBuilder->leftJoin('currencies', 'payments.currency_id', 'currencies.id');
 
         if (!($parent instanceof Order || $parent instanceof Invoice)) {
             foreach ($this->getElementGroups($parent) as $key => $elementGroup) {
@@ -97,6 +98,7 @@ public function handle(Group|Organisation|PaymentAccount|Shop|OrgPaymentServiceP
                 'payments.reference',
                 'payments.status',
                 'payments.date',
+                'payments.slug',
                 'payments.amount',
                 'payment_accounts.slug as payment_accounts_slug',
                 'payment_service_providers.slug as payment_service_providers_slug',
@@ -104,6 +106,7 @@ public function handle(Group|Organisation|PaymentAccount|Shop|OrgPaymentServiceP
                 'shops.slug as shop_slug',
                 'organisations.name as organisation_name',
                 'organisations.slug as organisation_slug',
+                'currencies.code as currency_code',
             ])
             ->leftJoin('payment_accounts', 'payments.payment_account_id', 'payment_accounts.id')
             ->leftJoin('payment_service_providers', 'payment_accounts.payment_service_provider_id', 'payment_service_providers.id')
diff --git a/app/Http/Resources/Accounting/PaymentsResource.php b/app/Http/Resources/Accounting/PaymentsResource.php
index 5a3d6345e3..a148ee9c1f 100644
--- a/app/Http/Resources/Accounting/PaymentsResource.php
+++ b/app/Http/Resources/Accounting/PaymentsResource.php
@@ -36,6 +36,7 @@ public function toArray($request): array
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
             'amount'     => $this->amount,
+            'currency_code' => $this->currency_code,
             'organisation_name' => $this->organisation_name,
             'organisation_slug' => $this->organisation_slug,
             'shop_name'         => $this->shop_name,

From 48f75dea342edd8063ce04066e766757080812d2 Mon Sep 17 00:00:00 2001
From: Ganes556 <gustiganes@gmail.com>
Date: Wed, 19 Feb 2025 14:01:44 +0800
Subject: [PATCH 8/9] index payment link & currency code

---
 app/Actions/Accounting/Payment/UI/IndexPayments.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Actions/Accounting/Payment/UI/IndexPayments.php b/app/Actions/Accounting/Payment/UI/IndexPayments.php
index 9da2394b77..a8b4a8adf8 100644
--- a/app/Actions/Accounting/Payment/UI/IndexPayments.php
+++ b/app/Actions/Accounting/Payment/UI/IndexPayments.php
@@ -98,7 +98,6 @@ public function handle(Group|Organisation|PaymentAccount|Shop|OrgPaymentServiceP
                 'payments.reference',
                 'payments.status',
                 'payments.date',
-                'payments.slug',
                 'payments.amount',
                 'payment_accounts.slug as payment_accounts_slug',
                 'payment_service_providers.slug as payment_service_providers_slug',

From 9dd11050cf08fe0a33547a2b0444b2e0598798f5 Mon Sep 17 00:00:00 2001
From: Ganes556 <gustiganes@gmail.com>
Date: Wed, 19 Feb 2025 14:02:17 +0800
Subject: [PATCH 9/9] index payment link & currency code

---
 app/Http/Resources/Accounting/PaymentsResource.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Http/Resources/Accounting/PaymentsResource.php b/app/Http/Resources/Accounting/PaymentsResource.php
index a148ee9c1f..aaeb468a9f 100644
--- a/app/Http/Resources/Accounting/PaymentsResource.php
+++ b/app/Http/Resources/Accounting/PaymentsResource.php
@@ -36,6 +36,14 @@ public function toArray($request): array
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
             'amount'     => $this->amount,
+            'route' => [
+                'name' => 'grp.org.accounting.payment-accounts.show.payments.show',
+                'params' => [
+                    'organisation' => $this->organisation_slug,
+                    'account' => $this->payment_accounts_slug,
+                    'payment' => $this->id
+                ]
+            ],
             'currency_code' => $this->currency_code,
             'organisation_name' => $this->organisation_name,
             'organisation_slug' => $this->organisation_slug,