fix: purchase master

app/Http/Controllers/PurchaseController.php

@@ -11,7 +11,6 @@ use App\Models\PurchaseDetail;
 use App\Models\StockProduct;
 use App\Models\Supplier;
 use App\Services\HelperService;
-use App\Services\PurchaseService;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\DB;
 use Inertia\Inertia;
@@ -40,11 +39,11 @@ class PurchaseController extends Controller
                     fn($purchase) => [
                         "id" => $purchase->id,
                         "updatedAt" => $purchase->updated_at,
-                        "email" => $purchase->supplier->email,
                         "name" => $purchase->supplier->name,
                         "phone" => $purchase->supplier->phone,
+                        "email" => $purchase->supplier->email,
                         "price" => HelperService::setRupiahFormat(
-                            PurchaseService::totalPrice($purchase)
+                            $purchase->purchaseDetail->sum("price")
                         ),
                         "status" => $purchase->status,
                     ]
@@ -74,7 +73,18 @@ class PurchaseController extends Controller
             "historyProductPurchase" => Inertia::lazy(
                 fn() => PurchaseDetail::historyProductPurchase(
                     request()->only("productNumber", "supplierId")
-                )->first()
+                )
+                    ->orderBy("price", "desc")
+                    ->get()
+                    ->transform(
+                        fn($purchaseDetail) => [
+                            "id" => $purchaseDetail->id,
+                            "price" => $purchaseDetail->price,
+                            "qty" => $purchaseDetail->qty,
+                            "ppn" => $purchaseDetail->purchase->ppn,
+                        ]
+                    )
+                    ->first()
             ),
         ]);
     }
@@ -142,7 +152,7 @@ class PurchaseController extends Controller
                     "id" => $purchase->id,
                     "number" => $purchase->product_number,
                     "name" => $purchase->product->name,
-                    "price" => $purchase->price,
+                    "price" => $purchase->getRawOriginal("price"),
                     "qty" => $purchase->qty,
                     "unit" => $purchase->product->unit,
                 ]
@@ -174,11 +184,27 @@ class PurchaseController extends Controller
                     "id" => $purchase->id,
                     "number" => $purchase->product_number,
                     "name" => $purchase->product->name,
-                    "price" => $purchase->price,
+                    "price" => $purchase->getRawOriginal("price"),
                     "qty" => $purchase->qty,
                     "unit" => $purchase->product->unit,
                 ]
             ),
+            "historyProductPurchase" => Inertia::lazy(
+                fn() => PurchaseDetail::historyProductPurchase(
+                    request()->only("productNumber", "supplierId")
+                )
+                    ->orderBy("price", "desc")
+                    ->get()
+                    ->transform(
+                        fn($purchaseDetail) => [
+                            "id" => $purchaseDetail->id,
+                            "price" => $purchaseDetail->price,
+                            "qty" => $purchaseDetail->qty,
+                            "ppn" => $purchaseDetail->purchase->ppn,
+                        ]
+                    )
+                    ->first()
+            ),
         ]);
     }
 

app/Models/PurchaseDetail.php

@@ -2,8 +2,10 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Services\HelperService;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class PurchaseDetail extends Model
 {
@@ -11,21 +13,27 @@ class PurchaseDetail extends Model
 
     protected $fillable = ["price", "qty", "purchase_number", "product_number"];
 
+    protected function price(): Attribute
+    {
+        return Attribute::make(
+            get: function ($value) {
+                $ppn = Ppn::first()->ppn;
+
+                return $this->purchase->ppn
+                    ? HelperService::addPPN($value, $ppn)
+                    : $value;
+            }
+        );
+    }
+
     public function product()
     {
         return $this->belongsTo(Product::class, "product_number", "number");
     }
 
-    public function supplier()
+    public function purchase()
     {
-        return $this->hasOneThrough(
-            Supplier::class,
-            Purchase::class,
-            "number",
-            "id",
-            "purchase_number",
-            "supplier_id"
-        );
+        return $this->belongsTo(Purchase::class, "purchase_number", "number");
     }
 
     public function scopeHistoryProductPurchase($query, array $filters)
@@ -38,7 +46,9 @@ class PurchaseDetail extends Model
                 $query->whereRelation("product", "number", $search);
             })
             ->when($filters["supplierId"] ?? null, function ($query, $search) {
-                $query->whereHas("supplier");
+                $query->whereHas("purchase", function ($query) use ($search) {
+                    $query->where("supplier_id", $search);
+                });
             });
     }
 }

app/Services/PurchaseService.php

@@ -1,21 +0,0 @@
-<?php
-namespace App\Services;
-
-use App\Models\Ppn;
-use App\Models\Purchase;
-
-class PurchaseService
-{
-    public static function totalPrice(Purchase $purchase)
-    {
-        return $purchase->purchaseDetail->sum(function ($purchaseDetail) use (
-            $purchase
-        ) {
-            $ppn = Ppn::first()->ppn;
-
-            return $purchase->ppn
-                ? HelperService::addPPN($purchaseDetail->price, $ppn)
-                : $purchaseDetail->price;
-        });
-    }
-}

resources/js/pages/Purchases/Components/Details.vue

@@ -77,7 +77,7 @@ defineProps({
       <div
         class="flex flex-column md:flex-row gap-2 md:gap-0 md:justify-content-between md:align-items-center"
       >
-        <small>{{ message }}</small>
+        <span class="text-xs">{{ message }}</span>
 
         <Button
           label="Simpan"

resources/js/pages/Purchases/Components/HistoryProduct.vue

@@ -0,0 +1,57 @@
+<script setup>
+import { watch } from 'vue'
+import { Inertia } from '@inertiajs/inertia'
+import { usePage } from '@inertiajs/inertia-vue3'
+import AppInputNumber from '@/components/AppInputNumber.vue'
+import AppInputText from '@/components/AppInputText.vue'
+
+const props = defineProps(['product', 'supplier'])
+
+watch(
+  () => props.product,
+  () => {
+    if (props.product?.number && props.supplier?.id) {
+      Inertia.reload({
+        data: {
+          productNumber: props.product.number,
+          supplierId: props.supplier.id,
+        },
+        only: ['historyProductPurchase'],
+      })
+    }
+
+    usePage().props.value.historyProductPurchase = {}
+  }
+)
+</script>
+
+<template>
+  <template v-if="$page.props.historyProductPurchase?.id">
+    <div class="col-12">
+      <h3 class="text-lg">Riwayat Produk Sebelumnya</h3>
+    </div>
+    <div class="col-12 md:col-6">
+      <AppInputNumber
+        disabled
+        class="mb-0"
+        label="Harga"
+        placeholder="harga"
+        v-model="$page.props.historyProductPurchase.price"
+      />
+
+      <span v-if="$page.props.historyProductPurchase.ppn" class="text-xs">
+        Harga sudah termasuk PPN {{ $page.props.ppn }} %
+      </span>
+    </div>
+
+    <div class="col-12 md:col-6">
+      <AppInputText
+        disabled
+        label="Kuantitas"
+        placeholder="kuantitas"
+        type="number"
+        v-model="$page.props.historyProductPurchase.qty"
+      />
+    </div>
+  </template>
+</template>

resources/js/pages/Purchases/Create.vue

@@ -1,10 +1,10 @@
 <script setup>
-import { watch, computed } from 'vue'
-import { Inertia } from '@inertiajs/inertia'
+import { computed } from 'vue'
 import { optionStatus } from './config'
 import { cartTable } from './config'
 import Details from './Components/Details.vue'
 import Cart from './Components/Cart.vue'
+import HistoryProduct from './Components/HistoryProduct.vue'
 import { useProductCart } from './Composables/useProductCart'
 import { onShowDialog } from './Composables/onShowDialog'
 import { useForm } from '@/composables/useForm'
@@ -60,25 +60,6 @@ const dropdownStatus = computed(() => {
   return optionStatus.filter((val) => val.value != 'success')
 })
 
-watch(
-  () => form.product,
-  () => {
-    if (form.product.id) {
-      Inertia.reload({
-        data: {
-          productNumber: form.product.number,
-          supplierId: form.supplier.id,
-        },
-        only: ['historyProductPurchase'],
-      })
-    }
-  }
-)
-
-const historyProductPrice = computed(() => {
-  return props.historyProductPurchase?.price
-})
-
 const {
   productCart,
   onClearProductCart,
@@ -196,14 +177,10 @@ const { onShowCreateProduct, onShowCreateSupplier } = onShowDialog()
                     />
                   </div>
 
-                  <div class="col-12 md:col-6">
-                    <AppInputNumber
-                      disabled
-                      label="Harga Sebelumya"
-                      placeholder="harga sebelumnya"
-                      v-model="historyProductPrice"
-                    />
-                  </div>
+                  <HistoryProduct
+                    :product="form.product"
+                    :supplier="form.supplier"
+                  />
 
                   <Divider type="dashed" />
 

resources/js/pages/Purchases/Edit.vue

@@ -3,6 +3,7 @@ import { optionStatus } from './config'
 import { cartTable } from './config'
 import Details from './Components/Details.vue'
 import Cart from './Components/Cart.vue'
+import HistoryProduct from './Components/HistoryProduct.vue'
 import { useProductCart } from './Composables/useProductCart'
 import { onShowDialog } from './Composables/onShowDialog'
 import { useForm } from '@/composables/useForm'
@@ -24,6 +25,7 @@ const props = defineProps({
     default: [],
   },
   purchaseDetail: Array,
+  historyProductPurchase: Object,
 })
 
 const form = useForm({
@@ -143,6 +145,13 @@ const { onShowCreateProduct } = onShowDialog()
                     />
                   </div>
 
+                  <HistoryProduct
+                    :product="form.product"
+                    :supplier="form.supplier"
+                  />
+
+                  <Divider type="dashed" />
+
                   <div class="col-12 md:col-6">
                     <AppInputNumber
                       :disabled="!form.supplier?.id"

resources/js/pages/Sales/Components/Details.vue

@@ -77,7 +77,7 @@ defineProps({
       <div
         class="flex flex-column md:flex-row gap-2 md:gap-0 md:justify-content-between md:align-items-center"
       >
-        <small>{{ message }}</small>
+        <span class="text-xs">{{ message }}</span>
 
         <Button
           label="Simpan"