diff --git a/.php_cs b/.php_cs new file mode 100644 index 000000000000..9dfc128f7605 --- /dev/null +++ b/.php_cs @@ -0,0 +1,18 @@ +notPath('vendor') + ->notPath('bootstrap') + ->notPath('storage') + ->in(__DIR__) + ->name('*.php') + ->notName('*.blade.php'); + +return PhpCsFixer\Config::create() + ->setRules([ + '@PSR2' => true, + 'array_syntax' => ['syntax' => 'short'], + 'ordered_imports' => ['sortAlgorithm' => 'alpha'], + 'no_unused_imports' => true, + ]) + ->setFinder($finder); \ No newline at end of file diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php index 15b9c693d67b..24b869e48374 100644 --- a/app/Console/Commands/CheckData.php +++ b/app/Console/Commands/CheckData.php @@ -12,25 +12,21 @@ namespace App\Console\Commands; use App; -use App\Libraries\CurlUtils; use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\CompanyLedger; use App\Models\Contact; use App\Models\Credit; -use App\Models\Invitation; use App\Models\Invoice; use App\Models\InvoiceInvitation; use App\Models\Payment; use App\Utils\Ninja; -use Carbon; use DB; use Exception; use Illuminate\Console\Command; use Mail; use Symfony\Component\Console\Input\InputOption; -use Utils; /* diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php index 98e7d311faca..047c6fc522ac 100644 --- a/app/Console/Commands/CreateSingleAccount.php +++ b/app/Console/Commands/CreateSingleAccount.php @@ -12,19 +12,10 @@ namespace App\Console\Commands; use App\DataMapper\CompanySettings; -use App\DataMapper\DefaultSettings; use App\Events\Invoice\InvoiceWasCreated; -use App\Events\Invoice\InvoiceWasMarkedSent; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\ClientFactory; use App\Factory\InvoiceFactory; use App\Factory\InvoiceItemFactory; -use App\Factory\PaymentFactory; -use App\Factory\QuoteFactory; use App\Helpers\Invoice\InvoiceSum; -use App\Jobs\Quote\CreateQuoteInvitations; -use App\Listeners\Credit\CreateCreditInvitation; -use App\Listeners\Invoice\CreateInvoiceInvitation; use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; @@ -34,8 +25,6 @@ use App\Models\CompanyToken; use App\Models\Country; use App\Models\Credit; use App\Models\Expense; -use App\Models\Payment; -use App\Models\PaymentType; use App\Models\Product; use App\Models\Project; use App\Models\Quote; diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index 5d0e07dd4240..22803f5341ed 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -12,29 +12,19 @@ namespace App\Console\Commands; use App\DataMapper\CompanySettings; -use App\DataMapper\DefaultSettings; use App\Events\Invoice\InvoiceWasCreated; -use App\Events\Invoice\InvoiceWasMarkedSent; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\ClientFactory; use App\Factory\InvoiceFactory; use App\Factory\InvoiceItemFactory; -use App\Factory\PaymentFactory; use App\Factory\QuoteFactory; use App\Helpers\Invoice\InvoiceSum; -use App\Jobs\Quote\CreateQuoteInvitations; -use App\Listeners\Credit\CreateCreditInvitation; -use App\Listeners\Invoice\CreateInvoiceInvitation; use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; use App\Models\CompanyToken; -use App\Models\Credit; use App\Models\Country; +use App\Models\Credit; use App\Models\Expense; -use App\Models\Payment; -use App\Models\PaymentType; use App\Models\Product; use App\Models\Project; use App\Models\Quote; diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php index ae18b2081533..d5b9a437e615 100644 --- a/app/Console/Commands/DemoMode.php +++ b/app/Console/Commands/DemoMode.php @@ -25,7 +25,6 @@ use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; use App\Models\CompanyToken; -use App\Models\Country; use App\Models\Credit; use App\Models\Expense; use App\Models\Product; @@ -40,18 +39,12 @@ use App\Utils\Ninja; use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\MakesHash; use Carbon\Carbon; -use Composer\Composer; -use Composer\Console\Application; -use Composer\Factory; -use Composer\IO\NullIO; -use Composer\Installer; use Illuminate\Console\Command; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Schema; use Illuminate\Support\Str; -use Symfony\Component\Console\Input\ArrayInput; class DemoMode extends Command { diff --git a/app/Console/Commands/PostUpdate.php b/app/Console/Commands/PostUpdate.php index 2f3f32e3f123..77d162d76e02 100644 --- a/app/Console/Commands/PostUpdate.php +++ b/app/Console/Commands/PostUpdate.php @@ -11,11 +11,7 @@ namespace App\Console\Commands; -use Composer\Composer; use Composer\Console\Application; -use Composer\Factory; -use Composer\Installer; -use Composer\IO\NullIO; use Illuminate\Console\Command; use Illuminate\Support\Facades\Artisan; use Log; @@ -66,7 +62,7 @@ class PostUpdate extends Command putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer'); - $input = new ArrayInput(array('command' => 'install', '--no-dev' => 'true')); + $input = new ArrayInput(['command' => 'install', '--no-dev' => 'true']); $application = new Application(); $application->setAutoExit(false); $application->run($input); diff --git a/app/Console/Commands/RecurringCommand.php b/app/Console/Commands/RecurringCommand.php index df3e7caf5a20..5de979adca0c 100644 --- a/app/Console/Commands/RecurringCommand.php +++ b/app/Console/Commands/RecurringCommand.php @@ -12,7 +12,6 @@ namespace App\Console\Commands; use App\Jobs\Cron\RecurringInvoicesCron; -use App\Models\Design; use Illuminate\Console\Command; class RecurringCommand extends Command diff --git a/app/Console/Commands/SendTestEmails.php b/app/Console/Commands/SendTestEmails.php index e1fd223e6b21..38fa21447cef 100644 --- a/app/Console/Commands/SendTestEmails.php +++ b/app/Console/Commands/SendTestEmails.php @@ -14,7 +14,6 @@ namespace App\Console\Commands; use App\DataMapper\CompanySettings; use App\DataMapper\DefaultSettings; use App\Factory\ClientFactory; -use App\Factory\CompanyUserFactory; use App\Factory\InvoiceFactory; use App\Factory\InvoiceInvitationFactory; use App\Jobs\Invoice\CreateEntityPdf; @@ -23,11 +22,9 @@ use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; -use App\Models\Invoice; use App\Models\User; use Faker\Factory; use Illuminate\Console\Command; -use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Mail; class SendTestEmails extends Command diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 1dd37df3471d..c94155c1a082 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -11,10 +11,8 @@ namespace App\Console; -use App\Console\Commands\CheckData; use App\Jobs\Cron\RecurringInvoicesCron; use App\Jobs\Ninja\AdjustEmailQuota; -use App\Jobs\Ninja\CheckDbStatus; use App\Jobs\Ninja\CompanySizeCheck; use App\Jobs\Util\ReminderJob; use App\Jobs\Util\SendFailedEmails; diff --git a/app/DataMapper/ClientSettings.php b/app/DataMapper/ClientSettings.php index 7234afe8379c..6f8a3f3d2a22 100644 --- a/app/DataMapper/ClientSettings.php +++ b/app/DataMapper/ClientSettings.php @@ -11,10 +11,7 @@ namespace App\DataMapper; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\Client; -use App\Utils\TranslationHelper; use stdClass; /** diff --git a/app/DataMapper/DefaultSettings.php b/app/DataMapper/DefaultSettings.php index a80242697dbf..39f71dc20dc4 100644 --- a/app/DataMapper/DefaultSettings.php +++ b/app/DataMapper/DefaultSettings.php @@ -11,7 +11,6 @@ namespace App\DataMapper; -use App\Models\Client; use App\Models\User; use stdClass; diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php index 2c64b80eb6bf..d7137ce7f1e7 100644 --- a/app/DataMapper/EmailTemplateDefaults.php +++ b/app/DataMapper/EmailTemplateDefaults.php @@ -12,7 +12,6 @@ namespace App\DataMapper; use Illuminate\Support\Facades\App; -use League\CommonMark\CommonMarkConverter; class EmailTemplateDefaults { diff --git a/app/DataMapper/FreeCompanySettings.php b/app/DataMapper/FreeCompanySettings.php index 0e38bf5d9cf3..8ec61b376871 100644 --- a/app/DataMapper/FreeCompanySettings.php +++ b/app/DataMapper/FreeCompanySettings.php @@ -11,7 +11,6 @@ namespace App\DataMapper; -use App\DataMapper\CompanySettings; use App\Utils\Traits\MakesHash; use stdClass; diff --git a/app/Events/Account/AccountCreated.php b/app/Events/Account/AccountCreated.php index 9636a873f069..1b926c6201d4 100644 --- a/app/Events/Account/AccountCreated.php +++ b/app/Events/Account/AccountCreated.php @@ -13,9 +13,7 @@ namespace App\Events\Account; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Client/ClientWasArchived.php b/app/Events/Client/ClientWasArchived.php index 3bb0fab8229a..422f499afd41 100644 --- a/app/Events/Client/ClientWasArchived.php +++ b/app/Events/Client/ClientWasArchived.php @@ -15,9 +15,7 @@ use App\Models\Client; use App\Models\Company; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Company/CompanyDocumentsDeleted.php b/app/Events/Company/CompanyDocumentsDeleted.php index 9e595852765b..597c21816384 100644 --- a/app/Events/Company/CompanyDocumentsDeleted.php +++ b/app/Events/Company/CompanyDocumentsDeleted.php @@ -14,9 +14,7 @@ namespace App\Events\Company; use App\Models\Company; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Contact/ContactLoggedIn.php b/app/Events/Contact/ContactLoggedIn.php index 6f798aa7fb3e..81532797509b 100644 --- a/app/Events/Contact/ContactLoggedIn.php +++ b/app/Events/Contact/ContactLoggedIn.php @@ -14,9 +14,7 @@ namespace App\Events\Contact; use App\Models\ClientContact; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Design/DesignWasArchived.php b/app/Events/Design/DesignWasArchived.php index d0062640fb63..13a1d7ff6a45 100644 --- a/app/Events/Design/DesignWasArchived.php +++ b/app/Events/Design/DesignWasArchived.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\Design; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Design/DesignWasCreated.php b/app/Events/Design/DesignWasCreated.php index 54206cf62ce1..c25f73b49dc6 100644 --- a/app/Events/Design/DesignWasCreated.php +++ b/app/Events/Design/DesignWasCreated.php @@ -13,7 +13,6 @@ namespace App\Events\Design; use App\Models\Company; use App\Models\Design; -use Illuminate\Broadcasting\Channel; use Illuminate\Queue\SerializesModels; /** diff --git a/app/Events/Design/DesignWasDeleted.php b/app/Events/Design/DesignWasDeleted.php index 2e8c9a3fd7e9..dc2c9f0bbed0 100644 --- a/app/Events/Design/DesignWasDeleted.php +++ b/app/Events/Design/DesignWasDeleted.php @@ -13,7 +13,6 @@ namespace App\Events\Design; use App\Models\Company; use App\Models\Design; -use Illuminate\Broadcasting\Channel; use Illuminate\Queue\SerializesModels; /** diff --git a/app/Events/Design/DesignWasRestored.php b/app/Events/Design/DesignWasRestored.php index 34cca273a55c..d3863f1c2485 100644 --- a/app/Events/Design/DesignWasRestored.php +++ b/app/Events/Design/DesignWasRestored.php @@ -13,7 +13,6 @@ namespace App\Events\Design; use App\Models\Company; use App\Models\Design; -use Illuminate\Broadcasting\Channel; use Illuminate\Queue\SerializesModels; /** diff --git a/app/Events/Design/DesignWasUpdated.php b/app/Events/Design/DesignWasUpdated.php index b561dab354dd..c3d6be69fab9 100644 --- a/app/Events/Design/DesignWasUpdated.php +++ b/app/Events/Design/DesignWasUpdated.php @@ -13,7 +13,6 @@ namespace App\Events\Design; use App\Models\Company; use App\Models\Design; -use Illuminate\Broadcasting\Channel; use Illuminate\Queue\SerializesModels; /** diff --git a/app/Events/Document/DocumentWasArchived.php b/app/Events/Document/DocumentWasArchived.php index d483f80ac039..2d51ef3b0996 100644 --- a/app/Events/Document/DocumentWasArchived.php +++ b/app/Events/Document/DocumentWasArchived.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\Document; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Payment/Methods/MethodDeleted.php b/app/Events/Payment/Methods/MethodDeleted.php index ac813808ff32..d6782c2d7288 100644 --- a/app/Events/Payment/Methods/MethodDeleted.php +++ b/app/Events/Payment/Methods/MethodDeleted.php @@ -15,9 +15,7 @@ use App\Models\ClientGatewayToken; use App\Models\Company; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Payment/PaymentWasEmailed.php b/app/Events/Payment/PaymentWasEmailed.php index 5a759b59d2cb..426a75e81498 100644 --- a/app/Events/Payment/PaymentWasEmailed.php +++ b/app/Events/Payment/PaymentWasEmailed.php @@ -11,14 +11,9 @@ namespace App\Events\Payment; -use App\Models\Client; use App\Models\Company; use App\Models\Payment; -use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; -use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Payment/PaymentWasEmailedAndFailed.php b/app/Events/Payment/PaymentWasEmailedAndFailed.php index bedc6bec85b5..51f5f3f5073e 100644 --- a/app/Events/Payment/PaymentWasEmailedAndFailed.php +++ b/app/Events/Payment/PaymentWasEmailedAndFailed.php @@ -11,14 +11,9 @@ namespace App\Events\Payment; -use App\Models\Client; use App\Models\Company; use App\Models\Payment; -use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; -use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/Product/ProductWasRestored.php b/app/Events/Product/ProductWasRestored.php index cc5c95b5b497..bac87990df1d 100644 --- a/app/Events/Product/ProductWasRestored.php +++ b/app/Events/Product/ProductWasRestored.php @@ -12,7 +12,6 @@ namespace App\Events\Product; use App\Models\Company; -use App\Models\Invoice; use Illuminate\Queue\SerializesModels; /** diff --git a/app/Events/Quote/QuoteWasApproved.php b/app/Events/Quote/QuoteWasApproved.php index e9f120e8b062..8a48151f41fe 100644 --- a/app/Events/Quote/QuoteWasApproved.php +++ b/app/Events/Quote/QuoteWasApproved.php @@ -14,11 +14,7 @@ namespace App\Events\Quote; use App\Models\ClientContact; use App\Models\Company; use App\Models\Quote; -use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; -use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/User/UserLoggedIn.php b/app/Events/User/UserLoggedIn.php index 87b56e8041cb..d07746200e30 100644 --- a/app/Events/User/UserLoggedIn.php +++ b/app/Events/User/UserLoggedIn.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\User; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/User/UserWasArchived.php b/app/Events/User/UserWasArchived.php index dabb82dced02..d7c2969d9cdb 100644 --- a/app/Events/User/UserWasArchived.php +++ b/app/Events/User/UserWasArchived.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\User; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/User/UserWasCreated.php b/app/Events/User/UserWasCreated.php index 8e254cefdd40..9d91d2ac281d 100644 --- a/app/Events/User/UserWasCreated.php +++ b/app/Events/User/UserWasCreated.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\User; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/User/UserWasDeleted.php b/app/Events/User/UserWasDeleted.php index 7b499b0612e5..490b4251c731 100644 --- a/app/Events/User/UserWasDeleted.php +++ b/app/Events/User/UserWasDeleted.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\User; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/User/UserWasRestored.php b/app/Events/User/UserWasRestored.php index 367c2eed9041..c16bea7cb823 100644 --- a/app/Events/User/UserWasRestored.php +++ b/app/Events/User/UserWasRestored.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\User; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Events/User/UserWasUpdated.php b/app/Events/User/UserWasUpdated.php index 616bae5f960f..2fe989cbe6d6 100644 --- a/app/Events/User/UserWasUpdated.php +++ b/app/Events/User/UserWasUpdated.php @@ -15,9 +15,7 @@ use App\Models\Company; use App\Models\User; use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Broadcasting\PresenceChannel; use Illuminate\Broadcasting\PrivateChannel; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; diff --git a/app/Exceptions/GenericPaymentDriverFailure.php b/app/Exceptions/GenericPaymentDriverFailure.php index c3a8898f7574..2feb0e7410e0 100644 --- a/app/Exceptions/GenericPaymentDriverFailure.php +++ b/app/Exceptions/GenericPaymentDriverFailure.php @@ -3,7 +3,6 @@ namespace App\Exceptions; use Exception; -use Throwable; class GenericPaymentDriverFailure extends Exception { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 869d5a2df8a2..cdee20094ba0 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -11,7 +11,6 @@ namespace App\Exceptions; -use App\Exceptions\GenericPaymentDriverFailure; use App\Models\Account; use Exception; use Illuminate\Auth\Access\AuthorizationException; @@ -35,7 +34,6 @@ use Symfony\Component\Debug\Exception\FatalThrowableError; use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Throwable; -use function Sentry\configureScope; class Handler extends ExceptionHandler { diff --git a/app/Exceptions/MigrationValidatorFailed.php b/app/Exceptions/MigrationValidatorFailed.php index 80ef8c5ac482..3557444e4139 100644 --- a/app/Exceptions/MigrationValidatorFailed.php +++ b/app/Exceptions/MigrationValidatorFailed.php @@ -3,7 +3,6 @@ namespace App\Exceptions; use Exception; -use Throwable; class MigrationValidatorFailed extends Exception { diff --git a/app/Exceptions/NonExistingMigrationFile.php b/app/Exceptions/NonExistingMigrationFile.php index ad7adbb58f92..ae89a4955a79 100644 --- a/app/Exceptions/NonExistingMigrationFile.php +++ b/app/Exceptions/NonExistingMigrationFile.php @@ -3,7 +3,6 @@ namespace App\Exceptions; use Exception; -use Throwable; class NonExistingMigrationFile extends Exception { diff --git a/app/Exceptions/ProcessingMigrationArchiveFailed.php b/app/Exceptions/ProcessingMigrationArchiveFailed.php index da2488954ffa..0b89be1ee4d7 100644 --- a/app/Exceptions/ProcessingMigrationArchiveFailed.php +++ b/app/Exceptions/ProcessingMigrationArchiveFailed.php @@ -3,7 +3,6 @@ namespace App\Exceptions; use Exception; -use Throwable; class ProcessingMigrationArchiveFailed extends Exception { diff --git a/app/Exceptions/ResourceDependencyMissing.php b/app/Exceptions/ResourceDependencyMissing.php index a265dc048cb0..46c35dca8ef2 100644 --- a/app/Exceptions/ResourceDependencyMissing.php +++ b/app/Exceptions/ResourceDependencyMissing.php @@ -3,7 +3,6 @@ namespace App\Exceptions; use Exception; -use Throwable; class ResourceDependencyMissing extends Exception { diff --git a/app/Exceptions/ResourceNotAvailableForMigration.php b/app/Exceptions/ResourceNotAvailableForMigration.php index 0e53111d547b..9c252aecda2e 100644 --- a/app/Exceptions/ResourceNotAvailableForMigration.php +++ b/app/Exceptions/ResourceNotAvailableForMigration.php @@ -3,7 +3,6 @@ namespace App\Exceptions; use Exception; -use Throwable; class ResourceNotAvailableForMigration extends Exception { diff --git a/app/Factory/ExpenseCategoryFactory.php b/app/Factory/ExpenseCategoryFactory.php index ce27392b0893..9768f4a5974e 100644 --- a/app/Factory/ExpenseCategoryFactory.php +++ b/app/Factory/ExpenseCategoryFactory.php @@ -11,10 +11,7 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\ExpenseCategory; -use Illuminate\Support\Facades\Log; class ExpenseCategoryFactory { diff --git a/app/Factory/ExpenseFactory.php b/app/Factory/ExpenseFactory.php index 0272d8f3c288..14f8821b3fb5 100644 --- a/app/Factory/ExpenseFactory.php +++ b/app/Factory/ExpenseFactory.php @@ -11,10 +11,7 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\Expense; -use Illuminate\Support\Facades\Log; class ExpenseFactory { diff --git a/app/Factory/InvoiceFactory.php b/app/Factory/InvoiceFactory.php index e16f4d58bf37..95426c244dd5 100644 --- a/app/Factory/InvoiceFactory.php +++ b/app/Factory/InvoiceFactory.php @@ -11,11 +11,7 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\Client; use App\Models\Invoice; -use Illuminate\Support\Facades\Log; class InvoiceFactory { diff --git a/app/Factory/InvoiceItemFactory.php b/app/Factory/InvoiceItemFactory.php index 8788b86bf166..9b7a9b41e682 100644 --- a/app/Factory/InvoiceItemFactory.php +++ b/app/Factory/InvoiceItemFactory.php @@ -12,7 +12,6 @@ namespace App\Factory; use Faker\Factory; -use Illuminate\Support\Carbon; use stdClass; //use Faker\Generator as Faker; diff --git a/app/Factory/InvoiceToRecurringInvoiceFactory.php b/app/Factory/InvoiceToRecurringInvoiceFactory.php index 5b1927a1a60e..121761bb9632 100644 --- a/app/Factory/InvoiceToRecurringInvoiceFactory.php +++ b/app/Factory/InvoiceToRecurringInvoiceFactory.php @@ -11,8 +11,6 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\Invoice; use App\Models\RecurringInvoice; diff --git a/app/Factory/PaymentFactory.php b/app/Factory/PaymentFactory.php index c452f3edc699..63987be66527 100644 --- a/app/Factory/PaymentFactory.php +++ b/app/Factory/PaymentFactory.php @@ -11,11 +11,8 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\Payment; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; class PaymentFactory { diff --git a/app/Factory/QuoteFactory.php b/app/Factory/QuoteFactory.php index 900c824f7430..8e5adf5ad6cc 100644 --- a/app/Factory/QuoteFactory.php +++ b/app/Factory/QuoteFactory.php @@ -11,11 +11,7 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\Client; use App\Models\Quote; -use Illuminate\Support\Facades\Log; class QuoteFactory { diff --git a/app/Factory/RecurringInvoiceFactory.php b/app/Factory/RecurringInvoiceFactory.php index 822e017afea6..11edb4d6799c 100644 --- a/app/Factory/RecurringInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceFactory.php @@ -11,8 +11,6 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\RecurringInvoice; class RecurringInvoiceFactory diff --git a/app/Factory/RecurringInvoiceToInvoiceFactory.php b/app/Factory/RecurringInvoiceToInvoiceFactory.php index 12c322705873..c1a26b4e86db 100644 --- a/app/Factory/RecurringInvoiceToInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php @@ -11,8 +11,6 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\Client; use App\Models\Invoice; use App\Models\RecurringInvoice; diff --git a/app/Factory/RecurringQuoteFactory.php b/app/Factory/RecurringQuoteFactory.php index 8a728fb58304..95d921ba90bd 100644 --- a/app/Factory/RecurringQuoteFactory.php +++ b/app/Factory/RecurringQuoteFactory.php @@ -11,8 +11,6 @@ namespace App\Factory; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Models\RecurringQuote; class RecurringQuoteFactory diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php index 1c87ddc47318..fbcc675ece4f 100644 --- a/app/Filters/CreditFilters.php +++ b/app/Filters/CreditFilters.php @@ -13,11 +13,9 @@ namespace App\Filters; use App\Models\Credit; -use App\Models\Invoice; use App\Models\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; class CreditFilters extends QueryFilters { diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php index 522b048631e9..7ce43c7b6756 100644 --- a/app/Filters/InvoiceFilters.php +++ b/app/Filters/InvoiceFilters.php @@ -15,7 +15,6 @@ use App\Models\Invoice; use App\Models\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; /** * InvoiceFilters. diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php index 43e058cf019f..e5bdca806b82 100644 --- a/app/Filters/PaymentFilters.php +++ b/app/Filters/PaymentFilters.php @@ -13,7 +13,6 @@ namespace App\Filters; use App\Models\User; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Support\Facades\Log; /** * PaymentFilters. diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index a6fc951903d9..d1a16ffa1d21 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -11,7 +11,6 @@ namespace App\Filters; -use App\Models\User; //use Illuminate\Database\Query\Builder; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php index 3e6ef9a1893a..c8e6e8d79c1b 100644 --- a/app/Filters/SystemLogFilters.php +++ b/app/Filters/SystemLogFilters.php @@ -12,10 +12,7 @@ namespace App\Filters; use App\Models\User; -use App\Models\Vendor; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Gate; /** * SystemLogFilters. diff --git a/app/Filters/TokenFilters.php b/app/Filters/TokenFilters.php index 333d436d3173..df9b635db9e7 100644 --- a/app/Filters/TokenFilters.php +++ b/app/Filters/TokenFilters.php @@ -12,7 +12,6 @@ namespace App\Filters; use App\Models\User; -use App\Models\Vendor; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Gate; diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php index b031909aafb2..22b4008b1519 100644 --- a/app/Helpers/Invoice/InvoiceItemSum.php +++ b/app/Helpers/Invoice/InvoiceItemSum.php @@ -13,11 +13,8 @@ namespace App\Helpers\Invoice; use App\DataMapper\BaseSettings; use App\DataMapper\InvoiceItem; -use App\Helpers\Invoice\Discounter; -use App\Helpers\Invoice\Taxer; use App\Models\Invoice; use App\Utils\Traits\NumberFormatter; -use Illuminate\Support\Collection; class InvoiceItemSum { diff --git a/app/Helpers/Invoice/InvoiceItemSumInclusive.php b/app/Helpers/Invoice/InvoiceItemSumInclusive.php index 9e54081955d1..0d08b34ec93d 100644 --- a/app/Helpers/Invoice/InvoiceItemSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceItemSumInclusive.php @@ -11,11 +11,8 @@ namespace App\Helpers\Invoice; -use App\Helpers\Invoice\Discounter; -use App\Helpers\Invoice\Taxer; use App\Models\Invoice; use App\Utils\Traits\NumberFormatter; -use Illuminate\Support\Collection; class InvoiceItemSumInclusive { diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php index 4ef116934266..99de0fdb91e6 100644 --- a/app/Helpers/Invoice/InvoiceSum.php +++ b/app/Helpers/Invoice/InvoiceSum.php @@ -11,11 +11,6 @@ namespace App\Helpers\Invoice; -use App\Helpers\Invoice\Balancer; -use App\Helpers\Invoice\CustomValuer; -use App\Helpers\Invoice\Discounter; -use App\Helpers\Invoice\InvoiceItemSum; -use App\Helpers\Invoice\Taxer; use App\Models\Invoice; use App\Utils\Traits\NumberFormatter; use Illuminate\Support\Collection; diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php index 3cba2e4a2944..8f63230335bf 100644 --- a/app/Helpers/Invoice/InvoiceSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceSumInclusive.php @@ -11,12 +11,6 @@ namespace App\Helpers\Invoice; -use App\Helpers\Invoice\Balancer; -use App\Helpers\Invoice\CustomValuer; -use App\Helpers\Invoice\Discounter; -use App\Helpers\Invoice\InvoiceItemSum; -use App\Helpers\Invoice\InvoiceItemSumInclusive; -use App\Helpers\Invoice\Taxer; use App\Models\Invoice; use App\Utils\Traits\NumberFormatter; use Illuminate\Support\Collection; diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php index 90377b16b37e..4575ff1e343d 100644 --- a/app/Helpers/Mail/GmailTransport.php +++ b/app/Helpers/Mail/GmailTransport.php @@ -11,11 +11,8 @@ namespace App\Helpers\Mail; -use App\Libraries\MultiDB; -use App\Models\User; use Dacastro4\LaravelGmail\Services\Message\Mail; use Illuminate\Mail\Transport\Transport; -use Log; use Swift_Mime_SimpleMessage; /** diff --git a/app/Helpers/Mail/GmailTransportManager.php b/app/Helpers/Mail/GmailTransportManager.php index 357e697f4adf..e4877c81e3a4 100644 --- a/app/Helpers/Mail/GmailTransportManager.php +++ b/app/Helpers/Mail/GmailTransportManager.php @@ -2,7 +2,6 @@ namespace App\Helpers\Mail; -use App\Helpers\Mail\GmailTransport; use Dacastro4\LaravelGmail\Services\Message\Mail; use Illuminate\Mail\TransportManager; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 6389c6223c77..f184e4eadf7a 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -12,16 +12,12 @@ namespace App\Http\Controllers; use App\Http\Requests\Account\CreateAccountRequest; -use App\Http\Requests\SignupRequest; use App\Jobs\Account\CreateAccount; use App\Models\Account; use App\Models\CompanyUser; -use App\Transformers\AccountTransformer; use App\Transformers\CompanyUserTransformer; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Log; class AccountController extends BaseController { diff --git a/app/Http/Controllers/Auth/ContactRegisterController.php b/app/Http/Controllers/Auth/ContactRegisterController.php index 750d0d12b458..71af89c4a5fa 100644 --- a/app/Http/Controllers/Auth/ContactRegisterController.php +++ b/app/Http/Controllers/Auth/ContactRegisterController.php @@ -7,7 +7,6 @@ use App\Factory\ClientFactory; use App\Http\Controllers\Controller; use App\Http\Requests\ClientPortal\RegisterRequest; use App\Models\Client; -use App\Models\ClientContact; use App\Models\Company; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index dcaa7460b3df..703e10a79733 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -23,14 +23,11 @@ use App\Models\CompanyToken; use App\Models\CompanyUser; use App\Models\User; use App\Transformers\CompanyUserTransformer; -use App\Transformers\UserTransformer; use App\Utils\Traits\UserSessionAttributes; use Google_Client; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Log; -use Laravel\Socialite\Facades\Socialite; use Turbo124\Beacon\Facades\LightLogs; class LoginController extends BaseController diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php index cc7de4e0cf6b..802d50e0bc71 100644 --- a/app/Http/Controllers/Auth/VerificationController.php +++ b/app/Http/Controllers/Auth/VerificationController.php @@ -12,7 +12,6 @@ namespace App\Http\Controllers\Auth; use Illuminate\Foundation\Auth\VerifiesEmails; -use Illuminate\Http\Request; use Illuminate\Routing\Controller; class VerificationController extends Controller diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index a6b2c962db75..6f115f3d78c9 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers; use App\Models\Account; use App\Models\Company; -use App\Models\Design; use App\Models\User; use App\Transformers\ArraySerializer; use App\Transformers\EntityTransformer; @@ -23,9 +22,6 @@ use App\Utils\Traits\AppSetup; use Illuminate\Contracts\Container\BindingResolutionException; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Request as Input; -use Illuminate\Support\Facades\Schema; use League\Fractal\Manager; use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Resource\Collection; diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index cfd03203082e..17a5c355da4b 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -11,12 +11,10 @@ namespace App\Http\Controllers; -use App\DataMapper\ClientSettings; use App\Events\Client\ClientWasCreated; use App\Events\Client\ClientWasUpdated; use App\Factory\ClientFactory; use App\Filters\ClientFilters; -use App\Http\Requests\Client\BulkClientRequest; use App\Http\Requests\Client\CreateClientRequest; use App\Http\Requests\Client\DestroyClientRequest; use App\Http\Requests\Client\EditClientRequest; @@ -25,15 +23,7 @@ use App\Http\Requests\Client\StoreClientRequest; use App\Http\Requests\Client\UpdateClientRequest; use App\Jobs\Client\StoreClient; use App\Jobs\Client\UpdateClient; -use App\Jobs\Entity\ActionEntity; -use App\Jobs\Util\ProcessBulk; -use App\Jobs\Util\UploadAvatar; use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Country; -use App\Models\Currency; -use App\Models\Size; -use App\Repositories\BaseRepository; use App\Repositories\ClientRepository; use App\Transformers\ClientTransformer; use App\Utils\Ninja; @@ -42,8 +32,6 @@ use App\Utils\Traits\MakesHash; use App\Utils\Traits\Uploadable; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; /** * Class ClientController. diff --git a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php index 7ba208a4557b..2cfea5578a30 100644 --- a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php +++ b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers\ClientPortal; use App\Http\Controllers\Controller; use Auth; -use Illuminate\Http\Request; class ContactHashLoginController extends Controller { diff --git a/app/Http/Controllers/ClientPortal/CreditController.php b/app/Http/Controllers/ClientPortal/CreditController.php index 0c0fecfc46a9..ea2eefcb2c74 100644 --- a/app/Http/Controllers/ClientPortal/CreditController.php +++ b/app/Http/Controllers/ClientPortal/CreditController.php @@ -6,7 +6,6 @@ use App\Http\Controllers\Controller; use App\Http\Requests\ClientPortal\ShowCreditRequest; use App\Models\Credit; use Illuminate\Contracts\View\Factory; -use Illuminate\Http\Request; use Illuminate\View\View; class CreditController extends Controller diff --git a/app/Http/Controllers/ClientPortal/DashboardController.php b/app/Http/Controllers/ClientPortal/DashboardController.php index cad5011f4f24..2dcba5dcd26e 100644 --- a/app/Http/Controllers/ClientPortal/DashboardController.php +++ b/app/Http/Controllers/ClientPortal/DashboardController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers\ClientPortal; use App\Http\Controllers\Controller; use Illuminate\Contracts\View\Factory; -use Illuminate\Http\Request; use Illuminate\View\View; class DashboardController extends Controller diff --git a/app/Http/Controllers/ClientPortal/EntityViewController.php b/app/Http/Controllers/ClientPortal/EntityViewController.php index 23c0d7d848a5..42c0596b8bf0 100644 --- a/app/Http/Controllers/ClientPortal/EntityViewController.php +++ b/app/Http/Controllers/ClientPortal/EntityViewController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\ClientPortal; use App\Http\Controllers\Controller; -use App\Models\Invoice; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index 344889f8ce98..fe31c6fd12cf 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -16,10 +16,6 @@ use App\Events\Invoice\InvoiceWasViewed; use App\Events\Misc\InvitationWasViewed; use App\Events\Quote\QuoteWasViewed; use App\Http\Controllers\Controller; -use App\Models\InvoiceInvitation; -use App\Models\QuoteInvitation; -use App\Models\CreditInvitation; -use App\Models\RecurringInvoiceInvitation; use App\Utils\Ninja; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php index c58186a8c674..61cdc83456be 100644 --- a/app/Http/Controllers/ClientPortal/PaymentController.php +++ b/app/Http/Controllers/ClientPortal/PaymentController.php @@ -225,6 +225,7 @@ class PaymentController extends Controller ->driver(auth()->user()->client) ->setPaymentMethod($payment_method_id) ->setPaymentHash($payment_hash) + ->checkRequirements() ->processPaymentView($data); } @@ -237,6 +238,7 @@ class PaymentController extends Controller ->driver(auth()->user()->client) ->setPaymentMethod($request->input('payment_method_id')) ->setPaymentHash($payment_hash) + ->checkRequirements() ->processPaymentResponse($request); } diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php index f85c367da545..066a84a5099f 100644 --- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php +++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php @@ -17,9 +17,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\ClientPortal\CreatePaymentMethodRequest; use App\Http\Requests\Request; use App\Models\ClientGatewayToken; -use App\Models\CompanyGateway; use App\Models\GatewayType; -use App\PaymentDrivers\AuthorizePaymentDriver; use App\Utils\Ninja; use App\Utils\Traits\MakesDates; use Exception; @@ -57,6 +55,7 @@ class PaymentMethodController extends Controller return $gateway ->driver(auth()->user()->client) ->setPaymentMethod($request->query('method')) + ->checkRequirements() ->authorizeView($data); } @@ -73,6 +72,7 @@ class PaymentMethodController extends Controller return $gateway ->driver(auth()->user()->client) ->setPaymentMethod($request->query('method')) + ->checkRequirements() ->authorizeResponse($request); } diff --git a/app/Http/Controllers/ClientPortal/ProfileController.php b/app/Http/Controllers/ClientPortal/ProfileController.php index 105cbcc809df..b08d081f8e66 100644 --- a/app/Http/Controllers/ClientPortal/ProfileController.php +++ b/app/Http/Controllers/ClientPortal/ProfileController.php @@ -18,9 +18,6 @@ use App\Jobs\Util\UploadAvatar; use App\Models\ClientContact; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Log; use Illuminate\View\View; class ProfileController extends Controller diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php index 02d425a64455..5200f2d62801 100644 --- a/app/Http/Controllers/ClientPortal/QuoteController.php +++ b/app/Http/Controllers/ClientPortal/QuoteController.php @@ -7,7 +7,6 @@ use App\Http\Controllers\Controller; use App\Http\Requests\ClientPortal\ProcessQuotesInBulkRequest; use App\Http\Requests\ClientPortal\ShowQuoteRequest; use App\Jobs\Invoice\InjectSignature; -use App\Models\Company; use App\Models\Quote; use App\Utils\Ninja; use App\Utils\TempFile; diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 42e5c1451975..15fb38c5ecc9 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -20,19 +20,14 @@ use App\Http\Requests\Company\EditCompanyRequest; use App\Http\Requests\Company\ShowCompanyRequest; use App\Http\Requests\Company\StoreCompanyRequest; use App\Http\Requests\Company\UpdateCompanyRequest; -use App\Http\Requests\SignupRequest; use App\Jobs\Company\CreateCompany; use App\Jobs\Company\CreateCompanyPaymentTerms; use App\Jobs\Company\CreateCompanyTaskStatuses; use App\Jobs\Company\CreateCompanyToken; use App\Jobs\Ninja\RefundCancelledAccount; -use App\Jobs\RegisterNewAccount; -use App\Jobs\Util\UploadAvatar; -use App\Models\Account; use App\Models\Company; use App\Models\CompanyUser; use App\Repositories\CompanyRepository; -use App\Transformers\AccountTransformer; use App\Transformers\CompanyTransformer; use App\Transformers\CompanyUserTransformer; use App\Utils\Ninja; @@ -42,7 +37,6 @@ use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Hash; use Turbo124\Beacon\Facades\LightLogs; /** diff --git a/app/Http/Controllers/CompanyGatewayController.php b/app/Http/Controllers/CompanyGatewayController.php index 8a4f63e64f5c..18dad2555c2f 100644 --- a/app/Http/Controllers/CompanyGatewayController.php +++ b/app/Http/Controllers/CompanyGatewayController.php @@ -18,7 +18,6 @@ use App\Http\Requests\CompanyGateway\EditCompanyGatewayRequest; use App\Http\Requests\CompanyGateway\ShowCompanyGatewayRequest; use App\Http\Requests\CompanyGateway\StoreCompanyGatewayRequest; use App\Http\Requests\CompanyGateway\UpdateCompanyGatewayRequest; -use App\Http\Requests\SignupRequest; use App\Models\CompanyGateway; use App\Repositories\CompanyRepository; use App\Transformers\CompanyGatewayTransformer; diff --git a/app/Http/Controllers/CompanyLedgerController.php b/app/Http/Controllers/CompanyLedgerController.php index 79b7eb62dc49..d9de6e4b6b4c 100644 --- a/app/Http/Controllers/CompanyLedgerController.php +++ b/app/Http/Controllers/CompanyLedgerController.php @@ -14,7 +14,6 @@ namespace App\Http\Controllers; use App\Http\Requests\CompanyLedger\ShowCompanyLedgerRequest; use App\Models\CompanyLedger; use App\Transformers\CompanyLedgerTransformer; -use Illuminate\Http\Request; use Illuminate\Http\Response; class CompanyLedgerController extends BaseController diff --git a/app/Http/Controllers/CompanyUserController.php b/app/Http/Controllers/CompanyUserController.php index 0a2d60708f0a..531a106e45f0 100644 --- a/app/Http/Controllers/CompanyUserController.php +++ b/app/Http/Controllers/CompanyUserController.php @@ -16,7 +16,6 @@ use App\Http\Requests\CompanyUser\UpdateCompanyUserRequest; use App\Models\CompanyUser; use App\Models\User; use App\Transformers\CompanyUserTransformer; -use Illuminate\Http\Request; use Illuminate\Http\Response; class CompanyUserController extends BaseController diff --git a/app/Http/Controllers/Contact/InvoiceController.php b/app/Http/Controllers/Contact/InvoiceController.php index e4d2f1fda907..a6307d7d44eb 100644 --- a/app/Http/Controllers/Contact/InvoiceController.php +++ b/app/Http/Controllers/Contact/InvoiceController.php @@ -16,7 +16,6 @@ use App\Http\Controllers\BaseController; use App\Models\Invoice; use App\Transformers\Contact\InvoiceTransformer; use App\Utils\Traits\MakesHash; -use Illuminate\Http\Request; use Illuminate\Http\Response; class InvoiceController extends BaseController diff --git a/app/Http/Controllers/Contact/LoginController.php b/app/Http/Controllers/Contact/LoginController.php index 0d4ad7829a5d..0efa9c9c2fb5 100644 --- a/app/Http/Controllers/Contact/LoginController.php +++ b/app/Http/Controllers/Contact/LoginController.php @@ -19,12 +19,10 @@ use App\Libraries\OAuth\OAuth; use App\Models\ClientContact; use App\Models\User; use App\Transformers\ClientContactLoginTransformer; -use App\Transformers\UserTransformer; use App\Utils\Traits\UserSessionAttributes; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Log; use Laravel\Socialite\Facades\Socialite; class LoginController extends BaseController diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index bd262a36ed91..4bbe544ab120 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -11,7 +11,6 @@ namespace App\Http\Controllers; -use App\Utils\Traits\UserSessionAttributes; use Illuminate\Contracts\View\Factory; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index f35efd2c5d40..d27e18d6a32c 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers; use App\Events\Credit\CreditWasCreated; use App\Events\Credit\CreditWasUpdated; use App\Factory\CloneCreditFactory; -use App\Factory\CloneCreditToQuoteFactory; use App\Factory\CreditFactory; use App\Filters\CreditFilters; use App\Http\Requests\Credit\ActionCreditRequest; @@ -15,10 +14,8 @@ use App\Http\Requests\Credit\EditCreditRequest; use App\Http\Requests\Credit\ShowCreditRequest; use App\Http\Requests\Credit\StoreCreditRequest; use App\Http\Requests\Credit\UpdateCreditRequest; -use App\Http\Requests\Invoice\EditInvoiceRequest; use App\Jobs\Entity\EmailEntity; use App\Jobs\Invoice\EmailCredit; -use App\Jobs\Invoice\MarkInvoicePaid; use App\Models\Client; use App\Models\Credit; use App\Models\Invoice; diff --git a/app/Http/Controllers/DesignController.php b/app/Http/Controllers/DesignController.php index 81f3d784c73e..253b078ea144 100644 --- a/app/Http/Controllers/DesignController.php +++ b/app/Http/Controllers/DesignController.php @@ -19,15 +19,12 @@ use App\Http\Requests\Design\EditDesignRequest; use App\Http\Requests\Design\ShowDesignRequest; use App\Http\Requests\Design\StoreDesignRequest; use App\Http\Requests\Design\UpdateDesignRequest; -use App\Jobs\Entity\ActionEntity; use App\Models\Design; use App\Repositories\DesignRepository; use App\Transformers\DesignTransformer; -use App\Utils\Traits\BulkOptions; use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Cache; /** * Class DesignController. diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php index 7e7e18ca3c86..6b0cd34feb58 100644 --- a/app/Http/Controllers/DocumentController.php +++ b/app/Http/Controllers/DocumentController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\Http\Requests\Document\DestroyDocumentRequest; -use App\Http\Requests\Document\EditDocumentRequest; use App\Http\Requests\Document\ShowDocumentRequest; use App\Http\Requests\Document\StoreDocumentRequest; use App\Http\Requests\Document\UpdateDocumentRequest; diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index e7abdeaae4c5..a255a44cf0ba 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -13,13 +13,11 @@ namespace App\Http\Controllers; use App\Http\Requests\Email\SendEmailRequest; use App\Jobs\Entity\EmailEntity; -use App\Jobs\Invoice\EmailInvoice; use App\Jobs\Mail\EntitySentMailer; use App\Models\Credit; use App\Models\Invoice; use App\Models\Quote; use App\Models\RecurringInvoice; -use App\Notifications\SendGenericNotification; use App\Transformers\CreditTransformer; use App\Transformers\InvoiceTransformer; use App\Transformers\QuoteTransformer; diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index 378ab06c6aff..bb529d3859c5 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -21,14 +21,7 @@ use App\Http\Requests\Expense\EditExpenseRequest; use App\Http\Requests\Expense\ShowExpenseRequest; use App\Http\Requests\Expense\StoreExpenseRequest; use App\Http\Requests\Expense\UpdateExpenseRequest; -use App\Jobs\Entity\ActionEntity; -use App\Jobs\Util\ProcessBulk; -use App\Jobs\Util\UploadAvatar; -use App\Models\Country; -use App\Models\Currency; use App\Models\Expense; -use App\Models\Size; -use App\Repositories\BaseRepository; use App\Repositories\ExpenseRepository; use App\Transformers\ExpenseTransformer; use App\Utils\Ninja; @@ -37,8 +30,6 @@ use App\Utils\Traits\MakesHash; use App\Utils\Traits\Uploadable; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; /** * Class ExpenseController. diff --git a/app/Http/Controllers/GroupSettingController.php b/app/Http/Controllers/GroupSettingController.php index 119f617248cf..4bb2111115a2 100644 --- a/app/Http/Controllers/GroupSettingController.php +++ b/app/Http/Controllers/GroupSettingController.php @@ -18,7 +18,6 @@ use App\Http\Requests\GroupSetting\EditGroupSettingRequest; use App\Http\Requests\GroupSetting\ShowGroupSettingRequest; use App\Http\Requests\GroupSetting\StoreGroupSettingRequest; use App\Http\Requests\GroupSetting\UpdateGroupSettingRequest; -use App\Http\Requests\SignupRequest; use App\Models\GroupSetting; use App\Repositories\GroupSettingRepository; use App\Transformers\GroupSettingTransformer; diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index a6903e983035..b45b9a3c26f2 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -12,9 +12,7 @@ namespace App\Http\Controllers; -use App\DataMapper\CompanySettings; use App\Events\Invoice\InvoiceWasCreated; -use App\Events\Invoice\InvoiceWasEmailed; use App\Events\Invoice\InvoiceWasUpdated; use App\Factory\CloneInvoiceFactory; use App\Factory\CloneInvoiceToQuoteFactory; @@ -33,7 +31,6 @@ use App\Jobs\Invoice\ZipInvoices; use App\Jobs\Util\UnlinkFile; use App\Models\Client; use App\Models\Invoice; -use App\Models\InvoiceInvitation; use App\Models\Quote; use App\Repositories\InvoiceRepository; use App\Transformers\InvoiceTransformer; diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php index 0d171b978c99..e840214ff4b1 100644 --- a/app/Http/Controllers/LicenseController.php +++ b/app/Http/Controllers/LicenseController.php @@ -13,8 +13,6 @@ namespace App\Http\Controllers; use App\Models\Account; use App\Utils\CurlUtils; -use App\Utils\Ninja; -use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Http\Request; use Illuminate\Http\Response; use stdClass; diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 6ca47a94ceab..ca17e3970cf1 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -21,7 +21,6 @@ use App\Models\Company; use App\Models\CompanyToken; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Mail; use Illuminate\Support\Str; class MigrationController extends BaseController diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 96cb5401f3b2..bf8b14da554e 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -11,6 +11,7 @@ namespace App\Http\Controllers; +use App\Events\Payment\PaymentWasUpdated; use App\Factory\PaymentFactory; use App\Filters\PaymentFilters; use App\Http\Requests\Payment\ActionPaymentRequest; @@ -21,18 +22,14 @@ use App\Http\Requests\Payment\RefundPaymentRequest; use App\Http\Requests\Payment\ShowPaymentRequest; use App\Http\Requests\Payment\StorePaymentRequest; use App\Http\Requests\Payment\UpdatePaymentRequest; -use App\Jobs\Entity\ActionEntity; -use App\Jobs\Invoice\ReverseInvoicePayment; use App\Models\Invoice; use App\Models\Payment; -use App\Repositories\BaseRepository; use App\Repositories\PaymentRepository; use App\Transformers\PaymentTransformer; +use App\Utils\Ninja; use App\Utils\Traits\MakesHash; -use App\Events\Payment\PaymentWasUpdated; use Illuminate\Http\Request; use Illuminate\Http\Response; -use App\Utils\Ninja; /** * Class PaymentController. diff --git a/app/Http/Controllers/PaymentTermController.php b/app/Http/Controllers/PaymentTermController.php index 5cb7f1ddc997..8a0c114b9cbf 100644 --- a/app/Http/Controllers/PaymentTermController.php +++ b/app/Http/Controllers/PaymentTermController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\Factory\PaymentTermFactory; -use App\Http\Requests\Payment\StorePaymentRequest; use App\Http\Requests\PaymentTerm\CreatePaymentTermRequest; use App\Http\Requests\PaymentTerm\DestroyPaymentTermRequest; use App\Http\Requests\PaymentTerm\ShowPaymentTermRequest; diff --git a/app/Http/Controllers/PingController.php b/app/Http/Controllers/PingController.php index a265815e53e6..dfc892d05901 100644 --- a/app/Http/Controllers/PingController.php +++ b/app/Http/Controllers/PingController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers; use App\Utils\Ninja; use App\Utils\SystemHealth; -use Illuminate\Http\Request; use Illuminate\Http\Response; class PingController extends BaseController diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php index 9fb3541ad9b3..5993b5279270 100644 --- a/app/Http/Controllers/PreviewController.php +++ b/app/Http/Controllers/PreviewController.php @@ -11,9 +11,7 @@ namespace App\Http\Controllers; -use App\Designs\Custom; use App\Designs\Designer; -use App\Factory\InvoiceFactory; use App\Jobs\Util\PreviewPdf; use App\Models\Client; use App\Models\ClientContact; @@ -26,7 +24,6 @@ use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesInvoiceHtml; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Response; -use Illuminate\Support\Facades\Storage; class PreviewController extends BaseController { diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index 06f9735b4acc..9e536f2c3ba9 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -19,7 +19,6 @@ use App\Http\Requests\Product\EditProductRequest; use App\Http\Requests\Product\ShowProductRequest; use App\Http\Requests\Product\StoreProductRequest; use App\Http\Requests\Product\UpdateProductRequest; -use App\Jobs\Entity\ActionEntity; use App\Models\Product; use App\Repositories\ProductRepository; use App\Transformers\ProductTransformer; diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 67276ddf3e87..97409bf1e2ce 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -19,17 +19,14 @@ use App\Http\Requests\Project\EditProjectRequest; use App\Http\Requests\Project\ShowProjectRequest; use App\Http\Requests\Project\StoreProjectRequest; use App\Http\Requests\Project\UpdateProjectRequest; -use App\Jobs\Entity\ActionEntity; use App\Models\Project; use App\Repositories\ProjectRepository; use App\Transformers\ProjectTransformer; -use App\Utils\Traits\BulkOptions; use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\MakesHash; use App\Utils\Traits\SavesDocuments; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Cache; /** * Class ProjectController. diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index 9d6a49cd55bb..d9fa11abb2b2 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -13,8 +13,6 @@ namespace App\Http\Controllers; use App\Events\Quote\QuoteWasCreated; use App\Events\Quote\QuoteWasUpdated; -use App\Factory\CloneInvoiceFactory; -use App\Factory\CloneInvoiceToQuoteFactory; use App\Factory\CloneQuoteFactory; use App\Factory\CloneQuoteToInvoiceFactory; use App\Factory\QuoteFactory; diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php index 2074062e7b38..21e9cc731aa6 100644 --- a/app/Http/Controllers/RecurringInvoiceController.php +++ b/app/Http/Controllers/RecurringInvoiceController.php @@ -11,8 +11,6 @@ namespace App\Http\Controllers; -use App\Factory\CloneRecurringInvoiceFactory; -use App\Factory\CloneRecurringInvoiceToQuoteFactory; use App\Factory\RecurringInvoiceFactory; use App\Filters\RecurringInvoiceFilters; use App\Http\Requests\RecurringInvoice\ActionRecurringInvoiceRequest; @@ -22,15 +20,12 @@ use App\Http\Requests\RecurringInvoice\EditRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\ShowRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\StoreRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\UpdateRecurringInvoiceRequest; -use App\Jobs\Entity\ActionEntity; use App\Models\RecurringInvoice; -use App\Repositories\BaseRepository; use App\Repositories\RecurringInvoiceRepository; use App\Transformers\RecurringInvoiceTransformer; use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Log; /** * Class RecurringInvoiceController. diff --git a/app/Http/Controllers/RecurringQuoteController.php b/app/Http/Controllers/RecurringQuoteController.php index 4f4fe111fd1c..951676bd53b5 100644 --- a/app/Http/Controllers/RecurringQuoteController.php +++ b/app/Http/Controllers/RecurringQuoteController.php @@ -22,17 +22,14 @@ use App\Http\Requests\RecurringQuote\EditRecurringQuoteRequest; use App\Http\Requests\RecurringQuote\ShowRecurringQuoteRequest; use App\Http\Requests\RecurringQuote\StoreRecurringQuoteRequest; use App\Http\Requests\RecurringQuote\UpdateRecurringQuoteRequest; -use App\Jobs\Entity\ActionEntity; use App\Models\Quote; use App\Models\RecurringQuote; -use App\Repositories\BaseRepository; use App\Repositories\RecurringQuoteRepository; use App\Transformers\QuoteTransformer; use App\Transformers\RecurringQuoteTransformer; use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Log; /** * Class RecurringQuoteController. diff --git a/app/Http/Controllers/SchedulerController.php b/app/Http/Controllers/SchedulerController.php index 2a4ff549ca0d..80e011ca3e2a 100644 --- a/app/Http/Controllers/SchedulerController.php +++ b/app/Http/Controllers/SchedulerController.php @@ -2,8 +2,6 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; - class SchedulerController extends Controller { public function index() diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 5f4de1a7c0f2..fbf1366286ba 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -12,14 +12,10 @@ namespace App\Http\Controllers; use App\Utils\Ninja; -use Composer\Factory; -use Composer\Installer; -use Composer\IO\NullIO; use Cz\Git\GitException; use Cz\Git\GitRepository; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Support\Facades\Artisan; -use Illuminate\Support\Facades\Storage; class SelfUpdateController extends BaseController { diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 80cdedfc7d73..1ddc22e8da38 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -12,7 +12,6 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; -use Illuminate\Http\Response; /** * Class SettingsController. diff --git a/app/Http/Controllers/Shop/ClientController.php b/app/Http/Controllers/Shop/ClientController.php index 8b395137d39a..d8306250633f 100644 --- a/app/Http/Controllers/Shop/ClientController.php +++ b/app/Http/Controllers/Shop/ClientController.php @@ -14,12 +14,10 @@ namespace App\Http\Controllers\Shop; use App\Events\Client\ClientWasCreated; use App\Factory\ClientFactory; use App\Http\Controllers\BaseController; -use App\Http\Requests\Client\StoreClientRequest; use App\Http\Requests\Shop\StoreShopClientRequest; use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; -use App\Models\CompanyToken; use App\Repositories\ClientRepository; use App\Transformers\ClientTransformer; use App\Utils\Ninja; diff --git a/app/Http/Controllers/Shop/InvoiceController.php b/app/Http/Controllers/Shop/InvoiceController.php index cd0c07538d8a..a2e6ae8c5d54 100644 --- a/app/Http/Controllers/Shop/InvoiceController.php +++ b/app/Http/Controllers/Shop/InvoiceController.php @@ -14,11 +14,9 @@ namespace App\Http\Controllers\Shop; use App\Events\Invoice\InvoiceWasCreated; use App\Factory\InvoiceFactory; use App\Http\Controllers\BaseController; -use App\Http\Requests\Invoice\StoreInvoiceRequest; use App\Http\Requests\Shop\StoreShopInvoiceRequest; use App\Models\Client; use App\Models\Company; -use App\Models\CompanyToken; use App\Models\Invoice; use App\Models\InvoiceInvitation; use App\Repositories\InvoiceRepository; diff --git a/app/Http/Controllers/Shop/ProductController.php b/app/Http/Controllers/Shop/ProductController.php index 94274d639259..012d929febee 100644 --- a/app/Http/Controllers/Shop/ProductController.php +++ b/app/Http/Controllers/Shop/ProductController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers\Shop; use App\Http\Controllers\BaseController; use App\Models\Company; -use App\Models\CompanyToken; use App\Models\Product; use App\Transformers\ProductTransformer; use App\Utils\Traits\MakesHash; diff --git a/app/Http/Controllers/Shop/ProfileController.php b/app/Http/Controllers/Shop/ProfileController.php index b24f9c519409..5b9898ff2d87 100644 --- a/app/Http/Controllers/Shop/ProfileController.php +++ b/app/Http/Controllers/Shop/ProfileController.php @@ -13,9 +13,6 @@ namespace App\Http\Controllers\Shop; use App\Http\Controllers\BaseController; use App\Models\Company; -use App\Models\CompanyToken; -use App\Models\Product; -use App\Transformers\ProductTransformer; use App\Transformers\Shop\CompanyShopProfileTransformer; use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/SystemLogController.php b/app/Http/Controllers/SystemLogController.php index 524ca6303362..55bae6d50c0d 100644 --- a/app/Http/Controllers/SystemLogController.php +++ b/app/Http/Controllers/SystemLogController.php @@ -2,9 +2,7 @@ namespace App\Http\Controllers; -use App\Filters\InvoiceFilters; use App\Filters\SystemLogFilters; -use App\Http\Requests\Invoice\ShowInvoiceRequest; use App\Models\SystemLog; use App\Transformers\SystemLogTransformer; use App\Utils\Traits\MakesHash; diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index 928249a95701..926404acbb94 100644 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -21,14 +21,7 @@ use App\Http\Requests\Task\EditTaskRequest; use App\Http\Requests\Task\ShowTaskRequest; use App\Http\Requests\Task\StoreTaskRequest; use App\Http\Requests\Task\UpdateTaskRequest; -use App\Jobs\Entity\ActionEntity; -use App\Jobs\Util\ProcessBulk; -use App\Jobs\Util\UploadAvatar; -use App\Models\Country; -use App\Models\Currency; -use App\Models\Size; use App\Models\Task; -use App\Repositories\BaseRepository; use App\Repositories\TaskRepository; use App\Transformers\TaskTransformer; use App\Utils\Ninja; @@ -37,7 +30,6 @@ use App\Utils\Traits\MakesHash; use App\Utils\Traits\Uploadable; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Cache; /** * Class TaskController. diff --git a/app/Http/Controllers/TemplateController.php b/app/Http/Controllers/TemplateController.php index 041b0a5efb79..1997c904b0bc 100644 --- a/app/Http/Controllers/TemplateController.php +++ b/app/Http/Controllers/TemplateController.php @@ -11,14 +11,11 @@ namespace App\Http\Controllers; -use App\DataMapper\EmailTemplateDefaults; use App\Utils\TemplateEngine; use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesInvoiceHtml; use App\Utils\Traits\MakesTemplateData; use Illuminate\Http\Response; -use Illuminate\Notifications\Messages\MailMessage; -use League\CommonMark\CommonMarkConverter; class TemplateController extends BaseController { diff --git a/app/Http/Controllers/TokenController.php b/app/Http/Controllers/TokenController.php index 9d545107d31b..69c4b69eacc5 100644 --- a/app/Http/Controllers/TokenController.php +++ b/app/Http/Controllers/TokenController.php @@ -19,16 +19,13 @@ use App\Http\Requests\Token\EditTokenRequest; use App\Http\Requests\Token\ShowTokenRequest; use App\Http\Requests\Token\StoreTokenRequest; use App\Http\Requests\Token\UpdateTokenRequest; -use App\Jobs\Entity\ActionEntity; use App\Models\CompanyToken; -use App\Repositories\BaseRepository; use App\Repositories\TokenRepository; use App\Transformers\CompanyTokenTransformer; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Cache; /** * Class TokenController. diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php index b9c2bc6bbb49..43d46fed7148 100644 --- a/app/Http/Controllers/Traits/VerifiesUserEmail.php +++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php @@ -15,7 +15,6 @@ namespace App\Http\Controllers\Traits; use App\Models\User; use App\Utils\Traits\UserSessionAttributes; use Illuminate\Http\RedirectResponse; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; /** diff --git a/app/Http/Controllers/TranslationController.php b/app/Http/Controllers/TranslationController.php index 3593e9f0dd79..00ace21350c9 100644 --- a/app/Http/Controllers/TranslationController.php +++ b/app/Http/Controllers/TranslationController.php @@ -12,7 +12,6 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; -use Illuminate\Http\Response; use Illuminate\Support\Facades\Cache; /** diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 1cf0586a2a3c..6818fa65b7a4 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -12,9 +12,6 @@ namespace App\Http\Controllers; use App\DataMapper\CompanySettings; -use App\DataMapper\DefaultSettings; -use App\Events\User\UserEmailAddressChangedNewEmail; -use App\Events\User\UserEmailAddressChangedOldEmail; use App\Events\User\UserWasCreated; use App\Factory\UserFactory; use App\Filters\UserFilters; @@ -29,7 +26,6 @@ use App\Http\Requests\User\StoreUserRequest; use App\Http\Requests\User\UpdateUserRequest; use App\Jobs\Company\CreateCompanyToken; use App\Jobs\User\UserEmailChanged; -use App\Models\CompanyToken; use App\Models\CompanyUser; use App\Models\User; use App\Repositories\UserRepository; @@ -38,7 +34,6 @@ use App\Utils\Ninja; use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Log; /** * Class UserController. diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php index 3957179560e0..837b35a4db0e 100644 --- a/app/Http/Controllers/VendorController.php +++ b/app/Http/Controllers/VendorController.php @@ -21,14 +21,7 @@ use App\Http\Requests\Vendor\EditVendorRequest; use App\Http\Requests\Vendor\ShowVendorRequest; use App\Http\Requests\Vendor\StoreVendorRequest; use App\Http\Requests\Vendor\UpdateVendorRequest; -use App\Jobs\Entity\ActionEntity; -use App\Jobs\Util\ProcessBulk; -use App\Jobs\Util\UploadAvatar; -use App\Models\Country; -use App\Models\Currency; -use App\Models\Size; use App\Models\Vendor; -use App\Repositories\BaseRepository; use App\Repositories\VendorRepository; use App\Transformers\VendorTransformer; use App\Utils\Ninja; @@ -37,8 +30,6 @@ use App\Utils\Traits\MakesHash; use App\Utils\Traits\Uploadable; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; /** * Class VendorController. diff --git a/app/Http/Livewire/DocumentsTable.php b/app/Http/Livewire/DocumentsTable.php index 6f43bcb0bf02..9aef32ddd27f 100644 --- a/app/Http/Livewire/DocumentsTable.php +++ b/app/Http/Livewire/DocumentsTable.php @@ -13,7 +13,6 @@ namespace App\Http\Livewire; use App\Models\Client; -use App\Models\Document; use App\Utils\Traits\WithSorting; use Livewire\Component; use Livewire\WithPagination; diff --git a/app/Http/Livewire/QuotesTable.php b/app/Http/Livewire/QuotesTable.php index 485f0a3c327e..813a986e24af 100644 --- a/app/Http/Livewire/QuotesTable.php +++ b/app/Http/Livewire/QuotesTable.php @@ -4,7 +4,6 @@ namespace App\Http\Livewire; use App\Models\Quote; use App\Utils\Traits\WithSorting; -use Illuminate\Support\Facades\DB; use Livewire\Component; use Livewire\WithPagination; diff --git a/app/Http/Middleware/ApiSecretCheck.php b/app/Http/Middleware/ApiSecretCheck.php index de0b80c8c707..d4e9fa7c19de 100644 --- a/app/Http/Middleware/ApiSecretCheck.php +++ b/app/Http/Middleware/ApiSecretCheck.php @@ -11,7 +11,6 @@ namespace App\Http\Middleware; -use App\Models\User; use Closure; use Illuminate\Http\Request; use stdClass; diff --git a/app/Http/Middleware/ClientPortalEnabled.php b/app/Http/Middleware/ClientPortalEnabled.php index 40f4a365ea31..f5c5ce8fffc3 100644 --- a/app/Http/Middleware/ClientPortalEnabled.php +++ b/app/Http/Middleware/ClientPortalEnabled.php @@ -11,7 +11,6 @@ namespace App\Http\Middleware; -use App\Models\User; use Closure; use Illuminate\Http\Request; diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php index 1be35211c59b..6740e676cc8f 100644 --- a/app/Http/Middleware/ContactKeyLogin.php +++ b/app/Http/Middleware/ContactKeyLogin.php @@ -14,7 +14,6 @@ namespace App\Http\Middleware; use App\Libraries\MultiDB; use App\Models\Client; use App\Models\ClientContact; -use App\Models\CompanyToken; use Auth; use Closure; use Illuminate\Http\Request; diff --git a/app/Http/Middleware/ContactSetDb.php b/app/Http/Middleware/ContactSetDb.php index 9f744c71199e..70cc8903e3d8 100644 --- a/app/Http/Middleware/ContactSetDb.php +++ b/app/Http/Middleware/ContactSetDb.php @@ -12,7 +12,6 @@ namespace App\Http\Middleware; use App\Libraries\MultiDB; -use App\Models\CompanyToken; use Closure; use Illuminate\Http\Request; use stdClass; diff --git a/app/Http/Middleware/ContactTokenAuth.php b/app/Http/Middleware/ContactTokenAuth.php index 33759d2be039..b4b5cfbce7b5 100644 --- a/app/Http/Middleware/ContactTokenAuth.php +++ b/app/Http/Middleware/ContactTokenAuth.php @@ -13,8 +13,6 @@ namespace App\Http\Middleware; use App\Events\Contact\ContactLoggedIn; use App\Models\ClientContact; -use App\Models\CompanyToken; -use App\Models\User; use App\Utils\Ninja; use Closure; use Illuminate\Http\Request; diff --git a/app/Http/Middleware/Locale.php b/app/Http/Middleware/Locale.php index ca7e85319f38..7ccf7988a8ce 100644 --- a/app/Http/Middleware/Locale.php +++ b/app/Http/Middleware/Locale.php @@ -2,7 +2,6 @@ namespace App\Http\Middleware; -use App\Models\Language; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\App; diff --git a/app/Http/Middleware/PasswordProtection.php b/app/Http/Middleware/PasswordProtection.php index ce482a63e62e..7c034d1adb41 100644 --- a/app/Http/Middleware/PasswordProtection.php +++ b/app/Http/Middleware/PasswordProtection.php @@ -11,8 +11,6 @@ namespace App\Http\Middleware; -use App\Libraries\MultiDB; -use App\Models\CompanyToken; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; diff --git a/app/Http/Middleware/SetDb.php b/app/Http/Middleware/SetDb.php index 49116aca3b3e..e3da1736fee7 100644 --- a/app/Http/Middleware/SetDb.php +++ b/app/Http/Middleware/SetDb.php @@ -12,7 +12,6 @@ namespace App\Http\Middleware; use App\Libraries\MultiDB; -use App\Models\CompanyToken; use Closure; use Illuminate\Http\Request; use stdClass; diff --git a/app/Http/Middleware/SetDbByCompanyKey.php b/app/Http/Middleware/SetDbByCompanyKey.php index e0a340731323..c00c18a133e1 100644 --- a/app/Http/Middleware/SetDbByCompanyKey.php +++ b/app/Http/Middleware/SetDbByCompanyKey.php @@ -12,7 +12,6 @@ namespace App\Http\Middleware; use App\Libraries\MultiDB; -use App\Models\CompanyToken; use Closure; use Illuminate\Http\Request; use stdClass; diff --git a/app/Http/Middleware/SetEmailDb.php b/app/Http/Middleware/SetEmailDb.php index 024a221e7e7c..de45635b4d54 100644 --- a/app/Http/Middleware/SetEmailDb.php +++ b/app/Http/Middleware/SetEmailDb.php @@ -12,7 +12,6 @@ namespace App\Http\Middleware; use App\Libraries\MultiDB; -use App\Models\CompanyToken; use Closure; use Illuminate\Http\Request; use stdClass; diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php index fe0c79a7533c..004c2d352407 100644 --- a/app/Http/Middleware/StartupCheck.php +++ b/app/Http/Middleware/StartupCheck.php @@ -12,17 +12,10 @@ namespace App\Http\Middleware; use App\DataMapper\EmailTemplateDefaults; -use App\Models\Account; -use App\Models\Language; -use App\Utils\CurlUtils; use Closure; use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Request as Input; use Illuminate\Support\Facades\Schema; -use Illuminate\Support\Facades\Session; /** * Class StartupCheck. diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 1d8b76576121..05238993ebba 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -12,8 +12,8 @@ namespace App\Http\Middleware; use Fideloper\Proxy\TrustProxies as Middleware; -use Illuminate\Http\Request; use Illuminate\Contracts\Config\Repository; +use Illuminate\Http\Request; class TrustProxies extends Middleware { diff --git a/app/Http/Requests/Activity/DownloadHistoricalEntityRequest.php b/app/Http/Requests/Activity/DownloadHistoricalEntityRequest.php index 53aca056b769..b44a56cf79c0 100644 --- a/app/Http/Requests/Activity/DownloadHistoricalEntityRequest.php +++ b/app/Http/Requests/Activity/DownloadHistoricalEntityRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Activity; use App\Http\Requests\Request; -use App\Models\Activity; class DownloadHistoricalEntityRequest extends Request { diff --git a/app/Http/Requests/Client/DestroyClientRequest.php b/app/Http/Requests/Client/DestroyClientRequest.php index d640d531c717..3a36019a70f0 100644 --- a/app/Http/Requests/Client/DestroyClientRequest.php +++ b/app/Http/Requests/Client/DestroyClientRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Client; use App\Http\Requests\Request; -use App\Models\Client; class DestroyClientRequest extends Request { diff --git a/app/Http/Requests/Client/EditClientRequest.php b/app/Http/Requests/Client/EditClientRequest.php index 93cdd1856bdc..679e24f641ea 100644 --- a/app/Http/Requests/Client/EditClientRequest.php +++ b/app/Http/Requests/Client/EditClientRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Client; use App\Http\Requests\Request; -use App\Models\Client; class EditClientRequest extends Request { diff --git a/app/Http/Requests/Client/ShowClientRequest.php b/app/Http/Requests/Client/ShowClientRequest.php index d862dcfdee35..4bd14e55bd3f 100644 --- a/app/Http/Requests/Client/ShowClientRequest.php +++ b/app/Http/Requests/Client/ShowClientRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Client; use App\Http\Requests\Request; -use App\Models\Client; class ShowClientRequest extends Request { diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php index 5713f5b299be..405713d993cb 100644 --- a/app/Http/Requests/Client/StoreClientRequest.php +++ b/app/Http/Requests/Client/StoreClientRequest.php @@ -19,7 +19,6 @@ use App\Models\Client; use App\Models\GroupSetting; use App\Utils\Traits\MakesHash; use Illuminate\Support\Facades\Cache; -use Illuminate\Validation\Rule; class StoreClientRequest extends Request { diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php index 4b9963b6f2ef..682b03b767a1 100644 --- a/app/Http/Requests/Client/UpdateClientRequest.php +++ b/app/Http/Requests/Client/UpdateClientRequest.php @@ -11,16 +11,11 @@ namespace App\Http\Requests\Client; -use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; use App\Http\Requests\Request; -use App\Http\ValidationRules\IsDeletedRule; use App\Http\ValidationRules\ValidClientGroupSettingsRule; -use App\Http\ValidationRules\ValidSettingsRule; -use App\Utils\Ninja; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\MakesHash; -use Illuminate\Validation\Rule; class UpdateClientRequest extends Request { diff --git a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php index 1b0eec9504a3..d0ab8a3e3ddc 100644 --- a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php +++ b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\ClientPortal\Documents; -use App\Models\Document; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Http\FormRequest; diff --git a/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php b/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php index 0c9a317a1f14..fef7bb800963 100644 --- a/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php +++ b/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\ClientPortal; use App\Http\Requests\Request; -use App\Models\Invoice; class ShowInvoiceRequest extends Request { diff --git a/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php b/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php index 5526480176d2..5267ca180556 100644 --- a/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php +++ b/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\ClientPortal; use App\Http\Requests\Request; -use App\Models\Invoice; class ShowRecurringInvoiceRequest extends Request { diff --git a/app/Http/Requests/ClientPortal/UpdateContactRequest.php b/app/Http/Requests/ClientPortal/UpdateContactRequest.php index a4cdc50207de..ada58f507606 100644 --- a/app/Http/Requests/ClientPortal/UpdateContactRequest.php +++ b/app/Http/Requests/ClientPortal/UpdateContactRequest.php @@ -13,7 +13,6 @@ namespace App\Http\Requests\ClientPortal; use App\Http\Requests\Request; use App\Utils\Traits\MakesHash; -use Zend\Diactoros\Response\JsonResponse; class UpdateContactRequest extends Request { diff --git a/app/Http/Requests/Company/EditCompanyRequest.php b/app/Http/Requests/Company/EditCompanyRequest.php index 61fe10825f7e..8a2e6d65bced 100644 --- a/app/Http/Requests/Company/EditCompanyRequest.php +++ b/app/Http/Requests/Company/EditCompanyRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Company; use App\Http\Requests\Request; -use App\Models\Company; class EditCompanyRequest extends Request { diff --git a/app/Http/Requests/Company/ShowCompanyRequest.php b/app/Http/Requests/Company/ShowCompanyRequest.php index f8d384eb4a36..49fd98c3da74 100644 --- a/app/Http/Requests/Company/ShowCompanyRequest.php +++ b/app/Http/Requests/Company/ShowCompanyRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Company; use App\Http\Requests\Request; -use App\Models\Company; class ShowCompanyRequest extends Request { diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php index 4d4ec7794a99..dc25a307c323 100644 --- a/app/Http/Requests/Company/StoreCompanyRequest.php +++ b/app/Http/Requests/Company/StoreCompanyRequest.php @@ -15,7 +15,6 @@ use App\DataMapper\CompanySettings; use App\Http\Requests\Request; use App\Http\ValidationRules\Company\ValidCompanyQuantity; use App\Http\ValidationRules\ValidSettingsRule; -use App\Models\ClientContact; use App\Models\Company; use App\Utils\Traits\MakesHash; diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index 76464d7a8b62..46b8e01458eb 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -14,10 +14,7 @@ namespace App\Http\Requests\Company; use App\DataMapper\CompanySettings; use App\Http\Requests\Request; use App\Http\ValidationRules\ValidSettingsRule; -use App\Utils\Ninja; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateCompanyRequest extends Request { diff --git a/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php index 0efb4bce2657..1728050b42ff 100644 --- a/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\CompanyGateway; use App\Http\Requests\Request; -use App\Models\Company; class CreateCompanyGatewayRequest extends Request { diff --git a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php index 5536510e14f3..ed09e96d98bb 100644 --- a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\CompanyGateway; use App\Http\Requests\Request; -use App\Models\Company; class DestroyCompanyGatewayRequest extends Request { diff --git a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php index ca0ed422fe78..4179b99e9731 100644 --- a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\CompanyGateway; use App\Http\Requests\Request; -use App\Models\Company; class EditCompanyGatewayRequest extends Request { diff --git a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php index 5684885b9c15..8917669873af 100644 --- a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\CompanyGateway; use App\Http\Requests\Request; -use App\Models\Company; class ShowCompanyGatewayRequest extends Request { diff --git a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php index 6f86a96a2a55..d8d95b26d222 100644 --- a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php @@ -13,7 +13,6 @@ namespace App\Http\Requests\CompanyGateway; use App\Http\Requests\Request; use App\Http\ValidationRules\ValidCompanyGatewayFeesAndLimitsRule; -use App\Models\Company; use App\Models\Gateway; use App\Utils\Traits\CompanyGatewayFeesAndLimitsSaver; diff --git a/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php b/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php index 21e3ae44d597..f3e66de88cf4 100644 --- a/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php +++ b/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php @@ -12,11 +12,7 @@ namespace App\Http\Requests\CompanyUser; use App\Http\Requests\Request; -use App\Utils\Traits\ChecksEntityStatus; -use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateCompanyUserRequest extends Request { diff --git a/app/Http/Requests/Credit/CreateCreditRequest.php b/app/Http/Requests/Credit/CreateCreditRequest.php index b4d9414de73f..8fa193057b34 100644 --- a/app/Http/Requests/Credit/CreateCreditRequest.php +++ b/app/Http/Requests/Credit/CreateCreditRequest.php @@ -12,8 +12,8 @@ namespace App\Http\Requests\Credit; -use App\Models\Credit; use App\Http\Requests\Request; +use App\Models\Credit; class CreateCreditRequest extends Request { diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php index 13a23b60dfa2..a1c937f6c178 100644 --- a/app/Http/Requests/Credit/StoreCreditRequest.php +++ b/app/Http/Requests/Credit/StoreCreditRequest.php @@ -11,11 +11,11 @@ namespace App\Http\Requests\Credit; +use App\Http\Requests\Request; use App\Http\ValidationRules\Credit\UniqueCreditNumberRule; use App\Models\Credit; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; -use App\Http\Requests\Request; class StoreCreditRequest extends Request { diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php index a1d1acecb056..fe0cf4a9ebc4 100644 --- a/app/Http/Requests/Credit/UpdateCreditRequest.php +++ b/app/Http/Requests/Credit/UpdateCreditRequest.php @@ -12,10 +12,10 @@ namespace App\Http\Requests\Credit; +use App\Http\Requests\Request; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; -use App\Http\Requests\Request; class UpdateCreditRequest extends Request { diff --git a/app/Http/Requests/Design/CreateDesignRequest.php b/app/Http/Requests/Design/CreateDesignRequest.php index d2ae4b64ee77..5b7e2b76069b 100644 --- a/app/Http/Requests/Design/CreateDesignRequest.php +++ b/app/Http/Requests/Design/CreateDesignRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Design; use App\Http\Requests\Request; -use App\Models\Design; class CreateDesignRequest extends Request { diff --git a/app/Http/Requests/Design/StoreDesignRequest.php b/app/Http/Requests/Design/StoreDesignRequest.php index 1420a12484e7..ae4e53b800ee 100644 --- a/app/Http/Requests/Design/StoreDesignRequest.php +++ b/app/Http/Requests/Design/StoreDesignRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Design; use App\Http\Requests\Request; -use App\Models\Design; class StoreDesignRequest extends Request { diff --git a/app/Http/Requests/Design/UpdateDesignRequest.php b/app/Http/Requests/Design/UpdateDesignRequest.php index 331bcc96d653..fd84ede591cf 100644 --- a/app/Http/Requests/Design/UpdateDesignRequest.php +++ b/app/Http/Requests/Design/UpdateDesignRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Design; use App\Http\Requests\Request; -use App\Models\Design; use App\Utils\Traits\ChecksEntityStatus; class UpdateDesignRequest extends Request diff --git a/app/Http/Requests/Document/UpdateDocumentRequest.php b/app/Http/Requests/Document/UpdateDocumentRequest.php index 9557e80d3098..046aa31b5496 100644 --- a/app/Http/Requests/Document/UpdateDocumentRequest.php +++ b/app/Http/Requests/Document/UpdateDocumentRequest.php @@ -12,9 +12,7 @@ namespace App\Http\Requests\Document; use App\Http\Requests\Request; -use App\Models\Document; use App\Utils\Traits\ChecksEntityStatus; -use Illuminate\Support\Facades\Log; class UpdateDocumentRequest extends Request { diff --git a/app/Http/Requests/Expense/BulkExpenseRequest.php b/app/Http/Requests/Expense/BulkExpenseRequest.php index 9d4d430d2586..3b054872959a 100644 --- a/app/Http/Requests/Expense/BulkExpenseRequest.php +++ b/app/Http/Requests/Expense/BulkExpenseRequest.php @@ -12,9 +12,9 @@ namespace App\Http\Requests\Expense; +use App\Http\Requests\Request; use App\Models\Expense; use App\Utils\Traits\BulkOptions; -use App\Http\Requests\Request; class BulkExpenseRequest extends Request { diff --git a/app/Http/Requests/Expense/DestroyExpenseRequest.php b/app/Http/Requests/Expense/DestroyExpenseRequest.php index c5ba3194f38d..3c84c2282ab0 100644 --- a/app/Http/Requests/Expense/DestroyExpenseRequest.php +++ b/app/Http/Requests/Expense/DestroyExpenseRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Expense; use App\Http\Requests\Request; -use App\Models\Expense; class DestroyExpenseRequest extends Request { diff --git a/app/Http/Requests/Expense/EditExpenseRequest.php b/app/Http/Requests/Expense/EditExpenseRequest.php index 25e4fabba531..b5a7243d3bd5 100644 --- a/app/Http/Requests/Expense/EditExpenseRequest.php +++ b/app/Http/Requests/Expense/EditExpenseRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Expense; use App\Http\Requests\Request; -use App\Models\Expense; class EditExpenseRequest extends Request { diff --git a/app/Http/Requests/Expense/ShowExpenseRequest.php b/app/Http/Requests/Expense/ShowExpenseRequest.php index bf636c1c4a22..bf34a5963d52 100644 --- a/app/Http/Requests/Expense/ShowExpenseRequest.php +++ b/app/Http/Requests/Expense/ShowExpenseRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Expense; use App\Http\Requests\Request; -use App\Models\Expense; class ShowExpenseRequest extends Request { diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php index f1e7482f5454..555ed82ea014 100644 --- a/app/Http/Requests/Expense/StoreExpenseRequest.php +++ b/app/Http/Requests/Expense/StoreExpenseRequest.php @@ -11,14 +11,10 @@ namespace App\Http\Requests\Expense; -use App\DataMapper\ExpenseSettings; use App\Http\Requests\Request; use App\Http\ValidationRules\Expense\UniqueExpenseNumberRule; -use App\Http\ValidationRules\User\RelatedUserRule; -use App\Http\ValidationRules\ValidExpenseGroupSettingsRule; use App\Models\Expense; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; use Illuminate\Validation\Rule; class StoreExpenseRequest extends Request diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php index 05f3cb5af5b1..23cb149fdfbe 100644 --- a/app/Http/Requests/Expense/UpdateExpenseRequest.php +++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php @@ -12,11 +12,8 @@ namespace App\Http\Requests\Expense; use App\Http\Requests\Request; -use App\Http\ValidationRules\IsDeletedRule; -use App\Http\ValidationRules\ValidExpenseGroupSettingsRule; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; use Illuminate\Validation\Rule; class UpdateExpenseRequest extends Request diff --git a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php index 39ea6f22b2e7..dbbe8d42ac60 100644 --- a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php +++ b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php @@ -12,9 +12,8 @@ namespace App\Http\Requests\ExpenseCategory; -use App\Models\ExpenseCategory; -use App\Utils\Traits\BulkOptions; use App\Http\Requests\Request; +use App\Utils\Traits\BulkOptions; class BulkExpenseCategoryRequest extends Request { @@ -27,7 +26,7 @@ class BulkExpenseCategoryRequest extends Request */ public function authorize() { - return auth()->user()->->isAdmin(); + return auth()->user()->isAdmin(); } /** diff --git a/app/Http/Requests/ExpenseCategory/DestroyExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/DestroyExpenseCategoryRequest.php index 126bb2e1ead3..27b6f9ff827d 100644 --- a/app/Http/Requests/ExpenseCategory/DestroyExpenseCategoryRequest.php +++ b/app/Http/Requests/ExpenseCategory/DestroyExpenseCategoryRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\ExpenseCategory; use App\Http\Requests\Request; -use App\Models\ExpenseCategory; class DestroyExpenseCategoryRequest extends Request { diff --git a/app/Http/Requests/ExpenseCategory/EditExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/EditExpenseCategoryRequest.php index 6046b3d8c1df..f8961513d840 100644 --- a/app/Http/Requests/ExpenseCategory/EditExpenseCategoryRequest.php +++ b/app/Http/Requests/ExpenseCategory/EditExpenseCategoryRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\ExpenseCategory; use App\Http\Requests\Request; -use App\Models\ExpenseCategory; class EditExpenseCategoryRequest extends Request { diff --git a/app/Http/Requests/ExpenseCategory/ShowExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/ShowExpenseCategoryRequest.php index 7f8cf1413994..52235eba4a3a 100644 --- a/app/Http/Requests/ExpenseCategory/ShowExpenseCategoryRequest.php +++ b/app/Http/Requests/ExpenseCategory/ShowExpenseCategoryRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\ExpenseCategory; use App\Http\Requests\Request; -use App\Models\ExpenseCategory; class ShowExpenseCategoryRequest extends Request { diff --git a/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php index 43197401d78b..6553e5107168 100644 --- a/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\GroupSetting; use App\Http\Requests\Request; -use App\Http\ValidationRules\ValidSettingsRule; use App\Models\GroupSetting; class CreateGroupSettingRequest extends Request diff --git a/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php b/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php index daff63dacec7..7158deca9e37 100644 --- a/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\GroupSetting; use App\Http\Requests\Request; -use App\Models\GroupSetting; class DestroyGroupSettingRequest extends Request { diff --git a/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php b/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php index 7581f5a33708..ed5874985681 100644 --- a/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\GroupSetting; use App\Http\Requests\Request; -use App\Models\GroupSetting; class EditGroupSettingRequest extends Request { diff --git a/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php b/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php index 661639d89bba..2dadf5923db6 100644 --- a/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\GroupSetting; use App\Http\Requests\Request; -use App\Models\GroupSetting; class ShowGroupSettingRequest extends Request { diff --git a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php index 0beb6ed7988e..f1e36684b338 100644 --- a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php @@ -15,7 +15,6 @@ use App\DataMapper\ClientSettings; use App\Http\Requests\Request; use App\Http\ValidationRules\ValidClientGroupSettingsRule; use App\Models\GroupSetting; -use Illuminate\Support\Facades\Log; class StoreGroupSettingRequest extends Request { diff --git a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php index 06b4b505f21f..9263266c322b 100644 --- a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php @@ -14,9 +14,6 @@ namespace App\Http\Requests\GroupSetting; use App\DataMapper\CompanySettings; use App\Http\Requests\Request; use App\Http\ValidationRules\ValidClientGroupSettingsRule; -use App\Utils\Ninja; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateGroupSettingRequest extends Request { diff --git a/app/Http/Requests/Invoice/DestroyInvoiceRequest.php b/app/Http/Requests/Invoice/DestroyInvoiceRequest.php index a7fcdff45089..fa315f066f8a 100644 --- a/app/Http/Requests/Invoice/DestroyInvoiceRequest.php +++ b/app/Http/Requests/Invoice/DestroyInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Invoice; use App\Http\Requests\Request; -use App\Models\Invoice; class DestroyInvoiceRequest extends Request { diff --git a/app/Http/Requests/Invoice/EditInvoiceRequest.php b/app/Http/Requests/Invoice/EditInvoiceRequest.php index 89b918c46a2a..af140718bd43 100644 --- a/app/Http/Requests/Invoice/EditInvoiceRequest.php +++ b/app/Http/Requests/Invoice/EditInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Invoice; use App\Http\Requests\Request; -use App\Models\Invoice; class EditInvoiceRequest extends Request { diff --git a/app/Http/Requests/Invoice/ShowInvoiceRequest.php b/app/Http/Requests/Invoice/ShowInvoiceRequest.php index 1ed386c5c180..0ffa97abbdfb 100644 --- a/app/Http/Requests/Invoice/ShowInvoiceRequest.php +++ b/app/Http/Requests/Invoice/ShowInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Invoice; use App\Http\Requests\Request; -use App\Models\Invoice; class ShowInvoiceRequest extends Request { diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php index 628de0aec37e..5f0464d7621e 100644 --- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php +++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php @@ -14,7 +14,6 @@ namespace App\Http\Requests\Invoice; use App\Http\Requests\Request; use App\Http\ValidationRules\Invoice\UniqueInvoiceNumberRule; use App\Http\ValidationRules\Project\ValidProjectForClient; -use App\Models\ClientContact; use App\Models\Invoice; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php index 6f71c4ab6dc5..35bb8e621f7d 100644 --- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php +++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php @@ -16,8 +16,6 @@ use App\Http\ValidationRules\Invoice\LockedInvoiceRule; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateInvoiceRequest extends Request { diff --git a/app/Http/Requests/Payment/ActionPaymentRequest.php b/app/Http/Requests/Payment/ActionPaymentRequest.php index de1110778ae6..9b87f5277d01 100644 --- a/app/Http/Requests/Payment/ActionPaymentRequest.php +++ b/app/Http/Requests/Payment/ActionPaymentRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Payment; use App\Http\Requests\Request; -use App\Models\Payment; class ActionPaymentRequest extends Request { diff --git a/app/Http/Requests/Payment/DestroyPaymentRequest.php b/app/Http/Requests/Payment/DestroyPaymentRequest.php index 6bc33ccc3f88..89f63797f992 100644 --- a/app/Http/Requests/Payment/DestroyPaymentRequest.php +++ b/app/Http/Requests/Payment/DestroyPaymentRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Payment; use App\Http\Requests\Request; -use App\Models\Payment; class DestroyPaymentRequest extends Request { diff --git a/app/Http/Requests/Payment/EditPaymentRequest.php b/app/Http/Requests/Payment/EditPaymentRequest.php index db6c0e3dd5de..0ec6e97c80e4 100644 --- a/app/Http/Requests/Payment/EditPaymentRequest.php +++ b/app/Http/Requests/Payment/EditPaymentRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Payment; use App\Http\Requests\Request; -use App\Models\Payment; class EditPaymentRequest extends Request { diff --git a/app/Http/Requests/Payment/ShowPaymentRequest.php b/app/Http/Requests/Payment/ShowPaymentRequest.php index 3f8b5f6a714d..a10d593de0a9 100644 --- a/app/Http/Requests/Payment/ShowPaymentRequest.php +++ b/app/Http/Requests/Payment/ShowPaymentRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Payment; use App\Http\Requests\Request; -use App\Models\Payment; class ShowPaymentRequest extends Request { diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php index b2ea76a15db9..b14cd40da4a0 100644 --- a/app/Http/Requests/Payment/StorePaymentRequest.php +++ b/app/Http/Requests/Payment/StorePaymentRequest.php @@ -12,8 +12,8 @@ namespace App\Http\Requests\Payment; use App\Http\Requests\Request; -use App\Http\ValidationRules\Credit\ValidCreditsRules; use App\Http\ValidationRules\Credit\CreditsSumRule; +use App\Http\ValidationRules\Credit\ValidCreditsRules; use App\Http\ValidationRules\Payment\ValidInvoicesRules; use App\Http\ValidationRules\PaymentAmountsBalanceRule; use App\Http\ValidationRules\ValidCreditsPresentRule; diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php index 182fccd83a81..3be776c3224e 100644 --- a/app/Http/Requests/Payment/UpdatePaymentRequest.php +++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php @@ -16,7 +16,6 @@ use App\Http\ValidationRules\PaymentAppliedValidAmount; use App\Http\ValidationRules\ValidCreditsPresentRule; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\MakesHash; -use Illuminate\Validation\Rule; class UpdatePaymentRequest extends Request { diff --git a/app/Http/Requests/PaymentTerm/ActionPaymentTermRequest.php b/app/Http/Requests/PaymentTerm/ActionPaymentTermRequest.php index 9e181b701802..a5b91a45a549 100644 --- a/app/Http/Requests/PaymentTerm/ActionPaymentTermRequest.php +++ b/app/Http/Requests/PaymentTerm/ActionPaymentTermRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\PaymentTerm; use App\Http\Requests\Request; -use App\Models\Payment; class ActionPaymentTermRequest extends Request { diff --git a/app/Http/Requests/PaymentTerm/CreatePaymentTermRequest.php b/app/Http/Requests/PaymentTerm/CreatePaymentTermRequest.php index 5cb29f5cdcf0..bd5a1c8895e9 100644 --- a/app/Http/Requests/PaymentTerm/CreatePaymentTermRequest.php +++ b/app/Http/Requests/PaymentTerm/CreatePaymentTermRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\PaymentTerm; use App\Http\Requests\Request; -use App\Models\PaymentTerm; class CreatePaymentTermRequest extends Request { diff --git a/app/Http/Requests/PaymentTerm/DestroyPaymentTermRequest.php b/app/Http/Requests/PaymentTerm/DestroyPaymentTermRequest.php index a16b8d314cf2..4f292243a90c 100644 --- a/app/Http/Requests/PaymentTerm/DestroyPaymentTermRequest.php +++ b/app/Http/Requests/PaymentTerm/DestroyPaymentTermRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\PaymentTerm; use App\Http\Requests\Request; -use App\Models\PaymentTerm; class DestroyPaymentTermRequest extends Request { diff --git a/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php b/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php index 4d2f55a09530..39d262b650aa 100644 --- a/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php +++ b/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\PaymentTerm; use App\Http\Requests\Request; -use App\Models\PaymentTerm; class EditPaymentTermRequest extends Request { diff --git a/app/Http/Requests/PaymentTerm/ShowPaymentTermRequest.php b/app/Http/Requests/PaymentTerm/ShowPaymentTermRequest.php index 66bfe05f4b6e..015fcf0afb5a 100644 --- a/app/Http/Requests/PaymentTerm/ShowPaymentTermRequest.php +++ b/app/Http/Requests/PaymentTerm/ShowPaymentTermRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\PaymentTerm; use App\Http\Requests\Request; -use App\Models\PaymentTerm; class ShowPaymentTermRequest extends Request { diff --git a/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php b/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php index c1ea8f6b8b7c..78fc1db02ed2 100644 --- a/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php +++ b/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\PaymentTerm; use App\Http\Requests\Request; -use App\Models\PaymentTerm; use App\Utils\Traits\MakesHash; class StorePaymentTermRequest extends Request diff --git a/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php b/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php index 73760fac0977..5c5966d66b1b 100644 --- a/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php +++ b/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php @@ -13,7 +13,6 @@ namespace App\Http\Requests\PaymentTerm; use App\Http\Requests\Request; use App\Utils\Traits\MakesHash; -use Illuminate\Validation\Rule; class UpdatePaymentTermRequest extends Request { diff --git a/app/Http/Requests/Payments/PaymentWebhookRequest.php b/app/Http/Requests/Payments/PaymentWebhookRequest.php index f4177fe8b4b6..7dc483272a23 100644 --- a/app/Http/Requests/Payments/PaymentWebhookRequest.php +++ b/app/Http/Requests/Payments/PaymentWebhookRequest.php @@ -12,9 +12,9 @@ namespace App\Http\Requests\Payments; +use App\Http\Requests\Request; use App\Models\Company; use App\Models\CompanyGateway; -use App\Http\Requests\Request; class PaymentWebhookRequest extends Request { diff --git a/app/Http/Requests/Product/DestroyProductRequest.php b/app/Http/Requests/Product/DestroyProductRequest.php index 060c83caf5f4..11dbc36f1b38 100644 --- a/app/Http/Requests/Product/DestroyProductRequest.php +++ b/app/Http/Requests/Product/DestroyProductRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Product; use App\Http\Requests\Request; -use App\Models\Payment; class DestroyProductRequest extends Request { diff --git a/app/Http/Requests/Product/UpdateProductRequest.php b/app/Http/Requests/Product/UpdateProductRequest.php index c8bdfe25c58d..8b0a09cd66b9 100644 --- a/app/Http/Requests/Product/UpdateProductRequest.php +++ b/app/Http/Requests/Product/UpdateProductRequest.php @@ -14,7 +14,6 @@ namespace App\Http\Requests\Product; use App\Http\Requests\Request; use App\Models\Product; use App\Utils\Traits\ChecksEntityStatus; -use Illuminate\Support\Facades\Log; class UpdateProductRequest extends Request { diff --git a/app/Http/Requests/Project/CreateProjectRequest.php b/app/Http/Requests/Project/CreateProjectRequest.php index 074c617c19f9..ba90aa3b0bdc 100644 --- a/app/Http/Requests/Project/CreateProjectRequest.php +++ b/app/Http/Requests/Project/CreateProjectRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Project; use App\Http\Requests\Request; -use App\Models\Project; class CreateProjectRequest extends Request { diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php index 89bc1d468176..66e3c72f5887 100644 --- a/app/Http/Requests/Project/UpdateProjectRequest.php +++ b/app/Http/Requests/Project/UpdateProjectRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Project; use App\Http\Requests\Request; -use App\Models\Project; use App\Utils\Traits\ChecksEntityStatus; class UpdateProjectRequest extends Request diff --git a/app/Http/Requests/Quote/ActionQuoteRequest.php b/app/Http/Requests/Quote/ActionQuoteRequest.php index 6300619f706f..abaad92e4861 100644 --- a/app/Http/Requests/Quote/ActionQuoteRequest.php +++ b/app/Http/Requests/Quote/ActionQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Quote; use App\Http\Requests\Request; -use App\Models\Quote; class ActionQuoteRequest extends Request { diff --git a/app/Http/Requests/Quote/DestroyQuoteRequest.php b/app/Http/Requests/Quote/DestroyQuoteRequest.php index 67f4fb755e3f..48b2513ca6f2 100644 --- a/app/Http/Requests/Quote/DestroyQuoteRequest.php +++ b/app/Http/Requests/Quote/DestroyQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Quote; use App\Http\Requests\Request; -use App\Models\Quote; class DestroyQuoteRequest extends Request { diff --git a/app/Http/Requests/Quote/EditQuoteRequest.php b/app/Http/Requests/Quote/EditQuoteRequest.php index 5f1b7e335e21..18ad11bea1bd 100644 --- a/app/Http/Requests/Quote/EditQuoteRequest.php +++ b/app/Http/Requests/Quote/EditQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Quote; use App\Http\Requests\Request; -use App\Models\Quote; class EditQuoteRequest extends Request { diff --git a/app/Http/Requests/Quote/ShowQuoteRequest.php b/app/Http/Requests/Quote/ShowQuoteRequest.php index f9be441c66c0..dc81434d5a86 100644 --- a/app/Http/Requests/Quote/ShowQuoteRequest.php +++ b/app/Http/Requests/Quote/ShowQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Quote; use App\Http\Requests\Request; -use App\Models\Quote; class ShowQuoteRequest extends Request { diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php index 1af628725493..7cf2b497cb08 100644 --- a/app/Http/Requests/Quote/UpdateQuoteRequest.php +++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php @@ -15,8 +15,6 @@ use App\Http\Requests\Request; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateQuoteRequest extends Request { diff --git a/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php index 0cb811d5a727..a149536707c0 100644 --- a/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringInvoice; use App\Http\Requests\Request; -use App\Models\RecurringInvoice; class ActionRecurringInvoiceRequest extends Request { diff --git a/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php index e58d7d7dee1d..3b20a3ff4398 100644 --- a/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringInvoice; use App\Http\Requests\Request; -use App\Models\RecurringInvoice; class DestroyRecurringInvoiceRequest extends Request { diff --git a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php index fff1183dd475..c32e01d35565 100644 --- a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringInvoice; use App\Http\Requests\Request; -use App\Models\RecurringInvoice; class EditRecurringInvoiceRequest extends Request { diff --git a/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php index 8397115535df..9bc256f14edb 100644 --- a/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringInvoice; use App\Http\Requests\Request; -use App\Models\RecurringInvoice; class ShowRecurringInvoiceRequest extends Request { diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php index a02fa5a989b0..c06b0c6242d3 100644 --- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php @@ -15,8 +15,6 @@ use App\Http\Requests\Request; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateRecurringInvoiceRequest extends Request { diff --git a/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php index 9cecff60901f..e5a2b7069655 100644 --- a/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringQuote; use App\Http\Requests\Request; -use App\Models\RecurringQuote; class ActionRecurringQuoteRequest extends Request { diff --git a/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php index 14e16893d180..9c4b4691c9eb 100644 --- a/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringQuote; use App\Http\Requests\Request; -use App\Models\RecurringQuote; class DestroyRecurringQuoteRequest extends Request { diff --git a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php index 2efd6e7e14dc..1c0e46b09505 100644 --- a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringQuote; use App\Http\Requests\Request; -use App\Models\RecurringQuote; class EditRecurringQuoteRequest extends Request { diff --git a/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php index b2b3046ee320..a82d0010802e 100644 --- a/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\RecurringQuote; use App\Http\Requests\Request; -use App\Models\RecurringQuote; class ShowRecurringQuoteRequest extends Request { diff --git a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php index 3053887ec7a3..dc0087bd74a7 100644 --- a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php @@ -14,8 +14,6 @@ namespace App\Http\Requests\RecurringQuote; use App\Http\Requests\Request; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\CleanLineItems; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateRecurringQuoteRequest extends Request { diff --git a/app/Http/Requests/Shop/StoreShopClientRequest.php b/app/Http/Requests/Shop/StoreShopClientRequest.php index fa199ad00139..c28618e37d9c 100644 --- a/app/Http/Requests/Shop/StoreShopClientRequest.php +++ b/app/Http/Requests/Shop/StoreShopClientRequest.php @@ -20,7 +20,6 @@ use App\Models\Company; use App\Models\GroupSetting; use App\Utils\Traits\MakesHash; use Illuminate\Support\Facades\Cache; -use Illuminate\Validation\Rule; class StoreShopClientRequest extends Request { diff --git a/app/Http/Requests/Shop/StoreShopInvoiceRequest.php b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php index cb389cb82f7e..54c00b49e751 100644 --- a/app/Http/Requests/Shop/StoreShopInvoiceRequest.php +++ b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php @@ -13,9 +13,7 @@ namespace App\Http\Requests\Shop; use App\Http\Requests\Request; use App\Http\ValidationRules\Invoice\UniqueInvoiceNumberRule; -use App\Models\ClientContact; use App\Models\Company; -use App\Models\Invoice; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; diff --git a/app/Http/Requests/Task/BulkTaskRequest.php b/app/Http/Requests/Task/BulkTaskRequest.php index 876488c726fb..4cb648f35f49 100644 --- a/app/Http/Requests/Task/BulkTaskRequest.php +++ b/app/Http/Requests/Task/BulkTaskRequest.php @@ -12,9 +12,9 @@ namespace App\Http\Requests\Task; +use App\Http\Requests\Request; use App\Models\Task; use App\Utils\Traits\BulkOptions; -use App\Http\Requests\Request; class BulkTaskRequest extends Request { diff --git a/app/Http/Requests/Task/DestroyTaskRequest.php b/app/Http/Requests/Task/DestroyTaskRequest.php index 3a72fc215aec..6f8d1ca5e261 100644 --- a/app/Http/Requests/Task/DestroyTaskRequest.php +++ b/app/Http/Requests/Task/DestroyTaskRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Task; use App\Http\Requests\Request; -use App\Models\Task; class DestroyTaskRequest extends Request { diff --git a/app/Http/Requests/Task/EditTaskRequest.php b/app/Http/Requests/Task/EditTaskRequest.php index a2a52c466f18..e19d4cdc9cee 100644 --- a/app/Http/Requests/Task/EditTaskRequest.php +++ b/app/Http/Requests/Task/EditTaskRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Task; use App\Http\Requests\Request; -use App\Models\Task; class EditTaskRequest extends Request { diff --git a/app/Http/Requests/Task/ShowTaskRequest.php b/app/Http/Requests/Task/ShowTaskRequest.php index f285b2c95625..5d11ec7d4d9e 100644 --- a/app/Http/Requests/Task/ShowTaskRequest.php +++ b/app/Http/Requests/Task/ShowTaskRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Task; use App\Http\Requests\Request; -use App\Models\Task; class ShowTaskRequest extends Request { diff --git a/app/Http/Requests/Task/StoreTaskRequest.php b/app/Http/Requests/Task/StoreTaskRequest.php index a7813c7a9c23..942cd77aa0a7 100644 --- a/app/Http/Requests/Task/StoreTaskRequest.php +++ b/app/Http/Requests/Task/StoreTaskRequest.php @@ -11,13 +11,9 @@ namespace App\Http\Requests\Task; -use App\DataMapper\TaskSettings; use App\Http\Requests\Request; -use App\Http\ValidationRules\Task\UniqueTaskNumberRule; -use App\Http\ValidationRules\ValidTaskGroupSettingsRule; use App\Models\Task; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; use Illuminate\Validation\Rule; class StoreTaskRequest extends Request diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php index 1610800efb49..1db58516b8bb 100644 --- a/app/Http/Requests/Task/UpdateTaskRequest.php +++ b/app/Http/Requests/Task/UpdateTaskRequest.php @@ -12,11 +12,8 @@ namespace App\Http\Requests\Task; use App\Http\Requests\Request; -use App\Http\ValidationRules\IsDeletedRule; -use App\Http\ValidationRules\ValidTaskGroupSettingsRule; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; use Illuminate\Validation\Rule; class UpdateTaskRequest extends Request diff --git a/app/Http/Requests/TaskStatus/ActionTaskStatusRequest.php b/app/Http/Requests/TaskStatus/ActionTaskStatusRequest.php index 379417df8d08..7539fb6f2a85 100644 --- a/app/Http/Requests/TaskStatus/ActionTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/ActionTaskStatusRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaskStatus; use App\Http\Requests\Request; -use App\Models\Payment; class ActionTaskStatusRequest extends Request { diff --git a/app/Http/Requests/TaskStatus/CreateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/CreateTaskStatusRequest.php index 42850061ecff..55f3663442e5 100644 --- a/app/Http/Requests/TaskStatus/CreateTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/CreateTaskStatusRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaskStatus; use App\Http\Requests\Request; -use App\Models\TaskStatus; class CreateTaskStatusRequest extends Request { diff --git a/app/Http/Requests/TaskStatus/DestroyTaskStatusRequest.php b/app/Http/Requests/TaskStatus/DestroyTaskStatusRequest.php index 37cceac60e45..83ba20afc235 100644 --- a/app/Http/Requests/TaskStatus/DestroyTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/DestroyTaskStatusRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaskStatus; use App\Http\Requests\Request; -use App\Models\TaskStatus; class DestroyTaskStatusRequest extends Request { diff --git a/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php index f47d92f4cd5e..45899c5d20a1 100644 --- a/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaskStatus; use App\Http\Requests\Request; -use App\Models\TaskStatus; class EditTaskStatusRequest extends Request { diff --git a/app/Http/Requests/TaskStatus/ShowTaskStatusRequest.php b/app/Http/Requests/TaskStatus/ShowTaskStatusRequest.php index 9037c2628abb..fe0aebe3cf13 100644 --- a/app/Http/Requests/TaskStatus/ShowTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/ShowTaskStatusRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaskStatus; use App\Http\Requests\Request; -use App\Models\TaskStatus; class ShowTaskStatusRequest extends Request { diff --git a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php index 9ecfc444ec34..97834f84da81 100644 --- a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaskStatus; use App\Http\Requests\Request; -use App\Models\TaskStatus; use App\Utils\Traits\MakesHash; class StoreTaskStatusRequest extends Request diff --git a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php index b0d822ca3af1..76e019abdde9 100644 --- a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php @@ -13,7 +13,6 @@ namespace App\Http\Requests\TaskStatus; use App\Http\Requests\Request; use App\Utils\Traits\MakesHash; -use Illuminate\Validation\Rule; class UpdateTaskStatusRequest extends Request { diff --git a/app/Http/Requests/TaxRate/CreateTaxRateRequest.php b/app/Http/Requests/TaxRate/CreateTaxRateRequest.php index f33d0c920242..11031b19cf17 100644 --- a/app/Http/Requests/TaxRate/CreateTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/CreateTaxRateRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaxRate; use App\Http\Requests\Request; -use App\Models\TaxRate; class CreateTaxRateRequest extends Request { diff --git a/app/Http/Requests/TaxRate/StoreTaxRateRequest.php b/app/Http/Requests/TaxRate/StoreTaxRateRequest.php index c9551d95022f..5063956b2713 100644 --- a/app/Http/Requests/TaxRate/StoreTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/StoreTaxRateRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\TaxRate; use App\Http\Requests\Request; -use App\Models\TaxRate; class StoreTaxRateRequest extends Request { diff --git a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php index a27ebb8257e6..b40f6b26737f 100644 --- a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php @@ -12,8 +12,6 @@ namespace App\Http\Requests\TaxRate; use App\Http\Requests\Request; -use App\Models\TaxRate; -use Illuminate\Support\Facades\Log; class UpdateTaxRateRequest extends Request { diff --git a/app/Http/Requests/Token/BulkTokenRequest.php b/app/Http/Requests/Token/BulkTokenRequest.php index 21fc4c5fe21a..f2b5e3e72b01 100644 --- a/app/Http/Requests/Token/BulkTokenRequest.php +++ b/app/Http/Requests/Token/BulkTokenRequest.php @@ -12,8 +12,8 @@ namespace App\Http\Requests\Token; -use App\Utils\Traits\BulkOptions; use App\Http\Requests\Request; +use App\Utils\Traits\BulkOptions; class BulkTokenRequest extends Request { diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php index 921868ec3e4a..9b47bfe17476 100644 --- a/app/Http/Requests/User/StoreUserRequest.php +++ b/app/Http/Requests/User/StoreUserRequest.php @@ -14,7 +14,6 @@ namespace App\Http\Requests\User; use App\DataMapper\DefaultSettings; use App\Factory\UserFactory; use App\Http\Requests\Request; -use App\Http\ValidationRules\NewUniqueUserRule; use App\Http\ValidationRules\ValidUserForCompany; use App\Libraries\MultiDB; use App\Models\User; diff --git a/app/Http/Requests/Vendor/BulkVendorRequest.php b/app/Http/Requests/Vendor/BulkVendorRequest.php index 2f533ba18415..4dfe4d6a6687 100644 --- a/app/Http/Requests/Vendor/BulkVendorRequest.php +++ b/app/Http/Requests/Vendor/BulkVendorRequest.php @@ -12,9 +12,9 @@ namespace App\Http\Requests\Vendor; +use App\Http\Requests\Request; use App\Models\Vendor; use App\Utils\Traits\BulkOptions; -use App\Http\Requests\Request; class BulkVendorRequest extends Request { diff --git a/app/Http/Requests/Vendor/DestroyVendorRequest.php b/app/Http/Requests/Vendor/DestroyVendorRequest.php index 8963f68296a9..8a4cda268f2f 100644 --- a/app/Http/Requests/Vendor/DestroyVendorRequest.php +++ b/app/Http/Requests/Vendor/DestroyVendorRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Vendor; use App\Http\Requests\Request; -use App\Models\Vendor; class DestroyVendorRequest extends Request { diff --git a/app/Http/Requests/Vendor/EditVendorRequest.php b/app/Http/Requests/Vendor/EditVendorRequest.php index efaa22870230..26fa8c5f2f4d 100644 --- a/app/Http/Requests/Vendor/EditVendorRequest.php +++ b/app/Http/Requests/Vendor/EditVendorRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Vendor; use App\Http\Requests\Request; -use App\Models\Vendor; class EditVendorRequest extends Request { diff --git a/app/Http/Requests/Vendor/ShowVendorRequest.php b/app/Http/Requests/Vendor/ShowVendorRequest.php index 501fcc341933..2c2a593b9ab8 100644 --- a/app/Http/Requests/Vendor/ShowVendorRequest.php +++ b/app/Http/Requests/Vendor/ShowVendorRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Vendor; use App\Http\Requests\Request; -use App\Models\Vendor; class ShowVendorRequest extends Request { diff --git a/app/Http/Requests/Vendor/StoreVendorRequest.php b/app/Http/Requests/Vendor/StoreVendorRequest.php index f647a309fc71..9543764acac8 100644 --- a/app/Http/Requests/Vendor/StoreVendorRequest.php +++ b/app/Http/Requests/Vendor/StoreVendorRequest.php @@ -11,13 +11,10 @@ namespace App\Http\Requests\Vendor; -use App\DataMapper\VendorSettings; use App\Http\Requests\Request; use App\Http\ValidationRules\ValidVendorGroupSettingsRule; use App\Models\Vendor; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class StoreVendorRequest extends Request { diff --git a/app/Http/Requests/Vendor/UpdateVendorRequest.php b/app/Http/Requests/Vendor/UpdateVendorRequest.php index 8a6cba26d39f..32e0c11efb3b 100644 --- a/app/Http/Requests/Vendor/UpdateVendorRequest.php +++ b/app/Http/Requests/Vendor/UpdateVendorRequest.php @@ -12,12 +12,8 @@ namespace App\Http\Requests\Vendor; use App\Http\Requests\Request; -use App\Http\ValidationRules\IsDeletedRule; -use App\Http\ValidationRules\ValidVendorGroupSettingsRule; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; class UpdateVendorRequest extends Request { diff --git a/app/Http/Requests/Webhook/BulkWebhookRequest.php b/app/Http/Requests/Webhook/BulkWebhookRequest.php index 4d10836505d2..442e8384c700 100644 --- a/app/Http/Requests/Webhook/BulkWebhookRequest.php +++ b/app/Http/Requests/Webhook/BulkWebhookRequest.php @@ -12,9 +12,8 @@ namespace App\Http\Requests\Webhook; -use App\Models\Vendor; -use App\Utils\Traits\BulkOptions; use App\Http\Requests\Request; +use App\Utils\Traits\BulkOptions; class BulkWebhookRequest extends Request { diff --git a/app/Http/Requests/Webhook/CreateWebhookRequest.php b/app/Http/Requests/Webhook/CreateWebhookRequest.php index e9630dfbe67b..64662a53eb52 100644 --- a/app/Http/Requests/Webhook/CreateWebhookRequest.php +++ b/app/Http/Requests/Webhook/CreateWebhookRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Webhook; use App\Http\Requests\Request; -use App\Models\Vendor; class CreateWebhookRequest extends Request { diff --git a/app/Http/Requests/Webhook/EditWebhookRequest.php b/app/Http/Requests/Webhook/EditWebhookRequest.php index 3560108e4c43..214c4f718c53 100644 --- a/app/Http/Requests/Webhook/EditWebhookRequest.php +++ b/app/Http/Requests/Webhook/EditWebhookRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Webhook; use App\Http\Requests\Request; -use App\Models\Vendor; class EditWebhookRequest extends Request { diff --git a/app/Http/Requests/Webhook/ShowWebhookRequest.php b/app/Http/Requests/Webhook/ShowWebhookRequest.php index 4d7572f84274..3c3c299e8c86 100644 --- a/app/Http/Requests/Webhook/ShowWebhookRequest.php +++ b/app/Http/Requests/Webhook/ShowWebhookRequest.php @@ -12,7 +12,6 @@ namespace App\Http\Requests\Webhook; use App\Http\Requests\Request; -use App\Models\Vendor; class ShowWebhookRequest extends Request { diff --git a/app/Http/Requests/Webhook/UpdateWebhookRequest.php b/app/Http/Requests/Webhook/UpdateWebhookRequest.php index 97f0ecbe723c..44efe779da8f 100644 --- a/app/Http/Requests/Webhook/UpdateWebhookRequest.php +++ b/app/Http/Requests/Webhook/UpdateWebhookRequest.php @@ -14,7 +14,6 @@ namespace App\Http\Requests\Webhook; use App\Http\Requests\Request; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\MakesHash; -use Illuminate\Validation\Rule; class UpdateWebhookRequest extends Request { diff --git a/app/Http/ValidationRules/Credit/CreditsSumRule.php b/app/Http/ValidationRules/Credit/CreditsSumRule.php index 5da527372f96..6561753ab423 100644 --- a/app/Http/ValidationRules/Credit/CreditsSumRule.php +++ b/app/Http/ValidationRules/Credit/CreditsSumRule.php @@ -11,11 +11,6 @@ namespace App\Http\ValidationRules\Credit; -use App\Libraries\MultiDB; -use App\Models\Credit; -use App\Models\Invoice; -use App\Models\Payment; -use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/Credit/UniqueCreditNumberRule.php b/app/Http/ValidationRules/Credit/UniqueCreditNumberRule.php index 390eafc477de..9baaad4b5fa1 100644 --- a/app/Http/ValidationRules/Credit/UniqueCreditNumberRule.php +++ b/app/Http/ValidationRules/Credit/UniqueCreditNumberRule.php @@ -11,9 +11,7 @@ namespace App\Http\ValidationRules\Credit; -use App\Libraries\MultiDB; use App\Models\Credit; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/Credit/ValidCreditsRules.php b/app/Http/ValidationRules/Credit/ValidCreditsRules.php index e261278de1eb..54fafa3f8020 100644 --- a/app/Http/ValidationRules/Credit/ValidCreditsRules.php +++ b/app/Http/ValidationRules/Credit/ValidCreditsRules.php @@ -11,11 +11,7 @@ namespace App\Http\ValidationRules\Credit; -use App\Libraries\MultiDB; use App\Models\Credit; -use App\Models\Invoice; -use App\Models\Payment; -use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php b/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php index 1e7ea875dd24..a8da394eea46 100644 --- a/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php +++ b/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php @@ -11,9 +11,7 @@ namespace App\Http\ValidationRules\Expense; -use App\Libraries\MultiDB; use App\Models\Expense; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/Invoice/LockedInvoiceRule.php b/app/Http/ValidationRules/Invoice/LockedInvoiceRule.php index 6cdd54ec77d4..f16e39d60f8f 100644 --- a/app/Http/ValidationRules/Invoice/LockedInvoiceRule.php +++ b/app/Http/ValidationRules/Invoice/LockedInvoiceRule.php @@ -11,9 +11,7 @@ namespace App\Http\ValidationRules\Invoice; -use App\Libraries\MultiDB; use App\Models\Invoice; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php b/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php index cc45ff9d1206..12832a307d7a 100644 --- a/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php +++ b/app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php @@ -11,9 +11,7 @@ namespace App\Http\ValidationRules\Invoice; -use App\Libraries\MultiDB; use App\Models\Invoice; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/NewUniqueUserRule.php b/app/Http/ValidationRules/NewUniqueUserRule.php index f6823dca02c8..3c66cb28887b 100644 --- a/app/Http/ValidationRules/NewUniqueUserRule.php +++ b/app/Http/ValidationRules/NewUniqueUserRule.php @@ -12,7 +12,6 @@ namespace App\Http\ValidationRules; use App\Libraries\MultiDB; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/Ninja/CanAddUserRule.php b/app/Http/ValidationRules/Ninja/CanAddUserRule.php index 555cc55cefe7..1bffad022f0b 100644 --- a/app/Http/ValidationRules/Ninja/CanAddUserRule.php +++ b/app/Http/ValidationRules/Ninja/CanAddUserRule.php @@ -11,7 +11,6 @@ namespace App\Http\ValidationRules\Ninja; -use App\Models\Company; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php index 3460b85915a4..c6f390c0c76e 100644 --- a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php +++ b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php @@ -11,11 +11,7 @@ namespace App\Http\ValidationRules\Payment; -use App\Libraries\MultiDB; -use App\Models\Credit; use App\Models\Invoice; -use App\Models\Payment; -use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/Payment/ValidRefundableRequest.php b/app/Http/ValidationRules/Payment/ValidRefundableRequest.php index e73a039ab7f9..c05c36d882ce 100644 --- a/app/Http/ValidationRules/Payment/ValidRefundableRequest.php +++ b/app/Http/ValidationRules/Payment/ValidRefundableRequest.php @@ -11,11 +11,9 @@ namespace App\Http\ValidationRules\Payment; -use App\Libraries\MultiDB; use App\Models\Credit; use App\Models\Invoice; use App\Models\Payment; -use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php index 35146355c7e1..9d235be37892 100644 --- a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php +++ b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php @@ -11,8 +11,6 @@ namespace App\Http\ValidationRules; -use App\Libraries\MultiDB; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/PaymentAppliedValidAmount.php b/app/Http/ValidationRules/PaymentAppliedValidAmount.php index 1aedf49ca5e3..6b94e22e7d8e 100644 --- a/app/Http/ValidationRules/PaymentAppliedValidAmount.php +++ b/app/Http/ValidationRules/PaymentAppliedValidAmount.php @@ -11,9 +11,7 @@ namespace App\Http\ValidationRules; -use App\Libraries\MultiDB; use App\Models\Payment; -use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/Quote/UniqueQuoteNumberRule.php b/app/Http/ValidationRules/Quote/UniqueQuoteNumberRule.php index 83bdf64adb11..82f629b4aeeb 100644 --- a/app/Http/ValidationRules/Quote/UniqueQuoteNumberRule.php +++ b/app/Http/ValidationRules/Quote/UniqueQuoteNumberRule.php @@ -11,9 +11,7 @@ namespace App\Http\ValidationRules\Quote; -use App\Libraries\MultiDB; use App\Models\Quote; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/Recurring/UniqueRecurringInvoiceNumberRule.php b/app/Http/ValidationRules/Recurring/UniqueRecurringInvoiceNumberRule.php index 124118bbc90a..8cb626845a4d 100644 --- a/app/Http/ValidationRules/Recurring/UniqueRecurringInvoiceNumberRule.php +++ b/app/Http/ValidationRules/Recurring/UniqueRecurringInvoiceNumberRule.php @@ -11,10 +11,7 @@ namespace App\Http\ValidationRules\Recurring; -use App\Libraries\MultiDB; -use App\Models\Invoice; use App\Models\RecurringInvoice; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/UniqueUserRule.php b/app/Http/ValidationRules/UniqueUserRule.php index bc176685118d..297c07211cfd 100644 --- a/app/Http/ValidationRules/UniqueUserRule.php +++ b/app/Http/ValidationRules/UniqueUserRule.php @@ -12,7 +12,6 @@ namespace App\Http\ValidationRules; use App\Libraries\MultiDB; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Http/ValidationRules/User/RelatedUserRule.php b/app/Http/ValidationRules/User/RelatedUserRule.php index f554684b3edc..bf0ea88c716d 100644 --- a/app/Http/ValidationRules/User/RelatedUserRule.php +++ b/app/Http/ValidationRules/User/RelatedUserRule.php @@ -11,7 +11,6 @@ namespace App\Http\ValidationRules\User; -use App\Libraries\MultiDB; use App\Models\User; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/ValidClientGroupSettingsRule.php b/app/Http/ValidationRules/ValidClientGroupSettingsRule.php index 1a0c25d186df..32c8aefcc7e3 100644 --- a/app/Http/ValidationRules/ValidClientGroupSettingsRule.php +++ b/app/Http/ValidationRules/ValidClientGroupSettingsRule.php @@ -11,8 +11,6 @@ namespace App\Http\ValidationRules; -use App\Libraries\MultiDB; -use App\Models\User; use App\Utils\Traits\ClientGroupSettingsSaver; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/ValidCreditsPresentRule.php b/app/Http/ValidationRules/ValidCreditsPresentRule.php index 6f24b1b0f181..3cbc41f3469d 100644 --- a/app/Http/ValidationRules/ValidCreditsPresentRule.php +++ b/app/Http/ValidationRules/ValidCreditsPresentRule.php @@ -11,9 +11,7 @@ namespace App\Http\ValidationRules; -use App\Libraries\MultiDB; use App\Models\Credit; -use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/ValidSettingsRule.php b/app/Http/ValidationRules/ValidSettingsRule.php index 481a421ce4e6..583a171c61ea 100644 --- a/app/Http/ValidationRules/ValidSettingsRule.php +++ b/app/Http/ValidationRules/ValidSettingsRule.php @@ -11,8 +11,6 @@ namespace App\Http\ValidationRules; -use App\Libraries\MultiDB; -use App\Models\User; use App\Utils\Traits\SettingsSaver; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Http/ValidationRules/ValidUserForCompany.php b/app/Http/ValidationRules/ValidUserForCompany.php index 51f41d64b88d..c8952c07827b 100644 --- a/app/Http/ValidationRules/ValidUserForCompany.php +++ b/app/Http/ValidationRules/ValidUserForCompany.php @@ -12,7 +12,6 @@ namespace App\Http\ValidationRules; use App\Libraries\MultiDB; -use App\Models\User; use Illuminate\Contracts\Validation\Rule; /** diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php index 98959d5b13fd..86284534cf3f 100644 --- a/app/Jobs/Account/CreateAccount.php +++ b/app/Jobs/Account/CreateAccount.php @@ -20,15 +20,11 @@ use App\Jobs\Company\CreateCompanyToken; use App\Jobs\User\CreateUser; use App\Jobs\Util\VersionCheck; use App\Models\Account; -use App\Models\User; use App\Notifications\Ninja\NewAccountCreated; use App\Utils\Ninja; -use App\Utils\Traits\UserSessionAttributes; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Notification; use Illuminate\Support\Str; use Symfony\Component\HttpFoundation\Response; use Turbo124\Beacon\Facades\LightLogs; diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php index 9ba6441fc361..8104170cfb14 100644 --- a/app/Jobs/Company/CreateCompany.php +++ b/app/Jobs/Company/CreateCompany.php @@ -12,7 +12,6 @@ namespace App\Jobs\Company; use App\DataMapper\CompanySettings; -use App\Events\UserSignedUp; use App\Models\Company; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Company/CreateCompanyPaymentTerms.php b/app/Jobs/Company/CreateCompanyPaymentTerms.php index 8c0453e1a622..5c6d06ffc489 100644 --- a/app/Jobs/Company/CreateCompanyPaymentTerms.php +++ b/app/Jobs/Company/CreateCompanyPaymentTerms.php @@ -11,13 +11,9 @@ namespace App\Jobs\Company; -use App\DataMapper\CompanySettings; -use App\Events\UserSignedUp; -use App\Models\Company; use App\Models\PaymentTerm; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Http\Request; class CreateCompanyPaymentTerms { diff --git a/app/Jobs/Company/CreateCompanyTaskStatuses.php b/app/Jobs/Company/CreateCompanyTaskStatuses.php index 8a759646d911..3cbde8215d18 100644 --- a/app/Jobs/Company/CreateCompanyTaskStatuses.php +++ b/app/Jobs/Company/CreateCompanyTaskStatuses.php @@ -11,14 +11,9 @@ namespace App\Jobs\Company; -use App\DataMapper\CompanySettings; -use App\Events\UserSignedUp; -use App\Models\Company; -use App\Models\PaymentTerm; use App\Models\TaskStatus; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Http\Request; class CreateCompanyTaskStatuses { diff --git a/app/Jobs/Credit/ApplyCreditPayment.php b/app/Jobs/Credit/ApplyCreditPayment.php index 3f27493a3b5f..8e30ea3f4a05 100644 --- a/app/Jobs/Credit/ApplyCreditPayment.php +++ b/app/Jobs/Credit/ApplyCreditPayment.php @@ -11,14 +11,8 @@ namespace App\Jobs\Credit; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; -use App\Jobs\Credit\ApplyPaymentToCredit; -use App\Libraries\MultiDB; -use App\Models\Company; use App\Models\Credit; use App\Models\Payment; -use App\Repositories\CreditRepository; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index efc441756cde..73c08909dbba 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -14,9 +14,7 @@ namespace App\Jobs\Cron; use App\Jobs\RecurringInvoice\SendRecurring; use App\Libraries\MultiDB; use App\Models\RecurringInvoice; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Http\Request; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Log; diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php index 982eadc06c38..1e552e1ff7d9 100644 --- a/app/Jobs/Entity/CreateEntityPdf.php +++ b/app/Jobs/Entity/CreateEntityPdf.php @@ -12,16 +12,9 @@ namespace App\Jobs\Entity; -use App\Designs\Custom; -use App\Designs\Designer; -use App\Designs\Modern; -use App\Libraries\MultiDB; -use App\Models\ClientContact; -use App\Models\Company; use App\Models\Credit; use App\Models\CreditInvitation; use App\Models\Design; -use App\Models\Entity; use App\Models\Invoice; use App\Models\InvoiceInvitation; use App\Models\Quote; @@ -45,7 +38,6 @@ use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Storage; -use Spatie\Browsershot\Browsershot; class CreateEntityPdf implements ShouldQueue { diff --git a/app/Jobs/Entity/EmailEntity.php b/app/Jobs/Entity/EmailEntity.php index 1daf8e0bf61a..6b7a5c0ccaa2 100644 --- a/app/Jobs/Entity/EmailEntity.php +++ b/app/Jobs/Entity/EmailEntity.php @@ -11,22 +11,18 @@ namespace App\Jobs\Entity; -use App\DataMapper\Analytics\EmailInvoiceFailure; use App\Events\Invoice\InvoiceReminderWasEmailed; use App\Events\Invoice\InvoiceWasEmailed; use App\Events\Invoice\InvoiceWasEmailedAndFailed; use App\Jobs\Mail\BaseMailerJob; -use App\Jobs\Utils\SystemLogger; use App\Libraries\MultiDB; use App\Mail\TemplateEmail; use App\Models\Activity; use App\Models\Company; use App\Models\CreditInvitation; -use App\Models\Invoice; use App\Models\InvoiceInvitation; use App\Models\QuoteInvitation; use App\Models\RecurringInvoiceInvitation; -use App\Models\SystemLog; use App\Utils\HtmlEngine; use App\Utils\Ninja; use Illuminate\Bus\Queueable; @@ -36,9 +32,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Mail; use Illuminate\Support\Str; -use Swift_TransportException; -use Symfony\Component\Mime\Test\Constraint\EmailTextBodyContains; -use Turbo124\Beacon\Facades\LightLogs; /*Multi Mailer implemented*/ diff --git a/app/Jobs/Invitation/MarkOpened.php b/app/Jobs/Invitation/MarkOpened.php index a1617d23a0ed..8bbed2b2233c 100644 --- a/app/Jobs/Invitation/MarkOpened.php +++ b/app/Jobs/Invitation/MarkOpened.php @@ -11,17 +11,12 @@ namespace App\Jobs\Invitation; -use App\Models\Invoice; -use App\Models\Payment; -use App\Repositories\InvoiceRepository; use App\Utils\Traits\NumberFormatter; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Mail; //todo - ensure we are MultiDB Aware in dispatched jobs diff --git a/app/Jobs/Invoice/InjectSignature.php b/app/Jobs/Invoice/InjectSignature.php index 58c028c1c5b4..1d0aad2f66c6 100644 --- a/app/Jobs/Invoice/InjectSignature.php +++ b/app/Jobs/Invoice/InjectSignature.php @@ -3,7 +3,6 @@ namespace App\Jobs\Invoice; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\Invoice; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Invoice/InvoiceWorkflowSettings.php b/app/Jobs/Invoice/InvoiceWorkflowSettings.php index e53b680501b9..350a23b69c22 100644 --- a/app/Jobs/Invoice/InvoiceWorkflowSettings.php +++ b/app/Jobs/Invoice/InvoiceWorkflowSettings.php @@ -12,7 +12,6 @@ namespace App\Jobs\Invoice; -use App\Mail\Invoices\InvoiceWasPaid; use App\Models\Client; use App\Models\Invoice; use App\Repositories\BaseRepository; @@ -21,7 +20,6 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Mail; class InvoiceWorkflowSettings implements ShouldQueue { diff --git a/app/Jobs/Invoice/ZipInvoices.php b/app/Jobs/Invoice/ZipInvoices.php index e614352c5701..d76ef3cb8bcc 100644 --- a/app/Jobs/Invoice/ZipInvoices.php +++ b/app/Jobs/Invoice/ZipInvoices.php @@ -13,10 +13,8 @@ namespace App\Jobs\Invoice; use App\Jobs\Mail\BaseMailerJob; use App\Jobs\Util\UnlinkFile; -use App\Libraries\MultiDB; use App\Mail\DownloadInvoices; use App\Models\Company; -use App\Models\Invoice; use App\Utils\TempFile; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php index 303591d0c435..cddb89bbb72c 100644 --- a/app/Jobs/Mail/BaseMailerJob.php +++ b/app/Jobs/Mail/BaseMailerJob.php @@ -14,7 +14,6 @@ namespace App\Jobs\Mail; use App\DataMapper\Analytics\EmailFailure; use App\Jobs\Util\SystemLogger; use App\Libraries\Google\Google; -use App\Libraries\MultiDB; use App\Models\SystemLog; use App\Models\User; use App\Providers\MailServiceProvider; diff --git a/app/Jobs/Mail/EntityPaidMailer.php b/app/Jobs/Mail/EntityPaidMailer.php index f5ba0d8b7aa4..a2ad45ed1494 100644 --- a/app/Jobs/Mail/EntityPaidMailer.php +++ b/app/Jobs/Mail/EntityPaidMailer.php @@ -11,21 +11,14 @@ namespace App\Jobs\Mail; -use App\Jobs\Util\SystemLogger; -use App\Libraries\Google\Google; use App\Libraries\MultiDB; use App\Mail\Admin\EntityNotificationMailer; use App\Mail\Admin\EntityPaidObject; -use App\Mail\Admin\EntitySentObject; -use App\Models\SystemLog; -use App\Models\User; -use App\Providers\MailServiceProvider; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Mail; /*Multi Mailer implemented*/ diff --git a/app/Jobs/Mail/EntitySentMailer.php b/app/Jobs/Mail/EntitySentMailer.php index a21b052f243f..175159b7669b 100644 --- a/app/Jobs/Mail/EntitySentMailer.php +++ b/app/Jobs/Mail/EntitySentMailer.php @@ -11,20 +11,14 @@ namespace App\Jobs\Mail; -use App\Jobs\Util\SystemLogger; -use App\Libraries\Google\Google; use App\Libraries\MultiDB; use App\Mail\Admin\EntityNotificationMailer; use App\Mail\Admin\EntitySentObject; -use App\Models\SystemLog; -use App\Models\User; -use App\Providers\MailServiceProvider; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Mail; /*Multi Mailer implemented*/ diff --git a/app/Jobs/Mail/EntityViewedMailer.php b/app/Jobs/Mail/EntityViewedMailer.php index 278531ee8f4c..1bd22f5e1ddd 100644 --- a/app/Jobs/Mail/EntityViewedMailer.php +++ b/app/Jobs/Mail/EntityViewedMailer.php @@ -11,20 +11,14 @@ namespace App\Jobs\Mail; -use App\Jobs\Util\SystemLogger; -use App\Libraries\Google\Google; use App\Libraries\MultiDB; use App\Mail\Admin\EntityNotificationMailer; use App\Mail\Admin\EntityViewedObject; -use App\Models\SystemLog; -use App\Models\User; -use App\Providers\MailServiceProvider; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Mail; /*Multi Mailer implemented*/ diff --git a/app/Jobs/Mail/MailRouter.php b/app/Jobs/Mail/MailRouter.php index a532de21b477..aa29d036b471 100644 --- a/app/Jobs/Mail/MailRouter.php +++ b/app/Jobs/Mail/MailRouter.php @@ -11,24 +11,16 @@ namespace App\Jobs\Mail; -use App\Jobs\Mail\BaseMailerJob; -use App\Jobs\Util\SystemLogger; -use App\Libraries\Google\Google; use App\Libraries\MultiDB; -use App\Mail\Admin\EntityNotificationMailer; -use App\Mail\Admin\EntitySentObject; use App\Models\ClientContact; use App\Models\Company; -use App\Models\SystemLog; use App\Models\User; -use App\Providers\MailServiceProvider; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Mail\Mailable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Mail; /*Multi Mailer Router implemented*/ diff --git a/app/Jobs/Mail/PaymentFailureMailer.php b/app/Jobs/Mail/PaymentFailureMailer.php index 3828bfc5c666..2f59c93f3384 100644 --- a/app/Jobs/Mail/PaymentFailureMailer.php +++ b/app/Jobs/Mail/PaymentFailureMailer.php @@ -11,23 +11,16 @@ namespace App\Jobs\Mail; -use App\Jobs\Util\SystemLogger; -use App\Libraries\Google\Google; use App\Libraries\MultiDB; use App\Mail\Admin\EntityNotificationMailer; -use App\Mail\Admin\EntityPaidObject; -use App\Mail\Admin\EntitySentObject; use App\Mail\Admin\PaymentFailureObject; -use App\Models\SystemLog; use App\Models\User; -use App\Providers\MailServiceProvider; use App\Utils\Traits\Notifications\UserNotifies; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Mail; /*Multi Mailer implemented*/ diff --git a/app/Jobs/Ninja/AdjustEmailQuota.php b/app/Jobs/Ninja/AdjustEmailQuota.php index 68f92ee97920..fd4bbd8139ae 100644 --- a/app/Jobs/Ninja/AdjustEmailQuota.php +++ b/app/Jobs/Ninja/AdjustEmailQuota.php @@ -11,10 +11,8 @@ namespace App\Jobs\Ninja; -use App\Jobs\Invoice\EmailInvoice; use App\Libraries\MultiDB; use App\Models\Account; -use App\Models\SystemLog; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Ninja/CheckDbStatus.php b/app/Jobs/Ninja/CheckDbStatus.php index b5302fe79e6e..958c02531693 100644 --- a/app/Jobs/Ninja/CheckDbStatus.php +++ b/app/Jobs/Ninja/CheckDbStatus.php @@ -11,10 +11,6 @@ namespace App\Jobs\Ninja; -use App\Jobs\Invoice\EmailInvoice; -use App\Libraries\MultiDB; -use App\Models\Account; -use App\Models\SystemLog; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php index 8adaec609548..796a6ca40c2f 100644 --- a/app/Jobs/Ninja/CompanySizeCheck.php +++ b/app/Jobs/Ninja/CompanySizeCheck.php @@ -11,9 +11,7 @@ namespace App\Jobs\Ninja; -use App\Jobs\Invoice\EmailInvoice; use App\Libraries\MultiDB; -use App\Models\Account; use App\Models\Company; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Jobs/Payment/EmailPayment.php b/app/Jobs/Payment/EmailPayment.php index 4bbaafc9f3c5..f4301535bde2 100644 --- a/app/Jobs/Payment/EmailPayment.php +++ b/app/Jobs/Payment/EmailPayment.php @@ -11,21 +11,15 @@ namespace App\Jobs\Payment; -use App\DataMapper\Analytics\EmailInvoiceFailure; -use App\Events\Invoice\InvoiceWasEmailed; -use App\Events\Invoice\InvoiceWasEmailedAndFailed; use App\Events\Payment\PaymentWasEmailed; use App\Events\Payment\PaymentWasEmailedAndFailed; -use App\Helpers\Email\BuildEmail; use App\Jobs\Mail\BaseMailerJob; -use App\Jobs\Utils\SystemLogger; use App\Libraries\MultiDB; use App\Mail\Engine\PaymentEmailEngine; use App\Mail\TemplateEmail; use App\Models\ClientContact; use App\Models\Company; use App\Models\Payment; -use App\Models\SystemLog; use App\Utils\Ninja; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; @@ -33,7 +27,6 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Mail; -use Turbo124\Beacon\Facades\LightLogs; class EmailPayment extends BaseMailerJob implements ShouldQueue { diff --git a/app/Jobs/Payment/PaymentNotification.php b/app/Jobs/Payment/PaymentNotification.php index 1160d52d1973..feb596da2089 100644 --- a/app/Jobs/Payment/PaymentNotification.php +++ b/app/Jobs/Payment/PaymentNotification.php @@ -11,10 +11,8 @@ namespace App\Jobs\Payment; -use App\Libraries\MultiDB; use App\Models\Company; use App\Models\Payment; -use App\Repositories\InvoiceRepository; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php index bb655aa245f2..061d7475ca3e 100644 --- a/app/Jobs/Product/UpdateOrCreateProduct.php +++ b/app/Jobs/Product/UpdateOrCreateProduct.php @@ -12,10 +12,7 @@ namespace App\Jobs\Product; use App\Libraries\MultiDB; -use App\Models\Company; -use App\Models\Payment; use App\Models\Product; -use App\Repositories\InvoiceRepository; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Quote/ApplyQuoteNumber.php b/app/Jobs/Quote/ApplyQuoteNumber.php index 0305c5c38e0b..48e83bcebdc5 100644 --- a/app/Jobs/Quote/ApplyQuoteNumber.php +++ b/app/Jobs/Quote/ApplyQuoteNumber.php @@ -13,10 +13,7 @@ namespace App\Jobs\Quote; use App\Libraries\MultiDB; use App\Models\Company; -use App\Models\Payment; -use App\Models\PaymentTerm; use App\Models\Quote; -use App\Repositories\QuoteRepository; use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\NumberFormatter; use Illuminate\Bus\Queueable; @@ -24,7 +21,6 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Carbon; class ApplyQuoteNumber implements ShouldQueue { diff --git a/app/Jobs/Quote/QuoteWorkflowSettings.php b/app/Jobs/Quote/QuoteWorkflowSettings.php index 95c5756c9c0d..03db55daaefc 100644 --- a/app/Jobs/Quote/QuoteWorkflowSettings.php +++ b/app/Jobs/Quote/QuoteWorkflowSettings.php @@ -12,7 +12,6 @@ namespace App\Jobs\Quote; -use App\Mail\Quote\QuoteWasApproved; use App\Models\Client; use App\Models\Quote; use App\Repositories\BaseRepository; diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 30c28d0783be..8ec0e3c1a4aa 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -22,10 +22,8 @@ use App\Utils\Traits\GeneratesCounter; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Http\Request; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Carbon; use Turbo124\Beacon\Facades\LightLogs; class SendRecurring implements ShouldQueue diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php index 38bb8edf80d6..437f3c034532 100644 --- a/app/Jobs/User/CreateUser.php +++ b/app/Jobs/User/CreateUser.php @@ -14,13 +14,11 @@ namespace App\Jobs\User; use App\DataMapper\CompanySettings; use App\DataMapper\DefaultSettings; use App\Events\User\UserWasCreated; -use App\Models\CompanyUser; use App\Models\User; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; class CreateUser { diff --git a/app/Jobs/User/UserEmailChanged.php b/app/Jobs/User/UserEmailChanged.php index 05cbda539ee6..e2144d2394b2 100644 --- a/app/Jobs/User/UserEmailChanged.php +++ b/app/Jobs/User/UserEmailChanged.php @@ -12,14 +12,12 @@ namespace App\Jobs\User; use App\Jobs\Mail\BaseMailerJob; -use App\Jobs\Util\SystemLogger; use App\Libraries\MultiDB; use App\Mail\User\UserNotificationMailer; use App\Models\Company; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Http\Request; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Mail; diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 197370068703..c9f2eadcddf8 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -32,13 +32,10 @@ use App\Http\ValidationRules\ValidCompanyGatewayFeesAndLimitsRule; use App\Http\ValidationRules\ValidUserForCompany; use App\Jobs\Company\CreateCompanyToken; use App\Jobs\Ninja\CompanySizeCheck; -use App\Jobs\Util\VersionCheck; use App\Libraries\MultiDB; use App\Mail\MigrationCompleted; -use App\Mail\MigrationFailed; use App\Models\Activity; use App\Models\Client; -use App\Models\ClientContact; use App\Models\ClientGatewayToken; use App\Models\Company; use App\Models\CompanyGateway; @@ -62,10 +59,8 @@ use App\Repositories\ClientContactRepository; use App\Repositories\ClientRepository; use App\Repositories\CompanyRepository; use App\Repositories\CreditRepository; -use App\Repositories\InvoiceRepository; use App\Repositories\Migration\InvoiceMigrationRepository; use App\Repositories\Migration\PaymentMigrationRepository; -use App\Repositories\PaymentRepository; use App\Repositories\ProductRepository; use App\Repositories\QuoteRepository; use App\Repositories\UserRepository; diff --git a/app/Jobs/Util/PreviewPdf.php b/app/Jobs/Util/PreviewPdf.php index 28e10b41fc09..06de2be40730 100644 --- a/app/Jobs/Util/PreviewPdf.php +++ b/app/Jobs/Util/PreviewPdf.php @@ -11,25 +11,13 @@ namespace App\Jobs\Util; -use App\Designs\Custom; -use App\Designs\Designer; -use App\Designs\Modern; -use App\Libraries\MultiDB; -use App\Models\ClientContact; use App\Models\Company; -use App\Models\Design; -use App\Models\Invoice; -use App\Utils\Traits\MakesInvoiceHtml; -use App\Utils\Traits\NumberFormatter; use App\Utils\Traits\Pdf\PdfMaker; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\App; -use Illuminate\Support\Facades\Storage; -use Spatie\Browsershot\Browsershot; class PreviewPdf implements ShouldQueue { diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php index 2cbc6251e050..3080df70fdae 100644 --- a/app/Jobs/Util/ReminderJob.php +++ b/app/Jobs/Util/ReminderJob.php @@ -12,11 +12,8 @@ namespace App\Jobs\Util; use App\Events\Invoice\InvoiceWasEmailed; -use App\Jobs\Invoice\EmailInvoice; use App\Libraries\MultiDB; -use App\Models\Account; use App\Models\Invoice; -use App\Utils\ClientPortal\CustomMessage\invitation; use App\Utils\Ninja; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; @@ -24,7 +21,6 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Storage; class ReminderJob implements ShouldQueue { diff --git a/app/Jobs/Util/SystemLogger.php b/app/Jobs/Util/SystemLogger.php index 204affdcf398..15dd05c3cf7f 100644 --- a/app/Jobs/Util/SystemLogger.php +++ b/app/Jobs/Util/SystemLogger.php @@ -16,12 +16,8 @@ use App\Models\SystemLog; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Http\File; -use Illuminate\Http\Request; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Storage; -use Intervention\Image\ImageManager; class SystemLogger implements ShouldQueue { diff --git a/app/Jobs/Util/UnlinkFile.php b/app/Jobs/Util/UnlinkFile.php index a97a53c3f102..88f131c9dd46 100644 --- a/app/Jobs/Util/UnlinkFile.php +++ b/app/Jobs/Util/UnlinkFile.php @@ -11,7 +11,6 @@ namespace App\Jobs\Util; -use App\Utils\Traits\BulkOptions; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/Util/UploadAvatar.php b/app/Jobs/Util/UploadAvatar.php index 3b1775607b91..b9da6dd71f23 100644 --- a/app/Jobs/Util/UploadAvatar.php +++ b/app/Jobs/Util/UploadAvatar.php @@ -15,11 +15,9 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Http\File; -use Illuminate\Http\Request; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Storage; -use Intervention\Image\ImageManager; class UploadAvatar implements ShouldQueue { diff --git a/app/Jobs/Util/UploadFile.php b/app/Jobs/Util/UploadFile.php index 579ac311149b..a5f3e2595c99 100644 --- a/app/Jobs/Util/UploadFile.php +++ b/app/Jobs/Util/UploadFile.php @@ -17,11 +17,9 @@ use App\Utils\Traits\MakesHash; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Http\Request; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Storage; -use Illuminate\Support\Str; use Intervention\Image\ImageManager; class UploadFile implements ShouldQueue diff --git a/app/Jobs/Util/VersionCheck.php b/app/Jobs/Util/VersionCheck.php index 9d04f9c3230a..c0480b5d29bb 100644 --- a/app/Jobs/Util/VersionCheck.php +++ b/app/Jobs/Util/VersionCheck.php @@ -17,7 +17,6 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Storage; class VersionCheck implements ShouldQueue { diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php index 44abb02574b2..aaf1a2399db8 100644 --- a/app/Jobs/Util/WebhookHandler.php +++ b/app/Jobs/Util/WebhookHandler.php @@ -10,6 +10,7 @@ */ namespace App\Jobs\Util; +use App\Libraries\MultiDB; use App\Models\Webhook; use App\Transformers\ArraySerializer; use GuzzleHttp\Client; @@ -21,7 +22,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use League\Fractal\Manager; use League\Fractal\Resource\Item; -use App\Libraries\MultiDB; class WebhookHandler implements ShouldQueue { diff --git a/app/Listeners/Activity/ArchivedClientActivity.php b/app/Listeners/Activity/ArchivedClientActivity.php index fbbfcac98c79..4ebcc40abc2a 100644 --- a/app/Listeners/Activity/ArchivedClientActivity.php +++ b/app/Listeners/Activity/ArchivedClientActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class ArchivedClientActivity implements ShouldQueue diff --git a/app/Listeners/Activity/ClientUpdatedActivity.php b/app/Listeners/Activity/ClientUpdatedActivity.php index 7bfdc5d2d755..09512c4f368a 100644 --- a/app/Listeners/Activity/ClientUpdatedActivity.php +++ b/app/Listeners/Activity/ClientUpdatedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class ClientUpdatedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/CreatedClientActivity.php b/app/Listeners/Activity/CreatedClientActivity.php index f398b3703e2e..4e4dddc06cbc 100644 --- a/app/Listeners/Activity/CreatedClientActivity.php +++ b/app/Listeners/Activity/CreatedClientActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreatedClientActivity implements ShouldQueue diff --git a/app/Listeners/Activity/CreatedCreditActivity.php b/app/Listeners/Activity/CreatedCreditActivity.php index 4b600d4efd01..1067c6ecc263 100644 --- a/app/Listeners/Activity/CreatedCreditActivity.php +++ b/app/Listeners/Activity/CreatedCreditActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreatedCreditActivity implements ShouldQueue diff --git a/app/Listeners/Activity/CreatedExpenseActivity.php b/app/Listeners/Activity/CreatedExpenseActivity.php index 2753b6298505..caaf24c29e9c 100644 --- a/app/Listeners/Activity/CreatedExpenseActivity.php +++ b/app/Listeners/Activity/CreatedExpenseActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreatedExpenseActivity implements ShouldQueue diff --git a/app/Listeners/Activity/CreatedQuoteActivity.php b/app/Listeners/Activity/CreatedQuoteActivity.php index d363aea105b1..53f09d310066 100644 --- a/app/Listeners/Activity/CreatedQuoteActivity.php +++ b/app/Listeners/Activity/CreatedQuoteActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreatedQuoteActivity implements ShouldQueue diff --git a/app/Listeners/Activity/CreatedTaskActivity.php b/app/Listeners/Activity/CreatedTaskActivity.php index 70ee99e5ddc4..13ce37c10402 100644 --- a/app/Listeners/Activity/CreatedTaskActivity.php +++ b/app/Listeners/Activity/CreatedTaskActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreatedTaskActivity implements ShouldQueue diff --git a/app/Listeners/Activity/CreatedVendorActivity.php b/app/Listeners/Activity/CreatedVendorActivity.php index cb7b1a223c46..4dc27ec227f6 100644 --- a/app/Listeners/Activity/CreatedVendorActivity.php +++ b/app/Listeners/Activity/CreatedVendorActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreatedVendorActivity implements ShouldQueue diff --git a/app/Listeners/Activity/CreditArchivedActivity.php b/app/Listeners/Activity/CreditArchivedActivity.php index b0302dde34a2..f83cf2edcca1 100644 --- a/app/Listeners/Activity/CreditArchivedActivity.php +++ b/app/Listeners/Activity/CreditArchivedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreditArchivedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/DeleteClientActivity.php b/app/Listeners/Activity/DeleteClientActivity.php index 3c2916a6efea..568b04b6d5fe 100644 --- a/app/Listeners/Activity/DeleteClientActivity.php +++ b/app/Listeners/Activity/DeleteClientActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class DeleteClientActivity implements ShouldQueue diff --git a/app/Listeners/Activity/DeleteCreditActivity.php b/app/Listeners/Activity/DeleteCreditActivity.php index da305e3775fa..514bcb21353a 100644 --- a/app/Listeners/Activity/DeleteCreditActivity.php +++ b/app/Listeners/Activity/DeleteCreditActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class DeleteCreditActivity implements ShouldQueue diff --git a/app/Listeners/Activity/ExpenseArchivedActivity.php b/app/Listeners/Activity/ExpenseArchivedActivity.php index 0d6a43ddfec7..4cedc797a11a 100644 --- a/app/Listeners/Activity/ExpenseArchivedActivity.php +++ b/app/Listeners/Activity/ExpenseArchivedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class ExpenseArchivedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/ExpenseDeletedActivity.php b/app/Listeners/Activity/ExpenseDeletedActivity.php index 477e783a6ac7..41352a853af0 100644 --- a/app/Listeners/Activity/ExpenseDeletedActivity.php +++ b/app/Listeners/Activity/ExpenseDeletedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class ExpenseDeletedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/ExpenseRestoredActivity.php b/app/Listeners/Activity/ExpenseRestoredActivity.php index c25fe9042864..77e938d5ca5b 100644 --- a/app/Listeners/Activity/ExpenseRestoredActivity.php +++ b/app/Listeners/Activity/ExpenseRestoredActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class ExpenseRestoredActivity implements ShouldQueue diff --git a/app/Listeners/Activity/ExpenseUpdatedActivity.php b/app/Listeners/Activity/ExpenseUpdatedActivity.php index 9f82f9dea3f4..084c3281532b 100644 --- a/app/Listeners/Activity/ExpenseUpdatedActivity.php +++ b/app/Listeners/Activity/ExpenseUpdatedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class ExpenseUpdatedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/PaymentArchivedActivity.php b/app/Listeners/Activity/PaymentArchivedActivity.php index 4f03c1aa8fe6..057c5b71151e 100644 --- a/app/Listeners/Activity/PaymentArchivedActivity.php +++ b/app/Listeners/Activity/PaymentArchivedActivity.php @@ -14,10 +14,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class PaymentArchivedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php index 54f92940dfec..2797cb81ff3e 100644 --- a/app/Listeners/Activity/PaymentCreatedActivity.php +++ b/app/Listeners/Activity/PaymentCreatedActivity.php @@ -11,14 +11,10 @@ namespace App\Listeners\Activity; -use App\Jobs\Invoice\InvoiceWorkflowSettings; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class PaymentCreatedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/PaymentDeletedActivity.php b/app/Listeners/Activity/PaymentDeletedActivity.php index 981383e22e43..1f701895a086 100644 --- a/app/Listeners/Activity/PaymentDeletedActivity.php +++ b/app/Listeners/Activity/PaymentDeletedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class PaymentDeletedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/PaymentRefundedActivity.php b/app/Listeners/Activity/PaymentRefundedActivity.php index 210dcc7bab84..e6c366d0ded8 100644 --- a/app/Listeners/Activity/PaymentRefundedActivity.php +++ b/app/Listeners/Activity/PaymentRefundedActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class PaymentRefundedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/PaymentUpdatedActivity.php b/app/Listeners/Activity/PaymentUpdatedActivity.php index 914dea159386..14d189f680e5 100644 --- a/app/Listeners/Activity/PaymentUpdatedActivity.php +++ b/app/Listeners/Activity/PaymentUpdatedActivity.php @@ -14,10 +14,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class PaymentUpdatedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/PaymentVoidedActivity.php b/app/Listeners/Activity/PaymentVoidedActivity.php index abb8c96177e0..96c789cda0d6 100644 --- a/app/Listeners/Activity/PaymentVoidedActivity.php +++ b/app/Listeners/Activity/PaymentVoidedActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class PaymentVoidedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/QuoteUpdatedActivity.php b/app/Listeners/Activity/QuoteUpdatedActivity.php index febdb3099f7c..777ae1d6645f 100644 --- a/app/Listeners/Activity/QuoteUpdatedActivity.php +++ b/app/Listeners/Activity/QuoteUpdatedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class QuoteUpdatedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/RestoreClientActivity.php b/app/Listeners/Activity/RestoreClientActivity.php index ac83245f7c4a..c7a692aa1275 100644 --- a/app/Listeners/Activity/RestoreClientActivity.php +++ b/app/Listeners/Activity/RestoreClientActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class RestoreClientActivity implements ShouldQueue diff --git a/app/Listeners/Activity/TaskArchivedActivity.php b/app/Listeners/Activity/TaskArchivedActivity.php index e31935efdecd..d176fbf730d6 100644 --- a/app/Listeners/Activity/TaskArchivedActivity.php +++ b/app/Listeners/Activity/TaskArchivedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class TaskArchivedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/TaskDeletedActivity.php b/app/Listeners/Activity/TaskDeletedActivity.php index 3b201b680f9f..96cabca125d5 100644 --- a/app/Listeners/Activity/TaskDeletedActivity.php +++ b/app/Listeners/Activity/TaskDeletedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class TaskDeletedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/TaskRestoredActivity.php b/app/Listeners/Activity/TaskRestoredActivity.php index 1188dc2072d7..febf8ec4926a 100644 --- a/app/Listeners/Activity/TaskRestoredActivity.php +++ b/app/Listeners/Activity/TaskRestoredActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class TaskRestoredActivity implements ShouldQueue diff --git a/app/Listeners/Activity/TaskUpdatedActivity.php b/app/Listeners/Activity/TaskUpdatedActivity.php index a503bc080195..617919344f61 100644 --- a/app/Listeners/Activity/TaskUpdatedActivity.php +++ b/app/Listeners/Activity/TaskUpdatedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class TaskUpdatedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/UpdatedCreditActivity.php b/app/Listeners/Activity/UpdatedCreditActivity.php index 46aa03bd3b29..ba13a5258919 100644 --- a/app/Listeners/Activity/UpdatedCreditActivity.php +++ b/app/Listeners/Activity/UpdatedCreditActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class UpdatedCreditActivity implements ShouldQueue diff --git a/app/Listeners/Activity/VendorArchivedActivity.php b/app/Listeners/Activity/VendorArchivedActivity.php index 3cbcc4acf1cf..e8171d19f076 100644 --- a/app/Listeners/Activity/VendorArchivedActivity.php +++ b/app/Listeners/Activity/VendorArchivedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class VendorArchivedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/VendorDeletedActivity.php b/app/Listeners/Activity/VendorDeletedActivity.php index 5c2941afc481..1422d4321239 100644 --- a/app/Listeners/Activity/VendorDeletedActivity.php +++ b/app/Listeners/Activity/VendorDeletedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class VendorDeletedActivity implements ShouldQueue diff --git a/app/Listeners/Activity/VendorRestoredActivity.php b/app/Listeners/Activity/VendorRestoredActivity.php index b14715736eca..1d2df0885ccb 100644 --- a/app/Listeners/Activity/VendorRestoredActivity.php +++ b/app/Listeners/Activity/VendorRestoredActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class VendorRestoredActivity implements ShouldQueue diff --git a/app/Listeners/Activity/VendorUpdatedActivity.php b/app/Listeners/Activity/VendorUpdatedActivity.php index 930e6be6f911..eabbc8d8962b 100644 --- a/app/Listeners/Activity/VendorUpdatedActivity.php +++ b/app/Listeners/Activity/VendorUpdatedActivity.php @@ -13,11 +13,8 @@ namespace App\Listeners\Activity; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class VendorUpdatedActivity implements ShouldQueue diff --git a/app/Listeners/Contact/UpdateContactLastLogin.php b/app/Listeners/Contact/UpdateContactLastLogin.php index f8a002749b96..77a376c59aff 100644 --- a/app/Listeners/Contact/UpdateContactLastLogin.php +++ b/app/Listeners/Contact/UpdateContactLastLogin.php @@ -12,10 +12,7 @@ namespace App\Listeners\Contact; use App\Libraries\MultiDB; -use App\Models\Activity; -use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; class UpdateContactLastLogin implements ShouldQueue { diff --git a/app/Listeners/Credit/CreateCreditInvitation.php b/app/Listeners/Credit/CreateCreditInvitation.php index 7f779b77b923..43c27c2a2d03 100644 --- a/app/Listeners/Credit/CreateCreditInvitation.php +++ b/app/Listeners/Credit/CreateCreditInvitation.php @@ -12,17 +12,9 @@ namespace App\Listeners\Credit; use App\Factory\CreditInvitationFactory; -use App\Factory\InvoiceInvitationFactory; use App\Libraries\MultiDB; use App\Models\CreditInvitation; -use App\Models\InvoiceInvitation; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Blade; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Storage; -use Spatie\Browsershot\Browsershot; class CreateCreditInvitation implements ShouldQueue { diff --git a/app/Listeners/Credit/CreditRestoredActivity.php b/app/Listeners/Credit/CreditRestoredActivity.php index 4077157bb7e9..d09034b624d4 100644 --- a/app/Listeners/Credit/CreditRestoredActivity.php +++ b/app/Listeners/Credit/CreditRestoredActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Credit; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class CreditRestoredActivity implements ShouldQueue diff --git a/app/Listeners/Credit/CreditViewedActivity.php b/app/Listeners/Credit/CreditViewedActivity.php index e31bf2af9471..9c4dda3a0555 100644 --- a/app/Listeners/Credit/CreditViewedActivity.php +++ b/app/Listeners/Credit/CreditViewedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Credit; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\CreditInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class CreditViewedActivity implements ShouldQueue diff --git a/app/Listeners/Document/DeleteCompanyDocuments.php b/app/Listeners/Document/DeleteCompanyDocuments.php index 27f10262afc5..b68bc85ce3ce 100644 --- a/app/Listeners/Document/DeleteCompanyDocuments.php +++ b/app/Listeners/Document/DeleteCompanyDocuments.php @@ -4,9 +4,7 @@ namespace App\Listeners\Document; use App\Libraries\MultiDB; use App\Models\Document; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Filesystem\Filesystem; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Facades\Storage; class DeleteCompanyDocuments diff --git a/app/Listeners/Invoice/CreateInvoiceActivity.php b/app/Listeners/Invoice/CreateInvoiceActivity.php index d57f7a23642a..a69727fd57f3 100644 --- a/app/Listeners/Invoice/CreateInvoiceActivity.php +++ b/app/Listeners/Invoice/CreateInvoiceActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class CreateInvoiceActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/CreateInvoiceInvitation.php b/app/Listeners/Invoice/CreateInvoiceInvitation.php index 26559472a64e..3c9f70167727 100644 --- a/app/Listeners/Invoice/CreateInvoiceInvitation.php +++ b/app/Listeners/Invoice/CreateInvoiceInvitation.php @@ -14,13 +14,7 @@ namespace App\Listeners\Invoice; use App\Factory\InvoiceInvitationFactory; use App\Libraries\MultiDB; use App\Models\InvoiceInvitation; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Blade; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Storage; -use Spatie\Browsershot\Browsershot; class CreateInvoiceInvitation implements ShouldQueue { diff --git a/app/Listeners/Invoice/CreateInvoicePdf.php b/app/Listeners/Invoice/CreateInvoicePdf.php index e48174ba75e4..4bf7908688f8 100644 --- a/app/Listeners/Invoice/CreateInvoicePdf.php +++ b/app/Listeners/Invoice/CreateInvoicePdf.php @@ -14,7 +14,6 @@ namespace App\Listeners\Invoice; use App\Jobs\Entity\CreateEntityPdf; use App\Libraries\MultiDB; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; class CreateInvoicePdf implements ShouldQueue { diff --git a/app/Listeners/Invoice/InvoiceArchivedActivity.php b/app/Listeners/Invoice/InvoiceArchivedActivity.php index 6765823d303f..68cf3437d0f4 100644 --- a/app/Listeners/Invoice/InvoiceArchivedActivity.php +++ b/app/Listeners/Invoice/InvoiceArchivedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceArchivedActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceCancelledActivity.php b/app/Listeners/Invoice/InvoiceCancelledActivity.php index 89a25bb088a5..42dff852ed42 100644 --- a/app/Listeners/Invoice/InvoiceCancelledActivity.php +++ b/app/Listeners/Invoice/InvoiceCancelledActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceCancelledActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceDeletedActivity.php b/app/Listeners/Invoice/InvoiceDeletedActivity.php index 3aa0b5db7caf..9b8115d979b4 100644 --- a/app/Listeners/Invoice/InvoiceDeletedActivity.php +++ b/app/Listeners/Invoice/InvoiceDeletedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceDeletedActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceEmailActivity.php b/app/Listeners/Invoice/InvoiceEmailActivity.php index 6a7bc00696a8..005bd71b2c3d 100644 --- a/app/Listeners/Invoice/InvoiceEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceEmailActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php index 3629a754ba74..562b4edd8afa 100644 --- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceEmailFailedActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceEmailedNotification.php b/app/Listeners/Invoice/InvoiceEmailedNotification.php index f1197397d2da..21543eb59d75 100644 --- a/app/Listeners/Invoice/InvoiceEmailedNotification.php +++ b/app/Listeners/Invoice/InvoiceEmailedNotification.php @@ -13,18 +13,9 @@ namespace App\Listeners\Invoice; use App\Jobs\Mail\EntitySentMailer; use App\Libraries\MultiDB; -use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Notifications\Admin\EntitySentNotification; -use App\Notifications\Admin\InvoiceSentNotification; -use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use App\Utils\Traits\Notifications\UserNotifies; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Notification; class InvoiceEmailedNotification implements ShouldQueue { diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php index 415dc13978bc..41d3ea92fa0f 100644 --- a/app/Listeners/Invoice/InvoicePaidActivity.php +++ b/app/Listeners/Invoice/InvoicePaidActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoicePaidActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php index 7da20a5d60c1..31ec97b644d7 100644 --- a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php @@ -12,14 +12,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; -use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceReminderEmailActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceRestoredActivity.php b/app/Listeners/Invoice/InvoiceRestoredActivity.php index 15b64da41083..3feb2f8927ea 100644 --- a/app/Listeners/Invoice/InvoiceRestoredActivity.php +++ b/app/Listeners/Invoice/InvoiceRestoredActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceRestoredActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceReversedActivity.php b/app/Listeners/Invoice/InvoiceReversedActivity.php index b49afc739834..205b6dbdbf59 100644 --- a/app/Listeners/Invoice/InvoiceReversedActivity.php +++ b/app/Listeners/Invoice/InvoiceReversedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceReversedActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/InvoiceViewedActivity.php b/app/Listeners/Invoice/InvoiceViewedActivity.php index 2de4df4f404b..d946b3bbe273 100644 --- a/app/Listeners/Invoice/InvoiceViewedActivity.php +++ b/app/Listeners/Invoice/InvoiceViewedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class InvoiceViewedActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/UpdateInvoiceActivity.php b/app/Listeners/Invoice/UpdateInvoiceActivity.php index 1a07174645a6..fee814a93be9 100644 --- a/app/Listeners/Invoice/UpdateInvoiceActivity.php +++ b/app/Listeners/Invoice/UpdateInvoiceActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class UpdateInvoiceActivity implements ShouldQueue diff --git a/app/Listeners/Invoice/UpdateInvoiceInvitations.php b/app/Listeners/Invoice/UpdateInvoiceInvitations.php index ceb9fad179ee..fdd01fad261f 100644 --- a/app/Listeners/Invoice/UpdateInvoiceInvitations.php +++ b/app/Listeners/Invoice/UpdateInvoiceInvitations.php @@ -12,9 +12,7 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; -use App\Models\Invoice; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; class UpdateInvoiceInvitations implements ShouldQueue { diff --git a/app/Listeners/Misc/InvitationViewedListener.php b/app/Listeners/Misc/InvitationViewedListener.php index 00cba9098d43..3ef7c29cb57b 100644 --- a/app/Listeners/Misc/InvitationViewedListener.php +++ b/app/Listeners/Misc/InvitationViewedListener.php @@ -16,7 +16,6 @@ use App\Libraries\MultiDB; use App\Notifications\Admin\EntityViewedNotification; use App\Utils\Traits\Notifications\UserNotifies; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Facades\Notification; class InvitationViewedListener implements ShouldQueue diff --git a/app/Listeners/Payment/PaymentEmailFailureActivity.php b/app/Listeners/Payment/PaymentEmailFailureActivity.php index c4a7c628de74..3ed2eed98072 100644 --- a/app/Listeners/Payment/PaymentEmailFailureActivity.php +++ b/app/Listeners/Payment/PaymentEmailFailureActivity.php @@ -11,18 +11,9 @@ namespace App\Listeners\Payment; -use App\Jobs\Mail\EntityPaidMailer; use App\Libraries\MultiDB; -use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; -use App\Notifications\Admin\NewPaymentNotification; -use App\Repositories\ActivityRepository; -use App\Utils\Ninja; use App\Utils\Traits\Notifications\UserNotifies; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Notification; class PaymentEmailFailureActivity implements ShouldQueue { diff --git a/app/Listeners/Payment/PaymentEmailedActivity.php b/app/Listeners/Payment/PaymentEmailedActivity.php index 938296fb04d4..a552e5489dd7 100644 --- a/app/Listeners/Payment/PaymentEmailedActivity.php +++ b/app/Listeners/Payment/PaymentEmailedActivity.php @@ -11,18 +11,9 @@ namespace App\Listeners\Payment; -use App\Jobs\Mail\EntityPaidMailer; use App\Libraries\MultiDB; -use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; -use App\Notifications\Admin\NewPaymentNotification; -use App\Repositories\ActivityRepository; -use App\Utils\Ninja; use App\Utils\Traits\Notifications\UserNotifies; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Notification; class PaymentEmailedActivity implements ShouldQueue { diff --git a/app/Listeners/Payment/PaymentNotification.php b/app/Listeners/Payment/PaymentNotification.php index 854357ec9650..927913df9608 100644 --- a/app/Listeners/Payment/PaymentNotification.php +++ b/app/Listeners/Payment/PaymentNotification.php @@ -13,15 +13,10 @@ namespace App\Listeners\Payment; use App\Jobs\Mail\EntityPaidMailer; use App\Libraries\MultiDB; -use App\Models\Activity; -use App\Models\Invoice; -use App\Models\Payment; use App\Notifications\Admin\NewPaymentNotification; -use App\Repositories\ActivityRepository; use App\Utils\Ninja; use App\Utils\Traits\Notifications\UserNotifies; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Facades\Notification; class PaymentNotification implements ShouldQueue diff --git a/app/Listeners/Payment/PaymentRestoredActivity.php b/app/Listeners/Payment/PaymentRestoredActivity.php index 7c524fbfb698..3e17c03ac528 100644 --- a/app/Listeners/Payment/PaymentRestoredActivity.php +++ b/app/Listeners/Payment/PaymentRestoredActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Payment; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class PaymentRestoredActivity implements ShouldQueue diff --git a/app/Listeners/Quote/CreateQuoteInvitation.php b/app/Listeners/Quote/CreateQuoteInvitation.php index eeaf8bd19948..9bd814089132 100644 --- a/app/Listeners/Quote/CreateQuoteInvitation.php +++ b/app/Listeners/Quote/CreateQuoteInvitation.php @@ -11,19 +11,10 @@ namespace App\Listeners\Quote; -use App\Factory\CreditInvitationFactory; -use App\Factory\InvoiceInvitationFactory; use App\Factory\QuoteInvitationFactory; use App\Libraries\MultiDB; -use App\Models\InvoiceInvitation; use App\Models\QuoteInvitation; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Blade; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Storage; -use Spatie\Browsershot\Browsershot; class CreateQuoteInvitation implements ShouldQueue { diff --git a/app/Listeners/Quote/QuoteApprovedActivity.php b/app/Listeners/Quote/QuoteApprovedActivity.php index 0da7c13b0222..480ae52da89d 100644 --- a/app/Listeners/Quote/QuoteApprovedActivity.php +++ b/app/Listeners/Quote/QuoteApprovedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Quote; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class QuoteApprovedActivity implements ShouldQueue diff --git a/app/Listeners/Quote/QuoteArchivedActivity.php b/app/Listeners/Quote/QuoteArchivedActivity.php index 61b143299988..c4e316e82a9e 100644 --- a/app/Listeners/Quote/QuoteArchivedActivity.php +++ b/app/Listeners/Quote/QuoteArchivedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Quote; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class QuoteArchivedActivity implements ShouldQueue diff --git a/app/Listeners/Quote/QuoteDeletedActivity.php b/app/Listeners/Quote/QuoteDeletedActivity.php index ccff57f183f2..50041908187d 100644 --- a/app/Listeners/Quote/QuoteDeletedActivity.php +++ b/app/Listeners/Quote/QuoteDeletedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Quote; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class QuoteDeletedActivity implements ShouldQueue diff --git a/app/Listeners/Quote/QuoteEmailActivity.php b/app/Listeners/Quote/QuoteEmailActivity.php index 4981601572ea..8d64a56b0c6c 100644 --- a/app/Listeners/Quote/QuoteEmailActivity.php +++ b/app/Listeners/Quote/QuoteEmailActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Quote; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class QuoteEmailActivity implements ShouldQueue diff --git a/app/Listeners/Quote/QuoteRestoredActivity.php b/app/Listeners/Quote/QuoteRestoredActivity.php index 05c28d3b86c3..877556ddb962 100644 --- a/app/Listeners/Quote/QuoteRestoredActivity.php +++ b/app/Listeners/Quote/QuoteRestoredActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Quote; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\InvoiceInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class QuoteRestoredActivity implements ShouldQueue diff --git a/app/Listeners/Quote/QuoteViewedActivity.php b/app/Listeners/Quote/QuoteViewedActivity.php index db47466f2acf..e80dfd27e7f4 100644 --- a/app/Listeners/Quote/QuoteViewedActivity.php +++ b/app/Listeners/Quote/QuoteViewedActivity.php @@ -13,13 +13,8 @@ namespace App\Listeners\Quote; use App\Libraries\MultiDB; use App\Models\Activity; -use App\Models\ClientContact; -use App\Models\QuoteInvitation; use App\Repositories\ActivityRepository; -use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Log; use stdClass; class QuoteViewedActivity implements ShouldQueue diff --git a/app/Listeners/Quote/ReachWorkflowSettings.php b/app/Listeners/Quote/ReachWorkflowSettings.php index 2fc0cd19f893..1ca8dbe06fcc 100644 --- a/app/Listeners/Quote/ReachWorkflowSettings.php +++ b/app/Listeners/Quote/ReachWorkflowSettings.php @@ -4,8 +4,6 @@ namespace App\Listeners\Quote; use App\Jobs\Quote\QuoteWorkflowSettings; use App\Libraries\MultiDB; -use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; class ReachWorkflowSettings { diff --git a/app/Listeners/SendVerificationNotification.php b/app/Listeners/SendVerificationNotification.php index 9e6457079d23..05eede2e949b 100644 --- a/app/Listeners/SendVerificationNotification.php +++ b/app/Listeners/SendVerificationNotification.php @@ -16,12 +16,9 @@ use App\Notifications\Ninja\VerifyUser; use App\Utils\Ninja; use Exception; use Illuminate\Broadcasting\InteractsWithSockets; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Events\Dispatchable; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Mail; class SendVerificationNotification implements ShouldQueue { diff --git a/app/Listeners/User/ArchivedUserActivity.php b/app/Listeners/User/ArchivedUserActivity.php index 3732ebcecff4..dfa0356226d3 100644 --- a/app/Listeners/User/ArchivedUserActivity.php +++ b/app/Listeners/User/ArchivedUserActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class ArchivedUserActivity implements ShouldQueue diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php index fcc7236e28e1..bdd943a9eb9a 100644 --- a/app/Listeners/User/CreatedUserActivity.php +++ b/app/Listeners/User/CreatedUserActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class CreatedUserActivity implements ShouldQueue diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php index 7f4e4970ad39..bdedc181dc87 100644 --- a/app/Listeners/User/DeletedUserActivity.php +++ b/app/Listeners/User/DeletedUserActivity.php @@ -17,7 +17,6 @@ use App\Repositories\ActivityRepository; use Illuminate\Broadcasting\InteractsWithSockets; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Events\Dispatchable; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use stdClass; diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php index 70953c441ca7..dc3b4ccf91b9 100644 --- a/app/Listeners/User/RestoredUserActivity.php +++ b/app/Listeners/User/RestoredUserActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class RestoredUserActivity implements ShouldQueue diff --git a/app/Listeners/User/UpdateUserLastLogin.php b/app/Listeners/User/UpdateUserLastLogin.php index b012c53b5a5c..6db7ab2b49a0 100644 --- a/app/Listeners/User/UpdateUserLastLogin.php +++ b/app/Listeners/User/UpdateUserLastLogin.php @@ -12,12 +12,9 @@ namespace App\Listeners\User; use App\Libraries\MultiDB; -use App\Models\Activity; -use App\Repositories\ActivityRepository; use Illuminate\Broadcasting\InteractsWithSockets; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Events\Dispatchable; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; class UpdateUserLastLogin implements ShouldQueue diff --git a/app/Listeners/User/UpdatedUserActivity.php b/app/Listeners/User/UpdatedUserActivity.php index 25b48a7b31f7..3ec91763dd06 100644 --- a/app/Listeners/User/UpdatedUserActivity.php +++ b/app/Listeners/User/UpdatedUserActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use stdClass; class UpdatedUserActivity implements ShouldQueue diff --git a/app/Mail/Admin/EntityNotificationMailer.php b/app/Mail/Admin/EntityNotificationMailer.php index a174d6f20a65..9f91d113672e 100644 --- a/app/Mail/Admin/EntityNotificationMailer.php +++ b/app/Mail/Admin/EntityNotificationMailer.php @@ -11,7 +11,6 @@ namespace App\Mail\Admin; -use App\Models\User; use Illuminate\Mail\Mailable; class EntityNotificationMailer extends Mailable diff --git a/app/Mail/Admin/EntityPaidObject.php b/app/Mail/Admin/EntityPaidObject.php index ddbe2587ca40..163f0860a999 100644 --- a/app/Mail/Admin/EntityPaidObject.php +++ b/app/Mail/Admin/EntityPaidObject.php @@ -11,7 +11,6 @@ namespace App\Mail\Admin; -use App\Models\User; use App\Utils\Number; use stdClass; diff --git a/app/Mail/Admin/EntitySentObject.php b/app/Mail/Admin/EntitySentObject.php index 2c822a82424f..2d334878d543 100644 --- a/app/Mail/Admin/EntitySentObject.php +++ b/app/Mail/Admin/EntitySentObject.php @@ -11,7 +11,6 @@ namespace App\Mail\Admin; -use App\Models\User; use App\Utils\Number; use stdClass; diff --git a/app/Mail/Admin/EntityViewedObject.php b/app/Mail/Admin/EntityViewedObject.php index 7709aa40e9b9..ab0c37871512 100644 --- a/app/Mail/Admin/EntityViewedObject.php +++ b/app/Mail/Admin/EntityViewedObject.php @@ -11,7 +11,6 @@ namespace App\Mail\Admin; -use App\Models\User; use App\Utils\Number; use stdClass; diff --git a/app/Mail/Admin/PaymentFailureObject.php b/app/Mail/Admin/PaymentFailureObject.php index 9408e27816e0..956e82d28413 100644 --- a/app/Mail/Admin/PaymentFailureObject.php +++ b/app/Mail/Admin/PaymentFailureObject.php @@ -11,7 +11,6 @@ namespace App\Mail\Admin; -use App\Models\User; use App\Utils\Number; use stdClass; diff --git a/app/Mail/DownloadInvoices.php b/app/Mail/DownloadInvoices.php index 6d07768ae419..9d6720c89162 100644 --- a/app/Mail/DownloadInvoices.php +++ b/app/Mail/DownloadInvoices.php @@ -3,9 +3,7 @@ namespace App\Mail; use App\Models\Company; -use App\Utils\Ninja; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php index c0662f9f7855..f76c395adb50 100644 --- a/app/Mail/Engine/PaymentEmailEngine.php +++ b/app/Mail/Engine/PaymentEmailEngine.php @@ -12,7 +12,6 @@ namespace App\Mail\Engine; use App\DataMapper\EmailTemplateDefaults; -use App\Utils\HtmlEngine; use App\Utils\Number; use App\Utils\Traits\MakesDates; diff --git a/app/Mail/ExistingMigration.php b/app/Mail/ExistingMigration.php index e70e1cd98622..b9b657daa2f1 100644 --- a/app/Mail/ExistingMigration.php +++ b/app/Mail/ExistingMigration.php @@ -3,7 +3,6 @@ namespace App\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/Invoices/InvoiceWasPaid.php b/app/Mail/Invoices/InvoiceWasPaid.php index 70ebef1fdf72..72979b88a829 100644 --- a/app/Mail/Invoices/InvoiceWasPaid.php +++ b/app/Mail/Invoices/InvoiceWasPaid.php @@ -3,7 +3,6 @@ namespace App\Mail\Invoices; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/MigrationCompleted.php b/app/Mail/MigrationCompleted.php index 861e2bfda287..988b36c0f819 100644 --- a/app/Mail/MigrationCompleted.php +++ b/app/Mail/MigrationCompleted.php @@ -3,7 +3,6 @@ namespace App\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/Quote/QuoteWasApproved.php b/app/Mail/Quote/QuoteWasApproved.php index 5467cb7b7ef4..dbe095b577af 100644 --- a/app/Mail/Quote/QuoteWasApproved.php +++ b/app/Mail/Quote/QuoteWasApproved.php @@ -3,7 +3,6 @@ namespace App\Mail\Quote; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index dc63ec86c65e..cfecff8ce2c5 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -4,7 +4,6 @@ namespace App\Mail; use App\Utils\Ninja; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; use LimitIterator; diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php index c7d2fe20daa9..464eac9ea25f 100644 --- a/app/Mail/TemplateEmail.php +++ b/app/Mail/TemplateEmail.php @@ -14,7 +14,6 @@ namespace App\Mail; use App\Models\Client; use App\Models\User; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/TestMailServer.php b/app/Mail/TestMailServer.php index 6dc52b3f810b..e392e121b334 100644 --- a/app/Mail/TestMailServer.php +++ b/app/Mail/TestMailServer.php @@ -11,9 +11,7 @@ namespace App\Mail; -use App\Utils\Ninja; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/User/UserNotificationMailer.php b/app/Mail/User/UserNotificationMailer.php index db85dedc1180..97a56513871b 100644 --- a/app/Mail/User/UserNotificationMailer.php +++ b/app/Mail/User/UserNotificationMailer.php @@ -11,7 +11,6 @@ namespace App\Mail\User; -use App\Models\User; use Illuminate\Mail\Mailable; class UserNotificationMailer extends Mailable diff --git a/app/Models/Account.php b/app/Models/Account.php index cb46be9ef3d5..519e9d24daa5 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -15,7 +15,6 @@ use App\Models\Presenters\AccountPresenter; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; use DateTime; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Laracasts\Presenter\PresentableTrait; diff --git a/app/Models/Activity.php b/app/Models/Activity.php index 258af69fc01c..8eae4bd5f5dd 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -12,7 +12,6 @@ namespace App\Models; use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; class Activity extends StaticModel { diff --git a/app/Models/Backup.php b/app/Models/Backup.php index 79ed840742f4..dfcff78e991d 100644 --- a/app/Models/Backup.php +++ b/app/Models/Backup.php @@ -11,11 +11,6 @@ namespace App\Models; -use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\SoftDeletes; -use Laracasts\Presenter\PresentableTrait; - class Backup extends BaseModel { public function getEntityType() diff --git a/app/Models/BankAccount.php b/app/Models/BankAccount.php index a57fb57d5674..f3fb4ca5220e 100644 --- a/app/Models/BankAccount.php +++ b/app/Models/BankAccount.php @@ -12,7 +12,6 @@ namespace App\Models; use Crypt; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Models/BankSubaccount.php b/app/Models/BankSubaccount.php index af5e0e910d69..c6c940c5a920 100644 --- a/app/Models/BankSubaccount.php +++ b/app/Models/BankSubaccount.php @@ -11,7 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index 89cd71f2d237..4c8b411e5cc6 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -13,17 +13,12 @@ namespace App\Models; use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; -use App\Filters\QueryFilters; -use App\Models\Design; use App\Utils\Traits\MakesHash; use App\Utils\Traits\UserSessionAttributes; -use Hashids\Hashids; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException; -use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; -use Illuminate\Database\Eloquent\Factories\HasFactory; class BaseModel extends Model { diff --git a/app/Models/Client.php b/app/Models/Client.php index 87383c73ee97..922beefd2098 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -13,38 +13,15 @@ namespace App\Models; use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; -use App\Factory\CompanyLedgerFactory; -use App\Factory\CreditFactory; -use App\Factory\InvoiceFactory; -use App\Factory\QuoteFactory; -use App\Models\Activity; -use App\Models\Company; -use App\Models\CompanyGateway; -use App\Models\Country; -use App\Models\Credit; -use App\Models\Currency; -use App\Models\DateFormat; -use App\Models\DatetimeFormat; -use App\Models\Filterable; -use App\Models\GatewayType; -use App\Models\GroupSetting; -use App\Models\Invoice; -use App\Models\Language; use App\Models\Presenters\ClientPresenter; -use App\Models\Quote; -use App\Models\Timezone; -use App\Models\User; use App\Services\Client\ClientService; -use App\Utils\Traits\CompanyGatewaySettings; use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; use Exception; -use Hashids\Hashids; use Illuminate\Contracts\Translation\HasLocalePreference; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\URL; use Laracasts\Presenter\PresentableTrait; class Client extends BaseModel implements HasLocalePreference diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php index f14fe6a72dae..bfa50b598555 100644 --- a/app/Models/ClientContact.php +++ b/app/Models/ClientContact.php @@ -11,15 +11,9 @@ namespace App\Models; -use App\Models\Company; -use App\Models\Language; use App\Models\Presenters\ClientContactPresenter; -use App\Models\User; -use App\Notifications\ClientContactResetPassword as ResetPasswordNotification; use App\Notifications\ClientContactResetPassword; use App\Utils\Traits\MakesHash; -use Hashids\Hashids; -use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Contracts\Translation\HasLocalePreference; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -27,7 +21,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; use Laracasts\Presenter\PresentableTrait; class ClientContact extends Authenticatable implements HasLocalePreference diff --git a/app/Models/ClientGatewayToken.php b/app/Models/ClientGatewayToken.php index 21e34db4fda5..8e9ab3f03ee1 100644 --- a/app/Models/ClientGatewayToken.php +++ b/app/Models/ClientGatewayToken.php @@ -11,11 +11,6 @@ namespace App\Models; -use App\Models\Client; -use App\Models\Company; -use App\Models\CompanyGateway; -use App\Models\GatewayType; -use App\Models\User; use App\Utils\Traits\MakesDates; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/Company.php b/app/Models/Company.php index 7c1bcf453bf8..1a00725cebf1 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -11,40 +11,15 @@ namespace App\Models; -use App\DataMapper\CompanySettings; -use App\Events\Company\CompanyDocumentsDeleted; -use App\Models\Account; -use App\Models\Client; -use App\Models\CompanyGateway; -use App\Models\CompanyUser; -use App\Models\Country; -use App\Models\Credit; -use App\Models\Currency; -use App\Models\Design; -use App\Models\Expense; -use App\Models\GroupSetting; -use App\Models\Industry; -use App\Models\Invoice; -use App\Models\Language; -use App\Models\Payment; -use App\Models\PaymentType; use App\Models\Presenters\CompanyPresenter; -use App\Models\Product; -use App\Models\RecurringInvoice; -use App\Models\TaxRate; -use App\Models\Timezone; -use App\Models\Traits\AccountTrait; -use App\Models\User; use App\Services\Notification\NotificationService; use App\Utils\Ninja; use App\Utils\Traits\CompanySettingsSaver; use App\Utils\Traits\MakesHash; use App\Utils\Traits\ThrottlesEmail; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Log; use Laracasts\Presenter\PresentableTrait; class Company extends BaseModel diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index 593256a50471..a8082e93b931 100644 --- a/app/Models/CompanyGateway.php +++ b/app/Models/CompanyGateway.php @@ -11,13 +11,8 @@ namespace App\Models; -use App\Models\Client; -use App\Models\Company; -use App\Models\Gateway; -use App\Models\GatewayType; use App\PaymentDrivers\BasePaymentDriver; use App\Utils\Number; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use stdClass; diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php index ed9cd2581c82..694d5eaf123c 100644 --- a/app/Models/CompanyToken.php +++ b/app/Models/CompanyToken.php @@ -11,8 +11,6 @@ namespace App\Models; -use App\Models\Filterable; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; class CompanyToken extends BaseModel diff --git a/app/Models/Country.php b/app/Models/Country.php index 0d5e81231358..e6b5e4369737 100644 --- a/app/Models/Country.php +++ b/app/Models/Country.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Country extends StaticModel { public $timestamps = false; diff --git a/app/Models/Credit.php b/app/Models/Credit.php index 0c7632b40cf6..916f4473b2ef 100644 --- a/app/Models/Credit.php +++ b/app/Models/Credit.php @@ -15,7 +15,6 @@ use App\Events\Credit\CreditWasUpdated; use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSumInclusive; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\Filterable; use App\Models\Presenters\CreditPresenter; use App\Services\Credit\CreditService; use App\Services\Ledger\LedgerService; @@ -24,7 +23,6 @@ use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesInvoiceValues; use App\Utils\Traits\MakesReminders; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Storage; diff --git a/app/Models/CreditInvitation.php b/app/Models/CreditInvitation.php index 18904920c2f9..29dd71d3bcdc 100644 --- a/app/Models/CreditInvitation.php +++ b/app/Models/CreditInvitation.php @@ -13,11 +13,9 @@ namespace App\Models; use App\Events\Credit\CreditWasUpdated; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\Invoice; use App\Utils\Ninja; use App\Utils\Traits\Inviteable; use App\Utils\Traits\MakesDates; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; diff --git a/app/Models/Currency.php b/app/Models/Currency.php index 6d5ed2ea4345..96ff14dc017f 100644 --- a/app/Models/Currency.php +++ b/app/Models/Currency.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Currency extends StaticModel { public $timestamps = false; diff --git a/app/Models/Design.php b/app/Models/Design.php index c7ebbdaa6780..1e9f7d8ea485 100644 --- a/app/Models/Design.php +++ b/app/Models/Design.php @@ -11,8 +11,6 @@ namespace App\Models; -use App\Models\Filterable; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; class Design extends BaseModel diff --git a/app/Models/Document.php b/app/Models/Document.php index 4a39618ec685..9e63b0972e80 100644 --- a/app/Models/Document.php +++ b/app/Models/Document.php @@ -11,7 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Storage; diff --git a/app/Models/Expense.php b/app/Models/Expense.php index 47e80d7398b1..9cc71214d1be 100644 --- a/app/Models/Expense.php +++ b/app/Models/Expense.php @@ -11,9 +11,6 @@ namespace App\Models; -use App\Models\Filterable; -use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; class Expense extends BaseModel diff --git a/app/Models/ExpenseCategory.php b/app/Models/ExpenseCategory.php index bedf598ca3ee..512e6321ae1c 100644 --- a/app/Models/ExpenseCategory.php +++ b/app/Models/ExpenseCategory.php @@ -11,8 +11,6 @@ namespace App\Models; -use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php index f2257b3ac5bb..2a256734bfe9 100644 --- a/app/Models/Gateway.php +++ b/app/Models/Gateway.php @@ -11,9 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; -use Omnipay\Omnipay; - class Gateway extends StaticModel { protected $casts = [ diff --git a/app/Models/GatewayType.php b/app/Models/GatewayType.php index 04b72832a2a6..6d53ab2ea179 100644 --- a/app/Models/GatewayType.php +++ b/app/Models/GatewayType.php @@ -11,9 +11,6 @@ namespace App\Models; -use App\Models\Gateway; -use Illuminate\Database\Eloquent\Model; - class GatewayType extends StaticModel { public $timestamps = false; diff --git a/app/Models/GroupSetting.php b/app/Models/GroupSetting.php index 17aec3965105..7462c7a8f0de 100644 --- a/app/Models/GroupSetting.php +++ b/app/Models/GroupSetting.php @@ -11,13 +11,7 @@ namespace App\Models; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\Client; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Hashids\Hashids; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Models/Industry.php b/app/Models/Industry.php index 4b02ee7707d7..91571e3daa6b 100644 --- a/app/Models/Industry.php +++ b/app/Models/Industry.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Industry extends StaticModel { public $timestamps = false; diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 50c35ef9c217..240049aa40ae 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -11,34 +11,21 @@ namespace App\Models; -use App\Events\Invoice\InvoiceWasMarkedSent; -use App\Events\Invoice\InvoiceWasPaid; use App\Events\Invoice\InvoiceWasUpdated; use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSumInclusive; -use App\Jobs\Client\UpdateClientBalance; -use App\Jobs\Company\UpdateCompanyLedgerWithInvoice; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\Backup; -use App\Models\CompanyLedger; -use App\Models\Currency; -use App\Models\Filterable; -use App\Models\PaymentTerm; use App\Models\Presenters\InvoicePresenter; use App\Services\Invoice\InvoiceService; use App\Services\Ledger\LedgerService; use App\Utils\Ninja; -use App\Utils\Number; -use App\Utils\Traits\Archivable; use App\Utils\Traits\Invoice\ActionsInvoice; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesInvoiceValues; use App\Utils\Traits\MakesReminders; use App\Utils\Traits\NumberFormatter; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Storage; use Laracasts\Presenter\PresentableTrait; diff --git a/app/Models/InvoiceInvitation.php b/app/Models/InvoiceInvitation.php index 1022d56ed42a..0510565fadb2 100644 --- a/app/Models/InvoiceInvitation.php +++ b/app/Models/InvoiceInvitation.php @@ -13,7 +13,6 @@ namespace App\Models; use App\Events\Invoice\InvoiceWasUpdated; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\Invoice; use App\Utils\Ninja; use App\Utils\Traits\Inviteable; use App\Utils\Traits\MakesDates; diff --git a/app/Models/Language.php b/app/Models/Language.php index 0e8f2169b562..712597c563ad 100644 --- a/app/Models/Language.php +++ b/app/Models/Language.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Language extends StaticModel { public $timestamps = false; diff --git a/app/Models/Payment.php b/app/Models/Payment.php index 0b1f58b09920..3f4c8792bf08 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -12,11 +12,6 @@ namespace App\Models; use App\Events\Payment\PaymentWasVoided; -use App\Models\BaseModel; -use App\Models\Credit; -use App\Models\DateFormat; -use App\Models\Filterable; -use App\Models\Paymentable; use App\Services\Ledger\LedgerService; use App\Services\Payment\PaymentService; use App\Utils\Ninja; @@ -24,7 +19,6 @@ use App\Utils\Number; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; use App\Utils\Traits\Payment\Refundable; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; class Payment extends BaseModel diff --git a/app/Models/PaymentLibrary.php b/app/Models/PaymentLibrary.php index 3dee9b6d9e41..03397fec87dc 100644 --- a/app/Models/PaymentLibrary.php +++ b/app/Models/PaymentLibrary.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - /** * Class PaymentLibrary. */ diff --git a/app/Models/PaymentTerm.php b/app/Models/PaymentTerm.php index daf9d82e7c03..a44b00ea5ff0 100644 --- a/app/Models/PaymentTerm.php +++ b/app/Models/PaymentTerm.php @@ -12,7 +12,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Support\Facades\Log; /** * Class PaymentTerm. diff --git a/app/Models/PaymentType.php b/app/Models/PaymentType.php index 3d9ed1f8f190..eb793f192b4f 100644 --- a/app/Models/PaymentType.php +++ b/app/Models/PaymentType.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class PaymentType extends StaticModel { /** diff --git a/app/Models/Presenters/EntityPresenter.php b/app/Models/Presenters/EntityPresenter.php index 99bd5392f57a..efb10f65b9b0 100644 --- a/app/Models/Presenters/EntityPresenter.php +++ b/app/Models/Presenters/EntityPresenter.php @@ -12,10 +12,8 @@ namespace App\Models\Presenters; use App\Utils\Traits\MakesHash; -use Hashids\Hashids; use Laracasts\Presenter\Presenter; use URL; -use Utils; /** * Class EntityPresenter. diff --git a/app/Models/Product.php b/app/Models/Product.php index b13f7e9e79d9..5ad61d953574 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -11,9 +11,7 @@ namespace App\Models; -use App\Models\Filterable; use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; class Product extends BaseModel diff --git a/app/Models/Project.php b/app/Models/Project.php index 55dc2c23a307..c295d666fe79 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -2,7 +2,6 @@ namespace App\Models; -use App\Models\Filterable; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Laracasts\Presenter\PresentableTrait; diff --git a/app/Models/Proposal.php b/app/Models/Proposal.php index ba396989b495..1121b37b7cd1 100644 --- a/app/Models/Proposal.php +++ b/app/Models/Proposal.php @@ -12,7 +12,6 @@ namespace App\Models; use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; class Proposal extends BaseModel { diff --git a/app/Models/Quote.php b/app/Models/Quote.php index 94ee3fece16f..897c6d646253 100644 --- a/app/Models/Quote.php +++ b/app/Models/Quote.php @@ -15,16 +15,13 @@ use App\Events\Quote\QuoteWasUpdated; use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSumInclusive; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\Filterable; use App\Models\Presenters\QuotePresenter; use App\Services\Quote\QuoteService; use App\Utils\Ninja; -use App\Utils\Traits\Archivable; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesInvoiceValues; use App\Utils\Traits\MakesReminders; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Storage; diff --git a/app/Models/QuoteInvitation.php b/app/Models/QuoteInvitation.php index 1ece2d56f9de..403946f7eb10 100644 --- a/app/Models/QuoteInvitation.php +++ b/app/Models/QuoteInvitation.php @@ -13,11 +13,9 @@ namespace App\Models; use App\Events\Quote\QuoteWasUpdated; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\Quote; use App\Utils\Ninja; use App\Utils\Traits\Inviteable; use App\Utils\Traits\MakesDates; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index 8a89de7beb6e..94358ec74b90 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -13,13 +13,10 @@ namespace App\Models; use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSumInclusive; -use App\Models\Filterable; -use App\Models\RecurringInvoiceInvitation; use App\Services\Recurring\RecurringService; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; use App\Utils\Traits\Recurring\HasRecurrence; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; diff --git a/app/Models/RecurringInvoiceInvitation.php b/app/Models/RecurringInvoiceInvitation.php index 0fb626e3e68b..733141f664f2 100644 --- a/app/Models/RecurringInvoiceInvitation.php +++ b/app/Models/RecurringInvoiceInvitation.php @@ -11,10 +11,8 @@ namespace App\Models; -use App\Models\RecurringInvoice; use App\Utils\Traits\Inviteable; use App\Utils\Traits\MakesDates; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Models/RecurringQuote.php b/app/Models/RecurringQuote.php index 5414e5e8640c..ded9b8f9f138 100644 --- a/app/Models/RecurringQuote.php +++ b/app/Models/RecurringQuote.php @@ -11,9 +11,7 @@ namespace App\Models; -use App\Models\Filterable; use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; diff --git a/app/Models/Size.php b/app/Models/Size.php index c0382eb8827a..5ce20512d0b4 100644 --- a/app/Models/Size.php +++ b/app/Models/Size.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - /** * Class Size. */ diff --git a/app/Models/SystemLog.php b/app/Models/SystemLog.php index 7c138620a069..98699266603a 100644 --- a/app/Models/SystemLog.php +++ b/app/Models/SystemLog.php @@ -11,7 +11,6 @@ namespace App\Models; -use App\Models\Filterable; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Models/Task.php b/app/Models/Task.php index 1cf6bcbf242e..39fd8127888c 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -11,9 +11,7 @@ namespace App\Models; -use App\Models\Filterable; use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Carbon; diff --git a/app/Models/TaxRate.php b/app/Models/TaxRate.php index 49b67f067c8d..50deed2e0ce1 100644 --- a/app/Models/TaxRate.php +++ b/app/Models/TaxRate.php @@ -12,7 +12,6 @@ namespace App\Models; use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; class TaxRate extends BaseModel diff --git a/app/Models/Timezone.php b/app/Models/Timezone.php index 6c12eef399ea..7edcde9fcaba 100644 --- a/app/Models/Timezone.php +++ b/app/Models/Timezone.php @@ -11,8 +11,6 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class Timezone extends StaticModel { /** diff --git a/app/Models/User.php b/app/Models/User.php index 2d2f7461feb9..66e53b69a427 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -11,19 +11,12 @@ namespace App\Models; -use App\Models\Company; -use App\Models\CompanyToken; -use App\Models\CompanyUser; -use App\Models\Filterable; -use App\Models\Language; use App\Models\Presenters\UserPresenter; -use App\Models\Traits\UserTrait; use App\Notifications\ResetPasswordNotification; use App\Utils\Traits\MakesHash; use App\Utils\Traits\UserSessionAttributes; use App\Utils\Traits\UserSettings; use Illuminate\Contracts\Auth\MustVerifyEmail; -use Illuminate\Contracts\Translation\HasLocalePreference; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index 8fe542e71ab8..4807dd8f4c91 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -11,12 +11,8 @@ namespace App\Models; -use App\Models\Filterable; use App\Models\Presenters\VendorPresenter; -use App\Models\VendorContact; use App\Utils\Traits\GeneratesCounter; -use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Laracasts\Presenter\PresentableTrait; diff --git a/app/Models/VendorContact.php b/app/Models/VendorContact.php index 31e2dd489fb1..b4031e545217 100644 --- a/app/Models/VendorContact.php +++ b/app/Models/VendorContact.php @@ -11,14 +11,8 @@ namespace App\Models; -use App\Models\Company; -use App\Models\Language; -use App\Models\User; -use App\Notifications\ClientContactResetPassword as ResetPasswordNotification; use App\Notifications\ClientContactResetPassword; use App\Utils\Traits\MakesHash; -use Hashids\Hashids; -use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Contracts\Translation\HasLocalePreference; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -26,7 +20,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; use Laracasts\Presenter\PresentableTrait; class VendorContact extends Authenticatable implements HasLocalePreference diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index 7839b3d62da3..d8d096ae8812 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -11,7 +11,6 @@ namespace App\Models; -use App\Models\Filterable; use Illuminate\Database\Eloquent\SoftDeletes; class Webhook extends BaseModel diff --git a/app/Notifications/Admin/NewPartialPaymentNotification.php b/app/Notifications/Admin/NewPartialPaymentNotification.php index c12d78005ba6..83eba45e660f 100644 --- a/app/Notifications/Admin/NewPartialPaymentNotification.php +++ b/app/Notifications/Admin/NewPartialPaymentNotification.php @@ -11,7 +11,6 @@ namespace App\Notifications\Admin; -use App\Mail\Signup\NewSignup; use App\Utils\Number; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Notifications/Admin/NewPaymentNotification.php b/app/Notifications/Admin/NewPaymentNotification.php index 7025e42de931..867e9b818da0 100644 --- a/app/Notifications/Admin/NewPaymentNotification.php +++ b/app/Notifications/Admin/NewPaymentNotification.php @@ -11,7 +11,6 @@ namespace App\Notifications\Admin; -use App\Mail\Signup\NewSignup; use App\Utils\Number; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Notifications/ClientContactRequestCancellation.php b/app/Notifications/ClientContactRequestCancellation.php index 7567d4833c72..68c6ce5f3beb 100644 --- a/app/Notifications/ClientContactRequestCancellation.php +++ b/app/Notifications/ClientContactRequestCancellation.php @@ -11,7 +11,6 @@ namespace App\Notifications; -use App\Mail\RecurringCancellationRequest; use Closure; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Notifications/ClientContactResetPassword.php b/app/Notifications/ClientContactResetPassword.php index b278573cb3b9..0ab2ab6c5241 100644 --- a/app/Notifications/ClientContactResetPassword.php +++ b/app/Notifications/ClientContactResetPassword.php @@ -13,13 +13,11 @@ namespace App\Notifications; use Closure; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Lang; class ClientContactResetPassword extends Notification { diff --git a/app/Notifications/NewAccountCreated.php b/app/Notifications/NewAccountCreated.php index e2140932f6e2..98257d57fb0d 100644 --- a/app/Notifications/NewAccountCreated.php +++ b/app/Notifications/NewAccountCreated.php @@ -11,7 +11,6 @@ namespace App\Notifications; -use App\Mail\Signup\NewSignup; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Notifications/Ninja/NewAccountCreated.php b/app/Notifications/Ninja/NewAccountCreated.php index 4acc78fe6eb6..34609e56cb62 100644 --- a/app/Notifications/Ninja/NewAccountCreated.php +++ b/app/Notifications/Ninja/NewAccountCreated.php @@ -11,7 +11,6 @@ namespace App\Notifications\Ninja; -use App\Mail\Signup\NewSignup; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Notifications/Ninja/VerifyUser.php b/app/Notifications/Ninja/VerifyUser.php index 0e673b7cbe6c..fcd8dcf830bb 100644 --- a/app/Notifications/Ninja/VerifyUser.php +++ b/app/Notifications/Ninja/VerifyUser.php @@ -11,12 +11,10 @@ namespace App\Notifications\Ninja; -use App\Mail\Signup\NewSignup; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Notifications\Messages\MailMessage; -use Illuminate\Notifications\Messages\SlackMessage; use Illuminate\Notifications\Notification; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; diff --git a/app/Notifications/ResetPasswordNotification.php b/app/Notifications/ResetPasswordNotification.php index 66c5eb6f1fc2..3065168f3333 100644 --- a/app/Notifications/ResetPasswordNotification.php +++ b/app/Notifications/ResetPasswordNotification.php @@ -3,7 +3,6 @@ namespace App\Notifications; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; diff --git a/app/Notifications/SendGenericNotification.php b/app/Notifications/SendGenericNotification.php index 62a4584c15cb..22b1660ed0d4 100644 --- a/app/Notifications/SendGenericNotification.php +++ b/app/Notifications/SendGenericNotification.php @@ -11,17 +11,14 @@ namespace App\Notifications; -use App\Jobs\Invoice\CreateUbl; use App\Models\Invoice; use App\Utils\Number; -use App\Utils\Traits\MakesInvoiceHtml; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\SlackMessage; use Illuminate\Notifications\Notification; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; class SendGenericNotification extends BaseNotification implements ShouldQueue diff --git a/app/Observers/CompanyObserver.php b/app/Observers/CompanyObserver.php index 9342d365ca56..e58bdea8db75 100644 --- a/app/Observers/CompanyObserver.php +++ b/app/Observers/CompanyObserver.php @@ -13,7 +13,6 @@ namespace App\Observers; use App\Events\Company\CompanyDocumentsDeleted; use App\Models\Company; -use App\Utils\Ninja; class CompanyObserver { diff --git a/app/Observers/PaymentObserver.php b/app/Observers/PaymentObserver.php index 926da623a19c..d57ab7b101e5 100644 --- a/app/Observers/PaymentObserver.php +++ b/app/Observers/PaymentObserver.php @@ -11,7 +11,6 @@ namespace App\Observers; -use App\Events\Payment\PaymentWasCreated; use App\Jobs\Util\WebhookHandler; use App\Models\Payment; use App\Models\Webhook; diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index cd587214d61f..89cf05e10646 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -11,7 +11,6 @@ namespace App\Observers; -use App\Events\User\UserWasUpdated; use App\Models\User; class UserObserver diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php b/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php index 63ee00d4be79..e077a2fc9f40 100644 --- a/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php +++ b/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php @@ -14,12 +14,8 @@ namespace App\PaymentDrivers\Authorize; use App\Exceptions\GenericPaymentDriverFailure; use App\Models\Client; -use App\Models\GatewayType; use App\PaymentDrivers\AuthorizePaymentDriver; -use net\authorize\api\constants\ANetEnvironment; use net\authorize\api\contract\v1\CreateCustomerProfileRequest; -use net\authorize\api\contract\v1\CustomerAddressType; -use net\authorize\api\contract\v1\CustomerPaymentProfileType; use net\authorize\api\contract\v1\CustomerProfileType; use net\authorize\api\controller\CreateCustomerProfileController; diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php index 3963c1ba3be8..1dda822d2182 100644 --- a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php +++ b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php @@ -13,7 +13,6 @@ namespace App\PaymentDrivers\Authorize; use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; use App\Jobs\Util\SystemLogger; use App\Models\ClientGatewayToken; use App\Models\GatewayType; @@ -21,13 +20,9 @@ use App\Models\Payment; use App\Models\PaymentHash; use App\Models\PaymentType; use App\Models\SystemLog; -use App\PaymentDrivers\Authorize\AuthorizeCreateCustomer; -use App\PaymentDrivers\Authorize\AuthorizePaymentMethod; -use App\PaymentDrivers\Authorize\ChargePaymentProfile; use App\PaymentDrivers\AuthorizePaymentDriver; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; -use Illuminate\Support\Carbon; /** * Class AuthorizeCreditCard. diff --git a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php index a3fca5069931..8b1ab194a530 100644 --- a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php +++ b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php @@ -19,15 +19,12 @@ use App\PaymentDrivers\AuthorizePaymentDriver; use App\PaymentDrivers\Authorize\AuthorizeCreateCustomer; use App\PaymentDrivers\Authorize\AuthorizeCreditCard; use net\authorize\api\contract\v1\CreateCustomerPaymentProfileRequest; -use net\authorize\api\contract\v1\CreateCustomerProfileRequest; use net\authorize\api\contract\v1\CustomerAddressType; use net\authorize\api\contract\v1\CustomerPaymentProfileType; -use net\authorize\api\contract\v1\CustomerProfileType; use net\authorize\api\contract\v1\GetCustomerPaymentProfileRequest; use net\authorize\api\contract\v1\OpaqueDataType; use net\authorize\api\contract\v1\PaymentType; use net\authorize\api\controller\CreateCustomerPaymentProfileController; -use net\authorize\api\controller\CreateCustomerProfileController; use net\authorize\api\controller\GetCustomerPaymentProfileController; use stdClass; diff --git a/app/PaymentDrivers/Authorize/RefundTransaction.php b/app/PaymentDrivers/Authorize/RefundTransaction.php index 8bedfcf40bfc..8669819e2937 100644 --- a/app/PaymentDrivers/Authorize/RefundTransaction.php +++ b/app/PaymentDrivers/Authorize/RefundTransaction.php @@ -13,7 +13,6 @@ namespace App\PaymentDrivers\Authorize; use App\Models\Payment; -use App\PaymentDrivers\Authorize\AuthorizeTransactions; use App\PaymentDrivers\AuthorizePaymentDriver; use net\authorize\api\contract\v1\CreateTransactionRequest; use net\authorize\api\contract\v1\CustomerProfilePaymentType; diff --git a/app/PaymentDrivers/AuthorizePaymentDriver.php b/app/PaymentDrivers/AuthorizePaymentDriver.php index f462024ece3a..a5b3de7ac90d 100644 --- a/app/PaymentDrivers/AuthorizePaymentDriver.php +++ b/app/PaymentDrivers/AuthorizePaymentDriver.php @@ -14,19 +14,15 @@ namespace App\PaymentDrivers; use App\Models\ClientGatewayToken; use App\Models\GatewayType; -use App\Models\Invoice; use App\Models\Payment; use App\Models\PaymentHash; use App\Models\SystemLog; use App\PaymentDrivers\Authorize\AuthorizeCreditCard; use App\PaymentDrivers\Authorize\AuthorizePaymentMethod; -use App\PaymentDrivers\Authorize\ChargePaymentProfile; use App\PaymentDrivers\Authorize\RefundTransaction; use net\authorize\api\constants\ANetEnvironment; -use net\authorize\api\contract\v1\CreateTransactionRequest; use net\authorize\api\contract\v1\GetMerchantDetailsRequest; use net\authorize\api\contract\v1\MerchantAuthenticationType; -use net\authorize\api\controller\CreateTransactionController; use net\authorize\api\controller\GetMerchantDetailsController; /** diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php index 741cbe61efeb..12c32023e486 100644 --- a/app/PaymentDrivers/BaseDriver.php +++ b/app/PaymentDrivers/BaseDriver.php @@ -26,7 +26,6 @@ use App\Models\Invoice; use App\Models\Payment; use App\Models\PaymentHash; use App\Models\SystemLog; -use App\PaymentDrivers\AbstractPaymentDriver; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; use App\Utils\Traits\SystemLogTrait; @@ -69,6 +68,9 @@ class BaseDriver extends AbstractPaymentDriver /* Array of payment methods */ public static $methods = []; + + /** @var array */ + public $required_fields = []; public function __construct(CompanyGateway $company_gateway, Client $client = null, $invitation = false) { @@ -329,4 +331,118 @@ class BaseDriver extends AbstractPaymentDriver throw new PaymentFailed($error, $e->getCode()); } + + /** + * Wrapper method for checking if resource is good. + * + * @param mixed $resource + * @return bool + */ + public function checkRequiredResource($resource): bool + { + if (is_null($resource) || empty($resource)) { + return true; + } + + return false; + } + + public function checkRequirements() + { + if ($this->company_gateway->require_billing_address) { + if ($this->checkRequiredResource(auth()->user('contact')->client->address1)) { + $this->required_fields[] = 'billing_address1'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->address2)) { + $this->required_fields[] = 'billing_address2'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->city)) { + $this->required_fields[] = 'billing_city'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->state)) { + $this->required_fields[] = 'billing_state'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->postal_code)) { + $this->required_fields[] = 'billing_postal_code'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->country_id)) { + $this->required_fields[] = 'billing_country'; + } + } + + if ($this->company_gateway->require_shipping_address) { + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_address1)) { + $this->required_fields[] = 'shipping_address1'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_address2)) { + $this->required_fields[] = 'shipping_address2'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_city)) { + $this->required_fields[] = 'shipping_city'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_state)) { + $this->required_fields[] = 'shipping_state'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_postal_code)) { + $this->required_fields[] = 'shipping_postal_code'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_country_id)) { + $this->required_fields[] = 'shipping_country'; + } + } + + if ($this->company_gateway->require_client_name) { + if ($this->checkRequiredResource(auth()->user('contact')->client->name)) { + $this->required_fields[] = 'name'; + } + } + + if ($this->company_gateway->require_client_phone) { + if ($this->checkRequiredResource(auth()->user('contact')->client->phone)) { + $this->required_fields[] = 'phone'; + } + } + + if ($this->company_gateway->require_contact_email) { + if ($this->checkRequiredResource(auth()->user('contact')->email)) { + $this->required_fields[] = 'contact_email'; + } + } + + if ($this->company_gateway->require_contact_name) { + if ($this->checkRequiredResource(auth()->user('contact')->first_name)) { + $this->required_fields[] = 'contact_first_name'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->last_name)) { + $this->required_fields[] = 'contact_last_name'; + } + } + + if ($this->company_gateway->require_postal_code) { + // In case "require_postal_code" is true, we don't need billing address. + + foreach ($this->required_fields as $position => $field) { + if (Str::startsWith($field, 'billing')) { + unset($this->required_fields[$position]); + } + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->postal_code)) { + $this->required_fields[] = 'postal_code'; + } + } + + return $this; + } } diff --git a/app/PaymentDrivers/CheckoutCom/CreditCard.php b/app/PaymentDrivers/CheckoutCom/CreditCard.php index a34ca706f400..5d393e8ef54b 100644 --- a/app/PaymentDrivers/CheckoutCom/CreditCard.php +++ b/app/PaymentDrivers/CheckoutCom/CreditCard.php @@ -13,7 +13,6 @@ namespace App\PaymentDrivers\CheckoutCom; use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest; -use App\Models\PaymentHash; use App\PaymentDrivers\CheckoutComPaymentDriver; use Checkout\Library\Exceptions\CheckoutHttpException; use Checkout\Models\Payments\IdSource; diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php index ba644ebc9471..afe466d7b3a2 100644 --- a/app/PaymentDrivers/CheckoutComPaymentDriver.php +++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php @@ -17,7 +17,6 @@ use App\Models\GatewayType; use App\Models\Payment; use App\Models\PaymentHash; use App\Models\SystemLog; -use App\PaymentDrivers\BaseDriver; use App\PaymentDrivers\CheckoutCom\CreditCard; use App\PaymentDrivers\CheckoutCom\Utilities; use App\Utils\Traits\SystemLogTrait; @@ -119,11 +118,23 @@ class CheckoutComPaymentDriver extends BaseDriver public function authorizeView($data) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->authorizeView($data); } public function authorizeResponse($data) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->authorizeResponse($data); } @@ -135,6 +146,12 @@ class CheckoutComPaymentDriver extends BaseDriver */ public function processPaymentView(array $data) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->paymentView($data); } @@ -146,6 +163,12 @@ class CheckoutComPaymentDriver extends BaseDriver */ public function processPaymentResponse($request) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->paymentResponse($request); } diff --git a/app/PaymentDrivers/CustomPaymentDriver.php b/app/PaymentDrivers/CustomPaymentDriver.php index b4210da8d3f3..03c76eb7007f 100644 --- a/app/PaymentDrivers/CustomPaymentDriver.php +++ b/app/PaymentDrivers/CustomPaymentDriver.php @@ -14,18 +14,7 @@ namespace App\PaymentDrivers; use App\Models\ClientGatewayToken; use App\Models\GatewayType; -use App\Models\Invoice; use App\Models\Payment; -use App\PaymentDrivers\Authorize\AuthorizeCreditCard; -use App\PaymentDrivers\Authorize\AuthorizePaymentMethod; -use App\PaymentDrivers\Authorize\ChargePaymentProfile; -use App\PaymentDrivers\Authorize\RefundTransaction; -use net\authorize\api\constants\ANetEnvironment; -use net\authorize\api\contract\v1\CreateTransactionRequest; -use net\authorize\api\contract\v1\GetMerchantDetailsRequest; -use net\authorize\api\contract\v1\MerchantAuthenticationType; -use net\authorize\api\controller\CreateTransactionController; -use net\authorize\api\controller\GetMerchantDetailsController; /** * Class CustomPaymentDriver. diff --git a/app/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/PaymentDrivers/PayPalExpressPaymentDriver.php index 78e7a69ab01a..c05b7d2f7abf 100644 --- a/app/PaymentDrivers/PayPalExpressPaymentDriver.php +++ b/app/PaymentDrivers/PayPalExpressPaymentDriver.php @@ -26,44 +26,14 @@ use App\Utils\Traits\MakesHash; use Exception; use Omnipay\Common\Item; use stdClass; - -/** - * Response array - * (. - 'TOKEN' => 'EC-50V302605X606694D', - 'SUCCESSPAGEREDIRECTREQUESTED' => 'false', - 'TIMESTAMP' => '2019-09-30T22:21:21Z', - 'CORRELATIONID' => '9e0da63193090', - 'ACK' => 'SuccessWithWarning', - 'VERSION' => '119.0', - 'BUILD' => '53688488', - 'L_ERRORCODE0' => '11607', - 'L_SHORTMESSAGE0' => 'Duplicate Request', - 'L_LONGMESSAGE0' => 'A successful transaction has already been completed for this token.', - 'L_SEVERITYCODE0' => 'Warning', - 'INSURANCEOPTIONSELECTED' => 'false', - 'SHIPPINGOPTIONISDEFAULT' => 'false', - 'PAYMENTINFO_0_TRANSACTIONID' => '5JE20141KL116573G', - 'PAYMENTINFO_0_TRANSACTIONTYPE' => 'expresscheckout', - 'PAYMENTINFO_0_PAYMENTTYPE' => 'instant', - 'PAYMENTINFO_0_ORDERTIME' => '2019-09-30T22:20:57Z', - 'PAYMENTINFO_0_AMT' => '31260.37', - 'PAYMENTINFO_0_TAXAMT' => '0.00', - 'PAYMENTINFO_0_CURRENCYCODE' => 'USD', - 'PAYMENTINFO_0_EXCHANGERATE' => '0.692213615971749', - 'PAYMENTINFO_0_PAYMENTSTATUS' => 'Pending', - 'PAYMENTINFO_0_PENDINGREASON' => 'unilateral', - 'PAYMENTINFO_0_REASONCODE' => 'None', - 'PAYMENTINFO_0_PROTECTIONELIGIBILITY' => 'Ineligible', - 'PAYMENTINFO_0_PROTECTIONELIGIBILITYTYPE' => 'None', - 'PAYMENTINFO_0_ERRORCODE' => '0', - 'PAYMENTINFO_0_ACK' => 'Success', -) - */ class PayPalExpressPaymentDriver extends BasePaymentDriver { use MakesHash; + public $payment_hash; + + public $required_fields = []; + protected $refundable = true; protected $token_billing = false; @@ -86,6 +56,120 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver const SYSTEM_LOG_TYPE = SystemLog::TYPE_PAYPAL; +public function checkRequirements() + { + if ($this->company_gateway->require_billing_address) { + if ($this->checkRequiredResource(auth()->user('contact')->client->address1)) { + $this->required_fields[] = 'billing_address1'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->address2)) { + $this->required_fields[] = 'billing_address2'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->city)) { + $this->required_fields[] = 'billing_city'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->state)) { + $this->required_fields[] = 'billing_state'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->postal_code)) { + $this->required_fields[] = 'billing_postal_code'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->country_id)) { + $this->required_fields[] = 'billing_country'; + } + } + + if ($this->company_gateway->require_shipping_address) { + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_address1)) { + $this->required_fields[] = 'shipping_address1'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_address2)) { + $this->required_fields[] = 'shipping_address2'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_city)) { + $this->required_fields[] = 'shipping_city'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_state)) { + $this->required_fields[] = 'shipping_state'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_postal_code)) { + $this->required_fields[] = 'shipping_postal_code'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->shipping_country_id)) { + $this->required_fields[] = 'shipping_country'; + } + } + + if ($this->company_gateway->require_client_name) { + if ($this->checkRequiredResource(auth()->user('contact')->client->name)) { + $this->required_fields[] = 'name'; + } + } + + if ($this->company_gateway->require_client_phone) { + if ($this->checkRequiredResource(auth()->user('contact')->client->phone)) { + $this->required_fields[] = 'phone'; + } + } + + if ($this->company_gateway->require_contact_email) { + if ($this->checkRequiredResource(auth()->user('contact')->email)) { + $this->required_fields[] = 'contact_email'; + } + } + + if ($this->company_gateway->require_contact_name) { + if ($this->checkRequiredResource(auth()->user('contact')->first_name)) { + $this->required_fields[] = 'contact_first_name'; + } + + if ($this->checkRequiredResource(auth()->user('contact')->last_name)) { + $this->required_fields[] = 'contact_last_name'; + } + } + + if ($this->company_gateway->require_postal_code) { + // In case "require_postal_code" is true, we don't need billing address. + + foreach ($this->required_fields as $position => $field) { + if (Str::startsWith($field, 'billing')) { + unset($this->required_fields[$position]); + } + } + + if ($this->checkRequiredResource(auth()->user('contact')->client->postal_code)) { + $this->required_fields[] = 'postal_code'; + } + } + + return $this; + } + + /** + * Wrapper method for checking if resource is good. + * + * @param mixed $resource + * @return bool + */ + public function checkRequiredResource($resource): bool + { + if (is_null($resource) || empty($resource)) { + return true; + } + + return false; + } + /** * Processes the payment with this gateway. * @@ -96,6 +180,12 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver */ public function processPaymentView(array $data) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + $response = $this->purchase($this->paymentDetails($data), $this->paymentItems($data)); if ($response->isRedirect()) { @@ -122,8 +212,21 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver } } + public function setPaymentHash(PaymentHash $payment_hash) + { + $this->payment_hash = $payment_hash; + + return $this; + } + public function processPaymentResponse($request) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + $response = $this->completePurchase($request->all()); $transaction_reference = $response->getTransactionReference() ?: $request->input('token'); @@ -191,13 +294,11 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver private function buildReturnUrl($input): string { - $url = $this->client->company->domain().'/client/payments/process/response'; - $url .= "?company_gateway_id={$this->company_gateway->id}&gateway_type_id=".GatewayType::PAYPAL; - $url .= '&payment_hash='.$input['payment_hash']; - $url .= '&amount='.$input['amount']; - $url .= '&fee='.$input['fee']; - - return $url; + return route('client.payments.response', [ + 'company_gateway_id' => $this->company_gateway->id, + 'payment_hash' => $this->payment_hash->hash, + 'payment_method_id' => GatewayType::PAYPAL, + ]); } private function buildCancelUrl($input): string diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php index 1a4c4ada6ba2..db8a7e610920 100644 --- a/app/PaymentDrivers/Stripe/ACH.php +++ b/app/PaymentDrivers/Stripe/ACH.php @@ -24,7 +24,6 @@ use App\Models\SystemLog; use App\PaymentDrivers\StripePaymentDriver; use Stripe\Exception\CardException; use Stripe\Exception\InvalidRequestException; -use Stripe\StripeClient; class ACH { diff --git a/app/PaymentDrivers/Stripe/Alipay.php b/app/PaymentDrivers/Stripe/Alipay.php index e2e5c3f06ec6..0fd233675bd9 100644 --- a/app/PaymentDrivers/Stripe/Alipay.php +++ b/app/PaymentDrivers/Stripe/Alipay.php @@ -12,19 +12,14 @@ namespace App\PaymentDrivers\Stripe; -use App\Events\Payment\PaymentWasCreated; use App\Exceptions\PaymentFailed; use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest; -use App\Http\Requests\Payments\PaymentWebhookRequest; use App\Jobs\Mail\PaymentFailureMailer; use App\Jobs\Util\SystemLogger; use App\Models\GatewayType; -use App\Models\Payment; use App\Models\PaymentType; use App\Models\SystemLog; use App\PaymentDrivers\StripePaymentDriver; -use App\Utils\Ninja; -use Exception; class Alipay { diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php index 7925846a7a2f..ab5e9aa89486 100644 --- a/app/PaymentDrivers/Stripe/CreditCard.php +++ b/app/PaymentDrivers/Stripe/CreditCard.php @@ -12,24 +12,16 @@ namespace App\PaymentDrivers\Stripe; -use App\Events\Payment\PaymentWasCreated; use App\Exceptions\PaymentFailed; use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest; use App\Jobs\Mail\PaymentFailureMailer; use App\Jobs\Util\SystemLogger; use App\Models\ClientGatewayToken; use App\Models\GatewayType; -use App\Models\Invoice; use App\Models\Payment; -use App\Models\PaymentHash; use App\Models\PaymentType; use App\Models\SystemLog; use App\PaymentDrivers\StripePaymentDriver; -use App\Utils\Ninja; -use Exception; -use stdClass; -use Stripe\PaymentIntent; -use Stripe\PaymentMethod; class CreditCard { diff --git a/app/PaymentDrivers/Stripe/SOFORT.php b/app/PaymentDrivers/Stripe/SOFORT.php index 3d8c0999f939..0b4a3f294f2b 100644 --- a/app/PaymentDrivers/Stripe/SOFORT.php +++ b/app/PaymentDrivers/Stripe/SOFORT.php @@ -14,7 +14,6 @@ namespace App\PaymentDrivers\Stripe; use App\Events\Payment\PaymentWasCreated; use App\Jobs\Util\SystemLogger; -use App\Models\Gateway; use App\Models\GatewayType; use App\Models\Payment; use App\Models\PaymentType; diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php index 0eefea5b4c4f..02de74b5a18d 100644 --- a/app/PaymentDrivers/StripePaymentDriver.php +++ b/app/PaymentDrivers/StripePaymentDriver.php @@ -12,20 +12,16 @@ namespace App\PaymentDrivers; -use App\Events\Payment\PaymentWasCreated; use App\Factory\PaymentFactory; use App\Http\Requests\Payments\PaymentWebhookRequest; use App\Http\Requests\Request; -use App\Jobs\Mail\PaymentFailureMailer; use App\Jobs\Util\SystemLogger; use App\Models\ClientGatewayToken; use App\Models\Company; use App\Models\CompanyGateway; use App\Models\GatewayType; -use App\Models\Invoice; use App\Models\Payment; use App\Models\PaymentHash; -use App\Models\PaymentType; use App\Models\SystemLog; use App\PaymentDrivers\Stripe\ACH; use App\PaymentDrivers\Stripe\Alipay; @@ -163,6 +159,12 @@ class StripePaymentDriver extends BaseDriver */ public function authorizeView(array $data) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->authorizeView($data); } @@ -174,6 +176,12 @@ class StripePaymentDriver extends BaseDriver */ public function authorizeResponse($request) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->authorizeResponse($request); } @@ -185,41 +193,23 @@ class StripePaymentDriver extends BaseDriver */ public function processPaymentView(array $data) { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->paymentView($data); } - /** - * Payment Intent Reponse looks like this. - * +"id": "pi_1FMR7JKmol8YQE9DuC4zMeN3" - * +"object": "payment_intent" - * +"allowed_source_types": array:1 [▼ - * 0 => "card" - * ] - * +"amount": 2372484 - * +"canceled_at": null - * +"cancellation_reason": null - * +"capture_method": "automatic" - * +"client_secret": "pi_1FMR7JKmol8YQE9DuC4zMeN3_secret_J3yseWJG6uV0MmsrAT1FlUklV" - * +"confirmation_method": "automatic" - * +"created": 1569381877 - * +"->currency()": "usd" - * +"description": "[3]" - * +"last_payment_error": null - * +"livemode": false - * +"next_action": null - * +"next_source_action": null - * +"payment_method": "pm_1FMR7ZKmol8YQE9DQWqPuyke" - * +"payment_method_types": array:1 [▶] - * +"receipt_email": null - * +"setup_future_usage": "off_session" - * +"shipping": null - * +"source": null - * +"status": "succeeded" - * @param $request - * @return - */ public function processPaymentResponse($request) //We never have to worry about unsuccessful payments as failures are handled at the front end for this driver. { + if (count($this->required_fields) > 0) { + return redirect() + ->route('client.profile.edit', ['client_contact' => auth()->user()->hashed_id]) + ->with('missing_required_fields', $this->required_fields); + } + return $this->payment_method->paymentResponse($request); } diff --git a/app/Policies/ActivityPolicy.php b/app/Policies/ActivityPolicy.php index 4964a99b2759..baba55e4c8d5 100644 --- a/app/Policies/ActivityPolicy.php +++ b/app/Policies/ActivityPolicy.php @@ -11,8 +11,6 @@ namespace App\Policies; -use App\Models\User; - /** * Class ActivityPolicy. */ diff --git a/app/Policies/ClientPolicy.php b/app/Policies/ClientPolicy.php index 590874852a35..af28efda76ff 100644 --- a/app/Policies/ClientPolicy.php +++ b/app/Policies/ClientPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Client; use App\Models\User; /** diff --git a/app/Policies/CompanyGatewayPolicy.php b/app/Policies/CompanyGatewayPolicy.php index 028ba9e993db..059316c4ba14 100644 --- a/app/Policies/CompanyGatewayPolicy.php +++ b/app/Policies/CompanyGatewayPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Client; use App\Models\User; /** diff --git a/app/Policies/CompanyPolicy.php b/app/Policies/CompanyPolicy.php index 7ea5527c2018..7d0e6477c787 100644 --- a/app/Policies/CompanyPolicy.php +++ b/app/Policies/CompanyPolicy.php @@ -13,7 +13,6 @@ namespace App\Policies; use App\Models\Company; use App\Models\User; -use Illuminate\Support\Facades\Log; /** * Class CompanyPolicy. diff --git a/app/Policies/CompanyTokenPolicy.php b/app/Policies/CompanyTokenPolicy.php index 3ced3df77e2a..4f53ce7d633b 100644 --- a/app/Policies/CompanyTokenPolicy.php +++ b/app/Policies/CompanyTokenPolicy.php @@ -11,8 +11,6 @@ namespace App\Policies; -use App\Models\User; - /** * Class CompanyTokenPolicy. */ diff --git a/app/Policies/ExpenseCategoryPolicy.php b/app/Policies/ExpenseCategoryPolicy.php index 37529ece0486..8c8e2fb0b417 100644 --- a/app/Policies/ExpenseCategoryPolicy.php +++ b/app/Policies/ExpenseCategoryPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Expense; use App\Models\User; /** diff --git a/app/Policies/ExpensePolicy.php b/app/Policies/ExpensePolicy.php index 98946b0186c5..b1ed4c6453cb 100644 --- a/app/Policies/ExpensePolicy.php +++ b/app/Policies/ExpensePolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Expense; use App\Models\User; /** diff --git a/app/Policies/InvoicePolicy.php b/app/Policies/InvoicePolicy.php index 38c36ded920a..10d9f977f89d 100644 --- a/app/Policies/InvoicePolicy.php +++ b/app/Policies/InvoicePolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Invoice; use App\Models\User; /** diff --git a/app/Policies/PaymentPolicy.php b/app/Policies/PaymentPolicy.php index 0ef44161ed7c..68157ece98c9 100644 --- a/app/Policies/PaymentPolicy.php +++ b/app/Policies/PaymentPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Payment; use App\Models\User; /** diff --git a/app/Policies/PaymentTermPolicy.php b/app/Policies/PaymentTermPolicy.php index 37a24fe0add3..ee91f5d37e57 100644 --- a/app/Policies/PaymentTermPolicy.php +++ b/app/Policies/PaymentTermPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Payment; use App\Models\User; /** diff --git a/app/Policies/QuotePolicy.php b/app/Policies/QuotePolicy.php index e766c8ea1e2f..255488dfef5f 100644 --- a/app/Policies/QuotePolicy.php +++ b/app/Policies/QuotePolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Quote; use App\Models\User; /** diff --git a/app/Policies/RecurringInvoicePolicy.php b/app/Policies/RecurringInvoicePolicy.php index 7497c57ae416..455478accaca 100644 --- a/app/Policies/RecurringInvoicePolicy.php +++ b/app/Policies/RecurringInvoicePolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\RecurringInvoice; use App\Models\User; /** diff --git a/app/Policies/RecurringQuotePolicy.php b/app/Policies/RecurringQuotePolicy.php index d43f7ec27bf6..c56c330638bc 100644 --- a/app/Policies/RecurringQuotePolicy.php +++ b/app/Policies/RecurringQuotePolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\RecurringQuote; use App\Models\User; /** diff --git a/app/Policies/TaskPolicy.php b/app/Policies/TaskPolicy.php index 40e4ae0cb921..cc1008c20379 100644 --- a/app/Policies/TaskPolicy.php +++ b/app/Policies/TaskPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Task; use App\Models\User; /** diff --git a/app/Policies/TaskStatusPolicy.php b/app/Policies/TaskStatusPolicy.php index 7678e8f4c50a..be097beb3add 100644 --- a/app/Policies/TaskStatusPolicy.php +++ b/app/Policies/TaskStatusPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Payment; use App\Models\User; /** diff --git a/app/Policies/TaxRatePolicy.php b/app/Policies/TaxRatePolicy.php index e589d36153bb..59c8cc2bdba8 100644 --- a/app/Policies/TaxRatePolicy.php +++ b/app/Policies/TaxRatePolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\TaxRate; use App\Models\User; /** diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index 31d78093ccc7..ecad12ee54b0 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -11,7 +11,6 @@ namespace App\Policies; -use App\Models\Client; use App\Models\CompanyUser; use App\Models\User; diff --git a/app/Policies/VendorPolicy.php b/app/Policies/VendorPolicy.php index 59bf556f8af3..a47f126d079e 100644 --- a/app/Policies/VendorPolicy.php +++ b/app/Policies/VendorPolicy.php @@ -12,7 +12,6 @@ namespace App\Policies; use App\Models\User; -use App\Models\Vendor; /** * Class VendorPolicy. diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index fba158b7c4b6..e7f41fd88d93 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -11,7 +11,6 @@ namespace App\Providers; -use App\Helpers\Language\DecoratedTranslator; use App\Models\Account; use App\Models\Client; use App\Models\Company; @@ -39,7 +38,6 @@ use App\Observers\QuoteObserver; use App\Observers\TaskObserver; use App\Observers\UserObserver; use Illuminate\Database\Eloquent\Relations\Relation; -use Illuminate\Queue\Events\JobFailed; use Illuminate\Queue\Events\JobProcessing; use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Queue; diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index f8517417a310..fae4adc6ada1 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -61,7 +61,6 @@ use App\Policies\TaxRatePolicy; use App\Policies\UserPolicy; use App\Policies\VendorPolicy; use App\Policies\WebhookPolicy; -use Auth; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; use Illuminate\Support\Facades\Gate; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 3b846892bb5a..6c1bd6793c9f 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -115,24 +115,22 @@ use App\Listeners\Credit\CreditViewedActivity; use App\Listeners\Document\DeleteCompanyDocuments; use App\Listeners\Invoice\CreateInvoiceActivity; use App\Listeners\Invoice\CreateInvoiceHtmlBackup; -use App\Listeners\Invoice\CreateInvoiceInvitation; use App\Listeners\Invoice\CreateInvoicePdf; use App\Listeners\Invoice\InvoiceArchivedActivity; use App\Listeners\Invoice\InvoiceCancelledActivity; use App\Listeners\Invoice\InvoiceDeletedActivity; use App\Listeners\Invoice\InvoiceEmailActivity; -use App\Listeners\Invoice\InvoiceEmailFailedActivity; use App\Listeners\Invoice\InvoiceEmailedNotification; +use App\Listeners\Invoice\InvoiceEmailFailedActivity; use App\Listeners\Invoice\InvoicePaidActivity; use App\Listeners\Invoice\InvoiceReminderEmailActivity; use App\Listeners\Invoice\InvoiceRestoredActivity; use App\Listeners\Invoice\InvoiceReversedActivity; use App\Listeners\Invoice\InvoiceViewedActivity; use App\Listeners\Invoice\UpdateInvoiceActivity; -use App\Listeners\Invoice\UpdateInvoiceInvitations; use App\Listeners\Misc\InvitationViewedListener; -use App\Listeners\Payment\PaymentEmailFailureActivity; use App\Listeners\Payment\PaymentEmailedActivity; +use App\Listeners\Payment\PaymentEmailFailureActivity; use App\Listeners\Payment\PaymentNotification; use App\Listeners\Payment\PaymentRestoredActivity; use App\Listeners\Quote\QuoteApprovedActivity; @@ -143,7 +141,6 @@ use App\Listeners\Quote\QuoteRestoredActivity; use App\Listeners\Quote\QuoteViewedActivity; use App\Listeners\Quote\ReachWorkflowSettings; use App\Listeners\SendVerificationNotification; -use App\Listeners\SetDBListener; use App\Listeners\User\DeletedUserActivity; use App\Listeners\User\UpdateUserLastLogin; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; diff --git a/app/Providers/MultiDatabaseUserProvider.php b/app/Providers/MultiDatabaseUserProvider.php index 4b3e01cfa870..6a08e442b562 100644 --- a/app/Providers/MultiDatabaseUserProvider.php +++ b/app/Providers/MultiDatabaseUserProvider.php @@ -17,7 +17,6 @@ use Illuminate\Contracts\Auth\UserProvider; use Illuminate\Contracts\Hashing\Hasher as HasherContract; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; class MultiDatabaseUserProvider implements UserProvider diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 88d47a61b3a0..7e17df342642 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -11,13 +11,8 @@ namespace App\Providers; -use App\Models\GroupSetting; -use App\Models\InvoiceInvitation; -use App\Models\QuoteInvitation; -use App\Models\RecurringInvoiceInvitation; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php index 0277f89e2cfe..e7f77da98b20 100644 --- a/app/Repositories/ActivityRepository.php +++ b/app/Repositories/ActivityRepository.php @@ -11,24 +11,20 @@ namespace App\Repositories; -use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\Backup; -use App\Models\Client; use App\Models\CompanyToken; use App\Models\Credit; use App\Models\Design; use App\Models\Invoice; use App\Models\Quote; use App\Models\RecurringInvoice; -use App\Models\User; -use App\Utils\HtmlEngine; -use App\Utils\Traits\MakesHash; -use App\Utils\Traits\MakesInvoiceHtml; -use Illuminate\Support\Facades\Log; use App\Services\PdfMaker\Design as PdfDesignModel; use App\Services\PdfMaker\Design as PdfMakerDesign; use App\Services\PdfMaker\PdfMaker as PdfMakerService; +use App\Utils\HtmlEngine; +use App\Utils\Traits\MakesHash; +use App\Utils\Traits\MakesInvoiceHtml; /** * Class for activity repository. diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index 6c230a38bf2e..ae17b3ff7e53 100644 --- a/app/Repositories/BaseRepository.php +++ b/app/Repositories/BaseRepository.php @@ -11,18 +11,12 @@ namespace App\Repositories; -use App\Events\Credit\CreditWasUpdated; -use App\Events\Invoice\InvoiceWasUpdated; -use App\Events\Quote\QuoteWasUpdated; -use App\Factory\InvoiceInvitationFactory; -use App\Factory\QuoteInvitationFactory; use App\Jobs\Product\UpdateOrCreateProduct; use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; use App\Models\Credit; use App\Models\Invoice; -use App\Models\InvoiceInvitation; use App\Models\Quote; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php index a56c68e45d4f..3bb7418eebab 100644 --- a/app/Repositories/ClientRepository.php +++ b/app/Repositories/ClientRepository.php @@ -13,10 +13,8 @@ namespace App\Repositories; use App\Factory\ClientFactory; use App\Models\Client; -use App\Repositories\ClientContactRepository; use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\SavesDocuments; -use Illuminate\Http\Request; /** * ClientRepository. diff --git a/app/Repositories/CompanyRepository.php b/app/Repositories/CompanyRepository.php index 70941a8a0ae0..b6f924a8ee33 100644 --- a/app/Repositories/CompanyRepository.php +++ b/app/Repositories/CompanyRepository.php @@ -12,7 +12,6 @@ namespace App\Repositories; use App\Models\Company; -use Illuminate\Http\Request; /** * CompanyRepository. diff --git a/app/Repositories/CreditRepository.php b/app/Repositories/CreditRepository.php index 5092fc8881ab..222d1834e7a4 100644 --- a/app/Repositories/CreditRepository.php +++ b/app/Repositories/CreditRepository.php @@ -11,13 +11,9 @@ namespace App\Repositories; -use App\Factory\CreditInvitationFactory; -use App\Models\ClientContact; -use App\Models\Company; use App\Models\Credit; use App\Models\CreditInvitation; use App\Utils\Traits\MakesHash; -use Illuminate\Http\Request; /** * CreditRepository. diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php index da7f7f80c916..e08a7b88cc5f 100644 --- a/app/Repositories/ExpenseRepository.php +++ b/app/Repositories/ExpenseRepository.php @@ -13,9 +13,7 @@ namespace App\Repositories; use App\Factory\ExpenseFactory; use App\Models\Expense; -use App\Repositories\VSendorContactRepository; use App\Utils\Traits\GeneratesCounter; -use Illuminate\Http\Request; /** * ExpenseRepository. diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php index 12a22121e484..40b5e6af9f83 100644 --- a/app/Repositories/InvoiceRepository.php +++ b/app/Repositories/InvoiceRepository.php @@ -11,11 +11,6 @@ namespace App\Repositories; -use App\Events\Invoice\InvoiceWasDeleted; -use App\Factory\InvoiceInvitationFactory; -use App\Jobs\Product\UpdateOrCreateProduct; -use App\Models\Client; -use App\Models\ClientContact; use App\Models\Invoice; use App\Models\InvoiceInvitation; use App\Utils\Traits\MakesHash; diff --git a/app/Repositories/Migration/InvoiceMigrationRepository.php b/app/Repositories/Migration/InvoiceMigrationRepository.php index e75c39c8d50e..fce68791f307 100644 --- a/app/Repositories/Migration/InvoiceMigrationRepository.php +++ b/app/Repositories/Migration/InvoiceMigrationRepository.php @@ -11,26 +11,16 @@ namespace App\Repositories\Migration; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\CreditFactory; -use App\Jobs\Credit\ApplyCreditPayment; use App\Jobs\Product\UpdateOrCreateProduct; -use App\Libraries\Currency\Conversion\CurrencyApi; -use App\Models\Activity; use App\Models\Client; use App\Models\ClientContact; use App\Models\Credit; use App\Models\Invoice; -use App\Models\Payment; use App\Models\Quote; use App\Models\RecurringInvoice; -use App\Repositories\ActivityRepository; use App\Repositories\BaseRepository; -use App\Repositories\CreditRepository; use App\Utils\Traits\MakesHash; use App\Utils\Traits\SavesDocuments; -use Illuminate\Http\Request; -use Illuminate\Support\Carbon; use ReflectionClass; /** diff --git a/app/Repositories/Migration/PaymentMigrationRepository.php b/app/Repositories/Migration/PaymentMigrationRepository.php index 732be99a0e95..df2dac681876 100644 --- a/app/Repositories/Migration/PaymentMigrationRepository.php +++ b/app/Repositories/Migration/PaymentMigrationRepository.php @@ -11,9 +11,6 @@ namespace App\Repositories\Migration; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\CreditFactory; -use App\Jobs\Credit\ApplyCreditPayment; use App\Libraries\Currency\Conversion\CurrencyApi; use App\Models\Activity; use App\Models\Client; diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php index 13967b8897d5..24b850f94237 100644 --- a/app/Repositories/PaymentRepository.php +++ b/app/Repositories/PaymentRepository.php @@ -13,14 +13,12 @@ namespace App\Repositories; use App\Events\Payment\PaymentWasCreated; use App\Events\Payment\PaymentWasDeleted; -use App\Factory\CreditFactory; use App\Jobs\Credit\ApplyCreditPayment; use App\Libraries\Currency\Conversion\CurrencyApi; use App\Models\Client; use App\Models\Credit; use App\Models\Invoice; use App\Models\Payment; -use App\Repositories\CreditRepository; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; use App\Utils\Traits\SavesDocuments; diff --git a/app/Repositories/ProductRepository.php b/app/Repositories/ProductRepository.php index c5c8a1e7c0af..e8f0a197e4e0 100644 --- a/app/Repositories/ProductRepository.php +++ b/app/Repositories/ProductRepository.php @@ -13,7 +13,6 @@ namespace App\Repositories; use App\Models\Product; use App\Utils\Traits\SavesDocuments; -use Illuminate\Http\Request; class ProductRepository extends BaseRepository { diff --git a/app/Repositories/QuoteRepository.php b/app/Repositories/QuoteRepository.php index 8708a10b5bef..641ef9f74510 100644 --- a/app/Repositories/QuoteRepository.php +++ b/app/Repositories/QuoteRepository.php @@ -11,16 +11,8 @@ namespace App\Repositories; -use App\Factory\QuoteInvitationFactory; -use App\Helpers\Invoice\InvoiceSum; -use App\Jobs\Quote\ApplyQuoteNumber; -use App\Jobs\Quote\CreateQuoteInvitations; -use App\Models\Client; -use App\Models\ClientContact; use App\Models\Quote; use App\Models\QuoteInvitation; -use App\Utils\Traits\MakesHash; -use Illuminate\Http\Request; /** * QuoteRepository. diff --git a/app/Repositories/RecurringInvoiceRepository.php b/app/Repositories/RecurringInvoiceRepository.php index f962cd8e8712..f39fee0274f6 100644 --- a/app/Repositories/RecurringInvoiceRepository.php +++ b/app/Repositories/RecurringInvoiceRepository.php @@ -13,7 +13,6 @@ namespace App\Repositories; use App\Helpers\Invoice\InvoiceSum; use App\Models\RecurringInvoice; -use Illuminate\Http\Request; /** * RecurringInvoiceRepository. diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php index db0e6cc97a73..984663d9f341 100644 --- a/app/Repositories/TaskRepository.php +++ b/app/Repositories/TaskRepository.php @@ -14,7 +14,6 @@ namespace App\Repositories; use App\Factory\TaskFactory; use App\Models\Task; use App\Utils\Traits\GeneratesCounter; -use Illuminate\Http\Request; /** * TaskRepository. diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index 4f25ab6b06a4..668cf0769d40 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -13,7 +13,6 @@ namespace App\Repositories; use App\DataMapper\CompanySettings; use App\Events\User\UserWasDeleted; -use App\Factory\CompanyUserFactory; use App\Models\CompanyUser; use App\Models\User; use App\Utils\Ninja; diff --git a/app/Repositories/VendorRepository.php b/app/Repositories/VendorRepository.php index 39a7576a2891..07e771f7996a 100644 --- a/app/Repositories/VendorRepository.php +++ b/app/Repositories/VendorRepository.php @@ -13,9 +13,7 @@ namespace App\Repositories; use App\Factory\VendorFactory; use App\Models\Vendor; -use App\Repositories\VendorContactRepository; use App\Utils\Traits\GeneratesCounter; -use Illuminate\Http\Request; /** * VendorRepository. diff --git a/app/Services/Credit/ApplyNumber.php b/app/Services/Credit/ApplyNumber.php index 949b73e7e179..9aa6fe731461 100644 --- a/app/Services/Credit/ApplyNumber.php +++ b/app/Services/Credit/ApplyNumber.php @@ -11,17 +11,9 @@ namespace App\Services\Credit; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; -use App\Jobs\Customer\UpdateCustomerBalance; -use App\Jobs\Customer\UpdateCustomerPaidToDate; use App\Models\Client; use App\Models\Credit; -use App\Models\Invoice; -use App\Models\Payment; use App\Services\AbstractService; -use App\Services\Customer\CustomerService; -use App\Services\Payment\PaymentService; use App\Utils\Traits\GeneratesCounter; class ApplyNumber extends AbstractService diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php index ce17900b4314..e7fb456173c6 100644 --- a/app/Services/Credit/CreditService.php +++ b/app/Services/Credit/CreditService.php @@ -12,10 +12,6 @@ namespace App\Services\Credit; use App\Models\Credit; -use App\Services\Credit\ApplyPayment; -use App\Services\Credit\CreateInvitations; -use App\Services\Credit\MarkSent; -use App\Services\Credit\SendEmail; use App\Utils\Traits\MakesHash; class CreditService diff --git a/app/Services/Credit/GetCreditPdf.php b/app/Services/Credit/GetCreditPdf.php index a531e593af74..1cd57aa3be5a 100644 --- a/app/Services/Credit/GetCreditPdf.php +++ b/app/Services/Credit/GetCreditPdf.php @@ -12,8 +12,6 @@ namespace App\Services\Credit; use App\Jobs\Entity\CreateEntityPdf; -use App\Models\ClientContact; -use App\Models\Credit; use App\Services\AbstractService; use Illuminate\Support\Facades\Storage; diff --git a/app/Services/Credit/SendEmail.php b/app/Services/Credit/SendEmail.php index 271214dec66d..061c666250b5 100644 --- a/app/Services/Credit/SendEmail.php +++ b/app/Services/Credit/SendEmail.php @@ -12,10 +12,9 @@ namespace App\Services\Credit; use App\Helpers\Email\CreditEmail; -use App\Jobs\Entity\EmailEntity; use App\Jobs\Credit\EmailCredit; +use App\Jobs\Entity\EmailEntity; use App\Models\ClientContact; -use App\Models\Credit; class SendEmail { diff --git a/app/Services/Invoice/AddGatewayFee.php b/app/Services/Invoice/AddGatewayFee.php index 13ddc521e768..66981f8fdd14 100644 --- a/app/Services/Invoice/AddGatewayFee.php +++ b/app/Services/Invoice/AddGatewayFee.php @@ -12,16 +12,11 @@ namespace App\Services\Invoice; use App\DataMapper\InvoiceItem; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; use App\Models\Client; use App\Models\CompanyGateway; use App\Models\Invoice; use App\Models\Payment; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; -use App\Utils\Traits\GeneratesCounter; class AddGatewayFee extends AbstractService { diff --git a/app/Services/Invoice/ApplyNumber.php b/app/Services/Invoice/ApplyNumber.php index 72edd57a5d6d..3c4b63081da0 100644 --- a/app/Services/Invoice/ApplyNumber.php +++ b/app/Services/Invoice/ApplyNumber.php @@ -11,14 +11,9 @@ namespace App\Services\Invoice; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; use App\Models\Client; use App\Models\Invoice; -use App\Models\Payment; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Traits\GeneratesCounter; class ApplyNumber extends AbstractService diff --git a/app/Services/Invoice/ApplyPayment.php b/app/Services/Invoice/ApplyPayment.php index 431cb00c6418..ead9cd9b4135 100644 --- a/app/Services/Invoice/ApplyPayment.php +++ b/app/Services/Invoice/ApplyPayment.php @@ -14,7 +14,6 @@ namespace App\Services\Invoice; use App\Models\Invoice; use App\Models\Payment; use App\Services\AbstractService; -use App\Services\Client\ClientService; class ApplyPayment extends AbstractService { diff --git a/app/Services/Invoice/ApplyRecurringNumber.php b/app/Services/Invoice/ApplyRecurringNumber.php index a29f47e9120f..6299fb5bb02c 100644 --- a/app/Services/Invoice/ApplyRecurringNumber.php +++ b/app/Services/Invoice/ApplyRecurringNumber.php @@ -11,14 +11,9 @@ namespace App\Services\Invoice; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; use App\Models\Client; use App\Models\Invoice; -use App\Models\Payment; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Traits\GeneratesCounter; class ApplyRecurringNumber extends AbstractService diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php index 510d1759b23c..e37039555aa2 100644 --- a/app/Services/Invoice/AutoBillInvoice.php +++ b/app/Services/Invoice/AutoBillInvoice.php @@ -21,10 +21,7 @@ use App\Models\Payment; use App\Models\PaymentHash; use App\Models\PaymentType; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Ninja; -use App\Utils\Traits\GeneratesCounter; use Illuminate\Support\Str; class AutoBillInvoice extends AbstractService diff --git a/app/Services/Invoice/HandleCancellation.php b/app/Services/Invoice/HandleCancellation.php index 8b841da1b34a..edca7054f322 100644 --- a/app/Services/Invoice/HandleCancellation.php +++ b/app/Services/Invoice/HandleCancellation.php @@ -12,18 +12,9 @@ namespace App\Services\Invoice; use App\Events\Invoice\InvoiceWasCancelled; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\CreditFactory; -use App\Factory\InvoiceItemFactory; -use App\Factory\PaymentFactory; -use App\Helpers\Invoice\InvoiceSum; use App\Models\Client; use App\Models\Invoice; -use App\Models\Payment; -use App\Models\Paymentable; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Ninja; use App\Utils\Traits\GeneratesCounter; use stdClass; diff --git a/app/Services/Invoice/HandleReversal.php b/app/Services/Invoice/HandleReversal.php index 15e1abc2578a..ba903b6f2dd1 100644 --- a/app/Services/Invoice/HandleReversal.php +++ b/app/Services/Invoice/HandleReversal.php @@ -12,10 +12,8 @@ namespace App\Services\Invoice; use App\Events\Invoice\InvoiceWasReversed; -use App\Events\Payment\PaymentWasCreated; use App\Factory\CreditFactory; use App\Factory\InvoiceItemFactory; -use App\Factory\PaymentFactory; use App\Helpers\Invoice\InvoiceSum; use App\Models\Client; use App\Models\Credit; @@ -23,8 +21,6 @@ use App\Models\Invoice; use App\Models\Payment; use App\Models\Paymentable; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Ninja; use App\Utils\Traits\GeneratesCounter; diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php index a75f23a13076..2015fad59cb5 100644 --- a/app/Services/Invoice/InvoiceService.php +++ b/app/Services/Invoice/InvoiceService.php @@ -19,19 +19,6 @@ use App\Models\Invoice; use App\Models\Payment; use App\Models\Task; use App\Services\Client\ClientService; -use App\Services\Invoice\ApplyNumber; -use App\Services\Invoice\ApplyPayment; -use App\Services\Invoice\ApplyRecurringNumber; -use App\Services\Invoice\AutoBillInvoice; -use App\Services\Invoice\CreateInvitations; -use App\Services\Invoice\GetInvoicePdf; -use App\Services\Invoice\HandleCancellation; -use App\Services\Invoice\HandleReversal; -use App\Services\Invoice\MarkInvoiceDeleted; -use App\Services\Invoice\MarkInvoicePaid; -use App\Services\Invoice\MarkSent; -use App\Services\Invoice\TriggeredActions; -use App\Services\Invoice\UpdateBalance; use App\Utils\Traits\MakesHash; use Illuminate\Support\Carbon; diff --git a/app/Services/Invoice/MarkInvoiceDeleted.php b/app/Services/Invoice/MarkInvoiceDeleted.php index a4bf50842c4b..cc830756a21c 100644 --- a/app/Services/Invoice/MarkInvoiceDeleted.php +++ b/app/Services/Invoice/MarkInvoiceDeleted.php @@ -11,20 +11,8 @@ namespace App\Services\Invoice; -use App\Events\Invoice\InvoiceWasCancelled; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\CreditFactory; -use App\Factory\InvoiceItemFactory; -use App\Factory\PaymentFactory; -use App\Helpers\Invoice\InvoiceSum; -use App\Models\Client; use App\Models\Invoice; -use App\Models\Payment; -use App\Models\Paymentable; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; -use App\Utils\Ninja; use App\Utils\Traits\GeneratesCounter; class MarkInvoiceDeleted extends AbstractService diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php index abf4e8e53e8a..64c2e3a75185 100644 --- a/app/Services/Invoice/MarkPaid.php +++ b/app/Services/Invoice/MarkPaid.php @@ -19,7 +19,6 @@ use App\Models\Invoice; use App\Models\Payment; use App\Services\AbstractService; use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Ninja; use App\Utils\Traits\GeneratesCounter; diff --git a/app/Services/Invoice/SendEmail.php b/app/Services/Invoice/SendEmail.php index 5cf7f703d9d4..4cbe19480a1d 100644 --- a/app/Services/Invoice/SendEmail.php +++ b/app/Services/Invoice/SendEmail.php @@ -15,7 +15,6 @@ use App\Jobs\Entity\EmailEntity; use App\Models\ClientContact; use App\Models\Invoice; use App\Services\AbstractService; -use Illuminate\Support\Carbon; class SendEmail extends AbstractService { diff --git a/app/Services/Invoice/TriggeredActions.php b/app/Services/Invoice/TriggeredActions.php index f64bef06e99d..f68dfdf51b16 100644 --- a/app/Services/Invoice/TriggeredActions.php +++ b/app/Services/Invoice/TriggeredActions.php @@ -12,15 +12,9 @@ namespace App\Services\Invoice; use App\Events\Invoice\InvoiceWasEmailed; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; use App\Jobs\Invoice\EmailEntity; -use App\Models\Client; use App\Models\Invoice; -use App\Models\Payment; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Ninja; use App\Utils\Traits\GeneratesCounter; use Illuminate\Http\Request; diff --git a/app/Services/Payment/ApplyNumber.php b/app/Services/Payment/ApplyNumber.php index a1c5adad6692..1482a25265c0 100644 --- a/app/Services/Payment/ApplyNumber.php +++ b/app/Services/Payment/ApplyNumber.php @@ -11,13 +11,8 @@ namespace App\Services\Payment; -use App\Events\Payment\PaymentWasCreated; -use App\Factory\PaymentFactory; -use App\Models\Client; use App\Models\Payment; use App\Services\AbstractService; -use App\Services\Client\ClientService; -use App\Services\Payment\PaymentService; use App\Utils\Traits\GeneratesCounter; class ApplyNumber extends AbstractService diff --git a/app/Services/Payment/DeletePayment.php b/app/Services/Payment/DeletePayment.php index 1e2272bc5d51..da5488cb8354 100644 --- a/app/Services/Payment/DeletePayment.php +++ b/app/Services/Payment/DeletePayment.php @@ -11,11 +11,6 @@ namespace App\Services\Payment; -use App\Exceptions\PaymentRefundFailed; -use App\Factory\CreditFactory; -use App\Factory\InvoiceItemFactory; -use App\Models\Activity; -use App\Models\CompanyGateway; use App\Models\Credit; use App\Models\Invoice; use App\Models\Payment; diff --git a/app/Services/Payment/PaymentService.php b/app/Services/Payment/PaymentService.php index 764b465eea41..203e7ae5d249 100644 --- a/app/Services/Payment/PaymentService.php +++ b/app/Services/Payment/PaymentService.php @@ -15,10 +15,6 @@ use App\Factory\PaymentFactory; use App\Models\Invoice; use App\Models\Payment; use App\Models\PaymentHash; -use App\Services\Payment\ApplyNumber; -use App\Services\Payment\DeletePayment; -use App\Services\Payment\RefundPayment; -use App\Services\Payment\UpdateInvoicePayment; class PaymentService { diff --git a/app/Services/Payment/RefundPayment.php b/app/Services/Payment/RefundPayment.php index 350c879f7881..a1acb5adb82f 100644 --- a/app/Services/Payment/RefundPayment.php +++ b/app/Services/Payment/RefundPayment.php @@ -15,7 +15,6 @@ use App\Exceptions\PaymentRefundFailed; use App\Factory\CreditFactory; use App\Factory\InvoiceItemFactory; use App\Models\Activity; -use App\Models\CompanyGateway; use App\Models\Credit; use App\Models\Invoice; use App\Models\Payment; diff --git a/app/Services/Payment/UpdateInvoicePayment.php b/app/Services/Payment/UpdateInvoicePayment.php index 6d8e75881a06..516c6c83515d 100644 --- a/app/Services/Payment/UpdateInvoicePayment.php +++ b/app/Services/Payment/UpdateInvoicePayment.php @@ -12,12 +12,9 @@ namespace App\Services\Payment; use App\Events\Invoice\InvoiceWasUpdated; -use App\Jobs\Payment\EmailPayment; -use App\Jobs\Util\SystemLogger; use App\Models\Invoice; use App\Models\Payment; use App\Models\PaymentHash; -use App\Models\SystemLog; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; diff --git a/app/Services/Quote/QuoteService.php b/app/Services/Quote/QuoteService.php index b09072f73d9d..0668c39aa84c 100644 --- a/app/Services/Quote/QuoteService.php +++ b/app/Services/Quote/QuoteService.php @@ -12,12 +12,9 @@ namespace App\Services\Quote; use App\Events\Quote\QuoteWasApproved; -use App\Factory\CloneQuoteToInvoiceFactory; use App\Models\Invoice; use App\Models\Quote; use App\Repositories\QuoteRepository; -use App\Services\Quote\CreateInvitations; -use App\Services\Quote\GetQuotePdf; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; diff --git a/app/Services/Quote/SendEmail.php b/app/Services/Quote/SendEmail.php index 8e7f670f85af..82c6a1a59f66 100644 --- a/app/Services/Quote/SendEmail.php +++ b/app/Services/Quote/SendEmail.php @@ -12,9 +12,7 @@ namespace App\Services\Quote; use App\Jobs\Entity\EmailEntity; -use App\Jobs\Quote\EmailQuote; use App\Models\ClientContact; -use App\Models\Quote; class SendEmail { diff --git a/app/Services/Recurring/CreateRecurringInvitations.php b/app/Services/Recurring/CreateRecurringInvitations.php index 5bfbdfc08849..f6bce6559069 100644 --- a/app/Services/Recurring/CreateRecurringInvitations.php +++ b/app/Services/Recurring/CreateRecurringInvitations.php @@ -11,12 +11,6 @@ namespace App\Services\Recurring; -use App\Factory\InvoiceInvitationFactory; -use App\Factory\RecurringInvoiceFactory; -use App\Models\Invoice; -use App\Models\RecurringInvoice; -use App\Models\InvoiceInvitation; -use App\Models\RecurringInvoiceInvitation; use App\Services\AbstractService; use Exception; use Illuminate\Support\Str; diff --git a/app/Services/Recurring/RecurringService.php b/app/Services/Recurring/RecurringService.php index 4db604bdb826..fdc515b91b24 100644 --- a/app/Services/Recurring/RecurringService.php +++ b/app/Services/Recurring/RecurringService.php @@ -12,8 +12,6 @@ namespace App\Services\Recurring; use App\Models\RecurringInvoice; -use App\Services\Recurring\ApplyNumber; -use App\Services\Recurring\CreateRecurringInvitations; use Illuminate\Support\Carbon; class RecurringService diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index c5699a99b8c2..23f39a7c101d 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -14,13 +14,8 @@ namespace App\Transformers; use App\Models\Account; use App\Models\Company; use App\Models\CompanyUser; -use App\Models\Payment; use App\Models\User; -use App\Transformers\CompanyTransformer; -use App\Transformers\CompanyUserTransformer; -use App\Transformers\UserTransformer; use App\Utils\Traits\MakesHash; -use Laracasts\Presenter\Exceptions\PresenterException; /** * Class AccountTransformer. diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php index 6e4bfb7c81aa..e954c7fcf2c0 100644 --- a/app/Transformers/ClientTransformer.php +++ b/app/Transformers/ClientTransformer.php @@ -18,11 +18,6 @@ use App\Models\ClientGatewayToken; use App\Models\CompanyLedger; use App\Models\Document; use App\Models\SystemLog; -use App\Transformers\ActivityTransformer; -use App\Transformers\ClientGatewayTokenTransformer; -use App\Transformers\CompanyLedgerTransformer; -use App\Transformers\DocumentTransformer; -use App\Transformers\SystemLogTransformer; use App\Utils\Traits\MakesHash; use League\Fractal\Resource\Collection; use stdClass; diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php index c62a54184792..db5865e732d7 100644 --- a/app/Transformers/CompanyGatewayTransformer.php +++ b/app/Transformers/CompanyGatewayTransformer.php @@ -12,7 +12,6 @@ namespace App\Transformers; use App\Models\CompanyGateway; -use App\Transformers\GatewayTransformer; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\SoftDeletes; use stdClass; diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index add89be0f830..c2e21c9229a5 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -37,18 +37,6 @@ use App\Models\TaskStatus; use App\Models\TaxRate; use App\Models\User; use App\Models\Webhook; -use App\Transformers\CompanyLedgerTransformer; -use App\Transformers\CompanyTokenHashedTransformer; -use App\Transformers\CompanyTokenTransformer; -use App\Transformers\CreditTransformer; -use App\Transformers\DocumentTransformer; -use App\Transformers\ExpenseCategoryTransformer; -use App\Transformers\PaymentTermTransformer; -use App\Transformers\RecurringInvoiceTransformer; -use App\Transformers\SystemLogTransformer; -use App\Transformers\TaskStatusTransformer; -use App\Transformers\TaskTransformer; -use App\Transformers\WebhookTransformer; use App\Utils\Traits\MakesHash; use stdClass; diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php index 14409366fa3b..85dfda97f1c4 100644 --- a/app/Transformers/CompanyUserTransformer.php +++ b/app/Transformers/CompanyUserTransformer.php @@ -16,10 +16,6 @@ use App\Models\Company; use App\Models\CompanyToken; use App\Models\CompanyUser; use App\Models\User; -use App\Transformers\AccountTransformer; -use App\Transformers\CompanyTokenTransformer; -use App\Transformers\CompanyTransformer; -use App\Transformers\UserTransformer; class CompanyUserTransformer extends EntityTransformer { diff --git a/app/Transformers/CreditTransformer.php b/app/Transformers/CreditTransformer.php index 72f5eefadfbc..3f982956c837 100644 --- a/app/Transformers/CreditTransformer.php +++ b/app/Transformers/CreditTransformer.php @@ -15,9 +15,6 @@ use App\Models\Backup; use App\Models\Credit; use App\Models\CreditInvitation; use App\Models\Document; -use App\Transformers\CreditInvitationTransformer; -use App\Transformers\DocumentTransformer; -use App\Transformers\InvoiceHistoryTransformer; use App\Utils\Traits\MakesHash; class CreditTransformer extends EntityTransformer diff --git a/app/Transformers/ExpenseCategoryTransformer.php b/app/Transformers/ExpenseCategoryTransformer.php index 21df0ade7563..27d66f5234e5 100644 --- a/app/Transformers/ExpenseCategoryTransformer.php +++ b/app/Transformers/ExpenseCategoryTransformer.php @@ -11,7 +11,6 @@ namespace App\Transformers; -use App\Models\Document; use App\Models\ExpenseCategory; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/app/Transformers/InvoiceHistoryTransformer.php b/app/Transformers/InvoiceHistoryTransformer.php index 90b61bbb54bd..68b8d9ae6e63 100644 --- a/app/Transformers/InvoiceHistoryTransformer.php +++ b/app/Transformers/InvoiceHistoryTransformer.php @@ -13,7 +13,6 @@ namespace App\Transformers; use App\Models\Activity; use App\Models\Backup; -use App\Transformers\ActivityTransformer; use App\Utils\Traits\MakesHash; class InvoiceHistoryTransformer extends EntityTransformer diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php index 27aa879b2c37..4fd1195d5f46 100644 --- a/app/Transformers/InvoiceTransformer.php +++ b/app/Transformers/InvoiceTransformer.php @@ -16,10 +16,6 @@ use App\Models\Client; use App\Models\Document; use App\Models\Invoice; use App\Models\InvoiceInvitation; -use App\Transformers\ClientTransformer; -use App\Transformers\DocumentTransformer; -use App\Transformers\InvoiceHistoryTransformer; -use App\Transformers\InvoiceInvitationTransformer; use App\Utils\Traits\MakesHash; class InvoiceTransformer extends EntityTransformer diff --git a/app/Transformers/PaymentTransformer.php b/app/Transformers/PaymentTransformer.php index f6e0bf6d4de6..9a5601479ccf 100644 --- a/app/Transformers/PaymentTransformer.php +++ b/app/Transformers/PaymentTransformer.php @@ -16,7 +16,6 @@ use App\Models\Document; use App\Models\Invoice; use App\Models\Payment; use App\Models\Paymentable; -use App\Transformers\DocumentTransformer; use App\Utils\Traits\MakesHash; class PaymentTransformer extends EntityTransformer diff --git a/app/Transformers/PaymentableTransformer.php b/app/Transformers/PaymentableTransformer.php index b4e36a317556..d7e1d444ff6a 100644 --- a/app/Transformers/PaymentableTransformer.php +++ b/app/Transformers/PaymentableTransformer.php @@ -12,7 +12,6 @@ namespace App\Transformers; use App\Models\Credit; -use App\Models\Payment; use App\Models\Paymentable; use App\Utils\Traits\MakesHash; diff --git a/app/Transformers/ProductTransformer.php b/app/Transformers/ProductTransformer.php index db5b8473563f..3d205e427503 100644 --- a/app/Transformers/ProductTransformer.php +++ b/app/Transformers/ProductTransformer.php @@ -15,7 +15,6 @@ use App\Models\Company; use App\Models\Document; use App\Models\Product; use App\Models\User; -use App\Transformers\DocumentTransformer; use App\Utils\Traits\MakesHash; use League\Fractal\Resource\Collection; diff --git a/app/Transformers/QuoteInvitationTransformer.php b/app/Transformers/QuoteInvitationTransformer.php index ede951508579..24d2e6a310d9 100644 --- a/app/Transformers/QuoteInvitationTransformer.php +++ b/app/Transformers/QuoteInvitationTransformer.php @@ -11,7 +11,6 @@ namespace App\Transformers; -use App\Models\Quote; use App\Models\QuoteInvitation; use App\Utils\Traits\MakesHash; diff --git a/app/Transformers/QuoteTransformer.php b/app/Transformers/QuoteTransformer.php index 454ba2b7985f..c2f207564d88 100644 --- a/app/Transformers/QuoteTransformer.php +++ b/app/Transformers/QuoteTransformer.php @@ -15,9 +15,6 @@ use App\Models\Backup; use App\Models\Document; use App\Models\Quote; use App\Models\QuoteInvitation; -use App\Transformers\DocumentTransformer; -use App\Transformers\InvoiceHistoryTransformer; -use App\Transformers\QuoteInvitationTransformer; use App\Utils\Traits\MakesHash; class QuoteTransformer extends EntityTransformer diff --git a/app/Transformers/RecurringInvoiceInvitationTransformer.php b/app/Transformers/RecurringInvoiceInvitationTransformer.php index e509d15fe2ef..d57506e41063 100644 --- a/app/Transformers/RecurringInvoiceInvitationTransformer.php +++ b/app/Transformers/RecurringInvoiceInvitationTransformer.php @@ -11,7 +11,6 @@ namespace App\Transformers; -use App\Models\InvoiceInvitation; use App\Models\RecurringInvoiceInvitation; use App\Utils\Traits\MakesHash; diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php index cd1f50270351..7862c105cb17 100644 --- a/app/Transformers/RecurringInvoiceTransformer.php +++ b/app/Transformers/RecurringInvoiceTransformer.php @@ -15,8 +15,6 @@ use App\Models\Document; use App\Models\Invoice; use App\Models\RecurringInvoice; use App\Models\RecurringInvoiceInvitation; -use App\Transformers\DocumentTransformer; -use App\Transformers\RecurringInvoiceInvitationTransformer; use App\Utils\Traits\MakesHash; class RecurringInvoiceTransformer extends EntityTransformer diff --git a/app/Transformers/RecurringQuoteTransformer.php b/app/Transformers/RecurringQuoteTransformer.php index 32e6ffdf58c6..c647ae792c8e 100644 --- a/app/Transformers/RecurringQuoteTransformer.php +++ b/app/Transformers/RecurringQuoteTransformer.php @@ -11,7 +11,6 @@ namespace App\Transformers; -use App\Models\Quote; use App\Models\RecurringQuote; use App\Utils\Traits\MakesHash; diff --git a/app/Transformers/Shop/CompanyShopProfileTransformer.php b/app/Transformers/Shop/CompanyShopProfileTransformer.php index 1aa70ede4f38..ff3990143224 100644 --- a/app/Transformers/Shop/CompanyShopProfileTransformer.php +++ b/app/Transformers/Shop/CompanyShopProfileTransformer.php @@ -11,35 +11,8 @@ namespace App\Transformers\Shop; -use App\Models\Account; -use App\Models\Activity; -use App\Models\Client; use App\Models\Company; -use App\Models\CompanyGateway; -use App\Models\CompanyLedger; -use App\Models\CompanyToken; -use App\Models\CompanyUser; -use App\Models\Credit; -use App\Models\Design; -use App\Models\Expense; -use App\Models\GroupSetting; -use App\Models\Payment; -use App\Models\PaymentTerm; -use App\Models\Product; -use App\Models\Project; -use App\Models\Quote; -use App\Models\Task; -use App\Models\TaxRate; -use App\Models\User; -use App\Models\Webhook; -use App\Transformers\CompanyLedgerTransformer; -use App\Transformers\CompanyTokenHashedTransformer; -use App\Transformers\CompanyTokenTransformer; -use App\Transformers\CreditTransformer; use App\Transformers\EntityTransformer; -use App\Transformers\PaymentTermTransformer; -use App\Transformers\TaskTransformer; -use App\Transformers\WebhookTransformer; use App\Utils\Traits\MakesHash; use stdClass; diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php index ab0d99a9574d..27e08b6d7e88 100644 --- a/app/Transformers/UserTransformer.php +++ b/app/Transformers/UserTransformer.php @@ -11,14 +11,10 @@ namespace App\Transformers; -use App\Models\Account; use App\Models\Company; use App\Models\CompanyToken; use App\Models\CompanyUser; use App\Models\User; -use App\Transformers\CompanyTokenTransformer; -use App\Transformers\CompanyTransformer; -use App\Transformers\CompanyUserTransformer; use App\Utils\Traits\MakesHash; use Illuminate\Support\Carbon; diff --git a/app/Transformers/VendorTransformer.php b/app/Transformers/VendorTransformer.php index 44de810166a5..86374f40dcb4 100644 --- a/app/Transformers/VendorTransformer.php +++ b/app/Transformers/VendorTransformer.php @@ -15,10 +15,6 @@ use App\Models\Activity; use App\Models\Document; use App\Models\Vendor; use App\Models\VendorContact; -use App\Models\VendorGatewayToken; -use App\Transformers\ActivityTransformer; -use App\Transformers\VendorContactTransformer; -use App\Transformers\VendorGatewayTokenTransformer; use App\Utils\Traits\MakesHash; use League\Fractal\Resource\Collection; diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 3605267007a2..302c4c697c9f 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -17,7 +17,6 @@ use App\Models\CreditInvitation; use App\Models\InvoiceInvitation; use App\Models\QuoteInvitation; use App\Models\RecurringInvoiceInvitation; -use App\Utils\Number; use App\Utils\Traits\MakesDates; use Exception; use Illuminate\Support\Facades\App; diff --git a/app/Utils/Ninja.php b/app/Utils/Ninja.php index d1b4de2ffadb..567530d41c6d 100644 --- a/app/Utils/Ninja.php +++ b/app/Utils/Ninja.php @@ -11,8 +11,6 @@ namespace App\Utils; -use App\Models\Account; -use App\Utils\CurlUtils; use Illuminate\Support\Facades\DB; /** diff --git a/app/Utils/Number.php b/app/Utils/Number.php index 3ec322a7cf4c..883dcb844815 100644 --- a/app/Utils/Number.php +++ b/app/Utils/Number.php @@ -12,7 +12,6 @@ namespace App\Utils; use App\Models\Currency; -use Illuminate\Support\Facades\Log; /** * Class Number. diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php index 5c160624adef..fee98d2d50e1 100644 --- a/app/Utils/PhantomJS/Phantom.php +++ b/app/Utils/PhantomJS/Phantom.php @@ -11,7 +11,6 @@ namespace App\Utils\PhantomJS; -use App\Designs\Designer; use App\Models\CreditInvitation; use App\Models\Design; use App\Models\InvoiceInvitation; diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php index 32cac1188070..d60b84bc14c7 100644 --- a/app/Utils/Statics.php +++ b/app/Utils/Statics.php @@ -11,9 +11,7 @@ namespace App\Utils; -use App\Models\Gateway; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; /** diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php index 430125ffd485..419c788044a6 100644 --- a/app/Utils/TemplateEngine.php +++ b/app/Utils/TemplateEngine.php @@ -16,7 +16,6 @@ use App\Models\Client; use App\Models\ClientContact; use App\Models\Invoice; use App\Models\InvoiceInvitation; -use App\Utils\HtmlEngine; use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesInvoiceHtml; use App\Utils\Traits\MakesTemplateData; diff --git a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php index 10f64d37563d..d1f33e04251f 100644 --- a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php +++ b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php @@ -12,7 +12,6 @@ namespace App\Utils\Traits; use App\DataMapper\BaseSettings; -use App\DataMapper\CompanySettings; use App\DataMapper\FeesAndLimits; /** diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php index 9e71d4611f57..b096baaeb6a4 100644 --- a/app/Utils/Traits/CompanySettingsSaver.php +++ b/app/Utils/Traits/CompanySettingsSaver.php @@ -13,7 +13,6 @@ namespace App\Utils\Traits; use App\DataMapper\CompanySettings; use App\Models\Company; -use App\Utils\Ninja; use stdClass; /** diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php index f22e9315b0d7..019dfef64245 100644 --- a/app/Utils/Traits/MakesDates.php +++ b/app/Utils/Traits/MakesDates.php @@ -14,7 +14,6 @@ namespace App\Utils\Traits; use Carbon\Carbon; use DateTime; use DateTimeZone; -use Illuminate\Support\Facades\Log; /** * Class MakesDates. diff --git a/app/Utils/Traits/MakesHash.php b/app/Utils/Traits/MakesHash.php index 1571c73c4475..6ee1d0cb32b0 100644 --- a/app/Utils/Traits/MakesHash.php +++ b/app/Utils/Traits/MakesHash.php @@ -11,7 +11,6 @@ namespace App\Utils\Traits; -use App\Exceptions\ModelNotFoundException; use App\Libraries\MultiDB; use Hashids\Hashids; use Illuminate\Support\Str; diff --git a/app/Utils/Traits/PaymentEmailBuilder.php b/app/Utils/Traits/PaymentEmailBuilder.php index 04f69fbf7a39..a5b92c5459c8 100644 --- a/app/Utils/Traits/PaymentEmailBuilder.php +++ b/app/Utils/Traits/PaymentEmailBuilder.php @@ -11,9 +11,6 @@ namespace App\Utils\Traits; -use App\Models\ClientContact; -use App\Models\Invoice; -use Illuminate\Support\Carbon; use League\CommonMark\CommonMarkConverter; use Parsedown; diff --git a/app/Utils/Traits/QuoteEmailBuilder.php b/app/Utils/Traits/QuoteEmailBuilder.php index a87a1fb1cdf5..86d367fa74c4 100644 --- a/app/Utils/Traits/QuoteEmailBuilder.php +++ b/app/Utils/Traits/QuoteEmailBuilder.php @@ -11,7 +11,6 @@ namespace App\Utils\Traits; -use App\Models\ClientContact; use App\Models\Quote; use Illuminate\Support\Carbon; use League\CommonMark\CommonMarkConverter; diff --git a/app/Utils/Traits/Recurring/HasRecurrence.php b/app/Utils/Traits/Recurring/HasRecurrence.php index f4ac8c185461..75bc9445508d 100644 --- a/app/Utils/Traits/Recurring/HasRecurrence.php +++ b/app/Utils/Traits/Recurring/HasRecurrence.php @@ -12,7 +12,6 @@ namespace App\Utils\Traits\Recurring; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; trait HasRecurrence { diff --git a/composer.json b/composer.json index 21f49728cad5..16a018ea4d0a 100644 --- a/composer.json +++ b/composer.json @@ -70,6 +70,7 @@ "darkaonline/l5-swagger": "^8.0", "facade/ignition": "^2.3.6", "filp/whoops": "^2.7", + "friendsofphp/php-cs-fixer": "^2.16", "fzaninotto/faker": "^1.9.1", "mockery/mockery": "^1.3.1", "nunomaduro/collision": "^5.0", @@ -109,6 +110,9 @@ "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi" + ], + "format": [ + "vendor/bin/php-cs-fixer fix" ] }, "config": { diff --git a/composer.lock b/composer.lock index 4cf2157996e1..6662b547a688 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a178576541f03dbaf5e757fb4c89b474", + "content-hash": "d52dc9a6166a9ecfb0e5e92041c112e2", "packages": [ { "name": "asgrim/ofxparser", @@ -2293,54 +2293,6 @@ }, "time": "2020-09-30T07:37:11+00:00" }, - { - "name": "halaxa/json-machine", - "version": "0.4.0", - "source": { - "type": "git", - "url": "https://github.com/halaxa/json-machine.git", - "reference": "b99d7a9a1efc8ba633da4581cf079b3a6f1ed219" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/halaxa/json-machine/zipball/b99d7a9a1efc8ba633da4581cf079b3a6f1ed219", - "reference": "b99d7a9a1efc8ba633da4581cf079b3a6f1ed219", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "ext-json": "*", - "guzzlehttp/guzzle": "^6", - "phpunit/phpunit": "^5.7.27" - }, - "type": "library", - "autoload": { - "psr-4": { - "JsonMachine\\": "src/" - }, - "files": [ - "src/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Filip Halaxa", - "email": "filip@halaxa.cz" - } - ], - "description": "Efficient, easy-to-use and fast JSON pull parser", - "support": { - "issues": "https://github.com/halaxa/json-machine/issues", - "source": "https://github.com/halaxa/json-machine/tree/0.4.0" - }, - "time": "2020-11-09T13:28:55+00:00" - }, { "name": "hashids/hashids", "version": "3.0.0", @@ -6805,58 +6757,6 @@ }, "time": "2020-11-09T15:54:21+00:00" }, - { - "name": "staudenmeir/eloquent-has-many-deep", - "version": "v1.13.1", - "source": { - "type": "git", - "url": "https://github.com/staudenmeir/eloquent-has-many-deep.git", - "reference": "c0c9b6bd5c39d08e8adddc7eb8625962bd67a3da" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/eloquent-has-many-deep/zipball/c0c9b6bd5c39d08e8adddc7eb8625962bd67a3da", - "reference": "c0c9b6bd5c39d08e8adddc7eb8625962bd67a3da", - "shasum": "" - }, - "require": { - "illuminate/database": "^8.0", - "php": "^7.3|^8.0" - }, - "require-dev": { - "illuminate/pagination": "^8.0", - "phpunit/phpunit": "^9.3", - "staudenmeir/eloquent-eager-limit": "^1.6" - }, - "type": "library", - "autoload": { - "psr-4": { - "Staudenmeir\\EloquentHasManyDeep\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonas Staudenmeir", - "email": "mail@jonas-staudenmeir.de" - } - ], - "description": "Laravel Eloquent HasManyThrough relationships with unlimited levels", - "support": { - "issues": "https://github.com/staudenmeir/eloquent-has-many-deep/issues", - "source": "https://github.com/staudenmeir/eloquent-has-many-deep/tree/v1.13.1" - }, - "funding": [ - { - "url": "https://paypal.me/JonasStaudenmeir", - "type": "custom" - } - ], - "time": "2020-11-22T18:51:29+00:00" - }, { "name": "stripe/stripe-php", "version": "v7.65.0", @@ -10862,6 +10762,107 @@ }, "time": "2020-11-01T12:00:00+00:00" }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v2.16.7", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4e35806a6d7d8510d6842ae932e8832363d22c87", + "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87", + "shasum": "" + }, + "require": { + "composer/semver": "^1.4 || ^2.0 || ^3.0", + "composer/xdebug-handler": "^1.2", + "doctrine/annotations": "^1.2", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.1", + "php-cs-fixer/diff": "^1.3", + "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", + "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", + "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", + "symfony/finder": "^3.0 || ^4.0 || ^5.0", + "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", + "symfony/polyfill-php70": "^1.0", + "symfony/polyfill-php72": "^1.4", + "symfony/process": "^3.0 || ^4.0 || ^5.0", + "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" + }, + "require-dev": { + "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", + "justinrainbow/json-schema": "^5.0", + "keradus/cli-executor": "^1.4", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.4.1", + "php-cs-fixer/accessible-object": "^1.0", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", + "phpunitgoodpractices/traits": "^1.9.1", + "symfony/phpunit-bridge": "^5.1", + "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters.", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", + "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + }, + "classmap": [ + "tests/Test/AbstractFixerTestCase.php", + "tests/Test/AbstractIntegrationCaseFactory.php", + "tests/Test/AbstractIntegrationTestCase.php", + "tests/Test/Assert/AssertTokensTrait.php", + "tests/Test/IntegrationCase.php", + "tests/Test/IntegrationCaseFactory.php", + "tests/Test/IntegrationCaseFactoryInterface.php", + "tests/Test/InternalIntegrationCaseFactory.php", + "tests/Test/IsIdenticalConstraint.php", + "tests/TestCase.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "support": { + "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.16.7" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2020-10-27T22:44:27+00:00" + }, { "name": "hamcrest/hamcrest-php", "version": "v2.0.1", @@ -11411,6 +11412,61 @@ }, "time": "2020-06-27T14:39:04+00:00" }, + { + "name": "php-cs-fixer/diff", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/diff/issues", + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" + }, + "time": "2020-10-14T08:39:05+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -13151,6 +13207,136 @@ ], "time": "2020-10-24T11:50:19+00:00" }, + { + "name": "symfony/polyfill-php70", + "version": "v1.20.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "metapackage", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-10-23T14:02:19+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v5.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "3d9f57c89011f0266e6b1d469e5c0110513859d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/3d9f57c89011f0266e6b1d469e5c0110513859d5", + "reference": "3d9f57c89011f0266e6b1d469e5c0110513859d5", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/service-contracts": "^1.0|^2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v5.1.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-10-24T12:01:57+00:00" + }, { "name": "symfony/yaml", "version": "v5.1.8", diff --git a/database/factories/AccountFactory.php b/database/factories/AccountFactory.php index 78017ca57e60..c453cd4a29ab 100644 --- a/database/factories/AccountFactory.php +++ b/database/factories/AccountFactory.php @@ -30,11 +30,10 @@ class AccountFactory extends Factory */ public function definition() { - return [ - 'default_company_id' => 1, - 'key' => Str::random(32), - 'report_errors' => 1, - ]; + return [ + 'default_company_id' => 1, + 'key' => Str::random(32), + 'report_errors' => 1, + ]; } - } diff --git a/database/factories/ClientContactFactory.php b/database/factories/ClientContactFactory.php index 8a6d739774b6..581b7333a7ef 100644 --- a/database/factories/ClientContactFactory.php +++ b/database/factories/ClientContactFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; -use App\Models\Account; use App\Models\ClientContact; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class ClientContactFactory extends Factory { @@ -43,6 +41,4 @@ class ClientContactFactory extends Factory 'contact_key' => \Illuminate\Support\Str::random(40), ]; } - } - diff --git a/database/factories/ClientFactory.php b/database/factories/ClientFactory.php index 07f26b4e4401..746a0cde6888 100644 --- a/database/factories/ClientFactory.php +++ b/database/factories/ClientFactory.php @@ -10,11 +10,9 @@ */ namespace Database\Factories; - use App\DataMapper\ClientSettings; use App\Models\Client; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class ClientFactory extends Factory { @@ -32,7 +30,6 @@ class ClientFactory extends Factory */ public function definition() { - return [ 'name' => $this->faker->company(), 'website' => $this->faker->url, @@ -61,4 +58,4 @@ class ClientFactory extends Factory 'client_hash' => \Illuminate\Support\Str::random(40), ]; } -} \ No newline at end of file +} diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php index bd6239854ef9..3324f26b404d 100644 --- a/database/factories/CompanyFactory.php +++ b/database/factories/CompanyFactory.php @@ -10,11 +10,9 @@ */ namespace Database\Factories; - use App\DataMapper\CompanySettings; use App\Models\Company; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class CompanyFactory extends Factory { diff --git a/database/factories/CreditFactory.php b/database/factories/CreditFactory.php index dd60d0e0ef53..b640dfbdbba1 100644 --- a/database/factories/CreditFactory.php +++ b/database/factories/CreditFactory.php @@ -10,13 +10,9 @@ */ namespace Database\Factories; - -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Factory\InvoiceItemFactory; use App\Models\Credit; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class CreditFactory extends Factory { diff --git a/database/factories/CreditInvitationFactory.php b/database/factories/CreditInvitationFactory.php index 1c74de5406f8..3836bf7cff9d 100644 --- a/database/factories/CreditInvitationFactory.php +++ b/database/factories/CreditInvitationFactory.php @@ -30,8 +30,8 @@ class CreditInvitationFactory extends Factory */ public function definition() { - return [ - 'key' => Str::random(40), - ]; - } -} \ No newline at end of file + return [ + 'key' => Str::random(40), + ]; + } +} diff --git a/database/factories/ExpenseCategoryFactory.php b/database/factories/ExpenseCategoryFactory.php index 38a1c07aa7fd..2d05d7c6d03d 100644 --- a/database/factories/ExpenseCategoryFactory.php +++ b/database/factories/ExpenseCategoryFactory.php @@ -12,7 +12,6 @@ namespace Database\Factories; use App\Models\ExpenseCategory; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class ExpenseCategoryFactory extends Factory { diff --git a/database/factories/ExpenseFactory.php b/database/factories/ExpenseFactory.php index 685bead9803e..fbeee3b8540c 100644 --- a/database/factories/ExpenseFactory.php +++ b/database/factories/ExpenseFactory.php @@ -12,7 +12,6 @@ namespace Database\Factories; use App\Models\Expense; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class ExpenseFactory extends Factory { diff --git a/database/factories/GatewayFactory.php b/database/factories/GatewayFactory.php index e1c61cf3d7ca..9770c9b13556 100644 --- a/database/factories/GatewayFactory.php +++ b/database/factories/GatewayFactory.php @@ -12,7 +12,6 @@ namespace Database\Factories; use App\Models\Gateway; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class GatewayFactory extends Factory { @@ -42,4 +41,4 @@ class GatewayFactory extends Factory 'default_gateway_type_id' => 1, ]; } -} \ No newline at end of file +} diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php index 7562a1d62c60..6686f7327ef5 100644 --- a/database/factories/InvoiceFactory.php +++ b/database/factories/InvoiceFactory.php @@ -10,13 +10,9 @@ */ namespace Database\Factories; - -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Factory\InvoiceItemFactory; use App\Models\Invoice; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class InvoiceFactory extends Factory { @@ -57,4 +53,4 @@ class InvoiceFactory extends Factory 'terms' => $this->faker->text(500), ]; } -} \ No newline at end of file +} diff --git a/database/factories/InvoiceInvitationFactory.php b/database/factories/InvoiceInvitationFactory.php index 8d462245a274..0069f92937f5 100644 --- a/database/factories/InvoiceInvitationFactory.php +++ b/database/factories/InvoiceInvitationFactory.php @@ -30,8 +30,8 @@ class InvoiceInvitationFactory extends Factory */ public function definition() { - return [ - 'key' => Str::random(40), - ]; - } -} \ No newline at end of file + return [ + 'key' => Str::random(40), + ]; + } +} diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php index 83088b5c7d81..717024da74a5 100644 --- a/database/factories/PaymentFactory.php +++ b/database/factories/PaymentFactory.php @@ -10,11 +10,8 @@ */ namespace Database\Factories; - - use App\Models\Payment; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class PaymentFactory extends Factory { @@ -32,13 +29,13 @@ class PaymentFactory extends Factory */ public function definition() { - return [ - 'is_deleted' => false, - 'amount' => $this->faker->numberBetween(1, 10), - 'date' => $this->faker->date(), - 'transaction_reference' => $this->faker->text(10), - 'type_id' => Payment::TYPE_CREDIT_CARD, - 'status_id' => Payment::STATUS_COMPLETED, - ]; - } -} \ No newline at end of file + return [ + 'is_deleted' => false, + 'amount' => $this->faker->numberBetween(1, 10), + 'date' => $this->faker->date(), + 'transaction_reference' => $this->faker->text(10), + 'type_id' => Payment::TYPE_CREDIT_CARD, + 'status_id' => Payment::STATUS_COMPLETED, + ]; + } +} diff --git a/database/factories/ProductFactory.php b/database/factories/ProductFactory.php index d55e061f6450..94592c79f04d 100644 --- a/database/factories/ProductFactory.php +++ b/database/factories/ProductFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; - use App\Models\Product; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class ProductFactory extends Factory { @@ -50,4 +48,4 @@ class ProductFactory extends Factory 'is_deleted' => false, ]; } -} \ No newline at end of file +} diff --git a/database/factories/ProjectFactory.php b/database/factories/ProjectFactory.php index ec8ba7bda004..054d29cfac62 100644 --- a/database/factories/ProjectFactory.php +++ b/database/factories/ProjectFactory.php @@ -10,11 +10,8 @@ */ namespace Database\Factories; - - use App\Models\Project; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class ProjectFactory extends Factory { @@ -31,10 +28,10 @@ class ProjectFactory extends Factory * @return array */ public function definition() - { - return [ - 'name' => $this->faker->name(), - 'public_notes' => $this->faker->text(50), - ]; - } + { + return [ + 'name' => $this->faker->name(), + 'public_notes' => $this->faker->text(50), + ]; + } } diff --git a/database/factories/QuoteFactory.php b/database/factories/QuoteFactory.php index 243cb66a1c4f..8fff12d7859b 100644 --- a/database/factories/QuoteFactory.php +++ b/database/factories/QuoteFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; - use App\Models\Quote; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class QuoteFactory extends Factory { @@ -50,4 +48,4 @@ class QuoteFactory extends Factory 'line_items' => false, ]; } -} \ No newline at end of file +} diff --git a/database/factories/QuoteInvitationFactory.php b/database/factories/QuoteInvitationFactory.php index 1a1cffc34d2f..cda082d50d64 100644 --- a/database/factories/QuoteInvitationFactory.php +++ b/database/factories/QuoteInvitationFactory.php @@ -10,7 +10,6 @@ */ namespace Database\Factories; - use App\Models\QuoteInvitation; use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Str; @@ -30,9 +29,9 @@ class QuoteInvitationFactory extends Factory * @return array */ public function definition() - { - return [ - 'key' => Str::random(40), - ]; - } + { + return [ + 'key' => Str::random(40), + ]; + } } diff --git a/database/factories/RecurringInvoiceFactory.php b/database/factories/RecurringInvoiceFactory.php index 34b6ff30311d..d684d21c8a26 100644 --- a/database/factories/RecurringInvoiceFactory.php +++ b/database/factories/RecurringInvoiceFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; - use App\Models\RecurringInvoice; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class RecurringInvoiceFactory extends Factory { diff --git a/database/factories/RecurringQuoteFactory.php b/database/factories/RecurringQuoteFactory.php index 6b76d48baf77..31d8905ecf60 100644 --- a/database/factories/RecurringQuoteFactory.php +++ b/database/factories/RecurringQuoteFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; -use App\Models\QuoteInvitation; use App\Models\RecurringQuote; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class RecurringQuoteFactory extends Factory { @@ -30,8 +28,8 @@ class RecurringQuoteFactory extends Factory * @return array */ public function definition() - { - return [ + { + return [ 'status_id' => RecurringQuote::STATUS_DRAFT, 'number' => $this->faker->text(256), 'discount' => $this->faker->numberBetween(1, 10), @@ -57,5 +55,5 @@ class RecurringQuoteFactory extends Factory 'next_send_date' => $this->faker->date(), 'remaining_cycles' => $this->faker->numberBetween(1, 10), ]; - } + } } diff --git a/database/factories/TaskFactory.php b/database/factories/TaskFactory.php index b18016f3e14a..379612f91a00 100644 --- a/database/factories/TaskFactory.php +++ b/database/factories/TaskFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; - use App\Models\Task; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class TaskFactory extends Factory { @@ -30,10 +28,10 @@ class TaskFactory extends Factory * @return array */ public function definition() - { - return [ - 'description' => $this->faker->text(50), + { + return [ + 'description' => $this->faker->text(50), 'invoice_id' => null, - ]; - } -} \ No newline at end of file + ]; + } +} diff --git a/database/factories/TaskStatusFactory.php b/database/factories/TaskStatusFactory.php index 02f49d3e0dd3..94c28d287f1c 100644 --- a/database/factories/TaskStatusFactory.php +++ b/database/factories/TaskStatusFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; - use App\Models\TaskStatus; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class TaskStatusFactory extends Factory { @@ -35,4 +33,4 @@ class TaskStatusFactory extends Factory 'name' => $this->faker->text(7), ]; } -} \ No newline at end of file +} diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 598f1a4deb9b..b0e645a081b0 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; - use App\Models\User; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class UserFactory extends Factory { @@ -30,15 +28,15 @@ class UserFactory extends Factory * @return array */ public function definition() - { - return [ - 'first_name' => $this->faker->name, - 'last_name' => $this->faker->name, - 'phone' => $this->faker->phoneNumber, - 'email' => config('ninja.testvars.username'), - 'email_verified_at' => now(), - 'password' => bcrypt(config('ninja.testvars.password')), // secret - 'remember_token' => \Illuminate\Support\Str::random(10), - ]; - } + { + return [ + 'first_name' => $this->faker->name, + 'last_name' => $this->faker->name, + 'phone' => $this->faker->phoneNumber, + 'email' => config('ninja.testvars.username'), + 'email_verified_at' => now(), + 'password' => bcrypt(config('ninja.testvars.password')), // secret + 'remember_token' => \Illuminate\Support\Str::random(10), + ]; + } } diff --git a/database/factories/VendorContactFactory.php b/database/factories/VendorContactFactory.php index 13fa826bb304..ac75d4d86bb3 100644 --- a/database/factories/VendorContactFactory.php +++ b/database/factories/VendorContactFactory.php @@ -10,10 +10,8 @@ */ namespace Database\Factories; - use App\Models\VendorContact; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class VendorContactFactory extends Factory { @@ -31,11 +29,11 @@ class VendorContactFactory extends Factory */ public function definition() { - return [ - 'first_name' => $this->faker->firstName, - 'last_name' => $this->faker->lastName, - 'phone' => $this->faker->phoneNumber, - 'email' => $this->faker->unique()->safeEmail, - ]; - } -} \ No newline at end of file + return [ + 'first_name' => $this->faker->firstName, + 'last_name' => $this->faker->lastName, + 'phone' => $this->faker->phoneNumber, + 'email' => $this->faker->unique()->safeEmail, + ]; + } +} diff --git a/database/factories/VendorFactory.php b/database/factories/VendorFactory.php index 8c4830a31f47..9106f043a5f5 100644 --- a/database/factories/VendorFactory.php +++ b/database/factories/VendorFactory.php @@ -12,7 +12,6 @@ namespace Database\Factories; use App\Models\Vendor; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; class VendorFactory extends Factory { @@ -48,4 +47,4 @@ class VendorFactory extends Factory 'country_id' => 4, ]; } -} \ No newline at end of file +} diff --git a/database/migrations/2020_07_21_112424_update_enabled_modules_value.php b/database/migrations/2020_07_21_112424_update_enabled_modules_value.php index bb4dd4f0dbd0..c508b68b4b5c 100644 --- a/database/migrations/2020_07_21_112424_update_enabled_modules_value.php +++ b/database/migrations/2020_07_21_112424_update_enabled_modules_value.php @@ -12,8 +12,6 @@ use App\Models\Company; use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; class UpdateEnabledModulesValue extends Migration { diff --git a/database/migrations/2020_08_13_095946_remove_photo_design.php b/database/migrations/2020_08_13_095946_remove_photo_design.php index fdbe03cc34a9..d26838069fa9 100644 --- a/database/migrations/2020_08_13_095946_remove_photo_design.php +++ b/database/migrations/2020_08_13_095946_remove_photo_design.php @@ -12,8 +12,6 @@ use App\Models\Design; use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; class RemovePhotoDesign extends Migration { diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php index 7a28dd3dfbc9..1c1c7a357a5c 100644 --- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php +++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php @@ -54,7 +54,6 @@ class AddIsPublicToDocumentsTable extends Migration $table->timestamps(6); $table->foreign('payment_id')->references('id')->on('payments')->onDelete('cascade')->onUpdate('cascade'); - }); Schema::table('recurring_invoices', function ($table) { @@ -114,7 +113,5 @@ class AddIsPublicToDocumentsTable extends Migration */ public function down() { - } - } diff --git a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php index b32aa8731cfa..58719d2f81e9 100644 --- a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php +++ b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php @@ -39,8 +39,6 @@ class IdNumberFieldsForMissingEntities extends Migration Schema::table('vendor_contacts', function (Blueprint $table) { $table->boolean('send_email')->default(0); }); - - } /** diff --git a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php index ad6e8c4c56ae..0dfe4872365f 100644 --- a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php +++ b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php @@ -12,7 +12,6 @@ use App\Models\Gateway; use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; class UpdateGatewayTableVisibleColumn extends Migration @@ -38,21 +37,18 @@ class UpdateGatewayTableVisibleColumn extends Migration $t->datetime('sent_date')->nullable(); $t->datetime('viewed_date')->nullable(); $t->datetime('opened_date')->nullable(); - }); - Schema::table('expenses', function ($t){ + Schema::table('expenses', function ($t) { $t->renameColumn('invoice_category_id', 'category_id'); }); - Schema::table('projects', function ($t){ + Schema::table('projects', function ($t) { $t->text('public_notes')->nullable(); $t->dropColumn('description'); - $t->decimal('budgeted_hours', 12,2)->change(); + $t->decimal('budgeted_hours', 12, 2)->change(); $t->boolean('is_deleted')->default(0); }); - - } diff --git a/database/migrations/2020_10_12_204517_project_number_column.php b/database/migrations/2020_10_12_204517_project_number_column.php index 1b24a2f9dd37..e17cf009d189 100644 --- a/database/migrations/2020_10_12_204517_project_number_column.php +++ b/database/migrations/2020_10_12_204517_project_number_column.php @@ -11,7 +11,6 @@ use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; class ProjectNumberColumn extends Migration @@ -23,15 +22,15 @@ class ProjectNumberColumn extends Migration */ public function up() { - Schema::table('projects', function($table){ + Schema::table('projects', function ($table) { $table->string('number')->nullable(); }); - Schema::table('expenses', function ($t){ + Schema::table('expenses', function ($t) { $t->renameColumn('expense_date', 'date'); }); - Schema::table('expense_categories', function ($t){ + Schema::table('expense_categories', function ($t) { $t->boolean('is_deleted')->default(false); }); } diff --git a/database/migrations/2020_10_14_201320_project_ids_to_entities.php b/database/migrations/2020_10_14_201320_project_ids_to_entities.php index 3f6546ce1109..1ca7bb9f4ab3 100644 --- a/database/migrations/2020_10_14_201320_project_ids_to_entities.php +++ b/database/migrations/2020_10_14_201320_project_ids_to_entities.php @@ -36,8 +36,6 @@ class ProjectIdsToEntities extends Migration $table->boolean('mark_expenses_paid')->default(0); $table->enum('use_credits_payment', ['always', 'off', 'option'])->default('off'); }); - - } /** diff --git a/database/migrations/2020_10_19_101823_project_name_unique_removal.php b/database/migrations/2020_10_19_101823_project_name_unique_removal.php index f4408ad7b99b..ba4bb1746a81 100644 --- a/database/migrations/2020_10_19_101823_project_name_unique_removal.php +++ b/database/migrations/2020_10_19_101823_project_name_unique_removal.php @@ -23,7 +23,6 @@ class ProjectNameUniqueRemoval extends Migration */ public function up() { - Schema::table('projects', function (Blueprint $table) { $table->dropUnique('projects_company_id_name_unique'); }); @@ -39,7 +38,6 @@ class ProjectNameUniqueRemoval extends Migration Schema::table('companies', function (Blueprint $table) { $table->boolean('invoice_expense_documents')->default(false); $table->boolean('auto_start_tasks')->default(false); - }); Schema::create('task_statuses', function (Blueprint $table) { diff --git a/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php index 6a88014227da..1db6170cc451 100644 --- a/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php +++ b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php @@ -23,10 +23,8 @@ class ExpensesNullableAssignedUser extends Migration */ public function up() { - Schema::table('expenses', function(Blueprint $table) { - + Schema::table('expenses', function (Blueprint $table) { $table->unsignedInteger('assigned_user_id')->nullable()->change(); - }); } diff --git a/database/migrations/2020_10_22_204900_company_table_fields.php b/database/migrations/2020_10_22_204900_company_table_fields.php index 107f18575fa5..0e51dcbfd97b 100644 --- a/database/migrations/2020_10_22_204900_company_table_fields.php +++ b/database/migrations/2020_10_22_204900_company_table_fields.php @@ -13,13 +13,13 @@ class CompanyTableFields extends Migration */ public function up() { - Schema::table('companies', function(Blueprint $table){ + Schema::table('companies', function (Blueprint $table) { $table->boolean('invoice_task_timelog')->default(true); $table->boolean('invoice_task_documents')->default(false); $table->dropColumn('use_credits_payment'); }); - Schema::table('task_statuses', function(Blueprint $table){ + Schema::table('task_statuses', function (Blueprint $table) { $table->unsignedInteger('status_sort_order')->default(0); }); } diff --git a/database/migrations/2020_10_27_021751_tasks_invoice_documents.php b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php index a36319b11635..112cfbe73388 100644 --- a/database/migrations/2020_10_27_021751_tasks_invoice_documents.php +++ b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php @@ -13,26 +13,25 @@ class TasksInvoiceDocuments extends Migration */ public function up() { - Schema::table('tasks', function(Blueprint $table){ + Schema::table('tasks', function (Blueprint $table) { $table->boolean('invoice_documents')->default(0); }); - Schema::table('companies', function(Blueprint $table){ + Schema::table('companies', function (Blueprint $table) { $table->boolean('show_tasks_table')->default(); }); - Schema::table('invoice_invitations', function(Blueprint $table){ + Schema::table('invoice_invitations', function (Blueprint $table) { $table->text('signature_ip')->nullable(); }); - Schema::table('quote_invitations', function(Blueprint $table){ + Schema::table('quote_invitations', function (Blueprint $table) { $table->text('signature_ip')->nullable(); }); - Schema::table('credit_invitations', function(Blueprint $table){ + Schema::table('credit_invitations', function (Blueprint $table) { $table->text('signature_ip')->nullable(); }); - } /** diff --git a/database/migrations/2020_10_28_224711_status_sort_order.php b/database/migrations/2020_10_28_224711_status_sort_order.php index dc674e5c69ba..3cb2dfd34d3a 100644 --- a/database/migrations/2020_10_28_224711_status_sort_order.php +++ b/database/migrations/2020_10_28_224711_status_sort_order.php @@ -1,7 +1,6 @@ renameColumn('sort_order', 'status_sort_order'); }); - } /** diff --git a/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php b/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php index 5313d450c120..738ae8e69779 100644 --- a/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php +++ b/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php @@ -13,10 +13,8 @@ class AssignedUserTasksTable extends Migration */ public function up() { - Schema::table('tasks', function(Blueprint $table) { - + Schema::table('tasks', function (Blueprint $table) { $table->unsignedInteger('assigned_user_id')->nullable()->change(); - }); } diff --git a/database/migrations/2020_10_29_093836_change_start_time_column_type.php b/database/migrations/2020_10_29_093836_change_start_time_column_type.php index 26cde14da1c3..b3670c47a457 100644 --- a/database/migrations/2020_10_29_093836_change_start_time_column_type.php +++ b/database/migrations/2020_10_29_093836_change_start_time_column_type.php @@ -13,7 +13,7 @@ class ChangeStartTimeColumnType extends Migration */ public function up() { - Schema::table('tasks', function (Blueprint $table){ + Schema::table('tasks', function (Blueprint $table) { $table->unsignedInteger('duration')->nullable()->change(); }); } diff --git a/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php b/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php index 516c71735907..78af867014a2 100644 --- a/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php +++ b/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php @@ -13,10 +13,8 @@ class TasksTableProjectNullable extends Migration */ public function up() { - Schema::table('projects', function(Blueprint $table) { - + Schema::table('projects', function (Blueprint $table) { $table->unsignedInteger('assigned_user_id')->nullable()->change(); - }); } diff --git a/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php b/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php index 81d178cd9c29..741a809b5c1c 100644 --- a/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php +++ b/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php @@ -13,7 +13,7 @@ class ChangeDefaultShowTasksTable extends Migration */ public function up() { - Schema::table('companies', function(Blueprint $table){ + Schema::table('companies', function (Blueprint $table) { $table->boolean('show_tasks_table')->default(false)->change(); }); } diff --git a/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php b/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php index 340cc851b533..0fcb88fd9bb6 100644 --- a/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php +++ b/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php @@ -13,11 +13,11 @@ class ChangeExpenseCurrencyIdColumn extends Migration */ public function up() { - Schema::table('expenses', function(Blueprint $table){ + Schema::table('expenses', function (Blueprint $table) { $table->renameColumn('expense_currency_id', 'currency_id'); }); - Schema::table('companies', function(Blueprint $table){ + Schema::table('companies', function (Blueprint $table) { $table->boolean('is_disabled')->default(false); }); } diff --git a/database/migrations/2020_11_01_031750_drop_migrating_column.php b/database/migrations/2020_11_01_031750_drop_migrating_column.php index a85f1bbac1ee..0bb55768259e 100644 --- a/database/migrations/2020_11_01_031750_drop_migrating_column.php +++ b/database/migrations/2020_11_01_031750_drop_migrating_column.php @@ -13,7 +13,7 @@ class DropMigratingColumn extends Migration */ public function up() { - Schema::table('company_user', function(Blueprint $table){ + Schema::table('company_user', function (Blueprint $table) { $table->dropColumn('is_migrating'); }); } diff --git a/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php b/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php index 18ac62d41d48..67305af17b04 100644 --- a/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php +++ b/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php @@ -13,7 +13,7 @@ class CompanyGatewayFieldsRefactor extends Migration */ public function up() { - Schema::table('company_gateways', function(Blueprint $table){ + Schema::table('company_gateways', function (Blueprint $table) { $table->renameColumn('show_billing_address', 'require_billing_address'); $table->renameColumn('show_shipping_address', 'require_shipping_address'); $table->boolean('require_client_name')->default(false); diff --git a/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php b/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php index c7aa8461721c..039f60d0c1c6 100644 --- a/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php +++ b/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php @@ -13,7 +13,7 @@ class CustomFieldsForPaymentsTable extends Migration */ public function up() { - Schema::table('payments', function(Blueprint $table){ + Schema::table('payments', function (Blueprint $table) { $table->string('custom_value1')->nullable(); $table->string('custom_value2')->nullable(); $table->string('custom_value3')->nullable(); diff --git a/database/migrations/2020_11_12_104413_company_gateway_rename_column.php b/database/migrations/2020_11_12_104413_company_gateway_rename_column.php index 5bc05b56b102..3be9a3a66f48 100644 --- a/database/migrations/2020_11_12_104413_company_gateway_rename_column.php +++ b/database/migrations/2020_11_12_104413_company_gateway_rename_column.php @@ -13,7 +13,7 @@ class CompanyGatewayRenameColumn extends Migration */ public function up() { - Schema::table('company_gateways', function(Blueprint $table){ + Schema::table('company_gateways', function (Blueprint $table) { $table->renameColumn('require_zip', 'require_postal_code'); }); } diff --git a/database/migrations/2020_11_15_203755_soft_delete_paymentables.php b/database/migrations/2020_11_15_203755_soft_delete_paymentables.php index b0f275a7960d..bf744ae13725 100644 --- a/database/migrations/2020_11_15_203755_soft_delete_paymentables.php +++ b/database/migrations/2020_11_15_203755_soft_delete_paymentables.php @@ -13,7 +13,7 @@ class SoftDeletePaymentables extends Migration */ public function up() { - Schema::table('paymentables', function(Blueprint $table){ + Schema::table('paymentables', function (Blueprint $table) { $table->softDeletes('deleted_at', 6); }); } diff --git a/database/seeders/CurrenciesSeeder.php b/database/seeders/CurrenciesSeeder.php index a40f479c8e97..cdc61af830bd 100644 --- a/database/seeders/CurrenciesSeeder.php +++ b/database/seeders/CurrenciesSeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\Currency; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 86b9cfb619cd..bae94e840b27 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -10,19 +10,7 @@ */ namespace Database\Seeders; - use App\Models\Timezone; -use Database\Seeders\BanksSeeder; -use Database\Seeders\ConstantsSeeder; -use Database\Seeders\CountriesSeeder; -use Database\Seeders\CurrenciesSeeder; -use Database\Seeders\DateFormatsSeeder; -use Database\Seeders\DesignSeeder; -use Database\Seeders\GatewayTypesSeeder; -use Database\Seeders\IndustrySeeder; -use Database\Seeders\LanguageSeeder; -use Database\Seeders\PaymentLibrariesSeeder; -use Database\Seeders\PaymentTypesSeeder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; @@ -58,6 +46,5 @@ class DatabaseSeeder extends Seeder DateFormatsSeeder::class, DesignSeeder::class, ]); - } } diff --git a/database/seeders/DateFormatsSeeder.php b/database/seeders/DateFormatsSeeder.php index db449a3ebf0d..a165d3bb241f 100644 --- a/database/seeders/DateFormatsSeeder.php +++ b/database/seeders/DateFormatsSeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\DateFormat; use App\Models\DatetimeFormat; use Illuminate\Database\Eloquent\Model; diff --git a/database/seeders/DesignSeeder.php b/database/seeders/DesignSeeder.php index a85fbfad71b7..587d96c4d0ee 100644 --- a/database/seeders/DesignSeeder.php +++ b/database/seeders/DesignSeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\Design; use App\Services\PdfMaker\Design as PdfMakerDesign; use Illuminate\Database\Eloquent\Model; diff --git a/database/seeders/GatewayTypesSeeder.php b/database/seeders/GatewayTypesSeeder.php index 8faed88b2437..cd06892a16ea 100644 --- a/database/seeders/GatewayTypesSeeder.php +++ b/database/seeders/GatewayTypesSeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\GatewayType; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; diff --git a/database/seeders/IndustrySeeder.php b/database/seeders/IndustrySeeder.php index e89cf43cca56..c6d455abf8af 100644 --- a/database/seeders/IndustrySeeder.php +++ b/database/seeders/IndustrySeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\Industry; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; @@ -63,6 +62,5 @@ class IndustrySeeder extends Seeder Industry::create($industry); } } - } } diff --git a/database/seeders/LanguageSeeder.php b/database/seeders/LanguageSeeder.php index 6311a6b86857..7d1c9662aa07 100644 --- a/database/seeders/LanguageSeeder.php +++ b/database/seeders/LanguageSeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\Language; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; @@ -64,6 +63,5 @@ class LanguageSeeder extends Seeder Language::create($language); } } - } } diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php index a6e6b1959b6d..a9f672bfe9e5 100644 --- a/database/seeders/PaymentLibrariesSeeder.php +++ b/database/seeders/PaymentLibrariesSeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\Gateway; use App\Models\GatewayType; use Illuminate\Database\Eloquent\Model; @@ -98,11 +97,9 @@ class PaymentLibrariesSeeder extends Seeder Gateway::whereIn('id', [1,15,20,39])->update(['visible' => 1]); - Gateway::all()->each(function ($gateway){ - + Gateway::all()->each(function ($gateway) { $gateway->site_url = $gateway->getHelp(); $gateway->save(); - }); } } diff --git a/database/seeders/PaymentTypesSeeder.php b/database/seeders/PaymentTypesSeeder.php index eaae804a7811..38d2c3ee6def 100644 --- a/database/seeders/PaymentTypesSeeder.php +++ b/database/seeders/PaymentTypesSeeder.php @@ -10,7 +10,6 @@ */ namespace Database\Seeders; - use App\Models\PaymentType; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; diff --git a/database/seeders/RandomDataSeeder.php b/database/seeders/RandomDataSeeder.php index d2e549129a2d..2660ae83b714 100644 --- a/database/seeders/RandomDataSeeder.php +++ b/database/seeders/RandomDataSeeder.php @@ -12,8 +12,6 @@ namespace Database\Seeders; use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; -use App\DataMapper\DefaultSettings; -use App\Events\Invoice\InvoiceWasUpdated; use App\Events\Payment\PaymentWasCreated; use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSumInclusive; @@ -26,7 +24,6 @@ use App\Models\Company; use App\Models\CompanyGateway; use App\Models\CompanyToken; use App\Models\Credit; -use App\Models\GatewayType; use App\Models\GroupSetting; use App\Models\Invoice; use App\Models\Payment; @@ -36,7 +33,6 @@ use App\Models\Product; use App\Models\Quote; use App\Models\RecurringInvoice; use App\Models\User; -use App\Models\UserAccount; use App\Repositories\CreditRepository; use App\Repositories\InvoiceRepository; use App\Repositories\QuoteRepository; diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php index 9596cb609b41..e5a425ddba51 100644 --- a/database/seeders/UsersTableSeeder.php +++ b/database/seeders/UsersTableSeeder.php @@ -10,14 +10,11 @@ */ namespace Database\Seeders; - use App\DataMapper\CompanySettings; -use App\DataMapper\DefaultSettings; use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\User; -use App\Models\UserAccount; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Seeder; diff --git a/public/css/app.css b/public/css/app.css index 5d3f9c09d8c4..73d7e284c94f 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1 +1 @@ -/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}[hidden],template{display:none}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{box-sizing:border-box;border:0 solid #d2d6dc}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#a0aec0}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#a0aec0}input::placeholder,textarea::placeholder{color:#a0aec0}[role=button],button{cursor:pointer}table{border-collapse:collapse}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}button,input,optgroup,select,textarea{padding:0;line-height:inherit;color:inherit}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}.form-input{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-input::-moz-placeholder{color:#9fa6b2;opacity:1}.form-input:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-input::placeholder{color:#9fa6b2;opacity:1}.form-input:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-textarea::-moz-placeholder{color:#9fa6b2;opacity:1}.form-textarea:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-textarea::placeholder{color:#9fa6b2;opacity:1}.form-textarea:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-multiselect{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-multiselect:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-select{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none'%3E%3Cpath d='M7 7l3-3 3 3m0 6l-3 3-3-3' stroke='%239fa6b2' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;background-repeat:no-repeat;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem 2.5rem .5rem .75rem;font-size:1rem;line-height:1.5;background-position:right .5rem center;background-size:1.5em 1.5em}.form-select::-ms-expand{color:#9fa6b2;border:none}@media not print{.form-select::-ms-expand{display:none}}@media print and (-ms-high-contrast:active),print and (-ms-high-contrast:none){.form-select{padding-right:.75rem}}.form-select:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.707 7.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4a1 1 0 00-1.414-1.414L7 8.586 5.707 7.293z'/%3E%3C/svg%3E");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-checkbox::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-checkbox{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.25rem}.form-checkbox:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked:focus,.form-radio:checked{border-color:transparent}.form-radio:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='8' cy='8' r='3'/%3E%3C/svg%3E");background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-radio::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-radio{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;border-radius:100%;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px}.form-radio:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-radio:checked:focus{border-color:transparent}.button{border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{opacity:.5;cursor:not-allowed}.button-primary{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--bg-opacity:1;background-color:#f05252;background-color:rgba(240,82,82,var(--bg-opacity));--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-danger:hover{--bg-opacity:1;background-color:#e02424;background-color:rgba(224,36,36,var(--bg-opacity))}.button-secondary{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.button-secondary:hover{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.button-link:hover{font-weight:600;text-decoration:underline}.button-link:focus{outline:2px solid transparent;outline-offset:2px;text-decoration:underline}.validation{border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));padding:.25rem .75rem}.validation-fail{border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.validation-fail,.validation-pass{--border-opacity:1;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));font-size:.875rem}.validation-pass{border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.input{align-items:center;border-width:1px;--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity));border-radius:.25rem;margin-top:.5rem;padding:.5rem 1rem;font-size:.875rem}.input:focus{outline:2px solid transparent;outline-offset:2px;--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.input-label{font-size:.875rem;--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.input-slim{padding-top:.5rem;padding-bottom:.5rem}.alert{padding:.75rem 1rem;font-size:.875rem;border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.alert-success{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.alert-failure{--border-opacity:1;border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.badge{display:inline-flex;align-items:center;padding:.125rem .625rem;border-radius:9999px;font-size:.75rem;font-weight:500;line-height:1rem}.badge-light{background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.badge-light,.badge-primary{--bg-opacity:1;--text-opacity:1}.badge-primary{background-color:#c3ddfd;background-color:rgba(195,221,253,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}.badge-danger{background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity));color:#f05252;color:rgba(240,82,82,var(--text-opacity))}.badge-danger,.badge-success{--bg-opacity:1;--text-opacity:1}.badge-success{background-color:#def7ec;background-color:rgba(222,247,236,var(--bg-opacity));color:#0e9f6e;color:rgba(14,159,110,var(--text-opacity))}.badge-secondary{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity));--text-opacity:1;color:#e5e7eb;color:rgba(229,231,235,var(--text-opacity))}.badge-warning{background-color:#feecdc;background-color:rgba(254,236,220,var(--bg-opacity));color:#ff5a1f;color:rgba(255,90,31,var(--text-opacity))}.badge-info,.badge-warning{--bg-opacity:1;--text-opacity:1}.badge-info{background-color:#e1effe;background-color:rgba(225,239,254,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}@media (min-width:640px){.dataTables_length{margin-top:1.25rem!important;margin-bottom:1.25rem!important}}@media (min-width:1024px){.dataTables_length{margin-top:1rem!important;margin-bottom:1rem!important}}.dataTables_length select{--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;font-size:.875rem!important;margin-left:.5rem!important;margin-right:.5rem!important;padding:.5rem!important}.dataTables_filter{margin-bottom:1rem}.dataTables_filter input{-webkit-appearance:none!important;-moz-appearance:none!important;appearance:none!important;background-color:#fff!important;border-radius:.375rem!important;font-size:1rem!important;line-height:1.5!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;padding:.5rem 1rem!important;font-size:.875rem!important}@media (min-width:1024px){.dataTables_filter{margin-top:-3rem!important}}.dataTables_paginate{padding-bottom:1.5rem!important;padding-top:.5rem!important}.dataTables_paginate .paginate_button{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-duration:.15s!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;font-size:.875rem!important;line-height:1rem!important;font-weight:500!important;border-radius:.25rem!important;--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;margin-right:.25rem!important;padding:.5rem 1rem!important;cursor:pointer!important}.dataTables_paginate .current{--bg-opacity:1!important;background-color:#1c64f2!important;background-color:rgba(28,100,242,var(--bg-opacity))!important;--text-opacity:1!important;color:#fff!important;color:rgba(255,255,255,var(--text-opacity))!important}.dataTables_info{font-size:.875rem!important}.dataTables_empty{padding-top:1rem!important;padding-bottom:1rem!important}.pagination{display:flex!important;align-items:center!important}.pagination .page-link{margin-top:-1px!important;border-top-width:2px!important;border-color:transparent!important;padding-top:1rem!important;padding-left:1rem!important;padding-right:1rem!important;display:inline-flex!important;align-items:center!important;font-size:.875rem!important;line-height:1.25rem!important;font-weight:500!important;--text-opacity:1!important;color:#6b7280!important;color:rgba(107,114,128,var(--text-opacity))!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;transition-duration:.15s!important;cursor:pointer!important}.pagination .page-link:hover{--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important}.pagination .page-link:focus{outline:2px solid transparent;outline-offset:2px;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.pagination .active>span{--text-opacity:1!important;color:#1c64f2!important;color:rgba(28,100,242,var(--text-opacity))!important;--border-opacity:1!important;border-color:#1c64f2!important;border-color:rgba(28,100,242,var(--border-opacity))!important}.space-x-1>:not(template)~:not(template){--space-x-reverse:0;margin-right:calc(0.25rem*var(--space-x-reverse));margin-left:calc(0.25rem*(1 - var(--space-x-reverse)))}.space-x-2>:not(template)~:not(template){--space-x-reverse:0;margin-right:calc(0.5rem*var(--space-x-reverse));margin-left:calc(0.5rem*(1 - var(--space-x-reverse)))}.bg-white{--bg-opacity:1;background-color:#fff;background-color:rgba(255,255,255,var(--bg-opacity))}.bg-gray-50{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.bg-gray-100{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.bg-gray-200{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.bg-gray-500{--bg-opacity:1;background-color:#6b7280;background-color:rgba(107,114,128,var(--bg-opacity))}.bg-gray-600{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.bg-gray-800{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity))}.bg-gray-900{--bg-opacity:1;background-color:#161e2e;background-color:rgba(22,30,46,var(--bg-opacity))}.bg-red-100{--bg-opacity:1;background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity))}.bg-green-500{--bg-opacity:1;background-color:#0e9f6e;background-color:rgba(14,159,110,var(--bg-opacity))}.bg-blue-50{--bg-opacity:1;background-color:#ebf5ff;background-color:rgba(235,245,255,var(--bg-opacity))}.bg-blue-600{--bg-opacity:1;background-color:#1c64f2;background-color:rgba(28,100,242,var(--bg-opacity))}.hover\:bg-gray-100:hover{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.hover\:bg-green-600:hover{--bg-opacity:1;background-color:#057a55;background-color:rgba(5,122,85,var(--bg-opacity))}.focus\:bg-gray-100:focus{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.focus\:bg-gray-600:focus{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.active\:bg-gray-50:active{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.border-transparent{border-color:transparent}.border-black{--border-opacity:1;border-color:#000;border-color:rgba(0,0,0,var(--border-opacity))}.border-gray-100{--border-opacity:1;border-color:#f4f5f7;border-color:rgba(244,245,247,var(--border-opacity))}.border-gray-200{--border-opacity:1;border-color:#e5e7eb;border-color:rgba(229,231,235,var(--border-opacity))}.border-gray-300{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.border-gray-800{--border-opacity:1;border-color:#252f3f;border-color:rgba(37,47,63,var(--border-opacity))}.border-green-500{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.border-blue-500{--border-opacity:1;border-color:#3f83f8;border-color:rgba(63,131,248,var(--border-opacity))}.border-blue-600{--border-opacity:1;border-color:#1c64f2;border-color:rgba(28,100,242,var(--border-opacity))}.hover\:border-gray-300:hover{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.focus\:border-gray-400:focus{--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.focus\:border-blue-300:focus{--border-opacity:1;border-color:#a4cafe;border-color:rgba(164,202,254,var(--border-opacity))}.rounded-sm{border-radius:.125rem}.rounded{border-radius:.25rem}.rounded-md{border-radius:.375rem}.rounded-lg{border-radius:.5rem}.rounded-full{border-radius:9999px}.border-none{border-style:none}.border-0{border-width:0}.border{border-width:1px}.border-t-2{border-top-width:2px}.border-l-2{border-left-width:2px}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.border-b{border-bottom-width:1px}.cursor-pointer{cursor:pointer}.block{display:block}.inline-block{display:inline-block}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.hidden{display:none}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.items-end{align-items:flex-end}.items-center{align-items:center}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.flex-1{flex:1 1 0%}.flex-shrink-0{flex-shrink:0}.font-sans{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.font-medium{font-weight:500}.font-semibold{font-weight:600}.font-bold{font-weight:700}.focus\:font-semibold:focus,.hover\:font-semibold:hover{font-weight:600}.h-0{height:0}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-12{height:3rem}.h-16{height:4rem}.h-32{height:8rem}.h-screen{height:100vh}.text-xs{font-size:.75rem}.text-sm{font-size:.875rem}.text-lg{font-size:1.125rem}.text-xl{font-size:1.25rem}.text-2xl{font-size:1.5rem}.text-3xl{font-size:1.875rem}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.leading-tight{line-height:1.25}.m-auto{margin:auto}.mx-2{margin-left:.5rem;margin-right:.5rem}.my-4{margin-top:1rem;margin-bottom:1rem}.my-10{margin-top:2.5rem;margin-bottom:2.5rem}.mx-auto{margin-left:auto;margin-right:auto}.-my-2{margin-top:-.5rem;margin-bottom:-.5rem}.mt-0{margin-top:0}.mb-0{margin-bottom:0}.mt-1{margin-top:.25rem}.mr-1{margin-right:.25rem}.ml-1{margin-left:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.mb-2{margin-bottom:.5rem}.ml-2{margin-left:.5rem}.mt-3{margin-top:.75rem}.mr-3{margin-right:.75rem}.mb-3{margin-bottom:.75rem}.ml-3{margin-left:.75rem}.mt-4{margin-top:1rem}.mr-4{margin-right:1rem}.mb-4{margin-bottom:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mb-6{margin-bottom:1.5rem}.mt-8{margin-top:2rem}.mt-10{margin-top:2.5rem}.mb-10{margin-bottom:2.5rem}.-mr-1{margin-right:-.25rem}.-ml-1{margin-left:-.25rem}.-mr-14{margin-right:-3.5rem}.-mt-px{margin-top:-1px}.max-w-xs{max-width:20rem}.max-w-xl{max-width:36rem}.max-w-2xl{max-width:42rem}.min-h-screen{min-height:100vh}.min-w-full{min-width:100%}.object-cover{-o-object-fit:cover;object-fit:cover}.opacity-0{opacity:0}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.opacity-100{opacity:1}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-hidden{overflow-y:hidden}.overflow-y-scroll{overflow-y:scroll}.p-1{padding:.25rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-6{padding:1.5rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.px-2{padding-left:.5rem;padding-right:.5rem}.py-3{padding-top:.75rem;padding-bottom:.75rem}.px-3{padding-left:.75rem;padding-right:.75rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-4{padding-left:1rem;padding-right:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.pr-1{padding-right:.25rem}.pl-1{padding-left:.25rem}.pt-4{padding-top:1rem}.pr-4{padding-right:1rem}.pb-4{padding-bottom:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pb-20{padding-bottom:5rem}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{right:0;left:0}.inset-0,.inset-y-0{top:0;bottom:0}.inset-x-0{right:0;left:0}.top-0{top:0}.right-0{right:0}.bottom-0{bottom:0}.left-0{left:0}.shadow-xs{box-shadow:0 0 0 1px rgba(0,0,0,.05)}.shadow-sm{box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.shadow{box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px 0 rgba(0,0,0,.06)}.shadow-lg{box-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -2px rgba(0,0,0,.05)}.shadow-xl{box-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 10px 10px -5px rgba(0,0,0,.04)}.focus\:shadow-outline:focus{box-shadow:0 0 0 3px rgba(118,169,250,.45)}.focus\:shadow-outline-blue:focus{box-shadow:0 0 0 3px rgba(164,202,254,.45)}.fill-current{fill:currentColor}.table-auto{table-layout:auto}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-white{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.text-black{--text-opacity:1;color:#000;color:rgba(0,0,0,var(--text-opacity))}.text-gray-300{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.text-gray-400{--text-opacity:1;color:#9fa6b2;color:rgba(159,166,178,var(--text-opacity))}.text-gray-500{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.text-gray-600{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.text-gray-700{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.text-gray-800{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.text-gray-900{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.text-red-400{--text-opacity:1;color:#f98080;color:rgba(249,128,128,var(--text-opacity))}.text-red-600{--text-opacity:1;color:#e02424;color:rgba(224,36,36,var(--text-opacity))}.text-blue-500{--text-opacity:1;color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}.text-blue-600{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-gray-300:hover{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.hover\:text-gray-500:hover{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.hover\:text-gray-600:hover{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.hover\:text-gray-700:hover{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.hover\:text-gray-800:hover{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.hover\:text-gray-900:hover{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.hover\:text-blue-600:hover{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-indigo-900:hover{--text-opacity:1;color:#362f78;color:rgba(54,47,120,var(--text-opacity))}.focus\:text-gray-500:focus{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.focus\:text-gray-600:focus{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.focus\:text-gray-700:focus{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.focus\:text-gray-900:focus{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.active\:text-gray-800:active{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.uppercase{text-transform:uppercase}.focus\:underline:focus{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tracking-wider{letter-spacing:.05em}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.whitespace-no-wrap{white-space:nowrap}.break-words{overflow-wrap:break-word}.break-all{word-break:break-all}.w-0{width:0}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-8{width:2rem}.w-12{width:3rem}.w-14{width:3.5rem}.w-48{width:12rem}.w-56{width:14rem}.w-64{width:16rem}.w-auto{width:auto}.w-1\/2{width:50%}.w-full{width:100%}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.gap-4{grid-gap:1rem;gap:1rem}.gap-6{grid-gap:1.5rem;gap:1.5rem}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.col-span-1{grid-column:span 1/span 1}.col-span-2{grid-column:span 2/span 2}.col-span-4{grid-column:span 4/span 4}.col-span-6{grid-column:span 6/span 6}.col-span-7{grid-column:span 7/span 7}.col-span-12{grid-column:span 12/span 12}.col-start-2{grid-column-start:2}.col-start-3{grid-column-start:3}.col-start-5{grid-column-start:5}.transform{--transform-translate-x:0;--transform-translate-y:0;--transform-rotate:0;--transform-skew-x:0;--transform-skew-y:0;--transform-scale-x:1;--transform-scale-y:1;transform:translateX(var(--transform-translate-x)) translateY(var(--transform-translate-y)) rotate(var(--transform-rotate)) skewX(var(--transform-skew-x)) skewY(var(--transform-skew-y)) scaleX(var(--transform-scale-x)) scaleY(var(--transform-scale-y))}.origin-top-right{transform-origin:top right}.scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.scale-100{--transform-scale-x:1;--transform-scale-y:1}.translate-x-0{--transform-translate-x:0}.-translate-x-full{--transform-translate-x:-100%}.translate-y-0{--transform-translate-y:0}.translate-y-4{--transform-translate-y:1rem}.transition-all{transition-property:all}.transition{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform}.transition-opacity{transition-property:opacity}.ease-linear{transition-timing-function:linear}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-75{transition-duration:75ms}.duration-100{transition-duration:.1s}.duration-150{transition-duration:.15s}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}@-webkit-keyframes spin{to{transform:rotate(1turn)}}@keyframes spin{to{transform:rotate(1turn)}}@-webkit-keyframes ping{75%,to{transform:scale(2);opacity:0}}@keyframes ping{75%,to{transform:scale(2);opacity:0}}@-webkit-keyframes pulse{50%{opacity:.5}}@keyframes pulse{50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}.animate-spin{-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}@media (min-width:640px){.sm\:container{width:100%;max-width:640px}@media (min-width:768px){.sm\:container{max-width:768px}}@media (min-width:1024px){.sm\:container{max-width:1024px}}@media (min-width:1280px){.sm\:container{max-width:1280px}}.sm\:rounded-lg{border-radius:.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:items-start{align-items:flex-start}.sm\:items-center{align-items:center}.sm\:justify-center{justify-content:center}.sm\:justify-between{justify-content:space-between}.sm\:flex-shrink-0{flex-shrink:0}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:mx-0{margin-left:0;margin-right:0}.sm\:my-8{margin-top:2rem;margin-bottom:2rem}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:mt-0{margin-top:0}.sm\:ml-3{margin-left:.75rem}.sm\:mt-4{margin-top:1rem}.sm\:ml-4{margin-left:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:ml-6{margin-left:1.5rem}.sm\:max-w-sm{max-width:24rem}.sm\:max-w-lg{max-width:32rem}.sm\:p-0{padding:0}.sm\:p-6{padding:1.5rem}.sm\:px-0{padding-left:0;padding-right:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:inset-0{top:0;right:0;bottom:0;left:0}.sm\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:gap-4{grid-gap:1rem;gap:1rem}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:col-span-2{grid-column:span 2/span 2}.sm\:col-span-3{grid-column:span 3/span 3}.sm\:col-span-4{grid-column:span 4/span 4}.sm\:col-span-6{grid-column:span 6/span 6}.sm\:scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.sm\:scale-100{--transform-scale-x:1;--transform-scale-y:1}.sm\:translate-y-0{--transform-translate-y:0}}@media (min-width:768px){.md\:container{width:100%}@media (min-width:640px){.md\:container{max-width:640px}}@media (min-width:768px){.md\:container{max-width:768px}}@media (min-width:1024px){.md\:container{max-width:1024px}}@media (min-width:1280px){.md\:container{max-width:1280px}}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:justify-between{justify-content:space-between}.md\:flex-shrink-0{flex-shrink:0}.md\:text-sm{font-size:.875rem}.md\:text-3xl{font-size:1.875rem}.md\:mt-0{margin-top:0}.md\:mr-2{margin-right:.5rem}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:mt-10{margin-top:2.5rem}.md\:-mr-1{margin-right:-.25rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:gap-6{grid-gap:1.5rem;gap:1.5rem}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:col-span-1{grid-column:span 1/span 1}.md\:col-span-2{grid-column:span 2/span 2}.md\:col-span-3{grid-column:span 3/span 3}.md\:col-span-4{grid-column:span 4/span 4}.md\:col-span-6{grid-column:span 6/span 6}.md\:col-start-2{grid-column-start:2}.md\:col-start-4{grid-column-start:4}}@media (min-width:1024px){.lg\:container{width:100%}@media (min-width:640px){.lg\:container{max-width:640px}}@media (min-width:768px){.lg\:container{max-width:768px}}@media (min-width:1024px){.lg\:container{max-width:1024px}}@media (min-width:1280px){.lg\:container{max-width:1280px}}.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:items-center{align-items:center}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:gap-4{grid-gap:1rem;gap:1rem}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:col-span-3{grid-column:span 3/span 3}.lg\:col-span-6{grid-column:span 6/span 6}.lg\:col-start-4{grid-column-start:4}}@media (min-width:1280px){.xl\:container{width:100%}@media (min-width:640px){.xl\:container{max-width:640px}}@media (min-width:768px){.xl\:container{max-width:768px}}@media (min-width:1024px){.xl\:container{max-width:1024px}}@media (min-width:1280px){.xl\:container{max-width:1280px}}} \ No newline at end of file +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}[hidden],template{display:none}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{box-sizing:border-box;border:0 solid #d2d6dc}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#a0aec0}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#a0aec0}input::placeholder,textarea::placeholder{color:#a0aec0}[role=button],button{cursor:pointer}table{border-collapse:collapse}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}button,input,optgroup,select,textarea{padding:0;line-height:inherit;color:inherit}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}.form-input{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-input::-moz-placeholder{color:#9fa6b2;opacity:1}.form-input:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-input::placeholder{color:#9fa6b2;opacity:1}.form-input:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-textarea::-moz-placeholder{color:#9fa6b2;opacity:1}.form-textarea:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-textarea::placeholder{color:#9fa6b2;opacity:1}.form-textarea:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-multiselect{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-multiselect:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-select{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none'%3E%3Cpath d='M7 7l3-3 3 3m0 6l-3 3-3-3' stroke='%239fa6b2' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;background-repeat:no-repeat;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem 2.5rem .5rem .75rem;font-size:1rem;line-height:1.5;background-position:right .5rem center;background-size:1.5em 1.5em}.form-select::-ms-expand{color:#9fa6b2;border:none}@media not print{.form-select::-ms-expand{display:none}}@media print and (-ms-high-contrast:active),print and (-ms-high-contrast:none){.form-select{padding-right:.75rem}}.form-select:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.707 7.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4a1 1 0 00-1.414-1.414L7 8.586 5.707 7.293z'/%3E%3C/svg%3E");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-checkbox::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-checkbox{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.25rem}.form-checkbox:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked:focus,.form-radio:checked{border-color:transparent}.form-radio:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='8' cy='8' r='3'/%3E%3C/svg%3E");background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-radio::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-radio{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;border-radius:100%;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px}.form-radio:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-radio:checked:focus{border-color:transparent}.button{border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{opacity:.5;cursor:not-allowed}.button-primary{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--bg-opacity:1;background-color:#f05252;background-color:rgba(240,82,82,var(--bg-opacity));--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-danger:hover{--bg-opacity:1;background-color:#e02424;background-color:rgba(224,36,36,var(--bg-opacity))}.button-secondary{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.button-secondary:hover{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.button-link:hover{font-weight:600;text-decoration:underline}.button-link:focus{outline:2px solid transparent;outline-offset:2px;text-decoration:underline}.validation{border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));padding:.25rem .75rem}.validation-fail{border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.validation-fail,.validation-pass{--border-opacity:1;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));font-size:.875rem}.validation-pass{border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.input{align-items:center;border-width:1px;--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity));border-radius:.25rem;margin-top:.5rem;padding:.5rem 1rem;font-size:.875rem}.input:focus{outline:2px solid transparent;outline-offset:2px;--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.input-label{font-size:.875rem;--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.input-slim{padding-top:.5rem;padding-bottom:.5rem}.alert{padding:.75rem 1rem;font-size:.875rem;border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.alert-success{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.alert-failure{--border-opacity:1;border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.badge{display:inline-flex;align-items:center;padding:.125rem .625rem;border-radius:9999px;font-size:.75rem;font-weight:500;line-height:1rem}.badge-light{background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.badge-light,.badge-primary{--bg-opacity:1;--text-opacity:1}.badge-primary{background-color:#c3ddfd;background-color:rgba(195,221,253,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}.badge-danger{background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity));color:#f05252;color:rgba(240,82,82,var(--text-opacity))}.badge-danger,.badge-success{--bg-opacity:1;--text-opacity:1}.badge-success{background-color:#def7ec;background-color:rgba(222,247,236,var(--bg-opacity));color:#0e9f6e;color:rgba(14,159,110,var(--text-opacity))}.badge-secondary{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity));--text-opacity:1;color:#e5e7eb;color:rgba(229,231,235,var(--text-opacity))}.badge-warning{background-color:#feecdc;background-color:rgba(254,236,220,var(--bg-opacity));color:#ff5a1f;color:rgba(255,90,31,var(--text-opacity))}.badge-info,.badge-warning{--bg-opacity:1;--text-opacity:1}.badge-info{background-color:#e1effe;background-color:rgba(225,239,254,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}@media (min-width:640px){.dataTables_length{margin-top:1.25rem!important;margin-bottom:1.25rem!important}}@media (min-width:1024px){.dataTables_length{margin-top:1rem!important;margin-bottom:1rem!important}}.dataTables_length select{--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;font-size:.875rem!important;margin-left:.5rem!important;margin-right:.5rem!important;padding:.5rem!important}.dataTables_filter{margin-bottom:1rem}.dataTables_filter input{-webkit-appearance:none!important;-moz-appearance:none!important;appearance:none!important;background-color:#fff!important;border-radius:.375rem!important;font-size:1rem!important;line-height:1.5!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;padding:.5rem 1rem!important;font-size:.875rem!important}@media (min-width:1024px){.dataTables_filter{margin-top:-3rem!important}}.dataTables_paginate{padding-bottom:1.5rem!important;padding-top:.5rem!important}.dataTables_paginate .paginate_button{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-duration:.15s!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;font-size:.875rem!important;line-height:1rem!important;font-weight:500!important;border-radius:.25rem!important;--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;margin-right:.25rem!important;padding:.5rem 1rem!important;cursor:pointer!important}.dataTables_paginate .current{--bg-opacity:1!important;background-color:#1c64f2!important;background-color:rgba(28,100,242,var(--bg-opacity))!important;--text-opacity:1!important;color:#fff!important;color:rgba(255,255,255,var(--text-opacity))!important}.dataTables_info{font-size:.875rem!important}.dataTables_empty{padding-top:1rem!important;padding-bottom:1rem!important}.pagination{display:flex!important;align-items:center!important}.pagination .page-link{margin-top:-1px!important;border-top-width:2px!important;border-color:transparent!important;padding-top:1rem!important;padding-left:1rem!important;padding-right:1rem!important;display:inline-flex!important;align-items:center!important;font-size:.875rem!important;line-height:1.25rem!important;font-weight:500!important;--text-opacity:1!important;color:#6b7280!important;color:rgba(107,114,128,var(--text-opacity))!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;transition-duration:.15s!important;cursor:pointer!important}.pagination .page-link:hover{--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important}.pagination .page-link:focus{outline:2px solid transparent;outline-offset:2px;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.pagination .active>span{--text-opacity:1!important;color:#1c64f2!important;color:rgba(28,100,242,var(--text-opacity))!important;--border-opacity:1!important;border-color:#1c64f2!important;border-color:rgba(28,100,242,var(--border-opacity))!important}.space-x-1>:not(template)~:not(template){--space-x-reverse:0;margin-right:calc(0.25rem*var(--space-x-reverse));margin-left:calc(0.25rem*(1 - var(--space-x-reverse)))}.space-x-2>:not(template)~:not(template){--space-x-reverse:0;margin-right:calc(0.5rem*var(--space-x-reverse));margin-left:calc(0.5rem*(1 - var(--space-x-reverse)))}.bg-white{--bg-opacity:1;background-color:#fff;background-color:rgba(255,255,255,var(--bg-opacity))}.bg-gray-50{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.bg-gray-100{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.bg-gray-200{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.bg-gray-500{--bg-opacity:1;background-color:#6b7280;background-color:rgba(107,114,128,var(--bg-opacity))}.bg-gray-600{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.bg-gray-800{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity))}.bg-gray-900{--bg-opacity:1;background-color:#161e2e;background-color:rgba(22,30,46,var(--bg-opacity))}.bg-red-100{--bg-opacity:1;background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity))}.bg-green-500{--bg-opacity:1;background-color:#0e9f6e;background-color:rgba(14,159,110,var(--bg-opacity))}.bg-blue-50{--bg-opacity:1;background-color:#ebf5ff;background-color:rgba(235,245,255,var(--bg-opacity))}.bg-blue-600{--bg-opacity:1;background-color:#1c64f2;background-color:rgba(28,100,242,var(--bg-opacity))}.hover\:bg-gray-100:hover{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.hover\:bg-green-600:hover{--bg-opacity:1;background-color:#057a55;background-color:rgba(5,122,85,var(--bg-opacity))}.focus\:bg-gray-100:focus{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.focus\:bg-gray-600:focus{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.active\:bg-gray-50:active{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.border-transparent{border-color:transparent}.border-black{--border-opacity:1;border-color:#000;border-color:rgba(0,0,0,var(--border-opacity))}.border-gray-100{--border-opacity:1;border-color:#f4f5f7;border-color:rgba(244,245,247,var(--border-opacity))}.border-gray-200{--border-opacity:1;border-color:#e5e7eb;border-color:rgba(229,231,235,var(--border-opacity))}.border-gray-300{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.border-gray-800{--border-opacity:1;border-color:#252f3f;border-color:rgba(37,47,63,var(--border-opacity))}.border-red-400{--border-opacity:1;border-color:#f98080;border-color:rgba(249,128,128,var(--border-opacity))}.border-green-500{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.border-blue-500{--border-opacity:1;border-color:#3f83f8;border-color:rgba(63,131,248,var(--border-opacity))}.border-blue-600{--border-opacity:1;border-color:#1c64f2;border-color:rgba(28,100,242,var(--border-opacity))}.hover\:border-gray-300:hover{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.focus\:border-gray-400:focus{--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.focus\:border-blue-300:focus{--border-opacity:1;border-color:#a4cafe;border-color:rgba(164,202,254,var(--border-opacity))}.rounded-sm{border-radius:.125rem}.rounded{border-radius:.25rem}.rounded-md{border-radius:.375rem}.rounded-lg{border-radius:.5rem}.rounded-full{border-radius:9999px}.border-none{border-style:none}.border-0{border-width:0}.border{border-width:1px}.border-t-2{border-top-width:2px}.border-l-2{border-left-width:2px}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.border-b{border-bottom-width:1px}.cursor-pointer{cursor:pointer}.block{display:block}.inline-block{display:inline-block}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.hidden{display:none}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.items-end{align-items:flex-end}.items-center{align-items:center}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.flex-1{flex:1 1 0%}.flex-shrink-0{flex-shrink:0}.font-sans{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.font-medium{font-weight:500}.font-semibold{font-weight:600}.font-bold{font-weight:700}.focus\:font-semibold:focus,.hover\:font-semibold:hover{font-weight:600}.h-0{height:0}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-12{height:3rem}.h-16{height:4rem}.h-32{height:8rem}.h-screen{height:100vh}.text-xs{font-size:.75rem}.text-sm{font-size:.875rem}.text-lg{font-size:1.125rem}.text-xl{font-size:1.25rem}.text-2xl{font-size:1.5rem}.text-3xl{font-size:1.875rem}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.leading-tight{line-height:1.25}.m-auto{margin:auto}.mx-2{margin-left:.5rem;margin-right:.5rem}.my-4{margin-top:1rem;margin-bottom:1rem}.my-10{margin-top:2.5rem;margin-bottom:2.5rem}.mx-auto{margin-left:auto;margin-right:auto}.-my-2{margin-top:-.5rem;margin-bottom:-.5rem}.mt-0{margin-top:0}.mb-0{margin-bottom:0}.ml-0{margin-left:0}.mt-1{margin-top:.25rem}.mr-1{margin-right:.25rem}.ml-1{margin-left:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.mb-2{margin-bottom:.5rem}.ml-2{margin-left:.5rem}.mt-3{margin-top:.75rem}.mr-3{margin-right:.75rem}.mb-3{margin-bottom:.75rem}.ml-3{margin-left:.75rem}.mt-4{margin-top:1rem}.mr-4{margin-right:1rem}.mb-4{margin-bottom:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mb-6{margin-bottom:1.5rem}.mt-8{margin-top:2rem}.mt-10{margin-top:2.5rem}.mb-10{margin-bottom:2.5rem}.-mr-1{margin-right:-.25rem}.-ml-1{margin-left:-.25rem}.-mr-14{margin-right:-3.5rem}.-mt-px{margin-top:-1px}.max-w-xs{max-width:20rem}.max-w-xl{max-width:36rem}.max-w-2xl{max-width:42rem}.min-h-screen{min-height:100vh}.min-w-full{min-width:100%}.object-cover{-o-object-fit:cover;object-fit:cover}.opacity-0{opacity:0}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.opacity-100{opacity:1}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-hidden{overflow-y:hidden}.overflow-y-scroll{overflow-y:scroll}.p-1{padding:.25rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-6{padding:1.5rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.px-2{padding-left:.5rem;padding-right:.5rem}.py-3{padding-top:.75rem;padding-bottom:.75rem}.px-3{padding-left:.75rem;padding-right:.75rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-4{padding-left:1rem;padding-right:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.pl-0{padding-left:0}.pr-1{padding-right:.25rem}.pl-1{padding-left:.25rem}.pt-4{padding-top:1rem}.pr-4{padding-right:1rem}.pb-4{padding-bottom:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pb-20{padding-bottom:5rem}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{right:0;left:0}.inset-0,.inset-y-0{top:0;bottom:0}.inset-x-0{right:0;left:0}.top-0{top:0}.right-0{right:0}.bottom-0{bottom:0}.left-0{left:0}.shadow-xs{box-shadow:0 0 0 1px rgba(0,0,0,.05)}.shadow-sm{box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.shadow{box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px 0 rgba(0,0,0,.06)}.shadow-lg{box-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -2px rgba(0,0,0,.05)}.shadow-xl{box-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 10px 10px -5px rgba(0,0,0,.04)}.focus\:shadow-outline:focus{box-shadow:0 0 0 3px rgba(118,169,250,.45)}.focus\:shadow-outline-blue:focus{box-shadow:0 0 0 3px rgba(164,202,254,.45)}.fill-current{fill:currentColor}.table-auto{table-layout:auto}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-white{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.text-black{--text-opacity:1;color:#000;color:rgba(0,0,0,var(--text-opacity))}.text-gray-300{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.text-gray-400{--text-opacity:1;color:#9fa6b2;color:rgba(159,166,178,var(--text-opacity))}.text-gray-500{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.text-gray-600{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.text-gray-700{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.text-gray-800{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.text-gray-900{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.text-red-400{--text-opacity:1;color:#f98080;color:rgba(249,128,128,var(--text-opacity))}.text-red-600{--text-opacity:1;color:#e02424;color:rgba(224,36,36,var(--text-opacity))}.text-blue-500{--text-opacity:1;color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}.text-blue-600{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-gray-300:hover{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.hover\:text-gray-500:hover{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.hover\:text-gray-600:hover{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.hover\:text-gray-700:hover{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.hover\:text-gray-800:hover{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.hover\:text-gray-900:hover{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.hover\:text-blue-600:hover{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-indigo-900:hover{--text-opacity:1;color:#362f78;color:rgba(54,47,120,var(--text-opacity))}.focus\:text-gray-500:focus{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.focus\:text-gray-600:focus{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.focus\:text-gray-700:focus{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.focus\:text-gray-900:focus{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.active\:text-gray-800:active{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.uppercase{text-transform:uppercase}.focus\:underline:focus,.underline{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tracking-wider{letter-spacing:.05em}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.whitespace-no-wrap{white-space:nowrap}.break-words{overflow-wrap:break-word}.break-all{word-break:break-all}.w-0{width:0}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-8{width:2rem}.w-12{width:3rem}.w-14{width:3.5rem}.w-48{width:12rem}.w-56{width:14rem}.w-64{width:16rem}.w-auto{width:auto}.w-1\/2{width:50%}.w-full{width:100%}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.gap-4{grid-gap:1rem;gap:1rem}.gap-6{grid-gap:1.5rem;gap:1.5rem}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.col-span-1{grid-column:span 1/span 1}.col-span-2{grid-column:span 2/span 2}.col-span-4{grid-column:span 4/span 4}.col-span-6{grid-column:span 6/span 6}.col-span-7{grid-column:span 7/span 7}.col-span-12{grid-column:span 12/span 12}.col-start-2{grid-column-start:2}.col-start-3{grid-column-start:3}.col-start-5{grid-column-start:5}.transform{--transform-translate-x:0;--transform-translate-y:0;--transform-rotate:0;--transform-skew-x:0;--transform-skew-y:0;--transform-scale-x:1;--transform-scale-y:1;transform:translateX(var(--transform-translate-x)) translateY(var(--transform-translate-y)) rotate(var(--transform-rotate)) skewX(var(--transform-skew-x)) skewY(var(--transform-skew-y)) scaleX(var(--transform-scale-x)) scaleY(var(--transform-scale-y))}.origin-top-right{transform-origin:top right}.scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.scale-100{--transform-scale-x:1;--transform-scale-y:1}.translate-x-0{--transform-translate-x:0}.-translate-x-full{--transform-translate-x:-100%}.translate-y-0{--transform-translate-y:0}.translate-y-4{--transform-translate-y:1rem}.transition-all{transition-property:all}.transition{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform}.transition-opacity{transition-property:opacity}.ease-linear{transition-timing-function:linear}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-75{transition-duration:75ms}.duration-100{transition-duration:.1s}.duration-150{transition-duration:.15s}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}@-webkit-keyframes spin{to{transform:rotate(1turn)}}@keyframes spin{to{transform:rotate(1turn)}}@-webkit-keyframes ping{75%,to{transform:scale(2);opacity:0}}@keyframes ping{75%,to{transform:scale(2);opacity:0}}@-webkit-keyframes pulse{50%{opacity:.5}}@keyframes pulse{50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}.animate-spin{-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}@media (min-width:640px){.sm\:container{width:100%;max-width:640px}@media (min-width:768px){.sm\:container{max-width:768px}}@media (min-width:1024px){.sm\:container{max-width:1024px}}@media (min-width:1280px){.sm\:container{max-width:1280px}}.sm\:rounded-lg{border-radius:.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:items-start{align-items:flex-start}.sm\:items-center{align-items:center}.sm\:justify-center{justify-content:center}.sm\:justify-between{justify-content:space-between}.sm\:flex-shrink-0{flex-shrink:0}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:mx-0{margin-left:0;margin-right:0}.sm\:my-8{margin-top:2rem;margin-bottom:2rem}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:mt-0{margin-top:0}.sm\:ml-3{margin-left:.75rem}.sm\:mt-4{margin-top:1rem}.sm\:ml-4{margin-left:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:ml-6{margin-left:1.5rem}.sm\:max-w-sm{max-width:24rem}.sm\:max-w-lg{max-width:32rem}.sm\:p-0{padding:0}.sm\:p-6{padding:1.5rem}.sm\:px-0{padding-left:0;padding-right:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:inset-0{top:0;right:0;bottom:0;left:0}.sm\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:gap-4{grid-gap:1rem;gap:1rem}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:col-span-2{grid-column:span 2/span 2}.sm\:col-span-3{grid-column:span 3/span 3}.sm\:col-span-4{grid-column:span 4/span 4}.sm\:col-span-6{grid-column:span 6/span 6}.sm\:scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.sm\:scale-100{--transform-scale-x:1;--transform-scale-y:1}.sm\:translate-y-0{--transform-translate-y:0}}@media (min-width:768px){.md\:container{width:100%}@media (min-width:640px){.md\:container{max-width:640px}}@media (min-width:768px){.md\:container{max-width:768px}}@media (min-width:1024px){.md\:container{max-width:1024px}}@media (min-width:1280px){.md\:container{max-width:1280px}}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:justify-between{justify-content:space-between}.md\:flex-shrink-0{flex-shrink:0}.md\:text-sm{font-size:.875rem}.md\:text-3xl{font-size:1.875rem}.md\:mt-0{margin-top:0}.md\:mr-2{margin-right:.5rem}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:mt-10{margin-top:2.5rem}.md\:-mr-1{margin-right:-.25rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:gap-6{grid-gap:1.5rem;gap:1.5rem}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:col-span-1{grid-column:span 1/span 1}.md\:col-span-2{grid-column:span 2/span 2}.md\:col-span-3{grid-column:span 3/span 3}.md\:col-span-4{grid-column:span 4/span 4}.md\:col-span-6{grid-column:span 6/span 6}.md\:col-start-2{grid-column-start:2}.md\:col-start-4{grid-column-start:4}}@media (min-width:1024px){.lg\:container{width:100%}@media (min-width:640px){.lg\:container{max-width:640px}}@media (min-width:768px){.lg\:container{max-width:768px}}@media (min-width:1024px){.lg\:container{max-width:1024px}}@media (min-width:1280px){.lg\:container{max-width:1280px}}.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:items-center{align-items:center}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:gap-4{grid-gap:1rem;gap:1rem}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:col-span-3{grid-column:span 3/span 3}.lg\:col-span-6{grid-column:span 6/span 6}.lg\:col-start-4{grid-column-start:4}}@media (min-width:1280px){.xl\:container{width:100%}@media (min-width:640px){.xl\:container{max-width:640px}}@media (min-width:768px){.xl\:container{max-width:768px}}@media (min-width:1024px){.xl\:container{max-width:1024px}}@media (min-width:1280px){.xl\:container{max-width:1280px}}} \ No newline at end of file diff --git a/public/mix-manifest.json b/public/mix-manifest.json index edbba5a7e68b..dd1c8956527d 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,6 +1,6 @@ { "/js/app.js": "/js/app.js?id=a33a5a58bfc6e2174841", - "/css/app.css": "/css/app.css?id=e55ed33a5056c9779c03", + "/css/app.css": "/css/app.css?id=2fee89354bd20f89bf73", "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4", "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1", "/js/clients/payment_methods/authorize-authorize-card.js": "/js/clients/payment_methods/authorize-authorize-card.js?id=cddcd46c630c71737bda", diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index c5d0a8e792e6..4300dcbd8a2c 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3305,4 +3305,10 @@ return [ 'by_clicking_next_you_accept_terms' => 'By clicking "Next step" you accept terms.', 'not_specified' => 'Not specified', + + 'before_proceeding_with_payment_warning' => 'Before proceeding with payment, you have to fill following fields', + 'after_completing_go_back_to_previous_page' => 'After completing, go back to previous page.', + + 'billing_country' => 'Billing Country', + 'shipping_country' => 'Shipping Country', ]; diff --git a/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php b/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php index 72972a81de63..6844feedc41e 100644 --- a/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php +++ b/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php @@ -10,7 +10,7 @@
- + @error('shipping_address1')
{{ $message }} @@ -19,7 +19,7 @@
- + @error('shipping_address2')
{{ $message }} @@ -28,7 +28,7 @@
- + @error('shipping_city')
{{ $message }} @@ -37,7 +37,7 @@
- + @error('shipping_state')
{{ $message }} @@ -46,7 +46,7 @@
- + @error('shipping_postal_code')
{{ $message }} @@ -55,7 +55,7 @@
- @foreach(App\Utils\TranslationHelper::getCountries() as $country)