From ab153963e4b7a9a9c1e85c7822f0d870a590d555 Mon Sep 17 00:00:00 2001 From: Harsh Jagad Date: Sat, 19 Feb 2022 09:50:46 +0000 Subject: [PATCH] Fix master issues --- app/Console/Kernel.php | 5 +- app/Http/Middleware/ConfigMiddleware.php | 10 -- tests/Feature/Admin/ReportTest.php | 96 ---------------- tests/Unit/{Model => }/AddressTest.php | 0 tests/Unit/{Model => }/CompanySettingTest.php | 0 tests/Unit/{Model => }/CompanyTest.php | 0 tests/Unit/{Model => }/CountryTest.php | 0 tests/Unit/{Model => }/CustomFieldTest.php | 0 .../Unit/{Model => }/CustomFieldValueTest.php | 0 tests/Unit/{Model => }/CustomerTest.php | 0 tests/Unit/{Model => }/EstimateItemTest.php | 0 tests/Unit/{Model => }/EstimateTest.php | 0 .../Unit/{Model => }/ExchangeRateLogTest.php | 0 .../Unit/{Model => }/ExpenseCategoryTest.php | 0 tests/Unit/{Model => }/ExpenseTest.php | 0 tests/Unit/{Model => }/InvoiceItemTest.php | 0 tests/Unit/{Model => }/InvoiceTest.php | 0 tests/Unit/{Model => }/ItemTest.php | 0 tests/Unit/{Model => }/PaymentMethodTest.php | 0 tests/Unit/{Model => }/PaymentTest.php | 0 .../Unit/{Model => }/RecurringInvoiceTest.php | 0 tests/Unit/Request/BulkExchangeRateTest.php | 29 ----- tests/Unit/Request/CompaniesTest.php | 55 --------- tests/Unit/Request/CompanyTest.php | 30 ----- tests/Unit/Request/CustomFieldTest.php | 27 ----- .../Request/Customer/CustomerLoginTest.php | 27 ----- .../Request/Customer/CustomerProfileTest.php | 92 --------------- tests/Unit/Request/CustomerTest.php | 106 ------------------ tests/Unit/Request/EstimateTest.php | 74 ------------ tests/Unit/Request/ExchangeRateLogTest.php | 25 ----- .../Unit/Request/ExchangeRateProviderTest.php | 38 ------- tests/Unit/Request/ExpenseCategoryTest.php | 25 ----- tests/Unit/Request/ExpenseTest.php | 49 -------- tests/Unit/Request/GetSettingsRequestTest.php | 27 ----- tests/Unit/Request/InvoiceTest.php | 74 ------------ tests/Unit/Request/ItemTest.php | 31 ----- tests/Unit/Request/LoginTest.php | 28 ----- tests/Unit/Request/NoteTest.php | 32 ------ tests/Unit/Request/PaymentMethodTest.php | 25 ----- tests/Unit/Request/PaymentTest.php | 45 -------- tests/Unit/Request/ProfileTest.php | 32 ------ tests/Unit/Request/RecurringInvoiceTest.php | 68 ----------- tests/Unit/Request/RoleTest.php | 31 ----- tests/Unit/Request/TaxTypeTest.php | 40 ------- tests/Unit/Request/UnitTest.php | 25 ----- .../Request/UpdateSettingsRequestTest.php | 23 ---- tests/Unit/Request/UserTest.php | 44 -------- tests/Unit/{Model => }/SettingTest.php | 0 tests/Unit/{Model => }/TaxTest.php | 0 tests/Unit/{Model => }/TaxTypeTest.php | 0 tests/Unit/{Model => }/UnitTest.php | 0 tests/Unit/{Model => }/UserTest.php | 0 52 files changed, 4 insertions(+), 1209 deletions(-) delete mode 100644 tests/Feature/Admin/ReportTest.php rename tests/Unit/{Model => }/AddressTest.php (100%) rename tests/Unit/{Model => }/CompanySettingTest.php (100%) rename tests/Unit/{Model => }/CompanyTest.php (100%) rename tests/Unit/{Model => }/CountryTest.php (100%) rename tests/Unit/{Model => }/CustomFieldTest.php (100%) rename tests/Unit/{Model => }/CustomFieldValueTest.php (100%) rename tests/Unit/{Model => }/CustomerTest.php (100%) rename tests/Unit/{Model => }/EstimateItemTest.php (100%) rename tests/Unit/{Model => }/EstimateTest.php (100%) rename tests/Unit/{Model => }/ExchangeRateLogTest.php (100%) rename tests/Unit/{Model => }/ExpenseCategoryTest.php (100%) rename tests/Unit/{Model => }/ExpenseTest.php (100%) rename tests/Unit/{Model => }/InvoiceItemTest.php (100%) rename tests/Unit/{Model => }/InvoiceTest.php (100%) rename tests/Unit/{Model => }/ItemTest.php (100%) rename tests/Unit/{Model => }/PaymentMethodTest.php (100%) rename tests/Unit/{Model => }/PaymentTest.php (100%) rename tests/Unit/{Model => }/RecurringInvoiceTest.php (100%) delete mode 100644 tests/Unit/Request/BulkExchangeRateTest.php delete mode 100644 tests/Unit/Request/CompaniesTest.php delete mode 100644 tests/Unit/Request/CompanyTest.php delete mode 100644 tests/Unit/Request/CustomFieldTest.php delete mode 100644 tests/Unit/Request/Customer/CustomerLoginTest.php delete mode 100644 tests/Unit/Request/Customer/CustomerProfileTest.php delete mode 100644 tests/Unit/Request/CustomerTest.php delete mode 100644 tests/Unit/Request/EstimateTest.php delete mode 100644 tests/Unit/Request/ExchangeRateLogTest.php delete mode 100644 tests/Unit/Request/ExchangeRateProviderTest.php delete mode 100644 tests/Unit/Request/ExpenseCategoryTest.php delete mode 100644 tests/Unit/Request/ExpenseTest.php delete mode 100644 tests/Unit/Request/GetSettingsRequestTest.php delete mode 100644 tests/Unit/Request/InvoiceTest.php delete mode 100644 tests/Unit/Request/ItemTest.php delete mode 100644 tests/Unit/Request/LoginTest.php delete mode 100644 tests/Unit/Request/NoteTest.php delete mode 100644 tests/Unit/Request/PaymentMethodTest.php delete mode 100644 tests/Unit/Request/PaymentTest.php delete mode 100644 tests/Unit/Request/ProfileTest.php delete mode 100644 tests/Unit/Request/RecurringInvoiceTest.php delete mode 100644 tests/Unit/Request/RoleTest.php delete mode 100644 tests/Unit/Request/TaxTypeTest.php delete mode 100644 tests/Unit/Request/UnitTest.php delete mode 100644 tests/Unit/Request/UpdateSettingsRequestTest.php delete mode 100644 tests/Unit/Request/UserTest.php rename tests/Unit/{Model => }/SettingTest.php (100%) rename tests/Unit/{Model => }/TaxTest.php (100%) rename tests/Unit/{Model => }/TaxTypeTest.php (100%) rename tests/Unit/{Model => }/UnitTest.php (100%) rename tests/Unit/{Model => }/UserTest.php (100%) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 38e218e3..c6de89c0 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -2,6 +2,7 @@ namespace Crater\Console; +use Crater\Models\CompanySetting; use Crater\Models\RecurringInvoice; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; @@ -37,9 +38,11 @@ class Kernel extends ConsoleKernel $recurringInvoices = RecurringInvoice::where('status', 'ACTIVE')->get(); foreach ($recurringInvoices as $recurringInvoice) { + $timeZone = CompanySetting::getSetting('time_zone', $recurringInvoice->company_id); + $schedule->call(function () use ($recurringInvoice) { $recurringInvoice->generateInvoice(); - })->cron($recurringInvoice->frequency); + })->cron($recurringInvoice->frequency)->timezone($timeZone); } } } diff --git a/app/Http/Middleware/ConfigMiddleware.php b/app/Http/Middleware/ConfigMiddleware.php index b9ef1274..2bcfc07f 100644 --- a/app/Http/Middleware/ConfigMiddleware.php +++ b/app/Http/Middleware/ConfigMiddleware.php @@ -3,7 +3,6 @@ namespace Crater\Http\Middleware; use Closure; -use Crater\Models\CompanySetting; use Crater\Models\FileDisk; class ConfigMiddleware @@ -18,15 +17,6 @@ class ConfigMiddleware public function handle($request, Closure $next) { if (\Storage::disk('local')->has('database_created')) { - $setting = CompanySetting::getSetting('time_zone', $request->header('company')); - - $timezone = config('app.timezone'); - - if ($setting && $setting != null && $setting != $timezone) { - config(['app.timezone' => $setting]); - date_default_timezone_set($setting); - } - if ($request->has('file_disk_id')) { $file_disk = FileDisk::find($request->file_disk_id); } else { diff --git a/tests/Feature/Admin/ReportTest.php b/tests/Feature/Admin/ReportTest.php deleted file mode 100644 index f13adb00..00000000 --- a/tests/Feature/Admin/ReportTest.php +++ /dev/null @@ -1,96 +0,0 @@ - 'DatabaseSeeder', '--force' => true]); - Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]); - - $user = User::find(1); - $this->withHeaders([ - 'company' => $user->companies()->first()->id, - ]); - Sanctum::actingAs( - $user, - ['*'] - ); -}); - -test('get customer sales report', function () { - $filters = [ - 'page' => 1, - 'limit' => 15, - 'from_date' => '2020-07-18', - 'to_date' => '2020-07-20', - ]; - $queryString = http_build_query($filters, '', '&'); - $queryString = Company::find(1)->unique_hash.'?'.$queryString; - - $response = getJson('reports/sales/customers/'.$queryString); - - $response->assertOk(); -}); - -test('get item sales report', function () { - $filters = [ - 'page' => 1, - 'limit' => 15, - 'from_date' => '2020-07-18', - 'to_date' => '2020-07-20', - ]; - $queryString = http_build_query($filters, '', '&'); - $queryString = Company::find(1)->unique_hash.'?'.$queryString; - - $response = getJson('reports/sales/items/'.$queryString); - - $response->assertOk(); -}); - -test('get expenses report', function () { - $filters = [ - 'page' => 1, - 'limit' => 15, - 'from_date' => '2020-07-18', - 'to_date' => '2020-07-20', - ]; - $queryString = http_build_query($filters, '', '&'); - $queryString = Company::find(1)->unique_hash.'?'.$queryString; - - $response = getJson('reports/expenses/'.$queryString); - - $response->assertOk(); -}); - -test('get tax summary', function () { - $filters = [ - 'page' => 1, - 'limit' => 15, - 'from_date' => '2020-07-18', - 'to_date' => '2020-07-20', - ]; - $queryString = http_build_query($filters, '', '&'); - $queryString = Company::find(1)->unique_hash.'?'.$queryString; - - $response = getJson('reports/tax-summary/'.$queryString); - - $response->assertOk(); -}); - -test('get profit loss', function () { - $filters = [ - 'page' => 1, - 'limit' => 15, - 'from_date' => '2020-07-18', - 'to_date' => '2020-07-20', - ]; - $queryString = http_build_query($filters, '', '&'); - $queryString = Company::find(1)->unique_hash.'?'.$queryString; - - $response = getJson('reports/profit-loss/'.$queryString); - - $response->assertOk(); -}); diff --git a/tests/Unit/Model/AddressTest.php b/tests/Unit/AddressTest.php similarity index 100% rename from tests/Unit/Model/AddressTest.php rename to tests/Unit/AddressTest.php diff --git a/tests/Unit/Model/CompanySettingTest.php b/tests/Unit/CompanySettingTest.php similarity index 100% rename from tests/Unit/Model/CompanySettingTest.php rename to tests/Unit/CompanySettingTest.php diff --git a/tests/Unit/Model/CompanyTest.php b/tests/Unit/CompanyTest.php similarity index 100% rename from tests/Unit/Model/CompanyTest.php rename to tests/Unit/CompanyTest.php diff --git a/tests/Unit/Model/CountryTest.php b/tests/Unit/CountryTest.php similarity index 100% rename from tests/Unit/Model/CountryTest.php rename to tests/Unit/CountryTest.php diff --git a/tests/Unit/Model/CustomFieldTest.php b/tests/Unit/CustomFieldTest.php similarity index 100% rename from tests/Unit/Model/CustomFieldTest.php rename to tests/Unit/CustomFieldTest.php diff --git a/tests/Unit/Model/CustomFieldValueTest.php b/tests/Unit/CustomFieldValueTest.php similarity index 100% rename from tests/Unit/Model/CustomFieldValueTest.php rename to tests/Unit/CustomFieldValueTest.php diff --git a/tests/Unit/Model/CustomerTest.php b/tests/Unit/CustomerTest.php similarity index 100% rename from tests/Unit/Model/CustomerTest.php rename to tests/Unit/CustomerTest.php diff --git a/tests/Unit/Model/EstimateItemTest.php b/tests/Unit/EstimateItemTest.php similarity index 100% rename from tests/Unit/Model/EstimateItemTest.php rename to tests/Unit/EstimateItemTest.php diff --git a/tests/Unit/Model/EstimateTest.php b/tests/Unit/EstimateTest.php similarity index 100% rename from tests/Unit/Model/EstimateTest.php rename to tests/Unit/EstimateTest.php diff --git a/tests/Unit/Model/ExchangeRateLogTest.php b/tests/Unit/ExchangeRateLogTest.php similarity index 100% rename from tests/Unit/Model/ExchangeRateLogTest.php rename to tests/Unit/ExchangeRateLogTest.php diff --git a/tests/Unit/Model/ExpenseCategoryTest.php b/tests/Unit/ExpenseCategoryTest.php similarity index 100% rename from tests/Unit/Model/ExpenseCategoryTest.php rename to tests/Unit/ExpenseCategoryTest.php diff --git a/tests/Unit/Model/ExpenseTest.php b/tests/Unit/ExpenseTest.php similarity index 100% rename from tests/Unit/Model/ExpenseTest.php rename to tests/Unit/ExpenseTest.php diff --git a/tests/Unit/Model/InvoiceItemTest.php b/tests/Unit/InvoiceItemTest.php similarity index 100% rename from tests/Unit/Model/InvoiceItemTest.php rename to tests/Unit/InvoiceItemTest.php diff --git a/tests/Unit/Model/InvoiceTest.php b/tests/Unit/InvoiceTest.php similarity index 100% rename from tests/Unit/Model/InvoiceTest.php rename to tests/Unit/InvoiceTest.php diff --git a/tests/Unit/Model/ItemTest.php b/tests/Unit/ItemTest.php similarity index 100% rename from tests/Unit/Model/ItemTest.php rename to tests/Unit/ItemTest.php diff --git a/tests/Unit/Model/PaymentMethodTest.php b/tests/Unit/PaymentMethodTest.php similarity index 100% rename from tests/Unit/Model/PaymentMethodTest.php rename to tests/Unit/PaymentMethodTest.php diff --git a/tests/Unit/Model/PaymentTest.php b/tests/Unit/PaymentTest.php similarity index 100% rename from tests/Unit/Model/PaymentTest.php rename to tests/Unit/PaymentTest.php diff --git a/tests/Unit/Model/RecurringInvoiceTest.php b/tests/Unit/RecurringInvoiceTest.php similarity index 100% rename from tests/Unit/Model/RecurringInvoiceTest.php rename to tests/Unit/RecurringInvoiceTest.php diff --git a/tests/Unit/Request/BulkExchangeRateTest.php b/tests/Unit/Request/BulkExchangeRateTest.php deleted file mode 100644 index 2950f9d0..00000000 --- a/tests/Unit/Request/BulkExchangeRateTest.php +++ /dev/null @@ -1,29 +0,0 @@ -assertEquals( - [ - 'currencies' => [ - 'required' - ], - 'currencies.*.id' => [ - 'required', - 'numeric' - ], - 'currencies.*.exchange_rate' => [ - 'required' - ], - ], - $request->rules() - ); -}); - -test('bulk exchange rate request authorize', function () { - $request = new BulkExchangeRateRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/CompaniesTest.php b/tests/Unit/Request/CompaniesTest.php deleted file mode 100644 index d5c396a6..00000000 --- a/tests/Unit/Request/CompaniesTest.php +++ /dev/null @@ -1,55 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - Rule::unique('companies'), - 'string' - ], - 'currency' => [ - 'required' - ], - 'address.name' => [ - 'nullable', - ], - 'address.address_street_1' => [ - 'nullable', - ], - 'address.address_street_2' => [ - 'nullable', - ], - 'address.city' => [ - 'nullable', - ], - 'address.state' => [ - 'nullable', - ], - 'address.country_id' => [ - 'required', - ], - 'address.zip' => [ - 'nullable', - ], - 'address.phone' => [ - 'nullable', - ], - 'address.fax' => [ - 'nullable', - ], - ], - $request->rules() - ); -}); - -test('companies request authorize', function () { - $request = new CompaniesRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/CompanyTest.php b/tests/Unit/Request/CompanyTest.php deleted file mode 100644 index c2e0e5ed..00000000 --- a/tests/Unit/Request/CompanyTest.php +++ /dev/null @@ -1,30 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - Rule::unique('companies')->ignore($request->header('company'), 'id'), - ], - 'slug' => [ - 'nullable' - ], - 'address.country_id' => [ - 'required', - ], - ], - $request->rules() - ); -}); - -test('company request authorize', function () { - $request = new CompanyRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/CustomFieldTest.php b/tests/Unit/Request/CustomFieldTest.php deleted file mode 100644 index 65ff474c..00000000 --- a/tests/Unit/Request/CustomFieldTest.php +++ /dev/null @@ -1,27 +0,0 @@ -assertEquals( - [ - 'name' => 'required', - 'label' => 'required', - 'model_type' => 'required', - 'type' => 'required', - 'is_required' => 'required|boolean', - 'options' => 'array', - 'placeholder' => 'string|nullable', - 'order' => 'required', - ], - $request->rules() - ); -}); - -test('custom field request authorize', function () { - $request = new CustomFieldRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/Customer/CustomerLoginTest.php b/tests/Unit/Request/Customer/CustomerLoginTest.php deleted file mode 100644 index e97a0651..00000000 --- a/tests/Unit/Request/Customer/CustomerLoginTest.php +++ /dev/null @@ -1,27 +0,0 @@ -assertEquals( - [ - 'email' => [ - 'required', - 'string' - ], - 'password' => [ - 'required', - 'string' - ], - ], - $request->rules() - ); -}); - -test('customer login request authorize', function () { - $request = new CustomerLoginRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/Customer/CustomerProfileTest.php b/tests/Unit/Request/Customer/CustomerProfileTest.php deleted file mode 100644 index 1fa70a26..00000000 --- a/tests/Unit/Request/Customer/CustomerProfileTest.php +++ /dev/null @@ -1,92 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'nullable', - ], - 'password' => [ - 'nullable', - 'min:8', - ], - 'email' => [ - 'nullable', - 'email', - Rule::unique('customers')->where('company_id', $request->header('company'))->ignore(Auth::id(), 'id') - ], - 'billing.name' => [ - 'nullable', - ], - 'billing.address_street_1' => [ - 'nullable', - ], - 'billing.address_street_2' => [ - 'nullable', - ], - 'billing.city' => [ - 'nullable', - ], - 'billing.state' => [ - 'nullable', - ], - 'billing.country_id' => [ - 'nullable', - ], - 'billing.zip' => [ - 'nullable', - ], - 'billing.phone' => [ - 'nullable', - ], - 'billing.fax' => [ - 'nullable', - ], - 'shipping.name' => [ - 'nullable', - ], - 'shipping.address_street_1' => [ - 'nullable', - ], - 'shipping.address_street_2' => [ - 'nullable', - ], - 'shipping.city' => [ - 'nullable', - ], - 'shipping.state' => [ - 'nullable', - ], - 'shipping.country_id' => [ - 'nullable', - ], - 'shipping.zip' => [ - 'nullable', - ], - 'shipping.phone' => [ - 'nullable', - ], - 'shipping.fax' => [ - 'nullable', - ], - 'customer_avatar' => [ - 'nullable', - 'file', - 'mimes:gif,jpg,png', - 'max:20000' - ] - ], - $request->rules() - ); -}); - -test('customer profile request authorize', function () { - $request = new CustomerProfileRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/CustomerTest.php b/tests/Unit/Request/CustomerTest.php deleted file mode 100644 index 44002147..00000000 --- a/tests/Unit/Request/CustomerTest.php +++ /dev/null @@ -1,106 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - ], - 'email' => [ - 'email', - 'nullable', - Rule::unique('customers')->where('company_id', $request->header('company')) - ], - 'password' => [ - 'nullable', - ], - 'phone' => [ - 'nullable', - ], - 'company_name' => [ - 'nullable', - ], - 'contact_name' => [ - 'nullable', - ], - 'website' => [ - 'nullable', - ], - 'prefix' => [ - 'nullable', - ], - 'enable_portal' => [ - 'boolean', - ], - 'currency_id' => [ - 'nullable', - ], - 'billing.name' => [ - 'nullable', - ], - 'billing.address_street_1' => [ - 'nullable', - ], - 'billing.address_street_2' => [ - 'nullable', - ], - 'billing.city' => [ - 'nullable', - ], - 'billing.state' => [ - 'nullable', - ], - 'billing.country_id' => [ - 'nullable', - ], - 'billing.zip' => [ - 'nullable', - ], - 'billing.phone' => [ - 'nullable', - ], - 'billing.fax' => [ - 'nullable', - ], - 'shipping.name' => [ - 'nullable', - ], - 'shipping.address_street_1' => [ - 'nullable', - ], - 'shipping.address_street_2' => [ - 'nullable', - ], - 'shipping.city' => [ - 'nullable', - ], - 'shipping.state' => [ - 'nullable', - ], - 'shipping.country_id' => [ - 'nullable', - ], - 'shipping.zip' => [ - 'nullable', - ], - 'shipping.phone' => [ - 'nullable', - ], - 'shipping.fax' => [ - 'nullable', - ] - ], - $request->rules() - ); -}); - -test('customer request authorize', function () { - $request = new CustomerRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/EstimateTest.php b/tests/Unit/Request/EstimateTest.php deleted file mode 100644 index a031521c..00000000 --- a/tests/Unit/Request/EstimateTest.php +++ /dev/null @@ -1,74 +0,0 @@ -assertEquals( - [ - 'estimate_date' => [ - 'required', - ], - 'expiry_date' => [ - 'nullable', - ], - 'customer_id' => [ - 'required', - ], - 'estimate_number' => [ - 'required', - Rule::unique('estimates')->where('company_id', $request->header('company')) - ], - 'exchange_rate' => [ - 'nullable' - ], - 'discount' => [ - 'required', - ], - 'discount_val' => [ - 'required', - ], - 'sub_total' => [ - 'required', - ], - 'total' => [ - 'required', - ], - 'tax' => [ - 'required', - ], - 'template_name' => [ - 'required' - ], - 'items' => [ - 'required', - 'array', - ], - 'items.*.description' => [ - 'nullable', - ], - 'items.*' => [ - 'required', - 'max:255', - ], - 'items.*.name' => [ - 'required', - ], - 'items.*.quantity' => [ - 'required', - ], - 'items.*.price' => [ - 'required', - ], - ], - $request->rules() - ); -}); - -test('estimate request authorize', function () { - $request = new EstimatesRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/ExchangeRateLogTest.php b/tests/Unit/Request/ExchangeRateLogTest.php deleted file mode 100644 index 9991865a..00000000 --- a/tests/Unit/Request/ExchangeRateLogTest.php +++ /dev/null @@ -1,25 +0,0 @@ -assertEquals( - [ - 'exchange_rate' => [ - 'required', - ], - 'currency_id' => [ - 'required' - ], - ], - $request->rules() - ); -}); - -test('exchange rate log request authorize', function () { - $request = new ExchangeRateLogRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/ExchangeRateProviderTest.php b/tests/Unit/Request/ExchangeRateProviderTest.php deleted file mode 100644 index 9f0735e3..00000000 --- a/tests/Unit/Request/ExchangeRateProviderTest.php +++ /dev/null @@ -1,38 +0,0 @@ -assertEquals( - [ - 'driver' => [ - 'required' - ], - 'key' => [ - 'required', - ], - 'currencies' => [ - 'nullable', - ], - 'currencies.*' => [ - 'nullable', - ], - 'driver_config' => [ - 'nullable' - ], - 'active' => [ - 'nullable', - 'boolean' - ], - ], - $request->rules() - ); -}); - -test('exchange rate provider request authorize', function () { - $request = new ExchangeRateProviderRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/ExpenseCategoryTest.php b/tests/Unit/Request/ExpenseCategoryTest.php deleted file mode 100644 index 3eaa572e..00000000 --- a/tests/Unit/Request/ExpenseCategoryTest.php +++ /dev/null @@ -1,25 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - ], - 'description' => [ - 'nullable', - ], - ], - $request->rules() - ); -}); - -test('expense category request authorize', function () { - $request = new ExpenseCategoryRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/ExpenseTest.php b/tests/Unit/Request/ExpenseTest.php deleted file mode 100644 index 7d7d482a..00000000 --- a/tests/Unit/Request/ExpenseTest.php +++ /dev/null @@ -1,49 +0,0 @@ -assertEquals( - [ - 'expense_date' => [ - 'required', - ], - 'expense_category_id' => [ - 'required', - ], - 'exchange_rate' => [ - 'nullable' - ], - 'payment_method_id' => [ - 'nullable', - ], - 'amount' => [ - 'required', - ], - 'customer_id' => [ - 'nullable', - ], - 'notes' => [ - 'nullable', - ], - 'currency_id' => [ - 'required' - ], - 'attachment_receipt' => [ - 'nullable', - 'file', - 'mimes:jpg,png,pdf,doc,docx,xls,xlsx,ppt,pptx', - 'max:20000' - ] - ], - $request->rules() - ); -}); - -test('expense request authorize', function () { - $request = new ExpenseRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/GetSettingsRequestTest.php b/tests/Unit/Request/GetSettingsRequestTest.php deleted file mode 100644 index 88f3e0d6..00000000 --- a/tests/Unit/Request/GetSettingsRequestTest.php +++ /dev/null @@ -1,27 +0,0 @@ -assertEquals( - [ - 'settings' => [ - 'required', - ], - 'settings.*' => [ - 'required', - 'string', - ], - ], - $request->rules() - ); -}); - - -test('get settings request authorize', function () { - $request = new GetSettingsRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/InvoiceTest.php b/tests/Unit/Request/InvoiceTest.php deleted file mode 100644 index f22a96e7..00000000 --- a/tests/Unit/Request/InvoiceTest.php +++ /dev/null @@ -1,74 +0,0 @@ -assertEquals( - [ - 'invoice_date' => [ - 'required', - ], - 'due_date' => [ - 'nullable', - ], - 'customer_id' => [ - 'required', - ], - 'invoice_number' => [ - 'required', - Rule::unique('invoices')->where('company_id', $request->header('company')) - ], - 'exchange_rate' => [ - 'nullable' - ], - 'discount' => [ - 'required', - ], - 'discount_val' => [ - 'required', - ], - 'sub_total' => [ - 'required', - ], - 'total' => [ - 'required', - ], - 'tax' => [ - 'required', - ], - 'template_name' => [ - 'required' - ], - 'items' => [ - 'required', - 'array', - ], - 'items.*' => [ - 'required', - 'max:255', - ], - 'items.*.description' => [ - 'nullable', - ], - 'items.*.name' => [ - 'required', - ], - 'items.*.quantity' => [ - 'required', - ], - 'items.*.price' => [ - 'required', - ], - ], - $request->rules() - ); -}); - -test('invoices request authorize', function () { - $request = new InvoicesRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/ItemTest.php b/tests/Unit/Request/ItemTest.php deleted file mode 100644 index af1d34c9..00000000 --- a/tests/Unit/Request/ItemTest.php +++ /dev/null @@ -1,31 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - ], - 'price' => [ - 'required', - ], - 'unit_id' => [ - 'nullable', - ], - 'description' => [ - 'nullable', - ], - ], - $request->rules() - ); -}); - -test('item request authorize', function () { - $request = new ItemsRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/LoginTest.php b/tests/Unit/Request/LoginTest.php deleted file mode 100644 index eff68660..00000000 --- a/tests/Unit/Request/LoginTest.php +++ /dev/null @@ -1,28 +0,0 @@ -assertEquals( - [ - 'username' => [ - 'required', - ], - 'password' => [ - 'required', - ], - 'device_name' => [ - 'required' - ], - ], - $request->rules() - ); -}); - -test('login request authorize', function () { - $request = new LoginRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/NoteTest.php b/tests/Unit/Request/NoteTest.php deleted file mode 100644 index a6ff1cd2..00000000 --- a/tests/Unit/Request/NoteTest.php +++ /dev/null @@ -1,32 +0,0 @@ -assertEquals( - [ - 'type' => [ - 'required' - ], - 'name' => [ - 'required', - Rule::unique('notes') - ->where('company_id', $request->header('company')) - ->where('type', $request->type) - ], - 'notes' => [ - 'required' - ], - ], - $request->rules() - ); -}); - -test('note request authorize', function () { - $request = new NotesRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/PaymentMethodTest.php b/tests/Unit/Request/PaymentMethodTest.php deleted file mode 100644 index 5f18af87..00000000 --- a/tests/Unit/Request/PaymentMethodTest.php +++ /dev/null @@ -1,25 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - Rule::unique('payment_methods') - ->where('company_id', $request->header('company')), - ], - ], - $request->rules() - ); -}); - -test('payment method request authorize', function () { - $request = new PaymentMethodRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/PaymentTest.php b/tests/Unit/Request/PaymentTest.php deleted file mode 100644 index 922246ab..00000000 --- a/tests/Unit/Request/PaymentTest.php +++ /dev/null @@ -1,45 +0,0 @@ -assertEquals( - [ - 'payment_date' => [ - 'required', - ], - 'customer_id' => [ - 'required', - ], - 'exchange_rate' => [ - 'nullable' - ], - 'amount' => [ - 'required', - ], - 'payment_number' => [ - 'required', - Rule::unique('payments')->where('company_id', $request->header('company')) - ], - 'invoice_id' => [ - 'nullable', - ], - 'payment_method_id' => [ - 'nullable', - ], - 'notes' => [ - 'nullable', - ], - ], - $request->rules() - ); -}); - -test('payment request authorize', function () { - $request = new PaymentRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/ProfileTest.php b/tests/Unit/Request/ProfileTest.php deleted file mode 100644 index 468923c5..00000000 --- a/tests/Unit/Request/ProfileTest.php +++ /dev/null @@ -1,32 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - ], - 'password' => [ - 'nullable', - 'min:8', - ], - 'email' => [ - 'required', - 'email', - Rule::unique('users')->ignore(Auth::id(), 'id'), - ], - ], - $request->rules() - ); -}); - -test('profile request authorize', function () { - $request = new ProfileRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/RecurringInvoiceTest.php b/tests/Unit/Request/RecurringInvoiceTest.php deleted file mode 100644 index 0eba7789..00000000 --- a/tests/Unit/Request/RecurringInvoiceTest.php +++ /dev/null @@ -1,68 +0,0 @@ -assertEquals( - [ - 'starts_at' => [ - 'required' - ], - 'send_automatically' => [ - 'required', - 'boolean' - ], - 'customer_id' => [ - 'required' - ], - 'discount' => [ - 'required', - ], - 'discount_val' => [ - 'required', - ], - 'sub_total' => [ - 'required', - ], - 'total' => [ - 'required', - ], - 'tax' => [ - 'required', - ], - 'status' => [ - 'required' - ], - 'exchange_rate' => [ - 'nullable' - ], - 'frequency' => [ - 'required' - ], - 'limit_by' => [ - 'required' - ], - 'limit_count' => [ - 'required_if:limit_by,COUNT', - ], - 'limit_date' => [ - 'required_if:limit_by,DATE', - ], - 'items' => [ - 'required' - ], - 'items.*' => [ - 'required' - ] - ], - $request->rules() - ); -}); - -test('recurring invoice request authorize', function () { - $request = new RecurringInvoiceRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/RoleTest.php b/tests/Unit/Request/RoleTest.php deleted file mode 100644 index 0dc33ba1..00000000 --- a/tests/Unit/Request/RoleTest.php +++ /dev/null @@ -1,31 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - 'string', - Rule::unique('roles')->where('scope', $request->header('company')) - ], - 'abilities' => [ - 'required' - ], - 'abilities.*' => [ - 'required' - ], - ], - $request->rules() - ); -}); - -test('role request authorize', function () { - $request = new RoleRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/TaxTypeTest.php b/tests/Unit/Request/TaxTypeTest.php deleted file mode 100644 index 97d304a7..00000000 --- a/tests/Unit/Request/TaxTypeTest.php +++ /dev/null @@ -1,40 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - Rule::unique('tax_types') - ->where('type', TaxType::TYPE_GENERAL) - ->where('company_id', $request->header('company')) - ], - 'percent' => [ - 'required', - ], - 'description' => [ - 'nullable', - ], - 'compound_tax' => [ - 'nullable', - ], - 'collective_tax' => [ - 'nullable', - ], - ], - $request->rules() - ); -}); - - -test('tax type request authorize', function () { - $request = new TaxTypeRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/UnitTest.php b/tests/Unit/Request/UnitTest.php deleted file mode 100644 index dd27ae7d..00000000 --- a/tests/Unit/Request/UnitTest.php +++ /dev/null @@ -1,25 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - Rule::unique('units') - ->where('company_id', $request->header('company')), - ], - ], - $request->rules() - ); -}); - -test('unit request authorize', function () { - $request = new UnitRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/UpdateSettingsRequestTest.php b/tests/Unit/Request/UpdateSettingsRequestTest.php deleted file mode 100644 index a3edebea..00000000 --- a/tests/Unit/Request/UpdateSettingsRequestTest.php +++ /dev/null @@ -1,23 +0,0 @@ -assertEquals( - [ - 'settings' => [ - 'required', - ], - ], - $request->rules() - ); -}); - - -test('update settings request authorize', function () { - $request = new UpdateSettingsRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Request/UserTest.php b/tests/Unit/Request/UserTest.php deleted file mode 100644 index d252bf66..00000000 --- a/tests/Unit/Request/UserTest.php +++ /dev/null @@ -1,44 +0,0 @@ -assertEquals( - [ - 'name' => [ - 'required', - ], - 'email' => [ - 'required', - 'email', - Rule::unique('users'), - ], - 'phone' => [ - 'nullable', - ], - 'password' => [ - 'required', - 'min:8', - ], - 'companies' => [ - 'required', - ], - 'companies.*.id' => [ - 'required', - ], - 'companies.*.role' => [ - 'required', - ], - ], - $request->rules() - ); -}); - -test('user request authorize', function () { - $request = new UserRequest(); - - $this->assertTrue($request->authorize()); -}); diff --git a/tests/Unit/Model/SettingTest.php b/tests/Unit/SettingTest.php similarity index 100% rename from tests/Unit/Model/SettingTest.php rename to tests/Unit/SettingTest.php diff --git a/tests/Unit/Model/TaxTest.php b/tests/Unit/TaxTest.php similarity index 100% rename from tests/Unit/Model/TaxTest.php rename to tests/Unit/TaxTest.php diff --git a/tests/Unit/Model/TaxTypeTest.php b/tests/Unit/TaxTypeTest.php similarity index 100% rename from tests/Unit/Model/TaxTypeTest.php rename to tests/Unit/TaxTypeTest.php diff --git a/tests/Unit/Model/UnitTest.php b/tests/Unit/UnitTest.php similarity index 100% rename from tests/Unit/Model/UnitTest.php rename to tests/Unit/UnitTest.php diff --git a/tests/Unit/Model/UserTest.php b/tests/Unit/UserTest.php similarity index 100% rename from tests/Unit/Model/UserTest.php rename to tests/Unit/UserTest.php