From 4ab92473e9e7cf679acf96762bd98e90f36fd8e3 Mon Sep 17 00:00:00 2001 From: gdarko Date: Mon, 29 Jan 2024 04:46:01 -0600 Subject: [PATCH] Setup pint & run code style fix --- app/Console/Commands/CheckEstimateStatus.php | 2 +- app/Console/Commands/CheckInvoiceStatus.php | 2 +- .../Commands/CreateTemplateCommand.php | 2 +- app/Console/Commands/InstallModuleCommand.php | 2 +- app/Console/Commands/UpdateCommand.php | 2 +- app/Console/Kernel.php | 9 +- app/Exceptions/Handler.php | 2 - app/Http/Controllers/AppVersionController.php | 3 +- .../Admin/Auth/ConfirmPasswordController.php | 2 +- .../Admin/Auth/ForgotPasswordController.php | 6 +- .../V1/Admin/Auth/LoginController.php | 2 +- .../V1/Admin/Auth/RegisterController.php | 6 +- .../V1/Admin/Auth/ResetPasswordController.php | 6 +- .../V1/Admin/Auth/VerificationController.php | 2 +- .../V1/Admin/Backup/ApiController.php | 6 +- .../V1/Admin/Backup/BackupsController.php | 6 +- .../Admin/Backup/DownloadBackupController.php | 2 +- .../V1/Admin/Company/CompaniesController.php | 8 +- .../V1/Admin/Company/CompanyController.php | 3 +- .../V1/Admin/Config/FiscalYearsController.php | 3 +- .../V1/Admin/Config/LanguagesController.php | 3 +- .../Config/RetrospectiveEditsController.php | 3 +- .../CustomField/CustomFieldsController.php | 2 +- .../Customer/CustomerStatsController.php | 5 +- .../V1/Admin/Customer/CustomersController.php | 12 +- .../Admin/Dashboard/DashboardController.php | 17 +- .../ChangeEstimateStatusController.php | 12 +- .../Estimate/ConvertEstimateController.php | 6 +- .../Estimate/EstimateTemplatesController.php | 5 +- .../V1/Admin/Estimate/EstimatesController.php | 4 +- .../Admin/Estimate/SendEstimateController.php | 9 +- .../SendEstimatePreviewController.php | 11 +- .../ExchangeRateProviderController.php | 5 +- .../GetActiveProviderController.php | 7 +- .../GetExchangeRateController.php | 17 +- .../GetSupportedCurrenciesController.php | 3 +- .../GetUsedCurrenciesController.php | 3 +- .../Expense/ExpenseCategoriesController.php | 11 +- .../V1/Admin/Expense/ExpensesController.php | 8 +- .../Admin/Expense/ShowReceiptController.php | 3 +- .../Admin/Expense/UploadReceiptController.php | 3 +- .../V1/Admin/General/BootstrapController.php | 5 +- .../General/BulkExchangeRateController.php | 12 +- .../V1/Admin/General/ConfigController.php | 3 +- .../V1/Admin/General/CountriesController.php | 3 +- .../V1/Admin/General/CurrenciesController.php | 3 +- .../Admin/General/DateFormatsController.php | 3 +- .../GetAllUsedCurrenciesController.php | 5 +- .../V1/Admin/General/NextNumberController.php | 5 +- .../V1/Admin/General/NotesController.php | 5 +- .../General/NumberPlaceholdersController.php | 3 +- .../V1/Admin/General/SearchController.php | 3 +- .../Admin/General/SearchUsersController.php | 3 +- .../V1/Admin/General/TimezonesController.php | 3 +- .../Invoice/ChangeInvoiceStatusController.php | 11 +- .../Admin/Invoice/CloneInvoiceController.php | 5 +- .../Invoice/InvoiceTemplatesController.php | 3 +- .../V1/Admin/Invoice/InvoicesController.php | 12 +- .../Admin/Invoice/SendInvoiceController.php | 2 +- .../Invoice/SendInvoicePreviewController.php | 4 +- .../V1/Admin/Item/ItemsController.php | 13 +- .../V1/Admin/Item/UnitsController.php | 5 +- .../V1/Admin/Mobile/AuthController.php | 6 +- .../V1/Admin/Modules/ApiTokenController.php | 3 +- .../CompleteModuleInstallationController.php | 5 +- .../V1/Admin/Modules/CopyModuleController.php | 5 +- .../Admin/Modules/DisableModuleController.php | 3 +- .../Modules/DownloadModuleController.php | 3 +- .../Admin/Modules/EnableModuleController.php | 3 +- .../V1/Admin/Modules/ModuleController.php | 5 +- .../V1/Admin/Modules/ModulesController.php | 3 +- .../Admin/Modules/UnzipModuleController.php | 3 +- .../Admin/Modules/UploadModuleController.php | 1 - .../Payment/PaymentMethodsController.php | 5 +- .../V1/Admin/Payment/PaymentsController.php | 4 +- .../Payment/SendPaymentPreviewController.php | 5 +- .../RecurringInvoiceController.php | 6 +- .../RecurringInvoiceFrequencyController.php | 2 +- .../Report/CustomerSalesReportController.php | 13 +- .../Admin/Report/ExpensesReportController.php | 13 +- .../Report/ItemSalesReportController.php | 13 +- .../Report/ProfitLossReportController.php | 16 +- .../Report/TaxSummaryReportController.php | 14 +- .../V1/Admin/Role/AbilitiesController.php | 3 +- .../V1/Admin/Role/RolesController.php | 10 +- .../V1/Admin/Settings/CompanyController.php | 8 +- ...anyCurrencyCheckTransactionsController.php | 3 +- .../V1/Admin/Settings/DiskController.php | 15 +- .../GetCompanyMailConfigurationController.php | 3 +- .../Admin/Settings/GetSettingsController.php | 4 +- .../Settings/MailConfigurationController.php | 11 +- .../V1/Admin/Settings/TaxTypesController.php | 5 +- .../UpdateCompanySettingsController.php | 4 +- .../Settings/UpdateSettingsController.php | 4 +- .../Admin/Update/CheckVersionController.php | 5 +- .../V1/Admin/Update/CopyFilesController.php | 5 +- .../V1/Admin/Update/DeleteFilesController.php | 5 +- .../Admin/Update/DownloadUpdateController.php | 5 +- .../Admin/Update/FinishUpdateController.php | 5 +- .../Admin/Update/MigrateUpdateController.php | 5 +- .../V1/Admin/Update/UnzipUpdateController.php | 5 +- .../V1/Admin/Update/UpdateController.php | 2 +- .../V1/Admin/Users/UsersController.php | 5 +- .../Auth/ForgotPasswordController.php | 4 +- .../V1/Customer/Auth/LoginController.php | 9 +- .../Customer/Auth/ResetPasswordController.php | 6 +- .../Estimate/AcceptEstimateController.php | 15 +- .../Customer/Estimate/EstimatesController.php | 18 +- .../V1/Customer/EstimatePdfController.php | 2 +- .../Customer/Expense/ExpensesController.php | 6 +- .../Customer/General/BootstrapController.php | 5 +- .../Customer/General/DashboardController.php | 5 +- .../V1/Customer/General/ProfileController.php | 6 +- .../Customer/Invoice/InvoicesController.php | 6 +- .../V1/Customer/InvoicePdfController.php | 4 +- .../Payment/PaymentMethodController.php | 3 +- .../Customer/Payment/PaymentsController.php | 6 +- .../V1/Customer/PaymentPdfController.php | 2 +- .../V1/Installation/AppDomainController.php | 6 +- .../DatabaseConfigurationController.php | 14 +- .../FilePermissionsController.php | 4 +- .../V1/Installation/FinishController.php | 3 +- .../V1/Installation/LoginController.php | 5 +- .../OnboardingWizardController.php | 3 +- .../Installation/RequirementsController.php | 5 +- .../V1/Modules/ScriptController.php | 5 +- .../V1/Modules/StyleController.php | 5 +- .../V1/PDF/DownloadReceiptController.php | 3 +- .../V1/PDF/EstimatePdfController.php | 4 +- .../V1/PDF/InvoicePdfController.php | 3 +- .../V1/PDF/PaymentPdfController.php | 3 +- .../V1/Webhook/CronJobController.php | 3 +- app/Http/Middleware/AdminMiddleware.php | 5 +- app/Http/Middleware/CompanyMiddleware.php | 2 - app/Http/Middleware/ConfigMiddleware.php | 1 - app/Http/Middleware/CronJobMiddleware.php | 2 - .../Middleware/CustomerPortalMiddleware.php | 1 - .../Middleware/InstallationMiddleware.php | 1 - app/Http/Middleware/PdfMiddleware.php | 1 - .../Middleware/RedirectIfAuthenticated.php | 3 +- app/Http/Middleware/RedirectIfInstalled.php | 1 - .../Middleware/RedirectIfUnauthorized.php | 2 - app/Http/Middleware/ScopeBouncer.php | 3 - app/Http/Requests/AvatarRequest.php | 8 +- app/Http/Requests/BulkExchangeRateRequest.php | 8 +- app/Http/Requests/CompaniesRequest.php | 8 +- app/Http/Requests/CompanyLogoRequest.php | 6 +- app/Http/Requests/CompanyRequest.php | 4 +- .../Customer/CustomerLoginRequest.php | 6 +- .../Customer/CustomerProfileRequest.php | 10 +- .../CustomerEstimateStatusRequest.php | 2 +- app/Http/Requests/CustomerRequest.php | 14 +- .../Requests/DatabaseEnvironmentRequest.php | 2 +- app/Http/Requests/DeleteInvoiceRequest.php | 4 +- app/Http/Requests/DeleteItemsRequest.php | 4 +- app/Http/Requests/EstimatesRequest.php | 14 +- app/Http/Requests/ExchangeRateLogRequest.php | 6 +- .../Requests/ExchangeRateProviderRequest.php | 8 +- app/Http/Requests/ExpenseCategoryRequest.php | 2 +- app/Http/Requests/ExpenseRequest.php | 14 +- app/Http/Requests/GetSettingRequest.php | 4 +- app/Http/Requests/InvoicesRequest.php | 14 +- app/Http/Requests/LoginRequest.php | 2 +- app/Http/Requests/NotesRequest.php | 10 +- app/Http/Requests/PaymentMethodRequest.php | 2 +- app/Http/Requests/PaymentRequest.php | 14 +- app/Http/Requests/RecurringInvoiceRequest.php | 32 +- app/Http/Requests/RoleRequest.php | 10 +- app/Http/Requests/TaxTypeRequest.php | 10 +- app/Http/Requests/UnitRequest.php | 2 +- app/Http/Requests/UnzipUpdateRequest.php | 6 +- .../Requests/UploadExpenseReceiptRequest.php | 6 +- app/Http/Requests/UploadModuleRequest.php | 6 +- app/Http/Resources/CompanyResource.php | 2 +- app/Http/Resources/CurrencyResource.php | 2 +- .../Resources/CustomFieldValueResource.php | 2 +- .../Resources/Customer/CurrencyResource.php | 2 +- app/Http/Resources/ModuleResource.php | 4 +- app/Http/Resources/RoleResource.php | 4 +- app/Http/Resources/UserResource.php | 2 +- app/Jobs/CreateBackupJob.php | 2 +- app/Listeners/Updates/Listener.php | 1 - app/Mail/EstimateViewedMail.php | 2 +- app/Mail/InvoiceViewedMail.php | 2 +- app/Mail/SendEstimateMail.php | 8 +- app/Mail/SendInvoiceMail.php | 4 +- app/Mail/SendPaymentMail.php | 8 +- app/Mail/TestMail.php | 3 - app/Models/Address.php | 2 + app/Models/Company.php | 9 +- app/Models/Currency.php | 2 +- app/Models/CustomField.php | 4 +- app/Models/CustomFieldValue.php | 4 +- app/Models/Customer.php | 14 +- app/Models/Estimate.php | 41 +- app/Models/EstimateItem.php | 6 +- app/Models/ExchangeRateLog.php | 2 +- app/Models/ExchangeRateProvider.php | 38 +- app/Models/Expense.php | 14 +- app/Models/FileDisk.php | 4 +- app/Models/Invoice.php | 37 +- app/Models/InvoiceItem.php | 6 +- app/Models/Payment.php | 22 +- app/Models/PaymentMethod.php | 5 +- app/Models/RecurringInvoice.php | 32 +- app/Models/Tax.php | 2 +- app/Models/TaxType.php | 3 +- app/Models/Transaction.php | 6 +- app/Models/User.php | 16 +- .../CustomerMailResetPasswordNotification.php | 9 +- .../MailResetPasswordNotification.php | 11 +- app/Policies/CompanyPolicy.php | 2 +- app/Policies/CustomFieldPolicy.php | 14 +- app/Policies/CustomerPolicy.php | 15 +- app/Policies/DashboardPolicy.php | 2 +- app/Policies/EstimatePolicy.php | 16 +- app/Policies/ExchangeRateProviderPolicy.php | 14 +- app/Policies/ExpenseCategoryPolicy.php | 14 +- app/Policies/ExpensePolicy.php | 15 +- app/Policies/InvoicePolicy.php | 16 +- app/Policies/ItemPolicy.php | 15 +- app/Policies/ModulesPolicy.php | 2 +- app/Policies/NotePolicy.php | 2 +- app/Policies/OwnerPolicy.php | 2 +- app/Policies/PaymentMethodPolicy.php | 14 +- app/Policies/PaymentPolicy.php | 17 +- app/Policies/RecurringInvoicePolicy.php | 15 +- app/Policies/ReportPolicy.php | 2 +- app/Policies/RolePolicy.php | 14 +- app/Policies/SettingsPolicy.php | 2 +- app/Policies/TaxTypePolicy.php | 14 +- app/Policies/UnitPolicy.php | 14 +- app/Policies/UserPolicy.php | 17 +- app/Providers/AppServiceProvider.php | 1 - app/Providers/AuthServiceProvider.php | 4 +- app/Providers/BroadcastServiceProvider.php | 2 +- app/Rules/RelationNotExist.php | 5 +- app/Services/SerialNumberFormatter.php | 61 +-- app/Space/DateFormatter.php | 38 +- app/Space/EnvironmentManager.php | 49 +- app/Space/FilePermissionChecker.php | 10 - app/Space/ModuleInstaller.php | 10 +- app/Space/RequirementsChecker.php | 9 +- app/Space/SiteApi.php | 2 +- app/Space/Updater.php | 4 +- app/Space/helpers.php | 20 +- app/Traits/ExchangeRateProvidersTrait.php | 46 +- app/Traits/GeneratesPdfTrait.php | 12 +- app/Traits/HasCustomFieldsTrait.php | 4 +- config/abilities.php | 432 +++++++-------- config/app.php | 4 +- config/dompdf.php | 35 +- config/invoiceshelf.php | 138 ++--- config/services.php | 2 +- database/factories/AddressFactory.php | 4 +- database/factories/CompanyFactory.php | 4 +- database/factories/CompanySettingFactory.php | 2 +- database/factories/CustomFieldFactory.php | 4 +- .../factories/CustomFieldValueFactory.php | 4 +- database/factories/CustomerFactory.php | 4 +- database/factories/EmailLogFactory.php | 2 +- database/factories/EstimateFactory.php | 2 +- database/factories/EstimateItemFactory.php | 4 +- database/factories/ExchangeRateLogFactory.php | 4 +- .../factories/ExchangeRateProviderFactory.php | 2 +- database/factories/ExpenseCategoryFactory.php | 2 +- database/factories/ExpenseFactory.php | 2 +- database/factories/FileDiskFactory.php | 2 +- database/factories/InvoiceFactory.php | 2 +- database/factories/InvoiceItemFactory.php | 4 +- database/factories/ItemFactory.php | 4 +- database/factories/NoteFactory.php | 2 +- database/factories/PaymentFactory.php | 2 +- database/factories/PaymentMethodFactory.php | 2 +- .../factories/RecurringInvoiceFactory.php | 4 +- database/factories/TaxFactory.php | 2 +- database/factories/TaxTypeFactory.php | 2 +- database/factories/UnitFactory.php | 2 +- database/factories/UserFactory.php | 4 +- ...2_01_063235_create_custom_fields_table.php | 2 +- ...63509_create_custom_field_values_table.php | 2 +- ..._102913_add_company_to_addresses_table.php | 2 +- ...3_050206_add_creator_in_invoices_table.php | 2 +- ..._050252_add_creator_in_estimates_table.php | 2 +- ...3_050316_add_creator_in_payments_table.php | 2 +- ...3_050333_add_creator_in_expenses_table.php | 2 +- ...1_23_050406_add_creator_in_items_table.php | 2 +- ...1_23_065815_add_creator_in_users_table.php | 2 +- ...12_02_064933_update_crater_version_320.php | 2 +- ...12_02_090527_update_crater_version_400.php | 4 +- ...12_08_133131_update_crater_version_401.php | 2 +- ...e_id_from_invoices_and_estimates_table.php | 4 +- ...12_23_061302_update_crater_version_402.php | 2 +- ...12_31_100816_update_crater_version_403.php | 2 +- ...01_22_085644_update_crater_version_404.php | 2 +- ...03_23_145012_add_number_length_setting.php | 2 +- ...05_05_063533_update_crater_version_410.php | 2 +- ...06_19_121939_update_crater_version_420.php | 2 +- ...021_06_28_105334_create_bouncer_tables.php | 9 +- ...62411_update_customer_id_in_all_tables.php | 22 +- ..._100256_change_relationship_of_company.php | 2 +- ...070204_add_owner_id_to_companies_table.php | 6 +- ...7_08_110940_add_company_to_notes_table.php | 6 +- ...recurring_invoice_id_to_invoices_table.php | 2 +- ...ring_invoice_id_to_invoice_items_table.php | 2 +- ...8_add_base_columns_into_invoices_table.php | 2 +- ..._base_columns_into_invoice_items_table.php | 2 +- ...base_columns_into_estimate_items_table.php | 2 +- ...53_add_currency_id_into_invoices_table.php | 2 +- ...08_add_currency_id_into_payments_table.php | 2 +- ...80611_add_currency_id_into_items_table.php | 2 +- ...80702_add_currency_id_into_taxes_table.php | 2 +- ...9_add_currency_id_into_estimates_table.php | 2 +- ...1413_add_tax_per_item_into_items_table.php | 2 +- .../2021_09_28_130822_add_sequence_column.php | 10 +- ...dd_recurring_invoice_id_to_taxes_table.php | 2 +- ...27_add_payment_method_to_expense_table.php | 2 +- ...alculate_base_values_for_existing_data.php | 10 +- ..._11_23_092111_add_new_company_settings.php | 4 +- ...11_23_093811_update_crater_version_500.php | 2 +- ...12_01_120956_update_crater_version_501.php | 2 +- ...12_02_063005_calculate_base_due_amount.php | 2 +- ...12_02_123007_update_crater_version_502.php | 2 +- ...12_03_154423_update_crater_version_503.php | 2 +- ...5_add_transaction_id_to_payments_table.php | 2 +- ...3415_add_type_to_payment_methods_table.php | 4 +- ...12_06_131201_update_crater_version_504.php | 2 +- ...033_calculate_base_values_for_expenses.php | 2 +- ...12_09_062434_update_crater_version_505.php | 2 +- ...2_10_121739_update_creater_version_506.php | 2 +- ...alculate_base_amount_of_payments_table.php | 2 +- ..._093701_add_fields_to_email_logs_table.php | 8 +- ...enable_portal_field_of_customers_table.php | 2 +- ..._31_042453_add_type_to_tax_types_table.php | 2 +- ...01_05_115423_update_crater_version_600.php | 2 +- ...022_01_06_103536_add_slug_to_companies.php | 2 +- ...01_12_132859_update_crater_version_601.php | 2 +- ...01_13_123829_update_crater_version_602.php | 2 +- ...02_15_113648_update_crater_version_603.php | 2 +- ...02_17_081723_update_crater_version_604.php | 2 +- .../2022_03_03_060121_crater_version_605.php | 2 +- ..._063237_change_over_due_status_to_sent.php | 2 +- ...alculate_base_values_for_invoice_items.php | 2 +- ...03_06_070829_update_crater_version_606.php | 2 +- ...d_generated_conversions_to_media_table.php | 4 +- database/seeders/CountriesTableSeeder.php | 500 +++++++++--------- database/seeders/CurrenciesTableSeeder.php | 3 +- database/seeders/DemoSeeder.php | 2 +- database/seeders/UsersTableSeeder.php | 4 +- public/index.php | 2 - routes/api.php | 39 +- routes/web.php | 12 +- server.php | 2 - tests/Feature/Admin/BackupTest.php | 11 +- tests/Feature/Admin/CompanySettingTest.php | 13 +- tests/Feature/Admin/CompanyTest.php | 11 +- tests/Feature/Admin/ConfigTest.php | 3 +- tests/Feature/Admin/CurrenciesTest.php | 5 +- tests/Feature/Admin/CustomFieldTest.php | 3 +- tests/Feature/Admin/CustomerTest.php | 23 +- tests/Feature/Admin/DashboardTest.php | 3 +- tests/Feature/Admin/EstimateTest.php | 10 +- tests/Feature/Admin/ExpenseCategoryTest.php | 3 +- tests/Feature/Admin/ExpenseTest.php | 3 +- tests/Feature/Admin/FileDiskTest.php | 7 +- tests/Feature/Admin/InvoiceTest.php | 44 +- tests/Feature/Admin/ItemTest.php | 5 +- tests/Feature/Admin/LocationTest.php | 3 +- tests/Feature/Admin/NextNumberTest.php | 3 +- tests/Feature/Admin/NotesTest.php | 3 +- tests/Feature/Admin/PaymentMethodTest.php | 3 +- tests/Feature/Admin/PaymentTest.php | 28 +- tests/Feature/Admin/RecurringInvoiceTest.php | 13 +- tests/Feature/Admin/RoleTest.php | 15 +- tests/Feature/Admin/TaxTypeTest.php | 5 +- tests/Feature/Admin/UnitTest.php | 3 +- tests/Feature/Admin/UserTest.php | 1 + tests/Feature/Customer/DashboardTest.php | 3 +- tests/Feature/Customer/EstimateTest.php | 15 +- tests/Feature/Customer/ExpenseTest.php | 7 +- tests/Feature/Customer/InvoiceTest.php | 7 +- tests/Feature/Customer/PaymentTest.php | 7 +- tests/Feature/Customer/ProfileTest.php | 13 +- tests/TestCase.php | 2 +- tests/Unit/AddressTest.php | 2 +- tests/Unit/CompanySettingTest.php | 3 +- tests/Unit/CompanyTest.php | 2 +- tests/Unit/CountryTest.php | 2 +- tests/Unit/CustomFieldTest.php | 2 +- tests/Unit/CustomFieldValueTest.php | 2 +- tests/Unit/CustomerTest.php | 2 +- tests/Unit/EstimateItemTest.php | 3 +- tests/Unit/EstimateTest.php | 10 +- tests/Unit/ExpenseCategoryTest.php | 2 +- tests/Unit/ExpenseTest.php | 2 +- tests/Unit/InvoiceItemTest.php | 3 +- tests/Unit/InvoiceTest.php | 13 +- tests/Unit/ItemTest.php | 2 +- tests/Unit/PaymentMethodTest.php | 2 +- tests/Unit/PaymentTest.php | 2 +- tests/Unit/RecurringInvoiceTest.php | 2 +- tests/Unit/SettingTest.php | 3 +- tests/Unit/TaxTest.php | 2 +- tests/Unit/TaxTypeTest.php | 2 +- tests/Unit/UnitTest.php | 2 +- tests/Unit/UserTest.php | 2 +- 406 files changed, 1616 insertions(+), 2026 deletions(-) diff --git a/app/Console/Commands/CheckEstimateStatus.php b/app/Console/Commands/CheckEstimateStatus.php index 4f8d8341..b0c98a7c 100644 --- a/app/Console/Commands/CheckEstimateStatus.php +++ b/app/Console/Commands/CheckEstimateStatus.php @@ -3,8 +3,8 @@ namespace InvoiceShelf\Console\Commands; use Carbon\Carbon; -use InvoiceShelf\Models\Estimate; use Illuminate\Console\Command; +use InvoiceShelf\Models\Estimate; class CheckEstimateStatus extends Command { diff --git a/app/Console/Commands/CheckInvoiceStatus.php b/app/Console/Commands/CheckInvoiceStatus.php index 20194557..6459fff3 100644 --- a/app/Console/Commands/CheckInvoiceStatus.php +++ b/app/Console/Commands/CheckInvoiceStatus.php @@ -3,8 +3,8 @@ namespace InvoiceShelf\Console\Commands; use Carbon\Carbon; -use InvoiceShelf\Models\Invoice; use Illuminate\Console\Command; +use InvoiceShelf\Models\Invoice; class CheckInvoiceStatus extends Command { diff --git a/app/Console/Commands/CreateTemplateCommand.php b/app/Console/Commands/CreateTemplateCommand.php index b4f83563..86c1e217 100644 --- a/app/Console/Commands/CreateTemplateCommand.php +++ b/app/Console/Commands/CreateTemplateCommand.php @@ -46,7 +46,7 @@ class CreateTemplateCommand extends Command } if (Storage::disk('views')->exists("/app/pdf/{$type}/{$templateName}.blade.php")) { - $this->info("Template with given name already exists."); + $this->info('Template with given name already exists.'); return 0; } diff --git a/app/Console/Commands/InstallModuleCommand.php b/app/Console/Commands/InstallModuleCommand.php index 9fe915fb..c86144ea 100644 --- a/app/Console/Commands/InstallModuleCommand.php +++ b/app/Console/Commands/InstallModuleCommand.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Console\Commands; -use InvoiceShelf\Space\ModuleInstaller; use Illuminate\Console\Command; +use InvoiceShelf\Space\ModuleInstaller; class InstallModuleCommand extends Command { diff --git a/app/Console/Commands/UpdateCommand.php b/app/Console/Commands/UpdateCommand.php index 7b37ff9b..e14ce4b5 100644 --- a/app/Console/Commands/UpdateCommand.php +++ b/app/Console/Commands/UpdateCommand.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Console\Commands; +use Illuminate\Console\Command; use InvoiceShelf\Models\Setting; use InvoiceShelf\Space\Updater; -use Illuminate\Console\Command; // Implementation taken from Akaunting - https://github.com/akaunting/akaunting class UpdateCommand extends Command diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 4db1ed89..07a9065e 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Console; -use InvoiceShelf\Models\CompanySetting; -use InvoiceShelf\Models\RecurringInvoice; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; +use InvoiceShelf\Models\CompanySetting; +use InvoiceShelf\Models\RecurringInvoice; class Kernel extends ConsoleKernel { @@ -24,17 +24,16 @@ class Kernel extends ConsoleKernel /** * Define the application's command schedule. * - * @param \Illuminate\Console\Scheduling\Schedule $schedule * @return void */ protected function schedule(Schedule $schedule) { if (\Storage::disk('local')->has('database_created')) { $schedule->command('check:invoices:status') - ->daily(); + ->daily(); $schedule->command('check:estimates:status') - ->daily(); + ->daily(); $recurringInvoices = RecurringInvoice::where('status', 'ACTIVE')->get(); foreach ($recurringInvoices as $recurringInvoice) { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 271bb599..9920b4af 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -31,7 +31,6 @@ class Handler extends ExceptionHandler * * This is a great spot to send exceptions to Sentry, Bugsnag, etc. * - * @param \Throwable $exception * @return void */ public function report(Throwable $exception) @@ -43,7 +42,6 @@ class Handler extends ExceptionHandler * Render an exception into an HTTP response. * * @param \Illuminate\Http\Request $request - * @param \Throwable $exception * @return \Illuminate\Http\Response */ public function render($request, Throwable $exception) diff --git a/app/Http/Controllers/AppVersionController.php b/app/Http/Controllers/AppVersionController.php index 640249f2..7cbb3127 100644 --- a/app/Http/Controllers/AppVersionController.php +++ b/app/Http/Controllers/AppVersionController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers; -use InvoiceShelf\Models\Setting; use Illuminate\Http\Request; +use InvoiceShelf\Models\Setting; class AppVersionController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php b/app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php index 75444ac4..319f69ba 100644 --- a/app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php +++ b/app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth; +use Illuminate\Foundation\Auth\ConfirmsPasswords; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Providers\RouteServiceProvider; -use Illuminate\Foundation\Auth\ConfirmsPasswords; class ConfirmPasswordController extends Controller { diff --git a/app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php b/app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php index e58ad52d..cd3c2ed7 100644 --- a/app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class ForgotPasswordController extends Controller { @@ -24,7 +24,6 @@ class ForgotPasswordController extends Controller /** * Get the response for a successful password reset link. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ @@ -39,14 +38,13 @@ class ForgotPasswordController extends Controller /** * Get the response for a failed password reset link. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ protected function sendResetLinkFailedResponse(Request $request, $response) { return response()->json([ - 'error' => 'Email could not be sent to this email address.' + 'error' => 'Email could not be sent to this email address.', ], 403); } } diff --git a/app/Http/Controllers/V1/Admin/Auth/LoginController.php b/app/Http/Controllers/V1/Admin/Auth/LoginController.php index 5fba7476..a00f9ce8 100644 --- a/app/Http/Controllers/V1/Admin/Auth/LoginController.php +++ b/app/Http/Controllers/V1/Admin/Auth/LoginController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth; +use Illuminate\Foundation\Auth\AuthenticatesUsers; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Providers\RouteServiceProvider; -use Illuminate\Foundation\Auth\AuthenticatesUsers; class LoginController extends Controller { diff --git a/app/Http/Controllers/V1/Admin/Auth/RegisterController.php b/app/Http/Controllers/V1/Admin/Auth/RegisterController.php index f55acb3a..8dfa783e 100644 --- a/app/Http/Controllers/V1/Admin/Auth/RegisterController.php +++ b/app/Http/Controllers/V1/Admin/Auth/RegisterController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth; +use Illuminate\Foundation\Auth\RegistersUsers; +use Illuminate\Support\Facades\Validator; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\User; use InvoiceShelf\Providers\RouteServiceProvider; -use Illuminate\Foundation\Auth\RegistersUsers; -use Illuminate\Support\Facades\Validator; class RegisterController extends Controller { @@ -43,7 +43,6 @@ class RegisterController extends Controller /** * Get a validator for an incoming registration request. * - * @param array $data * @return \Illuminate\Contracts\Validation\Validator */ protected function validator(array $data) @@ -58,7 +57,6 @@ class RegisterController extends Controller /** * Create a new user instance after a valid registration. * - * @param array $data * @return \App\User */ protected function create(array $data) diff --git a/app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php b/app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php index 579ad901..9e0869fa 100644 --- a/app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth; -use InvoiceShelf\Http\Controllers\Controller; -use InvoiceShelf\Providers\RouteServiceProvider; use Illuminate\Auth\Events\PasswordReset; use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Http\Request; use Illuminate\Support\Str; +use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Providers\RouteServiceProvider; class ResetPasswordController extends Controller { @@ -34,7 +34,6 @@ class ResetPasswordController extends Controller /** * Get the response for a successful password reset. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ @@ -66,7 +65,6 @@ class ResetPasswordController extends Controller /** * Get the response for a failed password reset. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ diff --git a/app/Http/Controllers/V1/Admin/Auth/VerificationController.php b/app/Http/Controllers/V1/Admin/Auth/VerificationController.php index de92257f..7e725807 100644 --- a/app/Http/Controllers/V1/Admin/Auth/VerificationController.php +++ b/app/Http/Controllers/V1/Admin/Auth/VerificationController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Auth; +use Illuminate\Foundation\Auth\VerifiesEmails; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Providers\RouteServiceProvider; -use Illuminate\Foundation\Auth\VerifiesEmails; class VerificationController extends Controller { diff --git a/app/Http/Controllers/V1/Admin/Backup/ApiController.php b/app/Http/Controllers/V1/Admin/Backup/ApiController.php index f05a4d74..1f8dd48d 100644 --- a/app/Http/Controllers/V1/Admin/Backup/ApiController.php +++ b/app/Http/Controllers/V1/Admin/Backup/ApiController.php @@ -4,15 +4,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Backup; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\JsonResponse; +use InvoiceShelf\Http\Controllers\Controller; class ApiController extends Controller { - /** - * - * @return JsonResponse - */ public function respondSuccess(): JsonResponse { return response()->json([ diff --git a/app/Http/Controllers/V1/Admin/Backup/BackupsController.php b/app/Http/Controllers/V1/Admin/Backup/BackupsController.php index 1a5f5ce1..e5c7897d 100644 --- a/app/Http/Controllers/V1/Admin/Backup/BackupsController.php +++ b/app/Http/Controllers/V1/Admin/Backup/BackupsController.php @@ -4,11 +4,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Backup; -use InvoiceShelf\Jobs\CreateBackupJob; -use InvoiceShelf\Rules\Backup\PathToZip; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; +use InvoiceShelf\Jobs\CreateBackupJob; +use InvoiceShelf\Rules\Backup\PathToZip; use Spatie\Backup\BackupDestination\Backup; use Spatie\Backup\BackupDestination\BackupDestination; use Spatie\Backup\Helpers\Format; @@ -59,7 +59,6 @@ class BackupsController extends ApiController /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request * @return JsonResponse */ public function store(Request $request) @@ -74,7 +73,6 @@ class BackupsController extends ApiController /** * Remove the specified resource from storage. * - * @param \Illuminate\Http\Request $request * @return JsonResponse */ public function destroy($disk, Request $request) diff --git a/app/Http/Controllers/V1/Admin/Backup/DownloadBackupController.php b/app/Http/Controllers/V1/Admin/Backup/DownloadBackupController.php index 8db815a7..334450d3 100644 --- a/app/Http/Controllers/V1/Admin/Backup/DownloadBackupController.php +++ b/app/Http/Controllers/V1/Admin/Backup/DownloadBackupController.php @@ -4,8 +4,8 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Backup; -use InvoiceShelf\Rules\Backup\PathToZip; use Illuminate\Http\Request; +use InvoiceShelf\Rules\Backup\PathToZip; use Spatie\Backup\BackupDestination\Backup; use Spatie\Backup\BackupDestination\BackupDestination; use Symfony\Component\HttpFoundation\Response; diff --git a/app/Http/Controllers/V1/Admin/Company/CompaniesController.php b/app/Http/Controllers/V1/Admin/Company/CompaniesController.php index 39b02633..3e1be8f4 100644 --- a/app/Http/Controllers/V1/Admin/Company/CompaniesController.php +++ b/app/Http/Controllers/V1/Admin/Company/CompaniesController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Company; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\CompaniesRequest; use InvoiceShelf\Http\Resources\CompanyResource; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\User; -use Illuminate\Http\Request; use Silber\Bouncer\BouncerFacade; use Vinkla\Hashids\Facades\Hashids; @@ -52,7 +52,7 @@ class CompaniesController extends Controller $company->deleteCompany($user); return response()->json([ - 'success' => true + 'success' => true, ]); } @@ -64,7 +64,7 @@ class CompaniesController extends Controller if ($user->hasCompany($company->id)) { return response()->json([ 'success' => false, - 'message' => 'User does not belongs to this company.' + 'message' => 'User does not belongs to this company.', ]); } @@ -72,7 +72,7 @@ class CompaniesController extends Controller BouncerFacade::sync($user)->roles(['super admin']); return response()->json([ - 'success' => true + 'success' => true, ]); } diff --git a/app/Http/Controllers/V1/Admin/Company/CompanyController.php b/app/Http/Controllers/V1/Admin/Company/CompanyController.php index c0fce839..bcdb96ba 100644 --- a/app/Http/Controllers/V1/Admin/Company/CompanyController.php +++ b/app/Http/Controllers/V1/Admin/Company/CompanyController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Company; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\CompanyResource; use InvoiceShelf\Models\Company; -use Illuminate\Http\Request; class CompanyController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php b/app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php index 16aec2c7..047c4622 100644 --- a/app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php +++ b/app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Config; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class FiscalYearsController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Config/LanguagesController.php b/app/Http/Controllers/V1/Admin/Config/LanguagesController.php index 1dfd91ba..7aa1c337 100644 --- a/app/Http/Controllers/V1/Admin/Config/LanguagesController.php +++ b/app/Http/Controllers/V1/Admin/Config/LanguagesController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Config; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class LanguagesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php b/app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php index 4e8e01c9..eff763b8 100644 --- a/app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php +++ b/app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Config; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class RetrospectiveEditsController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php b/app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php index d1ab83f0..8f27d24a 100644 --- a/app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php +++ b/app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\CustomField; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\CustomFieldRequest; use InvoiceShelf\Http\Resources\CustomFieldResource; use InvoiceShelf\Models\CustomField; -use Illuminate\Http\Request; class CustomFieldsController extends Controller { diff --git a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php b/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php index c9d78dc0..282c8e32 100644 --- a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php +++ b/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php @@ -3,6 +3,7 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Customer; use Carbon\Carbon; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\CustomerResource; use InvoiceShelf\Models\CompanySetting; @@ -10,14 +11,12 @@ use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\Expense; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\Payment; -use Illuminate\Http\Request; class CustomerStatsController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Customer $customer) @@ -136,7 +135,7 @@ class CustomerStatsController extends Controller return (new CustomerResource($customer)) ->additional(['meta' => [ - 'chartData' => $chartData + 'chartData' => $chartData, ]]); } } diff --git a/app/Http/Controllers/V1/Admin/Customer/CustomersController.php b/app/Http/Controllers/V1/Admin/Customer/CustomersController.php index 48f409ee..cc1bbc84 100644 --- a/app/Http/Controllers/V1/Admin/Customer/CustomersController.php +++ b/app/Http/Controllers/V1/Admin/Customer/CustomersController.php @@ -2,13 +2,13 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Customer; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests; use InvoiceShelf\Http\Requests\DeleteCustomersRequest; use InvoiceShelf\Http\Resources\CustomerResource; use InvoiceShelf\Models\Customer; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; class CustomersController extends Controller { @@ -35,7 +35,7 @@ class CustomersController extends Controller ->leftJoin('invoices', 'customers.id', '=', 'invoices.customer_id') ->paginateData($limit); - return (CustomerResource::collection($customers)) + return CustomerResource::collection($customers) ->additional(['meta' => [ 'customer_total_count' => Customer::whereCompany()->count(), ]]); @@ -59,7 +59,6 @@ class CustomersController extends Controller /** * Display the specified resource. * - * @param Customer $customer * @return \Illuminate\Http\JsonResponse */ public function show(Customer $customer) @@ -72,8 +71,7 @@ class CustomersController extends Controller /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\Customer $customer + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function update(Requests\CustomerRequest $request, Customer $customer) @@ -92,7 +90,7 @@ class CustomersController extends Controller /** * Remove a list of Customers along side all their resources (ie. Estimates, Invoices, Payments and Addresses) * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function delete(DeleteCustomersRequest $request) diff --git a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php b/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php index c1a030b9..ae2f3cba 100644 --- a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php +++ b/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php @@ -3,6 +3,7 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Dashboard; use Carbon\Carbon; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\CompanySetting; @@ -11,7 +12,6 @@ use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\Expense; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\Payment; -use Illuminate\Http\Request; use Silber\Bouncer\BouncerFacade; class DashboardController extends Controller @@ -19,7 +19,6 @@ class DashboardController extends Controller /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(Request $request) @@ -65,8 +64,8 @@ class DashboardController extends Controller 'invoice_date', [$start->format('Y-m-d'), $end->format('Y-m-d')] ) - ->whereCompany() - ->sum('base_total') + ->whereCompany() + ->sum('base_total') ); array_push( $expense_totals, @@ -74,8 +73,8 @@ class DashboardController extends Controller 'expense_date', [$start->format('Y-m-d'), $end->format('Y-m-d')] ) - ->whereCompany() - ->sum('base_amount') + ->whereCompany() + ->sum('base_amount') ); array_push( $receipt_totals, @@ -83,8 +82,8 @@ class DashboardController extends Controller 'payment_date', [$start->format('Y-m-d'), $end->format('Y-m-d')] ) - ->whereCompany() - ->sum('base_amount') + ->whereCompany() + ->sum('base_amount') ); array_push( $net_income_totals, @@ -121,7 +120,7 @@ class DashboardController extends Controller ->whereCompany() ->sum('base_amount'); - $total_net_income = (int)$total_receipts - (int)$total_expenses; + $total_net_income = (int) $total_receipts - (int) $total_expenses; $chart_data = [ 'months' => $months, diff --git a/app/Http/Controllers/V1/Admin/Estimate/ChangeEstimateStatusController.php b/app/Http/Controllers/V1/Admin/Estimate/ChangeEstimateStatusController.php index 9478dcb1..3f21116f 100644 --- a/app/Http/Controllers/V1/Admin/Estimate/ChangeEstimateStatusController.php +++ b/app/Http/Controllers/V1/Admin/Estimate/ChangeEstimateStatusController.php @@ -2,19 +2,17 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Estimate; -use Illuminate\Http\Request; class ChangeEstimateStatusController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @param Estimate $estimate - * @return \Illuminate\Http\Response - */ + * Handle the incoming request. + * + * @return \Illuminate\Http\Response + */ public function __invoke(Request $request, Estimate $estimate) { $this->authorize('send estimate', $estimate); diff --git a/app/Http/Controllers/V1/Admin/Estimate/ConvertEstimateController.php b/app/Http/Controllers/V1/Admin/Estimate/ConvertEstimateController.php index efe90db3..0a24f863 100644 --- a/app/Http/Controllers/V1/Admin/Estimate/ConvertEstimateController.php +++ b/app/Http/Controllers/V1/Admin/Estimate/ConvertEstimateController.php @@ -3,14 +3,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate; use Carbon\Carbon; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\InvoiceResource; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Services\SerialNumberFormatter; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use Vinkla\Hashids\Facades\Hashids; class ConvertEstimateController extends Controller @@ -18,8 +18,6 @@ class ConvertEstimateController extends Controller /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\Estimate $estimate * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Estimate $estimate, Invoice $invoice) diff --git a/app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php b/app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php index 2594ee48..ad535e6c 100644 --- a/app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php +++ b/app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Estimate; -use Illuminate\Http\Request; class EstimateTemplatesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -21,7 +20,7 @@ class EstimateTemplatesController extends Controller $estimateTemplates = Estimate::estimateTemplates(); return response()->json([ - 'estimateTemplates' => $estimateTemplates + 'estimateTemplates' => $estimateTemplates, ]); } } diff --git a/app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php b/app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php index c7649f75..f72df342 100644 --- a/app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php +++ b/app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php @@ -2,13 +2,13 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\DeleteEstimatesRequest; use InvoiceShelf\Http\Requests\EstimatesRequest; use InvoiceShelf\Http\Resources\EstimateResource; use InvoiceShelf\Jobs\GenerateEstimatePdfJob; use InvoiceShelf\Models\Estimate; -use Illuminate\Http\Request; class EstimatesController extends Controller { @@ -25,7 +25,7 @@ class EstimatesController extends Controller ->latest() ->paginateData($limit); - return (EstimateResource::collection($estimates)) + return EstimateResource::collection($estimates) ->additional(['meta' => [ 'estimate_total_count' => Estimate::whereCompany()->count(), ]]); diff --git a/app/Http/Controllers/V1/Admin/Estimate/SendEstimateController.php b/app/Http/Controllers/V1/Admin/Estimate/SendEstimateController.php index f5a51aff..4682277f 100644 --- a/app/Http/Controllers/V1/Admin/Estimate/SendEstimateController.php +++ b/app/Http/Controllers/V1/Admin/Estimate/SendEstimateController.php @@ -9,11 +9,10 @@ use InvoiceShelf\Models\Estimate; class SendEstimateController extends Controller { /** - * Handle the incoming request. - * - * @param \InvoiceShelf\Http\Requests\SendEstimatesRequest $request - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(SendEstimatesRequest $request, Estimate $estimate) { $this->authorize('send estimate', $estimate); diff --git a/app/Http/Controllers/V1/Admin/Estimate/SendEstimatePreviewController.php b/app/Http/Controllers/V1/Admin/Estimate/SendEstimatePreviewController.php index e6cbef8a..50f0174c 100644 --- a/app/Http/Controllers/V1/Admin/Estimate/SendEstimatePreviewController.php +++ b/app/Http/Controllers/V1/Admin/Estimate/SendEstimatePreviewController.php @@ -2,19 +2,18 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Estimate; +use Illuminate\Mail\Markdown; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\SendEstimatesRequest; use InvoiceShelf\Models\Estimate; -use Illuminate\Mail\Markdown; class SendEstimatePreviewController extends Controller { /** - * Handle the incoming request. - * - * @param \InvoiceShelf\Http\Requests\SendEstimatesRequest $request - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(SendEstimatesRequest $request, Estimate $estimate) { $this->authorize('send estimate', $estimate); diff --git a/app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php b/app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php index 17e6891c..9e77c5a6 100644 --- a/app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php +++ b/app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\ExchangeRateProviderRequest; use InvoiceShelf\Http\Resources\ExchangeRateProviderResource; use InvoiceShelf\Models\ExchangeRateProvider; -use Illuminate\Http\Request; class ExchangeRateProviderController extends Controller { @@ -56,7 +56,6 @@ class ExchangeRateProviderController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Http\Response */ public function show(ExchangeRateProvider $exchangeRateProvider) @@ -70,7 +69,6 @@ class ExchangeRateProviderController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Http\Response */ public function update(ExchangeRateProviderRequest $request, ExchangeRateProvider $exchangeRateProvider) @@ -97,7 +95,6 @@ class ExchangeRateProviderController extends Controller /** * Remove the specified resource from storage. * - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Http\Response */ public function destroy(ExchangeRateProvider $exchangeRateProvider) diff --git a/app/Http/Controllers/V1/Admin/ExchangeRate/GetActiveProviderController.php b/app/Http/Controllers/V1/Admin/ExchangeRate/GetActiveProviderController.php index b2384182..555fe8b5 100644 --- a/app/Http/Controllers/V1/Admin/ExchangeRate/GetActiveProviderController.php +++ b/app/Http/Controllers/V1/Admin/ExchangeRate/GetActiveProviderController.php @@ -2,24 +2,23 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\ExchangeRateProvider; -use Illuminate\Http\Request; class GetActiveProviderController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Currency $currency) { $query = ExchangeRateProvider::whereCompany()->whereJsonContains('currencies', $currency->code) - ->where('active', true) - ->get(); + ->where('active', true) + ->get(); if (count($query) !== 0) { return response()->json([ diff --git a/app/Http/Controllers/V1/Admin/ExchangeRate/GetExchangeRateController.php b/app/Http/Controllers/V1/Admin/ExchangeRate/GetExchangeRateController.php index 252ae3e8..8b0a83fe 100644 --- a/app/Http/Controllers/V1/Admin/ExchangeRate/GetExchangeRateController.php +++ b/app/Http/Controllers/V1/Admin/ExchangeRate/GetExchangeRateController.php @@ -2,14 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate; +use Illuminate\Http\Request; +use Illuminate\Support\Arr; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\ExchangeRateLog; use InvoiceShelf\Models\ExchangeRateProvider; use InvoiceShelf\Traits\ExchangeRateProvidersTrait; -use Illuminate\Http\Request; -use Illuminate\Support\Arr; class GetExchangeRateController extends Controller { @@ -18,7 +18,6 @@ class GetExchangeRateController extends Controller /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Currency $currency) @@ -27,14 +26,14 @@ class GetExchangeRateController extends Controller $baseCurrency = Currency::findOrFail($settings['currency']); $query = ExchangeRateProvider::whereJsonContains('currencies', $currency->code) - ->where('active', true) - ->get() - ->toArray(); + ->where('active', true) + ->get() + ->toArray(); $exchange_rate = ExchangeRateLog::where('base_currency_id', $currency->id) - ->where('currency_id', $baseCurrency->id) - ->orderBy('created_at', 'desc') - ->value('exchange_rate'); + ->where('currency_id', $baseCurrency->id) + ->orderBy('created_at', 'desc') + ->value('exchange_rate'); if ($query) { $filter = Arr::only($query[0], ['key', 'driver', 'driver_config']); diff --git a/app/Http/Controllers/V1/Admin/ExchangeRate/GetSupportedCurrenciesController.php b/app/Http/Controllers/V1/Admin/ExchangeRate/GetSupportedCurrenciesController.php index f9b475c2..5113ad6a 100644 --- a/app/Http/Controllers/V1/Admin/ExchangeRate/GetSupportedCurrenciesController.php +++ b/app/Http/Controllers/V1/Admin/ExchangeRate/GetSupportedCurrenciesController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\ExchangeRateProvider; use InvoiceShelf\Traits\ExchangeRateProvidersTrait; -use Illuminate\Http\Request; class GetSupportedCurrenciesController extends Controller { @@ -14,7 +14,6 @@ class GetSupportedCurrenciesController extends Controller /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/ExchangeRate/GetUsedCurrenciesController.php b/app/Http/Controllers/V1/Admin/ExchangeRate/GetUsedCurrenciesController.php index 6309a32d..74e90be1 100644 --- a/app/Http/Controllers/V1/Admin/ExchangeRate/GetUsedCurrenciesController.php +++ b/app/Http/Controllers/V1/Admin/ExchangeRate/GetUsedCurrenciesController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\ExchangeRate; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\ExchangeRateProvider; -use Illuminate\Http\Request; class GetUsedCurrenciesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php b/app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php index 9ebb7f3d..fa96f961 100644 --- a/app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php +++ b/app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Expense; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\ExpenseCategoryRequest; use InvoiceShelf\Http\Resources\ExpenseCategoryResource; use InvoiceShelf\Models\ExpenseCategory; -use Illuminate\Http\Request; class ExpenseCategoriesController extends Controller { @@ -32,7 +32,7 @@ class ExpenseCategoriesController extends Controller /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function store(ExpenseCategoryRequest $request) @@ -47,7 +47,6 @@ class ExpenseCategoriesController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\ExpenseCategory $category * @return \Illuminate\Http\Response */ public function show(ExpenseCategory $category) @@ -60,8 +59,8 @@ class ExpenseCategoriesController extends Controller /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\ExpenseCategory $ExpenseCategory + * @param \Illuminate\Http\Request $request + * @param \InvoiceShelf\Models\ExpenseCategory $ExpenseCategory * @return \Illuminate\Http\Response */ public function update(ExpenseCategoryRequest $request, ExpenseCategory $category) @@ -76,7 +75,7 @@ class ExpenseCategoriesController extends Controller /** * Remove the specified resource from storage. * - * @param \InvoiceShelf\ExpensesCategory $category + * @param \InvoiceShelf\ExpensesCategory $category * @return \Illuminate\Http\Response */ public function destroy(ExpenseCategory $category) diff --git a/app/Http/Controllers/V1/Admin/Expense/ExpensesController.php b/app/Http/Controllers/V1/Admin/Expense/ExpensesController.php index 0542b22f..dfc1d0c0 100644 --- a/app/Http/Controllers/V1/Admin/Expense/ExpensesController.php +++ b/app/Http/Controllers/V1/Admin/Expense/ExpensesController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Expense; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\DeleteExpensesRequest; use InvoiceShelf\Http\Requests\ExpenseRequest; use InvoiceShelf\Http\Resources\ExpenseResource; use InvoiceShelf\Models\Expense; -use Illuminate\Http\Request; class ExpensesController extends Controller { @@ -30,7 +30,7 @@ class ExpensesController extends Controller ->select('expenses.*', 'expense_categories.name', 'customers.name as user_name') ->paginateData($limit); - return (ExpenseResource::collection($expenses)) + return ExpenseResource::collection($expenses) ->additional(['meta' => [ 'expense_total_count' => Expense::whereCompany()->count(), ]]); @@ -39,7 +39,6 @@ class ExpensesController extends Controller /** * Store a newly created resource in storage. * - * @param \InvoiceShelf\Http\Requests\ExpenseRequest $request * @return \Illuminate\Http\JsonResponse */ public function store(ExpenseRequest $request) @@ -54,7 +53,6 @@ class ExpensesController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\Expense $expense * @return \Illuminate\Http\JsonResponse */ public function show(Expense $expense) @@ -67,8 +65,6 @@ class ExpensesController extends Controller /** * Update the specified resource in storage. * - * @param \InvoiceShelf\Http\Requests\ExpenseRequest $request - * @param \InvoiceShelf\Models\Expense $expense * @return \Illuminate\Http\JsonResponse */ public function update(ExpenseRequest $request, Expense $expense) diff --git a/app/Http/Controllers/V1/Admin/Expense/ShowReceiptController.php b/app/Http/Controllers/V1/Admin/Expense/ShowReceiptController.php index 7499fcba..334a6a5a 100644 --- a/app/Http/Controllers/V1/Admin/Expense/ShowReceiptController.php +++ b/app/Http/Controllers/V1/Admin/Expense/ShowReceiptController.php @@ -10,8 +10,7 @@ class ShowReceiptController extends Controller /** * Retrieve details of an expense receipt from storage. * - * @param \InvoiceShelf\Models\Expense $expense - * @return \Illuminate\Http\JsonResponse + * @return \Illuminate\Http\JsonResponse */ public function __invoke(Expense $expense) { diff --git a/app/Http/Controllers/V1/Admin/Expense/UploadReceiptController.php b/app/Http/Controllers/V1/Admin/Expense/UploadReceiptController.php index d3b2201c..14ad5e76 100644 --- a/app/Http/Controllers/V1/Admin/Expense/UploadReceiptController.php +++ b/app/Http/Controllers/V1/Admin/Expense/UploadReceiptController.php @@ -11,8 +11,7 @@ class UploadReceiptController extends Controller /** * Upload the expense receipts to storage. * - * @param \InvoiceShelf\Http\Requests\ExpenseRequest $request - * @param Expense $expense + * @param \InvoiceShelf\Http\Requests\ExpenseRequest $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(UploadExpenseReceiptRequest $request, Expense $expense) diff --git a/app/Http/Controllers/V1/Admin/General/BootstrapController.php b/app/Http/Controllers/V1/Admin/General/BootstrapController.php index a8593bca..549ad94c 100644 --- a/app/Http/Controllers/V1/Admin/General/BootstrapController.php +++ b/app/Http/Controllers/V1/Admin/General/BootstrapController.php @@ -2,6 +2,7 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\CompanyResource; use InvoiceShelf\Http\Resources\UserResource; @@ -11,7 +12,6 @@ use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Module; use InvoiceShelf\Models\Setting; use InvoiceShelf\Traits\GeneratesMenuTrait; -use Illuminate\Http\Request; use Silber\Bouncer\BouncerFacade; class BootstrapController extends Controller @@ -21,7 +21,6 @@ class BootstrapController extends Controller /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(Request $request) @@ -57,7 +56,7 @@ class BootstrapController extends Controller 'login_page_heading', 'login_page_description', 'admin_page_title', - 'copyright_text' + 'copyright_text', ]); return response()->json([ diff --git a/app/Http/Controllers/V1/Admin/General/BulkExchangeRateController.php b/app/Http/Controllers/V1/Admin/General/BulkExchangeRateController.php index 248cfb9a..07ce51f2 100644 --- a/app/Http/Controllers/V1/Admin/General/BulkExchangeRateController.php +++ b/app/Http/Controllers/V1/Admin/General/BulkExchangeRateController.php @@ -37,7 +37,7 @@ class BulkExchangeRateController extends Controller 'base_sub_total' => $invoice->sub_total * $currency['exchange_rate'], 'base_total' => $invoice->total * $currency['exchange_rate'], 'base_tax' => $invoice->tax * $currency['exchange_rate'], - 'base_due_amount' => $invoice->due_amount * $currency['exchange_rate'] + 'base_due_amount' => $invoice->due_amount * $currency['exchange_rate'], ]); $this->items($invoice); @@ -53,7 +53,7 @@ class BulkExchangeRateController extends Controller 'base_discount_val' => $estimate->sub_total * $currency['exchange_rate'], 'base_sub_total' => $estimate->sub_total * $currency['exchange_rate'], 'base_total' => $estimate->total * $currency['exchange_rate'], - 'base_tax' => $estimate->tax * $currency['exchange_rate'] + 'base_tax' => $estimate->tax * $currency['exchange_rate'], ]); $this->items($estimate); @@ -82,18 +82,18 @@ class BulkExchangeRateController extends Controller } $settings = [ - 'bulk_exchange_rate_configured' => 'YES' + 'bulk_exchange_rate_configured' => 'YES', ]; CompanySetting::setSettings($settings, $request->header('company')); return response()->json([ - 'success' => true + 'success' => true, ]); } return response()->json([ - 'error' => false + 'error' => false, ]); } @@ -105,7 +105,7 @@ class BulkExchangeRateController extends Controller 'base_discount_val' => $item->discount_val * $model->exchange_rate, 'base_price' => $item->price * $model->exchange_rate, 'base_tax' => $item->tax * $model->exchange_rate, - 'base_total' => $item->total * $model->exchange_rate + 'base_total' => $item->total * $model->exchange_rate, ]); $this->taxes($item); diff --git a/app/Http/Controllers/V1/Admin/General/ConfigController.php b/app/Http/Controllers/V1/Admin/General/ConfigController.php index ca173292..d4bb1fc2 100644 --- a/app/Http/Controllers/V1/Admin/General/ConfigController.php +++ b/app/Http/Controllers/V1/Admin/General/ConfigController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class ConfigController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/General/CountriesController.php b/app/Http/Controllers/V1/Admin/General/CountriesController.php index e15eacd7..02094c41 100644 --- a/app/Http/Controllers/V1/Admin/General/CountriesController.php +++ b/app/Http/Controllers/V1/Admin/General/CountriesController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\CountryResource; use InvoiceShelf\Models\Country; -use Illuminate\Http\Request; class CountriesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/General/CurrenciesController.php b/app/Http/Controllers/V1/Admin/General/CurrenciesController.php index 78fe2dc6..3481519a 100644 --- a/app/Http/Controllers/V1/Admin/General/CurrenciesController.php +++ b/app/Http/Controllers/V1/Admin/General/CurrenciesController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\CurrencyResource; use InvoiceShelf\Models\Currency; -use Illuminate\Http\Request; class CurrenciesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/General/DateFormatsController.php b/app/Http/Controllers/V1/Admin/General/DateFormatsController.php index c6d354c8..1e938559 100644 --- a/app/Http/Controllers/V1/Admin/General/DateFormatsController.php +++ b/app/Http/Controllers/V1/Admin/General/DateFormatsController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\DateFormatter; -use Illuminate\Http\Request; class DateFormatsController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/General/GetAllUsedCurrenciesController.php b/app/Http/Controllers/V1/Admin/General/GetAllUsedCurrenciesController.php index e2be9227..89fb12c7 100644 --- a/app/Http/Controllers/V1/Admin/General/GetAllUsedCurrenciesController.php +++ b/app/Http/Controllers/V1/Admin/General/GetAllUsedCurrenciesController.php @@ -2,20 +2,19 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\Payment; use InvoiceShelf\Models\Tax; -use Illuminate\Http\Request; class GetAllUsedCurrenciesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -31,7 +30,7 @@ class GetAllUsedCurrenciesController extends Controller $currencies = array_merge($invoices, $taxes, $estimates, $payments); return response()->json([ - 'currencies' => Currency::whereIn('id', $currencies)->get() + 'currencies' => Currency::whereIn('id', $currencies)->get(), ]); } } diff --git a/app/Http/Controllers/V1/Admin/General/NextNumberController.php b/app/Http/Controllers/V1/Admin/General/NextNumberController.php index c157c1e4..2c6f769e 100644 --- a/app/Http/Controllers/V1/Admin/General/NextNumberController.php +++ b/app/Http/Controllers/V1/Admin/General/NextNumberController.php @@ -2,19 +2,18 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\Payment; use InvoiceShelf\Services\SerialNumberFormatter; -use Illuminate\Http\Request; class NextNumberController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Invoice $invoice, Estimate $estimate, Payment $payment) @@ -54,7 +53,7 @@ class NextNumberController extends Controller } catch (\Exception $exception) { return response()->json([ 'success' => false, - 'message' => $exception->getMessage() + 'message' => $exception->getMessage(), ]); } diff --git a/app/Http/Controllers/V1/Admin/General/NotesController.php b/app/Http/Controllers/V1/Admin/General/NotesController.php index 3cd9ffa3..7f81573c 100644 --- a/app/Http/Controllers/V1/Admin/General/NotesController.php +++ b/app/Http/Controllers/V1/Admin/General/NotesController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\NotesRequest; use InvoiceShelf\Http\Resources\NoteResource; use InvoiceShelf\Models\Note; -use Illuminate\Http\Request; class NotesController extends Controller { @@ -47,7 +47,6 @@ class NotesController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\Note $note * @return \Illuminate\Http\Response */ public function show(Note $note) @@ -61,7 +60,6 @@ class NotesController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\Note $note * @return \Illuminate\Http\Response */ public function update(NotesRequest $request, Note $note) @@ -76,7 +74,6 @@ class NotesController extends Controller /** * Remove the specified resource from storage. * - * @param \InvoiceShelf\Models\Note $note * @return \Illuminate\Http\Response */ public function destroy(Note $note) diff --git a/app/Http/Controllers/V1/Admin/General/NumberPlaceholdersController.php b/app/Http/Controllers/V1/Admin/General/NumberPlaceholdersController.php index 4730b366..32b5a6cb 100644 --- a/app/Http/Controllers/V1/Admin/General/NumberPlaceholdersController.php +++ b/app/Http/Controllers/V1/Admin/General/NumberPlaceholdersController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Services\SerialNumberFormatter; -use Illuminate\Http\Request; class NumberPlaceholdersController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/General/SearchController.php b/app/Http/Controllers/V1/Admin/General/SearchController.php index 9b57fa2e..2c53e0d0 100644 --- a/app/Http/Controllers/V1/Admin/General/SearchController.php +++ b/app/Http/Controllers/V1/Admin/General/SearchController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\User; -use Illuminate\Http\Request; class SearchController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/General/SearchUsersController.php b/app/Http/Controllers/V1/Admin/General/SearchUsersController.php index 70a96397..ec3d6364 100644 --- a/app/Http/Controllers/V1/Admin/General/SearchUsersController.php +++ b/app/Http/Controllers/V1/Admin/General/SearchUsersController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\User; -use Illuminate\Http\Request; class SearchUsersController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/General/TimezonesController.php b/app/Http/Controllers/V1/Admin/General/TimezonesController.php index 84504ad8..f5474cbd 100644 --- a/app/Http/Controllers/V1/Admin/General/TimezonesController.php +++ b/app/Http/Controllers/V1/Admin/General/TimezonesController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\General; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\TimeZones; -use Illuminate\Http\Request; class TimezonesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Invoice/ChangeInvoiceStatusController.php b/app/Http/Controllers/V1/Admin/Invoice/ChangeInvoiceStatusController.php index 6d42b8c8..fd4d69f6 100644 --- a/app/Http/Controllers/V1/Admin/Invoice/ChangeInvoiceStatusController.php +++ b/app/Http/Controllers/V1/Admin/Invoice/ChangeInvoiceStatusController.php @@ -2,18 +2,17 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Invoice; -use Illuminate\Http\Request; class ChangeInvoiceStatusController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\JsonResponse - */ + * Handle the incoming request. + * + * @return \Illuminate\Http\JsonResponse + */ public function __invoke(Request $request, Invoice $invoice) { $this->authorize('send invoice', $invoice); diff --git a/app/Http/Controllers/V1/Admin/Invoice/CloneInvoiceController.php b/app/Http/Controllers/V1/Admin/Invoice/CloneInvoiceController.php index 9ecfbf8a..f324145c 100644 --- a/app/Http/Controllers/V1/Admin/Invoice/CloneInvoiceController.php +++ b/app/Http/Controllers/V1/Admin/Invoice/CloneInvoiceController.php @@ -3,12 +3,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice; use Carbon\Carbon; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\InvoiceResource; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Services\SerialNumberFormatter; -use Illuminate\Http\Request; use Vinkla\Hashids\Facades\Hashids; class CloneInvoiceController extends Controller @@ -16,7 +16,6 @@ class CloneInvoiceController extends Controller /** * Mail a specific invoice to the corresponding customer's email address. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(Request $request, Invoice $invoice) @@ -121,7 +120,7 @@ class CloneInvoiceController extends Controller foreach ($invoice->fields as $data) { $customFields[] = [ 'id' => $data->custom_field_id, - 'value' => $data->defaultAnswer + 'value' => $data->defaultAnswer, ]; } diff --git a/app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php b/app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php index 175d849a..8d974a8a 100644 --- a/app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php +++ b/app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Invoice; -use Illuminate\Http\Request; class InvoiceTemplatesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php b/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php index a8464bc7..805bedc3 100644 --- a/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php +++ b/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php @@ -2,13 +2,13 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests; use InvoiceShelf\Http\Requests\DeleteInvoiceRequest; use InvoiceShelf\Http\Resources\InvoiceResource; use InvoiceShelf\Jobs\GenerateInvoicePdfJob; use InvoiceShelf\Models\Invoice; -use Illuminate\Http\Request; class InvoicesController extends Controller { @@ -30,7 +30,7 @@ class InvoicesController extends Controller ->latest() ->paginateData($limit); - return (InvoiceResource::collection($invoices)) + return InvoiceResource::collection($invoices) ->additional(['meta' => [ 'invoice_total_count' => Invoice::whereCompany()->count(), ]]); @@ -39,7 +39,7 @@ class InvoicesController extends Controller /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function store(Requests\InvoicesRequest $request) @@ -60,7 +60,6 @@ class InvoicesController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\Invoice $invoice * @return \Illuminate\Http\JsonResponse */ public function show(Request $request, Invoice $invoice) @@ -73,8 +72,7 @@ class InvoicesController extends Controller /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param Invoice $invoice + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function update(Requests\InvoicesRequest $request, Invoice $invoice) @@ -95,7 +93,7 @@ class InvoicesController extends Controller /** * delete the specified resources in storage. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function delete(DeleteInvoiceRequest $request) diff --git a/app/Http/Controllers/V1/Admin/Invoice/SendInvoiceController.php b/app/Http/Controllers/V1/Admin/Invoice/SendInvoiceController.php index b3a4ba8d..081b09dc 100644 --- a/app/Http/Controllers/V1/Admin/Invoice/SendInvoiceController.php +++ b/app/Http/Controllers/V1/Admin/Invoice/SendInvoiceController.php @@ -11,7 +11,7 @@ class SendInvoiceController extends Controller /** * Mail a specific invoice to the corresponding customer's email address. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(SendInvoiceRequest $request, Invoice $invoice) diff --git a/app/Http/Controllers/V1/Admin/Invoice/SendInvoicePreviewController.php b/app/Http/Controllers/V1/Admin/Invoice/SendInvoicePreviewController.php index 3cd1b71e..7f4c0c70 100644 --- a/app/Http/Controllers/V1/Admin/Invoice/SendInvoicePreviewController.php +++ b/app/Http/Controllers/V1/Admin/Invoice/SendInvoicePreviewController.php @@ -2,17 +2,17 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Invoice; +use Illuminate\Mail\Markdown; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\SendInvoiceRequest; use InvoiceShelf\Models\Invoice; -use Illuminate\Mail\Markdown; class SendInvoicePreviewController extends Controller { /** * Mail a specific invoice to the corresponding customer's email address. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(SendInvoiceRequest $request, Invoice $invoice) diff --git a/app/Http/Controllers/V1/Admin/Item/ItemsController.php b/app/Http/Controllers/V1/Admin/Item/ItemsController.php index 6434f3c0..674e5fc7 100644 --- a/app/Http/Controllers/V1/Admin/Item/ItemsController.php +++ b/app/Http/Controllers/V1/Admin/Item/ItemsController.php @@ -2,20 +2,19 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Item; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests; use InvoiceShelf\Http\Requests\DeleteItemsRequest; use InvoiceShelf\Http\Resources\ItemResource; use InvoiceShelf\Models\Item; use InvoiceShelf\Models\TaxType; -use Illuminate\Http\Request; class ItemsController extends Controller { /** * Retrieve a list of existing Items. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function index(Request $request) @@ -31,7 +30,7 @@ class ItemsController extends Controller ->latest() ->paginateData($limit); - return (ItemResource::collection($items)) + return ItemResource::collection($items) ->additional(['meta' => [ 'tax_types' => TaxType::whereCompany()->latest()->get(), 'item_total_count' => Item::whereCompany()->count(), @@ -41,7 +40,7 @@ class ItemsController extends Controller /** * Create Item. * - * @param InvoiceShelf\Http\Requests\ItemsRequest $request + * @param InvoiceShelf\Http\Requests\ItemsRequest $request * @return \Illuminate\Http\JsonResponse */ public function store(Requests\ItemsRequest $request) @@ -56,7 +55,6 @@ class ItemsController extends Controller /** * get an existing Item. * - * @param Item $item * @return \Illuminate\Http\JsonResponse */ public function show(Item $item) @@ -69,8 +67,7 @@ class ItemsController extends Controller /** * Update an existing Item. * - * @param InvoiceShelf\Http\Requests\ItemsRequest $request - * @param \InvoiceShelf\Models\Item $item + * @param InvoiceShelf\Http\Requests\ItemsRequest $request * @return \Illuminate\Http\JsonResponse */ public function update(Requests\ItemsRequest $request, Item $item) @@ -85,7 +82,7 @@ class ItemsController extends Controller /** * Delete a list of existing Items. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function delete(DeleteItemsRequest $request) diff --git a/app/Http/Controllers/V1/Admin/Item/UnitsController.php b/app/Http/Controllers/V1/Admin/Item/UnitsController.php index cd3b98bb..c0c8f082 100644 --- a/app/Http/Controllers/V1/Admin/Item/UnitsController.php +++ b/app/Http/Controllers/V1/Admin/Item/UnitsController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Item; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\UnitRequest; use InvoiceShelf\Http\Resources\UnitResource; use InvoiceShelf\Models\Unit; -use Illuminate\Http\Request; class UnitsController extends Controller { @@ -47,7 +47,6 @@ class UnitsController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\Unit $unit * @return \Illuminate\Http\Response */ public function show(Unit $unit) @@ -61,7 +60,6 @@ class UnitsController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\Unit $unit * @return \Illuminate\Http\Response */ public function update(UnitRequest $request, Unit $unit) @@ -76,7 +74,6 @@ class UnitsController extends Controller /** * Remove the specified resource from storage. * - * @param \InvoiceShelf\Models\Unit $unit * @return \Illuminate\Http\Response */ public function destroy(Unit $unit) diff --git a/app/Http/Controllers/V1/Admin/Mobile/AuthController.php b/app/Http/Controllers/V1/Admin/Mobile/AuthController.php index d298ccc0..8e79231e 100644 --- a/app/Http/Controllers/V1/Admin/Mobile/AuthController.php +++ b/app/Http/Controllers/V1/Admin/Mobile/AuthController.php @@ -2,13 +2,13 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Mobile; -use InvoiceShelf\Http\Controllers\Controller; -use InvoiceShelf\Http\Requests\LoginRequest; -use InvoiceShelf\Models\User; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\ValidationException; +use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Http\Requests\LoginRequest; +use InvoiceShelf\Models\User; class AuthController extends Controller { diff --git a/app/Http/Controllers/V1/Admin/Modules/ApiTokenController.php b/app/Http/Controllers/V1/Admin/Modules/ApiTokenController.php index 04114edf..03c1d057 100644 --- a/app/Http/Controllers/V1/Admin/Modules/ApiTokenController.php +++ b/app/Http/Controllers/V1/Admin/Modules/ApiTokenController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\ModuleInstaller; -use Illuminate\Http\Request; class ApiTokenController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Modules/CompleteModuleInstallationController.php b/app/Http/Controllers/V1/Admin/Modules/CompleteModuleInstallationController.php index 56fe0ace..83229070 100644 --- a/app/Http/Controllers/V1/Admin/Modules/CompleteModuleInstallationController.php +++ b/app/Http/Controllers/V1/Admin/Modules/CompleteModuleInstallationController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\ModuleInstaller; -use Illuminate\Http\Request; class CompleteModuleInstallationController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -21,7 +20,7 @@ class CompleteModuleInstallationController extends Controller $response = ModuleInstaller::complete($request->module, $request->version); return response()->json([ - 'success' => $response + 'success' => $response, ]); } } diff --git a/app/Http/Controllers/V1/Admin/Modules/CopyModuleController.php b/app/Http/Controllers/V1/Admin/Modules/CopyModuleController.php index 970c03d9..dddaf8ee 100644 --- a/app/Http/Controllers/V1/Admin/Modules/CopyModuleController.php +++ b/app/Http/Controllers/V1/Admin/Modules/CopyModuleController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\ModuleInstaller; -use Illuminate\Http\Request; class CopyModuleController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -21,7 +20,7 @@ class CopyModuleController extends Controller $response = ModuleInstaller::copyFiles($request->module, $request->path); return response()->json([ - 'success' => $response + 'success' => $response, ]); } } diff --git a/app/Http/Controllers/V1/Admin/Modules/DisableModuleController.php b/app/Http/Controllers/V1/Admin/Modules/DisableModuleController.php index cd078e5a..51a1a03f 100644 --- a/app/Http/Controllers/V1/Admin/Modules/DisableModuleController.php +++ b/app/Http/Controllers/V1/Admin/Modules/DisableModuleController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Events\ModuleDisabledEvent; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Module as ModelsModule; -use Illuminate\Http\Request; use Nwidart\Modules\Facades\Module; class DisableModuleController extends Controller @@ -13,7 +13,6 @@ class DisableModuleController extends Controller /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, string $module) diff --git a/app/Http/Controllers/V1/Admin/Modules/DownloadModuleController.php b/app/Http/Controllers/V1/Admin/Modules/DownloadModuleController.php index 0216f5e5..5876e8eb 100644 --- a/app/Http/Controllers/V1/Admin/Modules/DownloadModuleController.php +++ b/app/Http/Controllers/V1/Admin/Modules/DownloadModuleController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\ModuleInstaller; -use Illuminate\Http\Request; class DownloadModuleController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Modules/EnableModuleController.php b/app/Http/Controllers/V1/Admin/Modules/EnableModuleController.php index 2c1b5a8b..1ac43aec 100644 --- a/app/Http/Controllers/V1/Admin/Modules/EnableModuleController.php +++ b/app/Http/Controllers/V1/Admin/Modules/EnableModuleController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Events\ModuleEnabledEvent; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Module as ModelsModule; -use Illuminate\Http\Request; use Nwidart\Modules\Facades\Module; class EnableModuleController extends Controller @@ -13,7 +13,6 @@ class EnableModuleController extends Controller /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, string $module) diff --git a/app/Http/Controllers/V1/Admin/Modules/ModuleController.php b/app/Http/Controllers/V1/Admin/Modules/ModuleController.php index 2798415c..1b615e5b 100644 --- a/app/Http/Controllers/V1/Admin/Modules/ModuleController.php +++ b/app/Http/Controllers/V1/Admin/Modules/ModuleController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\ModuleResource; use InvoiceShelf\Space\ModuleInstaller; -use Illuminate\Http\Request; class ModuleController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, string $module) @@ -27,7 +26,7 @@ class ModuleController extends Controller return (new ModuleResource($response->module)) ->additional(['meta' => [ - 'modules' => ModuleResource::collection(collect($response->modules)) + 'modules' => ModuleResource::collection(collect($response->modules)), ]]); } } diff --git a/app/Http/Controllers/V1/Admin/Modules/ModulesController.php b/app/Http/Controllers/V1/Admin/Modules/ModulesController.php index ac929a3e..dd16d2b6 100644 --- a/app/Http/Controllers/V1/Admin/Modules/ModulesController.php +++ b/app/Http/Controllers/V1/Admin/Modules/ModulesController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Modules; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\ModuleInstaller; -use Illuminate\Http\Request; class ModulesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Modules/UnzipModuleController.php b/app/Http/Controllers/V1/Admin/Modules/UnzipModuleController.php index 76d3e681..bb5a9836 100644 --- a/app/Http/Controllers/V1/Admin/Modules/UnzipModuleController.php +++ b/app/Http/Controllers/V1/Admin/Modules/UnzipModuleController.php @@ -11,7 +11,6 @@ class UnzipModuleController extends Controller /** * Handle the incoming request. * - * @param \InvoiceShelf\Http\Requests\UnzipUpdateRequest $request * @return \Illuminate\Http\Response */ public function __invoke(UnzipUpdateRequest $request) @@ -22,7 +21,7 @@ class UnzipModuleController extends Controller return response()->json([ 'success' => true, - 'path' => $path + 'path' => $path, ]); } } diff --git a/app/Http/Controllers/V1/Admin/Modules/UploadModuleController.php b/app/Http/Controllers/V1/Admin/Modules/UploadModuleController.php index 1fc43377..1249f4ee 100644 --- a/app/Http/Controllers/V1/Admin/Modules/UploadModuleController.php +++ b/app/Http/Controllers/V1/Admin/Modules/UploadModuleController.php @@ -11,7 +11,6 @@ class UploadModuleController extends Controller /** * Handle the incoming request. * - * @param \InvoiceShelf\Http\Requests\UploadModuleRequest $request * @return \Illuminate\Http\Response */ public function __invoke(UploadModuleRequest $request) diff --git a/app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php b/app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php index 17f7a53d..b7be3532 100644 --- a/app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php +++ b/app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Payment; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\PaymentMethodRequest; use InvoiceShelf\Http\Resources\PaymentMethodResource; use InvoiceShelf\Models\PaymentMethod; -use Illuminate\Http\Request; class PaymentMethodsController extends Controller { @@ -48,7 +48,6 @@ class PaymentMethodsController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return \Illuminate\Http\Response */ public function show(PaymentMethod $paymentMethod) @@ -62,7 +61,6 @@ class PaymentMethodsController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return \Illuminate\Http\Response */ public function update(PaymentMethodRequest $request, PaymentMethod $paymentMethod) @@ -77,7 +75,6 @@ class PaymentMethodsController extends Controller /** * Remove the specified resource from storage. * - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return \Illuminate\Http\Response */ public function destroy(PaymentMethod $paymentMethod) diff --git a/app/Http/Controllers/V1/Admin/Payment/PaymentsController.php b/app/Http/Controllers/V1/Admin/Payment/PaymentsController.php index 50fda5ec..85c7691e 100644 --- a/app/Http/Controllers/V1/Admin/Payment/PaymentsController.php +++ b/app/Http/Controllers/V1/Admin/Payment/PaymentsController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Payment; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\DeletePaymentsRequest; use InvoiceShelf\Http\Requests\PaymentRequest; use InvoiceShelf\Http\Resources\PaymentResource; use InvoiceShelf\Models\Payment; -use Illuminate\Http\Request; class PaymentsController extends Controller { @@ -31,7 +31,7 @@ class PaymentsController extends Controller ->latest() ->paginateData($limit); - return (PaymentResource::collection($payments)) + return PaymentResource::collection($payments) ->additional(['meta' => [ 'payment_total_count' => Payment::whereCompany()->count(), ]]); diff --git a/app/Http/Controllers/V1/Admin/Payment/SendPaymentPreviewController.php b/app/Http/Controllers/V1/Admin/Payment/SendPaymentPreviewController.php index 5937d30b..15cff9b5 100644 --- a/app/Http/Controllers/V1/Admin/Payment/SendPaymentPreviewController.php +++ b/app/Http/Controllers/V1/Admin/Payment/SendPaymentPreviewController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Payment; -use InvoiceShelf\Http\Controllers\Controller; -use InvoiceShelf\Models\Payment; use Illuminate\Http\Request; use Illuminate\Mail\Markdown; +use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Models\Payment; class SendPaymentPreviewController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Payment $payment) diff --git a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php b/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php index da37e779..50365544 100644 --- a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php +++ b/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\RecurringInvoice; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\RecurringInvoiceRequest; use InvoiceShelf\Http\Resources\RecurringInvoiceResource; use InvoiceShelf\Models\RecurringInvoice; -use Illuminate\Http\Request; class RecurringInvoiceController extends Controller { @@ -25,7 +25,7 @@ class RecurringInvoiceController extends Controller ->applyFilters($request->all()) ->paginateData($limit); - return (RecurringInvoiceResource::collection($recurringInvoices)) + return RecurringInvoiceResource::collection($recurringInvoices) ->additional(['meta' => [ 'recurring_invoice_total_count' => RecurringInvoice::whereCompany()->count(), ]]); @@ -49,7 +49,6 @@ class RecurringInvoiceController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\RecurringInvoice $recurringInvoice * @return \Illuminate\Http\Response */ public function show(RecurringInvoice $recurringInvoice) @@ -63,7 +62,6 @@ class RecurringInvoiceController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\RecurringInvoice $recurringInvoice * @return \Illuminate\Http\Response */ public function update(RecurringInvoiceRequest $request, RecurringInvoice $recurringInvoice) diff --git a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php b/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php index 7f9959f2..c18f45d2 100644 --- a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php +++ b/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\RecurringInvoice; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\RecurringInvoice; -use Illuminate\Http\Request; class RecurringInvoiceFrequencyController extends Controller { diff --git a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php index 614c4777..7ed71b94 100644 --- a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php @@ -2,22 +2,21 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Report; -use PDF; use Carbon\Carbon; -use InvoiceShelf\Models\Company; -use InvoiceShelf\Models\Currency; -use InvoiceShelf\Models\Customer; use Illuminate\Http\Request; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Support\Facades\App; use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Models\Company; +use InvoiceShelf\Models\CompanySetting; +use InvoiceShelf\Models\Currency; +use InvoiceShelf\Models\Customer; +use PDF; class CustomerSalesReportController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @param string $hash * @return \Illuminate\Http\JsonResponse */ @@ -27,7 +26,7 @@ class CustomerSalesReportController extends Controller $this->authorize('view report', $company); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); App::setLocale($locale); diff --git a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php b/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php index 5350f2ba..d015a0d6 100644 --- a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php @@ -2,22 +2,21 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Report; -use PDF; use Carbon\Carbon; -use InvoiceShelf\Models\Company; -use InvoiceShelf\Models\Expense; -use InvoiceShelf\Models\Currency; use Illuminate\Http\Request; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Support\Facades\App; use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Models\Company; +use InvoiceShelf\Models\CompanySetting; +use InvoiceShelf\Models\Currency; +use InvoiceShelf\Models\Expense; +use PDF; class ExpensesReportController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @param string $hash * @return \Illuminate\Http\JsonResponse */ @@ -27,7 +26,7 @@ class ExpensesReportController extends Controller $this->authorize('view report', $company); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); App::setLocale($locale); diff --git a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php b/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php index 7e400631..045b0060 100644 --- a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php @@ -2,22 +2,21 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Report; -use PDF; use Carbon\Carbon; -use InvoiceShelf\Models\Company; -use InvoiceShelf\Models\Currency; use Illuminate\Http\Request; -use InvoiceShelf\Models\InvoiceItem; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Support\Facades\App; use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Models\Company; +use InvoiceShelf\Models\CompanySetting; +use InvoiceShelf\Models\Currency; +use InvoiceShelf\Models\InvoiceItem; +use PDF; class ItemSalesReportController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @param string $hash * @return \Illuminate\Http\JsonResponse */ @@ -27,7 +26,7 @@ class ItemSalesReportController extends Controller $this->authorize('view report', $company); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); App::setLocale($locale); diff --git a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php index 93d3d5ea..cc24aebf 100644 --- a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php @@ -2,23 +2,22 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Report; -use PDF; use Carbon\Carbon; -use InvoiceShelf\Models\Company; -use InvoiceShelf\Models\Expense; -use InvoiceShelf\Models\Payment; -use InvoiceShelf\Models\Currency; use Illuminate\Http\Request; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Support\Facades\App; use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Models\Company; +use InvoiceShelf\Models\CompanySetting; +use InvoiceShelf\Models\Currency; +use InvoiceShelf\Models\Expense; +use InvoiceShelf\Models\Payment; +use PDF; class ProfitLossReportController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @param string $hash * @return \Illuminate\Http\JsonResponse */ @@ -28,7 +27,7 @@ class ProfitLossReportController extends Controller $this->authorize('view report', $company); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); App::setLocale($locale); @@ -52,7 +51,6 @@ class ProfitLossReportController extends Controller $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); - $colors = [ 'primary_text_color', 'heading_text_color', diff --git a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php b/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php index 94aa2cd1..e01e4ed2 100644 --- a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php +++ b/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php @@ -2,22 +2,21 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Report; -use PDF; use Carbon\Carbon; -use InvoiceShelf\Models\Tax; -use InvoiceShelf\Models\Company; -use InvoiceShelf\Models\Currency; use Illuminate\Http\Request; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Support\Facades\App; use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Models\Company; +use InvoiceShelf\Models\CompanySetting; +use InvoiceShelf\Models\Currency; +use InvoiceShelf\Models\Tax; +use PDF; class TaxSummaryReportController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @param string $hash * @return \Illuminate\Http\JsonResponse */ @@ -27,7 +26,7 @@ class TaxSummaryReportController extends Controller $this->authorize('view report', $company); - $locale = CompanySetting::getSetting('language', $company->id); + $locale = CompanySetting::getSetting('language', $company->id); App::setLocale($locale); @@ -47,7 +46,6 @@ class TaxSummaryReportController extends Controller $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); - $colors = [ 'primary_text_color', 'heading_text_color', diff --git a/app/Http/Controllers/V1/Admin/Role/AbilitiesController.php b/app/Http/Controllers/V1/Admin/Role/AbilitiesController.php index cc52300e..1076caf6 100644 --- a/app/Http/Controllers/V1/Admin/Role/AbilitiesController.php +++ b/app/Http/Controllers/V1/Admin/Role/AbilitiesController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Role; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class AbilitiesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Role/RolesController.php b/app/Http/Controllers/V1/Admin/Role/RolesController.php index a844942a..80552f26 100644 --- a/app/Http/Controllers/V1/Admin/Role/RolesController.php +++ b/app/Http/Controllers/V1/Admin/Role/RolesController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Role; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\RoleRequest; use InvoiceShelf\Http\Resources\RoleResource; use InvoiceShelf\Models\User; -use Illuminate\Http\Request; use Silber\Bouncer\BouncerFacade; use Silber\Bouncer\Database\Role; @@ -52,7 +52,7 @@ class RolesController extends Controller /** * Display the specified resource. * - * @param \Spatie\Permission\Models\Role $role + * @param \Spatie\Permission\Models\Role $role * @return \Illuminate\Http\Response */ public function show(Role $role) @@ -66,7 +66,7 @@ class RolesController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \Spatie\Permission\Models\Role $role + * @param \Spatie\Permission\Models\Role $role * @return \Illuminate\Http\Response */ public function update(RoleRequest $request, Role $role) @@ -83,7 +83,7 @@ class RolesController extends Controller /** * Remove the specified resource from storage. * - * @param \Spatie\Permission\Models\Role $role + * @param \Spatie\Permission\Models\Role $role * @return \Illuminate\Http\Response */ public function destroy(Role $role) @@ -99,7 +99,7 @@ class RolesController extends Controller $role->delete(); return response()->json([ - 'success' => true + 'success' => true, ]); } diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanyController.php b/app/Http/Controllers/V1/Admin/Settings/CompanyController.php index a0d0f8f0..e89f327c 100644 --- a/app/Http/Controllers/V1/Admin/Settings/CompanyController.php +++ b/app/Http/Controllers/V1/Admin/Settings/CompanyController.php @@ -2,6 +2,7 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\AvatarRequest; use InvoiceShelf\Http\Requests\CompanyLogoRequest; @@ -10,12 +11,12 @@ use InvoiceShelf\Http\Requests\ProfileRequest; use InvoiceShelf\Http\Resources\CompanyResource; use InvoiceShelf\Http\Resources\UserResource; use InvoiceShelf\Models\Company; -use Illuminate\Http\Request; class CompanyController extends Controller { /** * Retrive the Admin account. + * * @return \Illuminate\Http\JsonResponse */ public function getUser(Request $request) @@ -27,7 +28,6 @@ class CompanyController extends Controller * Update the Admin profile. * Includes name, email and (or) password * - * @param \InvoiceShelf\Http\Requests\ProfileRequest $request * @return \Illuminate\Http\JsonResponse */ public function updateProfile(ProfileRequest $request) @@ -41,7 +41,7 @@ class CompanyController extends Controller /** * Update Admin Company Details - * @param \InvoiceShelf\Http\Requests\CompanyRequest $request + * * @return \Illuminate\Http\JsonResponse */ public function updateCompany(CompanyRequest $request) @@ -60,7 +60,6 @@ class CompanyController extends Controller /** * Upload the company logo to storage. * - * @param \InvoiceShelf\Http\Requests\CompanyLogoRequest $request * @return \Illuminate\Http\JsonResponse */ public function uploadCompanyLogo(CompanyLogoRequest $request) @@ -94,7 +93,6 @@ class CompanyController extends Controller /** * Upload the Admin Avatar to public storage. * - * @param \InvoiceShelf\Http\Requests\AvatarRequest $request * @return \Illuminate\Http\JsonResponse */ public function uploadAvatar(AvatarRequest $request) diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php b/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php index 05eec81d..f38ba498 100644 --- a/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php +++ b/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Company; -use Illuminate\Http\Request; class CompanyCurrencyCheckTransactionsController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Settings/DiskController.php b/app/Http/Controllers/V1/Admin/Settings/DiskController.php index 9a809811..92dae885 100644 --- a/app/Http/Controllers/V1/Admin/Settings/DiskController.php +++ b/app/Http/Controllers/V1/Admin/Settings/DiskController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\DiskEnvironmentRequest; use InvoiceShelf\Http\Resources\FileDiskResource; use InvoiceShelf\Models\FileDisk; -use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; class DiskController extends Controller { /** - * * @return JsonResponse */ public function index(Request $request) @@ -28,8 +27,6 @@ class DiskController extends Controller } /** - * - * @param DiskEnvironmentRequest $request * @return JsonResponse */ public function store(DiskEnvironmentRequest $request) @@ -46,9 +43,7 @@ class DiskController extends Controller } /** - * - * @param Request $request - * @param \InvoiceShelf\Models\FileDisk $file_disk + * @param \InvoiceShelf\Models\FileDisk $file_disk * @return JsonResponse */ public function update(FileDisk $disk, Request $request) @@ -72,7 +67,7 @@ class DiskController extends Controller } /** - * @param Request $request + * @param Request $request * @return JsonResponse */ public function show($disk) @@ -88,7 +83,6 @@ class DiskController extends Controller break; - case 's3': $diskData = [ 'key' => '', @@ -151,7 +145,6 @@ class DiskController extends Controller } /** - * * @return JsonResponse */ public function getDiskDrivers() diff --git a/app/Http/Controllers/V1/Admin/Settings/GetCompanyMailConfigurationController.php b/app/Http/Controllers/V1/Admin/Settings/GetCompanyMailConfigurationController.php index 2bd81358..dab3d58f 100644 --- a/app/Http/Controllers/V1/Admin/Settings/GetCompanyMailConfigurationController.php +++ b/app/Http/Controllers/V1/Admin/Settings/GetCompanyMailConfigurationController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class GetCompanyMailConfigurationController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Admin/Settings/GetSettingsController.php b/app/Http/Controllers/V1/Admin/Settings/GetSettingsController.php index 6546e64b..152923c7 100644 --- a/app/Http/Controllers/V1/Admin/Settings/GetSettingsController.php +++ b/app/Http/Controllers/V1/Admin/Settings/GetSettingsController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\GetSettingRequest; use InvoiceShelf\Models\Setting; -use Illuminate\Http\Request; class GetSettingsController extends Controller { @@ -22,7 +22,7 @@ class GetSettingsController extends Controller $setting = Setting::getSetting($request->key); return response()->json([ - $request->key => $setting + $request->key => $setting, ]); } } diff --git a/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php b/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php index 01a4867c..0d09c36f 100755 --- a/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php +++ b/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php @@ -2,13 +2,13 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\MailEnvironmentRequest; use InvoiceShelf\Mail\TestMail; use InvoiceShelf\Models\Setting; use InvoiceShelf\Space\EnvironmentManager; -use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; use Mail; class MailConfigurationController extends Controller @@ -18,17 +18,12 @@ class MailConfigurationController extends Controller */ protected $environmentManager; - /** - * @param EnvironmentManager $environmentManager - */ public function __construct(EnvironmentManager $environmentManager) { $this->environmentManager = $environmentManager; } /** - * - * @param MailEnvironmentRequest $request * @return JsonResponse */ public function saveMailEnvironment(MailEnvironmentRequest $request) @@ -65,12 +60,10 @@ class MailConfigurationController extends Controller 'mail_ses_secret' => config('services.ses.secret'), ]; - return response()->json($MailData); } /** - * * @return JsonResponse */ public function getMailDrivers() diff --git a/app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php b/app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php index a9a36fee..3d093cfc 100644 --- a/app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php +++ b/app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\TaxTypeRequest; use InvoiceShelf\Http\Resources\TaxTypeResource; use InvoiceShelf\Models\TaxType; -use Illuminate\Http\Request; class TaxTypesController extends Controller { @@ -48,7 +48,6 @@ class TaxTypesController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\TaxType $taxType * @return \Illuminate\Http\Response */ public function show(TaxType $taxType) @@ -62,7 +61,6 @@ class TaxTypesController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \InvoiceShelf\Models\TaxType $taxType * @return \Illuminate\Http\Response */ public function update(TaxTypeRequest $request, TaxType $taxType) @@ -77,7 +75,6 @@ class TaxTypesController extends Controller /** * Remove the specified resource from storage. * - * @param \InvoiceShelf\Models\TaxType $taxType * @return \Illuminate\Http\Response */ public function destroy(TaxType $taxType) diff --git a/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php b/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php index 05de91b4..3a4bd02b 100644 --- a/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php +++ b/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Support\Arr; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\UpdateSettingsRequest; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\CompanySetting; -use Illuminate\Support\Arr; class UpdateCompanySettingsController extends Controller { @@ -30,7 +30,7 @@ class UpdateCompanySettingsController extends Controller ) { return response()->json([ 'success' => false, - 'message' => 'Cannot update company currency after transactions are created.' + 'message' => 'Cannot update company currency after transactions are created.', ]); } diff --git a/app/Http/Controllers/V1/Admin/Settings/UpdateSettingsController.php b/app/Http/Controllers/V1/Admin/Settings/UpdateSettingsController.php index 541eb2f6..df5c7ae8 100644 --- a/app/Http/Controllers/V1/Admin/Settings/UpdateSettingsController.php +++ b/app/Http/Controllers/V1/Admin/Settings/UpdateSettingsController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Settings; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\SettingRequest; use InvoiceShelf\Models\Setting; -use Illuminate\Http\Request; class UpdateSettingsController extends Controller { @@ -23,7 +23,7 @@ class UpdateSettingsController extends Controller return response()->json([ 'success' => true, - $request->settings + $request->settings, ]); } } diff --git a/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php b/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php index dba6f9c4..eed7d33d 100644 --- a/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php +++ b/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php @@ -2,17 +2,16 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Setting; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class CheckVersionController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function __invoke(Request $request) @@ -20,7 +19,7 @@ class CheckVersionController extends Controller if ((! $request->user()) || (! $request->user()->isOwner())) { return response()->json([ 'success' => false, - 'message' => 'You are not allowed to update this app.' + 'message' => 'You are not allowed to update this app.', ], 401); } diff --git a/app/Http/Controllers/V1/Admin/Update/CopyFilesController.php b/app/Http/Controllers/V1/Admin/Update/CopyFilesController.php index c6b2e313..61574bda 100644 --- a/app/Http/Controllers/V1/Admin/Update/CopyFilesController.php +++ b/app/Http/Controllers/V1/Admin/Update/CopyFilesController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class CopyFilesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -19,7 +18,7 @@ class CopyFilesController extends Controller if ((! $request->user()) || (! $request->user()->isOwner())) { return response()->json([ 'success' => false, - 'message' => 'You are not allowed to update this app.' + 'message' => 'You are not allowed to update this app.', ], 401); } diff --git a/app/Http/Controllers/V1/Admin/Update/DeleteFilesController.php b/app/Http/Controllers/V1/Admin/Update/DeleteFilesController.php index ab08a53e..19a6d720 100644 --- a/app/Http/Controllers/V1/Admin/Update/DeleteFilesController.php +++ b/app/Http/Controllers/V1/Admin/Update/DeleteFilesController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class DeleteFilesController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -19,7 +18,7 @@ class DeleteFilesController extends Controller if ((! $request->user()) || (! $request->user()->isOwner())) { return response()->json([ 'success' => false, - 'message' => 'You are not allowed to update this app.' + 'message' => 'You are not allowed to update this app.', ], 401); } diff --git a/app/Http/Controllers/V1/Admin/Update/DownloadUpdateController.php b/app/Http/Controllers/V1/Admin/Update/DownloadUpdateController.php index aa8b9adc..0f81a156 100644 --- a/app/Http/Controllers/V1/Admin/Update/DownloadUpdateController.php +++ b/app/Http/Controllers/V1/Admin/Update/DownloadUpdateController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class DownloadUpdateController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -19,7 +18,7 @@ class DownloadUpdateController extends Controller if ((! $request->user()) || (! $request->user()->isOwner())) { return response()->json([ 'success' => false, - 'message' => 'You are not allowed to update this app.' + 'message' => 'You are not allowed to update this app.', ], 401); } diff --git a/app/Http/Controllers/V1/Admin/Update/FinishUpdateController.php b/app/Http/Controllers/V1/Admin/Update/FinishUpdateController.php index 0f59cc1d..692b964e 100644 --- a/app/Http/Controllers/V1/Admin/Update/FinishUpdateController.php +++ b/app/Http/Controllers/V1/Admin/Update/FinishUpdateController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class FinishUpdateController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -19,7 +18,7 @@ class FinishUpdateController extends Controller if ((! $request->user()) || (! $request->user()->isOwner())) { return response()->json([ 'success' => false, - 'message' => 'You are not allowed to update this app.' + 'message' => 'You are not allowed to update this app.', ], 401); } diff --git a/app/Http/Controllers/V1/Admin/Update/MigrateUpdateController.php b/app/Http/Controllers/V1/Admin/Update/MigrateUpdateController.php index 237f9d95..90a66f2f 100644 --- a/app/Http/Controllers/V1/Admin/Update/MigrateUpdateController.php +++ b/app/Http/Controllers/V1/Admin/Update/MigrateUpdateController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class MigrateUpdateController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -19,7 +18,7 @@ class MigrateUpdateController extends Controller if ((! $request->user()) || (! $request->user()->isOwner())) { return response()->json([ 'success' => false, - 'message' => 'You are not allowed to update this app.' + 'message' => 'You are not allowed to update this app.', ], 401); } diff --git a/app/Http/Controllers/V1/Admin/Update/UnzipUpdateController.php b/app/Http/Controllers/V1/Admin/Update/UnzipUpdateController.php index 188d114f..d15d7f6a 100644 --- a/app/Http/Controllers/V1/Admin/Update/UnzipUpdateController.php +++ b/app/Http/Controllers/V1/Admin/Update/UnzipUpdateController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class UnzipUpdateController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -19,7 +18,7 @@ class UnzipUpdateController extends Controller if ((! $request->user()) || (! $request->user()->isOwner())) { return response()->json([ 'success' => false, - 'message' => 'You are not allowed to update this app.' + 'message' => 'You are not allowed to update this app.', ], 401); } diff --git a/app/Http/Controllers/V1/Admin/Update/UpdateController.php b/app/Http/Controllers/V1/Admin/Update/UpdateController.php index 427bf684..a746d98f 100644 --- a/app/Http/Controllers/V1/Admin/Update/UpdateController.php +++ b/app/Http/Controllers/V1/Admin/Update/UpdateController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Update; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Setting; use InvoiceShelf\Space\Updater; -use Illuminate\Http\Request; class UpdateController extends Controller { diff --git a/app/Http/Controllers/V1/Admin/Users/UsersController.php b/app/Http/Controllers/V1/Admin/Users/UsersController.php index b43ff6ce..b6b5938f 100644 --- a/app/Http/Controllers/V1/Admin/Users/UsersController.php +++ b/app/Http/Controllers/V1/Admin/Users/UsersController.php @@ -2,19 +2,18 @@ namespace InvoiceShelf\Http\Controllers\V1\Admin\Users; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\DeleteUserRequest; use InvoiceShelf\Http\Requests\UserRequest; use InvoiceShelf\Http\Resources\UserResource; use InvoiceShelf\Models\User; -use Illuminate\Http\Request; class UsersController extends Controller { /** * Display a listing of the resource. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function index(Request $request) @@ -54,7 +53,6 @@ class UsersController extends Controller /** * Display the specified resource. * - * @param \InvoiceShelf\Models\User $user * @return \Illuminate\Http\JsonResponse */ public function show(User $user) @@ -68,7 +66,6 @@ class UsersController extends Controller * Update the specified resource in storage. * * @param \Illuminate\Http\UserRequest $request - * @param \InvoiceShelf\Models\User $user * @return \Illuminate\Http\JsonResponse */ public function update(UserRequest $request, User $user) diff --git a/app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php b/app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php index f2d6dff6..a215e1b3 100644 --- a/app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Auth; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; use Password; class ForgotPasswordController extends Controller @@ -30,7 +30,6 @@ class ForgotPasswordController extends Controller /** * Get the response for a successful password reset link. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ @@ -45,7 +44,6 @@ class ForgotPasswordController extends Controller /** * Get the response for a failed password reset link. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ diff --git a/app/Http/Controllers/V1/Customer/Auth/LoginController.php b/app/Http/Controllers/V1/Customer/Auth/LoginController.php index 73265bdb..2ac9054d 100644 --- a/app/Http/Controllers/V1/Customer/Auth/LoginController.php +++ b/app/Http/Controllers/V1/Customer/Auth/LoginController.php @@ -2,20 +2,19 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Auth; +use Hash; +use Illuminate\Support\Facades\Auth; +use Illuminate\Validation\ValidationException; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\Customer\CustomerLoginRequest; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\Customer; -use Hash; -use Illuminate\Support\Facades\Auth; -use Illuminate\Validation\ValidationException; class LoginController extends Controller { /** * Handle the incoming request. * - * @param \InvoiceShelf\Http\Requests\Customer\CustomerLoginRequest $request * @return \Illuminate\Http\Response */ public function __invoke(CustomerLoginRequest $request, Company $company) @@ -39,7 +38,7 @@ class LoginController extends Controller Auth::guard('customer')->login($user); return response()->json([ - 'success' => true + 'success' => true, ]); } } diff --git a/app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php b/app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php index bfb1b21c..99239400 100644 --- a/app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Auth; -use InvoiceShelf\Http\Controllers\Controller; -use InvoiceShelf\Providers\RouteServiceProvider; use Illuminate\Auth\Events\PasswordReset; use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Http\Request; use Illuminate\Support\Str; +use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Providers\RouteServiceProvider; use Password; class ResetPasswordController extends Controller @@ -40,7 +40,6 @@ class ResetPasswordController extends Controller /** * Get the response for a successful password reset. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ @@ -72,7 +71,6 @@ class ResetPasswordController extends Controller /** * Get the response for a failed password reset. * - * @param \Illuminate\Http\Request $request * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ diff --git a/app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php b/app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php index 3362c25b..f7eac7e1 100644 --- a/app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php +++ b/app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php @@ -2,22 +2,21 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Estimate; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\EstimateResource; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\Estimate; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class AcceptEstimateController extends Controller { /** - * Handle the incoming request. - * - * @param \Illuminate\Http\Request $request - * @param Estimate $estimate - * @return \Illuminate\Http\Response - */ + * Handle the incoming request. + * + * @param Estimate $estimate + * @return \Illuminate\Http\Response + */ public function __invoke(Request $request, Company $company, $id) { $estimate = $company->estimates() diff --git a/app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php b/app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php index 013e7c81..5fe6629a 100644 --- a/app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php +++ b/app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Estimate; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\EstimateResource; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\Estimate; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class EstimatesController extends Controller { @@ -21,11 +21,11 @@ class EstimatesController extends Controller $limit = $request->has('limit') ? $request->limit : 10; $estimates = Estimate::with([ - 'items', - 'customer', - 'taxes', - 'creator', - ]) + 'items', + 'customer', + 'taxes', + 'creator', + ]) ->where('status', '<>', 'DRAFT') ->whereCustomer(Auth::guard('customer')->id()) ->applyFilters($request->only([ @@ -39,7 +39,7 @@ class EstimatesController extends Controller ->latest() ->paginateData($limit); - return (EstimateResource::collection($estimates)) + return EstimateResource::collection($estimates) ->additional(['meta' => [ 'estimateTotalCount' => Estimate::where('status', '<>', 'DRAFT')->whereCustomer(Auth::guard('customer')->id())->count(), ]]); @@ -48,7 +48,7 @@ class EstimatesController extends Controller /** * Display the specified resource. * - * @param Estimate $estimate + * @param Estimate $estimate * @return \Illuminate\Http\Response */ public function show(Company $company, $id) diff --git a/app/Http/Controllers/V1/Customer/EstimatePdfController.php b/app/Http/Controllers/V1/Customer/EstimatePdfController.php index c5786bda..249fb7aa 100644 --- a/app/Http/Controllers/V1/Customer/EstimatePdfController.php +++ b/app/Http/Controllers/V1/Customer/EstimatePdfController.php @@ -2,6 +2,7 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\EstimateResource; use InvoiceShelf\Mail\EstimateViewedMail; @@ -9,7 +10,6 @@ use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\EmailLog; use InvoiceShelf\Models\Estimate; -use Illuminate\Http\Request; class EstimatePdfController extends Controller { diff --git a/app/Http/Controllers/V1/Customer/Expense/ExpensesController.php b/app/Http/Controllers/V1/Customer/Expense/ExpensesController.php index 93cf8fab..945a6022 100644 --- a/app/Http/Controllers/V1/Customer/Expense/ExpensesController.php +++ b/app/Http/Controllers/V1/Customer/Expense/ExpensesController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Expense; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\ExpenseResource; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\Expense; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class ExpensesController extends Controller { @@ -31,7 +31,7 @@ class ExpensesController extends Controller ])) ->paginateData($limit); - return (ExpenseResource::collection($expenses)) + return ExpenseResource::collection($expenses) ->additional(['meta' => [ 'expenseTotalCount' => Expense::whereCustomer(Auth::guard('customer')->id())->count(), ]]); diff --git a/app/Http/Controllers/V1/Customer/General/BootstrapController.php b/app/Http/Controllers/V1/Customer/General/BootstrapController.php index 2e66daf6..caf7efb0 100644 --- a/app/Http/Controllers/V1/Customer/General/BootstrapController.php +++ b/app/Http/Controllers/V1/Customer/General/BootstrapController.php @@ -2,19 +2,18 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\General; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\CustomerResource; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Module; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class BootstrapController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Customer/General/DashboardController.php b/app/Http/Controllers/V1/Customer/General/DashboardController.php index 83ec3afb..5c705927 100644 --- a/app/Http/Controllers/V1/Customer/General/DashboardController.php +++ b/app/Http/Controllers/V1/Customer/General/DashboardController.php @@ -2,19 +2,18 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\General; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\Payment; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class DashboardController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Customer/General/ProfileController.php b/app/Http/Controllers/V1/Customer/General/ProfileController.php index cfc95cfc..e331d9bb 100644 --- a/app/Http/Controllers/V1/Customer/General/ProfileController.php +++ b/app/Http/Controllers/V1/Customer/General/ProfileController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\General; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\Customer\CustomerProfileRequest; use InvoiceShelf\Http\Resources\Customer\CustomerResource; use InvoiceShelf\Models\Company; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class ProfileController extends Controller { @@ -24,7 +24,7 @@ class ProfileController extends Controller $customer->clearMediaCollection('customer_avatar'); $customer->addMediaFromRequest('customer_avatar') - ->toMediaCollection('customer_avatar'); + ->toMediaCollection('customer_avatar'); } if ($request->billing !== null) { diff --git a/app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php b/app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php index e4508646..ce0a2477 100644 --- a/app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php +++ b/app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Invoice; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\InvoiceResource; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\Invoice; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class InvoicesController extends Controller { @@ -27,7 +27,7 @@ class InvoicesController extends Controller ->latest() ->paginateData($limit); - return (InvoiceResource::collection($invoices)) + return InvoiceResource::collection($invoices) ->additional(['meta' => [ 'invoiceTotalCount' => Invoice::where('status', '<>', 'DRAFT')->whereCustomer(Auth::guard('customer')->id())->count(), ]]); diff --git a/app/Http/Controllers/V1/Customer/InvoicePdfController.php b/app/Http/Controllers/V1/Customer/InvoicePdfController.php index 23adb42d..3b36c43b 100644 --- a/app/Http/Controllers/V1/Customer/InvoicePdfController.php +++ b/app/Http/Controllers/V1/Customer/InvoicePdfController.php @@ -2,6 +2,7 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\InvoiceResource as CustomerInvoiceResource; use InvoiceShelf\Mail\InvoiceViewedMail; @@ -9,7 +10,6 @@ use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\EmailLog; use InvoiceShelf\Models\Invoice; -use Illuminate\Http\Request; class InvoicePdfController extends Controller { @@ -45,7 +45,7 @@ class InvoicePdfController extends Controller return view('app')->with([ 'customer_logo' => get_company_setting('customer_portal_logo', $invoice->company_id), - 'current_theme' => get_company_setting('customer_portal_theme', $invoice->company_id) + 'current_theme' => get_company_setting('customer_portal_theme', $invoice->company_id), ]); } diff --git a/app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php b/app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php index 0a8832ca..820ea207 100644 --- a/app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php +++ b/app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php @@ -2,18 +2,17 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Payment; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\PaymentMethodResource; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\PaymentMethod; -use Illuminate\Http\Request; class PaymentMethodController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Company $company) diff --git a/app/Http/Controllers/V1/Customer/Payment/PaymentsController.php b/app/Http/Controllers/V1/Customer/Payment/PaymentsController.php index 9b6f6c75..8f1ad227 100644 --- a/app/Http/Controllers/V1/Customer/Payment/PaymentsController.php +++ b/app/Http/Controllers/V1/Customer/Payment/PaymentsController.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer\Payment; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\Customer\PaymentResource; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\Payment; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class PaymentsController extends Controller { @@ -33,7 +33,7 @@ class PaymentsController extends Controller ->latest() ->paginateData($limit); - return (PaymentResource::collection($payments)) + return PaymentResource::collection($payments) ->additional(['meta' => [ 'paymentTotalCount' => Payment::whereCustomer(Auth::guard('customer')->id())->count(), ]]); diff --git a/app/Http/Controllers/V1/Customer/PaymentPdfController.php b/app/Http/Controllers/V1/Customer/PaymentPdfController.php index d83fd65e..ed25f3d9 100644 --- a/app/Http/Controllers/V1/Customer/PaymentPdfController.php +++ b/app/Http/Controllers/V1/Customer/PaymentPdfController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Customer; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Resources\PaymentResource; use InvoiceShelf\Models\EmailLog; use InvoiceShelf\Models\Payment; -use Illuminate\Http\Request; class PaymentPdfController extends Controller { diff --git a/app/Http/Controllers/V1/Installation/AppDomainController.php b/app/Http/Controllers/V1/Installation/AppDomainController.php index 2159b8b3..53df54b2 100644 --- a/app/Http/Controllers/V1/Installation/AppDomainController.php +++ b/app/Http/Controllers/V1/Installation/AppDomainController.php @@ -2,17 +2,13 @@ namespace InvoiceShelf\Http\Controllers\V1\Installation; +use Illuminate\Support\Facades\Artisan; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\DomainEnvironmentRequest; use InvoiceShelf\Space\EnvironmentManager; -use Illuminate\Support\Facades\Artisan; class AppDomainController extends Controller { - /** - * - * @param DomainEnvironmentRequest $request - */ public function __invoke(DomainEnvironmentRequest $request) { Artisan::call('optimize:clear'); diff --git a/app/Http/Controllers/V1/Installation/DatabaseConfigurationController.php b/app/Http/Controllers/V1/Installation/DatabaseConfigurationController.php index 16c72d93..fae50fc5 100644 --- a/app/Http/Controllers/V1/Installation/DatabaseConfigurationController.php +++ b/app/Http/Controllers/V1/Installation/DatabaseConfigurationController.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Controllers\V1\Installation; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Artisan; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Http\Requests\DatabaseEnvironmentRequest; use InvoiceShelf\Space\EnvironmentManager; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Artisan; class DatabaseConfigurationController extends Controller { @@ -15,18 +15,11 @@ class DatabaseConfigurationController extends Controller */ protected $EnvironmentManager; - /** - * @param EnvironmentManager $environmentManager - */ public function __construct(EnvironmentManager $environmentManager) { $this->environmentManager = $environmentManager; } - /** - * - * @param DatabaseEnvironmentRequest $request - */ public function saveDatabaseEnvironment(DatabaseEnvironmentRequest $request) { Artisan::call('config:clear'); @@ -34,7 +27,7 @@ class DatabaseConfigurationController extends Controller $results = $this->environmentManager->saveDatabaseVariables($request); - if (array_key_exists("success", $results)) { + if (array_key_exists('success', $results)) { Artisan::call('key:generate --force'); Artisan::call('optimize:clear'); Artisan::call('config:clear'); @@ -79,7 +72,6 @@ class DatabaseConfigurationController extends Controller } - return response()->json([ 'config' => $databaseData, 'success' => true, diff --git a/app/Http/Controllers/V1/Installation/FilePermissionsController.php b/app/Http/Controllers/V1/Installation/FilePermissionsController.php index 98ccc3e4..b8f03b29 100644 --- a/app/Http/Controllers/V1/Installation/FilePermissionsController.php +++ b/app/Http/Controllers/V1/Installation/FilePermissionsController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Installation; +use Illuminate\Http\JsonResponse; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\FilePermissionChecker; -use Illuminate\Http\JsonResponse; class FilePermissionsController extends Controller { @@ -14,7 +14,7 @@ class FilePermissionsController extends Controller protected $permissions; /** - * @param PermissionsChecker $checker + * @param PermissionsChecker $checker */ public function __construct(FilePermissionChecker $checker) { diff --git a/app/Http/Controllers/V1/Installation/FinishController.php b/app/Http/Controllers/V1/Installation/FinishController.php index 7f3c160c..050bbd48 100644 --- a/app/Http/Controllers/V1/Installation/FinishController.php +++ b/app/Http/Controllers/V1/Installation/FinishController.php @@ -2,15 +2,14 @@ namespace InvoiceShelf\Http\Controllers\V1\Installation; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; +use InvoiceShelf\Http\Controllers\Controller; class FinishController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Controllers/V1/Installation/LoginController.php b/app/Http/Controllers/V1/Installation/LoginController.php index b57d33a1..d814ca82 100644 --- a/app/Http/Controllers/V1/Installation/LoginController.php +++ b/app/Http/Controllers/V1/Installation/LoginController.php @@ -3,16 +3,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Installation; use Auth; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\User; -use Illuminate\Http\Request; class LoginController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) @@ -23,7 +22,7 @@ class LoginController extends Controller return response()->json([ 'success' => true, 'user' => $user, - 'company' => $user->companies()->first() + 'company' => $user->companies()->first(), ]); } } diff --git a/app/Http/Controllers/V1/Installation/OnboardingWizardController.php b/app/Http/Controllers/V1/Installation/OnboardingWizardController.php index 4ca6d351..cb7acd29 100644 --- a/app/Http/Controllers/V1/Installation/OnboardingWizardController.php +++ b/app/Http/Controllers/V1/Installation/OnboardingWizardController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Installation; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Setting; -use Illuminate\Http\Request; class OnboardingWizardController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function getStep(Request $request) diff --git a/app/Http/Controllers/V1/Installation/RequirementsController.php b/app/Http/Controllers/V1/Installation/RequirementsController.php index a76f8a05..1a4ad44e 100755 --- a/app/Http/Controllers/V1/Installation/RequirementsController.php +++ b/app/Http/Controllers/V1/Installation/RequirementsController.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Controllers\V1\Installation; +use Illuminate\Http\JsonResponse; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Space\RequirementsChecker; -use Illuminate\Http\JsonResponse; class RequirementsController extends Controller { @@ -13,9 +13,6 @@ class RequirementsController extends Controller */ protected $requirements; - /** - * @param RequirementsChecker $checker - */ public function __construct(RequirementsChecker $checker) { $this->requirements = $checker; diff --git a/app/Http/Controllers/V1/Modules/ScriptController.php b/app/Http/Controllers/V1/Modules/ScriptController.php index 9fab40ba..4fd93afc 100644 --- a/app/Http/Controllers/V1/Modules/ScriptController.php +++ b/app/Http/Controllers/V1/Modules/ScriptController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Modules; -use InvoiceShelf\Http\Controllers\Controller; -use InvoiceShelf\Services\Module\ModuleFacade; use DateTime; use Illuminate\Support\Arr; +use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Services\Module\ModuleFacade; use Request; class ScriptController extends Controller @@ -13,7 +13,6 @@ class ScriptController extends Controller /** * Serve the requested script. * - * @param \Request $request * @return \Illuminate\Http\Response * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException diff --git a/app/Http/Controllers/V1/Modules/StyleController.php b/app/Http/Controllers/V1/Modules/StyleController.php index 754ee1ae..68039588 100644 --- a/app/Http/Controllers/V1/Modules/StyleController.php +++ b/app/Http/Controllers/V1/Modules/StyleController.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Controllers\V1\Modules; -use InvoiceShelf\Http\Controllers\Controller; -use InvoiceShelf\Services\Module\ModuleFacade; use DateTime; use Illuminate\Support\Arr; +use InvoiceShelf\Http\Controllers\Controller; +use InvoiceShelf\Services\Module\ModuleFacade; use Request; class StyleController extends Controller @@ -13,7 +13,6 @@ class StyleController extends Controller /** * Serve the requested stylesheet. * - * @param \Request $request * @return \Illuminate\Http\Response * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException diff --git a/app/Http/Controllers/V1/PDF/DownloadReceiptController.php b/app/Http/Controllers/V1/PDF/DownloadReceiptController.php index 277bb0bc..51d1b797 100644 --- a/app/Http/Controllers/V1/PDF/DownloadReceiptController.php +++ b/app/Http/Controllers/V1/PDF/DownloadReceiptController.php @@ -11,8 +11,7 @@ class DownloadReceiptController extends Controller * Handle the incoming request. * * @param \Illuminate\Http\Request $request - * @param Expense $expense - * @param string $hash + * @param string $hash * @return \Illuminate\Http\Response */ public function __invoke(Expense $expense) diff --git a/app/Http/Controllers/V1/PDF/EstimatePdfController.php b/app/Http/Controllers/V1/PDF/EstimatePdfController.php index c7d12045..56ae57e4 100644 --- a/app/Http/Controllers/V1/PDF/EstimatePdfController.php +++ b/app/Http/Controllers/V1/PDF/EstimatePdfController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\PDF; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Estimate; -use Illuminate\Http\Request; class EstimatePdfController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Estimate $estimate) @@ -20,7 +19,6 @@ class EstimatePdfController extends Controller return $estimate->getPDFData(); } - return $estimate->getGeneratedPDFOrStream('estimate'); } } diff --git a/app/Http/Controllers/V1/PDF/InvoicePdfController.php b/app/Http/Controllers/V1/PDF/InvoicePdfController.php index f22cbc83..944381ca 100644 --- a/app/Http/Controllers/V1/PDF/InvoicePdfController.php +++ b/app/Http/Controllers/V1/PDF/InvoicePdfController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\PDF; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Invoice; -use Illuminate\Http\Request; class InvoicePdfController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Invoice $invoice) diff --git a/app/Http/Controllers/V1/PDF/PaymentPdfController.php b/app/Http/Controllers/V1/PDF/PaymentPdfController.php index 9dc538c8..577190f3 100644 --- a/app/Http/Controllers/V1/PDF/PaymentPdfController.php +++ b/app/Http/Controllers/V1/PDF/PaymentPdfController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\PDF; +use Illuminate\Http\Request; use InvoiceShelf\Http\Controllers\Controller; use InvoiceShelf\Models\Payment; -use Illuminate\Http\Request; class PaymentPdfController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request, Payment $payment) diff --git a/app/Http/Controllers/V1/Webhook/CronJobController.php b/app/Http/Controllers/V1/Webhook/CronJobController.php index ea197c34..2d71fdea 100644 --- a/app/Http/Controllers/V1/Webhook/CronJobController.php +++ b/app/Http/Controllers/V1/Webhook/CronJobController.php @@ -2,16 +2,15 @@ namespace InvoiceShelf\Http\Controllers\V1\Webhook; -use InvoiceShelf\Http\Controllers\Controller; use Illuminate\Http\Request; use Illuminate\Support\Facades\Artisan; +use InvoiceShelf\Http\Controllers\Controller; class CronJobController extends Controller { /** * Handle the incoming request. * - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function __invoke(Request $request) diff --git a/app/Http/Middleware/AdminMiddleware.php b/app/Http/Middleware/AdminMiddleware.php index ada0fad1..7e1cbb54 100644 --- a/app/Http/Middleware/AdminMiddleware.php +++ b/app/Http/Middleware/AdminMiddleware.php @@ -10,9 +10,8 @@ class AdminMiddleware /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param null $guard + * @param \Illuminate\Http\Request $request + * @param null $guard * @return mixed */ public function handle($request, Closure $next, $guard = null) diff --git a/app/Http/Middleware/CompanyMiddleware.php b/app/Http/Middleware/CompanyMiddleware.php index 574a6a6d..7a992bf3 100644 --- a/app/Http/Middleware/CompanyMiddleware.php +++ b/app/Http/Middleware/CompanyMiddleware.php @@ -11,8 +11,6 @@ class CompanyMiddleware /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/ConfigMiddleware.php b/app/Http/Middleware/ConfigMiddleware.php index 42d6e465..63b2b5ac 100644 --- a/app/Http/Middleware/ConfigMiddleware.php +++ b/app/Http/Middleware/ConfigMiddleware.php @@ -11,7 +11,6 @@ class ConfigMiddleware * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/CronJobMiddleware.php b/app/Http/Middleware/CronJobMiddleware.php index 86c17754..ad992168 100644 --- a/app/Http/Middleware/CronJobMiddleware.php +++ b/app/Http/Middleware/CronJobMiddleware.php @@ -10,8 +10,6 @@ class CronJobMiddleware /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/CustomerPortalMiddleware.php b/app/Http/Middleware/CustomerPortalMiddleware.php index 34c6e7e4..5cf03bf8 100644 --- a/app/Http/Middleware/CustomerPortalMiddleware.php +++ b/app/Http/Middleware/CustomerPortalMiddleware.php @@ -11,7 +11,6 @@ class CustomerPortalMiddleware /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse */ diff --git a/app/Http/Middleware/InstallationMiddleware.php b/app/Http/Middleware/InstallationMiddleware.php index 79c33032..0eb8b876 100644 --- a/app/Http/Middleware/InstallationMiddleware.php +++ b/app/Http/Middleware/InstallationMiddleware.php @@ -11,7 +11,6 @@ class InstallationMiddleware * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/PdfMiddleware.php b/app/Http/Middleware/PdfMiddleware.php index a5a5dc89..0f15a899 100644 --- a/app/Http/Middleware/PdfMiddleware.php +++ b/app/Http/Middleware/PdfMiddleware.php @@ -11,7 +11,6 @@ class PdfMiddleware /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse */ diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 79d0108b..f883959f 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -3,8 +3,8 @@ namespace InvoiceShelf\Http\Middleware; use Closure; -use InvoiceShelf\Providers\RouteServiceProvider; use Illuminate\Support\Facades\Auth; +use InvoiceShelf\Providers\RouteServiceProvider; class RedirectIfAuthenticated { @@ -12,7 +12,6 @@ class RedirectIfAuthenticated * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next * @param string|null $guard * @return mixed */ diff --git a/app/Http/Middleware/RedirectIfInstalled.php b/app/Http/Middleware/RedirectIfInstalled.php index a7d08059..65144c57 100644 --- a/app/Http/Middleware/RedirectIfInstalled.php +++ b/app/Http/Middleware/RedirectIfInstalled.php @@ -11,7 +11,6 @@ class RedirectIfInstalled * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/RedirectIfUnauthorized.php b/app/Http/Middleware/RedirectIfUnauthorized.php index d7e942eb..8dc8d7ce 100644 --- a/app/Http/Middleware/RedirectIfUnauthorized.php +++ b/app/Http/Middleware/RedirectIfUnauthorized.php @@ -11,8 +11,6 @@ class RedirectIfUnauthorized /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next, $guard = null) diff --git a/app/Http/Middleware/ScopeBouncer.php b/app/Http/Middleware/ScopeBouncer.php index bc6edd4b..717511e5 100644 --- a/app/Http/Middleware/ScopeBouncer.php +++ b/app/Http/Middleware/ScopeBouncer.php @@ -16,8 +16,6 @@ class ScopeBouncer /** * Constructor. - * - * @param \Silber\Bouncer\Bouncer $bouncer */ public function __construct(Bouncer $bouncer) { @@ -28,7 +26,6 @@ class ScopeBouncer * Set the proper Bouncer scope for the incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Requests/AvatarRequest.php b/app/Http/Requests/AvatarRequest.php index 0f35e778..39cfbaac 100644 --- a/app/Http/Requests/AvatarRequest.php +++ b/app/Http/Requests/AvatarRequest.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Rules\Base64Mime; use Illuminate\Foundation\Http\FormRequest; +use InvoiceShelf\Rules\Base64Mime; class AvatarRequest extends FormRequest { @@ -29,12 +29,12 @@ class AvatarRequest extends FormRequest 'nullable', 'file', 'mimes:gif,jpg,png', - 'max:20000' + 'max:20000', ], 'avatar' => [ 'nullable', - new Base64Mime(['gif', 'jpg', 'png']) - ] + new Base64Mime(['gif', 'jpg', 'png']), + ], ]; } } diff --git a/app/Http/Requests/BulkExchangeRateRequest.php b/app/Http/Requests/BulkExchangeRateRequest.php index 5ccd5332..581a99c6 100644 --- a/app/Http/Requests/BulkExchangeRateRequest.php +++ b/app/Http/Requests/BulkExchangeRateRequest.php @@ -25,15 +25,15 @@ class BulkExchangeRateRequest extends FormRequest { return [ 'currencies' => [ - 'required' + 'required', ], 'currencies.*.id' => [ 'required', - 'numeric' + 'numeric', ], 'currencies.*.exchange_rate' => [ - 'required' - ] + 'required', + ], ]; } } diff --git a/app/Http/Requests/CompaniesRequest.php b/app/Http/Requests/CompaniesRequest.php index 618d7121..60e2e0ca 100644 --- a/app/Http/Requests/CompaniesRequest.php +++ b/app/Http/Requests/CompaniesRequest.php @@ -29,10 +29,10 @@ class CompaniesRequest extends FormRequest 'name' => [ 'required', Rule::unique('companies'), - 'string' + 'string', ], 'currency' => [ - 'required' + 'required', ], 'address.name' => [ 'nullable', @@ -68,11 +68,11 @@ class CompaniesRequest extends FormRequest { return collect($this->validated()) ->only([ - 'name' + 'name', ]) ->merge([ 'owner_id' => $this->user()->id, - 'slug' => Str::slug($this->name) + 'slug' => Str::slug($this->name), ]) ->toArray(); } diff --git a/app/Http/Requests/CompanyLogoRequest.php b/app/Http/Requests/CompanyLogoRequest.php index 7bafdc44..cf2a75cf 100644 --- a/app/Http/Requests/CompanyLogoRequest.php +++ b/app/Http/Requests/CompanyLogoRequest.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Rules\Base64Mime; use Illuminate\Foundation\Http\FormRequest; +use InvoiceShelf\Rules\Base64Mime; class CompanyLogoRequest extends FormRequest { @@ -27,8 +27,8 @@ class CompanyLogoRequest extends FormRequest return [ 'company_logo' => [ 'nullable', - new Base64Mime(['gif', 'jpg', 'png']) - ] + new Base64Mime(['gif', 'jpg', 'png']), + ], ]; } } diff --git a/app/Http/Requests/CompanyRequest.php b/app/Http/Requests/CompanyRequest.php index 189ed060..730fe7b9 100644 --- a/app/Http/Requests/CompanyRequest.php +++ b/app/Http/Requests/CompanyRequest.php @@ -30,7 +30,7 @@ class CompanyRequest extends FormRequest Rule::unique('companies')->ignore($this->header('company'), 'id'), ], 'slug' => [ - 'nullable' + 'nullable', ], 'address.country_id' => [ 'required', @@ -43,7 +43,7 @@ class CompanyRequest extends FormRequest return collect($this->validated()) ->only([ 'name', - 'slug' + 'slug', ]) ->toArray(); } diff --git a/app/Http/Requests/Customer/CustomerLoginRequest.php b/app/Http/Requests/Customer/CustomerLoginRequest.php index c3ba27f3..63b6db67 100644 --- a/app/Http/Requests/Customer/CustomerLoginRequest.php +++ b/app/Http/Requests/Customer/CustomerLoginRequest.php @@ -26,12 +26,12 @@ class CustomerLoginRequest extends FormRequest return [ 'email' => [ 'required', - 'string' + 'string', ], 'password' => [ 'required', - 'string' - ] + 'string', + ], ]; } } diff --git a/app/Http/Requests/Customer/CustomerProfileRequest.php b/app/Http/Requests/Customer/CustomerProfileRequest.php index 6d9d22dd..64df7b8c 100644 --- a/app/Http/Requests/Customer/CustomerProfileRequest.php +++ b/app/Http/Requests/Customer/CustomerProfileRequest.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Requests\Customer; -use InvoiceShelf\Models\Address; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Auth; use Illuminate\Validation\Rule; +use InvoiceShelf\Models\Address; class CustomerProfileRequest extends FormRequest { @@ -97,8 +97,8 @@ class CustomerProfileRequest extends FormRequest 'nullable', 'file', 'mimes:gif,jpg,png', - 'max:20000' - ] + 'max:20000', + ], ]; } @@ -106,7 +106,7 @@ class CustomerProfileRequest extends FormRequest { return collect($this->shipping) ->merge([ - 'type' => Address::SHIPPING_TYPE + 'type' => Address::SHIPPING_TYPE, ]) ->toArray(); } @@ -115,7 +115,7 @@ class CustomerProfileRequest extends FormRequest { return collect($this->billing) ->merge([ - 'type' => Address::BILLING_TYPE + 'type' => Address::BILLING_TYPE, ]) ->toArray(); } diff --git a/app/Http/Requests/CustomerEstimateStatusRequest.php b/app/Http/Requests/CustomerEstimateStatusRequest.php index 918dc1ef..ad8cb975 100644 --- a/app/Http/Requests/CustomerEstimateStatusRequest.php +++ b/app/Http/Requests/CustomerEstimateStatusRequest.php @@ -27,7 +27,7 @@ class CustomerEstimateStatusRequest extends FormRequest 'status' => [ 'required', 'in:ACCEPTED,REJECTED', - ] + ], ]; } } diff --git a/app/Http/Requests/CustomerRequest.php b/app/Http/Requests/CustomerRequest.php index 585196c1..36e557a1 100644 --- a/app/Http/Requests/CustomerRequest.php +++ b/app/Http/Requests/CustomerRequest.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\Address; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Arr; use Illuminate\Validation\Rule; +use InvoiceShelf\Models\Address; class CustomerRequest extends FormRequest { @@ -33,7 +33,7 @@ class CustomerRequest extends FormRequest 'email' => [ 'email', 'nullable', - Rule::unique('customers')->where('company_id', $this->header('company')) + Rule::unique('customers')->where('company_id', $this->header('company')), ], 'password' => [ 'nullable', @@ -55,7 +55,7 @@ class CustomerRequest extends FormRequest ], 'enable_portal' => [ - 'boolean' + 'boolean', ], 'currency_id' => [ 'nullable', @@ -113,7 +113,7 @@ class CustomerRequest extends FormRequest ], 'shipping.fax' => [ 'nullable', - ] + ], ]; if ($this->isMethod('PUT') && $this->email != null) { @@ -122,7 +122,7 @@ class CustomerRequest extends FormRequest 'nullable', Rule::unique('customers')->where('company_id', $this->header('company'))->ignore($this->route('customer')->id), ]; - }; + } return $rules; } @@ -156,7 +156,7 @@ class CustomerRequest extends FormRequest { return collect($this->shipping) ->merge([ - 'type' => Address::SHIPPING_TYPE + 'type' => Address::SHIPPING_TYPE, ]) ->toArray(); } @@ -165,7 +165,7 @@ class CustomerRequest extends FormRequest { return collect($this->billing) ->merge([ - 'type' => Address::BILLING_TYPE + 'type' => Address::BILLING_TYPE, ]) ->toArray(); } diff --git a/app/Http/Requests/DatabaseEnvironmentRequest.php b/app/Http/Requests/DatabaseEnvironmentRequest.php index 2208bdd6..85834d61 100644 --- a/app/Http/Requests/DatabaseEnvironmentRequest.php +++ b/app/Http/Requests/DatabaseEnvironmentRequest.php @@ -69,7 +69,7 @@ class DatabaseEnvironmentRequest extends FormRequest ], ]; - break; + break; } } diff --git a/app/Http/Requests/DeleteInvoiceRequest.php b/app/Http/Requests/DeleteInvoiceRequest.php index cd343278..eb8d9d1b 100644 --- a/app/Http/Requests/DeleteInvoiceRequest.php +++ b/app/Http/Requests/DeleteInvoiceRequest.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\Invoice; -use InvoiceShelf\Rules\RelationNotExist; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; +use InvoiceShelf\Models\Invoice; +use InvoiceShelf\Rules\RelationNotExist; class DeleteInvoiceRequest extends FormRequest { diff --git a/app/Http/Requests/DeleteItemsRequest.php b/app/Http/Requests/DeleteItemsRequest.php index e7a9cad2..b75e65cf 100644 --- a/app/Http/Requests/DeleteItemsRequest.php +++ b/app/Http/Requests/DeleteItemsRequest.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\Item; -use InvoiceShelf\Rules\RelationNotExist; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; +use InvoiceShelf\Models\Item; +use InvoiceShelf\Rules\RelationNotExist; class DeleteItemsRequest extends FormRequest { diff --git a/app/Http/Requests/EstimatesRequest.php b/app/Http/Requests/EstimatesRequest.php index 4d1da257..a0215864 100644 --- a/app/Http/Requests/EstimatesRequest.php +++ b/app/Http/Requests/EstimatesRequest.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Requests; +use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\Estimate; -use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Validation\Rule; class EstimatesRequest extends FormRequest { @@ -39,10 +39,10 @@ class EstimatesRequest extends FormRequest ], 'estimate_number' => [ 'required', - Rule::unique('estimates')->where('company_id', $this->header('company')) + Rule::unique('estimates')->where('company_id', $this->header('company')), ], 'exchange_rate' => [ - 'nullable' + 'nullable', ], 'discount' => [ 'required', @@ -60,7 +60,7 @@ class EstimatesRequest extends FormRequest 'required', ], 'template_name' => [ - 'required' + 'required', ], 'items' => [ 'required', @@ -89,11 +89,11 @@ class EstimatesRequest extends FormRequest $customer = Customer::find($this->customer_id); if ($companyCurrency && $customer) { - if ((string)$customer->currency_id !== $companyCurrency) { + if ((string) $customer->currency_id !== $companyCurrency) { $rules['exchange_rate'] = [ 'required', ]; - }; + } } if ($this->isMethod('PUT')) { diff --git a/app/Http/Requests/ExchangeRateLogRequest.php b/app/Http/Requests/ExchangeRateLogRequest.php index 8c86db35..1b593814 100644 --- a/app/Http/Requests/ExchangeRateLogRequest.php +++ b/app/Http/Requests/ExchangeRateLogRequest.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Foundation\Http\FormRequest; +use InvoiceShelf\Models\CompanySetting; class ExchangeRateLogRequest extends FormRequest { @@ -29,8 +29,8 @@ class ExchangeRateLogRequest extends FormRequest 'required', ], 'currency_id' => [ - 'required' - ] + 'required', + ], ]; } diff --git a/app/Http/Requests/ExchangeRateProviderRequest.php b/app/Http/Requests/ExchangeRateProviderRequest.php index b84a5c8b..4c3d02f1 100644 --- a/app/Http/Requests/ExchangeRateProviderRequest.php +++ b/app/Http/Requests/ExchangeRateProviderRequest.php @@ -25,7 +25,7 @@ class ExchangeRateProviderRequest extends FormRequest { $rules = [ 'driver' => [ - 'required' + 'required', ], 'key' => [ 'required', @@ -37,11 +37,11 @@ class ExchangeRateProviderRequest extends FormRequest 'nullable', ], 'driver_config' => [ - 'nullable' + 'nullable', ], 'active' => [ 'nullable', - 'boolean' + 'boolean', ], ]; @@ -52,7 +52,7 @@ class ExchangeRateProviderRequest extends FormRequest { return collect($this->validated()) ->merge([ - 'company_id' => $this->header('company') + 'company_id' => $this->header('company'), ]) ->toArray(); } diff --git a/app/Http/Requests/ExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategoryRequest.php index d7985674..da3e52c4 100644 --- a/app/Http/Requests/ExpenseCategoryRequest.php +++ b/app/Http/Requests/ExpenseCategoryRequest.php @@ -37,7 +37,7 @@ class ExpenseCategoryRequest extends FormRequest { return collect($this->validated()) ->merge([ - 'company_id' => $this->header('company') + 'company_id' => $this->header('company'), ]) ->toArray(); } diff --git a/app/Http/Requests/ExpenseRequest.php b/app/Http/Requests/ExpenseRequest.php index d691842f..40a187f9 100644 --- a/app/Http/Requests/ExpenseRequest.php +++ b/app/Http/Requests/ExpenseRequest.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Foundation\Http\FormRequest; +use InvoiceShelf\Models\CompanySetting; class ExpenseRequest extends FormRequest { @@ -34,7 +34,7 @@ class ExpenseRequest extends FormRequest 'required', ], 'exchange_rate' => [ - 'nullable' + 'nullable', ], 'payment_method_id' => [ 'nullable', @@ -49,14 +49,14 @@ class ExpenseRequest extends FormRequest 'nullable', ], 'currency_id' => [ - 'required' + 'required', ], 'attachment_receipt' => [ 'nullable', 'file', 'mimes:jpg,png,pdf,doc,docx,xls,xlsx,ppt,pptx', - 'max:20000' - ] + 'max:20000', + ], ]; if ($companyCurrency && $this->currency_id) { @@ -64,7 +64,7 @@ class ExpenseRequest extends FormRequest $rules['exchange_rate'] = [ 'required', ]; - }; + } } return $rules; @@ -82,7 +82,7 @@ class ExpenseRequest extends FormRequest 'company_id' => $this->header('company'), 'exchange_rate' => $exchange_rate, 'base_amount' => $this->amount * $exchange_rate, - 'currency_id' => $current_currency + 'currency_id' => $current_currency, ]) ->toArray(); } diff --git a/app/Http/Requests/GetSettingRequest.php b/app/Http/Requests/GetSettingRequest.php index 6213c8e3..71eebad2 100644 --- a/app/Http/Requests/GetSettingRequest.php +++ b/app/Http/Requests/GetSettingRequest.php @@ -26,8 +26,8 @@ class GetSettingRequest extends FormRequest return [ 'key' => [ 'required', - 'string' - ] + 'string', + ], ]; } } diff --git a/app/Http/Requests/InvoicesRequest.php b/app/Http/Requests/InvoicesRequest.php index 1d7b43a0..4c3cd2db 100644 --- a/app/Http/Requests/InvoicesRequest.php +++ b/app/Http/Requests/InvoicesRequest.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Http\Requests; +use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\Invoice; -use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Validation\Rule; class InvoicesRequest extends FormRequest { @@ -39,10 +39,10 @@ class InvoicesRequest extends FormRequest ], 'invoice_number' => [ 'required', - Rule::unique('invoices')->where('company_id', $this->header('company')) + Rule::unique('invoices')->where('company_id', $this->header('company')), ], 'exchange_rate' => [ - 'nullable' + 'nullable', ], 'discount' => [ 'required', @@ -60,7 +60,7 @@ class InvoicesRequest extends FormRequest 'required', ], 'template_name' => [ - 'required' + 'required', ], 'items' => [ 'required', @@ -89,11 +89,11 @@ class InvoicesRequest extends FormRequest $customer = Customer::find($this->customer_id); if ($customer && $companyCurrency) { - if ((string)$customer->currency_id !== $companyCurrency) { + if ((string) $customer->currency_id !== $companyCurrency) { $rules['exchange_rate'] = [ 'required', ]; - }; + } } if ($this->isMethod('PUT')) { diff --git a/app/Http/Requests/LoginRequest.php b/app/Http/Requests/LoginRequest.php index 08458d21..11dad9a7 100644 --- a/app/Http/Requests/LoginRequest.php +++ b/app/Http/Requests/LoginRequest.php @@ -31,7 +31,7 @@ class LoginRequest extends FormRequest 'required', ], 'device_name' => [ - 'required' + 'required', ], ]; } diff --git a/app/Http/Requests/NotesRequest.php b/app/Http/Requests/NotesRequest.php index e7c83a60..a47004cc 100644 --- a/app/Http/Requests/NotesRequest.php +++ b/app/Http/Requests/NotesRequest.php @@ -26,16 +26,16 @@ class NotesRequest extends FormRequest { $rules = [ 'type' => [ - 'required' + 'required', ], 'name' => [ 'required', Rule::unique('notes') ->where('company_id', $this->header('company')) - ->where('type', $this->type) + ->where('type', $this->type), ], 'notes' => [ - 'required' + 'required', ], ]; @@ -45,7 +45,7 @@ class NotesRequest extends FormRequest Rule::unique('notes') ->ignore($this->route('note')->id) ->where('type', $this->type) - ->where('company_id', $this->header('company')) + ->where('company_id', $this->header('company')), ]; } @@ -56,7 +56,7 @@ class NotesRequest extends FormRequest { return collect($this->validated()) ->merge([ - 'company_id' => $this->header('company') + 'company_id' => $this->header('company'), ]) ->toArray(); } diff --git a/app/Http/Requests/PaymentMethodRequest.php b/app/Http/Requests/PaymentMethodRequest.php index 5f084cc7..965ebfb2 100644 --- a/app/Http/Requests/PaymentMethodRequest.php +++ b/app/Http/Requests/PaymentMethodRequest.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\PaymentMethod; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; +use InvoiceShelf\Models\PaymentMethod; class PaymentMethodRequest extends FormRequest { diff --git a/app/Http/Requests/PaymentRequest.php b/app/Http/Requests/PaymentRequest.php index 602512ad..51b45918 100644 --- a/app/Http/Requests/PaymentRequest.php +++ b/app/Http/Requests/PaymentRequest.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\CompanySetting; -use InvoiceShelf\Models\Customer; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; +use InvoiceShelf\Models\CompanySetting; +use InvoiceShelf\Models\Customer; class PaymentRequest extends FormRequest { @@ -34,14 +34,14 @@ class PaymentRequest extends FormRequest 'required', ], 'exchange_rate' => [ - 'nullable' + 'nullable', ], 'amount' => [ 'required', ], 'payment_number' => [ 'required', - Rule::unique('payments')->where('company_id', $this->header('company')) + Rule::unique('payments')->where('company_id', $this->header('company')), ], 'invoice_id' => [ 'nullable', @@ -68,11 +68,11 @@ class PaymentRequest extends FormRequest $customer = Customer::find($this->customer_id); if ($customer && $companyCurrency) { - if ((string)$customer->currency_id !== $companyCurrency) { + if ((string) $customer->currency_id !== $companyCurrency) { $rules['exchange_rate'] = [ 'required', ]; - }; + } } return $rules; @@ -91,7 +91,7 @@ class PaymentRequest extends FormRequest 'company_id' => $this->header('company'), 'exchange_rate' => $exchange_rate, 'base_amount' => $this->amount * $exchange_rate, - 'currency_id' => $currency + 'currency_id' => $currency, ]) ->toArray(); } diff --git a/app/Http/Requests/RecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoiceRequest.php index 5f2b4b4a..8dc201ce 100644 --- a/app/Http/Requests/RecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoiceRequest.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Http\Requests; +use Illuminate\Foundation\Http\FormRequest; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\RecurringInvoice; -use Illuminate\Foundation\Http\FormRequest; class RecurringInvoiceRequest extends FormRequest { @@ -30,17 +30,17 @@ class RecurringInvoiceRequest extends FormRequest $rules = [ 'starts_at' => [ - 'required' + 'required', ], 'send_automatically' => [ 'required', - 'boolean' + 'boolean', ], 'customer_id' => [ - 'required' + 'required', ], 'exchange_rate' => [ - 'nullable' + 'nullable', ], 'discount' => [ 'required', @@ -58,16 +58,16 @@ class RecurringInvoiceRequest extends FormRequest 'required', ], 'status' => [ - 'required' + 'required', ], 'exchange_rate' => [ - 'nullable' + 'nullable', ], 'frequency' => [ - 'required' + 'required', ], 'limit_by' => [ - 'required' + 'required', ], 'limit_count' => [ 'required_if:limit_by,COUNT', @@ -76,24 +76,24 @@ class RecurringInvoiceRequest extends FormRequest 'required_if:limit_by,DATE', ], 'items' => [ - 'required' + 'required', ], 'items.*' => [ - 'required' - ] + 'required', + ], ]; $customer = Customer::find($this->customer_id); if ($customer && $companyCurrency) { - if ((string)$customer->currency_id !== $companyCurrency) { + if ((string) $customer->currency_id !== $companyCurrency) { $rules['exchange_rate'] = [ 'required', ]; - }; + } } - return $rules; + return $rules; } public function getRecurringInvoicePayload() @@ -114,7 +114,7 @@ class RecurringInvoiceRequest extends FormRequest 'discount_per_item' => CompanySetting::getSetting('discount_per_item', $this->header('company')) ?? 'NO', 'due_amount' => $this->total, 'exchange_rate' => $exchange_rate, - 'currency_id' => $currency + 'currency_id' => $currency, ]) ->toArray(); } diff --git a/app/Http/Requests/RoleRequest.php b/app/Http/Requests/RoleRequest.php index 413c49a6..0c93a5c2 100644 --- a/app/Http/Requests/RoleRequest.php +++ b/app/Http/Requests/RoleRequest.php @@ -28,14 +28,14 @@ class RoleRequest extends FormRequest 'name' => [ 'required', 'string', - Rule::unique('roles')->where('scope', $this->header('company')) + Rule::unique('roles')->where('scope', $this->header('company')), ], 'abilities' => [ - 'required' + 'required', ], 'abilities.*' => [ - 'required' - ] + 'required', + ], ]; if ($this->getMethod() == 'PUT') { @@ -44,7 +44,7 @@ class RoleRequest extends FormRequest 'string', Rule::unique('roles') ->ignore($this->route('role')->id, 'id') - ->where('scope', $this->header('company')) + ->where('scope', $this->header('company')), ]; } diff --git a/app/Http/Requests/TaxTypeRequest.php b/app/Http/Requests/TaxTypeRequest.php index 55be2f6d..a0a48802 100644 --- a/app/Http/Requests/TaxTypeRequest.php +++ b/app/Http/Requests/TaxTypeRequest.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Models\TaxType; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; +use InvoiceShelf\Models\TaxType; class TaxTypeRequest extends FormRequest { @@ -29,8 +29,8 @@ class TaxTypeRequest extends FormRequest 'name' => [ 'required', Rule::unique('tax_types') - ->where('type', TaxType::TYPE_GENERAL) - ->where('company_id', $this->header('company')) + ->where('type', TaxType::TYPE_GENERAL) + ->where('company_id', $this->header('company')), ], 'percent' => [ 'required', @@ -52,7 +52,7 @@ class TaxTypeRequest extends FormRequest Rule::unique('tax_types') ->ignore($this->route('tax_type')->id) ->where('type', TaxType::TYPE_GENERAL) - ->where('company_id', $this->header('company')) + ->where('company_id', $this->header('company')), ]; } @@ -64,7 +64,7 @@ class TaxTypeRequest extends FormRequest return collect($this->validated()) ->merge([ 'company_id' => $this->header('company'), - 'type' => TaxType::TYPE_GENERAL + 'type' => TaxType::TYPE_GENERAL, ]) ->toArray(); } diff --git a/app/Http/Requests/UnitRequest.php b/app/Http/Requests/UnitRequest.php index 056e041a..d7c43ee2 100644 --- a/app/Http/Requests/UnitRequest.php +++ b/app/Http/Requests/UnitRequest.php @@ -48,7 +48,7 @@ class UnitRequest extends FormRequest { return collect($this->validated()) ->merge([ - 'company_id' => $this->header('company') + 'company_id' => $this->header('company'), ]) ->toArray(); } diff --git a/app/Http/Requests/UnzipUpdateRequest.php b/app/Http/Requests/UnzipUpdateRequest.php index 7a356b83..59a96062 100644 --- a/app/Http/Requests/UnzipUpdateRequest.php +++ b/app/Http/Requests/UnzipUpdateRequest.php @@ -26,12 +26,12 @@ class UnzipUpdateRequest extends FormRequest return [ 'path' => [ 'required', - 'regex:/^[\.\/\w\-]+$/' + 'regex:/^[\.\/\w\-]+$/', ], 'module' => [ 'required', - 'string' - ] + 'string', + ], ]; } } diff --git a/app/Http/Requests/UploadExpenseReceiptRequest.php b/app/Http/Requests/UploadExpenseReceiptRequest.php index 90ff011c..aacaef54 100644 --- a/app/Http/Requests/UploadExpenseReceiptRequest.php +++ b/app/Http/Requests/UploadExpenseReceiptRequest.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Http\Requests; -use InvoiceShelf\Rules\Base64Mime; use Illuminate\Foundation\Http\FormRequest; +use InvoiceShelf\Rules\Base64Mime; class UploadExpenseReceiptRequest extends FormRequest { @@ -27,8 +27,8 @@ class UploadExpenseReceiptRequest extends FormRequest return [ 'attachment_receipt' => [ 'nullable', - new Base64Mime(['gif', 'jpg', 'png']) - ] + new Base64Mime(['gif', 'jpg', 'png']), + ], ]; } } diff --git a/app/Http/Requests/UploadModuleRequest.php b/app/Http/Requests/UploadModuleRequest.php index 56e0670c..973ffc91 100644 --- a/app/Http/Requests/UploadModuleRequest.php +++ b/app/Http/Requests/UploadModuleRequest.php @@ -28,13 +28,13 @@ class UploadModuleRequest extends FormRequest 'required', 'file', 'mimes:zip', - 'max:20000' + 'max:20000', ], 'module' => [ 'required', 'string', - 'max:100' - ] + 'max:100', + ], ]; } } diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php index 06f6142c..9a81682c 100644 --- a/app/Http/Resources/CompanyResource.php +++ b/app/Http/Resources/CompanyResource.php @@ -25,7 +25,7 @@ class CompanyResource extends JsonResource 'address' => $this->when($this->address()->exists(), function () { return new AddressResource($this->address); }), - 'roles' => RoleResource::collection($this->roles) + 'roles' => RoleResource::collection($this->roles), ]; } } diff --git a/app/Http/Resources/CurrencyResource.php b/app/Http/Resources/CurrencyResource.php index 2172ada2..440516a4 100644 --- a/app/Http/Resources/CurrencyResource.php +++ b/app/Http/Resources/CurrencyResource.php @@ -23,7 +23,7 @@ class CurrencyResource extends JsonResource 'thousand_separator' => $this->thousand_separator, 'decimal_separator' => $this->decimal_separator, 'swap_currency_symbol' => $this->swap_currency_symbol, - 'exchange_rate' => $this->exchange_rate + 'exchange_rate' => $this->exchange_rate, ]; } } diff --git a/app/Http/Resources/CustomFieldValueResource.php b/app/Http/Resources/CustomFieldValueResource.php index febe6981..bd36299d 100644 --- a/app/Http/Resources/CustomFieldValueResource.php +++ b/app/Http/Resources/CustomFieldValueResource.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Http\Resources; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Http\Resources\Json\JsonResource; +use InvoiceShelf\Models\CompanySetting; class CustomFieldValueResource extends JsonResource { diff --git a/app/Http/Resources/Customer/CurrencyResource.php b/app/Http/Resources/Customer/CurrencyResource.php index 6e7beba7..cf0582b7 100644 --- a/app/Http/Resources/Customer/CurrencyResource.php +++ b/app/Http/Resources/Customer/CurrencyResource.php @@ -23,7 +23,7 @@ class CurrencyResource extends JsonResource 'thousand_separator' => $this->thousand_separator, 'decimal_separator' => $this->decimal_separator, 'swap_currency_symbol' => $this->swap_currency_symbol, - 'exchange_rate' => $this->exchange_rate + 'exchange_rate' => $this->exchange_rate, ]; } } diff --git a/app/Http/Resources/ModuleResource.php b/app/Http/Resources/ModuleResource.php index 58e262a2..f3a05a3d 100644 --- a/app/Http/Resources/ModuleResource.php +++ b/app/Http/Resources/ModuleResource.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Http\Resources; +use Illuminate\Http\Resources\Json\JsonResource; use InvoiceShelf\Models\Module as ModelsModule; use InvoiceShelf\Models\Setting; -use Illuminate\Http\Resources\Json\JsonResource; use Nwidart\Modules\Facades\Module; class ModuleResource extends JsonResource @@ -50,7 +50,7 @@ class ModuleResource extends JsonResource 'update_available' => $this->updateAvailable(), 'video_link' => $this->video_link, 'video_thumbnail' => $this->video_thumbnail, - 'links' => $this->links + 'links' => $this->links, ]; } diff --git a/app/Http/Resources/RoleResource.php b/app/Http/Resources/RoleResource.php index 1948ef54..4f539e58 100644 --- a/app/Http/Resources/RoleResource.php +++ b/app/Http/Resources/RoleResource.php @@ -3,8 +3,8 @@ namespace InvoiceShelf\Http\Resources; use Carbon\Carbon; -use InvoiceShelf\Models\CompanySetting; use Illuminate\Http\Resources\Json\JsonResource; +use InvoiceShelf\Models\CompanySetting; class RoleResource extends JsonResource { @@ -22,7 +22,7 @@ class RoleResource extends JsonResource 'title' => $this->title, 'level' => $this->level, 'formatted_created_at' => $this->getFormattedAt(), - 'abilities' => $this->getAbilities() + 'abilities' => $this->getAbilities(), ]; } diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php index 51180773..d26452fc 100644 --- a/app/Http/Resources/UserResource.php +++ b/app/Http/Resources/UserResource.php @@ -39,7 +39,7 @@ class UserResource extends JsonResource }), 'companies' => $this->when($this->companies()->exists(), function () { return CompanyResource::collection($this->companies); - }) + }), ]; } } diff --git a/app/Jobs/CreateBackupJob.php b/app/Jobs/CreateBackupJob.php index bc0a8b21..cfb7cab4 100644 --- a/app/Jobs/CreateBackupJob.php +++ b/app/Jobs/CreateBackupJob.php @@ -2,12 +2,12 @@ namespace InvoiceShelf\Jobs; -use InvoiceShelf\Models\FileDisk; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use InvoiceShelf\Models\FileDisk; use Spatie\Backup\Tasks\Backup\BackupJobFactory; class CreateBackupJob implements ShouldQueue diff --git a/app/Listeners/Updates/Listener.php b/app/Listeners/Updates/Listener.php index 24c56a7e..fc600cad 100644 --- a/app/Listeners/Updates/Listener.php +++ b/app/Listeners/Updates/Listener.php @@ -10,7 +10,6 @@ class Listener /** * Check if should listen. * - * @param $event * @return bool */ protected function isListenerFired($event) diff --git a/app/Mail/EstimateViewedMail.php b/app/Mail/EstimateViewedMail.php index 0caf336f..9773eec3 100644 --- a/app/Mail/EstimateViewedMail.php +++ b/app/Mail/EstimateViewedMail.php @@ -31,6 +31,6 @@ class EstimateViewedMail extends Mailable public function build() { return $this->from(config('mail.from.address'), config('mail.from.name')) - ->markdown('emails.viewed.estimate', ['data', $this->data]); + ->markdown('emails.viewed.estimate', ['data', $this->data]); } } diff --git a/app/Mail/InvoiceViewedMail.php b/app/Mail/InvoiceViewedMail.php index ed272d5e..e658de35 100644 --- a/app/Mail/InvoiceViewedMail.php +++ b/app/Mail/InvoiceViewedMail.php @@ -31,6 +31,6 @@ class InvoiceViewedMail extends Mailable public function build() { return $this->from(config('mail.from.address'), config('mail.from.name')) - ->markdown('emails.viewed.invoice', ['data', $this->data]); + ->markdown('emails.viewed.invoice', ['data', $this->data]); } } diff --git a/app/Mail/SendEstimateMail.php b/app/Mail/SendEstimateMail.php index 8919521c..fc6c9074 100644 --- a/app/Mail/SendEstimateMail.php +++ b/app/Mail/SendEstimateMail.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Mail; -use InvoiceShelf\Models\EmailLog; -use InvoiceShelf\Models\Estimate; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; +use InvoiceShelf\Models\EmailLog; +use InvoiceShelf\Models\Estimate; use Vinkla\Hashids\Facades\Hashids; class SendEstimateMail extends Mailable @@ -48,8 +48,8 @@ class SendEstimateMail extends Mailable $this->data['url'] = route('estimate', ['email_log' => $log->token]); $mailContent = $this->from($this->data['from'], config('mail.from.name')) - ->subject($this->data['subject']) - ->markdown('emails.send.estimate', ['data', $this->data]); + ->subject($this->data['subject']) + ->markdown('emails.send.estimate', ['data', $this->data]); if ($this->data['attach']['data']) { $mailContent->attachData( diff --git a/app/Mail/SendInvoiceMail.php b/app/Mail/SendInvoiceMail.php index a90d9b36..4c4473bf 100644 --- a/app/Mail/SendInvoiceMail.php +++ b/app/Mail/SendInvoiceMail.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Mail; -use InvoiceShelf\Models\EmailLog; -use InvoiceShelf\Models\Invoice; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; +use InvoiceShelf\Models\EmailLog; +use InvoiceShelf\Models\Invoice; use Vinkla\Hashids\Facades\Hashids; class SendInvoiceMail extends Mailable diff --git a/app/Mail/SendPaymentMail.php b/app/Mail/SendPaymentMail.php index f4713c05..421ca4d1 100644 --- a/app/Mail/SendPaymentMail.php +++ b/app/Mail/SendPaymentMail.php @@ -2,11 +2,11 @@ namespace InvoiceShelf\Mail; -use InvoiceShelf\Models\EmailLog; -use InvoiceShelf\Models\Payment; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; +use InvoiceShelf\Models\EmailLog; +use InvoiceShelf\Models\Payment; use Vinkla\Hashids\Facades\Hashids; class SendPaymentMail extends Mailable @@ -48,8 +48,8 @@ class SendPaymentMail extends Mailable $this->data['url'] = route('payment', ['email_log' => $log->token]); $mailContent = $this->from($this->data['from'], config('mail.from.name')) - ->subject($this->data['subject']) - ->markdown('emails.send.payment', ['data', $this->data]); + ->subject($this->data['subject']) + ->markdown('emails.send.payment', ['data', $this->data]); if ($this->data['attach']['data']) { $mailContent->attachData( diff --git a/app/Mail/TestMail.php b/app/Mail/TestMail.php index 111dd3bc..fd33048b 100644 --- a/app/Mail/TestMail.php +++ b/app/Mail/TestMail.php @@ -17,9 +17,6 @@ class TestMail extends Mailable /** * Create a new message instance. - * - * @param $subject - * @param $message */ public function __construct($subject, $message) { diff --git a/app/Models/Address.php b/app/Models/Address.php index 36cbc4d8..9e7cb9b9 100644 --- a/app/Models/Address.php +++ b/app/Models/Address.php @@ -8,7 +8,9 @@ use Illuminate\Database\Eloquent\Model; class Address extends Model { use HasFactory; + public const BILLING_TYPE = 'billing'; + public const SHIPPING_TYPE = 'shipping'; protected $guarded = ['id']; diff --git a/app/Models/Company.php b/app/Models/Company.php index 62dbf65c..c3b11307 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -11,15 +11,15 @@ use Spatie\MediaLibrary\InteractsWithMedia; class Company extends Model implements HasMedia { + use HasFactory; use InteractsWithMedia; - use HasFactory; - protected $guarded = [ - 'id' + 'id', ]; public const COMPANY_LEVEL = 'company_level'; + public const CUSTOMER_LEVEL = 'customer_level'; protected $appends = ['logo', 'logo_path']; @@ -160,7 +160,7 @@ class Company extends Model implements HasMedia $super_admin = BouncerFacade::role()->firstOrCreate([ 'name' => 'super admin', 'title' => 'Super Admin', - 'scope' => $this->id + 'scope' => $this->id, ]); foreach (config('abilities.abilities') as $ability) { @@ -292,7 +292,6 @@ class Company extends Model implements HasMedia $this->customFieldValues()->delete(); } - if ($this->customFields()->exists()) { $this->customFields()->delete(); } diff --git a/app/Models/Currency.php b/app/Models/Currency.php index 74044bcf..44fbae4a 100644 --- a/app/Models/Currency.php +++ b/app/Models/Currency.php @@ -10,6 +10,6 @@ class Currency extends Model use HasFactory; protected $guarded = [ - 'id' + 'id', ]; } diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index cf759101..d7debc27 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -15,7 +15,7 @@ class CustomField extends Model protected $dates = [ 'date_answer', - 'date_time_answer' + 'date_time_answer', ]; protected $appends = [ @@ -29,7 +29,7 @@ class CustomField extends Model public function setTimeAnswerAttribute($value) { if ($value && $value != null) { - $this->attributes['time_answer'] = date("H:i:s", strtotime($value)); + $this->attributes['time_answer'] = date('H:i:s', strtotime($value)); } } diff --git a/app/Models/CustomFieldValue.php b/app/Models/CustomFieldValue.php index f2e96291..e8509d8f 100644 --- a/app/Models/CustomFieldValue.php +++ b/app/Models/CustomFieldValue.php @@ -11,7 +11,7 @@ class CustomFieldValue extends Model protected $dates = [ 'date_answer', - 'date_time_answer' + 'date_time_answer', ]; protected $guarded = [ @@ -25,7 +25,7 @@ class CustomFieldValue extends Model public function setTimeAnswerAttribute($value) { if ($value && $value != null) { - $this->attributes['time_answer'] = date("H:i:s", strtotime($value)); + $this->attributes['time_answer'] = date('H:i:s', strtotime($value)); } else { $this->attributes['time_answer'] = null; } diff --git a/app/Models/Customer.php b/app/Models/Customer.php index ce099714..b333338e 100644 --- a/app/Models/Customer.php +++ b/app/Models/Customer.php @@ -3,11 +3,11 @@ namespace InvoiceShelf\Models; use Carbon\Carbon; -use InvoiceShelf\Notifications\CustomerMailResetPasswordNotification; -use InvoiceShelf\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; +use InvoiceShelf\Notifications\CustomerMailResetPasswordNotification; +use InvoiceShelf\Traits\HasCustomFieldsTrait; use Laravel\Sanctum\HasApiTokens; use Silber\Bouncer\Database\HasRolesAndAbilities; use Spatie\MediaLibrary\HasMedia; @@ -16,14 +16,14 @@ use Spatie\MediaLibrary\InteractsWithMedia; class Customer extends Authenticatable implements HasMedia { use HasApiTokens; - use Notifiable; - use InteractsWithMedia; use HasCustomFieldsTrait; use HasFactory; use HasRolesAndAbilities; + use InteractsWithMedia; + use Notifiable; protected $guarded = [ - 'id' + 'id', ]; protected $hidden = [ @@ -37,7 +37,7 @@ class Customer extends Authenticatable implements HasMedia protected $appends = [ 'formattedCreatedAt', - 'avatar' + 'avatar', ]; protected $casts = [ @@ -123,7 +123,7 @@ class Customer extends Authenticatable implements HasMedia $avatar = $this->getMedia('customer_avatar')->first(); if ($avatar) { - return asset($avatar->getUrl()); + return asset($avatar->getUrl()); } return 0; diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php index a93f6539..1b52c59c 100644 --- a/app/Models/Estimate.php +++ b/app/Models/Estimate.php @@ -5,31 +5,36 @@ namespace InvoiceShelf\Models; use App; use Barryvdh\DomPDF\Facade\Pdf as PDF; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Vite; +use Illuminate\Support\Str; use InvoiceShelf\Mail\SendEstimateMail; use InvoiceShelf\Services\SerialNumberFormatter; use InvoiceShelf\Traits\GeneratesPdfTrait; use InvoiceShelf\Traits\HasCustomFieldsTrait; -use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Storage; -use Illuminate\Support\Str; use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\InteractsWithMedia; use Vinkla\Hashids\Facades\Hashids; class Estimate extends Model implements HasMedia { - use HasFactory; - use InteractsWithMedia; use GeneratesPdfTrait; use HasCustomFieldsTrait; + use HasFactory; + use InteractsWithMedia; public const STATUS_DRAFT = 'DRAFT'; + public const STATUS_SENT = 'SENT'; + public const STATUS_VIEWED = 'VIEWED'; + public const STATUS_EXPIRED = 'EXPIRED'; + public const STATUS_ACCEPTED = 'ACCEPTED'; + public const STATUS_REJECTED = 'REJECTED'; protected $dates = [ @@ -37,7 +42,7 @@ class Estimate extends Model implements HasMedia 'updated_at', 'deleted_at', 'estimate_date', - 'expiry_date' + 'expiry_date', ]; protected $appends = [ @@ -54,7 +59,7 @@ class Estimate extends Model implements HasMedia 'sub_total' => 'integer', 'discount' => 'float', 'discount_val' => 'integer', - 'exchange_rate' => 'float' + 'exchange_rate' => 'float', ]; public function getEstimatePdfUrlAttribute() @@ -228,7 +233,7 @@ class Estimate extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$data['currency_id'] !== $company_currency) { + if ((string) $data['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($estimate); } @@ -264,7 +269,7 @@ class Estimate extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$data['currency_id'] !== $company_currency) { + if ((string) $data['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($this); } @@ -290,12 +295,12 @@ class Estimate extends Model implements HasMedia } return Estimate::with([ - 'items.taxes', - 'items.fields', - 'items.fields.customField', - 'customer', - 'taxes' - ]) + 'items.taxes', + 'items.fields', + 'items.fields.customField', + 'customer', + 'taxes', + ]) ->find($this->id); } @@ -315,7 +320,7 @@ class Estimate extends Model implements HasMedia if (array_key_exists('taxes', $estimateItem) && $estimateItem['taxes']) { foreach ($estimateItem['taxes'] as $tax) { - if (gettype($tax['amount']) !== "NULL") { + if (gettype($tax['amount']) !== 'NULL') { $tax['company_id'] = $request->header('company'); $item->taxes()->create($tax); } @@ -333,7 +338,7 @@ class Estimate extends Model implements HasMedia $estimateTaxes = $request->taxes; foreach ($estimateTaxes as $tax) { - if (gettype($tax['amount']) !== "NULL") { + if (gettype($tax['amount']) !== 'NULL') { $tax['company_id'] = $request->header('company'); $tax['exchange_rate'] = $exchange_rate; $tax['base_amount'] = $tax['amount'] * $exchange_rate; diff --git a/app/Models/EstimateItem.php b/app/Models/EstimateItem.php index da017c44..ad1ffe19 100644 --- a/app/Models/EstimateItem.php +++ b/app/Models/EstimateItem.php @@ -2,17 +2,17 @@ namespace InvoiceShelf\Models; -use InvoiceShelf\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use InvoiceShelf\Traits\HasCustomFieldsTrait; class EstimateItem extends Model { - use HasFactory; use HasCustomFieldsTrait; + use HasFactory; protected $guarded = [ - 'id' + 'id', ]; protected $casts = [ diff --git a/app/Models/ExchangeRateLog.php b/app/Models/ExchangeRateLog.php index 723dfbaf..82960475 100644 --- a/app/Models/ExchangeRateLog.php +++ b/app/Models/ExchangeRateLog.php @@ -14,7 +14,7 @@ class ExchangeRateLog extends Model ]; protected $casts = [ - 'exchange_rate' => 'float' + 'exchange_rate' => 'float', ]; public function currency() diff --git a/app/Models/ExchangeRateProvider.php b/app/Models/ExchangeRateProvider.php index 1740d672..fef6110c 100644 --- a/app/Models/ExchangeRateProvider.php +++ b/app/Models/ExchangeRateProvider.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Models; -use InvoiceShelf\Http\Requests\ExchangeRateProviderRequest; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Http; +use InvoiceShelf\Http\Requests\ExchangeRateProviderRequest; class ExchangeRateProvider extends Model { @@ -18,7 +18,7 @@ class ExchangeRateProvider extends Model protected $casts = [ 'currencies' => 'array', 'driver_config' => 'array', - 'active' => 'boolean' + 'active' => 'boolean', ]; public function company() @@ -78,28 +78,28 @@ class ExchangeRateProvider extends Model { switch ($request['driver']) { case 'currency_freak': - $url = "https://api.currencyfreaks.com/latest?apikey=".$request['key']."&symbols=INR&base=USD"; + $url = 'https://api.currencyfreaks.com/latest?apikey='.$request['key'].'&symbols=INR&base=USD'; $response = Http::get($url)->json(); if (array_key_exists('success', $response)) { - if ($response["success"] == false) { - return respondJson($response["error"]["message"], $response["error"]["message"]); + if ($response['success'] == false) { + return respondJson($response['error']['message'], $response['error']['message']); } } return response()->json([ - 'exchangeRate' => array_values($response["rates"]), + 'exchangeRate' => array_values($response['rates']), ], 200); break; case 'currency_layer': - $url = "http://api.currencylayer.com/live?access_key=".$request['key']."&source=INR¤cies=USD"; + $url = 'http://api.currencylayer.com/live?access_key='.$request['key'].'&source=INR¤cies=USD'; $response = Http::get($url)->json(); if (array_key_exists('success', $response)) { - if ($response["success"] == false) { - return respondJson($response["error"]["info"], $response["error"]["info"]); + if ($response['success'] == false) { + return respondJson($response['error']['info'], $response['error']['info']); } } @@ -110,25 +110,25 @@ class ExchangeRateProvider extends Model break; case 'open_exchange_rate': - $url = "https://openexchangerates.org/api/latest.json?app_id=".$request['key']."&base=INR&symbols=USD"; + $url = 'https://openexchangerates.org/api/latest.json?app_id='.$request['key'].'&base=INR&symbols=USD'; $response = Http::get($url)->json(); - if (array_key_exists("error", $response)) { - return respondJson($response['message'], $response["description"]); + if (array_key_exists('error', $response)) { + return respondJson($response['message'], $response['description']); } return response()->json([ - 'exchangeRate' => array_values($response["rates"]), + 'exchangeRate' => array_values($response['rates']), ], 200); break; case 'currency_converter': $url = self::getCurrencyConverterUrl($request['driver_config']); - $url = $url."/api/v7/convert?apiKey=".$request['key']; + $url = $url.'/api/v7/convert?apiKey='.$request['key']; - $query = "INR_USD"; - $url = $url."&q={$query}"."&compact=y"; + $query = 'INR_USD'; + $url = $url."&q={$query}".'&compact=y'; $response = Http::get($url)->json(); return response()->json([ @@ -143,17 +143,17 @@ class ExchangeRateProvider extends Model { switch ($data['type']) { case 'PREMIUM': - return "https://api.currconv.com"; + return 'https://api.currconv.com'; break; case 'PREPAID': - return "https://prepaid.currconv.com"; + return 'https://prepaid.currconv.com'; break; case 'FREE': - return "https://free.currconv.com"; + return 'https://free.currconv.com'; break; diff --git a/app/Models/Expense.php b/app/Models/Expense.php index 92fc5f34..87bbb134 100644 --- a/app/Models/Expense.php +++ b/app/Models/Expense.php @@ -3,18 +3,18 @@ namespace InvoiceShelf\Models; use Carbon\Carbon; -use InvoiceShelf\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; +use InvoiceShelf\Traits\HasCustomFieldsTrait; use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\InteractsWithMedia; class Expense extends Model implements HasMedia { + use HasCustomFieldsTrait; use HasFactory; use InteractsWithMedia; - use HasCustomFieldsTrait; protected $dates = [ 'expense_date', @@ -26,12 +26,12 @@ class Expense extends Model implements HasMedia 'formattedExpenseDate', 'formattedCreatedAt', 'receipt', - 'receiptMeta' + 'receiptMeta', ]; protected $casts = [ 'notes' => 'string', - 'exchange_rate' => 'float' + 'exchange_rate' => 'float', ]; public function category() @@ -85,7 +85,7 @@ class Expense extends Model implements HasMedia if ($media) { return [ 'url' => $media->getFullUrl(), - 'type' => $media->type + 'type' => $media->type, ]; } @@ -235,7 +235,7 @@ class Expense extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$expense['currency_id'] !== $company_currency) { + if ((string) $expense['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($expense); } @@ -258,7 +258,7 @@ class Expense extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$data['currency_id'] !== $company_currency) { + if ((string) $data['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($this); } diff --git a/app/Models/FileDisk.php b/app/Models/FileDisk.php index 5205c6f5..1df45207 100644 --- a/app/Models/FileDisk.php +++ b/app/Models/FileDisk.php @@ -2,14 +2,16 @@ namespace InvoiceShelf\Models; -use InvoiceShelf\Carbon; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use InvoiceShelf\Carbon; class FileDisk extends Model { use HasFactory; + public const DISK_TYPE_SYSTEM = 'SYSTEM'; + public const DISK_TYPE_REMOTE = 'REMOTE'; protected $guarded = [ diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 668f795f..a06d50e3 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -5,15 +5,15 @@ namespace InvoiceShelf\Models; use App; use Barryvdh\DomPDF\Facade\Pdf as PDF; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Vite; +use Illuminate\Support\Str; use InvoiceShelf\Mail\SendInvoiceMail; use InvoiceShelf\Services\SerialNumberFormatter; use InvoiceShelf\Traits\GeneratesPdfTrait; use InvoiceShelf\Traits\HasCustomFieldsTrait; -use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Storage; -use Illuminate\Support\Str; use Nwidart\Modules\Facades\Module; use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\InteractsWithMedia; @@ -21,18 +21,23 @@ use Vinkla\Hashids\Facades\Hashids; class Invoice extends Model implements HasMedia { - use HasFactory; - use InteractsWithMedia; use GeneratesPdfTrait; use HasCustomFieldsTrait; + use HasFactory; + use InteractsWithMedia; public const STATUS_DRAFT = 'DRAFT'; + public const STATUS_SENT = 'SENT'; + public const STATUS_VIEWED = 'VIEWED'; + public const STATUS_COMPLETED = 'COMPLETED'; public const STATUS_UNPAID = 'UNPAID'; + public const STATUS_PARTIALLY_PAID = 'PARTIALLY_PAID'; + public const STATUS_PAID = 'PAID'; protected $dates = [ @@ -40,7 +45,7 @@ class Invoice extends Model implements HasMedia 'updated_at', 'deleted_at', 'invoice_date', - 'due_date' + 'due_date', ]; protected $casts = [ @@ -49,7 +54,7 @@ class Invoice extends Model implements HasMedia 'sub_total' => 'integer', 'discount' => 'float', 'discount_val' => 'integer', - 'exchange_rate' => 'float' + 'exchange_rate' => 'float', ]; protected $guarded = [ @@ -340,7 +345,7 @@ class Invoice extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$data['currency_id'] !== $company_currency) { + if ((string) $data['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($invoice); } @@ -357,7 +362,7 @@ class Invoice extends Model implements HasMedia 'items.fields', 'items.fields.customField', 'customer', - 'taxes' + 'taxes', ]) ->find($invoice->id); @@ -402,7 +407,7 @@ class Invoice extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$data['currency_id'] !== $company_currency) { + if ((string) $data['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($this); } @@ -432,7 +437,7 @@ class Invoice extends Model implements HasMedia 'items.fields', 'items.fields.customField', 'customer', - 'taxes' + 'taxes', ]) ->find($this->id); @@ -457,7 +462,7 @@ class Invoice extends Model implements HasMedia return [ 'type' => 'preview', - 'view' => new SendInvoiceMail($data) + 'view' => new SendInvoiceMail($data), ]; } @@ -504,7 +509,7 @@ class Invoice extends Model implements HasMedia $tax['base_amount'] = $tax['amount'] * $exchange_rate; $tax['currency_id'] = $invoice->currency_id; - if (gettype($tax['amount']) !== "NULL") { + if (gettype($tax['amount']) !== 'NULL') { if (array_key_exists('recurring_invoice_id', $invoiceItem)) { unset($invoiceItem['recurring_invoice_id']); } @@ -530,7 +535,7 @@ class Invoice extends Model implements HasMedia $tax['base_amount'] = $tax['amount'] * $exchange_rate; $tax['currency_id'] = $invoice->currency_id; - if (gettype($tax['amount']) !== "NULL") { + if (gettype($tax['amount']) !== 'NULL') { if (array_key_exists('recurring_invoice_id', $tax)) { unset($tax['recurring_invoice_id']); } @@ -664,7 +669,7 @@ class Invoice extends Model implements HasMedia foreach ($templates as $key => $template) { $templateName = Str::before(basename($template), '.blade.php'); $invoiceTemplates[$key]['name'] = $templateName; - $invoiceTemplates[$key]['path'] = Vite::asset('resources/static/img/PDF/'.$templateName.'.png'); + $invoiceTemplates[$key]['path'] = Vite::asset('resources/static/img/PDF/'.$templateName.'.png'); } return $invoiceTemplates; diff --git a/app/Models/InvoiceItem.php b/app/Models/InvoiceItem.php index 595a7e91..71341645 100644 --- a/app/Models/InvoiceItem.php +++ b/app/Models/InvoiceItem.php @@ -3,18 +3,18 @@ namespace InvoiceShelf\Models; use Carbon\Carbon; -use InvoiceShelf\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; +use InvoiceShelf\Traits\HasCustomFieldsTrait; class InvoiceItem extends Model { - use HasFactory; use HasCustomFieldsTrait; + use HasFactory; protected $guarded = [ - 'id' + 'id', ]; protected $casts = [ diff --git a/app/Models/Payment.php b/app/Models/Payment.php index 8fc2786d..f8af9ceb 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -4,28 +4,32 @@ namespace InvoiceShelf\Models; use Barryvdh\DomPDF\Facade\Pdf as PDF; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Model; use InvoiceShelf\Jobs\GeneratePaymentPdfJob; use InvoiceShelf\Mail\SendPaymentMail; use InvoiceShelf\Services\SerialNumberFormatter; use InvoiceShelf\Traits\GeneratesPdfTrait; use InvoiceShelf\Traits\HasCustomFieldsTrait; -use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\InteractsWithMedia; use Vinkla\Hashids\Facades\Hashids; class Payment extends Model implements HasMedia { - use HasFactory; - use InteractsWithMedia; use GeneratesPdfTrait; use HasCustomFieldsTrait; + use HasFactory; + use InteractsWithMedia; public const PAYMENT_MODE_CHECK = 'CHECK'; + public const PAYMENT_MODE_OTHER = 'OTHER'; + public const PAYMENT_MODE_CASH = 'CASH'; + public const PAYMENT_MODE_CREDIT_CARD = 'CREDIT_CARD'; + public const PAYMENT_MODE_BANK_TRANSFER = 'BANK_TRANSFER'; protected $dates = ['created_at', 'updated_at', 'payment_date']; @@ -40,7 +44,7 @@ class Payment extends Model implements HasMedia protected $casts = [ 'notes' => 'string', - 'exchange_rate' => 'float' + 'exchange_rate' => 'float', ]; protected static function booted() @@ -166,7 +170,7 @@ class Payment extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$payment['currency_id'] !== $company_currency) { + if ((string) $payment['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($payment); } @@ -180,7 +184,7 @@ class Payment extends Model implements HasMedia 'customer', 'invoice', 'paymentMethod', - 'fields' + 'fields', ])->find($payment->id); return $payment; @@ -218,7 +222,7 @@ class Payment extends Model implements HasMedia $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$data['currency_id'] !== $company_currency) { + if ((string) $data['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($this); } @@ -245,7 +249,7 @@ class Payment extends Model implements HasMedia if ($payment->invoice_id != null) { $invoice = Invoice::find($payment->invoice_id); - $invoice->due_amount = ((int)$invoice->due_amount + (int)$payment->amount); + $invoice->due_amount = ((int) $invoice->due_amount + (int) $payment->amount); if ($invoice->due_amount == $invoice->total) { $invoice->paid_status = Invoice::STATUS_UNPAID; diff --git a/app/Models/PaymentMethod.php b/app/Models/PaymentMethod.php index c06bb300..aab51b30 100644 --- a/app/Models/PaymentMethod.php +++ b/app/Models/PaymentMethod.php @@ -10,15 +10,16 @@ class PaymentMethod extends Model use HasFactory; protected $guarded = [ - 'id' + 'id', ]; public const TYPE_GENERAL = 'GENERAL'; + public const TYPE_MODULE = 'MODULE'; protected $casts = [ 'settings' => 'array', - 'use_test_env' => 'boolean' + 'use_test_env' => 'boolean', ]; public function setSettingsAttribute($value) diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index a1c332ee..33f10fd8 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -3,45 +3,49 @@ namespace InvoiceShelf\Models; use Carbon\Carbon; -use InvoiceShelf\Http\Requests\RecurringInvoiceRequest; -use InvoiceShelf\Services\SerialNumberFormatter; -use InvoiceShelf\Traits\HasCustomFieldsTrait; use Cron; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use InvoiceShelf\Http\Requests\RecurringInvoiceRequest; +use InvoiceShelf\Services\SerialNumberFormatter; +use InvoiceShelf\Traits\HasCustomFieldsTrait; use Vinkla\Hashids\Facades\Hashids; class RecurringInvoice extends Model { - use HasFactory; use HasCustomFieldsTrait; + use HasFactory; protected $guarded = [ 'id', ]; protected $dates = [ - 'starts_at' + 'starts_at', ]; public const NONE = 'NONE'; + public const COUNT = 'COUNT'; + public const DATE = 'DATE'; public const COMPLETED = 'COMPLETED'; + public const ON_HOLD = 'ON_HOLD'; + public const ACTIVE = 'ACTIVE'; protected $appends = [ 'formattedCreatedAt', 'formattedStartsAt', 'formattedNextInvoiceAt', - 'formattedLimitDate' + 'formattedLimitDate', ]; protected $casts = [ 'exchange_rate' => 'float', - 'send_automatically' => 'boolean' + 'send_automatically' => 'boolean', ]; public function getFormattedStartsAtAttribute() @@ -190,7 +194,7 @@ class RecurringInvoice extends Model $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$recurringInvoice['currency_id'] !== $company_currency) { + if ((string) $recurringInvoice['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($recurringInvoice); } @@ -215,7 +219,7 @@ class RecurringInvoice extends Model $company_currency = CompanySetting::getSetting('currency', $request->header('company')); - if ((string)$data['currency_id'] !== $company_currency) { + if ((string) $data['currency_id'] !== $company_currency) { ExchangeRateLog::addExchangeRateLog($this); } @@ -242,7 +246,7 @@ class RecurringInvoice extends Model if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) { foreach ($invoiceItem['taxes'] as $tax) { $tax['company_id'] = $recurringInvoice->company_id; - if (gettype($tax['amount']) !== "NULL") { + if (gettype($tax['amount']) !== 'NULL') { $item->taxes()->create($tax); } } @@ -255,7 +259,7 @@ class RecurringInvoice extends Model foreach ($taxes as $tax) { $tax['company_id'] = $recurringInvoice->company_id; - if (gettype($tax['amount']) !== "NULL") { + if (gettype($tax['amount']) !== 'NULL') { $recurringInvoice->taxes()->create($tax); } } @@ -307,7 +311,7 @@ class RecurringInvoice extends Model $days = CompanySetting::getSetting('invoice_due_date_days', $this->company_id); - if (! $days || $days == "null") { + if (! $days || $days == 'null') { $days = 7; } @@ -359,7 +363,7 @@ class RecurringInvoice extends Model foreach ($this->fields as $data) { $customField[] = [ 'id' => $data->custom_field_id, - 'value' => $data->defaultAnswer + 'value' => $data->defaultAnswer, ]; } @@ -375,7 +379,7 @@ class RecurringInvoice extends Model 'subject' => 'New Invoice', 'invoice' => $invoice->toArray(), 'customer' => $invoice->customer->toArray(), - 'company' => Company::find($invoice->company_id) + 'company' => Company::find($invoice->company_id), ]; $invoice->send($data); diff --git a/app/Models/Tax.php b/app/Models/Tax.php index da3a86f9..80c77500 100644 --- a/app/Models/Tax.php +++ b/app/Models/Tax.php @@ -12,7 +12,7 @@ class Tax extends Model use HasFactory; protected $guarded = [ - 'id' + 'id', ]; protected $casts = [ diff --git a/app/Models/TaxType.php b/app/Models/TaxType.php index 9b5e24c5..f14d6f34 100644 --- a/app/Models/TaxType.php +++ b/app/Models/TaxType.php @@ -15,10 +15,11 @@ class TaxType extends Model protected $casts = [ 'percent' => 'float', - 'compound_tax' => 'boolean' + 'compound_tax' => 'boolean', ]; public const TYPE_GENERAL = 'GENERAL'; + public const TYPE_MODULE = 'MODULE'; public function taxes() diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 0f530098..3dc761d3 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -12,15 +12,17 @@ class Transaction extends Model use HasFactory; protected $guarded = [ - 'id' + 'id', ]; protected $dates = [ - 'transaction_date' + 'transaction_date', ]; public const PENDING = 'PENDING'; + public const FAILED = 'FAILED'; + public const SUCCESS = 'SUCCESS'; public function payments() diff --git a/app/Models/User.php b/app/Models/User.php index d3e48f71..0fe9005c 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -3,13 +3,13 @@ namespace InvoiceShelf\Models; use Carbon\Carbon; -use InvoiceShelf\Http\Requests\UserRequest; -use InvoiceShelf\Notifications\MailResetPasswordNotification; -use InvoiceShelf\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\Schema; +use InvoiceShelf\Http\Requests\UserRequest; +use InvoiceShelf\Notifications\MailResetPasswordNotification; +use InvoiceShelf\Traits\HasCustomFieldsTrait; use Laravel\Sanctum\HasApiTokens; use Silber\Bouncer\BouncerFacade; use Silber\Bouncer\Database\HasRolesAndAbilities; @@ -19,11 +19,11 @@ use Spatie\MediaLibrary\InteractsWithMedia; class User extends Authenticatable implements HasMedia { use HasApiTokens; - use Notifiable; - use InteractsWithMedia; use HasCustomFieldsTrait; use HasFactory; use HasRolesAndAbilities; + use InteractsWithMedia; + use Notifiable; /** * The attributes that are mass assignable. @@ -31,7 +31,7 @@ class User extends Authenticatable implements HasMedia * @var array */ protected $guarded = [ - 'id' + 'id', ]; /** @@ -82,7 +82,7 @@ class User extends Authenticatable implements HasMedia $email = $request->email; $password = $request->password; - return (\Auth::attempt(['email' => $email, 'password' => $password], $remember)); + return \Auth::attempt(['email' => $email, 'password' => $password], $remember); } public function getFormattedCreatedAtAttribute($value) @@ -273,7 +273,7 @@ class User extends Authenticatable implements HasMedia $avatar = $this->getMedia('admin_avatar')->first(); if ($avatar) { - return asset($avatar->getUrl()); + return asset($avatar->getUrl()); } return 0; diff --git a/app/Notifications/CustomerMailResetPasswordNotification.php b/app/Notifications/CustomerMailResetPasswordNotification.php index a303687c..6a64e2a1 100644 --- a/app/Notifications/CustomerMailResetPasswordNotification.php +++ b/app/Notifications/CustomerMailResetPasswordNotification.php @@ -5,7 +5,6 @@ namespace InvoiceShelf\Notifications; use Illuminate\Auth\Notifications\ResetPassword; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; - use Illuminate\Notifications\Notification; class CustomerMailResetPasswordNotification extends ResetPassword @@ -43,12 +42,12 @@ class CustomerMailResetPasswordNotification extends ResetPassword { $link = url("/{$notifiable->company->slug}/customer/reset/password/".$this->token); - return ( new MailMessage() ) + return (new MailMessage()) ->subject('Reset Password Notification') - ->line("Hello! You are receiving this email because we received a password reset request for your account.") + ->line('Hello! You are receiving this email because we received a password reset request for your account.') ->action('Reset Password', $link) - ->line("This password reset link will expire in ".config('auth.passwords.users.expire')." minutes") - ->line("If you did not request a password reset, no further action is required."); + ->line('This password reset link will expire in '.config('auth.passwords.users.expire').' minutes') + ->line('If you did not request a password reset, no further action is required.'); } /** diff --git a/app/Notifications/MailResetPasswordNotification.php b/app/Notifications/MailResetPasswordNotification.php index 1de44adf..bf455365 100644 --- a/app/Notifications/MailResetPasswordNotification.php +++ b/app/Notifications/MailResetPasswordNotification.php @@ -5,7 +5,6 @@ namespace InvoiceShelf\Notifications; use Illuminate\Auth\Notifications\ResetPassword; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; - use Illuminate\Notifications\Notification; class MailResetPasswordNotification extends ResetPassword @@ -41,14 +40,14 @@ class MailResetPasswordNotification extends ResetPassword */ public function toMail($notifiable) { - $link = url("/reset-password/".$this->token); + $link = url('/reset-password/'.$this->token); - return ( new MailMessage() ) + return (new MailMessage()) ->subject('Reset Password Notification') - ->line("Hello! You are receiving this email because we received a password reset request for your account.") + ->line('Hello! You are receiving this email because we received a password reset request for your account.') ->action('Reset Password', $link) - ->line("This password reset link will expire in ".config('auth.passwords.users.expire')." minutes") - ->line("If you did not request a password reset, no further action is required."); + ->line('This password reset link will expire in '.config('auth.passwords.users.expire').' minutes') + ->line('If you did not request a password reset, no further action is required.'); } /** diff --git a/app/Policies/CompanyPolicy.php b/app/Policies/CompanyPolicy.php index 66643919..1d8d3d32 100644 --- a/app/Policies/CompanyPolicy.php +++ b/app/Policies/CompanyPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; class CompanyPolicy { diff --git a/app/Policies/CustomFieldPolicy.php b/app/Policies/CustomFieldPolicy.php index 8a45a845..add706ef 100644 --- a/app/Policies/CustomFieldPolicy.php +++ b/app/Policies/CustomFieldPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\CustomField; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class CustomFieldPolicy @@ -14,7 +14,6 @@ class CustomFieldPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class CustomFieldPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\CustomField $customField * @return mixed */ public function view(User $user, CustomField $customField) @@ -45,7 +42,6 @@ class CustomFieldPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class CustomFieldPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\CustomField $customField * @return mixed */ public function update(User $user, CustomField $customField) @@ -76,8 +70,6 @@ class CustomFieldPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\CustomField $customField * @return mixed */ public function delete(User $user, CustomField $customField) @@ -92,8 +84,6 @@ class CustomFieldPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\CustomField $customField * @return mixed */ public function restore(User $user, CustomField $customField) @@ -108,8 +98,6 @@ class CustomFieldPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\CustomField $customField * @return mixed */ public function forceDelete(User $user, CustomField $customField) diff --git a/app/Policies/CustomerPolicy.php b/app/Policies/CustomerPolicy.php index c0931bc6..57194205 100644 --- a/app/Policies/CustomerPolicy.php +++ b/app/Policies/CustomerPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class CustomerPolicy @@ -14,7 +14,6 @@ class CustomerPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class CustomerPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Customer $customer * @return mixed */ public function view(User $user, Customer $customer) @@ -45,7 +42,6 @@ class CustomerPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class CustomerPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Customer $customer * @return mixed */ public function update(User $user, Customer $customer) @@ -76,8 +70,6 @@ class CustomerPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Customer $customer * @return mixed */ public function delete(User $user, Customer $customer) @@ -92,8 +84,6 @@ class CustomerPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Customer $customer * @return mixed */ public function restore(User $user, Customer $customer) @@ -108,8 +98,6 @@ class CustomerPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Customer $customer * @return mixed */ public function forceDelete(User $user, Customer $customer) @@ -124,7 +112,6 @@ class CustomerPolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Policies/DashboardPolicy.php b/app/Policies/DashboardPolicy.php index 6847173a..14dddc61 100644 --- a/app/Policies/DashboardPolicy.php +++ b/app/Policies/DashboardPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class DashboardPolicy diff --git a/app/Policies/EstimatePolicy.php b/app/Policies/EstimatePolicy.php index 7e664cc1..2817db9c 100644 --- a/app/Policies/EstimatePolicy.php +++ b/app/Policies/EstimatePolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class EstimatePolicy @@ -14,7 +14,6 @@ class EstimatePolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class EstimatePolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Estimate $estimate * @return mixed */ public function view(User $user, Estimate $estimate) @@ -45,7 +42,6 @@ class EstimatePolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class EstimatePolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Estimate $estimate * @return mixed */ public function update(User $user, Estimate $estimate) @@ -76,8 +70,6 @@ class EstimatePolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Estimate $estimate * @return mixed */ public function delete(User $user, Estimate $estimate) @@ -92,8 +84,6 @@ class EstimatePolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Estimate $estimate * @return mixed */ public function restore(User $user, Estimate $estimate) @@ -108,8 +98,6 @@ class EstimatePolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Estimate $estimate * @return mixed */ public function forceDelete(User $user, Estimate $estimate) @@ -124,7 +112,6 @@ class EstimatePolicy /** * Determine whether the user can send email of the model. * - * @param \InvoiceShelf\Models\User $user * @param \InvoiceShelf\Models\Estimate $payment * @return mixed */ @@ -140,7 +127,6 @@ class EstimatePolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Policies/ExchangeRateProviderPolicy.php b/app/Policies/ExchangeRateProviderPolicy.php index aad1f621..617599fa 100644 --- a/app/Policies/ExchangeRateProviderPolicy.php +++ b/app/Policies/ExchangeRateProviderPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\ExchangeRateProvider; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class ExchangeRateProviderPolicy @@ -14,7 +14,6 @@ class ExchangeRateProviderPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return \Illuminate\Auth\Access\Response|bool */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class ExchangeRateProviderPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Auth\Access\Response|bool */ public function view(User $user, ExchangeRateProvider $exchangeRateProvider) @@ -45,7 +42,6 @@ class ExchangeRateProviderPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return \Illuminate\Auth\Access\Response|bool */ public function create(User $user) @@ -60,8 +56,6 @@ class ExchangeRateProviderPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Auth\Access\Response|bool */ public function update(User $user, ExchangeRateProvider $exchangeRateProvider) @@ -76,8 +70,6 @@ class ExchangeRateProviderPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Auth\Access\Response|bool */ public function delete(User $user, ExchangeRateProvider $exchangeRateProvider) @@ -92,8 +84,6 @@ class ExchangeRateProviderPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Auth\Access\Response|bool */ public function restore(User $user, ExchangeRateProvider $exchangeRateProvider) @@ -104,8 +94,6 @@ class ExchangeRateProviderPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExchangeRateProvider $exchangeRateProvider * @return \Illuminate\Auth\Access\Response|bool */ public function forceDelete(User $user, ExchangeRateProvider $exchangeRateProvider) diff --git a/app/Policies/ExpenseCategoryPolicy.php b/app/Policies/ExpenseCategoryPolicy.php index 36c02d54..f6bf268b 100644 --- a/app/Policies/ExpenseCategoryPolicy.php +++ b/app/Policies/ExpenseCategoryPolicy.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Expense; use InvoiceShelf\Models\ExpenseCategory; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class ExpenseCategoryPolicy @@ -15,7 +15,6 @@ class ExpenseCategoryPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -30,8 +29,6 @@ class ExpenseCategoryPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExpenseCategory $expenseCategory * @return mixed */ public function view(User $user, ExpenseCategory $expenseCategory) @@ -46,7 +43,6 @@ class ExpenseCategoryPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -61,8 +57,6 @@ class ExpenseCategoryPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExpenseCategory $expenseCategory * @return mixed */ public function update(User $user, ExpenseCategory $expenseCategory) @@ -77,8 +71,6 @@ class ExpenseCategoryPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExpenseCategory $expenseCategory * @return mixed */ public function delete(User $user, ExpenseCategory $expenseCategory) @@ -93,8 +85,6 @@ class ExpenseCategoryPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExpenseCategory $expenseCategory * @return mixed */ public function restore(User $user, ExpenseCategory $expenseCategory) @@ -109,8 +99,6 @@ class ExpenseCategoryPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\ExpenseCategory $expenseCategory * @return mixed */ public function forceDelete(User $user, ExpenseCategory $expenseCategory) diff --git a/app/Policies/ExpensePolicy.php b/app/Policies/ExpensePolicy.php index ebbe1035..29caaf88 100644 --- a/app/Policies/ExpensePolicy.php +++ b/app/Policies/ExpensePolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Expense; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class ExpensePolicy @@ -14,7 +14,6 @@ class ExpensePolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class ExpensePolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Expense $expense * @return mixed */ public function view(User $user, Expense $expense) @@ -45,7 +42,6 @@ class ExpensePolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class ExpensePolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Expense $expense * @return mixed */ public function update(User $user, Expense $expense) @@ -76,8 +70,6 @@ class ExpensePolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Expense $expense * @return mixed */ public function delete(User $user, Expense $expense) @@ -92,8 +84,6 @@ class ExpensePolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Expense $expense * @return mixed */ public function restore(User $user, Expense $expense) @@ -108,8 +98,6 @@ class ExpensePolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Expense $expense * @return mixed */ public function forceDelete(User $user, Expense $expense) @@ -124,7 +112,6 @@ class ExpensePolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Policies/InvoicePolicy.php b/app/Policies/InvoicePolicy.php index b57ddc3a..d0704be6 100644 --- a/app/Policies/InvoicePolicy.php +++ b/app/Policies/InvoicePolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class InvoicePolicy @@ -14,7 +14,6 @@ class InvoicePolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class InvoicePolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Invoice $invoice * @return mixed */ public function view(User $user, Invoice $invoice) @@ -45,7 +42,6 @@ class InvoicePolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class InvoicePolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Invoice $invoice * @return mixed */ public function update(User $user, Invoice $invoice) @@ -76,8 +70,6 @@ class InvoicePolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Invoice $invoice * @return mixed */ public function delete(User $user, Invoice $invoice) @@ -92,8 +84,6 @@ class InvoicePolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Invoice $invoice * @return mixed */ public function restore(User $user, Invoice $invoice) @@ -108,8 +98,6 @@ class InvoicePolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Invoice $invoice * @return mixed */ public function forceDelete(User $user, Invoice $invoice) @@ -124,7 +112,6 @@ class InvoicePolicy /** * Determine whether the user can send email of the model. * - * @param \InvoiceShelf\Models\User $user * @param \InvoiceShelf\Models\Payment $payment * @return mixed */ @@ -140,7 +127,6 @@ class InvoicePolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Policies/ItemPolicy.php b/app/Policies/ItemPolicy.php index 4ff9f48b..b93beeaa 100644 --- a/app/Policies/ItemPolicy.php +++ b/app/Policies/ItemPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Item; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class ItemPolicy @@ -14,7 +14,6 @@ class ItemPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class ItemPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Item $item * @return mixed */ public function view(User $user, Item $item) @@ -45,7 +42,6 @@ class ItemPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class ItemPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Item $item * @return mixed */ public function update(User $user, Item $item) @@ -76,8 +70,6 @@ class ItemPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Item $item * @return mixed */ public function delete(User $user, Item $item) @@ -92,8 +84,6 @@ class ItemPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Item $item * @return mixed */ public function restore(User $user, Item $item) @@ -108,8 +98,6 @@ class ItemPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Item $item * @return mixed */ public function forceDelete(User $user, Item $item) @@ -124,7 +112,6 @@ class ItemPolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Policies/ModulesPolicy.php b/app/Policies/ModulesPolicy.php index fb3d96af..e4b729e2 100644 --- a/app/Policies/ModulesPolicy.php +++ b/app/Policies/ModulesPolicy.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Policies; -use InvoiceShelf\Models\User; use Illuminate\Auth\Access\HandlesAuthorization; +use InvoiceShelf\Models\User; class ModulesPolicy { diff --git a/app/Policies/NotePolicy.php b/app/Policies/NotePolicy.php index 8db2b340..aeb51090 100644 --- a/app/Policies/NotePolicy.php +++ b/app/Policies/NotePolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Note; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class NotePolicy diff --git a/app/Policies/OwnerPolicy.php b/app/Policies/OwnerPolicy.php index 2f5004b0..86de0760 100644 --- a/app/Policies/OwnerPolicy.php +++ b/app/Policies/OwnerPolicy.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Policies; -use InvoiceShelf\Models\User; use Illuminate\Auth\Access\HandlesAuthorization; +use InvoiceShelf\Models\User; class OwnerPolicy { diff --git a/app/Policies/PaymentMethodPolicy.php b/app/Policies/PaymentMethodPolicy.php index 949506e4..ebb98885 100644 --- a/app/Policies/PaymentMethodPolicy.php +++ b/app/Policies/PaymentMethodPolicy.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Payment; use InvoiceShelf\Models\PaymentMethod; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class PaymentMethodPolicy @@ -15,7 +15,6 @@ class PaymentMethodPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -30,8 +29,6 @@ class PaymentMethodPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return mixed */ public function view(User $user, PaymentMethod $paymentMethod) @@ -46,7 +43,6 @@ class PaymentMethodPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -61,8 +57,6 @@ class PaymentMethodPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return mixed */ public function update(User $user, PaymentMethod $paymentMethod) @@ -77,8 +71,6 @@ class PaymentMethodPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return mixed */ public function delete(User $user, PaymentMethod $paymentMethod) @@ -93,8 +85,6 @@ class PaymentMethodPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return mixed */ public function restore(User $user, PaymentMethod $paymentMethod) @@ -109,8 +99,6 @@ class PaymentMethodPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\PaymentMethod $paymentMethod * @return mixed */ public function forceDelete(User $user, PaymentMethod $paymentMethod) diff --git a/app/Policies/PaymentPolicy.php b/app/Policies/PaymentPolicy.php index d8ed8320..9e2b5e92 100644 --- a/app/Policies/PaymentPolicy.php +++ b/app/Policies/PaymentPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Payment; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class PaymentPolicy @@ -14,7 +14,6 @@ class PaymentPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class PaymentPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Payment $payment * @return mixed */ public function view(User $user, Payment $payment) @@ -45,7 +42,6 @@ class PaymentPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class PaymentPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Payment $payment * @return mixed */ public function update(User $user, Payment $payment) @@ -76,8 +70,6 @@ class PaymentPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Payment $payment * @return mixed */ public function delete(User $user, Payment $payment) @@ -92,8 +84,6 @@ class PaymentPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Payment $payment * @return mixed */ public function restore(User $user, Payment $payment) @@ -108,8 +98,6 @@ class PaymentPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Payment $payment * @return mixed */ public function forceDelete(User $user, Payment $payment) @@ -124,8 +112,6 @@ class PaymentPolicy /** * Determine whether the user can send email of the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Payment $payment * @return mixed */ public function send(User $user, Payment $payment) @@ -140,7 +126,6 @@ class PaymentPolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Policies/RecurringInvoicePolicy.php b/app/Policies/RecurringInvoicePolicy.php index 87d693e0..f5f9b379 100644 --- a/app/Policies/RecurringInvoicePolicy.php +++ b/app/Policies/RecurringInvoicePolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\RecurringInvoice; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class RecurringInvoicePolicy @@ -14,7 +14,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return \Illuminate\Auth\Access\Response|bool */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\RecurringInvoice $recurringInvoice * @return \Illuminate\Auth\Access\Response|bool */ public function view(User $user, RecurringInvoice $recurringInvoice) @@ -45,7 +42,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return \Illuminate\Auth\Access\Response|bool */ public function create(User $user) @@ -60,8 +56,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\RecurringInvoice $recurringInvoice * @return \Illuminate\Auth\Access\Response|bool */ public function update(User $user, RecurringInvoice $recurringInvoice) @@ -76,8 +70,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\RecurringInvoice $recurringInvoice * @return \Illuminate\Auth\Access\Response|bool */ public function delete(User $user, RecurringInvoice $recurringInvoice) @@ -92,8 +84,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\RecurringInvoice $recurringInvoice * @return \Illuminate\Auth\Access\Response|bool */ public function restore(User $user, RecurringInvoice $recurringInvoice) @@ -108,8 +98,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\RecurringInvoice $recurringInvoice * @return \Illuminate\Auth\Access\Response|bool */ public function forceDelete(User $user, RecurringInvoice $recurringInvoice) @@ -124,7 +112,6 @@ class RecurringInvoicePolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Policies/ReportPolicy.php b/app/Policies/ReportPolicy.php index d924f8c2..6710e1b0 100644 --- a/app/Policies/ReportPolicy.php +++ b/app/Policies/ReportPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class ReportPolicy diff --git a/app/Policies/RolePolicy.php b/app/Policies/RolePolicy.php index 620d1ad1..d1f6ef58 100644 --- a/app/Policies/RolePolicy.php +++ b/app/Policies/RolePolicy.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Policies; -use InvoiceShelf\Models\User; use Illuminate\Auth\Access\HandlesAuthorization; +use InvoiceShelf\Models\User; use Silber\Bouncer\Database\Role; class RolePolicy @@ -13,7 +13,6 @@ class RolePolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -28,8 +27,6 @@ class RolePolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \Silber\Bouncer\Database\Role $role * @return mixed */ public function view(User $user, Role $role) @@ -44,7 +41,6 @@ class RolePolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -59,8 +55,6 @@ class RolePolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \Silber\Bouncer\Database\Role $role * @return mixed */ public function update(User $user, Role $role) @@ -75,8 +69,6 @@ class RolePolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \Silber\Bouncer\Database\Role $role * @return mixed */ public function delete(User $user, Role $role) @@ -91,8 +83,6 @@ class RolePolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \Silber\Bouncer\Database\Role $role * @return mixed */ public function restore(User $user, Role $role) @@ -107,8 +97,6 @@ class RolePolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \Silber\Bouncer\Database\Role $role * @return mixed */ public function forceDelete(User $user, Role $role) diff --git a/app/Policies/SettingsPolicy.php b/app/Policies/SettingsPolicy.php index cbc7eea4..2a68addb 100644 --- a/app/Policies/SettingsPolicy.php +++ b/app/Policies/SettingsPolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; class SettingsPolicy { diff --git a/app/Policies/TaxTypePolicy.php b/app/Policies/TaxTypePolicy.php index 02923eea..fc5530b7 100644 --- a/app/Policies/TaxTypePolicy.php +++ b/app/Policies/TaxTypePolicy.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\TaxType; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class TaxTypePolicy @@ -14,7 +14,6 @@ class TaxTypePolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -29,8 +28,6 @@ class TaxTypePolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\TaxType $taxType * @return mixed */ public function view(User $user, TaxType $taxType) @@ -45,7 +42,6 @@ class TaxTypePolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -60,8 +56,6 @@ class TaxTypePolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\TaxType $taxType * @return mixed */ public function update(User $user, TaxType $taxType) @@ -76,8 +70,6 @@ class TaxTypePolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\TaxType $taxType * @return mixed */ public function delete(User $user, TaxType $taxType) @@ -92,8 +84,6 @@ class TaxTypePolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\TaxType $taxType * @return mixed */ public function restore(User $user, TaxType $taxType) @@ -108,8 +98,6 @@ class TaxTypePolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\TaxType $taxType * @return mixed */ public function forceDelete(User $user, TaxType $taxType) diff --git a/app/Policies/UnitPolicy.php b/app/Policies/UnitPolicy.php index a0eba9da..34271f8a 100644 --- a/app/Policies/UnitPolicy.php +++ b/app/Policies/UnitPolicy.php @@ -2,10 +2,10 @@ namespace InvoiceShelf\Policies; +use Illuminate\Auth\Access\HandlesAuthorization; use InvoiceShelf\Models\Item; use InvoiceShelf\Models\Unit; use InvoiceShelf\Models\User; -use Illuminate\Auth\Access\HandlesAuthorization; use Silber\Bouncer\BouncerFacade; class UnitPolicy @@ -15,7 +15,6 @@ class UnitPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -30,8 +29,6 @@ class UnitPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Unit $unit * @return mixed */ public function view(User $user, Unit $unit) @@ -46,7 +43,6 @@ class UnitPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -61,8 +57,6 @@ class UnitPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Unit $unit * @return mixed */ public function update(User $user, Unit $unit) @@ -77,8 +71,6 @@ class UnitPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Unit $unit * @return mixed */ public function delete(User $user, Unit $unit) @@ -93,8 +85,6 @@ class UnitPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Unit $unit * @return mixed */ public function restore(User $user, Unit $unit) @@ -109,8 +99,6 @@ class UnitPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\Unit $unit * @return mixed */ public function forceDelete(User $user, Unit $unit) diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index c8a1a6fc..c6c9d273 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -2,8 +2,8 @@ namespace InvoiceShelf\Policies; -use InvoiceShelf\Models\User; use Illuminate\Auth\Access\HandlesAuthorization; +use InvoiceShelf\Models\User; class UserPolicy { @@ -12,7 +12,6 @@ class UserPolicy /** * Determine whether the user can view any models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function viewAny(User $user) @@ -27,8 +26,6 @@ class UserPolicy /** * Determine whether the user can view the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\User $model * @return mixed */ public function view(User $user, User $model) @@ -43,7 +40,6 @@ class UserPolicy /** * Determine whether the user can create models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function create(User $user) @@ -58,8 +54,6 @@ class UserPolicy /** * Determine whether the user can update the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\User $model * @return mixed */ public function update(User $user, User $model) @@ -74,8 +68,6 @@ class UserPolicy /** * Determine whether the user can delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\User $model * @return mixed */ public function delete(User $user, User $model) @@ -90,8 +82,6 @@ class UserPolicy /** * Determine whether the user can restore the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\User $model * @return mixed */ public function restore(User $user, User $model) @@ -106,8 +96,6 @@ class UserPolicy /** * Determine whether the user can permanently delete the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\User $model * @return mixed */ public function forceDelete(User $user, User $model) @@ -122,8 +110,6 @@ class UserPolicy /** * Determine whether the user can invite the model. * - * @param \InvoiceShelf\Models\User $user - * @param \InvoiceShelf\Models\User $model * @return mixed */ public function invite(User $user, User $model) @@ -138,7 +124,6 @@ class UserPolicy /** * Determine whether the user can delete models. * - * @param \InvoiceShelf\Models\User $user * @return mixed */ public function deleteMultiple(User $user) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 5f0cca76..98633c97 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,7 +4,6 @@ namespace InvoiceShelf\Providers; use Illuminate\Pagination\Paginator; use Illuminate\Support\Facades\Schema; -use Illuminate\Support\Facades\Vite; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index fed2f403..b5e59d15 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -2,6 +2,8 @@ namespace InvoiceShelf\Providers; +use Gate; +use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; use InvoiceShelf\Policies\CompanyPolicy; use InvoiceShelf\Policies\CustomerPolicy; use InvoiceShelf\Policies\DashboardPolicy; @@ -17,8 +19,6 @@ use InvoiceShelf\Policies\RecurringInvoicePolicy; use InvoiceShelf\Policies\ReportPolicy; use InvoiceShelf\Policies\SettingsPolicy; use InvoiceShelf\Policies\UserPolicy; -use Gate; -use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; class AuthServiceProvider extends ServiceProvider { diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index ab181c43..03311fc2 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -15,7 +15,7 @@ class BroadcastServiceProvider extends ServiceProvider public function boot() { Broadcast::routes(); - Broadcast::routes(["middleware" => 'api.auth']); + Broadcast::routes(['middleware' => 'api.auth']); require base_path('routes/channels.php'); } } diff --git a/app/Rules/RelationNotExist.php b/app/Rules/RelationNotExist.php index d5a5c4b8..fd100682 100644 --- a/app/Rules/RelationNotExist.php +++ b/app/Rules/RelationNotExist.php @@ -12,11 +12,10 @@ class RelationNotExist implements Rule /** * Create a new rule instance. - * @param string $class - * @param string $relation + * * @return void */ - public function __construct(string $class = null, string $relation = null) + public function __construct(?string $class = null, ?string $relation = null) { $this->class = $class; $this->relation = $relation; diff --git a/app/Services/SerialNumberFormatter.php b/app/Services/SerialNumberFormatter.php index 8e311c17..7ac7e0f8 100644 --- a/app/Services/SerialNumberFormatter.php +++ b/app/Services/SerialNumberFormatter.php @@ -7,9 +7,7 @@ use InvoiceShelf\Models\Customer; /** * SerialNumberFormatter - * @package InvoiceShelf\Services; */ - class SerialNumberFormatter { public const VALID_PLACEHOLDERS = ['CUSTOMER_SERIES', 'SEQUENCE', 'DATE_FORMAT', 'SERIES', 'RANDOM_SEQUENCE', 'DELIMITER', 'CUSTOMER_SEQUENCE']; @@ -33,7 +31,6 @@ class SerialNumberFormatter public $nextCustomerSequenceNumber; /** - * @param $model * @return $this */ public function setModel($model) @@ -59,7 +56,6 @@ class SerialNumberFormatter } /** - * @param $company * @return $this */ public function setCompany($company) @@ -70,7 +66,6 @@ class SerialNumberFormatter } /** - * @param $customer * @return $this */ public function setCustomer($customer = null) @@ -156,7 +151,7 @@ class SerialNumberFormatter public static function getPlaceholders(string $format) { - $regex = "/{{([A-Z_]{1,})(?::)?([a-zA-Z0-9_]{1,6}|.{1})?}}/"; + $regex = '/{{([A-Z_]{1,})(?::)?([a-zA-Z0-9_]{1,6}|.{1})?}}/'; preg_match_all($regex, $format, $placeholders); array_shift($placeholders); @@ -175,8 +170,8 @@ class SerialNumberFormatter if (in_array($name, self::VALID_PLACEHOLDERS)) { $validPlaceholders->push([ - "name" => $name, - "value" => $value + 'name' => $name, + 'value' => $value, ]); } } @@ -198,36 +193,36 @@ class SerialNumberFormatter $value = $placeholder['value']; switch ($name) { - case "SEQUENCE": - $value = $value ? $value : 6; - $serialNumber .= str_pad($this->nextSequenceNumber, $value, 0, STR_PAD_LEFT); + case 'SEQUENCE': + $value = $value ? $value : 6; + $serialNumber .= str_pad($this->nextSequenceNumber, $value, 0, STR_PAD_LEFT); - break; - case "DATE_FORMAT": - $value = $value ? $value : 'Y'; - $serialNumber .= date($value); + break; + case 'DATE_FORMAT': + $value = $value ? $value : 'Y'; + $serialNumber .= date($value); - break; - case "RANDOM_SEQUENCE": - $value = $value ? $value : 6; - $serialNumber .= substr(bin2hex(random_bytes($value)), 0, $value); + break; + case 'RANDOM_SEQUENCE': + $value = $value ? $value : 6; + $serialNumber .= substr(bin2hex(random_bytes($value)), 0, $value); - break; - case "CUSTOMER_SERIES": - if (isset($this->customer)) { - $serialNumber .= $this->customer->prefix ?? 'CST'; - } else { - $serialNumber .= 'CST'; - } + break; + case 'CUSTOMER_SERIES': + if (isset($this->customer)) { + $serialNumber .= $this->customer->prefix ?? 'CST'; + } else { + $serialNumber .= 'CST'; + } - break; - case "CUSTOMER_SEQUENCE": - $serialNumber .= str_pad($this->nextCustomerSequenceNumber, $value, 0, STR_PAD_LEFT); + break; + case 'CUSTOMER_SEQUENCE': + $serialNumber .= str_pad($this->nextCustomerSequenceNumber, $value, 0, STR_PAD_LEFT); - break; - default: - $serialNumber .= $value; - } + break; + default: + $serialNumber .= $value; + } } return $serialNumber; diff --git a/app/Space/DateFormatter.php b/app/Space/DateFormatter.php index 446621ca..abfe301c 100644 --- a/app/Space/DateFormatter.php +++ b/app/Space/DateFormatter.php @@ -8,36 +8,36 @@ class DateFormatter { protected static $formats = [ [ - "carbon_format" => "Y M d", - "moment_format" => "YYYY MMM DD", + 'carbon_format' => 'Y M d', + 'moment_format' => 'YYYY MMM DD', ], [ - "carbon_format" => "d M Y", - "moment_format" => "DD MMM YYYY", + 'carbon_format' => 'd M Y', + 'moment_format' => 'DD MMM YYYY', ], [ - "carbon_format" => "d/m/Y", - "moment_format" => "DD/MM/YYYY", + 'carbon_format' => 'd/m/Y', + 'moment_format' => 'DD/MM/YYYY', ], [ - "carbon_format" => "d.m.Y", - "moment_format" => "DD.MM.YYYY", + 'carbon_format' => 'd.m.Y', + 'moment_format' => 'DD.MM.YYYY', ], [ - "carbon_format" => "d-m-Y", - "moment_format" => "DD-MM-YYYY", + 'carbon_format' => 'd-m-Y', + 'moment_format' => 'DD-MM-YYYY', ], [ - "carbon_format" => "m/d/Y", - "moment_format" => "MM/DD/YYYY", + 'carbon_format' => 'm/d/Y', + 'moment_format' => 'MM/DD/YYYY', ], [ - "carbon_format" => "Y/m/d", - "moment_format" => " YYYY/MM/DD", + 'carbon_format' => 'Y/m/d', + 'moment_format' => ' YYYY/MM/DD', ], [ - "carbon_format" => "Y-m-d", - "moment_format" => "YYYY-MM-DD", + 'carbon_format' => 'Y-m-d', + 'moment_format' => 'YYYY-MM-DD', ], ]; @@ -47,9 +47,9 @@ class DateFormatter foreach (static::$formats as $format) { $new[] = [ - "display_date" => Carbon::now()->format($format['carbon_format']) , - "carbon_format_value" => $format['carbon_format'], - "moment_format_value" => $format['moment_format'], + 'display_date' => Carbon::now()->format($format['carbon_format']), + 'carbon_format_value' => $format['carbon_format'], + 'moment_format_value' => $format['moment_format'], ]; } diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php index e5b8694e..9c6867b2 100755 --- a/app/Space/EnvironmentManager.php +++ b/app/Space/EnvironmentManager.php @@ -2,13 +2,13 @@ namespace InvoiceShelf\Space; +use Exception; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use InvoiceShelf\Http\Requests\DatabaseEnvironmentRequest; use InvoiceShelf\Http\Requests\DiskEnvironmentRequest; use InvoiceShelf\Http\Requests\DomainEnvironmentRequest; use InvoiceShelf\Http\Requests\MailEnvironmentRequest; -use Exception; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; class EnvironmentManager { @@ -28,7 +28,6 @@ class EnvironmentManager /** * Save the database content to the .env file. * - * @param DatabaseEnvironmentRequest $request * @return array */ public function saveDatabaseVariables(DatabaseEnvironmentRequest $request) @@ -117,7 +116,6 @@ class EnvironmentManager file_get_contents($this->envPath) )); - file_put_contents($this->envPath, str_replace( 'SESSION_DOMAIN='.config('session.domain'), 'SESSION_DOMAIN='.explode(':', $request->app_domain)[0], @@ -135,8 +133,6 @@ class EnvironmentManager } /** - * - * @param DatabaseEnvironmentRequest $request * @return bool */ private function checkDatabaseConnection(DatabaseEnvironmentRequest $request) @@ -172,8 +168,6 @@ class EnvironmentManager } /** - * - * @param DatabaseEnvironmentRequest $request * @return bool */ private function checkVersionRequirements(DatabaseEnvironmentRequest $request, $conn) @@ -224,11 +218,11 @@ class EnvironmentManager } /** - * Save the mail content to the .env file. - * - * @param Request $request - * @return array - */ + * Save the mail content to the .env file. + * + * @param Request $request + * @return array + */ public function saveMailVariables(MailEnvironmentRequest $request) { $mailData = $this->getMailData($request); @@ -266,11 +260,11 @@ class EnvironmentManager private function getMailData($request) { - $mailFromCredential = ""; - $extraMailData = ""; - $extraOldMailData = ""; - $oldMailData = ""; - $newMailData = ""; + $mailFromCredential = ''; + $extraMailData = ''; + $extraOldMailData = ''; + $oldMailData = ''; + $newMailData = ''; if (env('MAIL_FROM_ADDRESS') !== null && env('MAIL_FROM_NAME') !== null) { $mailFromCredential = @@ -424,7 +418,7 @@ class EnvironmentManager /** * Save the disk content to the .env file. * - * @param Request $request + * @param Request $request * @return array */ public function saveDiskVariables(DiskEnvironmentRequest $request) @@ -464,10 +458,10 @@ class EnvironmentManager private function getDiskData($request) { - $oldDefaultDriver = ""; - $defaultDriver = ""; - $oldDiskData = ""; - $newDiskData = ""; + $oldDefaultDriver = ''; + $defaultDriver = ''; + $oldDiskData = ''; + $newDiskData = ''; if ($request->default_driver) { if (env('FILESYSTEM_DRIVER') !== null) { @@ -518,7 +512,7 @@ class EnvironmentManager 'DO_SPACES_REGION='.$request->do_spaces_region."\n". 'DO_SPACES_BUCKET='.$request->do_spaces_bucket."\n". 'DO_SPACES_ENDPOINT='.$request->do_spaces_endpoint."\n"; - 'DO_SPACES_ROOT='.$request->do_spaces_root."\n\n"; + 'DO_SPACES_ROOT='.$request->do_spaces_root."\n\n"; break; @@ -553,7 +547,6 @@ class EnvironmentManager /** * Save sanctum statful domain to the .env file. * - * @param DomainEnvironmentRequest $request * @return array */ public function saveDomainVariables(DomainEnvironmentRequest $request) @@ -572,12 +565,12 @@ class EnvironmentManager )); } catch (Exception $e) { return [ - 'error' => 'domain_verification_failed' + 'error' => 'domain_verification_failed', ]; } return [ - 'success' => 'domain_variable_save_successfully' + 'success' => 'domain_variable_save_successfully', ]; } } diff --git a/app/Space/FilePermissionChecker.php b/app/Space/FilePermissionChecker.php index ae254ec1..6c48dc7e 100644 --- a/app/Space/FilePermissionChecker.php +++ b/app/Space/FilePermissionChecker.php @@ -24,7 +24,6 @@ class FilePermissionChecker /** * Check for the folders permissions. * - * @param array $folders * @return array */ public function check(array $folders) @@ -43,7 +42,6 @@ class FilePermissionChecker /** * Get a folder permission. * - * @param $folder * @return string */ private function getPermission($folder) @@ -53,10 +51,6 @@ class FilePermissionChecker /** * Add the file to the list of results. - * - * @param $folder - * @param $permission - * @param $isSet */ private function addFile($folder, $permission, $isSet) { @@ -69,10 +63,6 @@ class FilePermissionChecker /** * Add the file and set the errors. - * - * @param $folder - * @param $permission - * @param $isSet */ private function addFileAndSetErrors($folder, $permission, $isSet) { diff --git a/app/Space/ModuleInstaller.php b/app/Space/ModuleInstaller.php index 3ac4ee54..a019caa4 100644 --- a/app/Space/ModuleInstaller.php +++ b/app/Space/ModuleInstaller.php @@ -3,13 +3,13 @@ namespace InvoiceShelf\Space; use Artisan; +use File; +use GuzzleHttp\Exception\RequestException; use InvoiceShelf\Events\ModuleEnabledEvent; use InvoiceShelf\Events\ModuleInstalledEvent; use InvoiceShelf\Http\Resources\ModuleResource; use InvoiceShelf\Models\Module as ModelsModule; use InvoiceShelf\Models\Setting; -use File; -use GuzzleHttp\Exception\RequestException; use Nwidart\Modules\Facades\Module; use ZipArchive; @@ -56,7 +56,7 @@ class ModuleInstaller $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true], $token); if ($response && ($response->getStatusCode() == 401)) { - return (object)['success' => false, 'error' => 'invalid_token']; + return (object) ['success' => false, 'error' => 'invalid_token']; } if ($response && ($response->getStatusCode() == 200)) { @@ -137,7 +137,7 @@ class ModuleInstaller return [ 'success' => true, - 'path' => $zip_file_path + 'path' => $zip_file_path, ]; } @@ -215,7 +215,7 @@ class ModuleInstaller return true; } - public static function checkToken(String $token) + public static function checkToken(string $token) { $url = 'api/marketplace/ping'; $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true], $token); diff --git a/app/Space/RequirementsChecker.php b/app/Space/RequirementsChecker.php index fc75d6e3..71a8865a 100755 --- a/app/Space/RequirementsChecker.php +++ b/app/Space/RequirementsChecker.php @@ -18,7 +18,6 @@ class RequirementsChecker /** * Check for the server requirements. * - * @param array $requirements * @return array */ public function check(array $requirements) @@ -40,7 +39,7 @@ class RequirementsChecker } break; - // check apache requirements + // check apache requirements case 'apache': foreach ($requirements[$type] as $requirement) { // if function doesn't exist we can't check apache modules @@ -67,7 +66,7 @@ class RequirementsChecker * * @return array */ - public function checkPHPVersion(string $minPhpVersion = null) + public function checkPHPVersion(?string $minPhpVersion = null) { $minVersionPhp = $minPhpVersion; $currentPhpVersion = $this->getPhpVersionInfo(); @@ -167,7 +166,7 @@ class RequirementsChecker * * @return array */ - public function checkSqliteVersion(string $minSqliteVersion = null) + public function checkSqliteVersion(?string $minSqliteVersion = null) { $minVersionSqlite = $minSqliteVersion; $currentSqliteVersion = $this->getSqliteVersionInfo(); @@ -203,7 +202,7 @@ class RequirementsChecker * * @return array */ - public function checkPgsqlVersion($conn, string $minPgsqlVersion = null) + public function checkPgsqlVersion($conn, ?string $minPgsqlVersion = null) { $minVersionPgsql = $minPgsqlVersion; $currentPgsqlVersion = $this->getPgsqlVersionInfo($conn); diff --git a/app/Space/SiteApi.php b/app/Space/SiteApi.php index 472c1013..badb5df9 100644 --- a/app/Space/SiteApi.php +++ b/app/Space/SiteApi.php @@ -2,9 +2,9 @@ namespace InvoiceShelf\Space; -use InvoiceShelf\Models\Setting; use GuzzleHttp\Client; use GuzzleHttp\Exception\RequestException; +use InvoiceShelf\Models\Setting; // Implementation taken from Akaunting - https://github.com/akaunting/akaunting trait SiteApi diff --git a/app/Space/Updater.php b/app/Space/Updater.php index 3b6b2fa9..ceb83f92 100644 --- a/app/Space/Updater.php +++ b/app/Space/Updater.php @@ -3,9 +3,9 @@ namespace InvoiceShelf\Space; use Artisan; -use InvoiceShelf\Events\UpdateFinished; use File; use GuzzleHttp\Exception\RequestException; +use InvoiceShelf\Events\UpdateFinished; use ZipArchive; // Implementation taken from Akaunting - https://github.com/akaunting/akaunting @@ -36,7 +36,7 @@ class Updater foreach (json_decode($extensions) as $extension) { $extensionData[$extension] = phpversion($extension) ? true : false; } - $extensionData['php'.'('.$data->version->minimum_php_version.')'] = version_compare(phpversion(), $data->version->minimum_php_version, ">="); + $extensionData['php'.'('.$data->version->minimum_php_version.')'] = version_compare(phpversion(), $data->version->minimum_php_version, '>='); $data->version->extensions = $extensionData; } diff --git a/app/Space/helpers.php b/app/Space/helpers.php index 2bb4d1da..e4db5827 100644 --- a/app/Space/helpers.php +++ b/app/Space/helpers.php @@ -1,15 +1,14 @@ json([ 'error' => $error, - 'message' => $message + 'message' => $message, ], 422); } diff --git a/app/Traits/ExchangeRateProvidersTrait.php b/app/Traits/ExchangeRateProvidersTrait.php index 80d96c59..8d03e29d 100644 --- a/app/Traits/ExchangeRateProvidersTrait.php +++ b/app/Traits/ExchangeRateProvidersTrait.php @@ -10,30 +10,30 @@ trait ExchangeRateProvidersTrait { switch ($filter['driver']) { case 'currency_freak': - $url = "https://api.currencyfreaks.com/latest?apikey=".$filter['key']; + $url = 'https://api.currencyfreaks.com/latest?apikey='.$filter['key']; $url = $url."&symbols={$currencyCode}"."&base={$baseCurrencyCode}"; $response = Http::get($url)->json(); if (array_key_exists('success', $response)) { - if ($response["success"] == false) { - return respondJson($response["error"]["message"], $response["error"]["message"]); + if ($response['success'] == false) { + return respondJson($response['error']['message'], $response['error']['message']); } } return response()->json([ - 'exchangeRate' => array_values($response["rates"]), + 'exchangeRate' => array_values($response['rates']), ], 200); break; case 'currency_layer': - $url = "http://api.currencylayer.com/live?access_key=".$filter['key']."&source={$baseCurrencyCode}¤cies={$currencyCode}"; + $url = 'http://api.currencylayer.com/live?access_key='.$filter['key']."&source={$baseCurrencyCode}¤cies={$currencyCode}"; $response = Http::get($url)->json(); if (array_key_exists('success', $response)) { - if ($response["success"] == false) { - return respondJson($response["error"]["info"], $response["error"]["info"]); + if ($response['success'] == false) { + return respondJson($response['error']['info'], $response['error']['info']); } } @@ -44,25 +44,25 @@ trait ExchangeRateProvidersTrait break; case 'open_exchange_rate': - $url = "https://openexchangerates.org/api/latest.json?app_id=".$filter['key']."&base={$baseCurrencyCode}&symbols={$currencyCode}"; + $url = 'https://openexchangerates.org/api/latest.json?app_id='.$filter['key']."&base={$baseCurrencyCode}&symbols={$currencyCode}"; $response = Http::get($url)->json(); - if (array_key_exists("error", $response)) { - return respondJson($response["message"], $response["description"]); + if (array_key_exists('error', $response)) { + return respondJson($response['message'], $response['description']); } return response()->json([ - 'exchangeRate' => array_values($response["rates"]), + 'exchangeRate' => array_values($response['rates']), ], 200); break; case 'currency_converter': $url = $this->getCurrencyConverterUrl($filter['driver_config']); - $url = $url."/api/v7/convert?apiKey=".$filter['key']; + $url = $url.'/api/v7/convert?apiKey='.$filter['key']; $query = "{$baseCurrencyCode}_{$currencyCode}"; - $url = $url."&q={$query}"."&compact=y"; + $url = $url."&q={$query}".'&compact=y'; $response = Http::get($url)->json(); return response()->json([ @@ -77,17 +77,17 @@ trait ExchangeRateProvidersTrait { switch ($data['type']) { case 'PREMIUM': - return "https://api.currconv.com"; + return 'https://api.currconv.com'; break; case 'PREPAID': - return "https://prepaid.currconv.com"; + return 'https://prepaid.currconv.com'; break; case 'FREE': - return "https://free.currconv.com"; + return 'https://free.currconv.com'; break; @@ -108,7 +108,7 @@ trait ExchangeRateProvidersTrait switch ($request->driver) { case 'currency_freak': - $url = "https://api.currencyfreaks.com/currency-symbols"; + $url = 'https://api.currencyfreaks.com/currency-symbols'; $response = Http::get($url)->json(); $checkKey = $this->getUrl($request); @@ -127,7 +127,7 @@ trait ExchangeRateProvidersTrait break; case 'currency_layer': - $url = "http://api.currencylayer.com/list?access_key=".$request->key; + $url = 'http://api.currencylayer.com/list?access_key='.$request->key; $response = Http::get($url)->json(); if ($response == null) { @@ -143,7 +143,7 @@ trait ExchangeRateProvidersTrait break; case 'open_exchange_rate': - $url = "https://openexchangerates.org/api/currencies.json"; + $url = 'https://openexchangerates.org/api/currencies.json'; $response = Http::get($url)->json(); $checkKey = $this->getUrl($request); @@ -182,28 +182,28 @@ trait ExchangeRateProvidersTrait { switch ($request->driver) { case 'currency_freak': - $url = "https://api.currencyfreaks.com/latest?apikey=".$request->key."&symbols=INR&base=USD"; + $url = 'https://api.currencyfreaks.com/latest?apikey='.$request->key.'&symbols=INR&base=USD'; return Http::get($url)->json(); break; case 'currency_layer': - $url = "http://api.currencylayer.com/live?access_key=".$request->key."&source=INR¤cies=USD"; + $url = 'http://api.currencylayer.com/live?access_key='.$request->key.'&source=INR¤cies=USD'; return Http::get($url)->json(); break; case 'open_exchange_rate': - $url = "https://openexchangerates.org/api/latest.json?app_id=".$request->key."&base=INR&symbols=USD"; + $url = 'https://openexchangerates.org/api/latest.json?app_id='.$request->key.'&base=INR&symbols=USD'; return Http::get($url)->json(); break; case 'currency_converter': - $url = $this->getCurrencyConverterUrl($request)."/api/v7/currencies?apiKey=".$request->key; + $url = $this->getCurrencyConverterUrl($request).'/api/v7/currencies?apiKey='.$request->key; return Http::get($url)->json(); diff --git a/app/Traits/GeneratesPdfTrait.php b/app/Traits/GeneratesPdfTrait.php index f3acc43f..c377b54b 100644 --- a/app/Traits/GeneratesPdfTrait.php +++ b/app/Traits/GeneratesPdfTrait.php @@ -3,10 +3,10 @@ namespace InvoiceShelf\Traits; use Carbon\Carbon; +use Illuminate\Support\Facades\App; use InvoiceShelf\Models\Address; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\FileDisk; -use Illuminate\Support\Facades\App; trait GeneratesPdfTrait { @@ -20,7 +20,7 @@ trait GeneratesPdfTrait ]); } - $locale = CompanySetting::getSetting('language', $this->company_id); + $locale = CompanySetting::getSetting('language', $this->company_id); App::setLocale($locale); @@ -68,13 +68,13 @@ trait GeneratesPdfTrait public function generatePDF($collection_name, $file_name, $deleteExistingFile = false) { - $save_pdf_to_disk = CompanySetting::getSetting('save_pdf_to_disk', $this->company_id); + $save_pdf_to_disk = CompanySetting::getSetting('save_pdf_to_disk', $this->company_id); if ($save_pdf_to_disk == 'NO') { return 0; } - $locale = CompanySetting::getSetting('language', $this->company_id); + $locale = CompanySetting::getSetting('language', $this->company_id); App::setLocale($locale); @@ -175,9 +175,9 @@ trait GeneratesPdfTrait $str = preg_replace("/<[^\/>]*>([\s]?)*<\/[^>]*>/", '', $str); - $str = str_replace("

", "", $str); + $str = str_replace('

', '', $str); - $str = str_replace("

", "
", $str); + $str = str_replace('

', '
', $str); return $str; } diff --git a/app/Traits/HasCustomFieldsTrait.php b/app/Traits/HasCustomFieldsTrait.php index 967d3deb..56145d6d 100644 --- a/app/Traits/HasCustomFieldsTrait.php +++ b/app/Traits/HasCustomFieldsTrait.php @@ -24,7 +24,7 @@ trait HasCustomFieldsTrait { foreach ($customFields as $field) { if (! is_array($field)) { - $field = (array)$field; + $field = (array) $field; } $customField = CustomField::find($field['id']); @@ -43,7 +43,7 @@ trait HasCustomFieldsTrait { foreach ($customFields as $field) { if (! is_array($field)) { - $field = (array)$field; + $field = (array) $field; } $customField = CustomField::find($field['id']); diff --git a/config/abilities.php b/config/abilities.php index dbaa7816..f7558581 100644 --- a/config/abilities.php +++ b/config/abilities.php @@ -17,404 +17,404 @@ return [ // Customer [ - "name" => "view customer", - "ability" => "view-customer", - "model" => Customer::class, + 'name' => 'view customer', + 'ability' => 'view-customer', + 'model' => Customer::class, ], [ - "name" => "create customer", - "ability" => "create-customer", - "model" => Customer::class, - "depends_on" => [ + 'name' => 'create customer', + 'ability' => 'create-customer', + 'model' => Customer::class, + 'depends_on' => [ 'view-customer', 'view-custom-field', - ] + ], ], [ - "name" => "edit customer", - "ability" => "edit-customer", - "model" => Customer::class, - "depends_on" => [ + 'name' => 'edit customer', + 'ability' => 'edit-customer', + 'model' => Customer::class, + 'depends_on' => [ 'view-customer', 'view-custom-field', - ] + ], ], [ - "name" => "delete customer", - "ability" => "delete-customer", - "model" => Customer::class, - "depends_on" => [ + 'name' => 'delete customer', + 'ability' => 'delete-customer', + 'model' => Customer::class, + 'depends_on' => [ 'view-customer', - ] + ], ], // Item [ - "name" => "view item", - "ability" => "view-item", - "model" => Item::class, + 'name' => 'view item', + 'ability' => 'view-item', + 'model' => Item::class, ], [ - "name" => "create item", - "ability" => "create-item", - "model" => Item::class, - "depends_on" => [ + 'name' => 'create item', + 'ability' => 'create-item', + 'model' => Item::class, + 'depends_on' => [ 'view-item', - 'view-tax-type' - ] + 'view-tax-type', + ], ], [ - "name" => "edit item", - "ability" => "edit-item", - "model" => Item::class, - "depends_on" => [ + 'name' => 'edit item', + 'ability' => 'edit-item', + 'model' => Item::class, + 'depends_on' => [ 'view-item', - ] + ], ], [ - "name" => "delete item", - "ability" => "delete-item", - "model" => Item::class, - "depends_on" => [ + 'name' => 'delete item', + 'ability' => 'delete-item', + 'model' => Item::class, + 'depends_on' => [ 'view-item', - ] + ], ], // Tax Type [ - "name" => "view tax type", - "ability" => "view-tax-type", - "model" => TaxType::class, + 'name' => 'view tax type', + 'ability' => 'view-tax-type', + 'model' => TaxType::class, ], [ - "name" => "create tax type", - "ability" => "create-tax-type", - "model" => TaxType::class, - "depends_on" => [ + 'name' => 'create tax type', + 'ability' => 'create-tax-type', + 'model' => TaxType::class, + 'depends_on' => [ 'view-tax-type', - ] + ], ], [ - "name" => "edit tax type", - "ability" => "edit-tax-type", - "model" => TaxType::class, - "depends_on" => [ + 'name' => 'edit tax type', + 'ability' => 'edit-tax-type', + 'model' => TaxType::class, + 'depends_on' => [ 'view-tax-type', - ] + ], ], [ - "name" => "delete tax type", - "ability" => "delete-tax-type", - "model" => TaxType::class, - "depends_on" => [ + 'name' => 'delete tax type', + 'ability' => 'delete-tax-type', + 'model' => TaxType::class, + 'depends_on' => [ 'view-tax-type', - ] + ], ], // Estimate [ - "name" => "view estimate", - "ability" => "view-estimate", - "model" => Estimate::class, + 'name' => 'view estimate', + 'ability' => 'view-estimate', + 'model' => Estimate::class, ], [ - "name" => "create estimate", - "ability" => "create-estimate", - "model" => Estimate::class, - "depends_on" => [ + 'name' => 'create estimate', + 'ability' => 'create-estimate', + 'model' => Estimate::class, + 'depends_on' => [ 'view-estimate', 'view-item', 'view-tax-type', 'view-customer', 'view-custom-field', - 'view-all-notes' - ] + 'view-all-notes', + ], ], [ - "name" => "edit estimate", - "ability" => "edit-estimate", - "model" => Estimate::class, - "depends_on" => [ + 'name' => 'edit estimate', + 'ability' => 'edit-estimate', + 'model' => Estimate::class, + 'depends_on' => [ 'view-item', 'view-estimate', 'view-tax-type', 'view-customer', 'view-custom-field', - 'view-all-notes' - ] + 'view-all-notes', + ], ], [ - "name" => "delete estimate", - "ability" => "delete-estimate", - "model" => Estimate::class, - "depends_on" => [ + 'name' => 'delete estimate', + 'ability' => 'delete-estimate', + 'model' => Estimate::class, + 'depends_on' => [ 'view-estimate', - ] + ], ], [ - "name" => "send estimate", - "ability" => "send-estimate", - "model" => Estimate::class, + 'name' => 'send estimate', + 'ability' => 'send-estimate', + 'model' => Estimate::class, ], // Invoice [ - "name" => "view invoice", - "ability" => "view-invoice", - "model" => Invoice::class, + 'name' => 'view invoice', + 'ability' => 'view-invoice', + 'model' => Invoice::class, ], [ - "name" => "create invoice", - "ability" => "create-invoice", - "model" => Invoice::class, + 'name' => 'create invoice', + 'ability' => 'create-invoice', + 'model' => Invoice::class, 'owner_only' => false, - "depends_on" => [ + 'depends_on' => [ 'view-item', 'view-invoice', 'view-tax-type', 'view-customer', 'view-custom-field', - 'view-all-notes' - ] + 'view-all-notes', + ], ], [ - "name" => "edit invoice", - "ability" => "edit-invoice", - "model" => Invoice::class, - "depends_on" => [ + 'name' => 'edit invoice', + 'ability' => 'edit-invoice', + 'model' => Invoice::class, + 'depends_on' => [ 'view-item', 'view-invoice', 'view-tax-type', 'view-customer', 'view-custom-field', - 'view-all-notes' - ] + 'view-all-notes', + ], ], [ - "name" => "delete invoice", - "ability" => "delete-invoice", - "model" => Invoice::class, - "depends_on" => [ - 'view-invoice' - ] + 'name' => 'delete invoice', + 'ability' => 'delete-invoice', + 'model' => Invoice::class, + 'depends_on' => [ + 'view-invoice', + ], ], [ - "name" => "send invoice", - "ability" => "send-invoice", - "model" => Invoice::class, + 'name' => 'send invoice', + 'ability' => 'send-invoice', + 'model' => Invoice::class, ], // Recurring Invoice [ - "name" => "view recurring invoice", - "ability" => "view-recurring-invoice", - "model" => RecurringInvoice::class, + 'name' => 'view recurring invoice', + 'ability' => 'view-recurring-invoice', + 'model' => RecurringInvoice::class, ], [ - "name" => "create recurring invoice", - "ability" => "create-recurring-invoice", - "model" => RecurringInvoice::class, - "depends_on" => [ + 'name' => 'create recurring invoice', + 'ability' => 'create-recurring-invoice', + 'model' => RecurringInvoice::class, + 'depends_on' => [ 'view-item', 'view-recurring-invoice', 'view-tax-type', 'view-customer', 'view-all-notes', - 'send-invoice' - ] + 'send-invoice', + ], ], [ - "name" => "edit recurring invoice", - "ability" => "edit-recurring-invoice", - "model" => RecurringInvoice::class, - "depends_on" => [ + 'name' => 'edit recurring invoice', + 'ability' => 'edit-recurring-invoice', + 'model' => RecurringInvoice::class, + 'depends_on' => [ 'view-item', 'view-recurring-invoice', 'view-tax-type', 'view-customer', 'view-all-notes', - 'send-invoice' - ] + 'send-invoice', + ], ], [ - "name" => "delete recurring invoice", - "ability" => "delete-recurring-invoice", - "model" => RecurringInvoice::class, - "depends_on" => [ + 'name' => 'delete recurring invoice', + 'ability' => 'delete-recurring-invoice', + 'model' => RecurringInvoice::class, + 'depends_on' => [ 'view-recurring-invoice', - ] + ], ], // Payment [ - "name" => "view payment", - "ability" => "view-payment", - "model" => Payment::class, + 'name' => 'view payment', + 'ability' => 'view-payment', + 'model' => Payment::class, ], [ - "name" => "create payment", - "ability" => "create-payment", - "model" => Payment::class, - "depends_on" => [ + 'name' => 'create payment', + 'ability' => 'create-payment', + 'model' => Payment::class, + 'depends_on' => [ 'view-customer', 'view-payment', 'view-invoice', 'view-custom-field', - 'view-all-notes' - ] + 'view-all-notes', + ], ], [ - "name" => "edit payment", - "ability" => "edit-payment", - "model" => Payment::class, - "depends_on" => [ + 'name' => 'edit payment', + 'ability' => 'edit-payment', + 'model' => Payment::class, + 'depends_on' => [ 'view-customer', 'view-payment', 'view-invoice', 'view-custom-field', - 'view-all-notes' - ] + 'view-all-notes', + ], ], [ - "name" => "delete payment", - "ability" => "delete-payment", - "model" => Payment::class, - "depends_on" => [ + 'name' => 'delete payment', + 'ability' => 'delete-payment', + 'model' => Payment::class, + 'depends_on' => [ 'view-payment', - ] + ], ], [ - "name" => "send payment", - "ability" => "send-payment", - "model" => Payment::class, + 'name' => 'send payment', + 'ability' => 'send-payment', + 'model' => Payment::class, ], // Expense [ - "name" => "view expense", - "ability" => "view-expense", - "model" => Expense::class, + 'name' => 'view expense', + 'ability' => 'view-expense', + 'model' => Expense::class, ], [ - "name" => "create expense", - "ability" => "create-expense", - "model" => Expense::class, - "depends_on" => [ + 'name' => 'create expense', + 'ability' => 'create-expense', + 'model' => Expense::class, + 'depends_on' => [ 'view-customer', 'view-expense', 'view-custom-field', - ] + ], ], [ - "name" => "edit expense", - "ability" => "edit-expense", - "model" => Expense::class, - "depends_on" => [ + 'name' => 'edit expense', + 'ability' => 'edit-expense', + 'model' => Expense::class, + 'depends_on' => [ 'view-customer', 'view-expense', 'view-custom-field', - ] + ], ], [ - "name" => "delete expense", - "ability" => "delete-expense", - "model" => Expense::class, - "depends_on" => [ + 'name' => 'delete expense', + 'ability' => 'delete-expense', + 'model' => Expense::class, + 'depends_on' => [ 'view-expense', - ] + ], ], // Custom Field [ - "name" => "view custom field", - "ability" => "view-custom-field", - "model" => CustomField::class, + 'name' => 'view custom field', + 'ability' => 'view-custom-field', + 'model' => CustomField::class, ], [ - "name" => "create custom field", - "ability" => "create-custom-field", - "model" => CustomField::class, - "depends_on" => [ + 'name' => 'create custom field', + 'ability' => 'create-custom-field', + 'model' => CustomField::class, + 'depends_on' => [ 'view-custom-field', - ] + ], ], [ - "name" => "edit custom field", - "ability" => "edit-custom-field", - "model" => CustomField::class, - "depends_on" => [ + 'name' => 'edit custom field', + 'ability' => 'edit-custom-field', + 'model' => CustomField::class, + 'depends_on' => [ 'view-custom-field', - ] + ], ], [ - "name" => "delete custom field", - "ability" => "delete-custom-field", - "model" => CustomField::class, - "depends_on" => [ + 'name' => 'delete custom field', + 'ability' => 'delete-custom-field', + 'model' => CustomField::class, + 'depends_on' => [ 'view-custom-field', - ] + ], ], // Financial Reports [ - "name" => "view financial reports", - "ability" => "view-financial-reports", - "model" => null, + 'name' => 'view financial reports', + 'ability' => 'view-financial-reports', + 'model' => null, ], // Exchange Rate Provider [ - "name" => "view exchange rate provider", - "ability" => "view-exchange-rate-provider", - "model" => ExchangeRateProvider::class, + 'name' => 'view exchange rate provider', + 'ability' => 'view-exchange-rate-provider', + 'model' => ExchangeRateProvider::class, 'owner_only' => false, ], [ - "name" => "create exchange rate provider", - "ability" => "create-exchange-rate-provider", - "model" => ExchangeRateProvider::class, + 'name' => 'create exchange rate provider', + 'ability' => 'create-exchange-rate-provider', + 'model' => ExchangeRateProvider::class, 'owner_only' => false, - "depends_on" => [ + 'depends_on' => [ 'view-exchange-rate-provider', - ] + ], ], [ - "name" => "edit exchange rate provider", - "ability" => "edit-exchange-rate-provider", - "model" => ExchangeRateProvider::class, + 'name' => 'edit exchange rate provider', + 'ability' => 'edit-exchange-rate-provider', + 'model' => ExchangeRateProvider::class, 'owner_only' => false, - "depends_on" => [ + 'depends_on' => [ 'view-exchange-rate-provider', - ] + ], ], [ - "name" => "delete exchange rate provider", - "ability" => "delete-exchange-rate-provider", - "model" => ExchangeRateProvider::class, + 'name' => 'delete exchange rate provider', + 'ability' => 'delete-exchange-rate-provider', + 'model' => ExchangeRateProvider::class, 'owner_only' => false, - "depends_on" => [ + 'depends_on' => [ 'view-exchange-rate-provider', - ] + ], ], // Settings [ - "name" => "view company dashboard", - "ability" => "dashboard", - "model" => null, + 'name' => 'view company dashboard', + 'ability' => 'dashboard', + 'model' => null, ], [ - "name" => "view all notes", - "ability" => "view-all-notes", - "model" => Note::class, + 'name' => 'view all notes', + 'ability' => 'view-all-notes', + 'model' => Note::class, ], [ - "name" => "manage notes", - "ability" => "manage-all-notes", - "model" => Note::class, - "depends_on" => [ - 'view-all-notes' - ] - ] - ] + 'name' => 'manage notes', + 'ability' => 'manage-all-notes', + 'model' => Note::class, + 'depends_on' => [ + 'view-all-notes', + ], + ], + ], ]; diff --git a/config/app.php b/config/app.php index ff4ef1ef..c2cac6e4 100644 --- a/config/app.php +++ b/config/app.php @@ -168,7 +168,7 @@ return [ InvoiceShelf\Providers\EventServiceProvider::class, InvoiceShelf\Providers\RouteServiceProvider::class, InvoiceShelf\Providers\DropboxServiceProvider::class, - InvoiceShelf\Providers\ViewServiceProvider::class + InvoiceShelf\Providers\ViewServiceProvider::class, ], /* @@ -220,6 +220,6 @@ return [ 'Flash' => Laracasts\Flash\Flash::class, // 'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class, 'Pusher' => Pusher\Pusher::class, - 'Menu' => Lavary\Menu\Facade::class + 'Menu' => Lavary\Menu\Facade::class, ], ]; diff --git a/config/dompdf.php b/config/dompdf.php index 2203d143..5a9b8390 100644 --- a/config/dompdf.php +++ b/config/dompdf.php @@ -38,7 +38,7 @@ return [ * Times-Roman, Times-Bold, Times-BoldItalic, Times-Italic, * Symbol, ZapfDingbats. */ - "font_dir" => storage_path('fonts/'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782) + 'font_dir' => storage_path('fonts/'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782) /** * The location of the DOMPDF font cache directory @@ -48,7 +48,7 @@ return [ * * Note: This directory must exist and be writable by the webserver process. */ - "font_cache" => storage_path('fonts/'), + 'font_cache' => storage_path('fonts/'), /** * The location of a temporary directory. @@ -57,7 +57,7 @@ return [ * The temporary directory is required to download remote images and when * using the PFDLib back end. */ - "temp_dir" => sys_get_temp_dir(), + 'temp_dir' => sys_get_temp_dir(), /** * ==== IMPORTANT ==== @@ -71,20 +71,19 @@ return [ * direct class use like: * $dompdf = new DOMPDF(); $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output(); */ - "chroot" => realpath(base_path()), + 'chroot' => realpath(base_path()), /** * Whether to enable font subsetting or not. */ - "enable_font_subsetting" => false, + 'enable_font_subsetting' => false, /** * The PDF rendering backend to use * * Valid settings are 'PDFLib', 'CPDF' (the bundled R&OS PDF class), 'GD' and * 'auto'. 'auto' will look for PDFLib and use it if found, or if not it will - * fall back on CPDF. 'GD' renders PDFs to graphic files. {@link - * Canvas_Factory} ultimately determines which rendering class to instantiate + * fall back on CPDF. 'GD' renders PDFs to graphic files. {@link * Canvas_Factory} ultimately determines which rendering class to instantiate * based on this setting. * * Both PDFLib & CPDF rendering backends provide sufficient rendering @@ -106,7 +105,7 @@ return [ * @link http://www.ros.co.nz/pdf * @link http://www.php.net/image */ - "pdf_backend" => "CPDF", + 'pdf_backend' => 'CPDF', /** * PDFlib license key @@ -132,7 +131,7 @@ return [ * the desired content might be different (e.g. screen or projection view of html file). * Therefore allow specification of content here. */ - "default_media_type" => "screen", + 'default_media_type' => 'screen', /** * The default paper size. @@ -141,15 +140,16 @@ return [ * * @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.) */ - "default_paper_size" => "a4", + 'default_paper_size' => 'a4', /** * The default font family * * Used if no suitable fonts can be found. This must exist in the font folder. + * * @var string */ - "default_font" => "DejaVu Sans", + 'default_font' => 'DejaVu Sans', /** * Image DPI setting @@ -184,7 +184,7 @@ return [ * * @var int */ - "dpi" => 96, + 'dpi' => 96, /** * Enable inline PHP @@ -198,7 +198,7 @@ return [ * * @var bool */ - "enable_php" => false, + 'enable_php' => false, /** * Enable inline Javascript @@ -208,7 +208,7 @@ return [ * * @var bool */ - "enable_javascript" => true, + 'enable_javascript' => true, /** * Enable remote file access @@ -227,18 +227,17 @@ return [ * * @var bool */ - "enable_remote" => true, + 'enable_remote' => true, /** * A ratio applied to the fonts height to be more like browsers' line height */ - "font_height_ratio" => 1.1, + 'font_height_ratio' => 1.1, /** * Use the more-than-experimental HTML5 Lib parser */ - "enable_html5_parser" => true, + 'enable_html5_parser' => true, ], - ]; diff --git a/config/invoiceshelf.php b/config/invoiceshelf.php index 6a13ff4a..4dbc05f8 100644 --- a/config/invoiceshelf.php +++ b/config/invoiceshelf.php @@ -52,43 +52,43 @@ return [ * List of languages supported by Crater. */ 'languages' => [ - ["code" => "ar", "name" => "Arabic"], - ["code" => "nl", "name" => "Dutch"], - ["code" => "en", "name" => "English"], - ["code" => "fr", "name" => "French"], - ["code" => "de", "name" => "German"], - ["code" => "ja", "name" => "Japanese"], - ["code" => "it", "name" => "Italian"], - ["code" => "lv", "name" => "Latvian"], - ["code" => "pl", "name" => "Polish"], - ["code" => "pt_BR", "name" => "Portuguese (Brazilian)"], - ["code" => "sr", "name" => "Serbian Latin"], - ["code" => "ko", "name" => "Korean"], - ["code" => "es", "name" => "Spanish"], - ["code" => "sv", "name" => "Svenska"], - ["code" => "sk", "name" => "Slovak"], - ["code" => "vi", "name" => "Tiếng Việt"], - ["code" => "cs", "name" => "Czech"], - ["code" => "el", "name" => "Greek"], - ["code" => "hr", "name" => "Crotian"], - ["code" => "th", "name" => "ไทย"], + ['code' => 'ar', 'name' => 'Arabic'], + ['code' => 'nl', 'name' => 'Dutch'], + ['code' => 'en', 'name' => 'English'], + ['code' => 'fr', 'name' => 'French'], + ['code' => 'de', 'name' => 'German'], + ['code' => 'ja', 'name' => 'Japanese'], + ['code' => 'it', 'name' => 'Italian'], + ['code' => 'lv', 'name' => 'Latvian'], + ['code' => 'pl', 'name' => 'Polish'], + ['code' => 'pt_BR', 'name' => 'Portuguese (Brazilian)'], + ['code' => 'sr', 'name' => 'Serbian Latin'], + ['code' => 'ko', 'name' => 'Korean'], + ['code' => 'es', 'name' => 'Spanish'], + ['code' => 'sv', 'name' => 'Svenska'], + ['code' => 'sk', 'name' => 'Slovak'], + ['code' => 'vi', 'name' => 'Tiếng Việt'], + ['code' => 'cs', 'name' => 'Czech'], + ['code' => 'el', 'name' => 'Greek'], + ['code' => 'hr', 'name' => 'Crotian'], + ['code' => 'th', 'name' => 'ไทย'], ], /* * List of Fiscal Years */ 'fiscal_years' => [ - ['key' => 'january-december' , 'value' => '1-12'], - ['key' => 'february-january' , 'value' => '2-1'], - ['key' => 'march-february' , 'value' => '3-2'], - ['key' => 'april-march' , 'value' => '4-3'], - ['key' => 'may-april' , 'value' => '5-4'], - ['key' => 'june-may' , 'value' => '6-5'], - ['key' => 'july-june' , 'value' => '7-6'], - ['key' => 'august-july' , 'value' => '8-7'], - ['key' => 'september-august' , 'value' => '9-8'], + ['key' => 'january-december', 'value' => '1-12'], + ['key' => 'february-january', 'value' => '2-1'], + ['key' => 'march-february', 'value' => '3-2'], + ['key' => 'april-march', 'value' => '4-3'], + ['key' => 'may-april', 'value' => '5-4'], + ['key' => 'june-may', 'value' => '6-5'], + ['key' => 'july-june', 'value' => '7-6'], + ['key' => 'august-july', 'value' => '8-7'], + ['key' => 'september-august', 'value' => '9-8'], ['key' => 'october-september', 'value' => '10-9'], - ['key' => 'november-october' , 'value' => '11-10'], + ['key' => 'november-october', 'value' => '11-10'], ['key' => 'december-november', 'value' => '12-11'], ], @@ -123,7 +123,7 @@ return [ 'icon' => 'UserIcon', 'owner_only' => false, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.company_information', @@ -133,7 +133,7 @@ return [ 'icon' => 'OfficeBuildingIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.preferences', @@ -143,7 +143,7 @@ return [ 'icon' => 'CogIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.customization', @@ -153,7 +153,7 @@ return [ 'icon' => 'PencilAltIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.roles.title', @@ -163,7 +163,7 @@ return [ 'icon' => 'UserGroupIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.exchange_rate', @@ -173,7 +173,7 @@ return [ 'icon' => 'CashIcon', 'owner_only' => false, 'ability' => 'view-exchange-rate-provider', - 'model' => ExchangeRateProvider::class + 'model' => ExchangeRateProvider::class, ], [ 'title' => 'settings.menu_title.notifications', @@ -183,7 +183,7 @@ return [ 'icon' => 'BellIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.tax_types', @@ -193,7 +193,7 @@ return [ 'icon' => 'CheckCircleIcon', 'owner_only' => false, 'ability' => 'view-tax-type', - 'model' => TaxType::class + 'model' => TaxType::class, ], [ 'title' => 'settings.menu_title.payment_modes', @@ -203,7 +203,7 @@ return [ 'icon' => 'CreditCardIcon', 'owner_only' => false, 'ability' => 'view-payment', - 'model' => Payment::class + 'model' => Payment::class, ], [ 'title' => 'settings.menu_title.custom_fields', @@ -213,7 +213,7 @@ return [ 'icon' => 'CubeIcon', 'owner_only' => false, 'ability' => 'view-custom-field', - 'model' => CustomField::class + 'model' => CustomField::class, ], [ 'title' => 'settings.menu_title.notes', @@ -223,7 +223,7 @@ return [ 'icon' => 'ClipboardCheckIcon', 'owner_only' => false, 'ability' => 'view-all-notes', - 'model' => Note::class + 'model' => Note::class, ], [ 'title' => 'settings.menu_title.expense_category', @@ -233,7 +233,7 @@ return [ 'icon' => 'ClipboardListIcon', 'owner_only' => false, 'ability' => 'view-expense', - 'model' => Expense::class + 'model' => Expense::class, ], [ 'title' => 'settings.mail.mail_config', @@ -243,7 +243,7 @@ return [ 'icon' => 'MailIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.file_disk', @@ -253,7 +253,7 @@ return [ 'icon' => 'FolderIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.backup', @@ -263,7 +263,7 @@ return [ 'icon' => 'DatabaseIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'settings.menu_title.update_app', @@ -273,7 +273,7 @@ return [ 'icon' => 'RefreshIcon', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], ], @@ -289,7 +289,7 @@ return [ 'name' => 'Dashboard', 'owner_only' => false, 'ability' => 'dashboard', - 'model' => '' + 'model' => '', ], [ 'title' => 'navigation.customers', @@ -299,7 +299,7 @@ return [ 'name' => 'Customers', 'owner_only' => false, 'ability' => 'view-customer', - 'model' => Customer::class + 'model' => Customer::class, ], [ 'title' => 'navigation.items', @@ -309,7 +309,7 @@ return [ 'name' => 'Items', 'owner_only' => false, 'ability' => 'view-item', - 'model' => Item::class + 'model' => Item::class, ], [ 'title' => 'navigation.estimates', @@ -319,7 +319,7 @@ return [ 'name' => 'Estimates', 'owner_only' => false, 'ability' => 'view-estimate', - 'model' => Estimate::class + 'model' => Estimate::class, ], [ 'title' => 'navigation.invoices', @@ -329,7 +329,7 @@ return [ 'name' => 'Invoices', 'owner_only' => false, 'ability' => 'view-invoice', - 'model' => Invoice::class + 'model' => Invoice::class, ], [ 'title' => 'navigation.recurring-invoices', @@ -339,7 +339,7 @@ return [ 'name' => 'Recurring Invoices', 'owner_only' => false, 'ability' => 'view-recurring-invoice', - 'model' => RecurringInvoice::class + 'model' => RecurringInvoice::class, ], [ 'title' => 'navigation.payments', @@ -349,7 +349,7 @@ return [ 'name' => 'Payments', 'owner_only' => false, 'ability' => 'view-payment', - 'model' => Payment::class + 'model' => Payment::class, ], [ 'title' => 'navigation.expenses', @@ -359,7 +359,7 @@ return [ 'name' => 'Expenses', 'owner_only' => false, 'ability' => 'view-expense', - 'model' => Expense::class + 'model' => Expense::class, ], [ 'title' => 'navigation.modules', @@ -369,7 +369,7 @@ return [ 'name' => 'Modules', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'navigation.users', @@ -379,7 +379,7 @@ return [ 'name' => 'Users', 'owner_only' => true, 'ability' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'navigation.reports', @@ -389,7 +389,7 @@ return [ 'name' => 'Reports', 'owner_only' => false, 'ability' => 'view-financial-reports', - 'model' => '' + 'model' => '', ], [ 'title' => 'navigation.settings', @@ -399,7 +399,7 @@ return [ 'name' => 'Settings', 'owner_only' => false, 'ability' => '', - 'model' => '' + 'model' => '', ], ], @@ -415,7 +415,7 @@ return [ 'ability' => '', 'owner_only' => false, 'group' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'Invoices', @@ -425,7 +425,7 @@ return [ 'ability' => '', 'owner_only' => false, 'group' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'Estimates', @@ -435,7 +435,7 @@ return [ 'owner_only' => false, 'ability' => '', 'group' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'Payments', @@ -445,7 +445,7 @@ return [ 'owner_only' => false, 'ability' => '', 'group' => '', - 'model' => '' + 'model' => '', ], [ 'title' => 'Settings', @@ -455,7 +455,7 @@ return [ 'owner_only' => false, 'ability' => '', 'group' => '', - 'model' => '' + 'model' => '', ], ], @@ -463,15 +463,15 @@ return [ * List of recurring invoice status */ 'recurring_invoice_status' => [ - 'create_status' => [ + 'create_status' => [ ['key' => 'settings.preferences.active', 'value' => 'ACTIVE'], - ['key' => 'settings.preferences.on_hold', 'value' => 'ON_HOLD'] - ], - 'update_status' => [ + ['key' => 'settings.preferences.on_hold', 'value' => 'ON_HOLD'], + ], + 'update_status' => [ ['key' => 'settings.preferences.active', 'value' => 'ACTIVE'], ['key' => 'settings.preferences.on_hold', 'value' => 'ON_HOLD'], ['key' => 'settings.preferences.completed', 'value' => 'COMPLETED'], - ] + ], ], /* @@ -503,5 +503,5 @@ return [ 'Invoice', 'Payment', 'Expense', - ] + ], ]; diff --git a/config/services.php b/config/services.php index 7b58b78b..9823d9c6 100644 --- a/config/services.php +++ b/config/services.php @@ -63,6 +63,6 @@ return [ ], 'cron_job' => [ - 'auth_token' => env('CRON_JOB_AUTH_TOKEN', 0) + 'auth_token' => env('CRON_JOB_AUTH_TOKEN', 0), ], ]; diff --git a/database/factories/AddressFactory.php b/database/factories/AddressFactory.php index 9dd74916..32802733 100644 --- a/database/factories/AddressFactory.php +++ b/database/factories/AddressFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Address; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class AddressFactory extends Factory { @@ -36,7 +36,7 @@ class AddressFactory extends Factory 'fax' => $this->faker->phoneNumber, 'type' => $this->faker->randomElement([Address::BILLING_TYPE, Address::SHIPPING_TYPE]), 'user_id' => User::factory(), - 'customer_id' => Customer::factory() + 'customer_id' => Customer::factory(), ]; } } diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php index 59b3a0e2..b3e413b3 100644 --- a/database/factories/CompanyFactory.php +++ b/database/factories/CompanyFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class CompanyFactory extends Factory { @@ -26,7 +26,7 @@ class CompanyFactory extends Factory 'unique_hash' => str_random(20), 'name' => $this->faker->name(), 'owner_id' => User::where('role', 'super admin')->first()->id, - 'slug' => $this->faker->word + 'slug' => $this->faker->word, ]; } } diff --git a/database/factories/CompanySettingFactory.php b/database/factories/CompanySettingFactory.php index 847f957d..554bbcb0 100644 --- a/database/factories/CompanySettingFactory.php +++ b/database/factories/CompanySettingFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\CompanySetting; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class CompanySettingFactory extends Factory { diff --git a/database/factories/CustomFieldFactory.php b/database/factories/CustomFieldFactory.php index 6212f755..03b52ec0 100644 --- a/database/factories/CustomFieldFactory.php +++ b/database/factories/CustomFieldFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\CustomField; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class CustomFieldFactory extends Factory { @@ -31,7 +31,7 @@ class CustomFieldFactory extends Factory 'slug' => function (array $item) { return clean_slug($item['model_type'], $item['label']); }, - 'type' => $this->faker->randomElement(['Text', 'Textarea', 'Phone', 'URL', 'Number','Dropdown' , 'Switch', 'Date', 'DateTime', 'Time']), + 'type' => $this->faker->randomElement(['Text', 'Textarea', 'Phone', 'URL', 'Number', 'Dropdown', 'Switch', 'Date', 'DateTime', 'Time']), 'company_id' => User::find(1)->companies()->first()->id, ]; } diff --git a/database/factories/CustomFieldValueFactory.php b/database/factories/CustomFieldValueFactory.php index 2deef757..b50fed12 100644 --- a/database/factories/CustomFieldValueFactory.php +++ b/database/factories/CustomFieldValueFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\CustomField; use InvoiceShelf\Models\CustomFieldValue; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class CustomFieldValueFactory extends Factory { @@ -24,7 +24,7 @@ class CustomFieldValueFactory extends Factory public function definition() { return [ - 'custom_field_valuable_type' => $this->faker->name , + 'custom_field_valuable_type' => $this->faker->name, 'custom_field_valuable_id' => 1, 'type' => $this->faker->name, 'custom_field_id' => CustomField::factory(), diff --git a/database/factories/CustomerFactory.php b/database/factories/CustomerFactory.php index ae670369..4823691d 100644 --- a/database/factories/CustomerFactory.php +++ b/database/factories/CustomerFactory.php @@ -2,11 +2,11 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; +use Illuminate\Support\Facades\Hash; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Facades\Hash; class CustomerFactory extends Factory { diff --git a/database/factories/EmailLogFactory.php b/database/factories/EmailLogFactory.php index df61bf22..1efe9eee 100644 --- a/database/factories/EmailLogFactory.php +++ b/database/factories/EmailLogFactory.php @@ -2,11 +2,11 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\EmailLog; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\Payment; -use Illuminate\Database\Eloquent\Factories\Factory; class EmailLogFactory extends Factory { diff --git a/database/factories/EstimateFactory.php b/database/factories/EstimateFactory.php index 029972c9..e41f7cf6 100644 --- a/database/factories/EstimateFactory.php +++ b/database/factories/EstimateFactory.php @@ -2,12 +2,12 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\User; use InvoiceShelf\Services\SerialNumberFormatter; -use Illuminate\Database\Eloquent\Factories\Factory; class EstimateFactory extends Factory { diff --git a/database/factories/EstimateItemFactory.php b/database/factories/EstimateItemFactory.php index eea17d15..62cd5054 100644 --- a/database/factories/EstimateItemFactory.php +++ b/database/factories/EstimateItemFactory.php @@ -2,11 +2,11 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Estimate; use InvoiceShelf\Models\EstimateItem; use InvoiceShelf\Models\Item; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class EstimateItemFactory extends Factory { @@ -40,7 +40,7 @@ class EstimateItemFactory extends Factory 'company_id' => User::find(1)->companies()->first()->id, 'tax' => $this->faker->randomDigitNotNull, 'total' => function (array $item) { - return ($item['price'] * $item['quantity']); + return $item['price'] * $item['quantity']; }, 'discount_type' => $this->faker->randomElement(['percentage', 'fixed']), 'discount_val' => function (array $estimate) { diff --git a/database/factories/ExchangeRateLogFactory.php b/database/factories/ExchangeRateLogFactory.php index f2f2cb0a..6eaa360c 100644 --- a/database/factories/ExchangeRateLogFactory.php +++ b/database/factories/ExchangeRateLogFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\ExchangeRateLog; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class ExchangeRateLogFactory extends Factory { @@ -27,7 +27,7 @@ class ExchangeRateLogFactory extends Factory 'company_id' => Currency::find(1)->id, 'base_currency_id' => User::find(1)->companies()->first()->id, 'currency_id' => Currency::find(4)->id, - 'exchange_rate' => $this->faker->randomDigitNotNull + 'exchange_rate' => $this->faker->randomDigitNotNull, ]; } } diff --git a/database/factories/ExchangeRateProviderFactory.php b/database/factories/ExchangeRateProviderFactory.php index c5d0ef97..566f8289 100644 --- a/database/factories/ExchangeRateProviderFactory.php +++ b/database/factories/ExchangeRateProviderFactory.php @@ -2,8 +2,8 @@ namespace Database\Factories; -use InvoiceShelf\Models\ExchangeRateProvider; use Illuminate\Database\Eloquent\Factories\Factory; +use InvoiceShelf\Models\ExchangeRateProvider; class ExchangeRateProviderFactory extends Factory { diff --git a/database/factories/ExpenseCategoryFactory.php b/database/factories/ExpenseCategoryFactory.php index 11a3e0f1..78fe6db6 100644 --- a/database/factories/ExpenseCategoryFactory.php +++ b/database/factories/ExpenseCategoryFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\ExpenseCategory; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class ExpenseCategoryFactory extends Factory { diff --git a/database/factories/ExpenseFactory.php b/database/factories/ExpenseFactory.php index 3d22908a..c1849121 100644 --- a/database/factories/ExpenseFactory.php +++ b/database/factories/ExpenseFactory.php @@ -2,12 +2,12 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\Expense; use InvoiceShelf\Models\ExpenseCategory; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class ExpenseFactory extends Factory { diff --git a/database/factories/FileDiskFactory.php b/database/factories/FileDiskFactory.php index 065c90ef..a83a54d6 100644 --- a/database/factories/FileDiskFactory.php +++ b/database/factories/FileDiskFactory.php @@ -2,8 +2,8 @@ namespace Database\Factories; -use InvoiceShelf\Models\FileDisk; use Illuminate\Database\Eloquent\Factories\Factory; +use InvoiceShelf\Models\FileDisk; class FileDiskFactory extends Factory { diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php index 0cebe59f..7ecbb799 100644 --- a/database/factories/InvoiceFactory.php +++ b/database/factories/InvoiceFactory.php @@ -2,13 +2,13 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\Invoice; use InvoiceShelf\Models\RecurringInvoice; use InvoiceShelf\Models\User; use InvoiceShelf\Services\SerialNumberFormatter; -use Illuminate\Database\Eloquent\Factories\Factory; class InvoiceFactory extends Factory { diff --git a/database/factories/InvoiceItemFactory.php b/database/factories/InvoiceItemFactory.php index 82807125..671635a9 100644 --- a/database/factories/InvoiceItemFactory.php +++ b/database/factories/InvoiceItemFactory.php @@ -2,11 +2,11 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\InvoiceItem; use InvoiceShelf\Models\Item; use InvoiceShelf\Models\RecurringInvoice; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class InvoiceItemFactory extends Factory { @@ -38,7 +38,7 @@ class InvoiceItemFactory extends Factory 'company_id' => User::find(1)->companies()->first()->id, 'quantity' => $this->faker->randomDigitNotNull, 'total' => function (array $item) { - return ($item['price'] * $item['quantity']); + return $item['price'] * $item['quantity']; }, 'discount_type' => $this->faker->randomElement(['percentage', 'fixed']), 'discount_val' => function (array $invoice) { diff --git a/database/factories/ItemFactory.php b/database/factories/ItemFactory.php index 84d34114..ba715316 100644 --- a/database/factories/ItemFactory.php +++ b/database/factories/ItemFactory.php @@ -2,11 +2,11 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Item; use InvoiceShelf\Models\Unit; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class ItemFactory extends Factory { @@ -32,7 +32,7 @@ class ItemFactory extends Factory 'unit_id' => Unit::factory(), 'creator_id' => User::where('role', 'super admin')->first()->company_id, 'currency_id' => Currency::find(1)->id, - 'tax_per_item' => $this->faker->randomElement([true, false]) + 'tax_per_item' => $this->faker->randomElement([true, false]), ]; } } diff --git a/database/factories/NoteFactory.php b/database/factories/NoteFactory.php index 4b2d58c7..b3fcc3e3 100644 --- a/database/factories/NoteFactory.php +++ b/database/factories/NoteFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Note; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class NoteFactory extends Factory { diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php index 0c3c81e7..eec4a029 100644 --- a/database/factories/PaymentFactory.php +++ b/database/factories/PaymentFactory.php @@ -2,13 +2,13 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\Payment; use InvoiceShelf\Models\PaymentMethod; use InvoiceShelf\Models\User; use InvoiceShelf\Services\SerialNumberFormatter; -use Illuminate\Database\Eloquent\Factories\Factory; class PaymentFactory extends Factory { diff --git a/database/factories/PaymentMethodFactory.php b/database/factories/PaymentMethodFactory.php index 50759006..f63f4753 100644 --- a/database/factories/PaymentMethodFactory.php +++ b/database/factories/PaymentMethodFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\PaymentMethod; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class PaymentMethodFactory extends Factory { diff --git a/database/factories/RecurringInvoiceFactory.php b/database/factories/RecurringInvoiceFactory.php index 92599211..9f977e32 100644 --- a/database/factories/RecurringInvoiceFactory.php +++ b/database/factories/RecurringInvoiceFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Customer; use InvoiceShelf\Models\RecurringInvoice; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class RecurringInvoiceFactory extends Factory { @@ -41,7 +41,7 @@ class RecurringInvoiceFactory extends Factory 'limit_by' => $this->faker->randomElement(['NONE', 'COUNT', 'DATE']), 'limit_count' => $this->faker->randomDigit, 'limit_date' => $this->faker->date(), - 'exchange_rate' => $this->faker->randomDigitNotNull + 'exchange_rate' => $this->faker->randomDigitNotNull, ]; } } diff --git a/database/factories/TaxFactory.php b/database/factories/TaxFactory.php index 8a37f322..6706779c 100644 --- a/database/factories/TaxFactory.php +++ b/database/factories/TaxFactory.php @@ -2,11 +2,11 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Currency; use InvoiceShelf\Models\Tax; use InvoiceShelf\Models\TaxType; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class TaxFactory extends Factory { diff --git a/database/factories/TaxTypeFactory.php b/database/factories/TaxTypeFactory.php index d4dfcd59..1ad8f074 100644 --- a/database/factories/TaxTypeFactory.php +++ b/database/factories/TaxTypeFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\TaxType; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class TaxTypeFactory extends Factory { diff --git a/database/factories/UnitFactory.php b/database/factories/UnitFactory.php index 3a67d897..05fac5a7 100644 --- a/database/factories/UnitFactory.php +++ b/database/factories/UnitFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; +use Illuminate\Database\Eloquent\Factories\Factory; use InvoiceShelf\Models\Unit; use InvoiceShelf\Models\User; -use Illuminate\Database\Eloquent\Factories\Factory; class UnitFactory extends Factory { diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index bf36c015..7a7cca4e 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; -use InvoiceShelf\Models\Currency; -use InvoiceShelf\Models\User; use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Facades\Hash; +use InvoiceShelf\Models\Currency; +use InvoiceShelf\Models\User; class UserFactory extends Factory { diff --git a/database/migrations/2020_02_01_063235_create_custom_fields_table.php b/database/migrations/2020_02_01_063235_create_custom_fields_table.php index 58731642..480506a4 100644 --- a/database/migrations/2020_02_01_063235_create_custom_fields_table.php +++ b/database/migrations/2020_02_01_063235_create_custom_fields_table.php @@ -45,7 +45,7 @@ class CreateCustomFieldsTable extends Migration { Schema::table('custom_fields', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'company_id' ] ); + $table->dropForeign(['company_id']); } }); Schema::dropIfExists('custom_fields'); diff --git a/database/migrations/2020_02_01_063509_create_custom_field_values_table.php b/database/migrations/2020_02_01_063509_create_custom_field_values_table.php index c03ccc0f..c8fc4c1e 100644 --- a/database/migrations/2020_02_01_063509_create_custom_field_values_table.php +++ b/database/migrations/2020_02_01_063509_create_custom_field_values_table.php @@ -39,7 +39,7 @@ class CreateCustomFieldValuesTable extends Migration */ public function down() { - Schema::table('custom_field_values', function (Blueprint $table){ + Schema::table('custom_field_values', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { $table->dropForeign(['custom_field_id']); $table->dropForeign(['company_id']); diff --git a/database/migrations/2020_10_01_102913_add_company_to_addresses_table.php b/database/migrations/2020_10_01_102913_add_company_to_addresses_table.php index e643a700..e9ce5a43 100644 --- a/database/migrations/2020_10_01_102913_add_company_to_addresses_table.php +++ b/database/migrations/2020_10_01_102913_add_company_to_addresses_table.php @@ -29,7 +29,7 @@ class AddCompanyToAddressesTable extends Migration { Schema::table('addresses', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'company_id' ] ); + $table->dropForeign(['company_id']); } }); } diff --git a/database/migrations/2020_11_23_050206_add_creator_in_invoices_table.php b/database/migrations/2020_11_23_050206_add_creator_in_invoices_table.php index ac330667..e39625fa 100644 --- a/database/migrations/2020_11_23_050206_add_creator_in_invoices_table.php +++ b/database/migrations/2020_11_23_050206_add_creator_in_invoices_table.php @@ -28,7 +28,7 @@ class AddCreatorInInvoicesTable extends Migration { Schema::table('invoices', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'creator_id' ] ); + $table->dropForeign(['creator_id']); } }); } diff --git a/database/migrations/2020_11_23_050252_add_creator_in_estimates_table.php b/database/migrations/2020_11_23_050252_add_creator_in_estimates_table.php index 6963e658..8287f50f 100644 --- a/database/migrations/2020_11_23_050252_add_creator_in_estimates_table.php +++ b/database/migrations/2020_11_23_050252_add_creator_in_estimates_table.php @@ -28,7 +28,7 @@ class AddCreatorInEstimatesTable extends Migration { Schema::table('estimates', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'creator_id' ] ); + $table->dropForeign(['creator_id']); } }); } diff --git a/database/migrations/2020_11_23_050316_add_creator_in_payments_table.php b/database/migrations/2020_11_23_050316_add_creator_in_payments_table.php index ea622243..9f243340 100644 --- a/database/migrations/2020_11_23_050316_add_creator_in_payments_table.php +++ b/database/migrations/2020_11_23_050316_add_creator_in_payments_table.php @@ -28,7 +28,7 @@ class AddCreatorInPaymentsTable extends Migration { Schema::table('payments', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'creator_id' ] ); + $table->dropForeign(['creator_id']); } }); } diff --git a/database/migrations/2020_11_23_050333_add_creator_in_expenses_table.php b/database/migrations/2020_11_23_050333_add_creator_in_expenses_table.php index 676edb80..822c72d5 100644 --- a/database/migrations/2020_11_23_050333_add_creator_in_expenses_table.php +++ b/database/migrations/2020_11_23_050333_add_creator_in_expenses_table.php @@ -28,7 +28,7 @@ class AddCreatorInExpensesTable extends Migration { Schema::table('expenses', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'creator_id' ] ); + $table->dropForeign(['creator_id']); } }); } diff --git a/database/migrations/2020_11_23_050406_add_creator_in_items_table.php b/database/migrations/2020_11_23_050406_add_creator_in_items_table.php index d5d9d279..9287a482 100644 --- a/database/migrations/2020_11_23_050406_add_creator_in_items_table.php +++ b/database/migrations/2020_11_23_050406_add_creator_in_items_table.php @@ -28,7 +28,7 @@ class AddCreatorInItemsTable extends Migration { Schema::table('items', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'creator_id' ] ); + $table->dropForeign(['creator_id']); } }); } diff --git a/database/migrations/2020_11_23_065815_add_creator_in_users_table.php b/database/migrations/2020_11_23_065815_add_creator_in_users_table.php index ba3d6e9f..a4925369 100644 --- a/database/migrations/2020_11_23_065815_add_creator_in_users_table.php +++ b/database/migrations/2020_11_23_065815_add_creator_in_users_table.php @@ -28,7 +28,7 @@ class AddCreatorInUsersTable extends Migration { Schema::table('users', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'creator_id' ] ); + $table->dropForeign(['creator_id']); } }); } diff --git a/database/migrations/2020_12_02_064933_update_crater_version_320.php b/database/migrations/2020_12_02_064933_update_crater_version_320.php index 61981057..8cbe22bf 100644 --- a/database/migrations/2020_12_02_064933_update_crater_version_320.php +++ b/database/migrations/2020_12_02_064933_update_crater_version_320.php @@ -1,7 +1,7 @@ id)->update([ 'company_id' => $user->company_id, - 'user_id' => null + 'user_id' => null, ]); // Update company settings diff --git a/database/migrations/2020_12_08_133131_update_crater_version_401.php b/database/migrations/2020_12_08_133131_update_crater_version_401.php index 799b6dc9..bd5286bb 100644 --- a/database/migrations/2020_12_08_133131_update_crater_version_401.php +++ b/database/migrations/2020_12_08_133131_update_crater_version_401.php @@ -1,7 +1,7 @@ foreign('role_id') - ->references('id')->on(Models::table('roles')) - ->onUpdate('cascade')->onDelete('cascade'); + ->references('id')->on(Models::table('roles')) + ->onUpdate('cascade')->onDelete('cascade'); }); Schema::create(Models::table('permissions'), function (Blueprint $table) { @@ -94,8 +93,8 @@ class CreateBouncerTables extends Migration ); $table->foreign('ability_id') - ->references('id')->on(Models::table('abilities')) - ->onUpdate('cascade')->onDelete('cascade'); + ->references('id')->on(Models::table('abilities')) + ->onUpdate('cascade')->onDelete('cascade'); }); } diff --git a/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php b/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php index 331240ca..6e8977ca 100644 --- a/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php +++ b/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php @@ -1,5 +1,9 @@ id)->update([ 'customer_id' => $newCustomer->id, - 'user_id' => null + 'user_id' => null, ]); Expense::where('user_id', $user->id)->update([ 'customer_id' => $newCustomer->id, - 'user_id' => null + 'user_id' => null, ]); Estimate::where('user_id', $user->id)->update([ 'customer_id' => $newCustomer->id, - 'user_id' => null + 'user_id' => null, ]); Invoice::where('user_id', $user->id)->update([ 'customer_id' => $newCustomer->id, - 'user_id' => null + 'user_id' => null, ]); Payment::where('user_id', $user->id)->update([ 'customer_id' => $newCustomer->id, - 'user_id' => null + 'user_id' => null, ]); CustomFieldValue::where('custom_field_valuable_id', $user->id) ->where('custom_field_valuable_type', 'InvoiceShelf\Models\User') ->update([ 'custom_field_valuable_type' => 'InvoiceShelf\Models\Customer', - 'custom_field_valuable_id' => $newCustomer->id + 'custom_field_valuable_id' => $newCustomer->id, ]); } @@ -69,7 +69,7 @@ class UpdateCustomerIdInAllTables extends Migration if ($customFields) { foreach ($customFields as $customField) { - $customField->model_type = "Customer"; + $customField->model_type = 'Customer'; $customField->slug = Str::upper('CUSTOM_'.$customField->model_type.'_'.Str::slug($customField->label, '_')); $customField->save(); } diff --git a/database/migrations/2021_07_05_100256_change_relationship_of_company.php b/database/migrations/2021_07_05_100256_change_relationship_of_company.php index 4e506e98..8f0e05fa 100644 --- a/database/migrations/2021_07_05_100256_change_relationship_of_company.php +++ b/database/migrations/2021_07_05_100256_change_relationship_of_company.php @@ -1,9 +1,9 @@ dropColumn('slug'); if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'owner_id' ] ); + $table->dropForeign(['owner_id']); } }); } diff --git a/database/migrations/2021_07_08_110940_add_company_to_notes_table.php b/database/migrations/2021_07_08_110940_add_company_to_notes_table.php index f7e2c903..354a1bfb 100644 --- a/database/migrations/2021_07_08_110940_add_company_to_notes_table.php +++ b/database/migrations/2021_07_08_110940_add_company_to_notes_table.php @@ -1,10 +1,10 @@ dropForeign( [ 'company_id' ] ); + $table->dropForeign(['company_id']); } }); } diff --git a/database/migrations/2021_07_09_063712_add_recurring_invoice_id_to_invoices_table.php b/database/migrations/2021_07_09_063712_add_recurring_invoice_id_to_invoices_table.php index 068d512a..45009746 100644 --- a/database/migrations/2021_07_09_063712_add_recurring_invoice_id_to_invoices_table.php +++ b/database/migrations/2021_07_09_063712_add_recurring_invoice_id_to_invoices_table.php @@ -28,7 +28,7 @@ class AddRecurringInvoiceIdToInvoicesTable extends Migration { Schema::table('invoices', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'recurring_invoice_id' ] ); + $table->dropForeign(['recurring_invoice_id']); } $table->dropColumn('recurring_invoice_id'); }); diff --git a/database/migrations/2021_07_09_063755_add_recurring_invoice_id_to_invoice_items_table.php b/database/migrations/2021_07_09_063755_add_recurring_invoice_id_to_invoice_items_table.php index 12261049..094443e6 100644 --- a/database/migrations/2021_07_09_063755_add_recurring_invoice_id_to_invoice_items_table.php +++ b/database/migrations/2021_07_09_063755_add_recurring_invoice_id_to_invoice_items_table.php @@ -29,7 +29,7 @@ class AddRecurringInvoiceIdToInvoiceItemsTable extends Migration { Schema::table('invoice_items', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'recurring_invoice_id' ] ); + $table->dropForeign(['recurring_invoice_id']); } $table->dropColumn('recurring_invoice_id'); }); diff --git a/database/migrations/2021_07_16_072458_add_base_columns_into_invoices_table.php b/database/migrations/2021_07_16_072458_add_base_columns_into_invoices_table.php index 7d45570d..8554ab61 100644 --- a/database/migrations/2021_07_16_072458_add_base_columns_into_invoices_table.php +++ b/database/migrations/2021_07_16_072458_add_base_columns_into_invoices_table.php @@ -37,7 +37,7 @@ class AddBaseColumnsIntoInvoicesTable extends Migration 'base_sub_total', 'base_total', 'base_tax', - 'base_due_amount' + 'base_due_amount', ]); }); } diff --git a/database/migrations/2021_07_16_072925_add_base_columns_into_invoice_items_table.php b/database/migrations/2021_07_16_072925_add_base_columns_into_invoice_items_table.php index dff9811b..32b6837a 100644 --- a/database/migrations/2021_07_16_072925_add_base_columns_into_invoice_items_table.php +++ b/database/migrations/2021_07_16_072925_add_base_columns_into_invoice_items_table.php @@ -35,7 +35,7 @@ class AddBaseColumnsIntoInvoiceItemsTable extends Migration 'exchange_rate', 'base_discount_val', 'base_tax', - 'base_total' + 'base_total', ]); }); } diff --git a/database/migrations/2021_07_16_073441_add_base_columns_into_estimate_items_table.php b/database/migrations/2021_07_16_073441_add_base_columns_into_estimate_items_table.php index 4be5f60a..ea6c3172 100644 --- a/database/migrations/2021_07_16_073441_add_base_columns_into_estimate_items_table.php +++ b/database/migrations/2021_07_16_073441_add_base_columns_into_estimate_items_table.php @@ -35,7 +35,7 @@ class AddBaseColumnsIntoEstimateItemsTable extends Migration 'base_discount_val', 'base_price', 'base_tax', - 'base_total' + 'base_total', ]); }); } diff --git a/database/migrations/2021_07_16_080253_add_currency_id_into_invoices_table.php b/database/migrations/2021_07_16_080253_add_currency_id_into_invoices_table.php index a6f33ffa..ab49fd0b 100644 --- a/database/migrations/2021_07_16_080253_add_currency_id_into_invoices_table.php +++ b/database/migrations/2021_07_16_080253_add_currency_id_into_invoices_table.php @@ -28,7 +28,7 @@ class AddCurrencyIdIntoInvoicesTable extends Migration { Schema::table('invoices', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'currency_id' ] ); + $table->dropForeign(['currency_id']); } $table->dropColumn('currency_id'); }); diff --git a/database/migrations/2021_07_16_080508_add_currency_id_into_payments_table.php b/database/migrations/2021_07_16_080508_add_currency_id_into_payments_table.php index 69954d12..b68ef26d 100644 --- a/database/migrations/2021_07_16_080508_add_currency_id_into_payments_table.php +++ b/database/migrations/2021_07_16_080508_add_currency_id_into_payments_table.php @@ -28,7 +28,7 @@ class AddCurrencyIdIntoPaymentsTable extends Migration { Schema::table('payments', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'currency_id' ] ); + $table->dropForeign(['currency_id']); } $table->dropColumn('currency_id'); }); diff --git a/database/migrations/2021_07_16_080611_add_currency_id_into_items_table.php b/database/migrations/2021_07_16_080611_add_currency_id_into_items_table.php index dea454ac..f2a27429 100644 --- a/database/migrations/2021_07_16_080611_add_currency_id_into_items_table.php +++ b/database/migrations/2021_07_16_080611_add_currency_id_into_items_table.php @@ -28,7 +28,7 @@ class AddCurrencyIdIntoItemsTable extends Migration { Schema::table('items', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'currency_id' ] ); + $table->dropForeign(['currency_id']); } $table->dropColumn('currency_id'); }); diff --git a/database/migrations/2021_07_16_080702_add_currency_id_into_taxes_table.php b/database/migrations/2021_07_16_080702_add_currency_id_into_taxes_table.php index a1fa353c..f21c0ad1 100644 --- a/database/migrations/2021_07_16_080702_add_currency_id_into_taxes_table.php +++ b/database/migrations/2021_07_16_080702_add_currency_id_into_taxes_table.php @@ -28,7 +28,7 @@ class AddCurrencyIdIntoTaxesTable extends Migration { Schema::table('taxes', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'currency_id' ] ); + $table->dropForeign(['currency_id']); } $table->dropColumn('currency_id'); }); diff --git a/database/migrations/2021_07_16_112429_add_currency_id_into_estimates_table.php b/database/migrations/2021_07_16_112429_add_currency_id_into_estimates_table.php index 49fd8a0e..17d6f115 100644 --- a/database/migrations/2021_07_16_112429_add_currency_id_into_estimates_table.php +++ b/database/migrations/2021_07_16_112429_add_currency_id_into_estimates_table.php @@ -28,7 +28,7 @@ class AddCurrencyIdIntoEstimatesTable extends Migration { Schema::table('estimates', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'currency_id' ] ); + $table->dropForeign(['currency_id']); } $table->dropColumn('currency_id'); }); diff --git a/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php b/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php index 5ab5c0ed..34a259be 100644 --- a/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php +++ b/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php @@ -1,9 +1,9 @@ map(function ($invoice) use ($customerSequence) { - $invoiceNumber = explode("-", $invoice->invoice_number); + $invoiceNumber = explode('-', $invoice->invoice_number); $invoice->sequence_number = intval(end($invoiceNumber)); $invoice->customer_sequence_number = $customerSequence; $invoice->save(); @@ -55,7 +55,7 @@ class AddSequenceColumn extends Migration if ($estimates) { $customerSequence = 1; $estimates->map(function ($estimate) use ($customerSequence) { - $estimateNumber = explode("-", $estimate->estimate_number); + $estimateNumber = explode('-', $estimate->estimate_number); $estimate->sequence_number = intval(end($estimateNumber)); $estimate->customer_sequence_number = $customerSequence; $estimate->save(); @@ -67,7 +67,7 @@ class AddSequenceColumn extends Migration if ($estimates) { $customerSequence = 1; $payments->map(function ($payment) use ($customerSequence) { - $paymentNumber = explode("-", $payment->payment_number); + $paymentNumber = explode('-', $payment->payment_number); $payment->sequence_number = intval(end($paymentNumber)); $payment->customer_sequence_number = $customerSequence; $payment->save(); diff --git a/database/migrations/2021_10_06_100539_add_recurring_invoice_id_to_taxes_table.php b/database/migrations/2021_10_06_100539_add_recurring_invoice_id_to_taxes_table.php index 80daf59e..413f3fd6 100644 --- a/database/migrations/2021_10_06_100539_add_recurring_invoice_id_to_taxes_table.php +++ b/database/migrations/2021_10_06_100539_add_recurring_invoice_id_to_taxes_table.php @@ -28,7 +28,7 @@ class AddRecurringInvoiceIdToTaxesTable extends Migration { Schema::table('taxes', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'recurring_invoice_id' ] ); + $table->dropForeign(['recurring_invoice_id']); } $table->dropColumn('recurring_invoice_id'); }); diff --git a/database/migrations/2021_11_13_051127_add_payment_method_to_expense_table.php b/database/migrations/2021_11_13_051127_add_payment_method_to_expense_table.php index ce0190d5..4208af90 100644 --- a/database/migrations/2021_11_13_051127_add_payment_method_to_expense_table.php +++ b/database/migrations/2021_11_13_051127_add_payment_method_to_expense_table.php @@ -28,7 +28,7 @@ class AddPaymentMethodToExpenseTable extends Migration { Schema::table('expenses', function (Blueprint $table) { if (config('database.default') !== 'sqlite') { - $table->dropForeign( [ 'payment_method_id' ] ); + $table->dropForeign(['payment_method_id']); } $table->dropColumn('payment_method_id'); }); diff --git a/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php b/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php index 66d81310..441ee8c2 100644 --- a/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php +++ b/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php @@ -1,10 +1,10 @@ $invoice->sub_total, 'base_total' => $invoice->total, 'base_tax' => $invoice->tax, - 'base_due_amount' => $invoice->due_amount + 'base_due_amount' => $invoice->due_amount, ]); } else { $invoice->update([ @@ -72,7 +72,7 @@ class CalculateBaseValuesForExistingData extends Migration 'base_discount_val' => $estimate->sub_total, 'base_sub_total' => $estimate->sub_total, 'base_total' => $estimate->total, - 'base_tax' => $estimate->tax + 'base_tax' => $estimate->tax, ]); } else { $estimate->update([ @@ -89,7 +89,7 @@ class CalculateBaseValuesForExistingData extends Migration $payment->update([ 'currency_id' => $currency_id, 'base_amount' => $payment->amount, - 'exchange_rate' => 1 + 'exchange_rate' => 1, ]); } else { $payment->update([ @@ -110,7 +110,7 @@ class CalculateBaseValuesForExistingData extends Migration 'base_discount_val' => $item->discount_val * $model->exchange_rate, 'base_price' => $item->price * $model->exchange_rate, 'base_tax' => $item->tax * $model->exchange_rate, - 'base_total' => $item->total * $model->exchange_rate + 'base_total' => $item->total * $model->exchange_rate, ]); $this->taxes($item, $model->currency_id); diff --git a/database/migrations/2021_11_23_092111_add_new_company_settings.php b/database/migrations/2021_11_23_092111_add_new_company_settings.php index 9ce657d4..cc5df0ab 100644 --- a/database/migrations/2021_11_23_092111_add_new_company_settings.php +++ b/database/migrations/2021_11_23_092111_add_new_company_settings.php @@ -1,8 +1,8 @@ 'YES', 'estimate_expiry_date_days' => 7, 'estimate_convert_action' => 'no_action', - 'bulk_exchange_rate_configured' => "NO", + 'bulk_exchange_rate_configured' => 'NO', 'invoice_number_format' => "{{SERIES:{$oldSettings['invoice_prefix']}}}{{DELIMITER:-}}{{SEQUENCE:{$oldSettings['invoice_number_length']}}}", 'estimate_number_format' => "{{SERIES:{$oldSettings['estimate_prefix']}}}{{DELIMITER:-}}{{SEQUENCE:{$oldSettings['estimate_number_length']}}}", 'payment_number_format' => "{{SERIES:{$oldSettings['payment_prefix']}}}{{DELIMITER:-}}{{SEQUENCE:{$oldSettings['payment_number_length']}}}", diff --git a/database/migrations/2021_11_23_093811_update_crater_version_500.php b/database/migrations/2021_11_23_093811_update_crater_version_500.php index 7ac4f4aa..03ca0fbe 100644 --- a/database/migrations/2021_11_23_093811_update_crater_version_500.php +++ b/database/migrations/2021_11_23_093811_update_crater_version_500.php @@ -1,7 +1,7 @@ dropForeign( [ 'transaction_id' ] ); + $table->dropForeign(['transaction_id']); } $table->dropColumn('transaction_id'); }); diff --git a/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php b/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php index a2d9cb99..cb374abe 100644 --- a/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php +++ b/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php @@ -1,9 +1,9 @@ 'Yes', - 'link_expiry_days' => 7 + 'link_expiry_days' => 7, ]; $companies = Company::all(); diff --git a/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php b/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php index 46707914..4492d57d 100644 --- a/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php +++ b/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php @@ -1,9 +1,9 @@ delete(); $countries = [ - ['id' => 1,'code' => 'AF' ,'name' => "Afghanistan",'phonecode' => 93], - ['id' => 2,'code' => 'AL' ,'name' => "Albania",'phonecode' => 355], - ['id' => 3,'code' => 'DZ' ,'name' => "Algeria",'phonecode' => 213], - ['id' => 4,'code' => 'AS' ,'name' => "American Samoa",'phonecode' => 1684], - ['id' => 5,'code' => 'AD' ,'name' => "Andorra",'phonecode' => 376], - ['id' => 6,'code' => 'AO' ,'name' => "Angola",'phonecode' => 244], - ['id' => 7,'code' => 'AI' ,'name' => "Anguilla",'phonecode' => 1264], - ['id' => 8,'code' => 'AQ' ,'name' => "Antarctica",'phonecode' => 0], - ['id' => 9,'code' => 'AG' ,'name' => "Antigua And Barbuda",'phonecode' => 1268], - ['id' => 10,'code' => 'AR','name' => "Argentina",'phonecode' => 54], - ['id' => 11,'code' => 'AM','name' => "Armenia",'phonecode' => 374], - ['id' => 12,'code' => 'AW','name' => "Aruba",'phonecode' => 297], - ['id' => 13,'code' => 'AU','name' => "Australia",'phonecode' => 61], - ['id' => 14,'code' => 'AT','name' => "Austria",'phonecode' => 43], - ['id' => 15,'code' => 'AZ','name' => "Azerbaijan",'phonecode' => 994], - ['id' => 16,'code' => 'BS','name' => "Bahamas The",'phonecode' => 1242], - ['id' => 17,'code' => 'BH','name' => "Bahrain",'phonecode' => 973], - ['id' => 18,'code' => 'BD','name' => "Bangladesh",'phonecode' => 880], - ['id' => 19,'code' => 'BB','name' => "Barbados",'phonecode' => 1246], - ['id' => 20,'code' => 'BY','name' => "Belarus",'phonecode' => 375], - ['id' => 21,'code' => 'BE','name' => "Belgium",'phonecode' => 32], - ['id' => 22,'code' => 'BZ','name' => "Belize",'phonecode' => 501], - ['id' => 23,'code' => 'BJ','name' => "Benin",'phonecode' => 229], - ['id' => 24,'code' => 'BM','name' => "Bermuda",'phonecode' => 1441], - ['id' => 25,'code' => 'BT','name' => "Bhutan",'phonecode' => 975], - ['id' => 26,'code' => 'BO','name' => "Bolivia",'phonecode' => 591], - ['id' => 27,'code' => 'BA','name' => "Bosnia and Herzegovina",'phonecode' => 387], - ['id' => 28,'code' => 'BW','name' => "Botswana",'phonecode' => 267], - ['id' => 29,'code' => 'BV','name' => "Bouvet Island",'phonecode' => 0], - ['id' => 30,'code' => 'BR','name' => "Brazil",'phonecode' => 55], - ['id' => 31,'code' => 'IO','name' => "British Indian Ocean Territory",'phonecode' => 246], - ['id' => 32,'code' => 'BN','name' => "Brunei",'phonecode' => 673], - ['id' => 33,'code' => 'BG','name' => "Bulgaria",'phonecode' => 359], - ['id' => 34,'code' => 'BF','name' => "Burkina Faso",'phonecode' => 226], - ['id' => 35,'code' => 'BI','name' => "Burundi",'phonecode' => 257], - ['id' => 36,'code' => 'KH','name' => "Cambodia",'phonecode' => 855], - ['id' => 37,'code' => 'CM','name' => "Cameroon",'phonecode' => 237], - ['id' => 38,'code' => 'CA','name' => "Canada",'phonecode' => 1], - ['id' => 39,'code' => 'CV','name' => "Cape Verde",'phonecode' => 238], - ['id' => 40,'code' => 'KY','name' => "Cayman Islands",'phonecode' => 1345], - ['id' => 41,'code' => 'CF','name' => "Central African Republic",'phonecode' => 236], - ['id' => 42,'code' => 'TD','name' => "Chad",'phonecode' => 235], - ['id' => 43,'code' => 'CL','name' => "Chile",'phonecode' => 56], - ['id' => 44,'code' => 'CN','name' => "China",'phonecode' => 86], - ['id' => 45,'code' => 'CX','name' => "Christmas Island",'phonecode' => 61], - ['id' => 46,'code' => 'CC','name' => "Cocos (Keeling) Islands",'phonecode' => 672], - ['id' => 47,'code' => 'CO','name' => "Colombia",'phonecode' => 57], - ['id' => 48,'code' => 'KM','name' => "Comoros",'phonecode' => 269], - ['id' => 49,'code' => 'CG','name' => "Congo",'phonecode' => 242], - ['id' => 50,'code' => 'CD','name' => "Congo The Democratic Republic Of The",'phonecode' => 242], - ['id' => 51,'code' => 'CK','name' => "Cook Islands",'phonecode' => 682], - ['id' => 52,'code' => 'CR','name' => "Costa Rica",'phonecode' => 506], - ['id' => 53,'code' => 'CI','name' => "Cote D Ivoire (Ivory Coast)",'phonecode' => 225], - ['id' => 54,'code' => 'HR','name' => "Croatia (Hrvatska)",'phonecode' => 385], - ['id' => 55,'code' => 'CU','name' => "Cuba",'phonecode' => 53], - ['id' => 56,'code' => 'CY','name' => "Cyprus",'phonecode' => 357], - ['id' => 57,'code' => 'CZ','name' => "Czech Republic",'phonecode' => 420], - ['id' => 58,'code' => 'DK','name' => "Denmark",'phonecode' => 45], - ['id' => 59,'code' => 'DJ','name' => "Djibouti",'phonecode' => 253], - ['id' => 60,'code' => 'DM','name' => "Dominica",'phonecode' => 1767], - ['id' => 61,'code' => 'DO','name' => "Dominican Republic",'phonecode' => 1809], - ['id' => 62,'code' => 'TP','name' => "East Timor",'phonecode' => 670], - ['id' => 63,'code' => 'EC','name' => "Ecuador",'phonecode' => 593], - ['id' => 64,'code' => 'EG','name' => "Egypt",'phonecode' => 20], - ['id' => 65,'code' => 'SV','name' => "El Salvador",'phonecode' => 503], - ['id' => 66,'code' => 'GQ','name' => "Equatorial Guinea",'phonecode' => 240], - ['id' => 67,'code' => 'ER','name' => "Eritrea",'phonecode' => 291], - ['id' => 68,'code' => 'EE','name' => "Estonia",'phonecode' => 372], - ['id' => 69,'code' => 'ET','name' => "Ethiopia",'phonecode' => 251], - ['id' => 70,'code' => 'XA','name' => "External Territories of Australia",'phonecode' => 61], - ['id' => 71,'code' => 'FK','name' => "Falkland Islands",'phonecode' => 500], - ['id' => 72,'code' => 'FO','name' => "Faroe Islands",'phonecode' => 298], - ['id' => 73,'code' => 'FJ','name' => "Fiji Islands",'phonecode' => 679], - ['id' => 74,'code' => 'FI','name' => "Finland",'phonecode' => 358], - ['id' => 75,'code' => 'FR','name' => "France",'phonecode' => 33], - ['id' => 76,'code' => 'GF','name' => "French Guiana",'phonecode' => 594], - ['id' => 77,'code' => 'PF','name' => "French Polynesia",'phonecode' => 689], - ['id' => 78,'code' => 'TF','name' => "French Southern Territories",'phonecode' => 0], - ['id' => 79,'code' => 'GA','name' => "Gabon",'phonecode' => 241], - ['id' => 80,'code' => 'GM','name' => "Gambia The",'phonecode' => 220], - ['id' => 81,'code' => 'GE','name' => "Georgia",'phonecode' => 995], - ['id' => 82,'code' => 'DE','name' => "Germany",'phonecode' => 49], - ['id' => 83,'code' => 'GH','name' => "Ghana",'phonecode' => 233], - ['id' => 84,'code' => 'GI','name' => "Gibraltar",'phonecode' => 350], - ['id' => 85,'code' => 'GR','name' => "Greece",'phonecode' => 30], - ['id' => 86,'code' => 'GL','name' => "Greenland",'phonecode' => 299], - ['id' => 87,'code' => 'GD','name' => "Grenada",'phonecode' => 1473], - ['id' => 88,'code' => 'GP','name' => "Guadeloupe",'phonecode' => 590], - ['id' => 89,'code' => 'GU','name' => "Guam",'phonecode' => 1671], - ['id' => 90,'code' => 'GT','name' => "Guatemala",'phonecode' => 502], - ['id' => 91,'code' => 'XU','name' => "Guernsey and Alderney",'phonecode' => 44], - ['id' => 92,'code' => 'GN','name' => "Guinea",'phonecode' => 224], - ['id' => 93,'code' => 'GW','name' => "Guinea-Bissau",'phonecode' => 245], - ['id' => 94,'code' => 'GY','name' => "Guyana",'phonecode' => 592], - ['id' => 95,'code' => 'HT','name' => "Haiti",'phonecode' => 509], - ['id' => 96,'code' => 'HM','name' => "Heard and McDonald Islands",'phonecode' => 0], - ['id' => 97,'code' => 'HN','name' => "Honduras",'phonecode' => 504], - ['id' => 98,'code' => 'HK','name' => "Hong Kong S.A.R.",'phonecode' => 852], - ['id' => 99,'code' => 'HU','name' => "Hungary",'phonecode' => 36], - ['id' => 100,'code' => 'IS','name' => "Iceland",'phonecode' => 354], - ['id' => 101,'code' => 'IN','name' => "India",'phonecode' => 91], - ['id' => 102,'code' => 'ID','name' => "Indonesia",'phonecode' => 62], - ['id' => 103,'code' => 'IR','name' => "Iran",'phonecode' => 98], - ['id' => 104,'code' => 'IQ','name' => "Iraq",'phonecode' => 964], - ['id' => 105,'code' => 'IE','name' => "Ireland",'phonecode' => 353], - ['id' => 106,'code' => 'IL','name' => "Israel",'phonecode' => 972], - ['id' => 107,'code' => 'IT','name' => "Italy",'phonecode' => 39], - ['id' => 108,'code' => 'JM','name' => "Jamaica",'phonecode' => 1876], - ['id' => 109,'code' => 'JP','name' => "Japan",'phonecode' => 81], - ['id' => 110,'code' => 'XJ','name' => "Jersey",'phonecode' => 44], - ['id' => 111,'code' => 'JO','name' => "Jordan",'phonecode' => 962], - ['id' => 112,'code' => 'KZ','name' => "Kazakhstan",'phonecode' => 7], - ['id' => 113,'code' => 'KE','name' => "Kenya",'phonecode' => 254], - ['id' => 114,'code' => 'KI','name' => "Kiribati",'phonecode' => 686], - ['id' => 115,'code' => 'KP','name' => "Korea North",'phonecode' => 850], - ['id' => 116,'code' => 'KR','name' => "Korea South",'phonecode' => 82], - ['id' => 117,'code' => 'KW','name' => "Kuwait",'phonecode' => 965], - ['id' => 118,'code' => 'KG','name' => "Kyrgyzstan",'phonecode' => 996], - ['id' => 119,'code' => 'LA','name' => "Laos",'phonecode' => 856], - ['id' => 120,'code' => 'LV','name' => "Latvia",'phonecode' => 371], - ['id' => 121,'code' => 'LB','name' => "Lebanon",'phonecode' => 961], - ['id' => 122,'code' => 'LS','name' => "Lesotho",'phonecode' => 266], - ['id' => 123,'code' => 'LR','name' => "Liberia",'phonecode' => 231], - ['id' => 124,'code' => 'LY','name' => "Libya",'phonecode' => 218], - ['id' => 125,'code' => 'LI','name' => "Liechtenstein",'phonecode' => 423], - ['id' => 126,'code' => 'LT','name' => "Lithuania",'phonecode' => 370], - ['id' => 127,'code' => 'LU','name' => "Luxembourg",'phonecode' => 352], - ['id' => 128,'code' => 'MO','name' => "Macau S.A.R.",'phonecode' => 853], - ['id' => 129,'code' => 'MK','name' => "Macedonia",'phonecode' => 389], - ['id' => 130,'code' => 'MG','name' => "Madagascar",'phonecode' => 261], - ['id' => 131,'code' => 'MW','name' => "Malawi",'phonecode' => 265], - ['id' => 132,'code' => 'MY','name' => "Malaysia",'phonecode' => 60], - ['id' => 133,'code' => 'MV','name' => "Maldives",'phonecode' => 960], - ['id' => 134,'code' => 'ML','name' => "Mali",'phonecode' => 223], - ['id' => 135,'code' => 'MT','name' => "Malta",'phonecode' => 356], - ['id' => 136,'code' => 'XM','name' => "Man (Isle of)",'phonecode' => 44], - ['id' => 137,'code' => 'MH','name' => "Marshall Islands",'phonecode' => 692], - ['id' => 138,'code' => 'MQ','name' => "Martinique",'phonecode' => 596], - ['id' => 139,'code' => 'MR','name' => "Mauritania",'phonecode' => 222], - ['id' => 140,'code' => 'MU','name' => "Mauritius",'phonecode' => 230], - ['id' => 141,'code' => 'YT','name' => "Mayotte",'phonecode' => 269], - ['id' => 142,'code' => 'MX','name' => "Mexico",'phonecode' => 52], - ['id' => 143,'code' => 'FM','name' => "Micronesia",'phonecode' => 691], - ['id' => 144,'code' => 'MD','name' => "Moldova",'phonecode' => 373], - ['id' => 145,'code' => 'MC','name' => "Monaco",'phonecode' => 377], - ['id' => 146,'code' => 'MN','name' => "Mongolia",'phonecode' => 976], - ['id' => 147,'code' => 'MS','name' => "Montserrat",'phonecode' => 1664], - ['id' => 148,'code' => 'MA','name' => "Morocco",'phonecode' => 212], - ['id' => 149,'code' => 'MZ','name' => "Mozambique",'phonecode' => 258], - ['id' => 150,'code' => 'MM','name' => "Myanmar",'phonecode' => 95], - ['id' => 151,'code' => 'NA','name' => "Namibia",'phonecode' => 264], - ['id' => 152,'code' => 'NR','name' => "Nauru",'phonecode' => 674], - ['id' => 153,'code' => 'NP','name' => "Nepal",'phonecode' => 977], - ['id' => 154,'code' => 'AN','name' => "Netherlands Antilles",'phonecode' => 599], - ['id' => 155,'code' => 'NL','name' => "Netherlands",'phonecode' => 31], - ['id' => 156,'code' => 'NC','name' => "New Caledonia",'phonecode' => 687], - ['id' => 157,'code' => 'NZ','name' => "New Zealand",'phonecode' => 64], - ['id' => 158,'code' => 'NI','name' => "Nicaragua",'phonecode' => 505], - ['id' => 159,'code' => 'NE','name' => "Niger",'phonecode' => 227], - ['id' => 160,'code' => 'NG','name' => "Nigeria",'phonecode' => 234], - ['id' => 161,'code' => 'NU','name' => "Niue",'phonecode' => 683], - ['id' => 162,'code' => 'NF','name' => "Norfolk Island",'phonecode' => 672], - ['id' => 163,'code' => 'MP','name' => "Northern Mariana Islands",'phonecode' => 1670], - ['id' => 164,'code' => 'NO','name' => "Norway",'phonecode' => 47], - ['id' => 165,'code' => 'OM','name' => "Oman",'phonecode' => 968], - ['id' => 166,'code' => 'PK','name' => "Pakistan",'phonecode' => 92], - ['id' => 167,'code' => 'PW','name' => "Palau",'phonecode' => 680], - ['id' => 168,'code' => 'PS','name' => "Palestinian Territory Occupied",'phonecode' => 970], - ['id' => 169,'code' => 'PA','name' => "Panama",'phonecode' => 507], - ['id' => 170,'code' => 'PG','name' => "Papua new Guinea",'phonecode' => 675], - ['id' => 171,'code' => 'PY','name' => "Paraguay",'phonecode' => 595], - ['id' => 172,'code' => 'PE','name' => "Peru",'phonecode' => 51], - ['id' => 173,'code' => 'PH','name' => "Philippines",'phonecode' => 63], - ['id' => 174,'code' => 'PN','name' => "Pitcairn Island",'phonecode' => 0], - ['id' => 175,'code' => 'PL','name' => "Poland",'phonecode' => 48], - ['id' => 176,'code' => 'PT','name' => "Portugal",'phonecode' => 351], - ['id' => 177,'code' => 'PR','name' => "Puerto Rico",'phonecode' => 1787], - ['id' => 178,'code' => 'QA','name' => "Qatar",'phonecode' => 974], - ['id' => 179,'code' => 'RE','name' => "Reunion",'phonecode' => 262], - ['id' => 180,'code' => 'RO','name' => "Romania",'phonecode' => 40], - ['id' => 181,'code' => 'RU','name' => "Russia",'phonecode' => 70], - ['id' => 182,'code' => 'RW','name' => "Rwanda",'phonecode' => 250], - ['id' => 183,'code' => 'SH','name' => "Saint Helena",'phonecode' => 290], - ['id' => 184,'code' => 'KN','name' => "Saint Kitts And Nevis",'phonecode' => 1869], - ['id' => 185,'code' => 'LC','name' => "Saint Lucia",'phonecode' => 1758], - ['id' => 186,'code' => 'PM','name' => "Saint Pierre and Miquelon",'phonecode' => 508], - ['id' => 187,'code' => 'VC','name' => "Saint Vincent And The Grenadines",'phonecode' => 1784], - ['id' => 188,'code' => 'WS','name' => "Samoa",'phonecode' => 684], - ['id' => 189,'code' => 'SM','name' => "San Marino",'phonecode' => 378], - ['id' => 190,'code' => 'ST','name' => "Sao Tome and Principe",'phonecode' => 239], - ['id' => 191,'code' => 'SA','name' => "Saudi Arabia",'phonecode' => 966], - ['id' => 192,'code' => 'SN','name' => "Senegal",'phonecode' => 221], - ['id' => 193,'code' => 'RS','name' => "Serbia",'phonecode' => 381], - ['id' => 194,'code' => 'SC','name' => "Seychelles",'phonecode' => 248], - ['id' => 195,'code' => 'SL','name' => "Sierra Leone",'phonecode' => 232], - ['id' => 196,'code' => 'SG','name' => "Singapore",'phonecode' => 65], - ['id' => 197,'code' => 'SK','name' => "Slovakia",'phonecode' => 421], - ['id' => 198,'code' => 'SI','name' => "Slovenia",'phonecode' => 386], - ['id' => 199,'code' => 'XG','name' => "Smaller Territories of the UK",'phonecode' => 44], - ['id' => 200,'code' => 'SB','name' => "Solomon Islands",'phonecode' => 677], - ['id' => 201,'code' => 'SO','name' => "Somalia",'phonecode' => 252], - ['id' => 202,'code' => 'ZA','name' => "South Africa",'phonecode' => 27], - ['id' => 203,'code' => 'GS','name' => "South Georgia",'phonecode' => 0], - ['id' => 204,'code' => 'SS','name' => "South Sudan",'phonecode' => 211], - ['id' => 205,'code' => 'ES','name' => "Spain",'phonecode' => 34], - ['id' => 206,'code' => 'LK','name' => "Sri Lanka",'phonecode' => 94], - ['id' => 207,'code' => 'SD','name' => "Sudan",'phonecode' => 249], - ['id' => 208,'code' => 'SR','name' => "Suriname",'phonecode' => 597], - ['id' => 209,'code' => 'SJ','name' => "Svalbard And Jan Mayen Islands",'phonecode' => 47], - ['id' => 210,'code' => 'SZ','name' => "Swaziland",'phonecode' => 268], - ['id' => 211,'code' => 'SE','name' => "Sweden",'phonecode' => 46], - ['id' => 212,'code' => 'CH','name' => "Switzerland",'phonecode' => 41], - ['id' => 213,'code' => 'SY','name' => "Syria",'phonecode' => 963], - ['id' => 214,'code' => 'TW','name' => "Taiwan",'phonecode' => 886], - ['id' => 215,'code' => 'TJ','name' => "Tajikistan",'phonecode' => 992], - ['id' => 216,'code' => 'TZ','name' => "Tanzania",'phonecode' => 255], - ['id' => 217,'code' => 'TH','name' => "Thailand",'phonecode' => 66], - ['id' => 218,'code' => 'TG','name' => "Togo",'phonecode' => 228], - ['id' => 219,'code' => 'TK','name' => "Tokelau",'phonecode' => 690], - ['id' => 220,'code' => 'TO','name' => "Tonga",'phonecode' => 676], - ['id' => 221,'code' => 'TT','name' => "Trinidad And Tobago",'phonecode' => 1868], - ['id' => 222,'code' => 'TN','name' => "Tunisia",'phonecode' => 216], - ['id' => 223,'code' => 'TR','name' => "Turkey",'phonecode' => 90], - ['id' => 224,'code' => 'TM','name' => "Turkmenistan",'phonecode' => 7370], - ['id' => 225,'code' => 'TC','name' => "Turks And Caicos Islands",'phonecode' => 1649], - ['id' => 226,'code' => 'TV','name' => "Tuvalu",'phonecode' => 688], - ['id' => 227,'code' => 'UG','name' => "Uganda",'phonecode' => 256], - ['id' => 228,'code' => 'UA','name' => "Ukraine",'phonecode' => 380], - ['id' => 229,'code' => 'AE','name' => "United Arab Emirates",'phonecode' => 971], - ['id' => 230,'code' => 'GB','name' => "United Kingdom",'phonecode' => 44], - ['id' => 231,'code' => 'US','name' => "United States",'phonecode' => 1], - ['id' => 232,'code' => 'UM','name' => "United States Minor Outlying Islands",'phonecode' => 1], - ['id' => 233,'code' => 'UY','name' => "Uruguay",'phonecode' => 598], - ['id' => 234,'code' => 'UZ','name' => "Uzbekistan",'phonecode' => 998], - ['id' => 235,'code' => 'VU','name' => "Vanuatu",'phonecode' => 678], - ['id' => 236,'code' => 'VA','name' => "Vatican City State (Holy See)",'phonecode' => 39], - ['id' => 237,'code' => 'VE','name' => "Venezuela",'phonecode' => 58], - ['id' => 238,'code' => 'VN','name' => "Vietnam",'phonecode' => 84], - ['id' => 239,'code' => 'VG','name' => "Virgin Islands (British)",'phonecode' => 1284], - ['id' => 240,'code' => 'VI','name' => "Virgin Islands (US)",'phonecode' => 1340], - ['id' => 241,'code' => 'WF','name' => "Wallis And Futuna Islands",'phonecode' => 681], - ['id' => 242,'code' => 'EH','name' => "Western Sahara",'phonecode' => 212], - ['id' => 243,'code' => 'YE','name' => "Yemen",'phonecode' => 967], - ['id' => 244,'code' => 'YU','name' => "Yugoslavia",'phonecode' => 38], - ['id' => 245,'code' => 'ZM','name' => "Zambia",'phonecode' => 260], - ['id' => 246,'code' => 'ZW','name' => "Zimbabwe",'phonecode' => 263], + ['id' => 1, 'code' => 'AF', 'name' => 'Afghanistan', 'phonecode' => 93], + ['id' => 2, 'code' => 'AL', 'name' => 'Albania', 'phonecode' => 355], + ['id' => 3, 'code' => 'DZ', 'name' => 'Algeria', 'phonecode' => 213], + ['id' => 4, 'code' => 'AS', 'name' => 'American Samoa', 'phonecode' => 1684], + ['id' => 5, 'code' => 'AD', 'name' => 'Andorra', 'phonecode' => 376], + ['id' => 6, 'code' => 'AO', 'name' => 'Angola', 'phonecode' => 244], + ['id' => 7, 'code' => 'AI', 'name' => 'Anguilla', 'phonecode' => 1264], + ['id' => 8, 'code' => 'AQ', 'name' => 'Antarctica', 'phonecode' => 0], + ['id' => 9, 'code' => 'AG', 'name' => 'Antigua And Barbuda', 'phonecode' => 1268], + ['id' => 10, 'code' => 'AR', 'name' => 'Argentina', 'phonecode' => 54], + ['id' => 11, 'code' => 'AM', 'name' => 'Armenia', 'phonecode' => 374], + ['id' => 12, 'code' => 'AW', 'name' => 'Aruba', 'phonecode' => 297], + ['id' => 13, 'code' => 'AU', 'name' => 'Australia', 'phonecode' => 61], + ['id' => 14, 'code' => 'AT', 'name' => 'Austria', 'phonecode' => 43], + ['id' => 15, 'code' => 'AZ', 'name' => 'Azerbaijan', 'phonecode' => 994], + ['id' => 16, 'code' => 'BS', 'name' => 'Bahamas The', 'phonecode' => 1242], + ['id' => 17, 'code' => 'BH', 'name' => 'Bahrain', 'phonecode' => 973], + ['id' => 18, 'code' => 'BD', 'name' => 'Bangladesh', 'phonecode' => 880], + ['id' => 19, 'code' => 'BB', 'name' => 'Barbados', 'phonecode' => 1246], + ['id' => 20, 'code' => 'BY', 'name' => 'Belarus', 'phonecode' => 375], + ['id' => 21, 'code' => 'BE', 'name' => 'Belgium', 'phonecode' => 32], + ['id' => 22, 'code' => 'BZ', 'name' => 'Belize', 'phonecode' => 501], + ['id' => 23, 'code' => 'BJ', 'name' => 'Benin', 'phonecode' => 229], + ['id' => 24, 'code' => 'BM', 'name' => 'Bermuda', 'phonecode' => 1441], + ['id' => 25, 'code' => 'BT', 'name' => 'Bhutan', 'phonecode' => 975], + ['id' => 26, 'code' => 'BO', 'name' => 'Bolivia', 'phonecode' => 591], + ['id' => 27, 'code' => 'BA', 'name' => 'Bosnia and Herzegovina', 'phonecode' => 387], + ['id' => 28, 'code' => 'BW', 'name' => 'Botswana', 'phonecode' => 267], + ['id' => 29, 'code' => 'BV', 'name' => 'Bouvet Island', 'phonecode' => 0], + ['id' => 30, 'code' => 'BR', 'name' => 'Brazil', 'phonecode' => 55], + ['id' => 31, 'code' => 'IO', 'name' => 'British Indian Ocean Territory', 'phonecode' => 246], + ['id' => 32, 'code' => 'BN', 'name' => 'Brunei', 'phonecode' => 673], + ['id' => 33, 'code' => 'BG', 'name' => 'Bulgaria', 'phonecode' => 359], + ['id' => 34, 'code' => 'BF', 'name' => 'Burkina Faso', 'phonecode' => 226], + ['id' => 35, 'code' => 'BI', 'name' => 'Burundi', 'phonecode' => 257], + ['id' => 36, 'code' => 'KH', 'name' => 'Cambodia', 'phonecode' => 855], + ['id' => 37, 'code' => 'CM', 'name' => 'Cameroon', 'phonecode' => 237], + ['id' => 38, 'code' => 'CA', 'name' => 'Canada', 'phonecode' => 1], + ['id' => 39, 'code' => 'CV', 'name' => 'Cape Verde', 'phonecode' => 238], + ['id' => 40, 'code' => 'KY', 'name' => 'Cayman Islands', 'phonecode' => 1345], + ['id' => 41, 'code' => 'CF', 'name' => 'Central African Republic', 'phonecode' => 236], + ['id' => 42, 'code' => 'TD', 'name' => 'Chad', 'phonecode' => 235], + ['id' => 43, 'code' => 'CL', 'name' => 'Chile', 'phonecode' => 56], + ['id' => 44, 'code' => 'CN', 'name' => 'China', 'phonecode' => 86], + ['id' => 45, 'code' => 'CX', 'name' => 'Christmas Island', 'phonecode' => 61], + ['id' => 46, 'code' => 'CC', 'name' => 'Cocos (Keeling) Islands', 'phonecode' => 672], + ['id' => 47, 'code' => 'CO', 'name' => 'Colombia', 'phonecode' => 57], + ['id' => 48, 'code' => 'KM', 'name' => 'Comoros', 'phonecode' => 269], + ['id' => 49, 'code' => 'CG', 'name' => 'Congo', 'phonecode' => 242], + ['id' => 50, 'code' => 'CD', 'name' => 'Congo The Democratic Republic Of The', 'phonecode' => 242], + ['id' => 51, 'code' => 'CK', 'name' => 'Cook Islands', 'phonecode' => 682], + ['id' => 52, 'code' => 'CR', 'name' => 'Costa Rica', 'phonecode' => 506], + ['id' => 53, 'code' => 'CI', 'name' => 'Cote D Ivoire (Ivory Coast)', 'phonecode' => 225], + ['id' => 54, 'code' => 'HR', 'name' => 'Croatia (Hrvatska)', 'phonecode' => 385], + ['id' => 55, 'code' => 'CU', 'name' => 'Cuba', 'phonecode' => 53], + ['id' => 56, 'code' => 'CY', 'name' => 'Cyprus', 'phonecode' => 357], + ['id' => 57, 'code' => 'CZ', 'name' => 'Czech Republic', 'phonecode' => 420], + ['id' => 58, 'code' => 'DK', 'name' => 'Denmark', 'phonecode' => 45], + ['id' => 59, 'code' => 'DJ', 'name' => 'Djibouti', 'phonecode' => 253], + ['id' => 60, 'code' => 'DM', 'name' => 'Dominica', 'phonecode' => 1767], + ['id' => 61, 'code' => 'DO', 'name' => 'Dominican Republic', 'phonecode' => 1809], + ['id' => 62, 'code' => 'TP', 'name' => 'East Timor', 'phonecode' => 670], + ['id' => 63, 'code' => 'EC', 'name' => 'Ecuador', 'phonecode' => 593], + ['id' => 64, 'code' => 'EG', 'name' => 'Egypt', 'phonecode' => 20], + ['id' => 65, 'code' => 'SV', 'name' => 'El Salvador', 'phonecode' => 503], + ['id' => 66, 'code' => 'GQ', 'name' => 'Equatorial Guinea', 'phonecode' => 240], + ['id' => 67, 'code' => 'ER', 'name' => 'Eritrea', 'phonecode' => 291], + ['id' => 68, 'code' => 'EE', 'name' => 'Estonia', 'phonecode' => 372], + ['id' => 69, 'code' => 'ET', 'name' => 'Ethiopia', 'phonecode' => 251], + ['id' => 70, 'code' => 'XA', 'name' => 'External Territories of Australia', 'phonecode' => 61], + ['id' => 71, 'code' => 'FK', 'name' => 'Falkland Islands', 'phonecode' => 500], + ['id' => 72, 'code' => 'FO', 'name' => 'Faroe Islands', 'phonecode' => 298], + ['id' => 73, 'code' => 'FJ', 'name' => 'Fiji Islands', 'phonecode' => 679], + ['id' => 74, 'code' => 'FI', 'name' => 'Finland', 'phonecode' => 358], + ['id' => 75, 'code' => 'FR', 'name' => 'France', 'phonecode' => 33], + ['id' => 76, 'code' => 'GF', 'name' => 'French Guiana', 'phonecode' => 594], + ['id' => 77, 'code' => 'PF', 'name' => 'French Polynesia', 'phonecode' => 689], + ['id' => 78, 'code' => 'TF', 'name' => 'French Southern Territories', 'phonecode' => 0], + ['id' => 79, 'code' => 'GA', 'name' => 'Gabon', 'phonecode' => 241], + ['id' => 80, 'code' => 'GM', 'name' => 'Gambia The', 'phonecode' => 220], + ['id' => 81, 'code' => 'GE', 'name' => 'Georgia', 'phonecode' => 995], + ['id' => 82, 'code' => 'DE', 'name' => 'Germany', 'phonecode' => 49], + ['id' => 83, 'code' => 'GH', 'name' => 'Ghana', 'phonecode' => 233], + ['id' => 84, 'code' => 'GI', 'name' => 'Gibraltar', 'phonecode' => 350], + ['id' => 85, 'code' => 'GR', 'name' => 'Greece', 'phonecode' => 30], + ['id' => 86, 'code' => 'GL', 'name' => 'Greenland', 'phonecode' => 299], + ['id' => 87, 'code' => 'GD', 'name' => 'Grenada', 'phonecode' => 1473], + ['id' => 88, 'code' => 'GP', 'name' => 'Guadeloupe', 'phonecode' => 590], + ['id' => 89, 'code' => 'GU', 'name' => 'Guam', 'phonecode' => 1671], + ['id' => 90, 'code' => 'GT', 'name' => 'Guatemala', 'phonecode' => 502], + ['id' => 91, 'code' => 'XU', 'name' => 'Guernsey and Alderney', 'phonecode' => 44], + ['id' => 92, 'code' => 'GN', 'name' => 'Guinea', 'phonecode' => 224], + ['id' => 93, 'code' => 'GW', 'name' => 'Guinea-Bissau', 'phonecode' => 245], + ['id' => 94, 'code' => 'GY', 'name' => 'Guyana', 'phonecode' => 592], + ['id' => 95, 'code' => 'HT', 'name' => 'Haiti', 'phonecode' => 509], + ['id' => 96, 'code' => 'HM', 'name' => 'Heard and McDonald Islands', 'phonecode' => 0], + ['id' => 97, 'code' => 'HN', 'name' => 'Honduras', 'phonecode' => 504], + ['id' => 98, 'code' => 'HK', 'name' => 'Hong Kong S.A.R.', 'phonecode' => 852], + ['id' => 99, 'code' => 'HU', 'name' => 'Hungary', 'phonecode' => 36], + ['id' => 100, 'code' => 'IS', 'name' => 'Iceland', 'phonecode' => 354], + ['id' => 101, 'code' => 'IN', 'name' => 'India', 'phonecode' => 91], + ['id' => 102, 'code' => 'ID', 'name' => 'Indonesia', 'phonecode' => 62], + ['id' => 103, 'code' => 'IR', 'name' => 'Iran', 'phonecode' => 98], + ['id' => 104, 'code' => 'IQ', 'name' => 'Iraq', 'phonecode' => 964], + ['id' => 105, 'code' => 'IE', 'name' => 'Ireland', 'phonecode' => 353], + ['id' => 106, 'code' => 'IL', 'name' => 'Israel', 'phonecode' => 972], + ['id' => 107, 'code' => 'IT', 'name' => 'Italy', 'phonecode' => 39], + ['id' => 108, 'code' => 'JM', 'name' => 'Jamaica', 'phonecode' => 1876], + ['id' => 109, 'code' => 'JP', 'name' => 'Japan', 'phonecode' => 81], + ['id' => 110, 'code' => 'XJ', 'name' => 'Jersey', 'phonecode' => 44], + ['id' => 111, 'code' => 'JO', 'name' => 'Jordan', 'phonecode' => 962], + ['id' => 112, 'code' => 'KZ', 'name' => 'Kazakhstan', 'phonecode' => 7], + ['id' => 113, 'code' => 'KE', 'name' => 'Kenya', 'phonecode' => 254], + ['id' => 114, 'code' => 'KI', 'name' => 'Kiribati', 'phonecode' => 686], + ['id' => 115, 'code' => 'KP', 'name' => 'Korea North', 'phonecode' => 850], + ['id' => 116, 'code' => 'KR', 'name' => 'Korea South', 'phonecode' => 82], + ['id' => 117, 'code' => 'KW', 'name' => 'Kuwait', 'phonecode' => 965], + ['id' => 118, 'code' => 'KG', 'name' => 'Kyrgyzstan', 'phonecode' => 996], + ['id' => 119, 'code' => 'LA', 'name' => 'Laos', 'phonecode' => 856], + ['id' => 120, 'code' => 'LV', 'name' => 'Latvia', 'phonecode' => 371], + ['id' => 121, 'code' => 'LB', 'name' => 'Lebanon', 'phonecode' => 961], + ['id' => 122, 'code' => 'LS', 'name' => 'Lesotho', 'phonecode' => 266], + ['id' => 123, 'code' => 'LR', 'name' => 'Liberia', 'phonecode' => 231], + ['id' => 124, 'code' => 'LY', 'name' => 'Libya', 'phonecode' => 218], + ['id' => 125, 'code' => 'LI', 'name' => 'Liechtenstein', 'phonecode' => 423], + ['id' => 126, 'code' => 'LT', 'name' => 'Lithuania', 'phonecode' => 370], + ['id' => 127, 'code' => 'LU', 'name' => 'Luxembourg', 'phonecode' => 352], + ['id' => 128, 'code' => 'MO', 'name' => 'Macau S.A.R.', 'phonecode' => 853], + ['id' => 129, 'code' => 'MK', 'name' => 'Macedonia', 'phonecode' => 389], + ['id' => 130, 'code' => 'MG', 'name' => 'Madagascar', 'phonecode' => 261], + ['id' => 131, 'code' => 'MW', 'name' => 'Malawi', 'phonecode' => 265], + ['id' => 132, 'code' => 'MY', 'name' => 'Malaysia', 'phonecode' => 60], + ['id' => 133, 'code' => 'MV', 'name' => 'Maldives', 'phonecode' => 960], + ['id' => 134, 'code' => 'ML', 'name' => 'Mali', 'phonecode' => 223], + ['id' => 135, 'code' => 'MT', 'name' => 'Malta', 'phonecode' => 356], + ['id' => 136, 'code' => 'XM', 'name' => 'Man (Isle of)', 'phonecode' => 44], + ['id' => 137, 'code' => 'MH', 'name' => 'Marshall Islands', 'phonecode' => 692], + ['id' => 138, 'code' => 'MQ', 'name' => 'Martinique', 'phonecode' => 596], + ['id' => 139, 'code' => 'MR', 'name' => 'Mauritania', 'phonecode' => 222], + ['id' => 140, 'code' => 'MU', 'name' => 'Mauritius', 'phonecode' => 230], + ['id' => 141, 'code' => 'YT', 'name' => 'Mayotte', 'phonecode' => 269], + ['id' => 142, 'code' => 'MX', 'name' => 'Mexico', 'phonecode' => 52], + ['id' => 143, 'code' => 'FM', 'name' => 'Micronesia', 'phonecode' => 691], + ['id' => 144, 'code' => 'MD', 'name' => 'Moldova', 'phonecode' => 373], + ['id' => 145, 'code' => 'MC', 'name' => 'Monaco', 'phonecode' => 377], + ['id' => 146, 'code' => 'MN', 'name' => 'Mongolia', 'phonecode' => 976], + ['id' => 147, 'code' => 'MS', 'name' => 'Montserrat', 'phonecode' => 1664], + ['id' => 148, 'code' => 'MA', 'name' => 'Morocco', 'phonecode' => 212], + ['id' => 149, 'code' => 'MZ', 'name' => 'Mozambique', 'phonecode' => 258], + ['id' => 150, 'code' => 'MM', 'name' => 'Myanmar', 'phonecode' => 95], + ['id' => 151, 'code' => 'NA', 'name' => 'Namibia', 'phonecode' => 264], + ['id' => 152, 'code' => 'NR', 'name' => 'Nauru', 'phonecode' => 674], + ['id' => 153, 'code' => 'NP', 'name' => 'Nepal', 'phonecode' => 977], + ['id' => 154, 'code' => 'AN', 'name' => 'Netherlands Antilles', 'phonecode' => 599], + ['id' => 155, 'code' => 'NL', 'name' => 'Netherlands', 'phonecode' => 31], + ['id' => 156, 'code' => 'NC', 'name' => 'New Caledonia', 'phonecode' => 687], + ['id' => 157, 'code' => 'NZ', 'name' => 'New Zealand', 'phonecode' => 64], + ['id' => 158, 'code' => 'NI', 'name' => 'Nicaragua', 'phonecode' => 505], + ['id' => 159, 'code' => 'NE', 'name' => 'Niger', 'phonecode' => 227], + ['id' => 160, 'code' => 'NG', 'name' => 'Nigeria', 'phonecode' => 234], + ['id' => 161, 'code' => 'NU', 'name' => 'Niue', 'phonecode' => 683], + ['id' => 162, 'code' => 'NF', 'name' => 'Norfolk Island', 'phonecode' => 672], + ['id' => 163, 'code' => 'MP', 'name' => 'Northern Mariana Islands', 'phonecode' => 1670], + ['id' => 164, 'code' => 'NO', 'name' => 'Norway', 'phonecode' => 47], + ['id' => 165, 'code' => 'OM', 'name' => 'Oman', 'phonecode' => 968], + ['id' => 166, 'code' => 'PK', 'name' => 'Pakistan', 'phonecode' => 92], + ['id' => 167, 'code' => 'PW', 'name' => 'Palau', 'phonecode' => 680], + ['id' => 168, 'code' => 'PS', 'name' => 'Palestinian Territory Occupied', 'phonecode' => 970], + ['id' => 169, 'code' => 'PA', 'name' => 'Panama', 'phonecode' => 507], + ['id' => 170, 'code' => 'PG', 'name' => 'Papua new Guinea', 'phonecode' => 675], + ['id' => 171, 'code' => 'PY', 'name' => 'Paraguay', 'phonecode' => 595], + ['id' => 172, 'code' => 'PE', 'name' => 'Peru', 'phonecode' => 51], + ['id' => 173, 'code' => 'PH', 'name' => 'Philippines', 'phonecode' => 63], + ['id' => 174, 'code' => 'PN', 'name' => 'Pitcairn Island', 'phonecode' => 0], + ['id' => 175, 'code' => 'PL', 'name' => 'Poland', 'phonecode' => 48], + ['id' => 176, 'code' => 'PT', 'name' => 'Portugal', 'phonecode' => 351], + ['id' => 177, 'code' => 'PR', 'name' => 'Puerto Rico', 'phonecode' => 1787], + ['id' => 178, 'code' => 'QA', 'name' => 'Qatar', 'phonecode' => 974], + ['id' => 179, 'code' => 'RE', 'name' => 'Reunion', 'phonecode' => 262], + ['id' => 180, 'code' => 'RO', 'name' => 'Romania', 'phonecode' => 40], + ['id' => 181, 'code' => 'RU', 'name' => 'Russia', 'phonecode' => 70], + ['id' => 182, 'code' => 'RW', 'name' => 'Rwanda', 'phonecode' => 250], + ['id' => 183, 'code' => 'SH', 'name' => 'Saint Helena', 'phonecode' => 290], + ['id' => 184, 'code' => 'KN', 'name' => 'Saint Kitts And Nevis', 'phonecode' => 1869], + ['id' => 185, 'code' => 'LC', 'name' => 'Saint Lucia', 'phonecode' => 1758], + ['id' => 186, 'code' => 'PM', 'name' => 'Saint Pierre and Miquelon', 'phonecode' => 508], + ['id' => 187, 'code' => 'VC', 'name' => 'Saint Vincent And The Grenadines', 'phonecode' => 1784], + ['id' => 188, 'code' => 'WS', 'name' => 'Samoa', 'phonecode' => 684], + ['id' => 189, 'code' => 'SM', 'name' => 'San Marino', 'phonecode' => 378], + ['id' => 190, 'code' => 'ST', 'name' => 'Sao Tome and Principe', 'phonecode' => 239], + ['id' => 191, 'code' => 'SA', 'name' => 'Saudi Arabia', 'phonecode' => 966], + ['id' => 192, 'code' => 'SN', 'name' => 'Senegal', 'phonecode' => 221], + ['id' => 193, 'code' => 'RS', 'name' => 'Serbia', 'phonecode' => 381], + ['id' => 194, 'code' => 'SC', 'name' => 'Seychelles', 'phonecode' => 248], + ['id' => 195, 'code' => 'SL', 'name' => 'Sierra Leone', 'phonecode' => 232], + ['id' => 196, 'code' => 'SG', 'name' => 'Singapore', 'phonecode' => 65], + ['id' => 197, 'code' => 'SK', 'name' => 'Slovakia', 'phonecode' => 421], + ['id' => 198, 'code' => 'SI', 'name' => 'Slovenia', 'phonecode' => 386], + ['id' => 199, 'code' => 'XG', 'name' => 'Smaller Territories of the UK', 'phonecode' => 44], + ['id' => 200, 'code' => 'SB', 'name' => 'Solomon Islands', 'phonecode' => 677], + ['id' => 201, 'code' => 'SO', 'name' => 'Somalia', 'phonecode' => 252], + ['id' => 202, 'code' => 'ZA', 'name' => 'South Africa', 'phonecode' => 27], + ['id' => 203, 'code' => 'GS', 'name' => 'South Georgia', 'phonecode' => 0], + ['id' => 204, 'code' => 'SS', 'name' => 'South Sudan', 'phonecode' => 211], + ['id' => 205, 'code' => 'ES', 'name' => 'Spain', 'phonecode' => 34], + ['id' => 206, 'code' => 'LK', 'name' => 'Sri Lanka', 'phonecode' => 94], + ['id' => 207, 'code' => 'SD', 'name' => 'Sudan', 'phonecode' => 249], + ['id' => 208, 'code' => 'SR', 'name' => 'Suriname', 'phonecode' => 597], + ['id' => 209, 'code' => 'SJ', 'name' => 'Svalbard And Jan Mayen Islands', 'phonecode' => 47], + ['id' => 210, 'code' => 'SZ', 'name' => 'Swaziland', 'phonecode' => 268], + ['id' => 211, 'code' => 'SE', 'name' => 'Sweden', 'phonecode' => 46], + ['id' => 212, 'code' => 'CH', 'name' => 'Switzerland', 'phonecode' => 41], + ['id' => 213, 'code' => 'SY', 'name' => 'Syria', 'phonecode' => 963], + ['id' => 214, 'code' => 'TW', 'name' => 'Taiwan', 'phonecode' => 886], + ['id' => 215, 'code' => 'TJ', 'name' => 'Tajikistan', 'phonecode' => 992], + ['id' => 216, 'code' => 'TZ', 'name' => 'Tanzania', 'phonecode' => 255], + ['id' => 217, 'code' => 'TH', 'name' => 'Thailand', 'phonecode' => 66], + ['id' => 218, 'code' => 'TG', 'name' => 'Togo', 'phonecode' => 228], + ['id' => 219, 'code' => 'TK', 'name' => 'Tokelau', 'phonecode' => 690], + ['id' => 220, 'code' => 'TO', 'name' => 'Tonga', 'phonecode' => 676], + ['id' => 221, 'code' => 'TT', 'name' => 'Trinidad And Tobago', 'phonecode' => 1868], + ['id' => 222, 'code' => 'TN', 'name' => 'Tunisia', 'phonecode' => 216], + ['id' => 223, 'code' => 'TR', 'name' => 'Turkey', 'phonecode' => 90], + ['id' => 224, 'code' => 'TM', 'name' => 'Turkmenistan', 'phonecode' => 7370], + ['id' => 225, 'code' => 'TC', 'name' => 'Turks And Caicos Islands', 'phonecode' => 1649], + ['id' => 226, 'code' => 'TV', 'name' => 'Tuvalu', 'phonecode' => 688], + ['id' => 227, 'code' => 'UG', 'name' => 'Uganda', 'phonecode' => 256], + ['id' => 228, 'code' => 'UA', 'name' => 'Ukraine', 'phonecode' => 380], + ['id' => 229, 'code' => 'AE', 'name' => 'United Arab Emirates', 'phonecode' => 971], + ['id' => 230, 'code' => 'GB', 'name' => 'United Kingdom', 'phonecode' => 44], + ['id' => 231, 'code' => 'US', 'name' => 'United States', 'phonecode' => 1], + ['id' => 232, 'code' => 'UM', 'name' => 'United States Minor Outlying Islands', 'phonecode' => 1], + ['id' => 233, 'code' => 'UY', 'name' => 'Uruguay', 'phonecode' => 598], + ['id' => 234, 'code' => 'UZ', 'name' => 'Uzbekistan', 'phonecode' => 998], + ['id' => 235, 'code' => 'VU', 'name' => 'Vanuatu', 'phonecode' => 678], + ['id' => 236, 'code' => 'VA', 'name' => 'Vatican City State (Holy See)', 'phonecode' => 39], + ['id' => 237, 'code' => 'VE', 'name' => 'Venezuela', 'phonecode' => 58], + ['id' => 238, 'code' => 'VN', 'name' => 'Vietnam', 'phonecode' => 84], + ['id' => 239, 'code' => 'VG', 'name' => 'Virgin Islands (British)', 'phonecode' => 1284], + ['id' => 240, 'code' => 'VI', 'name' => 'Virgin Islands (US)', 'phonecode' => 1340], + ['id' => 241, 'code' => 'WF', 'name' => 'Wallis And Futuna Islands', 'phonecode' => 681], + ['id' => 242, 'code' => 'EH', 'name' => 'Western Sahara', 'phonecode' => 212], + ['id' => 243, 'code' => 'YE', 'name' => 'Yemen', 'phonecode' => 967], + ['id' => 244, 'code' => 'YU', 'name' => 'Yugoslavia', 'phonecode' => 38], + ['id' => 245, 'code' => 'ZM', 'name' => 'Zambia', 'phonecode' => 260], + ['id' => 246, 'code' => 'ZW', 'name' => 'Zimbabwe', 'phonecode' => 263], ]; DB::table('countries')->insert($countries); } diff --git a/database/seeders/CurrenciesTableSeeder.php b/database/seeders/CurrenciesTableSeeder.php index cb0121a0..dd9bc60e 100644 --- a/database/seeders/CurrenciesTableSeeder.php +++ b/database/seeders/CurrenciesTableSeeder.php @@ -2,8 +2,8 @@ namespace Database\Seeders; -use InvoiceShelf\Models\Currency; use Illuminate\Database\Seeder; +use InvoiceShelf\Models\Currency; class CurrenciesTableSeeder extends Seeder { @@ -618,7 +618,6 @@ class CurrenciesTableSeeder extends Seeder ], ]; - foreach ($currencies as $currency) { Currency::create($currency); } diff --git a/database/seeders/DemoSeeder.php b/database/seeders/DemoSeeder.php index bbc98c8f..818bfa14 100644 --- a/database/seeders/DemoSeeder.php +++ b/database/seeders/DemoSeeder.php @@ -2,10 +2,10 @@ namespace Database\Seeders; +use Illuminate\Database\Seeder; use InvoiceShelf\Models\Address; use InvoiceShelf\Models\Setting; use InvoiceShelf\Models\User; -use Illuminate\Database\Seeder; class DemoSeeder extends Seeder { diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php index a4712b16..d5d602fe 100644 --- a/database/seeders/UsersTableSeeder.php +++ b/database/seeders/UsersTableSeeder.php @@ -2,10 +2,10 @@ namespace Database\Seeders; +use Illuminate\Database\Seeder; use InvoiceShelf\Models\Company; use InvoiceShelf\Models\Setting; use InvoiceShelf\Models\User; -use Illuminate\Database\Seeder; use Silber\Bouncer\BouncerFacade; use Vinkla\Hashids\Facades\Hashids; @@ -28,7 +28,7 @@ class UsersTableSeeder extends Seeder $company = Company::create([ 'name' => 'xyz', 'owner_id' => $user->id, - 'slug' => 'xyz' + 'slug' => 'xyz', ]); $company->unique_hash = Hashids::connection(Company::class)->encode($company->id); diff --git a/public/index.php b/public/index.php index 26e536a5..d99f5424 100644 --- a/public/index.php +++ b/public/index.php @@ -3,10 +3,8 @@ /** * Laravel - A PHP Framework For Web Artisans * - * @package Laravel * @author Taylor Otwell */ - define('LARAVEL_START', microtime(true)); if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) { diff --git a/routes/api.php b/routes/api.php index f3782cb8..60938590 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,5 +1,6 @@ name('ping'); - // Version 1 endpoints // -------------------------------------- Route::prefix('/v1')->group(function () { - // App version // ---------------------------------- Route::get('/app/version', AppVersionController::class); - // Authentication & Password Reset //---------------------------------- @@ -149,19 +145,17 @@ Route::prefix('/v1')->group(function () { Route::post('logout', [AuthController::class, 'logout'])->middleware('auth:sanctum'); // Send reset password mail - Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware("throttle:10,2"); + Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware('throttle:10,2'); // handle reset password form process Route::post('reset/password', [ResetPasswordController::class, 'reset']); }); - // Countries //---------------------------------- Route::get('/countries', CountriesController::class); - // Onboarding //---------------------------------- @@ -185,7 +179,6 @@ Route::prefix('/v1')->group(function () { Route::post('/finish', FinishController::class); }); - Route::middleware(['auth:sanctum', 'company'])->group(function () { Route::middleware(['bouncer'])->group(function () { @@ -203,19 +196,16 @@ Route::prefix('/v1')->group(function () { Route::post('/bulk-update-exchange-rate', BulkExchangeRateController::class); }); - // Dashboard //---------------------------------- Route::get('/dashboard', DashboardController::class); - // Auth check //---------------------------------- Route::get('/auth/check', [AuthController::class, 'check']); - // Search users //---------------------------------- @@ -223,7 +213,6 @@ Route::prefix('/v1')->group(function () { Route::get('/search/user', SearchUsersController::class); - // MISC //---------------------------------- @@ -241,7 +230,6 @@ Route::prefix('/v1')->group(function () { Route::get('/current-company', AdminCompanyController::class); - // Customers //---------------------------------- @@ -251,7 +239,6 @@ Route::prefix('/v1')->group(function () { Route::resource('customers', CustomersController::class); - // Items //---------------------------------- @@ -261,7 +248,6 @@ Route::prefix('/v1')->group(function () { Route::resource('units', UnitsController::class); - // Invoices //------------------------------------------------- @@ -279,7 +265,6 @@ Route::prefix('/v1')->group(function () { Route::apiResource('invoices', InvoicesController::class); - // Recurring Invoice //------------------------------------------------- @@ -289,7 +274,6 @@ Route::prefix('/v1')->group(function () { Route::apiResource('recurring-invoices', RecurringInvoiceController::class); - // Estimates //------------------------------------------------- @@ -307,7 +291,6 @@ Route::prefix('/v1')->group(function () { Route::apiResource('estimates', EstimatesController::class); - // Expenses //---------------------------------- @@ -321,7 +304,6 @@ Route::prefix('/v1')->group(function () { Route::apiResource('categories', ExpenseCategoriesController::class); - // Payments //---------------------------------- @@ -335,13 +317,11 @@ Route::prefix('/v1')->group(function () { Route::apiResource('payment-methods', PaymentMethodsController::class); - // Custom fields //---------------------------------- Route::resource('custom-fields', CustomFieldsController::class); - // Backup & Disk //---------------------------------- @@ -353,7 +333,6 @@ Route::prefix('/v1')->group(function () { Route::get('/disk/drivers', [DiskController::class, 'getDiskDrivers']); - // Exchange Rate //---------------------------------- @@ -367,11 +346,9 @@ Route::prefix('/v1')->group(function () { Route::apiResource('exchange-rate-providers', ExchangeRateProviderController::class); - // Settings //---------------------------------- - Route::get('/me', [CompanyController::class, 'getUser']); Route::put('/me', [CompanyController::class, 'updateProfile']); @@ -382,7 +359,6 @@ Route::prefix('/v1')->group(function () { Route::post('/me/upload-avatar', [CompanyController::class, 'uploadAvatar']); - Route::put('/company', [CompanyController::class, 'updateCompany']); Route::post('/company/upload-logo', [CompanyController::class, 'uploadCompanyLogo']); @@ -397,7 +373,6 @@ Route::prefix('/v1')->group(function () { Route::get('/company/has-transactions', CompanyCurrencyCheckTransactionsController::class); - // Mails //---------------------------------- @@ -413,13 +388,11 @@ Route::prefix('/v1')->group(function () { Route::apiResource('notes', NotesController::class); - // Tax Types //---------------------------------- Route::apiResource('tax-types', TaxTypesController::class); - // Roles //---------------------------------- @@ -428,7 +401,6 @@ Route::prefix('/v1')->group(function () { Route::apiResource('roles', RolesController::class); }); - // Self Update //---------------------------------- @@ -457,7 +429,6 @@ Route::prefix('/v1')->group(function () { Route::get('companies', [CompaniesController::class, 'getUserCompanies']); - // Users //---------------------------------- @@ -465,7 +436,6 @@ Route::prefix('/v1')->group(function () { Route::apiResource('/users', UsersController::class); - // Modules //---------------------------------- @@ -492,10 +462,8 @@ Route::prefix('/v1')->group(function () { }); }); - Route::prefix('/{company:slug}/customer')->group(function () { - // Authentication & Password Reset //---------------------------------- @@ -508,7 +476,6 @@ Route::prefix('/v1')->group(function () { Route::post('reset/password', [AuthResetPasswordController::class, 'reset'])->name('customer.password.reset'); }); - // Invoices, Estimates, Payments and Expenses endpoints //------------------------------------------------------- @@ -523,7 +490,7 @@ Route::prefix('/v1')->group(function () { Route::post('/estimate/{estimate}/status', CustomerAcceptEstimateController::class); - Route::get('estimates', [ CustomerEstimatesController::class, 'index']); + Route::get('estimates', [CustomerEstimatesController::class, 'index']); Route::get('estimates/{id}', [CustomerEstimatesController::class, 'show']); diff --git a/routes/web.php b/routes/web.php index 5d10e347..2dd96277 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,5 +1,6 @@ logout(); }); - // Customer auth // ---------------------------------------------- @@ -47,7 +45,6 @@ Route::post('/{company:slug}/customer/logout', function () { Auth::guard('customer')->logout(); }); - // Report PDF & Expense Endpoints // ---------------------------------------------- @@ -73,14 +70,12 @@ Route::middleware('auth:sanctum')->prefix('reports')->group(function () { //---------------------------------- Route::get('/profit-loss/{hash}', ProfitLossReportController::class); - // download expense receipt // ------------------------------------------------- Route::get('/expenses/{expense}/download-receipt', DownloadReceiptController::class); Route::get('/expenses/{expense}/receipt', ShowReceiptController::class); }); - // PDF Endpoints // ---------------------------------------------- @@ -99,7 +94,6 @@ Route::middleware('pdf-auth')->group(function () { Route::get('/payments/pdf/{payment:unique_hash}', PaymentPdfController::class); }); - // customer pdf endpoints for invoice, estimate and Payment // ------------------------------------------------- @@ -114,7 +108,6 @@ Route::prefix('/customer')->group(function () { Route::get('/payments/view/{email_log:token}', [CustomerPaymentPdfController::class, 'getPdf'])->name('payment'); }); - // Setup for installation of app // ---------------------------------------------- @@ -122,7 +115,6 @@ Route::get('/installation', function () { return view('app'); })->name('install')->middleware('redirect-if-installed'); - // Move other http requests to the Vue App // ------------------------------------------------- @@ -134,7 +126,7 @@ Route::get('{company:slug}/customer/{vue?}', function (Company $company) { return view('app')->with([ 'customer_logo' => get_company_setting('customer_portal_logo', $company->id), 'current_theme' => get_company_setting('customer_portal_theme', $company->id), - 'customer_page_title' => get_company_setting('customer_portal_page_title', $company->id) + 'customer_page_title' => get_company_setting('customer_portal_page_title', $company->id), ]); })->where('vue', '[\/\w\.-]*')->name('customer.dashboard')->middleware(['install']); diff --git a/server.php b/server.php index 5fb6379e..b07fa44b 100644 --- a/server.php +++ b/server.php @@ -3,10 +3,8 @@ /** * Laravel - A PHP Framework For Web Artisans * - * @package Laravel * @author Taylor Otwell */ - $uri = urldecode( parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) ); diff --git a/tests/Feature/Admin/BackupTest.php b/tests/Feature/Admin/BackupTest.php index a8b81dbf..0526fcfd 100644 --- a/tests/Feature/Admin/BackupTest.php +++ b/tests/Feature/Admin/BackupTest.php @@ -1,11 +1,12 @@ $disk->id, ]; - $response = postJson("/api/v1/backups", $data); + $response = postJson('/api/v1/backups', $data); Queue::assertPushed(CreateBackupJob::class); $response = getJson("/api/v1/backups?disk={$disk->driver}&&file_disk_id={$disk->id}"); $response->assertStatus(200)->assertJson([ - "disks" => [ - "local", + 'disks' => [ + 'local', ], ]); }); diff --git a/tests/Feature/Admin/CompanySettingTest.php b/tests/Feature/Admin/CompanySettingTest.php index 948d6c6f..8e2c4d93 100644 --- a/tests/Feature/Admin/CompanySettingTest.php +++ b/tests/Feature/Admin/CompanySettingTest.php @@ -1,5 +1,6 @@ assertOk(); }); - test('update profile using a form request', function () { $this->assertActionUsesFormRequest( CompanyController::class, @@ -77,8 +77,8 @@ test('update company', function () { 'phone' => '1234567890', 'zip' => '112233', 'address' => [ - 'country_id' => 2 - ] + 'country_id' => 2, + ], ]; putJson('api/v1/company', $company) @@ -125,7 +125,7 @@ test('update settings', function () { test('update settings without currency setting', function () { $settings = [ - 'notification_email' => 'noreply@crater.in', + 'notification_email' => 'noreply@invoiceshelf.com', ]; $response = postJson('/api/v1/company/settings', ['settings' => $settings]); @@ -170,10 +170,9 @@ test('update currency settings after company has currency and transactions is no $response->assertOK() ->assertJson([ 'success' => false, - 'message' => 'Cannot update company currency after transactions are created.' + 'message' => 'Cannot update company currency after transactions are created.', ]); - $this->assertDatabaseHas('company_settings', [ 'option' => 'currency', 'value' => 1, diff --git a/tests/Feature/Admin/CompanyTest.php b/tests/Feature/Admin/CompanyTest.php index 0d65c274..be3c234f 100644 --- a/tests/Feature/Admin/CompanyTest.php +++ b/tests/Feature/Admin/CompanyTest.php @@ -1,11 +1,12 @@ raw([ 'currency' => 12, 'address' => [ - 'country_id' => 12 - ] + 'country_id' => 12, + ], ]); postJson('/api/v1/companies', $company) @@ -44,7 +45,7 @@ test('store company', function () { $company = collect($company) ->only([ - 'name' + 'name', ]) ->toArray(); @@ -52,7 +53,7 @@ test('store company', function () { }); test('delete company', function () { - postJson('/api/v1/companies/delete', ["xyz"]) + postJson('/api/v1/companies/delete', ['xyz']) ->assertStatus(422); }); diff --git a/tests/Feature/Admin/ConfigTest.php b/tests/Feature/Admin/ConfigTest.php index dc551df9..2a64132d 100644 --- a/tests/Feature/Admin/ConfigTest.php +++ b/tests/Feature/Admin/ConfigTest.php @@ -1,8 +1,9 @@ assertOk(); }); diff --git a/tests/Feature/Admin/CustomFieldTest.php b/tests/Feature/Admin/CustomFieldTest.php index fe5c3eb3..5a71c7e5 100644 --- a/tests/Feature/Admin/CustomFieldTest.php +++ b/tests/Feature/Admin/CustomFieldTest.php @@ -1,11 +1,12 @@ raw([ 'shipping' => [ 'name' => 'newName', - 'address_street_1' => 'address' + 'address_street_1' => 'address', ], 'billing' => [ 'name' => 'newName', - 'address_street_1' => 'address' - ] + 'address_street_1' => 'address', + ], ]); postJson('api/v1/customers', $customer) @@ -60,7 +61,7 @@ test('create customer', function () { $this->assertDatabaseHas('customers', [ 'name' => $customer['name'], - 'email' => $customer['email'] + 'email' => $customer['email'], ]); }); @@ -80,7 +81,7 @@ test('get customer', function () { $this->assertDatabaseHas('customers', [ 'id' => $customer->id, 'name' => $customer['name'], - 'email' => $customer['email'] + 'email' => $customer['email'], ]); $response->assertOk(); @@ -92,22 +93,22 @@ test('update customer', function () { $customer1 = Customer::factory()->raw([ 'shipping' => [ 'name' => 'newName', - 'address_street_1' => 'address' + 'address_street_1' => 'address', ], 'billing' => [ 'name' => 'newName', - 'address_street_1' => 'address' - ] + 'address_street_1' => 'address', + ], ]); $response = putJson('api/v1/customers/'.$customer->id, $customer1); $customer1 = collect($customer1) ->only([ - 'email' + 'email', ]) ->merge([ - 'creator_id' => Auth::id() + 'creator_id' => Auth::id(), ]) ->toArray(); diff --git a/tests/Feature/Admin/DashboardTest.php b/tests/Feature/Admin/DashboardTest.php index bc53b09a..2a57ccb2 100644 --- a/tests/Feature/Admin/DashboardTest.php +++ b/tests/Feature/Admin/DashboardTest.php @@ -1,8 +1,9 @@ raw([ 'items' => [ EstimateItem::factory()->raw([ - 'estimate_id' => $estimate->id + 'estimate_id' => $estimate->id, ]), ], 'taxes' => [ @@ -302,7 +302,7 @@ test('create estimate with tax per item', function () { ]); $this->assertDatabaseHas('taxes', [ - 'tax_type_id' => $estimate['items'][0]['taxes'][0]['tax_type_id'] + 'tax_type_id' => $estimate['items'][0]['taxes'][0]['tax_type_id'], ]); }); @@ -358,12 +358,12 @@ test('create estimate with EUR currency', function () { $this->assertDatabaseHas('taxes', [ 'tax_type_id' => $estimate['taxes'][0]['tax_type_id'], - 'amount' => $estimate['tax'] + 'amount' => $estimate['tax'], ]); $this->assertDatabaseHas('estimate_items', [ 'item_id' => $estimate['items'][0]['item_id'], - 'name' => $estimate['items'][0]['name'] + 'name' => $estimate['items'][0]['name'], ]); }); diff --git a/tests/Feature/Admin/ExpenseCategoryTest.php b/tests/Feature/Admin/ExpenseCategoryTest.php index 012bcfb4..73f44f6e 100644 --- a/tests/Feature/Admin/ExpenseCategoryTest.php +++ b/tests/Feature/Admin/ExpenseCategoryTest.php @@ -1,11 +1,12 @@ assertDatabaseHas('file_disks', $disk); }); - test('update file disk', function () { $disk = FileDisk::factory()->create(); @@ -50,7 +50,6 @@ test('update file disk', function () { $this->assertDatabaseHas('file_disks', $disk2); }); - test('get disk', function () { $disk = FileDisk::factory()->create(); @@ -60,7 +59,7 @@ test('get disk', function () { }); test('get drivers', function () { - $response = getJson("/api/v1/disk/drivers"); + $response = getJson('/api/v1/disk/drivers'); $response->assertStatus(200); }); diff --git a/tests/Feature/Admin/InvoiceTest.php b/tests/Feature/Admin/InvoiceTest.php index e1d7afa6..d686db7a 100644 --- a/tests/Feature/Admin/InvoiceTest.php +++ b/tests/Feature/Admin/InvoiceTest.php @@ -1,5 +1,6 @@ assertDatabaseHas('invoice_items', [ 'item_id' => $invoice['items'][0]['item_id'], - 'name' => $invoice['items'][0]['name'] + 'name' => $invoice['items'][0]['name'], ]); }); @@ -84,7 +84,7 @@ test('create invoice as sent', function () { $this->assertDatabaseHas('invoice_items', [ 'item_id' => $invoice['items'][0]['item_id'], - 'name' => $invoice['items'][0]['name'] + 'name' => $invoice['items'][0]['name'], ]); }); @@ -122,7 +122,7 @@ test('update invoice', function () { $this->assertDatabaseHas('invoice_items', [ 'item_id' => $invoice2['items'][0]['item_id'], - 'name' => $invoice2['items'][0]['name'] + 'name' => $invoice2['items'][0]['name'], ]); }); @@ -260,7 +260,7 @@ test('create invoice with negative tax', function () { $invoice = Invoice::factory() ->raw([ 'taxes' => [Tax::factory()->raw([ - 'percent' => -9.99 + 'percent' => -9.99, ])], 'items' => [InvoiceItem::factory()->raw()], ]); @@ -283,23 +283,23 @@ test('create invoice with negative tax', function () { ]); $this->assertDatabaseHas('taxes', [ - 'tax_type_id' => $invoice['taxes'][0]['tax_type_id'] + 'tax_type_id' => $invoice['taxes'][0]['tax_type_id'], ]); }); test('create invoice with tax per item', function () { $invoice = Invoice::factory() ->raw([ - 'tax_per_item' => 'YES', - 'items' => [ - InvoiceItem::factory()->raw([ - 'taxes' => [Tax::factory()->raw()], - ]), - InvoiceItem::factory()->raw([ - 'taxes' => [Tax::factory()->raw()], - ]), - ], - ]); + 'tax_per_item' => 'YES', + 'items' => [ + InvoiceItem::factory()->raw([ + 'taxes' => [Tax::factory()->raw()], + ]), + InvoiceItem::factory()->raw([ + 'taxes' => [Tax::factory()->raw()], + ]), + ], + ]); $response = postJson('api/v1/invoices', $invoice); @@ -319,7 +319,7 @@ test('create invoice with tax per item', function () { ]); $this->assertDatabaseHas('taxes', [ - 'tax_type_id' => $invoice['items'][0]['taxes'][0]['tax_type_id'] + 'tax_type_id' => $invoice['items'][0]['taxes'][0]['tax_type_id'], ]); }); @@ -373,12 +373,12 @@ test('create invoice with EUR currency', function () { $this->assertDatabaseHas('taxes', [ 'tax_type_id' => $invoice['taxes'][0]['tax_type_id'], - 'amount' => $invoice['tax'] + 'amount' => $invoice['tax'], ]); $this->assertDatabaseHas('invoice_items', [ 'item_id' => $invoice['items'][0]['item_id'], - 'name' => $invoice['items'][0]['name'] + 'name' => $invoice['items'][0]['name'], ]); }); @@ -387,9 +387,9 @@ test('update invoice with EUR currency', function () { ->hasItems(1) ->hasTaxes(1) ->create([ - 'invoice_date' => '1988-07-18', - 'due_date' => '1988-08-18', - ]); + 'invoice_date' => '1988-07-18', + 'due_date' => '1988-08-18', + ]); $invoice2 = Invoice::factory() ->raw([ diff --git a/tests/Feature/Admin/ItemTest.php b/tests/Feature/Admin/ItemTest.php index 85684003..2c716862 100644 --- a/tests/Feature/Admin/ItemTest.php +++ b/tests/Feature/Admin/ItemTest.php @@ -1,12 +1,13 @@ $items->pluck('id'), ]; - postJson("/api/v1/items/delete", $data)->assertOk(); + postJson('/api/v1/items/delete', $data)->assertOk(); foreach ($items as $item) { $this->assertModelMissing($item); diff --git a/tests/Feature/Admin/LocationTest.php b/tests/Feature/Admin/LocationTest.php index ae9a3ab7..f0a12b02 100644 --- a/tests/Feature/Admin/LocationTest.php +++ b/tests/Feature/Admin/LocationTest.php @@ -1,8 +1,9 @@ create([ 'due_amount' => 100, - 'exchange_rate' => 1 + 'exchange_rate' => 1, ]); $payment = Payment::factory()->raw([ 'invoice_id' => $invoice->id, - 'payment_number' => "PAY-000001", + 'payment_number' => 'PAY-000001', 'amount' => $invoice->due_amount, - 'exchange_rate' => 1 + 'exchange_rate' => 1, ]); $response = postJson('api/v1/payments', $payment); @@ -80,12 +80,12 @@ test('update payment', function () { $payment = Payment::factory()->create([ 'payment_date' => '1988-08-18', 'invoice_id' => $invoice->id, - 'exchange_rate' => 1 + 'exchange_rate' => 1, ]); $payment2 = Payment::factory()->raw([ 'invoice_id' => $invoice->id, - 'exchange_rate' => 1 + 'exchange_rate' => 1, ]); putJson("api/v1/payments/{$payment->id}", $payment2) @@ -162,8 +162,8 @@ test('delete payment', function () { test('create payment without invoice', function () { $payment = Payment::factory()->raw([ - 'payment_number' => "PAY-000001", - 'exchange_rate' => 1 + 'payment_number' => 'PAY-000001', + 'exchange_rate' => 1, ]); postJson('api/v1/payments', $payment)->assertOk(); @@ -178,7 +178,7 @@ test('create payment without invoice', function () { test('create payment with invoice', function () { $payment = Payment::factory()->raw([ - 'payment_number' => "PAY-000001", + 'payment_number' => 'PAY-000001', ]); $invoice = Invoice::factory()->create(); @@ -186,7 +186,7 @@ test('create payment with invoice', function () { $payment = Payment::factory()->raw([ 'invoice_id' => $invoice->id, 'amount' => $invoice->due_amount, - 'exchange_rate' => 1 + 'exchange_rate' => 1, ]); postJson('api/v1/payments', $payment)->assertOk(); @@ -218,15 +218,15 @@ test('create payment with partially paid', function () { 'customer_id' => $invoice->customer_id, 'exchange_rate' => $invoice->exchange_rate, 'amount' => 100, - 'currency_id' => $invoice->currency_id + 'currency_id' => $invoice->currency_id, ]); - $response = postJson("api/v1/payments", $payment)->assertOk(); + $response = postJson('api/v1/payments', $payment)->assertOk(); $this->assertDatabaseHas('payments', [ 'payment_number' => $payment['payment_number'], - 'customer_id' => (string)$payment['customer_id'], - 'amount' => (string)$payment['amount'], + 'customer_id' => (string) $payment['customer_id'], + 'amount' => (string) $payment['amount'], ]); $this->assertDatabaseHas('invoices', [ diff --git a/tests/Feature/Admin/RecurringInvoiceTest.php b/tests/Feature/Admin/RecurringInvoiceTest.php index 294c8e47..9d5ccdad 100644 --- a/tests/Feature/Admin/RecurringInvoiceTest.php +++ b/tests/Feature/Admin/RecurringInvoiceTest.php @@ -1,13 +1,14 @@ raw(); $recurringInvoice['items'] = [ - InvoiceItem::factory()->raw() + InvoiceItem::factory()->raw(), ]; postJson('api/v1/recurring-invoices', $recurringInvoice) @@ -77,12 +78,12 @@ test('update user using a form request', function () { test('update recurring invoice', function () { $recurringInvoice = RecurringInvoice::factory()->create(); $recurringInvoice['items'] = [ - InvoiceItem::factory()->raw() + InvoiceItem::factory()->raw(), ]; $new_recurringInvoice = RecurringInvoice::factory()->raw(); $new_recurringInvoice['items'] = [ - InvoiceItem::factory()->raw() + InvoiceItem::factory()->raw(), ]; putJson("api/v1/recurring-invoices/{$recurringInvoice->id}", $new_recurringInvoice) @@ -118,11 +119,11 @@ test('delete multiple recurring invoice', function () { test('calculate frequency for recurring invoice', function () { $data = [ 'frequency' => '* * 2 * *', - 'starts_at' => Carbon::now()->format('Y-m-d') + 'starts_at' => Carbon::now()->format('Y-m-d'), ]; $queryString = http_build_query($data, '', '&'); - getJson("api/v1/recurring-invoice-frequency?".$queryString) + getJson('api/v1/recurring-invoice-frequency?'.$queryString) ->assertOk(); }); diff --git a/tests/Feature/Admin/RoleTest.php b/tests/Feature/Admin/RoleTest.php index 0d52c115..1d95966e 100644 --- a/tests/Feature/Admin/RoleTest.php +++ b/tests/Feature/Admin/RoleTest.php @@ -1,8 +1,9 @@ "loremipsum@gmail.com", - "name" => "lorem", - "password" => "lorem@123" + 'email' => 'loremipsum@gmail.com', + 'name' => 'lorem', + 'password' => 'lorem@123', ]; $data['companies'] = [ [ - "role" => "super admin", - "id" => 1 - ] + 'role' => 'super admin', + 'id' => 1, + ], ]; postJson('api/v1/users', $data) diff --git a/tests/Feature/Admin/TaxTypeTest.php b/tests/Feature/Admin/TaxTypeTest.php index d80b5af5..98494a5a 100644 --- a/tests/Feature/Admin/TaxTypeTest.php +++ b/tests/Feature/Admin/TaxTypeTest.php @@ -1,10 +1,10 @@ assertModelMissing($taxType); }); - test('create negative tax type', function () { $taxType = TaxType::factory()->raw([ - 'percent' => -9.99 + 'percent' => -9.99, ]); postJson('api/v1/tax-types', $taxType) diff --git a/tests/Feature/Admin/UnitTest.php b/tests/Feature/Admin/UnitTest.php index 29bb6626..8d2ba0ae 100644 --- a/tests/Feature/Admin/UnitTest.php +++ b/tests/Feature/Admin/UnitTest.php @@ -1,11 +1,12 @@ user(); $estimate = Estimate::factory()->create([ - 'customer_id' => $customer->id + 'customer_id' => $customer->id, ]); getJson("/api/v1/{$customer->company->slug}/customer/estimates/{$estimate->id}") @@ -46,11 +47,11 @@ test('customer estimate mark as accepted', function () { $estimate = Estimate::factory()->create([ 'estimate_date' => '1988-07-18', 'expiry_date' => '1988-08-18', - 'customer_id' => $customer->id + 'customer_id' => $customer->id, ]); $status = [ - 'status' => Estimate::STATUS_ACCEPTED + 'status' => Estimate::STATUS_ACCEPTED, ]; $response = postJson("api/v1/{$customer->company->slug}/customer/estimate/{$estimate->id}/status", $status) @@ -65,11 +66,11 @@ test('customer estimate mark as rejected', function () { $estimate = Estimate::factory()->create([ 'estimate_date' => '1988-07-18', 'expiry_date' => '1988-08-18', - 'customer_id' => $customer->id + 'customer_id' => $customer->id, ]); $status = [ - 'status' => Estimate::STATUS_REJECTED + 'status' => Estimate::STATUS_REJECTED, ]; $response = postJson("api/v1/{$customer->company->slug}/customer/estimate/{$estimate->id}/status", $status) diff --git a/tests/Feature/Customer/ExpenseTest.php b/tests/Feature/Customer/ExpenseTest.php index b8609734..3296c7f8 100644 --- a/tests/Feature/Customer/ExpenseTest.php +++ b/tests/Feature/Customer/ExpenseTest.php @@ -2,11 +2,12 @@ namespace Tests\Feature\Customer; -use InvoiceShelf\Models\Customer; -use InvoiceShelf\Models\Expense; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Auth; +use InvoiceShelf\Models\Customer; +use InvoiceShelf\Models\Expense; use Laravel\Sanctum\Sanctum; + use function Pest\Laravel\getJson; beforeEach(function () { @@ -33,7 +34,7 @@ test('get customer expense', function () { $expense = Expense::factory()->create([ 'customer_id' => $customer->id, - 'company_id' => $customer->company->id + 'company_id' => $customer->company->id, ]); getJson("/api/v1/{$customer->company->slug}/customer/expenses/{$expense->id}") diff --git a/tests/Feature/Customer/InvoiceTest.php b/tests/Feature/Customer/InvoiceTest.php index 9ae03954..e143cad8 100644 --- a/tests/Feature/Customer/InvoiceTest.php +++ b/tests/Feature/Customer/InvoiceTest.php @@ -2,11 +2,12 @@ namespace Tests\Feature\Customer; -use InvoiceShelf\Models\Customer; -use InvoiceShelf\Models\Invoice; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Auth; +use InvoiceShelf\Models\Customer; +use InvoiceShelf\Models\Invoice; use Laravel\Sanctum\Sanctum; + use function Pest\Laravel\getJson; beforeEach(function () { @@ -32,7 +33,7 @@ test('get customer invoice', function () { $customer = Auth::guard('customer')->user(); $invoice = Invoice::factory()->create([ - 'customer_id' => $customer->id + 'customer_id' => $customer->id, ]); getJson("/api/v1/{$customer->company->slug}/customer/invoices/{$invoice->id}")->assertOk(); diff --git a/tests/Feature/Customer/PaymentTest.php b/tests/Feature/Customer/PaymentTest.php index 7af7bdbb..47051236 100644 --- a/tests/Feature/Customer/PaymentTest.php +++ b/tests/Feature/Customer/PaymentTest.php @@ -2,11 +2,12 @@ namespace Tests\Feature\Customer; -use InvoiceShelf\Models\Customer; -use InvoiceShelf\Models\Payment; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Auth; +use InvoiceShelf\Models\Customer; +use InvoiceShelf\Models\Payment; use Laravel\Sanctum\Sanctum; + use function Pest\Laravel\getJson; beforeEach(function () { @@ -32,7 +33,7 @@ test('get customer payment', function () { $customer = Auth::guard('customer')->user(); $payment = Payment::factory()->create([ - 'customer_id' => $customer->id + 'customer_id' => $customer->id, ]); getJson("/api/v1/{$customer->company->slug}/customer/payments/{$payment->id}")->assertOk(); diff --git a/tests/Feature/Customer/ProfileTest.php b/tests/Feature/Customer/ProfileTest.php index 9e454fda..9efbce8c 100644 --- a/tests/Feature/Customer/ProfileTest.php +++ b/tests/Feature/Customer/ProfileTest.php @@ -2,12 +2,13 @@ namespace Tests\Feature\Customer; +use Illuminate\Support\Facades\Artisan; +use Illuminate\Support\Facades\Auth; use InvoiceShelf\Http\Controllers\V1\Customer\General\ProfileController; use InvoiceShelf\Http\Requests\Customer\CustomerProfileRequest; use InvoiceShelf\Models\Customer; -use Illuminate\Support\Facades\Artisan; -use Illuminate\Support\Facades\Auth; use Laravel\Sanctum\Sanctum; + use function Pest\Laravel\getJson; use function Pest\Laravel\postJson; @@ -38,19 +39,19 @@ test('update customer profile', function () { $newCustomer = Customer::factory()->raw([ 'shipping' => [ 'name' => 'newName', - 'address_street_1' => 'address' + 'address_street_1' => 'address', ], 'billing' => [ 'name' => 'newName', - 'address_street_1' => 'address' - ] + 'address_street_1' => 'address', + ], ]); postJson("api/v1/{$customer->company->slug}/customer/profile", $newCustomer)->assertOk(); $this->assertDatabaseHas('customers', [ 'name' => $customer['name'], - 'email' => $customer['email'] + 'email' => $customer['email'], ]); }); diff --git a/tests/TestCase.php b/tests/TestCase.php index 0a180db4..27dcaf28 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -9,8 +9,8 @@ use JMac\Testing\Traits\AdditionalAssertions; abstract class TestCase extends BaseTestCase { - use CreatesApplication; use AdditionalAssertions; + use CreatesApplication; protected function setUp(): void { diff --git a/tests/Unit/AddressTest.php b/tests/Unit/AddressTest.php index 76526f18..f49e8296 100644 --- a/tests/Unit/AddressTest.php +++ b/tests/Unit/AddressTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/CompanySettingTest.php b/tests/Unit/CompanySettingTest.php index 99553fc4..fa5e5116 100644 --- a/tests/Unit/CompanySettingTest.php +++ b/tests/Unit/CompanySettingTest.php @@ -1,8 +1,9 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/CountryTest.php b/tests/Unit/CountryTest.php index 844c05ea..a0393763 100644 --- a/tests/Unit/CountryTest.php +++ b/tests/Unit/CountryTest.php @@ -1,8 +1,8 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/CustomFieldTest.php b/tests/Unit/CustomFieldTest.php index 6943ecba..f47193ac 100644 --- a/tests/Unit/CustomFieldTest.php +++ b/tests/Unit/CustomFieldTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/CustomFieldValueTest.php b/tests/Unit/CustomFieldValueTest.php index ae107d91..d6fdec79 100644 --- a/tests/Unit/CustomFieldValueTest.php +++ b/tests/Unit/CustomFieldValueTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/CustomerTest.php b/tests/Unit/CustomerTest.php index 995da615..1eecaad2 100644 --- a/tests/Unit/CustomerTest.php +++ b/tests/Unit/CustomerTest.php @@ -1,8 +1,8 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/EstimateItemTest.php b/tests/Unit/EstimateItemTest.php index 54d3bf42..38bc6eae 100644 --- a/tests/Unit/EstimateItemTest.php +++ b/tests/Unit/EstimateItemTest.php @@ -1,9 +1,9 @@ 'DatabaseSeeder', '--force' => true]); @@ -25,7 +25,6 @@ test('estimate item belongs to item', function () { $this->assertTrue($estimateItem->item()->exists()); }); - test('estimate item has many taxes', function () { $estimateItem = EstimateItem::factory()->hasTaxes(5)->create([ 'estimate_id' => Estimate::factory(), diff --git a/tests/Unit/EstimateTest.php b/tests/Unit/EstimateTest.php index 5f68abe2..3bdd9bb7 100644 --- a/tests/Unit/EstimateTest.php +++ b/tests/Unit/EstimateTest.php @@ -1,11 +1,11 @@ 'DatabaseSeeder', '--force' => true]); @@ -95,7 +95,7 @@ test('update estimate', function () { $request->replace($newEstimate); - $estimate_number = explode("-", $newEstimate['estimate_number']); + $estimate_number = explode('-', $newEstimate['estimate_number']); $number_attributes['estimate_number'] = $estimate_number[0].'-'.sprintf('%06d', intval($estimate_number[1])); @@ -137,7 +137,7 @@ test('create items', function () { $request = new Request(); - $request->replace(['items' => $items ]); + $request->replace(['items' => $items]); Estimate::createItems($estimate, $request, $estimate->exchange_rate); @@ -170,7 +170,7 @@ test('create taxes', function () { $request = new Request(); - $request->replace(['taxes' => $taxes ]); + $request->replace(['taxes' => $taxes]); Estimate::createTaxes($estimate, $request, $estimate->exchange_rate); diff --git a/tests/Unit/ExpenseCategoryTest.php b/tests/Unit/ExpenseCategoryTest.php index 94988d92..d97ae60f 100644 --- a/tests/Unit/ExpenseCategoryTest.php +++ b/tests/Unit/ExpenseCategoryTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/ExpenseTest.php b/tests/Unit/ExpenseTest.php index 3ef51e4e..1389775c 100644 --- a/tests/Unit/ExpenseTest.php +++ b/tests/Unit/ExpenseTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/InvoiceItemTest.php b/tests/Unit/InvoiceItemTest.php index a40271c2..6e51d97f 100644 --- a/tests/Unit/InvoiceItemTest.php +++ b/tests/Unit/InvoiceItemTest.php @@ -1,9 +1,9 @@ 'DatabaseSeeder', '--force' => true]); @@ -25,7 +25,6 @@ test('invoice item belongs to item', function () { $this->assertTrue($invoiceItem->item()->exists()); }); - test('invoice item has many taxes', function () { $invoiceItem = InvoiceItem::factory()->hasTaxes(5)->create([ 'invoice_id' => Invoice::factory(), diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php index 7b1ae1b8..a0eb41a8 100644 --- a/tests/Unit/InvoiceTest.php +++ b/tests/Unit/InvoiceTest.php @@ -1,11 +1,11 @@ 'DatabaseSeeder', '--force' => true]); @@ -50,7 +50,6 @@ test('get previous status', function () { $this->assertEquals('DRAFT', $status); }); - test('create invoice', function () { $invoice = Invoice::factory()->raw(); @@ -66,7 +65,7 @@ test('create invoice', function () { $request->replace($invoice); - $invoice_number = explode("-", $invoice['invoice_number']); + $invoice_number = explode('-', $invoice['invoice_number']); $number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1])); $response = Invoice::createInvoice($request); @@ -116,7 +115,7 @@ test('update invoice', function () { $request->replace($newInvoice); - $invoice_number = explode("-", $newInvoice['invoice_number']); + $invoice_number = explode('-', $newInvoice['invoice_number']); $number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1])); @@ -157,7 +156,7 @@ test('create items', function () { $request = new InvoicesRequest(); - $request->replace(['items' => $items ]); + $request->replace(['items' => $items]); Invoice::createItems($invoice, $request->items); @@ -184,7 +183,7 @@ test('create taxes', function () { $request = new Request(); - $request->replace(['taxes' => $taxes ]); + $request->replace(['taxes' => $taxes]); Invoice::createTaxes($invoice, $request->taxes); diff --git a/tests/Unit/ItemTest.php b/tests/Unit/ItemTest.php index dacc3f68..3a453ef4 100644 --- a/tests/Unit/ItemTest.php +++ b/tests/Unit/ItemTest.php @@ -1,11 +1,11 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/PaymentMethodTest.php b/tests/Unit/PaymentMethodTest.php index 867692a9..42337954 100644 --- a/tests/Unit/PaymentMethodTest.php +++ b/tests/Unit/PaymentMethodTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/PaymentTest.php b/tests/Unit/PaymentTest.php index fd93e26c..c8214742 100644 --- a/tests/Unit/PaymentTest.php +++ b/tests/Unit/PaymentTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/RecurringInvoiceTest.php b/tests/Unit/RecurringInvoiceTest.php index dc34ef09..e3630f23 100644 --- a/tests/Unit/RecurringInvoiceTest.php +++ b/tests/Unit/RecurringInvoiceTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/SettingTest.php b/tests/Unit/SettingTest.php index 1d001219..dadeb068 100644 --- a/tests/Unit/SettingTest.php +++ b/tests/Unit/SettingTest.php @@ -1,7 +1,8 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/TaxTypeTest.php b/tests/Unit/TaxTypeTest.php index b4aa85be..cb83dbff 100644 --- a/tests/Unit/TaxTypeTest.php +++ b/tests/Unit/TaxTypeTest.php @@ -1,7 +1,7 @@ 'DatabaseSeeder', '--force' => true]); diff --git a/tests/Unit/UnitTest.php b/tests/Unit/UnitTest.php index 11b25fb6..1d8220d0 100644 --- a/tests/Unit/UnitTest.php +++ b/tests/Unit/UnitTest.php @@ -1,8 +1,8 @@ 'DatabaseSeeder', '--force' => true]);