fix: report master

app/Http/Controllers/CustomerController.php

@@ -22,7 +22,7 @@ class CustomerController extends Controller
     {
         return inertia("Customers/Index", [
             "initialSearch" => request("search"),
-            "customers" => Customer::filter(request()->only("search"))
+            "customers" => Customer::search(request()->only("search"))
                 ->latest()
                 ->paginate(10)
                 ->withQueryString()

app/Http/Controllers/ProductController.php

@@ -23,7 +23,7 @@ class ProductController extends Controller
     {
         return inertia("Products/Index", [
             "initialSearch" => request("search"),
-            "products" => Product::filter(request()->only("search"))
+            "products" => Product::search(request()->only("search"))
                 ->latest()
                 ->paginate(10)
                 ->withQueryString()

app/Http/Controllers/PurchaseController.php

@@ -34,7 +34,7 @@ class PurchaseController extends Controller
     {
         return inertia("Purchases/Index", [
             "initialSearch" => request("search"),
-            "purchases" => Purchase::filter(request()->only("search"))
+            "purchases" => Purchase::search(request()->only("search"))
                 ->latest()
                 ->paginate(10)
                 ->withQueryString()
@@ -66,12 +66,12 @@ class PurchaseController extends Controller
             "ppn" => Ppn::first()->ppn,
             "productNumber" => "PDK" . now()->format("YmdHis"),
             "suppliers" => Inertia::lazy(
-                fn() => Supplier::filter([
+                fn() => Supplier::search([
                     "search" => request("supplier"),
                 ])->get()
             ),
             "products" => Inertia::lazy(
-                fn() => Product::filter(["search" => request("product")])->get()
+                fn() => Product::search(["search" => request("product")])->get()
             ),
             "productPurchase" => Inertia::lazy(
                 fn() => PurchaseDetail::historyProductPurchase(
@@ -181,7 +181,7 @@ class PurchaseController extends Controller
             "ppnChecked" => $purchase->ppn ? true : false,
             "supplier" => $purchase->supplier,
             "products" => Inertia::lazy(
-                fn() => Product::filter(["search" => request("product")])->get()
+                fn() => Product::search(["search" => request("product")])->get()
             ),
             "purchaseDetail" => $purchase->purchaseDetail->transform(
                 fn($purchase) => [

app/Http/Controllers/SalesController.php

@@ -12,6 +12,7 @@ use Illuminate\Database\QueryException;
 use App\Http\Requests\Sales\StoreSaleRequest;
 use App\Http\Requests\Sales\UpdateSaleRequest;
 use App\Models\Company;
+use App\Models\SaleDetail;
 use App\Services\FunctionService;
 use App\Services\SaleService;
 use Barryvdh\DomPDF\Facade\Pdf;
@@ -32,7 +33,7 @@ class SalesController extends Controller
     {
         return inertia("Sales/Index", [
             "initialSearch" => request("search"),
-            "sales" => Sale::filter(request()->only("search"))
+            "sales" => Sale::search(request()->only("search"))
                 ->latest()
                 ->paginate(10)
                 ->withQueryString()
@@ -63,12 +64,12 @@ class SalesController extends Controller
             "number" => "PJN" . now()->format("YmdHis"),
             "ppn" => Ppn::first()->ppn,
             "customers" => Inertia::lazy(
-                fn() => Customer::filter([
+                fn() => Customer::search([
                     "search" => request("customer"),
                 ])->get()
             ),
             "stockProducts" => Inertia::lazy(
-                fn() => StockProduct::filter([
+                fn() => StockProduct::search([
                     "search" => request("stockProduct"),
                 ])
                     ->get()
@@ -229,7 +230,47 @@ class SalesController extends Controller
 
     public function report()
     {
-        return inertia("Sales/Report");
+        return inertia("Sales/Report", [
+            "params" => [
+                "filters" => request()->only("start_date", "end_date"),
+            ],
+            "sales" => Inertia::lazy(
+                fn() => SaleDetail::filter(
+                    request()->only("start_date", "end_date")
+                )
+                    ->latest()
+                    ->paginate(10)
+                    ->withQueryString()
+                    ->through(
+                        fn($saleDetail) => [
+                            "updatedAt" => $saleDetail->updated_at,
+                            "totalPrice" => FunctionService::rupiahFormat(
+                                $saleDetail->price * $saleDetail->qty
+                            ),
+                            "status" => $saleDetail->sale->status,
+                        ]
+                    )
+            ),
+            // "data" => [
+            //     "sales" => Inertia::lazy(
+            //         fn() => SaleDetail::filter(
+            //             request()->only("start_date", "end_date")
+            //         )
+            //             ->latest()
+            //             ->paginate(10)
+            //             ->withQueryString()
+            //             ->through(
+            //                 fn($saleDetail) => [
+            //                     "updatedAt" => $saleDetail->updated_at,
+            //                     "totalPrice" => FunctionService::rupiahFormat(
+            //                         $saleDetail->price * $saleDetail->qty
+            //                     ),
+            //                     "status" => $saleDetail->sale->status,
+            //                 ]
+            //             )
+            //     ),
+            // ],
+        ]);
     }
 
     public function reportExcel()

app/Http/Controllers/StockProductController.php

@@ -22,7 +22,7 @@ class StockProductController extends Controller
     {
         return inertia("StockProducts/Index", [
             "initialSearch" => request("search"),
-            "stockProducts" => StockProduct::filter(request()->only("search"))
+            "stockProducts" => StockProduct::search(request()->only("search"))
                 ->latest()
                 ->paginate(10)
                 ->withQueryString()

app/Http/Controllers/UserController.php

@@ -26,7 +26,7 @@ class UserController extends Controller
     {
         return inertia("Users/Index", [
             "initialSearch" => request("search"),
-            "users" => User::filter(request()->only("search"))
+            "users" => User::search(request()->only("search"))
                 ->latest()
                 ->paginate(10)
                 ->withQueryString()

app/Models/Customer.php

@@ -18,7 +18,7 @@ class Customer extends Model
         return $this->hasMany(Sale::class);
     }
 
-    public function scopeFilter($query, array $filters)
+    public function scopeSearch($query, array $filters)
     {
         $query->when($filters["search"] ?? null, function ($query, $search) {
             $query->where(function ($query) use ($search) {

app/Models/Product.php

@@ -35,7 +35,7 @@ class Product extends Model
         return $this->hasMany(SaleDetail::class, "product_number", "number");
     }
 
-    public function scopeFilter($query, array $filters)
+    public function scopeSearch($query, array $filters)
     {
         $query->when($filters["search"] ?? null, function ($query, $search) {
             $query->where(function ($query) use ($search) {

app/Models/Purchase.php

@@ -38,7 +38,7 @@ class Purchase extends Model
         return $this->belongsTo(Supplier::class);
     }
 
-    public function scopeFilter($query, array $filters)
+    public function scopeSearch($query, array $filters)
     {
         $query->when($filters["search"] ?? null, function ($query, $search) {
             $query

app/Models/Sale.php

@@ -34,7 +34,7 @@ class Sale extends Model
         return $this->belongsTo(Customer::class);
     }
 
-    public function scopeFilter($query, array $filters)
+    public function scopeSearch($query, array $filters)
     {
         $query->when($filters["search"] ?? null, function ($query, $search) {
             $query

app/Models/SaleDetail.php

@@ -2,10 +2,11 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
 use App\Services\FunctionService;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
 
 class SaleDetail extends Model
 {
@@ -13,6 +14,15 @@ class SaleDetail extends Model
 
     protected $fillable = ["price", "qty", "sale_number", "product_number"];
 
+    protected function updatedAt(): Attribute
+    {
+        return Attribute::make(
+            get: fn($value) => Carbon::parse($value)->translatedFormat(
+                "l d/m/y"
+            )
+        );
+    }
+
     protected function price(): Attribute
     {
         return Attribute::make(
@@ -51,4 +61,15 @@ class SaleDetail extends Model
                 });
             });
     }
+
+    public function scopeFilter($query, array $filters)
+    {
+        $query
+            ->when($filters["start_date"] ?? null, function ($query, $search) {
+                $query->whereDate("created_at", ">=", $search);
+            })
+            ->when($filters["end_date"] ?? null, function ($query, $search) {
+                $query->whereDate("created_at", "<=", $search);
+            });
+    }
 }

app/Models/StockProduct.php

@@ -40,7 +40,7 @@ class StockProduct extends Model
         return $this->belongsTo(Product::class, "product_number", "number");
     }
 
-    public function scopeFilter($query, array $filters)
+    public function scopeSearch($query, array $filters)
     {
         $query
             ->when($filters["search"] ?? null, function ($query, $search) {

app/Models/Supplier.php

@@ -18,7 +18,7 @@ class Supplier extends Model
         return $this->hasMany(Purchase::class);
     }
 
-    public function scopeFilter($query, array $filters)
+    public function scopeSearch($query, array $filters)
     {
         $query->when($filters["search"] ?? null, function ($query, $search) {
             $query->where(function ($query) use ($search) {

app/Models/User.php

@@ -45,7 +45,7 @@ class User extends Authenticatable
         return $this->belongsTo(Role::class);
     }
 
-    public function scopeFilter($query, array $filters)
+    public function scopeSearch($query, array $filters)
     {
         $query->when($filters["search"] ?? null, function ($query, $search) {
             $query->where(function ($query) use ($search) {

resources/js/components/AppFilterDateRange.vue

@@ -0,0 +1,79 @@
+<script setup>
+import { onMounted, reactive, watch } from 'vue'
+import { Inertia } from '@inertiajs/inertia'
+import dayjs from 'dayjs'
+import { pickBy } from 'lodash'
+
+const props = defineProps({
+  initialFilter: {
+    type: Object,
+    required: true,
+  },
+  refreshData: {
+    type: String,
+    required: true,
+  },
+})
+
+const filters = reactive({
+  dates: null,
+  startDate: null,
+  endDate: null,
+})
+
+onMounted(() => {
+  if (props.initialFilter.start_date || props.initialFilter.end_date) {
+    if (props.initialFilter.end_date) {
+      filters.dates = [
+        new Date(props.initialFilter.start_date),
+        new Date(props.initialFilter.end_date),
+      ]
+    } else {
+      filters.dates = [new Date(props.initialFilter.start_date), null]
+    }
+  }
+})
+
+watch(
+  () => filters.dates,
+  () => {
+    if (filters.dates[1]) {
+      filters.startDate = dayjs(filters.dates[0]).format('YYYY-MM-DD')
+
+      filters.endDate = dayjs(filters.dates[1]).format('YYYY-MM-DD')
+    } else if (filters.dates[0]) {
+      filters.startDate = dayjs(filters.dates[0]).format('YYYY-MM-DD')
+
+      filters.endDate = null
+
+      removeParams('end_date')
+    }
+
+    Inertia.reload({
+      data: pickBy({
+        start_date: filters.startDate,
+        end_date: filters.endDate,
+      }),
+      only: [props.refreshData],
+    })
+  }
+)
+
+const removeParams = (...params) => {
+  const urlParams = new URLSearchParams(location.search)
+
+  params.forEach((value) => urlParams.delete(value))
+
+  window.history.replaceState({}, '', `${location.pathname}?${urlParams}`)
+}
+</script>
+
+<template>
+  <Calendar
+    class="w-full"
+    selection-mode="range"
+    date-format="dd/mm/yy"
+    :manual-input="false"
+    v-model="filters.dates"
+  />
+</template>

resources/js/composables/useDateRangeFilter.js

@@ -1,45 +0,0 @@
-import { onMounted, watch, ref } from 'vue'
-import dayjs from 'dayjs'
-
-export function useDateRangeFilter(props) {
-  const dates = ref(null)
-
-  const startDate = ref(null)
-
-  const endDate = ref(null)
-
-  onMounted(() => {
-    if (!props.initialDateRange) {
-      return
-    }
-
-    if (props.initialDateRange[0] || props.initialDateRange[1]) {
-      if (props.initialDateRange[1]) {
-        dates.value = [
-          new Date(props.initialDateRange[0]),
-          new Date(props.initialDateRange[1]),
-        ]
-      } else {
-        dates.value = [new Date(props.props.initialDateRange[1]), null]
-      }
-    }
-  })
-
-  watch(dates, () => {
-    if (dates.value[1]) {
-      startDate.value = dayjs(dates.value[0]).format('YYYY-MM-DD')
-
-      endDate.value = dayjs(dates.value[1]).format('YYYY-MM-DD')
-    } else if (dates.value[0]) {
-      startDate.value = dayjs(dates.value[0]).format('YYYY-MM-DD')
-
-      endDate.value = null
-    }
-  })
-
-  return {
-    dates,
-    startDate,
-    endDate,
-  }
-}

resources/js/pages/Sales/Report.vue

@@ -1,9 +1,42 @@
 <script setup>
+import { reportTable } from './config'
+import AppFilterDateRange from '@/components/AppFilterDateRange.vue'
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
+
+defineProps({
+  params: Object,
+  sales: Object,
+})
 </script>
 
 <template>
   <DashboardLayout title="Laporan Penjualan">
-    <h1>Laporan Penjualan</h1>
+    <DataTable
+      responsive-layout="scroll"
+      column-resize-mode="expand"
+      :rowHover="true"
+      :stripedRows="true"
+    >
+      <template #header>
+        <h1>Laporan Penjualan</h1>
+
+        <div class="grid">
+          <div class="col-12 sm:col-6 lg:col-4">
+            <AppFilterDateRange
+              placeholder="filter waktu..."
+              refresh-data="sales"
+              :initial-filter="params.filters"
+            />
+          </div>
+        </div>
+      </template>
+
+      <Column
+        v-for="value in reportTable"
+        :field="value.field"
+        :header="value.header"
+        :key="value.field"
+      />
+    </DataTable>
   </DashboardLayout>
 </template>

resources/js/pages/Sales/config.js

@@ -24,3 +24,9 @@ export const cartTable = [
   { field: 'qty', header: 'Kuantitas' },
   { field: 'unit', header: 'Satuan' },
 ]
+
+export const reportTable = [
+  { field: 'updatedAt', header: 'Tanggal' },
+  { field: 'totalPrice', header: 'Total Harga' },
+  { field: 'status', header: 'Status' },
+]

resources/js/utils/helpers.js

@@ -22,6 +22,14 @@ export const IDRCurrencyFormat = (number, decimal = false) => {
   }
 }
 
+export function removeParams(...params) {
+  const urlParams = new URLSearchParams(location.search)
+
+  params.forEach((value) => urlParams.delete(value))
+
+  window.history.replaceState({}, '', `${location.pathname}?${urlParams}`)
+}
+
 export class FormValidationError extends Error {
   constructor(message, errors) {
     super(message)

routes/web.php

@@ -54,8 +54,6 @@ Route::middleware(["auth", "verified", "checkBlocked"])->group(function () {
 
     Route::resource("/customers", CustomerController::class);
 
-    Route::resource("/purchases", PurchaseController::class);
-
     Route::get("/purchases/pdf/invoice/{purchase}", [
         PurchaseController::class,
         "invoice",
@@ -73,7 +71,7 @@ Route::middleware(["auth", "verified", "checkBlocked"])->group(function () {
 
     Route::get("/purchases/report", [PurchaseController::class, "report"]);
 
-    Route::resource("/sales", SalesController::class);
+    Route::resource("/purchases", PurchaseController::class);
 
     Route::get("/sales/pdf/invoice/{sale}", [
         SalesController::class,
@@ -92,6 +90,8 @@ Route::middleware(["auth", "verified", "checkBlocked"])->group(function () {
 
     Route::get("/sales/report", [SalesController::class, "report"]);
 
+    Route::resource("/sales", SalesController::class);
+
     Route::resource("/suppliers", SupplierController::class);
 
     Route::resource("/stock-products", StockProductController::class);

storage/framework/cache/data/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore