Fix minor issues

app/Http/Requests/CompaniesRequest.php

@@ -3,7 +3,6 @@
 namespace Crater\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 
 class CompaniesRequest extends FormRequest
@@ -34,6 +33,9 @@ class CompaniesRequest extends FormRequest
             'currency' => [
                 'required'
             ],
+            'currency' => [
+                'required'
+            ],
             'address.name' => [
                 'nullable',
             ],
@@ -71,8 +73,7 @@ class CompaniesRequest extends FormRequest
                 'name'
             ])
             ->merge([
-                'owner_id' => $this->user()->id,
+                'owner_id' => $this->user()->id
-                'slug' => Str::slug($this->name)
             ])
             ->toArray();
     }

app/Models/Company.php

@@ -217,7 +217,7 @@ class Company extends Model implements HasMedia
             'estimate_billing_address_format' => $billingAddressFormat,
             'payment_company_address_format' => $companyAddressFormat,
             'payment_from_customer_address_format' => $paymentFromCustomerAddress,
-            'currency' => request()->currency ?? 13,
+            'currency' => request()->currency ?? 1,
             'time_zone' => 'Asia/Kolkata',
             'language' => 'en',
             'fiscal_year' => '1-12',

tests/Feature/Admin/EstimateTest.php

@@ -415,32 +415,31 @@ test('update estimate with EUR currency', function () {
 
     $response = putJson('api/v1/estimates/'.$estimate->id, $estimate2);
 
-    $this->assertDatabaseHas('estimates', [
+    $estimate_assert = collect($estimate2)
-        'id' => $estimate['id'],
+        ->only([
-        'template_name' => $estimate2['template_name'],
+            'id',
-        'estimate_number' => $estimate2['estimate_number'],
+            'template_name',
-        'discount_type' => $estimate2['discount_type'],
+            'estimate_number',
-        'discount_val' => $estimate2['discount_val'],
+            'discount_type',
-        'sub_total' => $estimate2['sub_total'],
+            'discount_val',
-        'discount' => $estimate2['discount'],
+            'sub_total',
-        'customer_id' => $estimate2['customer_id'],
+            'discount',
-        'total' => $estimate2['total'],
+            'customer_id',
-        'tax' => $estimate2['tax'],
+            'total',
-        'exchange_rate' => $estimate2['exchange_rate'],
+            'tax'
-        'base_discount_val' => $estimate2['base_discount_val'],
+        ])
-        'base_sub_total' => $estimate2['base_sub_total'],
+        ->toArray();
-        'base_total' => $estimate2['base_total'],
-        'base_tax' => $estimate2['base_tax'],
-    ]);
 
-    $this->assertDatabaseHas('estimate_items', [
+    $this->assertDatabaseHas('estimates', $estimate_assert);
-        'estimate_id' => $estimate2['items'][0]['estimate_id'],
+
-        'exchange_rate' => $estimate2['items'][0]['exchange_rate'],
+    $estimate_item_assert = collect($estimate2['items'][0])
-        'base_price' => $estimate2['items'][0]['base_price'],
+        ->only([
-        'base_discount_val' => $estimate2['items'][0]['base_discount_val'],
+            'estimate_id',
-        'base_tax' => $estimate2['items'][0]['base_tax'],
+            'amount'
-        'base_total' => $estimate2['items'][0]['base_total'],
+        ])
-    ]);
+        ->toArray();
+
+    $this->assertDatabaseHas('estimate_items', $estimate_item_assert);
 
     $response->assertStatus(200);
 });

tests/Feature/Admin/ExpenseTest.php

@@ -37,13 +37,15 @@ test('create expense', function () {
 
     postJson('api/v1/expenses', $expense)->assertStatus(201);
 
-    $this->assertDatabaseHas('expenses', [
+    $expense = collect($expense)
-        'notes' => $expense['notes'],
+        ->only([
-        'expense_category_id' => $expense['expense_category_id'],
+            'notes',
-        'amount' => $expense['amount'],
+            'expense_category_id',
-        'exchange_rate' => $expense['exchange_rate'],
+            'amount'
-        'base_amount' => $expense['base_amount'],
+        ])
-    ]);
+        ->toArray();
+
+    $this->assertDatabaseHas('expenses', $expense);
 });
 
 test('store validates using a form request', function () {
@@ -146,11 +148,13 @@ test('update expense with EUR currency', function () {
 
     putJson('api/v1/expenses/'.$expense->id, $expense2)->assertOk();
 
-    $this->assertDatabaseHas('expenses', [
+    $expense2 = collect($expense2)
-        'id' => $expense->id,
+        ->only([
-        'expense_category_id' => $expense2['expense_category_id'],
+            'id',
-        'amount' => $expense2['amount'],
+            'expense_category_id',
-        'exchange_rate' => $expense2['exchange_rate'],
+            'amount'
-        'base_amount' => $expense2['base_amount'],
+        ])
-    ]);
+        ->toArray();
+
+    $this->assertDatabaseHas('expenses', $expense2);
 });

tests/Feature/Admin/InvoiceTest.php

@@ -9,7 +9,6 @@ use Crater\Models\Tax;
 use Crater\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
-
 use function Pest\Laravel\getJson;
 use function Pest\Laravel\postJson;
 use function Pest\Laravel\putJson;
@@ -431,31 +430,36 @@ test('update invoice with EUR currency', function () {
 
     putJson('api/v1/invoices/'.$invoice->id, $invoice2)->assertOk();
 
-    $this->assertDatabaseHas('invoices', [
+    $invoice_assert = collect($invoice2)
-        'id' => $invoice['id'],
+        ->only([
-        'invoice_number' => $invoice2['invoice_number'],
+            'invoice_number',
-        'sub_total' => $invoice2['sub_total'],
+            'template_name',
-        'total' => $invoice2['total'],
+            'sub_total',
-        'tax' => $invoice2['tax'],
+            'total',
-        'discount' => $invoice2['discount'],
+            'tax',
-        'customer_id' => $invoice2['customer_id'],
+            'discount',
-        'template_name' => $invoice2['template_name'],
+            'customer_id',
-        'exchange_rate' => $invoice2['exchange_rate'],
+        ])
-        'base_total' => $invoice2['base_total'],
+        ->toArray();
-    ]);
 
-    $this->assertDatabaseHas('invoice_items', [
+    $this->assertDatabaseHas('invoices', $invoice_assert);
-        'invoice_id' => $invoice2['items'][0]['invoice_id'],
-        'item_id' => $invoice2['items'][0]['item_id'],
-        'name' => $invoice2['items'][0]['name'],
-        'exchange_rate' => $invoice2['items'][0]['exchange_rate'],
-        'base_price' => $invoice2['items'][0]['base_price'],
-        'base_total' => $invoice2['items'][0]['base_total'],
-    ]);
 
-    $this->assertDatabaseHas('taxes', [
+    $invoice_item_assert = collect($invoice2['items'][0])
-        'amount' => $invoice2['taxes'][0]['amount'],
+        ->only([
-        'name' => $invoice2['taxes'][0]['name'],
+            'invoice_id',
-        'base_amount' => $invoice2['taxes'][0]['base_amount'],
+            'item_id',
-    ]);
+            'name',
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('invoice_items', $invoice_item_assert);
+
+    $invoice_tax_assert = collect($invoice2['taxes'][0])
+        ->only([
+            'name',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('taxes', $invoice_tax_assert);
 });