fix: sale master

app/Http/Controllers/SalesController.php

@@ -77,6 +77,7 @@ class SalesController extends Controller
                             "ppn" => $stockProduct->ppn,
                             "qty" => $stockProduct->qty,
                             "unit" => $stockProduct->product->unit,
+                            "profit" => $stockProduct->product->profit,
                         ]
                     )
             ),

resources/js/components/AppPassword.vue

@@ -53,6 +53,7 @@ const ariaDescribedbyLabel = computed(
     <Password
       class="w-full"
       input-class="w-full"
+      :class="{ 'p-invalid': isError }"
       :promptLabel="promptLabel"
       :weakLabel="weakLabel"
       :mediumLabel="mediumLabel"

resources/js/pages/Sales/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/Sales/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/Sales/Composables/onShowDialog.js → resources/js/pages/Sales/Composables/useDialog.js

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

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

@@ -1,39 +1,63 @@
 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(
-      (product) => product.number === form.product.number
-    )
+    onClearProductErrors()
+
+    productCart.find((product) => {
+      if (product.number === form.product.number) {
+        // productErrors.push({
+        //   message: 'Produk sudah ada dikeranjang',
+        //   field: 'product',
+        // })
+
+        if (form.qty + product.qty > form.product.qty) {
+          productErrors.push({
+            message: 'Stok tidak mencukupi',
+            field: 'qty',
+          })
+        }
+      }
+    })
 
-    if (existProduct) {
-      throw new FormValidationError('Produk sudah ada dikeranjang', 'product')
+    if (productErrors.length) {
+      throw new FormValidationError('form error', productErrors)
     }
   }
 
   const onAddProduct = () => {
     try {
-      form.clearErrors('product', 'price', 'qty')
+      form.clearErrors('product', 'qty')
 
       productValidation()
 
-      productCart.push({
-        label: 'add',
-        number: form.product.number,
-        name: form.product.name,
-        price: form.price,
-        qty: form.qty,
-        unit: form.product.unit,
+      productCart.find((product) => {
+        if (product.number === form.product.number) {
+          product.qty += form.qty
+        } else {
+          productCart.push({
+            label: 'add',
+            number: form.product.number,
+            name: form.product.name,
+            price: form.price,
+            qty: form.qty,
+            unit: form.product.unit,
+          })
+        }
       })
 
-      form.reset('product', 'price', 'qty')
+      form.reset('product', 'qty')
     } catch (e) {
-      form.setError(e.field, e.message)
+      e.errors.forEach((error) => {
+        form.setError(error.field, error.message)
+      })
     }
   }
 
@@ -56,6 +80,10 @@ export function useProductCart(form, initialProducts = []) {
     productCartDeleted.splice(0)
   }
 
+  const onClearProductErrors = () => {
+    productErrors.splice(0)
+  }
+
   const totalProductPrice = () => {
     const productPrices = productCart.map((product) => {
       if (form.checkedPpn) {
@@ -65,7 +93,10 @@ export function useProductCart(form, initialProducts = []) {
       }
     })
 
-    return productPrices.reduce((prev, current) => prev + current, 0)
+    return productPrices.reduce(
+      (prevPrice, currentPrice) => prevPrice + currentPrice,
+      0
+    )
   }
 
   const onEditProduct = (event) => {
@@ -80,6 +111,7 @@ export function useProductCart(form, initialProducts = []) {
   return {
     productCart,
     productCartDeleted,
+    productErrors,
     onClearProductCart,
     onClearProductCartDelete,
     onAddProduct,

resources/js/pages/Sales/Create.vue

@@ -1,11 +1,12 @@
 <script setup>
-import { computed } from 'vue'
+import { computed, watchEffect } from 'vue'
+import { profit } from '@/utils/helpers'
 import { optionStatus } from './config'
 import { cartTable } from './config'
 import Details from './Components/Details.vue'
 import Cart from './Components/Cart.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'
@@ -54,20 +55,34 @@ const onSubmit = () => {
     })
 }
 
+watchEffect(() => {
+  if (form.product?.number) {
+    form.price = profit(form.product.price, form.product.profit)
+
+    form.qty = 1
+  }
+})
+
 const dropdownStatus = computed(() => {
   return optionStatus.filter((val) => val.value != 'pending')
 })
 
+const profitDescription = computed(() => {
+  const priceProfit = profit(form.product?.price, form.product?.profit)
+
+  return form.price === priceProfit ? true : false
+})
+
 const {
   productCart,
+  productErrors,
   onAddProduct,
   onClearProductCart,
   onDeleteProduct,
-  onEditProduct,
   totalProductPrice,
 } = useProductCart(form)
 
-const { onShowCustomerCreate } = onShowDialog()
+const { onShowCustomerCreate } = useDialog()
 </script>
 
 <template>
@@ -142,7 +157,7 @@ const { onShowCustomerCreate } = onShowDialog()
                       field="name"
                       refresh-data="stockProducts"
                       v-model="form.product"
-                      :error="form.errors.products"
+                      :error="form.errors.product"
                       :suggestions="stockProducts"
                     >
                       <template #item="slotProps">
@@ -202,22 +217,23 @@ const { onShowCustomerCreate } = onShowDialog()
                   <div class="col-12 md:col-6">
                     <AppInputNumber
                       class="m-0"
-                      :disabled="!form.customer?.id"
+                      :disabled="!form.product?.number"
                       label="Harga Jual"
                       placeholder="harga jual"
                       v-model="form.price"
                     />
-                    <span v-if="form.product?.number" class="text-xs">
-                      Sudah termasuk profit 30%
+                    <span v-if="profitDescription" class="text-xs">
+                      Sudah termasuk profit {{ form.product.profit }} %
                     </span>
                   </div>
 
                   <div class="col-12 md:col-6">
                     <AppInputText
-                      :disabled="!form.customer?.id"
+                      :disabled="!form.product?.number"
                       label="Kuantitas"
                       placeholder="kuantitas"
                       type="number"
+                      :error="form.errors.qty"
                       v-model="form.qty"
                     />
                   </div>
@@ -229,6 +245,7 @@ const { onShowCustomerCreate } = 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
                     "
@@ -244,9 +261,9 @@ const { onShowCustomerCreate } = 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/utils/helpers.js

@@ -0,0 +1,30 @@
+export function ppn(price, percent) {
+  return price + price * (percent / 100)
+}
+
+export function profit(price, percent) {
+  return ppn(price, percent)
+}
+
+export function discount(price, percent) {
+  return price - price * (percent / 100)
+}
+
+export const IDRCurrencyFormat = (number, decimal = false) => {
+  if (number === null) {
+    return
+  }
+
+  if (decimal) {
+    return 'Rp' + number.toLocaleString('id') + ',00'
+  } else {
+    return 'Rp' + number.toLocaleString('id')
+  }
+}
+
+export class FormValidationError extends Error {
+  constructor(message, errors) {
+    super(message)
+    this.errors = errors
+  }
+}