fix: purchase master

app/Http/Controllers/PurchaseController.php

@@ -70,7 +70,7 @@ class PurchaseController extends Controller
             "products" => Inertia::lazy(
                 fn() => Product::filter(["search" => request("product")])->get()
             ),
-            "historyProductPurchase" => Inertia::lazy(
+            "productPurchase" => Inertia::lazy(
                 fn() => PurchaseDetail::historyProductPurchase(
                     request()->only("productNumber", "supplierId")
                 )
@@ -78,7 +78,7 @@ class PurchaseController extends Controller
                     ->get()
                     ->transform(
                         fn($purchaseDetail) => [
-                            "id" => $purchaseDetail->id,
+                            "number" => $purchaseDetail->product_number,
                             "price" => $purchaseDetail->price,
                             "qty" => $purchaseDetail->qty,
                             "ppn" => $purchaseDetail->purchase->ppn,

app/Models/StockProduct.php

@@ -35,11 +35,13 @@ class StockProduct extends Model
     public function scopeFilter($query, array $filters)
     {
         $query->when($filters["search"] ?? null, function ($query, $search) {
-            $query->whereHas("product", function ($query) use ($search) {
-                $query
-                    ->where("number", "like", "%" . $search . "%")
-                    ->orWhere("name", "like", "%" . $search . "%");
-            });
+            $query
+                ->whereHas("product", function ($query) use ($search) {
+                    $query
+                        ->where("number", "like", "%" . $search . "%")
+                        ->orWhere("name", "like", "%" . $search . "%");
+                })
+                ->where("qty", ">", 0);
         });
     }
 }

resources/js/components/AppAutoComplete.vue

@@ -67,6 +67,7 @@ const onSelect = (event) => {
     <label :for="forLabel">{{ label }}</label>
 
     <AutoComplete
+      forceSelection
       class="w-full"
       inputClass="w-full"
       :model-value="modelValue"

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

@@ -1,6 +1,6 @@
 <script setup>
 import { ref } from 'vue'
-import { IDRCurrencyFormat } from '@/utils/currencyFormat'
+import { IDRCurrencyFormat } from '@/utils/helpers'
 import AppInputNumber from '@/components/AppInputNumber.vue'
 import AppInputText from '@/components/AppInputText.vue'
 

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

@@ -1,5 +1,5 @@
 <script setup>
-import { IDRCurrencyFormat } from '@/utils/currencyFormat'
+import { IDRCurrencyFormat } from '@/utils/helpers'
 
 defineProps({
   title: String,

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

@@ -1,58 +0,0 @@
-<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/Composables/onShowDialog.js → resources/js/pages/Purchases/Composables/useDialog.js

@@ -1,9 +1,9 @@
-import { useDialog } from 'primevue/usedialog'
+import { useDialog as usePrimeDialog } from 'primevue/usedialog'
 import SupplierCreate from '../Components/SupplierCreate.vue'
 import ProductCreate from '../Components/ProductCreate.vue'
 
-export function onShowDialog() {
-  const dialog = useDialog()
+export function useDialog() {
+  const dialog = usePrimeDialog()
 
   const dialogStyle = {
     style: {

resources/js/pages/Purchases/Composables/useProductCart.js

@@ -1,24 +1,35 @@
 import { reactive } from 'vue'
-import FormValidationError from '@/utils/FormValidationError'
+import { FormValidationError } from '@/utils/helpers'
 
 export function useProductCart(form, initialProducts = []) {
   const productCart = reactive(initialProducts)
 
   const productCartDeleted = reactive([])
 
+  const productErrors = reactive([])
+
   const productValidation = () => {
-    const existProduct = productCart.find(
+    onClearProductErrors()
+
+    const productExists = productCart.find(
       (product) => product.number === form.product.number
     )
 
-    if (existProduct) {
-      throw new FormValidationError('Produk sudah ada dikeranjang', 'product')
+    if (productExists) {
+      productErrors.push({
+        message: 'Produk sudah ada dikeranjang',
+        field: 'product',
+      })
+    }
+
+    if (productErrors.length) {
+      throw new FormValidationError('form error', productErrors)
     }
   }
 
   const onAddProduct = () => {
     try {
-      form.clearErrors('product', 'price', 'qty')
+      form.clearErrors('product', 'qty')
 
       productValidation()
 
@@ -27,13 +38,15 @@ export function useProductCart(form, initialProducts = []) {
         number: form.product.number,
         name: form.product.name,
         price: form.price,
-        qty: form.qty,
+        qty: Number(form.qty),
         unit: form.product.unit,
       })
 
       form.reset('product', 'price', 'qty')
     } catch (e) {
-      form.setError(e.field, e.message)
+      e.errors.forEach((error) => {
+        form.setError(error.field, error.message)
+      })
     }
   }
 
@@ -56,6 +69,10 @@ export function useProductCart(form, initialProducts = []) {
     productCartDeleted.splice(0)
   }
 
+  const onClearProductErrors = () => {
+    productErrors.splice(0)
+  }
+
   const totalProductPrice = () => {
     const productPrices = productCart.map((product) => {
       if (form.checkedPpn) {
@@ -80,6 +97,7 @@ export function useProductCart(form, initialProducts = []) {
   return {
     productCart,
     productCartDeleted,
+    productErrors,
     onClearProductCart,
     onClearProductCartDelete,
     onAddProduct,

resources/js/pages/Purchases/Create.vue

@@ -1,12 +1,14 @@
 <script setup>
-import { computed } from 'vue'
+import { computed, watch, watchEffect } from 'vue'
+import { Inertia } from '@inertiajs/inertia'
+import { once } from 'lodash'
+import { ppn } from '@/utils/helpers'
 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 { useDialog } from './Composables/useDialog'
 import { useForm } from '@/composables/useForm'
 import AppInputText from '@/components/AppInputText.vue'
 import AppInputNumber from '@/components/AppInputNumber.vue'
@@ -25,7 +27,7 @@ const props = defineProps({
     type: Array,
     default: [],
   },
-  historyProductPurchase: Object,
+  productPurchase: Object,
 })
 
 const form = useForm({
@@ -56,20 +58,53 @@ const onSubmit = () => {
     })
 }
 
+watchEffect(() => {
+  if (props.productPurchase?.number) {
+    form.price = props.productPurchase.price
+
+    form.qty = props.productPurchase.qty
+  } else {
+    form.price = null
+  }
+})
+
+watch(
+  () => form.product,
+  () => {
+    if (form.product?.number) {
+      Inertia.reload({
+        data: {
+          productNumber: form.product.number,
+          supplierId: form.supplier.id,
+        },
+        only: ['productPurchase'],
+      })
+    }
+  }
+)
+
+const productUnit = computed(() => form.product?.unit)
+
+const productPurchasePrice = computed(() => props.productPurchase?.price)
+
+const productPurchasePpn = computed(() => props.productPurchase?.ppn)
+
+const productPurchaseQty = computed(() => props.productPurchase?.qty)
+
 const dropdownStatus = computed(() => {
   return optionStatus.filter((val) => val.value != 'success')
 })
 
 const {
   productCart,
+  productErrors,
   onClearProductCart,
   onAddProduct,
   onDeleteProduct,
-  onEditProduct,
   totalProductPrice,
 } = useProductCart(form)
 
-const { onShowCreateProduct, onShowCreateSupplier } = onShowDialog()
+const { onShowCreateProduct, onShowCreateSupplier } = useDialog()
 </script>
 
 <template>
@@ -144,7 +179,7 @@ const { onShowCreateProduct, onShowCreateSupplier } = onShowDialog()
                       field="name"
                       refresh-data="products"
                       v-model="form.product"
-                      :error="form.errors.products"
+                      :error="form.errors.product"
                       :suggestions="products"
                     >
                       <template #item="slotProps">
@@ -168,27 +203,50 @@ const { onShowCreateProduct, onShowCreateSupplier } = onShowDialog()
                     </AppAutoComplete>
                   </div>
 
-                  <div v-if="form.product?.number" class="col-12 md:col-6">
+                  <div class="col-12 md:col-6">
                     <AppInputText
                       disabled
                       label="Satuan"
                       placeholder="satuan"
-                      v-model="form.product.unit"
+                      v-model="productUnit"
                     />
                   </div>
 
                   <Divider type="dashed" />
 
-                  <HistoryProduct
-                    :product="form.product"
-                    :supplier="form.supplier"
-                  />
+                  <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="productPurchasePrice"
+                    />
+
+                    <span v-if="productPurchasePpn" class="text-xs">
+                      Harga sudah termasuk PPN {{ ppn }} %
+                    </span>
+                  </div>
+
+                  <div class="col-12 md:col-6">
+                    <AppInputText
+                      disabled
+                      label="Kuantitas"
+                      placeholder="kuantitas"
+                      type="number"
+                      v-model="productPurchaseQty"
+                    />
+                  </div>
 
                   <Divider type="dashed" />
 
                   <div class="col-12 md:col-6">
                     <AppInputNumber
-                      :disabled="!form.supplier?.id"
+                      :disabled="!form.product?.id"
                       label="Harga Terbaru"
                       placeholder="harga terbaru"
                       v-model="form.price"
@@ -197,7 +255,7 @@ const { onShowCreateProduct, onShowCreateSupplier } = onShowDialog()
 
                   <div class="col-12 md:col-6">
                     <AppInputText
-                      :disabled="!form.supplier?.id"
+                      :disabled="!form.product?.id"
                       label="Kuantitas"
                       placeholder="kuantitas"
                       type="number"
@@ -212,8 +270,12 @@ const { onShowCreateProduct, onShowCreateSupplier } = onShowDialog()
                     label="Tambah Produk"
                     icon="pi pi-check"
                     class="p-button-outlined"
+                    :class="{ 'p-button-danger': productErrors.length }"
                     :disabled="
-                      !form.price || !form.qty || !form.product?.number
+                      !form.price ||
+                      !Number(form.qty) ||
+                      !form.product?.number ||
+                      productErrors.length
                     "
                     @click="onAddProduct"
                   />
@@ -227,9 +289,9 @@ const { onShowCreateProduct, onShowCreateSupplier } = onShowDialog()
               title="Keranjang Produk"
               :product-cart="productCart"
               :header-table="cartTable"
+              :btn-edit-show="false"
               v-model:checked-ppn="form.checkedPpn"
               @delete="onDeleteProduct"
-              @edit="onEditProduct"
             />
           </div>
         </div>

resources/js/pages/Purchases/Show.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useForm } from '@/composables/useForm'
-import { IDRCurrencyFormat } from '@/utils/currencyFormat'
+import { IDRCurrencyFormat } from '@/utils/helpers'
 import { cartTable } from './config'
 import Cart from './Components/Cart.vue'
 import { useProductCart } from './Composables/useProductCart'

resources/js/pages/Sales/Composables/useProductCart.js

@@ -96,15 +96,6 @@ export function useProductCart(form, initialProducts = []) {
     )
   }
 
-  const onEditProduct = (event) => {
-    const { newData, index } = event
-
-    productCart[index] = {
-      ...newData,
-      label: 'edit',
-    }
-  }
-
   return {
     productCart,
     productCartDeleted,
@@ -113,7 +104,6 @@ export function useProductCart(form, initialProducts = []) {
     onClearProductCartDelete,
     onAddProduct,
     onDeleteProduct,
-    onEditProduct,
     totalProductPrice,
   }
 }

resources/js/pages/Sales/Show.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useForm } from '@/composables/useForm'
-import { IDRCurrencyFormat } from '@/utils/currencyFormat'
+import { IDRCurrencyFormat } from '@/utils/helpers'
 import { cartTable } from './config'
 import Cart from './Components/Cart.vue'
 import { useProductCart } from './Composables/useProductCart'