fix: purchase master

app/Http/Controllers/PurchaseController.php

@@ -84,13 +84,11 @@ class PurchaseController extends Controller
         DB::beginTransaction();
 
         try {
-            $ppn = Ppn::first()->ppn;
-
             $validated = $request
                 ->safe()
                 ->merge([
                     "user_id" => auth()->user()->id,
-                    "ppn" => $request->ppn ? $ppn : 0,
+                    "ppn" => $request->ppn ? true : false,
                 ])
                 ->all();
 
@@ -190,12 +188,10 @@ class PurchaseController extends Controller
         DB::beginTransaction();
 
         try {
-            $ppn = Ppn::first()->ppn;
-
             $validated = $request
                 ->safe()
                 ->merge([
-                    "ppn" => $request->ppn ? $ppn : 0,
+                    "ppn" => $request->ppn ? true : false,
                 ])
                 ->all();
 
@@ -227,23 +223,52 @@ class PurchaseController extends Controller
                 }
 
                 if ($request->status == "success") {
-                    $validated = [
-                        "purchase_number" => $purchase->number,
-                        "price" => $product["price"],
-                        "qty" => $product["qty"],
-                        "product_number" => $product["number"],
-                    ];
+                    $stockProduct = StockProduct::where(
+                        "product_number",
+                        $product["number"]
+                    );
+
+                    if ($stockProduct->exists()) {
+                        $validated = [
+                            "price" =>
+                                $stockProduct->first()->price >
+                                $product["price"]
+                                    ? $stockProduct->first()->price
+                                    : $product["price"],
+                            "ppn" => $request->ppn ? true : false,
+                        ];
 
-                    StockProduct::create($validated);
+                        $stockProduct->increment(
+                            "qty",
+                            $product["qty"],
+                            $validated
+                        );
+                    } else {
+                        $validated = [
+                            "price" => $product["price"],
+                            "ppn" => $request->ppn ? true : false,
+                            "qty" => $product["qty"],
+                            "product_number" => $product["number"],
+                        ];
+
+                        StockProduct::create($validated);
+                    }
                 }
             }
 
             DB::commit();
 
-            return back()->with(
-                "success",
-                __("messages.success.update.purchase")
-            );
+            if ($request->status == "success") {
+                return to_route("purchases.show", $purchase)->with(
+                    "success",
+                    __("messages.success.update.purchase")
+                );
+            } else {
+                return back()->with(
+                    "success",
+                    __("messages.success.update.purchase")
+                );
+            }
         } catch (QueryException $e) {
             DB::rollBack();
 

app/Models/StockProduct.php

@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Services\HelperService;
-use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -11,22 +9,7 @@ class StockProduct extends Model
 {
     use HasFactory;
 
-    protected $fillable = [
-        "purchase_number",
-        "sale_number",
-        "price",
-        "qty",
-        "product_number",
-    ];
-
-    protected function price(): Attribute
-    {
-        $ppn = Purchase::where("number", $this->purchase_number)->first()->ppn;
-
-        return Attribute::make(
-            get: fn($value) => HelperService::addPPN($value, $ppn)
-        );
-    }
+    protected $fillable = ["price", "qty", "ppn", "product_number"];
 
     public function product()
     {

database/migrations/2022_06_16_092657_create_stock_products_table.php

@@ -13,17 +13,9 @@ return new class extends Migration {
     public function up()
     {
         Schema::create("stock_products", function (Blueprint $table) {
-            $table->id();
-            $table
-                ->string("purchase_number")
-                ->nullable()
-                ->default(null);
-            $table
-                ->string("sale_number")
-                ->nullable()
-                ->default(null);
             $table->unsignedInteger("price");
             $table->integer("qty");
+            $table->unsignedTinyInteger("ppn");
             $table->string("product_number");
             $table
                 ->foreign("product_number")

resources/js/pages/Purchases/Create.vue

@@ -49,7 +49,7 @@ const onSubmit = () => {
       onSuccess: () => {
         form.reset()
 
-        onClearProduct()
+        onClearProductCart()
       },
     })
 }
@@ -60,10 +60,10 @@ const dropdownStatus = computed(() => {
 
 const {
   productCart,
+  onClearProductCart,
   onAddProduct,
   onDeleteProduct,
   onEditProduct,
-  onClearProduct,
   totalProductPrice,
 } = useProductCart(form)