fix merge conflict

Author: khalidmaquilang

app/Observers/ProductObserver.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Observers;
+
+use Filament\Facades\Filament;
+use Illuminate\Database\Eloquent\Model;
+
+class ProductObserver extends BaseObserver
+{
+    /**
+     * Handle the Model "creating" event.
+     */
+    public function creating(Model $model): void
+    {
+        if (auth()->check()) {
+            $model->company_id = Filament::getTenant()->id;
+        }
+    }
+}

app/Providers/AppServiceProvider.php

@@ -8,6 +8,7 @@
 use App\Models\GoodsReceipt;
 use App\Models\Inventory;
 use App\Models\Payment;
+use App\Models\Product;
 use App\Models\PurchaseOrder;
 use App\Models\PurchaseOrderItem;
 use App\Models\Sale;
@@ -19,6 +20,7 @@
 use App\Observers\GoodsReceiptObserver;
 use App\Observers\InventoryObserver;
 use App\Observers\PaymentObserver;
+use App\Observers\ProductObserver;
 use App\Observers\PurchaseOrderItemObserver;
 use App\Observers\PurchaseOrderObserver;
 use App\Observers\SaleItemObserver;
@@ -59,6 +61,8 @@ public function boot(): void
         GoodsReceipt::observe(GoodsReceiptObserver::class);
         Payment::observe(PaymentObserver::class);
         GoodsIssue::observe(GoodsIssueObserver::class);
+        Product::observe(ProductObserver::class);
+        Inventory::observe(InventoryObserver::class);
 
         Event::subscribe(StockMovementSubscriber::class);
     }