Merge pull request #156 from andrewdwallo/development-3.x

Development 3.x

app/Models/Accounting/Account.php

@@ -147,24 +147,40 @@ class Account extends Model
         return $this->hasMany(JournalEntry::class, 'account_id');
     }
 
-    public static function getAccountsReceivableAccount(): self
+    public static function getAccountsReceivableAccount(?int $companyId = null): self
     {
-        return self::where('name', 'Accounts Receivable')->firstOrFail();
+        return self::where('name', 'Accounts Receivable')
+            ->when($companyId, function (Builder $query) use ($companyId) {
+                $query->where('company_id', $companyId);
+            })
+            ->firstOrFail();
     }
 
-    public static function getAccountsPayableAccount(): self
+    public static function getAccountsPayableAccount(?int $companyId = null): self
     {
-        return self::where('name', 'Accounts Payable')->firstOrFail();
+        return self::where('name', 'Accounts Payable')
+            ->when($companyId, function (Builder $query) use ($companyId) {
+                $query->where('company_id', $companyId);
+            })
+            ->firstOrFail();
     }
 
-    public static function getSalesDiscountAccount(): self
+    public static function getSalesDiscountAccount(?int $companyId = null): self
     {
-        return self::where('name', 'Sales Discount')->firstOrFail();
+        return self::where('name', 'Sales Discount')
+            ->when($companyId, function (Builder $query) use ($companyId) {
+                $query->where('company_id', $companyId);
+            })
+            ->firstOrFail();
     }
 
-    public static function getPurchaseDiscountAccount(): self
+    public static function getPurchaseDiscountAccount(?int $companyId = null): self
     {
-        return self::where('name', 'Purchase Discount')->firstOrFail();
+        return self::where('name', 'Purchase Discount')
+            ->when($companyId, function (Builder $query) use ($companyId) {
+                $query->where('company_id', $companyId);
+            })
+            ->firstOrFail();
     }
 
     protected static function newFactory(): Factory

app/Models/Accounting/Bill.php

@@ -253,7 +253,7 @@ class Bill extends Document
             'amount' => $formattedAmountForBankCurrency,
             'payment_method' => $data['payment_method'],
             'bank_account_id' => $data['bank_account_id'],
-            'account_id' => Account::getAccountsPayableAccount()->id,
+            'account_id' => Account::getAccountsPayableAccount($this->company_id)->id,
             'description' => $transactionDescription,
             'notes' => $data['notes'] ?? null,
             'meta' => [
@@ -282,7 +282,7 @@ class Bill extends Document
         $transaction->journalEntries()->create([
             'company_id' => $this->company_id,
             'type' => JournalEntryType::Credit,
-            'account_id' => Account::getAccountsPayableAccount()->id,
+            'account_id' => Account::getAccountsPayableAccount($this->company_id)->id,
             'amount' => $total,
             'description' => $baseDescription,
         ]);
@@ -342,7 +342,7 @@ class Bill extends Document
                     $transaction->journalEntries()->create([
                         'company_id' => $this->company_id,
                         'type' => JournalEntryType::Credit,
-                        'account_id' => Account::getPurchaseDiscountAccount()->id,
+                        'account_id' => Account::getPurchaseDiscountAccount($this->company_id)->id,
                         'amount' => CurrencyConverter::convertCentsToFormatSimple($lineItemDiscount),
                         'description' => "{$lineItemDescription} (Proportional Discount)",
                     ]);

app/Models/Accounting/Invoice.php

@@ -337,7 +337,7 @@ class Invoice extends Document
             'amount' => $formattedAmountForBankCurrency,
             'payment_method' => $data['payment_method'],
             'bank_account_id' => $data['bank_account_id'],
-            'account_id' => Account::getAccountsReceivableAccount()->id,
+            'account_id' => Account::getAccountsReceivableAccount($this->company_id)->id,
             'description' => $transactionDescription,
             'notes' => $data['notes'] ?? null,
             'meta' => [
@@ -380,7 +380,7 @@ class Invoice extends Document
         $transaction->journalEntries()->create([
             'company_id' => $this->company_id,
             'type' => JournalEntryType::Debit,
-            'account_id' => Account::getAccountsReceivableAccount()->id,
+            'account_id' => Account::getAccountsReceivableAccount($this->company_id)->id,
             'amount' => $total,
             'description' => $baseDescription,
         ]);
@@ -430,7 +430,7 @@ class Invoice extends Document
                     $transaction->journalEntries()->create([
                         'company_id' => $this->company_id,
                         'type' => JournalEntryType::Debit,
-                        'account_id' => Account::getSalesDiscountAccount()->id,
+                        'account_id' => Account::getSalesDiscountAccount($this->company_id)->id,
                         'amount' => CurrencyConverter::convertCentsToFormatSimple($lineItemDiscount),
                         'description' => "{$lineItemDescription} (Proportional Discount)",
                     ]);