wip

database/factories/Accounting/BillFactory.php

@@ -162,7 +162,7 @@ class BillFactory extends Factory
                     'posted_at' => $postedAt,
                     'amount' => CurrencyConverter::convertCentsToFormatSimple($amount, $bill->currency_code),
                     'payment_method' => $this->faker->randomElement(PaymentMethod::class),
-                    'bank_account_id' => BankAccount::inRandomOrder()->value('id'),
+                    'bank_account_id' => BankAccount::where('company_id', $bill->company_id)->inRandomOrder()->value('id'),
                     'notes' => $this->faker->sentence,
                 ];
 
@@ -224,16 +224,18 @@ class BillFactory extends Factory
             return;
         }
 
-        $subtotal = $bill->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $bill->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $bill->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $bill->lineItems()->sum('subtotal');
+        $taxTotalCents = $bill->lineItems()->sum('tax_total');
+        $discountTotalCents = $bill->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $bill->currency_code;
 
         $bill->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

database/factories/Accounting/EstimateFactory.php

@@ -8,6 +8,7 @@ use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
+use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -204,16 +205,18 @@ class EstimateFactory extends Factory
             return;
         }
 
-        $subtotal = $estimate->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $estimate->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $estimate->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $estimate->lineItems()->sum('subtotal');
+        $taxTotalCents = $estimate->lineItems()->sum('tax_total');
+        $discountTotalCents = $estimate->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $estimate->currency_code;
 
         $estimate->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

database/factories/Accounting/InvoiceFactory.php

@@ -180,7 +180,7 @@ class InvoiceFactory extends Factory
                     'posted_at' => $postedAt,
                     'amount' => CurrencyConverter::convertCentsToFormatSimple($amount, $invoice->currency_code),
                     'payment_method' => $this->faker->randomElement(PaymentMethod::class),
-                    'bank_account_id' => BankAccount::inRandomOrder()->value('id'),
+                    'bank_account_id' => BankAccount::where('company_id', $invoice->company_id)->inRandomOrder()->value('id'),
                     'notes' => $this->faker->sentence,
                 ];
 
@@ -249,16 +249,18 @@ class InvoiceFactory extends Factory
             return;
         }
 
-        $subtotal = $invoice->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $invoice->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $invoice->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $invoice->lineItems()->sum('subtotal');
+        $taxTotalCents = $invoice->lineItems()->sum('tax_total');
+        $discountTotalCents = $invoice->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $invoice->currency_code;
 
         $invoice->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

database/factories/Accounting/RecurringInvoiceFactory.php

@@ -14,6 +14,7 @@ use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\RecurringInvoice;
 use App\Models\Common\Client;
 use App\Models\Company;
+use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -298,16 +299,18 @@ class RecurringInvoiceFactory extends Factory
             return;
         }
 
-        $subtotal = $recurringInvoice->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $recurringInvoice->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $recurringInvoice->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $recurringInvoice->lineItems()->sum('subtotal');
+        $taxTotalCents = $recurringInvoice->lineItems()->sum('tax_total');
+        $discountTotalCents = $recurringInvoice->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $recurringInvoice->currency_code;
 
         $recurringInvoice->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

tests/TestCase.php

@@ -51,9 +51,7 @@ abstract class TestCase extends BaseTestCase
     {
         Offering::factory()
             ->for($this->testCompany)
-            ->sellable()
             ->withSalesAdjustments()
-            ->purchasable()
             ->withPurchaseAdjustments()
             ->create();