From 51f4e5315cba51476cf0209c30df136796c7ca11 Mon Sep 17 00:00:00 2001
From: Ganes556 <gustiganes@gmail.com>
Date: Thu, 20 Feb 2025 08:08:21 +0800
Subject: [PATCH 01/10] index dispatched email table

---
 .../Comms/DispatchedEmail/UI/IndexDispatchedEmails.php    | 4 ++--
 app/Actions/Comms/Outbox/UI/ShowOutbox.php                | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Actions/Comms/DispatchedEmail/UI/IndexDispatchedEmails.php b/app/Actions/Comms/DispatchedEmail/UI/IndexDispatchedEmails.php
index a99bb5a55c..bc4090cde9 100644
--- a/app/Actions/Comms/DispatchedEmail/UI/IndexDispatchedEmails.php
+++ b/app/Actions/Comms/DispatchedEmail/UI/IndexDispatchedEmails.php
@@ -38,7 +38,7 @@ public function handle(Group|Mailshot|Outbox|PostRoom|Organisation|Shop $parent,
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->orWhereWith('dispatched_emails.email_address', $value);
+                $query->orWhereWith('email_addresses.email', $value);
             });
         });
 
@@ -96,7 +96,7 @@ public function handle(Group|Mailshot|Outbox|PostRoom|Organisation|Shop $parent,
                     $query->where('dispatched_emails.group_id', $parent->id);
                 }
             })
-            ->allowedSorts(['dispatched_emails.state', 'sent_at' ,'dispatched_emails.number_reads', 'mask_as_spam' ,'dispatched_emails.number_clicks'])
+            ->allowedSorts(['email_address', 'sent_at' ,'number_reads', 'mask_as_spam' ,'number_clicks'])
             ->allowedFilters([$globalSearch])
             ->withPaginator($prefix, tableName: request()->route()->getName())
             ->withQueryString();
diff --git a/app/Actions/Comms/Outbox/UI/ShowOutbox.php b/app/Actions/Comms/Outbox/UI/ShowOutbox.php
index 9ba4c5d70a..5a33abb370 100644
--- a/app/Actions/Comms/Outbox/UI/ShowOutbox.php
+++ b/app/Actions/Comms/Outbox/UI/ShowOutbox.php
@@ -152,12 +152,12 @@ public function htmlResponse(Outbox $outbox, ActionRequest $request): Response
                     : Inertia::lazy(fn () => GetOutboxShowcase::run($outbox)),
 
                 OutboxTabsEnum::MAILSHOTS->value => $this->tab == OutboxTabsEnum::MAILSHOTS->value ?
-                    fn () => MailshotResource::collection(IndexMailshots::run($outbox))
-                    : Inertia::lazy(fn () => MailshotResource::collection(IndexMailshots::run($outbox))),
+                    fn () => MailshotResource::collection(IndexMailshots::run($outbox, OutboxTabsEnum::MAILSHOTS->value))
+                    : Inertia::lazy(fn () => MailshotResource::collection(IndexMailshots::run($outbox, OutboxTabsEnum::MAILSHOTS->value))),
 
                 OutboxTabsEnum::DISPATCHED_EMAILS->value => $this->tab == OutboxTabsEnum::DISPATCHED_EMAILS->value ?
-                    fn () => DispatchedEmailResource::collection(IndexDispatchedEmails::run($outbox))
-                    : Inertia::lazy(fn () => DispatchedEmailResource::collection(IndexDispatchedEmails::run($outbox))),
+                    fn () => DispatchedEmailResource::collection(IndexDispatchedEmails::run($outbox, OutboxTabsEnum::DISPATCHED_EMAILS->value))
+                    : Inertia::lazy(fn () => DispatchedEmailResource::collection(IndexDispatchedEmails::run($outbox, OutboxTabsEnum::DISPATCHED_EMAILS->value))),
 
                 // OutboxTabsEnum::EMAIL_BULK_RUNS->value => $this->tab == OutboxTabsEnum::EMAIL_BULK_RUNS->value ?
                 // fn () => EmailBulkRunsResource::collection(IndexEmailBulkRuns::run($outbox))

From a2a6b7626be49a8e2dae84eb138f382920c4f6d2 Mon Sep 17 00:00:00 2001
From: aqordeon <aqordivika@yahoo.co.id>
Date: Thu, 20 Feb 2025 08:30:36 +0800
Subject: [PATCH 02/10] fix: PR Pallet + Stored Item: submit button

---
 app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php   | 4 ++--
 .../Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php       | 2 +-
 .../Tables/Grp/Org/Fulfilment/TablePalletReturnPallets.vue    | 4 ++--
 resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php b/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
index 3dda3bbd37..ae412f3b8f 100644
--- a/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
+++ b/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
@@ -105,13 +105,13 @@ public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request)
             } else {
                 $tooltipSubmit = __('Submit');
             }
-
+            
             $buttonSubmit = [
                 'type'    => 'button',
                 'style'   => 'save',
                 'tooltip' => $tooltipSubmit,
                 'label'   => __('Submit') . ' (' . $palletReturn->stats->number_pallets . ')',
-                'key'     => 'submit',
+                'key'     => 'submit-pallet',
                 'route'   => [
                     'method'     => 'post',
                     'name'       => 'grp.models.fulfilment-customer.pallet-return.submit_and_confirm',
diff --git a/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php b/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php
index 669dd0d0cb..4aeb37e1b8 100644
--- a/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php
+++ b/app/Actions/Fulfilment/PalletReturn/UI/ShowStoredItemReturn.php
@@ -106,7 +106,7 @@ public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request)
             'style'   => 'save',
             'tooltip' => $tooltipSubmit,
             // 'label'   => __('Confirm') . ' (' . $palletReturn->storedItems()->count() . ')',
-            'key'     => 'submit',
+            'key'     => 'submit-stored-items',
             'route'   => [
                 'method'     => 'post',
                 'name'       => 'grp.models.fulfilment-customer.pallet-return.submit_and_confirm',
diff --git a/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletReturnPallets.vue b/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletReturnPallets.vue
index 13b9cf1e34..6031e938dd 100644
--- a/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletReturnPallets.vue
+++ b/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletReturnPallets.vue
@@ -140,9 +140,9 @@ const setUpChecked = () => {
 
 const debounceReloadBoxStats = debounce(() => {
     router.reload({
-        only: ['box_stats'],  // Only reload the props with dynamic name tabSlug (i.e props.showcase, props.menu)
+        only: ['pageHead', 'box_stats'],
     })
-}, 500)
+}, 700)
 
 const onCheckTable = async (item: {}) => {
     if (item.is_checked) {
diff --git a/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue b/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue
index 4565234d76..1d5db8d89c 100644
--- a/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue
+++ b/resources/js/Pages/Grp/Org/Fulfilment/PalletReturn.vue
@@ -443,7 +443,7 @@ const isModalUploadFileOpen = ref(false)
        
         </template>
 
-        <template #button-submit="{ action }">
+        <template #button-submit-stored-items="{ action }">
             <ButtonWithLink
                 :routeTarget="action.route"
                 :label="`${trans('Submit')} (${xstored_items_count})`"

From eeec06fd1d69a49fc1475668a0c0e4ecfbb5c4bd Mon Sep 17 00:00:00 2001
From: aqordeon <aqordivika@yahoo.co.id>
Date: Thu, 20 Feb 2025 09:13:57 +0800
Subject: [PATCH 03/10] fix: Pallet Delivery: no button 'set location'

---
 .../Pallet/UI/IndexPalletsInDelivery.php      |  2 +-
 .../js/Components/LocationFieldDelivery.vue   | 31 ++++++++++++++++---
 resources/js/Components/SelectQuery.vue       | 17 +++++++---
 .../Fulfilment/TablePalletDeliveryPallets.vue |  5 +++
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/app/Actions/Fulfilment/Pallet/UI/IndexPalletsInDelivery.php b/app/Actions/Fulfilment/Pallet/UI/IndexPalletsInDelivery.php
index a2bc0ff165..7f5b3a6f0a 100644
--- a/app/Actions/Fulfilment/Pallet/UI/IndexPalletsInDelivery.php
+++ b/app/Actions/Fulfilment/Pallet/UI/IndexPalletsInDelivery.php
@@ -72,7 +72,7 @@ public function handle(PalletDelivery $palletDelivery, $prefix = null): LengthAw
                 'pallets.pallet_delivery_id',
                 'pallets.pallet_return_id',
                 'locations.slug as location_slug',
-                'locations.slug as location_code',
+                'locations.code as location_code',
             );
 
 
diff --git a/resources/js/Components/LocationFieldDelivery.vue b/resources/js/Components/LocationFieldDelivery.vue
index c6393dc404..8260d3467d 100644
--- a/resources/js/Components/LocationFieldDelivery.vue
+++ b/resources/js/Components/LocationFieldDelivery.vue
@@ -26,6 +26,9 @@ library.add( faTrashAlt, faSignOutAlt, faPaperPlane, faInventory, faTruckLoading
 const props = defineProps<{
     pallet: Pallet
     locationRoute?: routeType
+    noButton?: boolean
+    noFetchOnMounted?: boolean
+    initOptions?: {}[]
 }>()
 
 const emits = defineEmits<{
@@ -48,7 +51,7 @@ const error = ref({})
 // }
 
 const isLoading = ref<string | boolean>(false)
-const onChangeLocation = (closeModal: Function) => {
+const onChangeLocation = (closeModal?: Function) => {
     router.patch(
         route(props.pallet['bookInRoute'].name, props.pallet['bookInRoute'].parameters),
         { location_id: location.data().location_id},
@@ -56,7 +59,9 @@ const onChangeLocation = (closeModal: Function) => {
             preserveScroll: true,
             onStart: () => { isLoading.value = true },
             onSuccess: () => {
-                closeModal()
+                if (closeModal) { 
+                    closeModal()
+                }
                 emits('renderTableKey')
                 error.value = {}
             },
@@ -76,9 +81,27 @@ const onChangeLocation = (closeModal: Function) => {
 </script>
 
 <template>
-    <div class="relative">
+    <div class="relative w-64">
     <!-- <pre>{{ pallet.state }}</pre> -->
-        <Popover >
+        <SelectQuery
+            v-if="props.noButton"
+            :urlRoute="route(locationRoute?.name, locationRoute?.parameters)"
+            :value="location"
+            :placeholder="'Select location'"
+            :required="true"
+            :trackBy="'code'"
+            :label="'code'"
+            :valueProp="'id'"
+            :closeOnSelect="true"
+            :clearOnSearch="false"
+            :fieldName="'location_id'"
+            @updateVModel="() => (onChangeLocation(), error.location_id = '')"
+            :loadingCaret="!!isLoading"
+            noFetchOnMounted
+            :initOptions="initOptions"
+        />
+
+        <Popover v-else >
             <template #button>
                 <!-- <Button :type="pallet.state == 'booked_in' ? 'primary' : 'tertiary'" :icon="['fal', 'inventory']"
                     tooltip="Set location for pallet" :key="pallet.index" :size="'xs'" /> -->
diff --git a/resources/js/Components/SelectQuery.vue b/resources/js/Components/SelectQuery.vue
index de488676a7..d7bfda64b6 100644
--- a/resources/js/Components/SelectQuery.vue
+++ b/resources/js/Components/SelectQuery.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import Multiselect from "@vueform/multiselect"
 
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted, inject } from 'vue'
 import axios from "axios"
 import { notify } from "@kyvg/vue3-notification"
 import Tag from '@/Components/Tag.vue'
@@ -13,6 +13,7 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { trans } from "laravel-vue-i18n"
 import LoadingIcon from "./Utils/LoadingIcon.vue"
 import LoadingText from "./Utils/LoadingText.vue"
+import { layoutStructure } from "@/Composables/useLayoutStructure"
 
 library.add(faChevronDown)
 
@@ -40,7 +41,9 @@ const props = withDefaults(defineProps<{
     isSelected?: Function
     loadingCaret?:boolean
     disabled?: boolean
+    noFetchOnMounted?: boolean
     prefixQuery?: string   // from filter[global] to stored_items_filter[global]
+    initOptions?: {}[]
 }>(), {
     required: false,
     placeholder: 'select',
@@ -68,8 +71,10 @@ const emits = defineEmits<{
     (e: 'filerOption', value : String): void
 }>()
 
+const layout = inject('layout', layoutStructure)
+
 let timeoutId: any
-const optionData = ref([])
+const optionData = ref(props.initOptions || [])
 const q = ref('')
 const page = ref(1)
 const loading = ref(false)
@@ -162,7 +167,11 @@ onMounted(() => {
     if (dropdown) {
         dropdown.addEventListener('scroll', onScrollMultiselect)
     }
-    getOptions()
+
+    if (props.noFetchOnMounted) {
+    } else {
+        getOptions()
+    }
 
 })
 
@@ -214,7 +223,7 @@ defineExpose({
         @change="((e)=>{props.onChange(e), getOptions()})"
         :closeOnDeselect="closeOnDeselect"
         :isSelected="isSelected"
-        :loading="loadingCaret"
+        :loading="loadingCaret || loading"
     >
         
         <template #tag="{ option, handleTagRemove, disabled }">
diff --git a/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletDeliveryPallets.vue b/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletDeliveryPallets.vue
index 8d29a7aa9d..0fc5a5cd97 100644
--- a/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletDeliveryPallets.vue
+++ b/resources/js/Components/Tables/Grp/Org/Fulfilment/TablePalletDeliveryPallets.vue
@@ -226,6 +226,7 @@ const onSavedError = (error: {}, pallet: { form: {} }) => {
 						:theme="item.id"
 						:label="`${item.reference}`"
 						v-tooltip="item.name"
+						stringToColor
 					>
 						<template #label>
 							<div class="whitespace-nowrap text-xs">
@@ -248,6 +249,7 @@ const onSavedError = (error: {}, pallet: { form: {} }) => {
 						:theme="item.id"
 						:label="`${item.reference}`"
 						v-tooltip="item.name"
+						stringToColor
 					>
 						<template #label>
 							<div class="whitespace-nowrap text-xs">
@@ -269,10 +271,13 @@ const onSavedError = (error: {}, pallet: { form: {} }) => {
 		<template #cell(location)="{ item: pallet }">
 			<div v-if="pallet.state == 'received' || pallet.state == 'booked_in' || pallet.state == 'booking_in'" class="flex gap-x-1 gap-y-2 items-center">
 				<LocationFieldDelivery
+					noButton
+					noFetchOnMounted
                     :key="pallet.state"
                     :pallet="pallet"
 					@renderTableKey="() => emits('renderTableKey')"
                     :locationRoute="locationRoute"
+					:initOptions="pallet.location_id ? [{ id: pallet.location_id, code: pallet.location_code }] : []"
                 />
 			</div>
             

From ff8d5b43348f8b3343a7d33798b24ca914f2fac3 Mon Sep 17 00:00:00 2001
From: Ganes556 <gustiganes@gmail.com>
Date: Thu, 20 Feb 2025 09:32:09 +0800
Subject: [PATCH 04/10] subnavigation in show invoice categories

---
 .../Accounting/Invoice/UI/IndexInvoices.php   | 47 +++++++++++++++++--
 .../Accounting/Invoice/UI/IndexRefunds.php    | 14 ++++--
 .../UI/IndexInvoiceCategories.php             |  2 +-
 .../UI/ShowInvoiceCategory.php                | 22 ++++++++-
 .../WithInvoiceCategorySubNavigation.php      | 14 ++++++
 .../Org/Accounting/TableInvoiceCategories.vue | 14 ++++--
 .../Grp/Org/Accounting/InvoiceCategory.vue    |  4 +-
 routes/grp/web/org/accounting.php             |  2 +
 8 files changed, 103 insertions(+), 16 deletions(-)

diff --git a/app/Actions/Accounting/Invoice/UI/IndexInvoices.php b/app/Actions/Accounting/Invoice/UI/IndexInvoices.php
index 682a2c0568..681139c80b 100644
--- a/app/Actions/Accounting/Invoice/UI/IndexInvoices.php
+++ b/app/Actions/Accounting/Invoice/UI/IndexInvoices.php
@@ -9,6 +9,8 @@
 namespace App\Actions\Accounting\Invoice\UI;
 
 use App\Actions\Accounting\Invoice\WithInvoicesSubNavigation;
+use App\Actions\Accounting\InvoiceCategory\UI\ShowInvoiceCategory;
+use App\Actions\Accounting\InvoiceCategory\WithInvoiceCategorySubNavigation;
 use App\Actions\CRM\Customer\UI\ShowCustomer;
 use App\Actions\CRM\Customer\UI\ShowCustomerClient;
 use App\Actions\CRM\Customer\UI\WithCustomerSubNavigation;
@@ -25,6 +27,7 @@
 use App\Http\Resources\Accounting\InvoicesResource;
 use App\InertiaTable\InertiaTable;
 use App\Models\Accounting\Invoice;
+use App\Models\Accounting\InvoiceCategory;
 use App\Models\Catalogue\Shop;
 use App\Models\CRM\Customer;
 use App\Models\CRM\WebUser;
@@ -48,11 +51,13 @@ class IndexInvoices extends OrgAction
     use WithFulfilmentCustomerSubNavigation;
     use WithCustomerSubNavigation;
     use WithInvoicesSubNavigation;
+    use WithInvoiceCategorySubNavigation;
 
-    private Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|Shop $parent;
+
+    private Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|InvoiceCategory|Shop $parent;
     private string $bucket = '';
 
-    public function handle(Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|Shop|Order $parent, $prefix = null): LengthAwarePaginator
+    public function handle(Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|InvoiceCategory|Shop|Order $parent, $prefix = null): LengthAwarePaginator
     {
 
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
@@ -93,6 +98,8 @@ public function handle(Group|Organisation|Fulfilment|Customer|CustomerClient|Ful
             $queryBuilder->where('invoices.order_id', $parent->id);
         } elseif ($parent instanceof Group) {
             $queryBuilder->where('invoices.group_id', $parent->id);
+        } elseif ($parent instanceof InvoiceCategory) {
+            $queryBuilder->where('invoices.invoice_category_id', $parent->id);
         } else {
             abort(422);
         }
@@ -142,7 +149,7 @@ public function handle(Group|Organisation|Fulfilment|Customer|CustomerClient|Ful
             ->withQueryString();
     }
 
-    public function tableStructure(Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|Shop|Order $parent, $prefix = null): Closure
+    public function tableStructure(Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|InvoiceCategory|Shop|Order $parent, $prefix = null): Closure
     {
         return function (InertiaTable $table) use ($prefix, $parent) {
             if ($prefix) {
@@ -163,6 +170,9 @@ public function tableStructure(Group|Organisation|Fulfilment|Customer|CustomerCl
             } elseif ($parent instanceof Group) {
                 $stats     = $parent->orderingStats;
                 $noResults = __("This group hasn't been invoiced");
+            } elseif ($parent instanceof InvoiceCategory) {
+                $stats     = $parent->stats;
+                $noResults = __("This invoice category hasn't been invoiced");
             } else {
                 $stats = $parent->salesStats;
             }
@@ -226,6 +236,8 @@ public function authorize(ActionRequest $request): bool
             );
         } elseif ($this->parent instanceof Group) {
             return $request->user()->authTo("group-overview");
+        } elseif ($this->parent instanceof InvoiceCategory) {
+            return $request->user()->authTo("accounting.{$this->organisation->id}.view");
         }
 
         return false;
@@ -252,6 +264,8 @@ public function htmlResponse(LengthAwarePaginator $invoices, ActionRequest $requ
             $subNavigation = $this->getFulfilmentCustomerSubNavigation($this->parent, $request);
         } elseif ($this->parent instanceof Shop || $this->parent instanceof Fulfilment || $this->parent instanceof Organisation) {
             $subNavigation = $this->getInvoicesNavigation($this->parent);
+        } elseif ($this->parent instanceof InvoiceCategory) {
+            $subNavigation = $this->getInvoiceCategoryNavigation($this->parent);
         }
 
 
@@ -274,7 +288,6 @@ public function htmlResponse(LengthAwarePaginator $invoices, ActionRequest $requ
                 'icon' => 'fal fa-file-invoice-dollar',
             ];
             $afterTitle = [
-
                 'label' => __('invoices')
             ];
         } elseif ($this->parent instanceof CustomerClient) {
@@ -299,6 +312,14 @@ public function htmlResponse(LengthAwarePaginator $invoices, ActionRequest $requ
                 'icon'  => ['fal', 'fa-user'],
                 'title' => __('customer')
             ];
+        } elseif ($this->parent instanceof InvoiceCategory) {
+            $iconRight  = null;
+            $model = __('Invoices');
+            $title      = $this->parent->name;
+            $icon       = [
+                'icon'  => ['fal', 'fa-file-invoice-dollar'],
+                'title' => __('invoice category')
+            ];
         }
 
         $routeName       = $request->route()->getName();
@@ -443,6 +464,14 @@ public function inGroup(ActionRequest $request): LengthAwarePaginator
         return $this->handle(group());
     }
 
+    public function inInvoiceCategory(Organisation $organisation, InvoiceCategory $invoiceCategory, ActionRequest $request): LengthAwarePaginator
+    {
+        $this->parent = $invoiceCategory;
+        $this->initialisation($invoiceCategory->organisation, $request)->withTab(InvoicesTabsEnum::values());
+
+        return $this->handle($invoiceCategory, InvoicesTabsEnum::INVOICES->value);
+    }
+
     /** @noinspection PhpUnusedParameterInspection */
     public function inFulfilmentCustomer(Organisation $organisation, Fulfilment $fulfilment, FulfilmentCustomer $fulfilmentCustomer, ActionRequest $request): LengthAwarePaginator
     {
@@ -616,6 +645,16 @@ public function getBreadcrumbs(string $routeName, array $routeParameters): array
                     ]
                 )
             ),
+            'grp.org.accounting.invoice-categories.show.invoices.index' =>
+            array_merge(
+                ShowInvoiceCategory::make()->getBreadcrumbs($this->parent, $routeName, $routeParameters),
+                $headCrumb(
+                    [
+                        'name'       => $routeName,
+                        'parameters' => $routeParameters
+                    ],
+                )
+            ),
 
             'grp.overview.ordering.invoices.index' =>
             array_merge(
diff --git a/app/Actions/Accounting/Invoice/UI/IndexRefunds.php b/app/Actions/Accounting/Invoice/UI/IndexRefunds.php
index 1f97057595..40e41e30c2 100644
--- a/app/Actions/Accounting/Invoice/UI/IndexRefunds.php
+++ b/app/Actions/Accounting/Invoice/UI/IndexRefunds.php
@@ -23,6 +23,7 @@
 use App\Http\Resources\Accounting\InvoicesResource;
 use App\InertiaTable\InertiaTable;
 use App\Models\Accounting\Invoice;
+use App\Models\Accounting\InvoiceCategory;
 use App\Models\Catalogue\Shop;
 use App\Models\CRM\Customer;
 use App\Models\Dropshipping\CustomerClient;
@@ -46,10 +47,10 @@ class IndexRefunds extends OrgAction
     use WithCustomerSubNavigation;
     use WithInvoicesSubNavigation;
 
-    private Invoice|Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|Shop $parent;
+    private Invoice|Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|InvoiceCategory|Shop $parent;
     private string $bucket;
 
-    public function handle(Invoice|Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|Shop|Order $parent, $prefix = null): LengthAwarePaginator
+    public function handle(Invoice|Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|InvoiceCategory|Shop|Order $parent, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
@@ -84,6 +85,8 @@ public function handle(Invoice|Group|Organisation|Fulfilment|Customer|CustomerCl
             $queryBuilder->where('invoices.group_id', $parent->id);
         } elseif ($parent instanceof Invoice) {
             $queryBuilder->where('invoices.invoice_id', $parent->id);
+        } elseif ($parent instanceof InvoiceCategory) {
+            $queryBuilder->where('invoices.invoice_category_id', $parent->id);
         } else {
             abort(422);
         }
@@ -133,7 +136,7 @@ public function handle(Invoice|Group|Organisation|Fulfilment|Customer|CustomerCl
             ->withQueryString();
     }
 
-    public function tableStructure(Invoice|Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|Shop|Order $parent, $prefix = null): Closure
+    public function tableStructure(Invoice|Group|Organisation|Fulfilment|Customer|CustomerClient|FulfilmentCustomer|InvoiceCategory|Shop|Order $parent, $prefix = null): Closure
     {
         return function (InertiaTable $table) use ($prefix, $parent) {
             if ($prefix) {
@@ -156,6 +159,9 @@ public function tableStructure(Invoice|Group|Organisation|Fulfilment|Customer|Cu
             } elseif ($parent instanceof Group) {
                 $stats     = $parent->orderingStats;
                 $noResults = __("This group hasn't been invoiced");
+            } elseif ($parent instanceof InvoiceCategory) {
+                $stats     = $parent->stats;
+                $noResults = __("This invoice category hasn't been invoiced");
             } else {
                 $stats = $parent->salesStats;
             }
@@ -220,6 +226,8 @@ public function authorize(ActionRequest $request): bool
             return $request->user()->authTo("fulfilment-shop.{$this->fulfilment->id}.view");
         } elseif ($this->parent instanceof Group) {
             return $request->user()->authTo("group-overview");
+        } elseif ($this->parent instanceof InvoiceCategory) {
+            return $request->user()->authTo("accounting.{$this->organisation->id}.view");
         }
 
         return false;
diff --git a/app/Actions/Accounting/InvoiceCategory/UI/IndexInvoiceCategories.php b/app/Actions/Accounting/InvoiceCategory/UI/IndexInvoiceCategories.php
index 582b9ad403..eac861cce4 100644
--- a/app/Actions/Accounting/InvoiceCategory/UI/IndexInvoiceCategories.php
+++ b/app/Actions/Accounting/InvoiceCategory/UI/IndexInvoiceCategories.php
@@ -55,7 +55,7 @@ public function handle(Organisation $parent, $prefix = null): LengthAwarePaginat
                 'invoice_category_stats.number_invoices_type_invoice as number_type_invoices',
                 'invoice_category_stats.number_invoices_type_refund as number_type_refunds',
             ])
-            ->allowedSorts(['name', 'state', 'number_type_invoices', 'amount', 'number_type_refunds'])
+            ->allowedSorts(['name', 'id' ,'state', 'number_type_invoices', 'amount', 'number_type_refunds'])
             ->allowedFilters([$globalSearch])
             ->withPaginator($prefix, tableName: request()->route()->getName())
             ->withQueryString();
diff --git a/app/Actions/Accounting/InvoiceCategory/UI/ShowInvoiceCategory.php b/app/Actions/Accounting/InvoiceCategory/UI/ShowInvoiceCategory.php
index e0d9d5fa82..eadfe9b021 100644
--- a/app/Actions/Accounting/InvoiceCategory/UI/ShowInvoiceCategory.php
+++ b/app/Actions/Accounting/InvoiceCategory/UI/ShowInvoiceCategory.php
@@ -65,7 +65,7 @@ public function htmlResponse(InvoiceCategory $invoiceCategory, ActionRequest $re
                     'subNavigation' => $this->getInvoiceCategoryNavigation($invoiceCategory),
                     'model'     => __('Invoice Category'),
                     'icon'      => [
-                        'icon'  => ['fal', 'fa-money-check-alt'],
+                        'icon'  => ['fal', 'fa-sitemap'],
                         'title' => __('invoice category')
                     ],
                     'title'     => $invoiceCategory->name,
@@ -144,6 +144,26 @@ public function getBreadcrumbs(InvoiceCategory $invoiceCategory, string $routeNa
                     $suffix
                 ),
             ),
+            'grp.org.accounting.invoice-categories.show.invoices.index' => array_merge(
+                ShowAccountingDashboard::make()->getBreadcrumbs(
+                    'grp.org.accounting.dashboard',
+                    Arr::only($routeParameters, ['organisation'])
+                ),
+                $headCrumb(
+                    $invoiceCategory,
+                    [
+                        'index' => [
+                            'name'       => 'grp.org.accounting.invoice-categories.index',
+                            'parameters' => Arr::only($routeParameters, ['organisation'])
+                        ],
+                        'model' => [
+                            'name'       => 'grp.org.accounting.invoice-categories.show',
+                            'parameters' => Arr::only($routeParameters, ['organisation', 'invoiceCategory'])
+                        ]
+                    ],
+                    $suffix
+                ),
+            ),
             default => []
         };
     }
diff --git a/app/Actions/Accounting/InvoiceCategory/WithInvoiceCategorySubNavigation.php b/app/Actions/Accounting/InvoiceCategory/WithInvoiceCategorySubNavigation.php
index 2093de2587..bfb1d9d7b3 100644
--- a/app/Actions/Accounting/InvoiceCategory/WithInvoiceCategorySubNavigation.php
+++ b/app/Actions/Accounting/InvoiceCategory/WithInvoiceCategorySubNavigation.php
@@ -27,6 +27,20 @@ protected function getInvoiceCategoryNavigation(InvoiceCategory $invoiceCategory
                     ],
                 ],
             ],
+            [
+                "label"    => __('Invoices'),
+                "route"     => [
+                    "name"       => 'grp.org.accounting.invoice-categories.show.invoices.index',
+                    "parameters" => [
+                        'organisation' => $invoiceCategory->organisation->slug,
+                        'invoiceCategory' => $invoiceCategory->slug
+                    ],
+                ],
+                'leftIcon' => [
+                    'icon'    => ['fal', 'fa-file-invoice-dollar'],
+                    'tooltip' => __('Invoices')
+                ]
+            ],
 
             // [
             //     "number"   => $numberUnpaid,
diff --git a/resources/js/Components/Tables/Grp/Org/Accounting/TableInvoiceCategories.vue b/resources/js/Components/Tables/Grp/Org/Accounting/TableInvoiceCategories.vue
index 8880ecef1c..55f4b70bf5 100644
--- a/resources/js/Components/Tables/Grp/Org/Accounting/TableInvoiceCategories.vue
+++ b/resources/js/Components/Tables/Grp/Org/Accounting/TableInvoiceCategories.vue
@@ -37,8 +37,8 @@ function invoiceRoute(invoiceCategory: {}) {
     switch (route().current()) {
         case "grp.org.accounting.invoice-categories.index":
             return route(
-                "grp.org.accounting.invoices.index",
-                [route().params["organisation"]])
+                "grp.org.accounting.invoice-categories.show.invoices.index",
+                [route().params["organisation"],invoiceCategory.slug])
         default:
             return ''
     }
@@ -47,9 +47,13 @@ function invoiceRoute(invoiceCategory: {}) {
 function refundRoute(invoiceCategory: {}) {
     switch (route().current()) {
         case "grp.org.accounting.invoice-categories.index":
-            return route(
-                "grp.org.accounting.refunds.index",
-                [route().params["organisation"]])
+        return route(
+                "grp.org.accounting.invoice-categories.show.invoices.index",
+                {
+                    "organisation": route().params["organisation"],
+                    "invoiceCategory": invoiceCategory.slug,
+                    'tab': 'refunds'
+                })
         default:
             return ''
     }
diff --git a/resources/js/Pages/Grp/Org/Accounting/InvoiceCategory.vue b/resources/js/Pages/Grp/Org/Accounting/InvoiceCategory.vue
index daed6f0627..fbbcdf4bf1 100644
--- a/resources/js/Pages/Grp/Org/Accounting/InvoiceCategory.vue
+++ b/resources/js/Pages/Grp/Org/Accounting/InvoiceCategory.vue
@@ -7,7 +7,7 @@
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faChartLine, faCoins, faInfoCircle, faMoneyCheckAlt } from '@fal'
+import { faChartLine, faCoins, faInfoCircle, faSitemap } from '@fal'
 
 import PageHeading from '@/Components/Headings/PageHeading.vue'
 import { computed, defineAsyncComponent, ref } from "vue"
@@ -22,7 +22,7 @@ import PaymentAccountOverview from "@/Components/Tables/Grp/Org/Accounting/Payme
 import PaymentAccountStats from "@/Components/Tables/Grp/Org/Accounting/PaymentAccountStats.vue"
 import Dashboard from '@/Components/DataDisplay/Dashboard/Dashboard.vue'
 
-library.add(faCoins, faChartLine, faInfoCircle, faMoneyCheckAlt)
+library.add(faCoins, faChartLine, faInfoCircle, faSitemap)
 
 const ModelChangelog = defineAsyncComponent(() => import('@/Components/ModelChangelog.vue'))
 
diff --git a/routes/grp/web/org/accounting.php b/routes/grp/web/org/accounting.php
index 5bb2c84f91..ddbd84e225 100644
--- a/routes/grp/web/org/accounting.php
+++ b/routes/grp/web/org/accounting.php
@@ -93,6 +93,8 @@
 Route::get('/invoice-categories', IndexInvoiceCategories::class)->name('invoice-categories.index');
 Route::get('/invoice-categories/create', CreateInvoiceCategory::class)->name('invoice-categories.create');
 Route::get('/invoice-categories/{invoiceCategory}', ShowInvoiceCategory::class)->name('invoice-categories.show');
+Route::get('/invoice-categories/{invoiceCategory}/invoices', [IndexInvoices::class, 'inInvoiceCategory'])->name('invoice-categories.show.invoices.index');
+
 Route::get('/invoice-categories/{invoiceCategory}/edit', EditInvoiceCategory::class)->name('invoice-categories.edit');
 
 

From 3e8b0500f42fbc3507a87adadb1240c33f2092e2 Mon Sep 17 00:00:00 2001
From: KirinZero0 <aryapermana02@gmail.com>
Date: Thu, 20 Feb 2025 09:33:54 +0800
Subject: [PATCH 05/10] Index Pallets in return fix

---
 .../IndexPalletsInReturnPalletWholePallets.php             | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Actions/Fulfilment/PalletReturn/IndexPalletsInReturnPalletWholePallets.php b/app/Actions/Fulfilment/PalletReturn/IndexPalletsInReturnPalletWholePallets.php
index abe0f38717..6c23a25d8e 100644
--- a/app/Actions/Fulfilment/PalletReturn/IndexPalletsInReturnPalletWholePallets.php
+++ b/app/Actions/Fulfilment/PalletReturn/IndexPalletsInReturnPalletWholePallets.php
@@ -72,7 +72,12 @@ public function handle(PalletReturn $palletReturn, $prefix = null): LengthAwareP
         });
 
         if ($palletReturn->state !== PalletReturnStateEnum::DISPATCHED) {
-            $query->where('pallets.status', '!=', PalletStatusEnum::RETURNED);
+            $query->whereNotIn('pallets.status', [
+                PalletStatusEnum::RETURNED,
+                PalletStatusEnum::IN_PROCESS,
+                PalletStatusEnum::RECEIVING,
+                PalletStatusEnum::NOT_RECEIVED
+            ]);
         } elseif ($palletReturn->state === PalletReturnStateEnum::IN_PROCESS) {
             $query->where('pallets.status', PalletStatusEnum::STORING);
         }

From 452f4cd0145370826c75bff654aa782de6726e3f Mon Sep 17 00:00:00 2001
From: dandiAW <dandiferrari75@gmail.com>
Date: Thu, 20 Feb 2025 10:14:54 +0800
Subject: [PATCH 06/10] fix style confirm approve

---
 .../Utils/ModalApproveConfirmation.vue        | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/resources/js/Components/Utils/ModalApproveConfirmation.vue b/resources/js/Components/Utils/ModalApproveConfirmation.vue
index ff4fff8ad9..53b3c59614 100644
--- a/resources/js/Components/Utils/ModalApproveConfirmation.vue
+++ b/resources/js/Components/Utils/ModalApproveConfirmation.vue
@@ -40,12 +40,13 @@ function directCustomer(customer: any) {
 </script>
 
 <template>
-	<Modal :isOpen="model" @onClose="closeModal" :closeButton="true" width="w-[500px]">
-		<div class="flex flex-col items-center p-8 space-y-6">
+	<Modal :isOpen="model" @onClose="closeModal" :closeButton="true" width="w-[400px]">
+		<!-- Main Content -->
+		<div class="flex flex-col items-center p-4 space-y-4">
 			<!-- Header with icon and title -->
-			<div class="flex flex-col items-center space-y-2">
+			<div class="flex flex-col items-center space-y-1">
 				<svg
-					class="h-12 w-12 text-green-500"
+					class="h-10 w-10 text-green-500"
 					fill="none"
 					stroke="currentColor"
 					viewBox="0 0 24 24">
@@ -55,27 +56,29 @@ function directCustomer(customer: any) {
 						stroke-width="2"
 						d="M5 13l4 4L19 7" />
 				</svg>
-				<h2 class="text-2xl font-bold text-gray-800">Customer Approved!</h2>
+				<h2 class="text-xl font-bold text-gray-800">Customer Approved!</h2>
 			</div>
 			<!-- Informational message -->
-			<p class="text-center text-gray-600">
-				The customer has been approved successfully. You can now proceed to view their
-				details.
+			<p class="text-center text-gray-600 text-sm">
+				The customer has been approved. You can now view their details.
 			</p>
-			<!-- Action button -->
+			<!-- Centered button for viewing customer details -->
 			<div class="w-full flex justify-center">
 				<Link
 					:href="directCustomer(props.approvedCustomer)"
-					class="w-full md:w-auto px-2 py-3  text-black font-semibold rounded-full text-centertransition">
-					Go to Customer
+					class="w-full md:w-auto px-4 py-2 bg-blue-600 hover:bg-blue-700 text-white font-medium rounded-full text-center transition shadow-sm">
+					View Details
+
 				</Link>
 			</div>
-            <div class="w-full flex justify-end">
-                <button @click="closeModal"
-                        class="w-full md:w-auto px-6 py-3 bg-gray-300 text-gray-800 font-semibold rounded-full text-center hover:bg-gray-400 transition">
-                Continue Approve
-                </button>
-            </div>
+		</div>
+		<!-- Footer with continue button -->
+		<div class="px-4 py-3 border-t border-gray-200 flex justify-end">
+			<Button
+				@click="closeModal"
+				class="px-4 py-2 bg-gray-300 hover:bg-gray-400 text-gray-800 font-medium rounded-full text-center transition shadow-xs">
+				Continue Approve
+			</Button>
 		</div>
 	</Modal>
 </template>

From 63e90b382565e3ee7df19a8f8150b659f3e3d7f5 Mon Sep 17 00:00:00 2001
From: KirinZero0 <aryapermana02@gmail.com>
Date: Thu, 20 Feb 2025 10:26:42 +0800
Subject: [PATCH 07/10] Import Supplier Product (working)

---
 .../SupplyChain/SupplierProductImport.php     | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/app/Imports/SupplyChain/SupplierProductImport.php b/app/Imports/SupplyChain/SupplierProductImport.php
index 7be5998ba1..82efdacf7a 100644
--- a/app/Imports/SupplyChain/SupplierProductImport.php
+++ b/app/Imports/SupplyChain/SupplierProductImport.php
@@ -10,6 +10,7 @@
 namespace App\Imports\SupplyChain;
 
 use App\Actions\SupplyChain\SupplierProduct\StoreSupplierProduct;
+use App\Actions\SupplyChain\SupplierProduct\UpdateSupplierProduct;
 use App\Imports\WithImport;
 use App\Models\Helpers\Upload;
 use App\Models\SupplyChain\Supplier;
@@ -35,33 +36,44 @@ public function __construct(Supplier $supplier, Upload $upload)
     public function storeModel($row, $uploadRecord): void
     {
         $sanitizedData = $this->processExcelData([$row]);
-        $fields =
-            array_merge(
-                array_keys(
-                    $this->rules()
-                )
-            );
-
-        if ($sanitizedData['availability'] == 'Available') {
+        $validatedData = array_intersect_key($sanitizedData, array_flip(array_keys($this->rules())));
+
+        if ($validatedData['availability'] == 'Available') {
             $availability = true;
         } else {
             $availability = false;
         }
 
         $modelData = [
-            'code' => $sanitizedData['suppliers_product_code'],
-            'name' => $sanitizedData['suppliers_unit_description'],
+            'code' => $validatedData['suppliers_product_code'],
+            'name' => $validatedData['suppliers_unit_description'],
             'is_available' => $availability,
-            'cost' => $sanitizedData['unit_cost'],
-            'units_per_pack' => $sanitizedData['units_per_sko'],
-            'units_per_carton' => $sanitizedData['skos_per_carton'],
-            'cbm' => $sanitizedData['carton_cbm'],
+            'cost' => $validatedData['unit_cost'],
+            'units_per_pack' => $validatedData['units_per_sko'],
+            'units_per_carton' => $validatedData['skos_per_carton'],
+            'cbm' => $validatedData['carton_cbm'],
         ];
+
         try {
-            StoreSupplierProduct::run(
-                $this->scope,
-                $modelData
-            );
+            $partKey = $validatedData['id_supplier_part_key'];
+            $existingProduct = null;
+            if (is_numeric($partKey)) {
+                $partKey = (int) $partKey;
+                $existingProduct = $this->scope->supplierProducts()
+                ->where('id', $partKey)
+                ->first();
+            }
+
+            $isNew = is_string($validatedData['id_supplier_part_key']) 
+                && strtolower($validatedData['id_supplier_part_key']) === 'new';
+
+            if ($existingProduct) {
+                UpdateSupplierProduct::run($existingProduct, $modelData);
+            } elseif ($isNew) {
+                StoreSupplierProduct::run($this->scope, $modelData);
+            } else {
+                throw new Exception("Part key not found");
+            }
 
             $this->setRecordAsCompleted($uploadRecord);
         } catch (Exception $e) {

From 31aab52b3c648cf0e70bba9e4c037be9b0e0b0bd Mon Sep 17 00:00:00 2001
From: Artha <manager.arthachan@gmail.com>
Date: Thu, 20 Feb 2025 10:57:17 +0800
Subject: [PATCH 08/10] fix: sns notification

---
 app/Actions/Comms/Notifications/GetSnsNotification.php      | 5 +++--
 app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php | 2 +-
 routes/grp/webhooks/webhooks.php                            | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Actions/Comms/Notifications/GetSnsNotification.php b/app/Actions/Comms/Notifications/GetSnsNotification.php
index f6ae20619f..c8b67ee5b3 100644
--- a/app/Actions/Comms/Notifications/GetSnsNotification.php
+++ b/app/Actions/Comms/Notifications/GetSnsNotification.php
@@ -13,15 +13,16 @@
 use Aws\Sns\Message;
 use Aws\Sns\MessageValidator;
 use Illuminate\Support\Arr;
+use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class GetSnsNotification
 {
     use AsAction;
 
-    public function asController(): string
+    public function asController(ActionRequest $request): string
     {
-        $message   = Message::fromRawPostData();
+        $message   = new Message($request->all());
         $validator = new MessageValidator();
 
         if ($validator->isValid($message)) {
diff --git a/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php b/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
index ae412f3b8f..22c1c89ee0 100644
--- a/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
+++ b/app/Actions/Fulfilment/PalletReturn/UI/ShowPalletReturn.php
@@ -105,7 +105,7 @@ public function htmlResponse(PalletReturn $palletReturn, ActionRequest $request)
             } else {
                 $tooltipSubmit = __('Submit');
             }
-            
+
             $buttonSubmit = [
                 'type'    => 'button',
                 'style'   => 'save',
diff --git a/routes/grp/webhooks/webhooks.php b/routes/grp/webhooks/webhooks.php
index f66e7a4e2c..ddbdc41949 100644
--- a/routes/grp/webhooks/webhooks.php
+++ b/routes/grp/webhooks/webhooks.php
@@ -15,7 +15,7 @@
 use App\Actions\Dropshipping\Shopify\Webhook\ShopRedactWebhookShopify;
 
 Route::name('webhooks.')->group(function () {
-    Route::any('sns', GetSnsNotification::class)->name('sns');
+    Route::post('sns', GetSnsNotification::class)->name('sns');
 });
 
 Route::prefix('shopify-user/{shopifyUser:id}')->name('webhooks.shopify.')->group(function () {

From d01792281538f4ec15fcdd6aa856c044d7627450 Mon Sep 17 00:00:00 2001
From: Artha <manager.arthachan@gmail.com>
Date: Thu, 20 Feb 2025 11:15:59 +0800
Subject: [PATCH 09/10] fix: get sns email

---
 .../Notifications/GetSnsNotification.php      |  2 +-
 .../ProcessSesNotification.php                | 38 +++++++++++--------
 .../SupplyChain/SupplierProductImport.php     |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/Actions/Comms/Notifications/GetSnsNotification.php b/app/Actions/Comms/Notifications/GetSnsNotification.php
index c8b67ee5b3..1d8108ebb2 100644
--- a/app/Actions/Comms/Notifications/GetSnsNotification.php
+++ b/app/Actions/Comms/Notifications/GetSnsNotification.php
@@ -45,7 +45,7 @@ public function asController(ActionRequest $request): string
                         ]
                     );
 
-                    ProcessSesNotification::dispatch($sesNotification);
+                    // ProcessSesNotification::dispatch($sesNotification);
 
                 }
             }
diff --git a/app/Actions/Comms/SesNotification/ProcessSesNotification.php b/app/Actions/Comms/SesNotification/ProcessSesNotification.php
index 3f563f6a43..5c40ca6fe7 100644
--- a/app/Actions/Comms/SesNotification/ProcessSesNotification.php
+++ b/app/Actions/Comms/SesNotification/ProcessSesNotification.php
@@ -9,6 +9,7 @@
 namespace App\Actions\Comms\SesNotification;
 
 use App\Actions\Comms\DispatchedEmail\UpdateDispatchedEmail;
+use App\Actions\Comms\EmailTrackingEvent\StoreEmailTrackingEvent;
 use App\Actions\CRM\Prospect\UpdateProspectEmailClicked;
 use App\Actions\CRM\Prospect\UpdateProspectEmailHardBounced;
 use App\Actions\CRM\Prospect\UpdateProspectEmailOpened;
@@ -161,22 +162,27 @@ public function handle(SesNotification $sesNotification): ?array
 
                 break;
             case 'Click':
-                $type = DispatchedEmailEventTypeEnum::CLICK;
-                $date = Arr::get($sesNotification->data, 'click.timestamp');
-                $data = Arr::only($sesNotification->data['click'], ['ipAddress', 'userAgent', 'link', 'linkTags']);
-
-                if ($dispatchedEmail->recipient_type == 'Prospect') {
-                    UpdateProspectEmailClicked::run($dispatchedEmail->recipient, new Carbon($date));
-                }
-
-                UpdateDispatchedEmail::run(
-                    $dispatchedEmail,
-                    [
-                        'state'      => DispatchedEmailStateEnum::CLICKED,
-                        'date'       => $date,
-                        'is_clicked' => true
-                    ]
-                );
+                StoreEmailTrackingEvent::make()->action($dispatchedEmail, [
+                    'provider_reference' => $sesNotification->message_id
+                ]);
+                /*       $type = DispatchedEmailEventTypeEnum::CLICK;
+                       $date = Arr::get($sesNotification->data, 'click.timestamp');
+                       $data = Arr::only($sesNotification->data['click'], ['ipAddress', 'userAgent', 'link', 'linkTags']);
+
+                       if ($dispatchedEmail->recipient_type == 'Prospect') {
+                           UpdateProspectEmailClicked::run($dispatchedEmail->recipient, new Carbon($date));
+                       }*/
+
+                // Create storetracking event and call hydrators
+
+                /*         UpdateDispatchedEmail::run(
+                             $dispatchedEmail,
+                             [
+                                 'state'      => DispatchedEmailStateEnum::CLICKED,
+                                 'date'       => $date,
+                                 'is_clicked' => true
+                             ]
+                         );*/
 
                 break;
 
diff --git a/app/Imports/SupplyChain/SupplierProductImport.php b/app/Imports/SupplyChain/SupplierProductImport.php
index 82efdacf7a..397d5a742a 100644
--- a/app/Imports/SupplyChain/SupplierProductImport.php
+++ b/app/Imports/SupplyChain/SupplierProductImport.php
@@ -64,7 +64,7 @@ public function storeModel($row, $uploadRecord): void
                 ->first();
             }
 
-            $isNew = is_string($validatedData['id_supplier_part_key']) 
+            $isNew = is_string($validatedData['id_supplier_part_key'])
                 && strtolower($validatedData['id_supplier_part_key']) === 'new';
 
             if ($existingProduct) {

From 8c9addd148792f8df6de2b8143274b99871554a0 Mon Sep 17 00:00:00 2001
From: Artha <manager.arthachan@gmail.com>
Date: Thu, 20 Feb 2025 11:18:03 +0800
Subject: [PATCH 10/10] delete: soft delete ses notuification

---
 app/Models/Comms/SesNotification.php          |  3 --
 ...oft_deletes_to_ses_notifications_table.php | 31 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 database/migrations/2025_02_20_031703_delete_soft_deletes_to_ses_notifications_table.php

diff --git a/app/Models/Comms/SesNotification.php b/app/Models/Comms/SesNotification.php
index 378814b710..9d966c53da 100644
--- a/app/Models/Comms/SesNotification.php
+++ b/app/Models/Comms/SesNotification.php
@@ -9,7 +9,6 @@
 namespace App\Models\Comms;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * App\Models\Comms\SesNotification
@@ -30,8 +29,6 @@
  */
 class SesNotification extends Model
 {
-    use SoftDeletes;
-
     protected $casts = [
         'data' => 'array',
     ];
diff --git a/database/migrations/2025_02_20_031703_delete_soft_deletes_to_ses_notifications_table.php b/database/migrations/2025_02_20_031703_delete_soft_deletes_to_ses_notifications_table.php
new file mode 100644
index 0000000000..d0fea27670
--- /dev/null
+++ b/database/migrations/2025_02_20_031703_delete_soft_deletes_to_ses_notifications_table.php
@@ -0,0 +1,31 @@
+<?php
+
+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()
+    {
+        Schema::table('ses_notifications', function (Blueprint $table) {
+            $table->dropColumn(['deleted_at']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('ses_notifications', function (Blueprint $table) {
+            //
+        });
+    }
+};