Order Handling in Dashboard

app/Actions/Accounting/InvoiceCategory/IndexInvoiceCategoriesSalesTable.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * Author: Raul Perusquia <raul@inikoo.com>
+ * Created: Sun, 16 Mar 2025 21:12:40 Malaysia Time, Kuala Lumpur, Malaysia
+ * Copyright (c) 2025, Raul A Perusquia Flores
+ */
+
+namespace App\Actions\Accounting\InvoiceCategory;
+
+use App\Actions\OrgAction;
+use App\Http\Resources\Dashboards\DashboardInvoiceCategoriesSalesResource;
+use App\Models\Accounting\InvoiceCategory;
+use App\Models\SysAdmin\Group;
+use App\Models\SysAdmin\Organisation;
+use App\Services\QueryBuilder;
+
+class IndexInvoiceCategoriesSalesTable extends OrgAction
+{
+    public function handle(Group|Organisation $parent)
+    {
+        $queryBuilder = QueryBuilder::for(InvoiceCategory::class);
+        if (class_basename($parent) == 'Organisation') {
+            $queryBuilder->where('organisation_id', $parent->id);
+        } else {
+            $queryBuilder->where('group_id', $parent->id);
+        }
+
+
+        return $queryBuilder
+            ->defaultSort('invoice_categories.name')
+            ->select(['id', 'name', 'slug', 'state', 'invoice_categories.currency_id', 'invoice_categories.organisation_id'])
+            ->allowedSorts(['name', 'state'])
+            ->withPaginator(null)
+            ->withQueryString();
+    }
+
+
+    public function action(Group|Organisation $parent): array
+    {
+        if ($parent instanceof Group) {
+            $this->initialisationFromGroup($parent, []);
+        } else {
+            $this->initialisation($parent, []);
+        }
+        $shops = $this->handle($parent);
+
+        return json_decode(DashboardInvoiceCategoriesSalesResource::collection($shops)->toJson(), true);
+    }
+
+}

app/Actions/CRM/Customer/StoreCustomer.php

@@ -11,14 +11,17 @@
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateCrmStats;
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateCustomerInvoices;
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateCustomers;
+use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateRegistrationIntervals;
 use App\Actions\CRM\Customer\Search\CustomerRecordSearch;
 use App\Actions\Fulfilment\FulfilmentCustomer\StoreFulfilmentCustomerFromCustomer;
 use App\Actions\Helpers\Address\ParseCountryID;
 use App\Actions\Helpers\SerialReference\GetSerialReference;
 use App\Actions\Helpers\TaxNumber\StoreTaxNumber;
 use App\Actions\OrgAction;
 use App\Actions\SysAdmin\Group\Hydrators\GroupHydrateCustomers;
+use App\Actions\SysAdmin\Group\Hydrators\GroupHydrateRegistrationIntervals;
 use App\Actions\SysAdmin\Organisation\Hydrators\OrganisationHydrateCustomers;
+use App\Actions\SysAdmin\Organisation\Hydrators\OrganisationHydrateRegistrationIntervals;
 use App\Actions\Traits\Rules\WithNoStrictRules;
 use App\Actions\Traits\WithModelAddressActions;
 use App\Enums\Catalogue\Shop\ShopTypeEnum;
@@ -144,9 +147,12 @@ public function handle(Shop $shop, array $modelData): Customer
 
         ShopHydrateCrmStats::dispatch($customer->shop)->delay($this->hydratorsDelay);
         ShopHydrateCustomers::dispatch($customer->shop)->delay($this->hydratorsDelay);
+        ShopHydrateRegistrationIntervals::dispatch($customer->shop)->delay($this->hydratorsDelay);
         ShopHydrateCustomerInvoices::dispatch($customer->shop)->delay($this->hydratorsDelay);
         GroupHydrateCustomers::dispatch($customer->group)->delay($this->hydratorsDelay);
+        GroupHydrateRegistrationIntervals::dispatch($customer->group)->delay($this->hydratorsDelay);
         OrganisationHydrateCustomers::dispatch($customer->organisation)->delay($this->hydratorsDelay);
+        OrganisationHydrateRegistrationIntervals::dispatch($customer->organisation)->delay($this->hydratorsDelay);
 
         CustomerRecordSearch::dispatch($customer);
 

app/Actions/Catalogue/Shop/HydrateShops.php

@@ -28,6 +28,7 @@
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateInvoiceIntervals;
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateInvoices;
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateOrderHandling;
+use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateOrderIntervals;
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydrateOrders;
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydratePaymentAccounts;
 use App\Actions\Catalogue\Shop\Hydrators\ShopHydratePayments;
@@ -80,6 +81,7 @@ public function handle(Shop $shop): void
         ShopHydrateCrmStats::run($shop);
         ShopHydrateAdjustments::run($shop);
         ShopHydrateOrderHandling::run($shop);
+        ShopHydrateOrderIntervals::run($shop);
 
     }
 

app/Actions/Catalogue/Shop/Hydrators/ShopHydrateOrderHandling.php

@@ -13,6 +13,7 @@
 use App\Actions\Traits\WithEnumStats;
 use App\Enums\Dispatching\DeliveryNote\DeliveryNoteStateEnum;
 use App\Enums\Dispatching\Picking\PickingStateEnum;
+use App\Enums\Ordering\Order\OrderPayStatusEnum;
 use App\Enums\Ordering\Order\OrderStateEnum;
 use App\Models\Catalogue\Shop;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
@@ -40,6 +41,7 @@ public function getJobMiddleware(): array
     public function handle(Shop $shop): void
     {
         $stats = [
+            // aka Basket for UI
             'number_orders_state_creating'         => $shop->orders()->where('state', OrderStateEnum::CREATING)->count(),
             'orders_state_creating_amount'         => $shop->orders()->where('state', OrderStateEnum::CREATING)->sum('net_amount'),
             'orders_state_creating_amount_org_currency' => $shop->orders()->where('state', OrderStateEnum::CREATING)->sum('org_net_amount'),
@@ -50,15 +52,15 @@ public function handle(Shop $shop): void
             'orders_state_submitted_amount_org_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->sum('org_net_amount'),
             'orders_state_submitted_amount_grp_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->sum('grp_net_amount'),
 
-            'number_orders_state_submitted_paid' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->whereColumn('payment_amount', '>=', 'total_amount')->count(),
-            'orders_state_submitted_paid_amount' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->whereColumn('payment_amount', '>=', 'total_amount')->sum('net_amount'),
-            'orders_state_submitted_paid_amount_org_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->whereColumn('payment_amount', '>=', 'total_amount')->sum('org_net_amount'),
-            'orders_state_submitted_paid_amount_grp_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->whereColumn('payment_amount', '>=', 'total_amount')->sum('grp_net_amount'),
+            'number_orders_state_submitted_paid' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::PAID)->count(),
+            'orders_state_submitted_paid_amount' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::PAID)->sum('net_amount'),
+            'orders_state_submitted_paid_amount_org_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::PAID)->sum('org_net_amount'),
+            'orders_state_submitted_paid_amount_grp_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::PAID)->sum('grp_net_amount'),
 
-            'number_orders_state_submitted_not_paid' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('payment_amount', 0)->count(),
-            'orders_state_submitted_not_paid_amount' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('payment_amount', 0)->sum('net_amount'),
-            'orders_state_submitted_not_paid_amount_org_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('payment_amount', 0)->sum('org_net_amount'),
-            'orders_state_submitted_not_paid_amount_grp_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('payment_amount', 0)->sum('grp_net_amount'),
+            'number_orders_state_submitted_not_paid' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::UNPAID)->count(),
+            'orders_state_submitted_not_paid_amount' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::UNPAID)->sum('net_amount'),
+            'orders_state_submitted_not_paid_amount_org_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::UNPAID)->sum('org_net_amount'),
+            'orders_state_submitted_not_paid_amount_grp_currency' => $shop->orders()->where('state', OrderStateEnum::SUBMITTED)->where('pay_status', OrderPayStatusEnum::UNPAID)->sum('grp_net_amount'),
 
             'number_orders_state_in_warehouse'     => $shop->orders()->where('state', OrderStateEnum::IN_WAREHOUSE)->count(),
             'orders_state_in_warehouse_amount' => $shop->orders()->where('state', OrderStateEnum::IN_WAREHOUSE)->sum('net_amount'),

app/Actions/Catalogue/Shop/Hydrators/ShopHydrateOrderIntervals.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * Author: Ganes <gustiganes@gmail.com>
+ * Created on: 17-03-2025, Bali, Indonesia
+ * Github: https://github.com/Ganes556
+ * Copyright: 2025
+ *
+*/
+
+namespace App\Actions\Catalogue\Shop\Hydrators;
+
+use App\Actions\Traits\WithIntervalsAggregators;
+use App\Enums\Ordering\Order\OrderStateEnum;
+use App\Models\Catalogue\Shop;
+use App\Models\Ordering\Order;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ShopHydrateOrderIntervals
+{
+    use AsAction;
+    use WithIntervalsAggregators;
+
+    public string $jobQueue = 'sales';
+
+    private Shop $shop;
+
+    public function __construct(Shop $shop)
+    {
+        $this->shop = $shop;
+    }
+
+    public function getJobMiddleware(): array
+    {
+        return [(new WithoutOverlapping($this->shop->id))->dontRelease()];
+    }
+
+    public function handle(Shop $shop): void
+    {
+
+        $stats = [];
+
+        $queryBase = Order::where('shop_id', $shop->id)->where('state', OrderStateEnum::CREATING)->selectRaw(' count(*) as  sum_aggregate');
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'created_at',
+            queryBase: $queryBase,
+            statField: 'baskets_created_'
+        );
+
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'updated_at',
+            queryBase: $queryBase,
+            statField: 'baskets_updated_'
+        );
+
+
+        $shop->orderingIntervals()->update($stats);
+    }
+}

app/Actions/Catalogue/Shop/Hydrators/ShopHydrateRegistrationIntervals.php

@@ -0,0 +1,53 @@
+<?php
+/*
+ * author Arya Permana - Kirin
+ * created on 14-03-2025-16h-40m
+ * github: https://github.com/KirinZero0
+ * copyright 2025
+*/
+
+namespace App\Actions\Catalogue\Shop\Hydrators;
+
+use App\Actions\Traits\WithIntervalsAggregators;
+use App\Enums\Accounting\Invoice\InvoiceTypeEnum;
+use App\Models\Accounting\Invoice;
+use App\Models\Catalogue\Shop;
+use App\Models\CRM\Customer;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ShopHydrateRegistrationIntervals
+{
+    use AsAction;
+    use WithIntervalsAggregators;
+
+    public string $jobQueue = 'sales';
+
+    private Shop $shop;
+
+    public function __construct(Shop $shop)
+    {
+        $this->shop = $shop;
+    }
+
+    public function getJobMiddleware(): array
+    {
+        return [(new WithoutOverlapping($this->shop->id))->dontRelease()];
+    }
+
+    public function handle(Shop $shop): void
+    {
+
+        $stats = [];
+
+        $queryBase = Customer::where('shop_id', $shop->id)->selectRaw('count(*) as  sum_aggregate');
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            queryBase: $queryBase,
+            statField: 'registrations_'
+        );
+
+        $shop->orderingIntervals()->update($stats);
+    }
+
+}

app/Actions/Catalogue/Shop/Hydrators/ShopHydrateSales.php

@@ -9,8 +9,10 @@
 namespace App\Actions\Catalogue\Shop\Hydrators;
 
 use App\Actions\Traits\WithIntervalsAggregators;
+use App\Enums\Ordering\Order\OrderStateEnum;
 use App\Models\Accounting\Invoice;
 use App\Models\Catalogue\Shop;
+use App\Models\Ordering\Order;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -66,10 +68,70 @@ public function handle(Shop $shop, ?array $intervals = null, $doPreviousInterval
             doPreviousPeriods: $doPreviousIntervals
         );
 
+        // basket
+        $queryBase = Order::where('shop_id', $shop->id)->where('state', OrderStateEnum::CREATING)->selectRaw('sum(net_amount) as  sum_aggregate');
+
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'created_at',
+            queryBase: $queryBase,
+            statField: 'baskets_created_',
+            intervals: $intervals,
+            doPreviousPeriods: $doPreviousIntervals
+        );
+
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'updated_at',
+            queryBase: $queryBase,
+            statField: 'baskets_updated_',
+            intervals: $intervals,
+            doPreviousPeriods: $doPreviousIntervals
+        );
+
+        $queryBase = Order::where('shop_id', $shop->id)->where('state', OrderStateEnum::CREATING)->selectRaw('sum(grp_net_amount) as  sum_aggregate');
+
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'created_at',
+            queryBase: $queryBase,
+            statField: 'baskets_created_grp_currency_',
+            intervals: $intervals,
+            doPreviousPeriods: $doPreviousIntervals
+        );
+
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'updated_at',
+            queryBase: $queryBase,
+            statField: 'baskets_updated_grp_currency_',
+            intervals: $intervals,
+            doPreviousPeriods: $doPreviousIntervals
+        );
+
+        $queryBase = Order::where('shop_id', $shop->id)->where('state', OrderStateEnum::CREATING)->selectRaw('sum(org_net_amount) as  sum_aggregate');
+
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'created_at',
+            queryBase: $queryBase,
+            statField: 'baskets_created_org_currency_',
+            intervals: $intervals,
+            doPreviousPeriods: $doPreviousIntervals
+        );
+
+        $stats     = $this->getIntervalsData(
+            stats: $stats,
+            dateField: 'updated_at',
+            queryBase: $queryBase,
+            statField: 'baskets_updated_org_currency_',
+            intervals: $intervals,
+            doPreviousPeriods: $doPreviousIntervals
+        );
+
         $shop->salesIntervals()->update($stats);
     }
 
 
 
-
 }

app/Actions/Catalogue/Shop/UI/ShowShop.php

@@ -8,9 +8,9 @@
 
 namespace App\Actions\Catalogue\Shop\UI;
 
+use App\Actions\Dashboard\ShowOrganisationDashboard;
 use App\Actions\Helpers\History\UI\IndexHistory;
 use App\Actions\OrgAction;
-use App\Actions\SysAdmin\Organisation\UI\ShowOrganisationDashboard;
 use App\Actions\Traits\WithDashboard;
 use App\Actions\UI\WithInertia;
 use App\Enums\CRM\Customer\CustomerStateEnum;
@@ -19,7 +19,6 @@
 use App\Http\Resources\Catalogue\ShopResource;
 use App\Http\Resources\History\HistoryResource;
 use App\Models\Catalogue\Shop;
-use App\Models\CRM\Customer;
 use App\Models\SysAdmin\Organisation;
 use Illuminate\Support\Arr;
 use Inertia\Inertia;