fix: purchase master

app/Http/Controllers/PurchaseController.php

@@ -80,7 +80,7 @@ class PurchaseController extends Controller
                     ->transform(
                         fn($purchaseDetail) => [
                             "number" => $purchaseDetail->product_number,
-                            "price" => $purchaseDetail->price,
+                            "price" => $purchaseDetail->getRawOriginal("price"),
                             "qty" => $purchaseDetail->qty,
                             "ppn" => $purchaseDetail->purchase->ppn,
                         ]

app/Models/PurchaseDetail.php

@@ -20,8 +20,8 @@ class PurchaseDetail extends Model
                 $ppn = Ppn::first()->ppn;
 
                 return $this->purchase->ppn
-                    ? HelperService::addPPN($value, $ppn)
-                    : $value;
+                    ? HelperService::addPPN($value, $ppn) * $this->qty
+                    : $value * $this->qty;
             }
         );
     }

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

@@ -1,10 +1,12 @@
 <script setup>
 import { watchEffect, watch, computed, inject } from 'vue'
 import { Inertia } from '@inertiajs/inertia'
+import { ppn as ppnUtils } from '@/utils/helpers'
 import AppInputText from '@/components/AppInputText.vue'
 import AppInputNumber from '@/components/AppInputNumber.vue'
 
 const props = defineProps({
+  ppn: Number,
   productPurchase: Object,
 })
 
@@ -35,7 +37,14 @@ watch(
   }
 )
 
-const productPurchasePrice = computed(() => props.productPurchase?.price)
+const productPurchasePrice = computed(() => {
+  if (props.productPurchase?.number) {
+    return ppnUtils(
+      props.productPurchase.price,
+      props.productPurchase?.ppn ?? 0
+    )
+  }
+})
 
 const productPurchasePpn = computed(() => props.productPurchase?.ppn)
 

resources/js/pages/Purchases/Composables/useCart.js

@@ -1,5 +1,5 @@
 import { reactive } from 'vue'
-import { FormValidationError } from '@/utils/helpers'
+import { FormValidationError, ppn } from '@/utils/helpers'
 
 export function useCart(form, initialProducts = []) {
   const cart = reactive(initialProducts)
@@ -75,11 +75,9 @@ export function useCart(form, initialProducts = []) {
 
   const totalCartPrice = () => {
     const itemPrices = cart.map((product) => {
-      if (form.checkedPpn) {
-        return product.price + product.price * (form.ppn / 100)
-      } else {
-        return product.price
-      }
+      return form.checkedPpn
+        ? ppn(product.price, form.ppn) * product.qty
+        : product.price * product.qty
     })
 
     return itemPrices.reduce((prev, current) => prev + current, 0)

resources/js/pages/Purchases/Create.vue

@@ -183,14 +183,17 @@ const { onShowCreateProduct, onShowCreateSupplier } = useDialog()
 
                   <Divider type="dashed" />
 
-                  <HistoryProduct :product-purchase="productPurchase" />
+                  <HistoryProduct
+                    :ppn="ppn"
+                    :product-purchase="productPurchase"
+                  />
 
                   <Divider type="dashed" />
 
                   <div class="col-12 md:col-6">
                     <AppInputNumber
-                      label="Harga Terbaru"
-                      placeholder="harga terbaru"
+                      label="Harga"
+                      placeholder="harga"
                       :disabled="!form.product?.id"
                       v-model="form.price"
                     />