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 7130c1a9a1ab..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; /* @@ -332,16 +328,16 @@ class CheckData extends Command $total_amount = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.amount'); $total_refund = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.refunded'); - $total_invoice_payments += ($total_amount - $total_refund); + $total_invoice_payments += ($total_amount - $total_refund); } - foreach($client->payments as $payment) - { - $credit_total_applied += $payment->paymentables->where('paymentable_type', App\Models\Credit::class)->sum(DB::raw('amount')); + foreach ($client->payments as $payment) { + $credit_total_applied += $payment->paymentables->where('paymentable_type', App\Models\Credit::class)->sum(DB::raw('amount')); } - if($credit_total_applied < 0) - $total_invoice_payments += $credit_total_applied; //todo this is contentious + if ($credit_total_applied < 0) { + $total_invoice_payments += $credit_total_applied; + } //todo this is contentious info("total invoice payments = {$total_invoice_payments} with client paid to date of of {$client->paid_to_date}"); diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php index f500accc6db4..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; @@ -100,7 +89,6 @@ class CreateSingleAccount extends Command $this->warmCache(); $this->createSmallAccount(); - } private function createSmallAccount() @@ -205,7 +193,6 @@ class CreateSingleAccount extends Command $this->info('creating credit for client #'.$client->id); $this->createCredit($client); - } $this->createGateways($company, $user); @@ -299,7 +286,6 @@ class CreateSingleAccount extends Command private function createInvoice($client) { - $faker = Factory::create(); $invoice = InvoiceFactory::create($client->company->id, $client->user->id); //stub the company and user_id @@ -369,7 +355,6 @@ class CreateSingleAccount extends Command private function createQuote($client) { - $faker = Factory::create(); $quote = Quote::factory()->create(['user_id' => $client->user->id, 'company_id' => $client->company->id, 'client_id' => $client->id]); @@ -414,21 +399,21 @@ class CreateSingleAccount extends Command { $line_items = []; - $item = InvoiceItemFactory::create(); - $item->quantity = 1; - $item->cost = 1000; + $item = InvoiceItemFactory::create(); + $item->quantity = 1; + $item->cost = 1000; - $product = Product::all()->random(); + $product = Product::all()->random(); - $item->cost = (float) $product->cost; - $item->product_key = $product->product_key; - $item->notes = $product->notes; - $item->custom_value1 = $product->custom_value1; - $item->custom_value2 = $product->custom_value2; - $item->custom_value3 = $product->custom_value3; - $item->custom_value4 = $product->custom_value4; + $item->cost = (float) $product->cost; + $item->product_key = $product->product_key; + $item->notes = $product->notes; + $item->custom_value1 = $product->custom_value1; + $item->custom_value2 = $product->custom_value2; + $item->custom_value3 = $product->custom_value3; + $item->custom_value4 = $product->custom_value4; - $line_items[] = $item; + $line_items[] = $item; return $line_items; @@ -505,7 +490,6 @@ class CreateSingleAccount extends Command private function createGateways($company, $user) { - if (config('ninja.testvars.stripe') && ($this->gateway == 'all' || $this->gateway == 'stripe')) { $cg = new CompanyGateway; $cg->company_id = $company->id; diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index 6b1172ebf1df..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; @@ -471,7 +461,6 @@ class CreateTestData extends Command private function createInvoice($client) { - $faker = Factory::create(); $invoice = InvoiceFactory::create($client->company->id, $client->user->id); //stub the company and user_id @@ -522,7 +511,6 @@ class CreateTestData extends Command private function createCredit($client) { - $faker = Factory::create(); $credit = Credit::factory()->create(['user_id' => $client->user->id, 'company_id' => $client->company->id, 'client_id' => $client->id]); @@ -562,7 +550,6 @@ class CreateTestData extends Command private function createQuote($client) { - $faker = Factory::create(); //$quote = QuoteFactory::create($client->company->id, $client->user->id);//stub the company and user_id diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php index 10b89a551b7c..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 { @@ -303,7 +296,7 @@ class DemoMode extends Command 'is_primary' => 1, ]); - ClientContact::factory()->count(rand(1,5))->create([ + ClientContact::factory()->count(rand(1, 5))->create([ 'user_id' => $user->id, 'client_id' => $client->id, 'company_id' => $company->id, @@ -325,7 +318,7 @@ class DemoMode extends Command private function createExpense($client) { - Expense::factory()->count(rand(1,5))->create([ + Expense::factory()->count(rand(1, 5))->create([ 'user_id' => $client->user_id, 'client_id' => $client->id, 'company_id' => $client->company_id, @@ -346,7 +339,7 @@ class DemoMode extends Command 'is_primary' => 1, ]); - VendorContact::factory()->count(rand(1,5))->create([ + VendorContact::factory()->count(rand(1, 5))->create([ 'user_id' => $client->user->id, 'vendor_id' => $vendor->id, 'company_id' => $client->company_id, @@ -376,7 +369,6 @@ class DemoMode extends Command private function createInvoice($client, $assigned_user_id = null) { - $faker = \Faker\Factory::create(); $invoice = InvoiceFactory::create($client->company->id, $client->user->id); //stub the company and user_id @@ -441,7 +433,6 @@ class DemoMode extends Command private function createCredit($client, $assigned_user_id = null) { - $faker = \Faker\Factory::create(); $credit = Credit::factory()->create(['user_id' => $client->user->id, 'company_id' => $client->company->id, 'client_id' => $client->id]); diff --git a/app/Console/Commands/PostUpdate.php b/app/Console/Commands/PostUpdate.php index a10654a3fc88..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; @@ -46,7 +42,6 @@ class PostUpdate extends Command */ public function handle() { - set_time_limit(0); info('running post update'); @@ -67,12 +62,11 @@ 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); echo "Done."; - } } 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/SendRemindersCron.php b/app/Console/Commands/SendRemindersCron.php index 9ad36e5434c6..e3f4ccb89970 100644 --- a/app/Console/Commands/SendRemindersCron.php +++ b/app/Console/Commands/SendRemindersCron.php @@ -65,10 +65,9 @@ class SendRemindersCron extends Command ->whereDate('due_date', now()->subDays(1)->startOfDay()) ->cursor(); - $invoices->each(function ($invoice){ + $invoices->each(function ($invoice) { WebHookHandler::dispatch(Webhook::EVENT_LATE_INVOICE, $invoice, $invoice->company); }); - } private function webHookExpiredQuotes() @@ -78,7 +77,7 @@ class SendRemindersCron extends Command ->whereDate('due_date', now()->subDays(1)->startOfDay()) ->cursor(); - $quotes->each(function ($quote){ + $quotes->each(function ($quote) { WebHookHandler::dispatch(Webhook::EVENT_EXPIRED_QUOTE, $quote, $quote->company); }); } diff --git a/app/Console/Commands/SendTestEmails.php b/app/Console/Commands/SendTestEmails.php index c775dce2f27d..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 @@ -82,7 +79,6 @@ class SendTestEmails extends Command $user = User::whereEmail('user@example.com')->first(); if (! $user) { - $account = Account::factory()->create(); $user = User::factory()->create([ 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/CompanySettings.php b/app/DataMapper/CompanySettings.php index 4efc296a13e5..3d9a8639069d 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -175,13 +175,13 @@ class CompanySettings extends BaseSettings public $email_template_reminder3 = ''; //@implemented public $email_template_reminder_endless = ''; //@implemented public $email_signature = ''; //@implemented - public $enable_email_markup = true; //@TODO - + public $enable_email_markup = true; //@TODO - public $email_subject_custom1 = ''; //@TODO public $email_subject_custom2 = ''; //@TODO public $email_subject_custom3 = ''; //@TODO - public $email_template_custom1 = ''; //@TODO + public $email_template_custom1 = ''; //@TODO public $email_template_custom2 = ''; //@TODO public $email_template_custom3 = ''; //@TODO @@ -195,7 +195,7 @@ class CompanySettings extends BaseSettings public $num_days_reminder3 = 0;//@implmemented public $schedule_reminder1 = ''; // (enum: after_invoice_date, before_due_date, after_due_date) implmemented - public $schedule_reminder2 = ''; // (enum: after_invoice_date, before_due_date, after_due_date) implmemented + public $schedule_reminder2 = ''; // (enum: after_invoice_date, before_due_date, after_due_date) implmemented public $schedule_reminder3 = ''; // (enum: after_invoice_date, before_due_date, after_due_date) implmemented public $reminder_send_time = 32400; //number of seconds from UTC +0 to send reminders @TODO @@ -511,7 +511,7 @@ class CompanySettings extends BaseSettings /** * Provides class defaults on init. - * + * * @return stdClass */ public static function defaults(): stdClass @@ -544,7 +544,7 @@ class CompanySettings extends BaseSettings * set new properties to the object prior to being returned. * * @param $settings - * + * * @return stdClass */ public static function setProperties($settings): stdClass @@ -562,7 +562,7 @@ class CompanySettings extends BaseSettings /** * Stubs the notification defaults - * + * * @return stdClass */ public static function notificationDefaults() :stdClass @@ -575,7 +575,7 @@ class CompanySettings extends BaseSettings /** * Defines entity variables for PDF generation - * + * * @return stdClass The stdClass of PDF variables */ private static function getEntityVariableDefaults() :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 0ab17319ade8..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 { @@ -148,11 +147,9 @@ class EmailTemplateDefaults public static function emailPaymentTemplate() { - $payment_message = '

'.self::transformText('payment_message').'



$view_link

'; return $payment_message; - } public static function emailCreditTemplate() @@ -164,11 +161,9 @@ class EmailTemplateDefaults public static function emailPaymentPartialTemplate() { - $payment_message = '

'.self::transformText('payment_message').'



$view_link

'; return $payment_message; - } public static function emailPaymentPartialSubject() 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/Factory/TaskFactory.php b/app/Factory/TaskFactory.php index e0d43b02e94c..64e47ddefee1 100644 --- a/app/Factory/TaskFactory.php +++ b/app/Factory/TaskFactory.php @@ -24,9 +24,9 @@ class TaskFactory $task->company_id = $company_id; $task->user_id = $user_id; $task->time_log = '[]'; - $task->is_running = false; - $task->is_deleted = false; - $task->duration = 0; + $task->is_running = false; + $task->is_deleted = false; + $task->duration = 0; return $task; } 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 388d941e8446..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. @@ -51,13 +48,11 @@ class SystemLogFilters extends QueryFilters */ public function filter(string $filter = '') : Builder { - if (strlen($filter) == 0) { return $this->builder; } return $this->builder; - } /** 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 ee66fddc67cc..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 { @@ -231,7 +228,7 @@ class InvoiceItemSum } //$amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total)); - $amount = ( $this->sub_total > 0 ) ? $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total)) : 0; + $amount = ($this->sub_total > 0) ? $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total)) : 0; $item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount); @@ -264,7 +261,7 @@ class InvoiceItemSum /** * Sets default casts for the values in the line_items. - * + * * @return $this */ private function cleanLineItem() 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 3a9d4bab6685..7ad69538f85a 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; @@ -160,17 +155,21 @@ class InvoiceSum { $this->total += $this->total_taxes; - if(is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) + if (is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) { $this->total += $this->invoice->custom_value1; + } - if(is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) + if (is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) { $this->total += $this->invoice->custom_value2; + } - if(is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) + if (is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) { $this->total += $this->invoice->custom_value3; + } - if(is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) + if (is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) { $this->total += $this->invoice->custom_value4; + } return $this; } @@ -202,7 +201,6 @@ class InvoiceSum public function getRecurringInvoice() { - $this->invoice->amount = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision); $this->invoice->total_taxes = $this->getTotalTaxes(); $this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision); @@ -220,8 +218,7 @@ class InvoiceSum { /* If amount != balance then some money has been paid on the invoice, need to subtract this difference from the total to set the new balance */ - if($this->invoice->status_id != Invoice::STATUS_DRAFT) - { + if ($this->invoice->status_id != Invoice::STATUS_DRAFT) { if ($this->invoice->amount != $this->invoice->balance) { $paid_to_date = $this->invoice->amount - $this->invoice->balance; @@ -318,7 +315,6 @@ class InvoiceSum public function purgeTaxes() { - $this->tax_rate1 = 0; $this->tax_name1 = ''; @@ -332,7 +328,7 @@ class InvoiceSum $line_items = collect($this->invoice->line_items); - $items = $line_items->map(function ($item){ + $items = $line_items->map(function ($item) { $item->tax_rate1 = 0; $item->tax_rate2 = 0; $item->tax_rate3 = 0; @@ -350,5 +346,4 @@ class InvoiceSum return $this; } - } diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php index 95d2492b7354..b13652471d88 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; @@ -66,7 +60,7 @@ class InvoiceSumInclusive ->calculateCustomValues() ->calculateInvoiceTaxes() ->setTaxMap() - ->calculateTotals() //just don't add the taxes!! + ->calculateTotals() //just don't add the taxes!! ->calculateBalance() ->calculatePartial(); @@ -172,24 +166,27 @@ class InvoiceSumInclusive { //$this->total += $this->total_taxes; - if(is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) + if (is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) { $this->total += $this->invoice->custom_value1; + } - if(is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) + if (is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) { $this->total += $this->invoice->custom_value2; + } - if(is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) + if (is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) { $this->total += $this->invoice->custom_value3; + } - if(is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) - $this->total += $this->invoice->custom_value4; + if (is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) { + $this->total += $this->invoice->custom_value4; + } return $this; } public function getRecurringInvoice() { - $this->invoice->amount = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision); $this->invoice->total_taxes = $this->getTotalTaxes(); $this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision); @@ -329,7 +326,6 @@ class InvoiceSumInclusive public function purgeTaxes() { - return $this; } } 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/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php index 2bcf310dfa04..8168052aab85 100644 --- a/app/Http/Controllers/Auth/ContactLoginController.php +++ b/app/Http/Controllers/Auth/ContactLoginController.php @@ -80,5 +80,4 @@ class ContactLoginController extends Controller return redirect('/client/login'); } - } 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 63aa19aec955..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 @@ -173,8 +170,7 @@ class LoginController extends BaseController $cu = CompanyUser::query() ->where('user_id', auth()->user()->id); - return $this->listResponse($cu); - + return $this->listResponse($cu); } else { LightLogs::create(new LoginFailure()) ->increment() 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 095e96f24503..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; @@ -207,12 +203,12 @@ class BaseController extends Controller $updated_at = date('Y-m-d H:i:s', $updated_at); $query->with( - [ + [ 'company' => function ($query) use ($updated_at) { $query->whereNotNull('updated_at')->with('documents'); }, 'company.clients' => function ($query) use ($updated_at) { - $query->where('clients.updated_at', '>=', $updated_at)->with('contacts.company', 'gateway_tokens','documents'); + $query->where('clients.updated_at', '>=', $updated_at)->with('contacts.company', 'gateway_tokens', 'documents'); }, 'company.company_gateways' => function ($query) { $query->whereNotNull('updated_at'); @@ -236,7 +232,7 @@ class BaseController extends Controller $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents'); }, 'company.payments'=> function ($query) use ($updated_at) { - $query->where('updated_at', '>=', $updated_at)->with('paymentables','documents'); + $query->where('updated_at', '>=', $updated_at)->with('paymentables', 'documents'); }, 'company.payment_terms'=> function ($query) use ($updated_at) { $query->where('updated_at', '>=', $updated_at); @@ -245,7 +241,7 @@ class BaseController extends Controller $query->where('updated_at', '>=', $updated_at)->with('documents'); }, 'company.projects'=> function ($query) use ($updated_at) { - $query->where('updated_at', '>=', $updated_at)->with('documents' ); + $query->where('updated_at', '>=', $updated_at)->with('documents'); }, 'company.quotes'=> function ($query) use ($updated_at) { $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents'); @@ -254,13 +250,13 @@ class BaseController extends Controller $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents'); }, 'company.tasks'=> function ($query) use ($updated_at) { - $query->where('updated_at', '>=', $updated_at)->with('documents' ); + $query->where('updated_at', '>=', $updated_at)->with('documents'); }, 'company.tax_rates' => function ($query) use ($updated_at) { $query->where('updated_at', '>=', $updated_at); }, 'company.vendors'=> function ($query) use ($updated_at) { - $query->where('updated_at', '>=', $updated_at)->with('contacts','documents'); + $query->where('updated_at', '>=', $updated_at)->with('contacts', 'documents'); }, 'company.expense_categories'=> function ($query) use ($updated_at) { $query->where('updated_at', '>=', $updated_at); @@ -297,14 +293,17 @@ class BaseController extends Controller $query->with($includes); - if (auth()->user() && ! auth()->user()->hasPermission('view_'.lcfirst(class_basename($this->entity_type)))) + if (auth()->user() && ! auth()->user()->hasPermission('view_'.lcfirst(class_basename($this->entity_type)))) { $query->where('user_id', '=', auth()->user()->id); + } - if (request()->has('updated_at') && request()->input('updated_at') > 0) + if (request()->has('updated_at') && request()->input('updated_at') > 0) { $query->where('updated_at', '>=', date('Y-m-d H:i:s', intval(request()->input('updated_at')))); + } - if ($this->serializer && $this->serializer != EntityTransformer::API_SERIALIZER_JSON) + if ($this->serializer && $this->serializer != EntityTransformer::API_SERIALIZER_JSON) { $this->entity_type = null; + } if ($query instanceof Builder) { $limit = request()->input('per_page', 20); @@ -317,7 +316,6 @@ class BaseController extends Controller } return $this->response($this->manager->createData($resource)->toArray()); - } protected function response($response) @@ -357,13 +355,15 @@ class BaseController extends Controller $transformer = new $this->entity_transformer(request()->input('serializer')); - if ($this->serializer && $this->serializer != EntityTransformer::API_SERIALIZER_JSON) + if ($this->serializer && $this->serializer != EntityTransformer::API_SERIALIZER_JSON) { $this->entity_type = null; + } $resource = new Item($item, $transformer, $this->entity_type); - if (auth()->user() && request()->include_static) + if (auth()->user() && request()->include_static) { $data['static'] = Statics::company(auth()->user()->getCompany()->getLocale()); + } return $this->response($this->manager->createData($resource)->toArray()); } @@ -407,7 +407,6 @@ class BaseController extends Controller public function flutterRoute() { - if ((bool) $this->checkAppSetup() !== false && $account = Account::first()) { if (config('ninja.require_https') && ! request()->isSecure()) { return redirect()->secure(request()->getRequestUri()); 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 3a64b9f1d36d..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 { @@ -25,11 +24,6 @@ class ContactHashLoginController extends Controller */ public function login(string $contact_key) { - return redirect('/client/login'); - } - } - - 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 1e4e4efc22d4..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; @@ -37,7 +33,6 @@ class InvitationController extends Controller public function router(string $entity, string $invitation_key) { - $key = $entity.'_id'; $entity_obj = 'App\Models\\'.ucfirst(Str::camel($entity)).'Invitation'; @@ -48,18 +43,15 @@ class InvitationController extends Controller /* Return early if we have the correct client_hash embedded */ - if(request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) { + if (request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) { auth()->guard('contact')->login($invitation->contact, true); - } - else if ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) { + } elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) { $this->middleware('auth:contact'); - } - else { + } else { auth()->guard('contact')->login($invitation->contact, true); } if (auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) { - $invitation->markViewed(); event(new InvitationWasViewed($invitation->{$entity}, $invitation, $invitation->{$entity}->company, Ninja::eventVars())); @@ -68,8 +60,6 @@ class InvitationController extends Controller } return redirect()->route('client.'.$entity.'.show', [$entity => $this->encodePrimaryKey($invitation->{$key})]); - - } private function fireEntityViewedEvent($invitation, $entity_string) diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php index 1cac29ad5560..c58186a8c674 100644 --- a/app/Http/Controllers/ClientPortal/PaymentController.php +++ b/app/Http/Controllers/ClientPortal/PaymentController.php @@ -77,8 +77,9 @@ class PaymentController extends Controller $is_credit_payment = false; $token = false; - if($request->input('company_gateway_id') == CompanyGateway::GATEWAY_CREDIT) + if ($request->input('company_gateway_id') == CompanyGateway::GATEWAY_CREDIT) { $is_credit_payment = true; + } $gateway = CompanyGateway::find($request->input('company_gateway_id')); @@ -94,10 +95,8 @@ class PaymentController extends Controller $invoices = Invoice::whereIn('id', $this->transformKeys($payable_invoices->pluck('invoice_id')->toArray()))->get(); /* pop non payable invoice from the $payable_invoices array */ - $payable_invoices = $payable_invoices->filter(function ($payable_invoice) use ($invoices){ - + $payable_invoices = $payable_invoices->filter(function ($payable_invoice) use ($invoices) { return $invoices->where('hashed_id', $payable_invoice['invoice_id'])->first()->isPayable(); - }); /*return early if no invoices*/ @@ -110,8 +109,7 @@ class PaymentController extends Controller $settings = auth()->user()->client->getMergedSettings(); /*iterate through invoices and add gateway fees and other payment metadata*/ - $payable_invoices = $payable_invoices->map(function($payable_invoice) use($invoices, $settings){ - + $payable_invoices = $payable_invoices->map(function ($payable_invoice) use ($invoices, $settings) { $payable_invoice['amount'] = Number::parseFloat($payable_invoice['amount']); $invoice = $invoices->first(function ($inv) use ($payable_invoice) { @@ -167,7 +165,6 @@ class PaymentController extends Controller $payable_invoice['additional_info'] = $additional_info; return $payable_invoice; - }); if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) { @@ -182,8 +179,9 @@ class PaymentController extends Controller $credit_totals = $first_invoice->client->getSetting('use_credits_payment') == 'off' ? 0 : $first_invoice->client->service()->getCreditBalance(); $starting_invoice_amount = $first_invoice->amount; - if($gateway) + if ($gateway) { $first_invoice->service()->addGatewayFee($gateway, $payment_method_id, $invoice_totals)->save(); + } /** * Gateway fee is calculated @@ -192,8 +190,9 @@ class PaymentController extends Controller */ $fee_totals = $first_invoice->amount - $starting_invoice_amount; - if($gateway) + if ($gateway) { $token = auth()->user()->client->gateway_token($gateway->id, $payment_method_id); + } $payment_hash = new PaymentHash; $payment_hash->hash = Str::random(128); @@ -218,7 +217,7 @@ class PaymentController extends Controller 'amount_with_fee' => $invoice_totals + $fee_totals, ]; - if($is_credit_payment) { + if ($is_credit_payment) { return $this->processCreditPayment($request, $data); } @@ -252,9 +251,9 @@ class PaymentController extends Controller $payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$request->input('payment_hash')])->first(); /* Hydrate the $payment */ - if($payment_hash->payment()->exists()) + if ($payment_hash->payment()->exists()) { $payment = $payment_hash->payment; - else { + } else { $payment = PaymentFactory::create($payment_hash->fee_invoice->company_id, $payment_hash->fee_invoice->user_id); $payment->client_id = $payment_hash->fee_invoice->client_id; $payment->save(); @@ -264,8 +263,7 @@ class PaymentController extends Controller } /* Iterate through the invoices and apply credits to them */ - collect($payment_hash->invoices())->each(function ($payable_invoice) use ($payment, $payment_hash){ - + collect($payment_hash->invoices())->each(function ($payable_invoice) use ($payment, $payment_hash) { $invoice = Invoice::find($this->decodePrimaryKey($payable_invoice->invoice_id)); $amount = $payable_invoice->amount; @@ -274,35 +272,31 @@ class PaymentController extends Controller ->service() ->getCredits(); - foreach($credits as $credit) - { - //starting invoice balance - $invoice_balance = $invoice->balance; + foreach ($credits as $credit) { + //starting invoice balance + $invoice_balance = $invoice->balance; - //credit payment applied - $credit->service()->applyPayment($invoice, $amount, $payment); + //credit payment applied + $credit->service()->applyPayment($invoice, $amount, $payment); - //amount paid from invoice calculated - $remaining_balance = ($invoice_balance - $invoice->fresh()->balance); + //amount paid from invoice calculated + $remaining_balance = ($invoice_balance - $invoice->fresh()->balance); - //reduce the amount to be paid on the invoice from the NEXT credit - $amount -= $remaining_balance; + //reduce the amount to be paid on the invoice from the NEXT credit + $amount -= $remaining_balance; - //break if the invoice is no longer PAYABLE OR there is no more amount to be applied - if(!$invoice->isPayable() || (int)$amount == 0) - break; + //break if the invoice is no longer PAYABLE OR there is no more amount to be applied + if (!$invoice->isPayable() || (int)$amount == 0) { + break; } - + } }); return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]); - } public function processCreditPayment(Request $request, array $data) { - return render('gateways.credit.index', $data); - } } diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php index f85c367da545..463e74c2f5d5 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; 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 2ccf9a6012b7..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; /** @@ -408,9 +402,9 @@ class CompanyController extends BaseController */ public function update(UpdateCompanyRequest $request, Company $company) { - - if($request->hasFile('company_logo') || (is_array($request->input('settings')) && !array_key_exists('company_logo', $request->input('settings')))) + if ($request->hasFile('company_logo') || (is_array($request->input('settings')) && !array_key_exists('company_logo', $request->input('settings')))) { $this->removeLogo($company); + } $company = $this->company_repo->save($request->all(), $company); @@ -490,7 +484,6 @@ class CompanyController extends BaseController LightLogs::create(new AccountDeleted()) ->increment() ->batch(); - } else { $company_id = $company->id; $company->delete(); 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 acf081363458..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; @@ -187,7 +184,7 @@ class CreditController extends BaseController $credit = $this->credit_repository->save($request->all(), CreditFactory::create(auth()->user()->company()->id, auth()->user()->id)); - $credit = $credit->service() + $credit = $credit->service() ->fillDefaults() ->save(); 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 04f10b0cccc9..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; @@ -120,18 +118,14 @@ class EmailController extends BaseController $template = str_replace("email_template_", "", $template); $entity_obj->invitations->each(function ($invitation) use ($subject, $body, $entity_string, $entity_obj, $template) { - if ($invitation->contact->send_email && $invitation->contact->email) { - $data = [ 'subject' => $subject, 'body' => $body ]; EmailEntity::dispatchNow($invitation, $invitation->company, $template, $data); - } - }); $entity_obj->last_sent_date = now(); 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 62092a73bd63..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; @@ -396,7 +393,7 @@ class InvoiceController extends BaseController $invoice = $this->invoice_repo->save($request->all(), $invoice); - UnlinkFile::dispatchNow(config('filesystems.default'),$invoice->client->invoice_filepath().$invoice->number.'.pdf'); + UnlinkFile::dispatchNow(config('filesystems.default'), $invoice->client->invoice_filepath().$invoice->number.'.pdf'); event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars())); @@ -731,7 +728,6 @@ class InvoiceController extends BaseController $invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($invoice) { info("firing email"); EmailEntity::dispatch($invitation, $invoice->company, $this->reminder_template); - }); if (! $bulk) { 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 de7e14fa9514..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 @@ -219,7 +218,6 @@ class MigrationController extends BaseController */ public function startMigration(Request $request) { - $companies = json_decode($request->companies); if (app()->environment() === 'local') { @@ -227,7 +225,6 @@ class MigrationController extends BaseController } foreach ($companies as $company) { - $is_valid = $request->file($company->company_index)->isValid(); if (!$is_valid) { diff --git a/app/Http/Controllers/OpenAPI/TaskSchema.php b/app/Http/Controllers/OpenAPI/TaskSchema.php index 72c6d473ca9b..23acb2649e06 100644 --- a/app/Http/Controllers/OpenAPI/TaskSchema.php +++ b/app/Http/Controllers/OpenAPI/TaskSchema.php @@ -27,4 +27,4 @@ * @OA\Property(property="updated_at", type="number", format="integer", example="1434342123", description="Timestamp"), * @OA\Property(property="archived_at", type="number", format="integer", example="1434342123", description="Timestamp"), * ) - */ \ No newline at end of file + */ 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 41f8886880ef..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 @@ -45,7 +44,9 @@ class PingController extends BaseController return response()->json( ['company_name' => auth()->user()->getCompany()->present()->name(), 'user_name' => auth()->user()->present()->name(), - ], 200); + ], + 200 + ); } /** 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 371b2004791b..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. @@ -363,7 +360,7 @@ class ProjectController extends BaseController $project->fill($request->all()); $project->save(); - if(empty($project->number)){ + if (empty($project->number)) { $project->number = $this->getNextProjectNumber($project); $project->save(); } diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index 9aba18ada4a6..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; @@ -670,22 +668,25 @@ class QuoteController extends BaseController case 'restore': $this->quote_repo->restore($quote); - if (!$bulk) + if (!$bulk) { return $this->listResponse($quote); + } break; case 'archive': $this->quote_repo->archive($quote); - if (!$bulk) + if (!$bulk) { return $this->listResponse($quote); + } break; case 'delete': $this->quote_repo->delete($quote); - if (!$bulk) + if (!$bulk) { return $this->listResponse($quote); + } break; case 'email': @@ -700,7 +701,6 @@ class QuoteController extends BaseController return $this->itemResponse($quote); } break; - // no break default: return response()->json(['message' => "The requested action `{$action}` is not available."], 400); break; diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php index 7fe473520f03..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. @@ -628,6 +623,5 @@ class RecurringInvoiceController extends BaseController // code... break; } - } } 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 338c79b2097f..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 { @@ -74,7 +70,6 @@ class SelfUpdateController extends BaseController try { $res = $repo->pull(); } catch (GitException $e) { - info($e->getMessage()); return response()->json(['message'=>$e->getMessage()], 500); } 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 c96637e58714..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; @@ -63,8 +61,9 @@ class SystemLogController extends BaseController { $system_logs = SystemLog::filter($filters); - if(auth()->user()->isAdmin()) + if (auth()->user()->isAdmin()) { return $this->listResponse($system_logs); + } return $this->errorResponse('Insufficient permissions', 403); } 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/Profile/Settings/General.php b/app/Http/Livewire/Profile/Settings/General.php index 249c832458aa..48e7bd08764c 100644 --- a/app/Http/Livewire/Profile/Settings/General.php +++ b/app/Http/Livewire/Profile/Settings/General.php @@ -65,9 +65,9 @@ class General extends Component $data = $this->validate($this->rules); - if (!empty($this->password)) { - $this->profile->password = Hash::make($this->password); - } + if (!empty($this->password)) { + $this->profile->password = Hash::make($this->password); + } $this->profile ->fill($data) 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 dfe057768a4d..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; @@ -27,9 +26,9 @@ class ApiSecretCheck */ public function handle($request, Closure $next) { - - if(! config('ninja.api_secret')) + if (! config('ninja.api_secret')) { return $next($request); + } if ($request->header('X-API-SECRET') && ($request->header('X-API-SECRET') == config('ninja.api_secret'))) { return $next($request); 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 50444c5178bd..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; @@ -34,47 +33,32 @@ class ContactKeyLogin */ public function handle($request, Closure $next) { - - if(Auth::guard('contact')->check()) + if (Auth::guard('contact')->check()) { Auth::guard('contact')->logout(); + } if ($request->segment(3) && config('ninja.db.multi_db_enabled')) { - if (MultiDB::findAndSetDbByContactKey($request->segment(3))) { - $client_contact = ClientContact::where('contact_key', $request->segment(3))->first(); Auth::guard('contact')->login($client_contact, true); return redirect()->to('client/dashboard'); - } - - } - else if ($request->has('contact_key')) { - - if($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()){ + } elseif ($request->has('contact_key')) { + if ($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()) { Auth::guard('contact')->login($client_contact, true); return redirect()->to('client/dashboard'); } - - } - else if($request->has('client_hash') && config('ninja.db.multi_db_enabled')){ - + } elseif ($request->has('client_hash') && config('ninja.db.multi_db_enabled')) { if (MultiDB::findAndSetDbByClientHash($request->input('client_hash'))) { - $client = Client::where('client_hash', $request->input('client_hash'))->first(); Auth::guard('contact')->login($client->primary_contact()->first(), true); return redirect()->to('client/dashboard'); - } - - } - else if($request->has('client_hash')){ - - if($client = Client::where('client_hash', $request->input('client_hash'))->first()){ + } elseif ($request->has('client_hash')) { + if ($client = Client::where('client_hash', $request->input('client_hash'))->first()) { Auth::guard('contact')->login($client->primary_contact()->first(), true); return redirect()->to('client/dashboard'); } - } return $next($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 86e6175fd299..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; @@ -55,7 +53,7 @@ class ContactTokenAuth //stateless, don't remember the contact. auth()->guard('contact')->login($client_contact, false); - event(new ContactLoggedIn($client_contact, $client_contact->company, Ninja::eventVars())); + event(new ContactLoggedIn($client_contact, $client_contact->company, Ninja::eventVars())); } else { $error = [ 'message' => 'Invalid token', 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/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index bf71e2969221..4843070dc947 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -31,7 +31,6 @@ class QueryLogging */ public function handle(Request $request, Closure $next) { - $timeStart = microtime(true); // Enable query logging for development @@ -54,7 +53,6 @@ class QueryLogging // if($count > 50) // Log::info($queries); - } } 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 ec22cacae3d3..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; @@ -38,7 +37,7 @@ class SetEmailDb if (! MultiDB::userFindAndSetDb($request->input('email'))) { return response()->json($error, 400); } - } + } // else { // return response()->json($error, 403); // } diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php index 48f2517fdeb7..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. @@ -69,8 +62,9 @@ class StartupCheck /*Build template cache*/ - if ($request->has('clear_cache') || ! Cache::has('templates')) + if ($request->has('clear_cache') || ! Cache::has('templates')) { $this->buildTemplates(); + } $response = $next($request); diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 82fd6890763e..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 { @@ -36,12 +36,12 @@ class TrustProxies extends Middleware * * @param \Illuminate\Contracts\Config\Repository $config */ - public function __construct(Repository $config) { - - parent::__construct($config); - - if (config('ninja.trusted_proxies')) - $this->proxies = config('ninja.trusted_proxies'); + public function __construct(Repository $config) + { + parent::__construct($config); + if (config('ninja.trusted_proxies')) { + $this->proxies = config('ninja.trusted_proxies'); + } } } 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 bbaddc7ad89a..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 @@ -42,8 +39,9 @@ class UpdateExpenseRequest extends Request //$rules['id_number'] = 'unique:clients,id_number,,id,company_id,' . auth()->user()->company()->id; $rules['contacts.*.email'] = 'nullable|distinct'; - if(isset($this->number)) + if (isset($this->number)) { $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id); + } return $this->globalRules($rules); } 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/ExpenseCategory/UpdateExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php index 27d1f2c83c2c..aaf661f7558c 100644 --- a/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php +++ b/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php @@ -13,6 +13,7 @@ namespace App\Http\Requests\ExpenseCategory; use App\Http\Requests\Request; use App\Utils\Traits\ChecksEntityStatus; + class UpdateExpenseCategoryRequest extends Request { use ChecksEntityStatus; @@ -29,13 +30,12 @@ class UpdateExpenseCategoryRequest extends Request public function rules() { - $rules = []; - if ($this->input('name')) + if ($this->input('name')) { $rules['name'] = 'unique:expense_categories,name,'.$this->id.',id,company_id,'.$this->expense_category->company_id; + } return $rules; } - } 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 844e309eb525..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 { @@ -31,7 +30,6 @@ class StoreGroupSettingRequest extends Request public function rules() { - $rules['name'] = 'required|unique:group_settings,name,null,null,company_id,'.auth()->user()->companyId(); $rules['settings'] = new ValidClientGroupSettingsRule(); 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 93afbd206cdf..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; @@ -39,7 +39,7 @@ class StorePaymentRequest extends Request { $input = $this->all(); - // info(print_r($input,1)); + // info(print_r($input,1)); $invoices_total = 0; $credits_total = 0; @@ -77,7 +77,7 @@ class StorePaymentRequest extends Request } if (! isset($input['amount']) || $input['amount'] == 0) { - $input['amount'] = $invoices_total - $credits_total; + $input['amount'] = $invoices_total - $credits_total; } $input['is_manual'] = true; diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php index 961fd3e93274..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 { @@ -35,8 +34,7 @@ class UpdatePaymentRequest extends Request public function rules() { - - $rules = [ + $rules = [ 'number' => 'nullable|unique:payments,number,'.$this->id.',id,company_id,'.$this->payment->company_id, 'invoices' => ['array', new PaymentAppliedValidAmount, new ValidCreditsPresentRule], 'invoices.*.invoice_id' => 'distinct', 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/StoreProjectRequest.php b/app/Http/Requests/Project/StoreProjectRequest.php index a59dbbadb10f..a7f77e9d2c67 100644 --- a/app/Http/Requests/Project/StoreProjectRequest.php +++ b/app/Http/Requests/Project/StoreProjectRequest.php @@ -34,16 +34,16 @@ class StoreProjectRequest extends Request { $rules = []; - $rules['name'] = 'required'; - $rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id; - $rules['number'] = 'unique:projects,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id; + $rules['name'] = 'required'; + $rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id; + $rules['number'] = 'unique:projects,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id; return $this->globalRules($rules); } protected function prepareForValidation() { - $input = $this->decodePrimaryKeys($this->all()); + $input = $this->decodePrimaryKeys($this->all()); $this->replace($input); } diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php index 48c4e947a140..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 @@ -33,18 +32,20 @@ class UpdateProjectRequest extends Request { $rules = []; - if(isset($this->number)) + if (isset($this->number)) { $rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id)->ignore($this->project->id); + } return $this->globalRules($rules); } protected function prepareForValidation() { - $input = $this->decodePrimaryKeys($this->all()); + $input = $this->decodePrimaryKeys($this->all()); - if(isset($input['client_id'])) + if (isset($input['client_id'])) { unset($input['client_id']); + } $this->replace($input); } 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/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php index 6c5fca03ccda..cba0442356a7 100644 --- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php @@ -100,29 +100,30 @@ class StoreRecurringInvoiceRequest extends Request $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; - if(isset($input['auto_bill'])) + if (isset($input['auto_bill'])) { $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']); - else{ - - if($client = Client::find($input['client_id'])) + } else { + if ($client = Client::find($input['client_id'])) { $input['auto_bill'] = $client->getSetting('auto_bill'); + } } - $this->replace($input); + $this->replace($input); } private function setAutoBillFlag($auto_bill) { - if($auto_bill == 'always') + if ($auto_bill == 'always') { return true; + } - if($auto_bill == 'off') + if ($auto_bill == 'off') { return false; - + } } - public function messages() - { - return []; - } + public function messages() + { + return []; + } } diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php index cd512f03f09b..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 { @@ -36,7 +34,6 @@ class UpdateRecurringInvoiceRequest extends Request public function rules() { - $rules = []; if ($this->input('documents') && is_array($this->input('documents'))) { @@ -90,33 +87,32 @@ class UpdateRecurringInvoiceRequest extends Request $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; - if(isset($input['auto_bill'])) + if (isset($input['auto_bill'])) { $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']); + } $this->replace($input); } /** * if($auto_bill == '') - * off / optin / optout will reset the status of this field to off to allow + * off / optin / optout will reset the status of this field to off to allow * the client to choose whether to auto_bill or not. - * + * * @param enum $auto_bill off/always/optin/optout * * @return bool */ private function setAutoBillFlag($auto_bill) :bool { - - if($auto_bill == 'always') + if ($auto_bill == 'always') { return true; + } // if($auto_bill == '') - // off / optin / optout will reset the status of this field to off to allow + // off / optin / optout will reset the status of this field to off to allow // the client to choose whether to auto_bill or not. return false; - } - } 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/Request.php b/app/Http/Requests/Request.php index 5e31c967e522..5b30670aa357 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -17,7 +17,7 @@ use Illuminate\Foundation\Http\FormRequest; class Request extends FormRequest { - use MakesHash; + use MakesHash; /** * Get the validation rules that apply to the request. @@ -31,22 +31,22 @@ class Request extends FormRequest public function globalRules($rules) { - $merge_rules = []; + $merge_rules = []; - foreach($this->all() as $key => $value) - { - if(method_exists($this, $key)) - $merge_rules = $this->{$key}($rules); - } + foreach ($this->all() as $key => $value) { + if (method_exists($this, $key)) { + $merge_rules = $this->{$key}($rules); + } + } - return array_merge($merge_rules, $rules); + return array_merge($merge_rules, $rules); } private function assigned_user_id($rules) - { - $rules['assigned_user_id'] = [ - 'bail' , - 'sometimes', + { + $rules['assigned_user_id'] = [ + 'bail' , + 'sometimes', 'nullable', new RelatedUserRule($this->all()) ]; @@ -70,7 +70,6 @@ class Request extends FormRequest public function decodePrimaryKeys($input) { - if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) { $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']); } @@ -81,15 +80,15 @@ class Request extends FormRequest if (array_key_exists('vendor_id', $input) && is_string($input['vendor_id'])) { $input['vendor_id'] = $this->decodePrimaryKey($input['vendor_id']); - } + } if (array_key_exists('client_id', $input) && is_string($input['client_id'])) { $input['client_id'] = $this->decodePrimaryKey($input['client_id']); - } + } if (array_key_exists('invoice_id', $input) && is_string($input['invoice_id'])) { $input['invoice_id'] = $this->decodePrimaryKey($input['invoice_id']); - } + } if (array_key_exists('design_id', $input) && is_string($input['design_id'])) { $input['design_id'] = $this->decodePrimaryKey($input['design_id']); @@ -146,6 +145,6 @@ class Request extends FormRequest } } - return $input; + return $input; } } 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 6bd1bce41387..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 @@ -38,17 +34,18 @@ class StoreTaskRequest extends Request { $rules = []; - if(isset($this->number)) + if (isset($this->number)) { $rules['number'] = Rule::unique('tasks')->where('company_id', auth()->user()->company()->id); + } - return $this->globalRules($rules); + return $this->globalRules($rules); } protected function prepareForValidation() { $input = $this->all(); - $input = $this->decodePrimaryKeys($this->all()); + $input = $this->decodePrimaryKeys($this->all()); if (array_key_exists('status_id', $input) && is_string($input['status_id'])) { $input['status_id'] = $this->decodePrimaryKey($input['status_id']); @@ -56,5 +53,4 @@ class StoreTaskRequest extends Request $this->replace($input); } - } diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php index 16a1e3882e1f..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 @@ -38,15 +35,16 @@ class UpdateTaskRequest extends Request { $rules = []; - if(isset($this->number)) + if (isset($this->number)) { $rules['number'] = Rule::unique('tasks')->where('company_id', auth()->user()->company()->id)->ignore($this->task->id); + } return $this->globalRules($rules); } protected function prepareForValidation() { - $input = $this->decodePrimaryKeys($this->all()); + $input = $this->decodePrimaryKeys($this->all()); if (array_key_exists('status_id', $input) && is_string($input['status_id'])) { $input['status_id'] = $this->decodePrimaryKey($input['status_id']); 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 d6e550427f98..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 { @@ -33,10 +32,10 @@ class UpdateTaskStatusRequest extends Request { $rules = []; - if ($this->input('name')) - $rules['name'] = 'unique:task_statuses,name,'.$this->id.',id,company_id,'.$this->task_status->company_id; + if ($this->input('name')) { + $rules['name'] = 'unique:task_statuses,name,'.$this->id.',id,company_id,'.$this->task_status->company_id; + } - return $rules; + return $rules; } - } 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 134a8bbe76b9..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; @@ -41,12 +36,11 @@ class CreditsSumRule implements Rule private function checkCreditTotals() { - - if( array_sum(array_column($this->input['credits'],'amount')) > array_sum(array_column($this->input['invoices'], 'amount'))) + if (array_sum(array_column($this->input['credits'], 'amount')) > array_sum(array_column($this->input['invoices'], 'amount'))) { return false; + } return true; - } /** 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 dc1c0c5195f4..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; /** @@ -51,8 +49,9 @@ class UniqueExpenseNumberRule implements Rule */ private function checkIfExpenseNumberUnique() : bool { - if(empty($this->input['number'])) + if (empty($this->input['number'])) { return true; + } $expense = Expense::query() ->where('number', $this->input['number']) 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 1cecd095cf2b..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; /** @@ -51,8 +49,9 @@ class UniqueInvoiceNumberRule implements Rule */ private function checkIfInvoiceNumberUnique() : bool { - if(empty($this->input['number'])) + if (empty($this->input['number'])) { return true; + } $invoice = Invoice::where('client_id', $this->input['client_id']) ->where('number', $this->input['number']) 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 cc9ff5251b21..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; /** @@ -73,8 +71,8 @@ class PaymentAmountsBalanceRule implements Rule return true; } // if no invoices are present, then this is an unapplied payment, let this pass validation! -// info("payment amounts = {$payment_amounts}"); -// info("invoice amounts = {$invoice_amounts}"); + // info("payment amounts = {$payment_amounts}"); + // info("invoice amounts = {$invoice_amounts}"); return $payment_amounts >= $invoice_amounts; } 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/Project/ValidProjectForClient.php b/app/Http/ValidationRules/Project/ValidProjectForClient.php index e33d5366a2bd..2118686a1155 100644 --- a/app/Http/ValidationRules/Project/ValidProjectForClient.php +++ b/app/Http/ValidationRules/Project/ValidProjectForClient.php @@ -35,11 +35,13 @@ class ValidProjectForClient implements Rule */ public function passes($attribute, $value) { - if(empty($this->input['project_id'])) + if (empty($this->input['project_id'])) { return true; + } - if(is_string($this->input['project_id'])) + if (is_string($this->input['project_id'])) { $this->input['project_id'] = $this->decodePrimaryKey($this->input['project_id']); + } $project = Project::findOrFail($this->input['project_id']); @@ -53,6 +55,4 @@ class ValidProjectForClient implements Rule { return "Project client does not match entity client"; } - - } 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 d37cbcfa05ea..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; /** @@ -52,8 +49,9 @@ class UniqueRecurringInvoiceNumberRule implements Rule */ private function checkIfInvoiceNumberUnique() : bool { - if(empty($this->input['number'])) + if (empty($this->input['number'])) { return true; + } $invoice = RecurringInvoice::where('client_id', $this->input['client_id']) ->where('number', $this->input['number']) 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 43958e7a49b9..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; @@ -50,9 +49,9 @@ class RelatedUserRule implements Rule */ private function checkUserIsRelated($user_id) : bool { - - if(empty($user_id)) + if (empty($user_id)) { return true; + } return User::query() ->where('id', $user_id) 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 46d1de283e51..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; @@ -60,7 +58,6 @@ class ValidCreditsPresentRule implements Rule if (request()->input('credits') && is_array(request()->input('credits'))) { - $credit_collection = Credit::whereIn('id', $this->transformKeys(array_column(request()->input('credits'), 'credit_id'))) ->where('balance', '>', 0) ->get(); 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/Http/ViewComposers/PortalComposer.php b/app/Http/ViewComposers/PortalComposer.php index 5f1a172ef57b..5d36d37c4e89 100644 --- a/app/Http/ViewComposers/PortalComposer.php +++ b/app/Http/ViewComposers/PortalComposer.php @@ -32,8 +32,9 @@ class PortalComposer { $view->with($this->portalData()); - if(auth()->user()) + if (auth()->user()) { Lang::replace(Ninja::transformTranslations(auth()->user()->client->getMergedSettings())); + } } /** @@ -73,7 +74,7 @@ class PortalComposer $data[] = ['title' => ctrans('texts.documents'), 'url' => 'client.documents.index', 'icon' => 'download']; if (auth()->user('contact')->client->getSetting('enable_client_portal_tasks')) { - $data[] = ['title' => ctrans('texts.tasks'), 'url' => 'client.dashboard', 'icon' => 'clock']; + $data[] = ['title' => ctrans('texts.tasks'), 'url' => 'client.dashboard', 'icon' => 'clock']; // TODO: Update when 'tasks' module is available in client portal. } 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 6927648d0b0c..73c08909dbba 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -14,15 +14,13 @@ 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; class RecurringInvoicesCron { - use Dispatchable; + use Dispatchable; /** * Create a new job instance. @@ -44,27 +42,23 @@ class RecurringInvoicesCron info("Sending recurring invoices ".Carbon::now()->format('Y-m-d h:i:s')); if (! config('ninja.db.multi_db_enabled')) { - - $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now()) + $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now()) ->where('status_id', RecurringInvoice::STATUS_ACTIVE) ->with('company') ->cursor(); - Log::info(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count()); - - $recurring_invoices->each(function ($recurring_invoice, $key) { + Log::info(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count()); + $recurring_invoices->each(function ($recurring_invoice, $key) { info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date); - if(!$recurring_invoice->company->is_disabled) + if (!$recurring_invoice->company->is_disabled) { SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); - + } }); - } else { //multiDB environment, need to foreach (MultiDB::$dbs as $db) { - MultiDB::setDB($db); $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now()) @@ -75,12 +69,11 @@ class RecurringInvoicesCron Log::info(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count().' On Database # '.$db); $recurring_invoices->each(function ($recurring_invoice, $key) { - info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date); - if(!$recurring_invoice->company->is_disabled) + if (!$recurring_invoice->company->is_disabled) { SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); - + } }); } } diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php index a3847da9fe4c..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 { @@ -72,19 +64,16 @@ class CreateEntityPdf implements ShouldQueue { $this->invitation = $invitation; - if($invitation instanceof InvoiceInvitation){ + if ($invitation instanceof InvoiceInvitation) { $this->entity = $invitation->invoice; $this->entity_string = 'invoice'; - } - elseif($invitation instanceof QuoteInvitation){ + } elseif ($invitation instanceof QuoteInvitation) { $this->entity = $invitation->quote; $this->entity_string = 'quote'; - } - elseif($invitation instanceof CreditInvitation){ + } elseif ($invitation instanceof CreditInvitation) { $this->entity = $invitation->credit; $this->entity_string = 'credit'; - } - elseif($invitation instanceof RecurringInvoiceInvitation){ + } elseif ($invitation instanceof RecurringInvoiceInvitation) { $this->entity = $invitation->recurring_invoice; $this->entity_string = 'recurring_invoice'; } @@ -98,7 +87,6 @@ class CreateEntityPdf implements ShouldQueue public function handle() { - if (config('ninja.phantomjs_key')) { return (new Phantom)->generate($this->invitation); } @@ -108,15 +96,13 @@ class CreateEntityPdf implements ShouldQueue $entity_design_id = ''; - if($this->entity instanceof Invoice){ + if ($this->entity instanceof Invoice) { $path = $this->entity->client->invoice_filepath(); $entity_design_id = 'invoice_design_id'; - } - elseif($this->entity instanceof Quote){ + } elseif ($this->entity instanceof Quote) { $path = $this->entity->client->quote_filepath(); $entity_design_id = 'quote_design_id'; - } - elseif($this->entity instanceof Credit){ + } elseif ($this->entity instanceof Credit) { $path = $this->entity->client->credit_filepath(); $entity_design_id = 'credit_design_id'; } @@ -131,12 +117,12 @@ class CreateEntityPdf implements ShouldQueue $html = new HtmlEngine($this->invitation); if ($design->is_custom) { - $options = [ + $options = [ 'custom_partials' => json_decode(json_encode($design->design), true) ]; - $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); + $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); } else { - $template = new PdfMakerDesign(strtolower($design->name)); + $template = new PdfMakerDesign(strtolower($design->name)); } $state = [ @@ -165,15 +151,14 @@ class CreateEntityPdf implements ShouldQueue $pdf = null; try { - $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true)); - } - catch(\Exception $e) { - info(print_r($e->getMessage(),1)); + } catch (\Exception $e) { + info(print_r($e->getMessage(), 1)); } - if($pdf) + if ($pdf) { $instance = Storage::disk($this->disk)->put($file_path, $pdf); + } return $file_path; } diff --git a/app/Jobs/Entity/EmailEntity.php b/app/Jobs/Entity/EmailEntity.php index c6ab3c30f197..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*/ @@ -88,7 +81,6 @@ class EmailEntity extends BaseMailerJob implements ShouldQueue $this->template_data = $template_data; $this->email_entity_builder = $this->resolveEmailBuilder(); - } /** @@ -99,8 +91,9 @@ class EmailEntity extends BaseMailerJob implements ShouldQueue */ public function handle() { - if($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } MultiDB::setDB($this->company->db); @@ -132,14 +125,15 @@ class EmailEntity extends BaseMailerJob implements ShouldQueue private function resolveEntityString() :string { - if($this->invitation instanceof InvoiceInvitation) + if ($this->invitation instanceof InvoiceInvitation) { return 'invoice'; - elseif($this->invitation instanceof QuoteInvitation) + } elseif ($this->invitation instanceof QuoteInvitation) { return 'quote'; - elseif($this->invitation instanceof CreditInvitation) + } elseif ($this->invitation instanceof CreditInvitation) { return 'credit'; - elseif($this->invitation instanceof RecurringInvoiceInvitation) + } elseif ($this->invitation instanceof RecurringInvoiceInvitation) { return 'recurring_invoice'; + } } private function entityEmailFailed($message) @@ -153,7 +147,6 @@ class EmailEntity extends BaseMailerJob implements ShouldQueue # code... break; } - } private function entityEmailSucceeded() 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 ad3619923105..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; @@ -97,10 +95,8 @@ class ZipInvoices extends BaseMailerJob implements ShouldQueue try { Mail::to($this->email) ->send(new DownloadInvoices(Storage::disk(config('filesystems.default'))->url($path.$file_name), $this->company)); - } - catch (\Exception $e) { + } catch (\Exception $e) { $this->failed($e); - } UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1)); diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php index a938086e133b..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; @@ -104,6 +103,5 @@ class BaseMailerJob implements ShouldQueue LightLogs::create($job_failure) ->batch(); - } } diff --git a/app/Jobs/Mail/EntityPaidMailer.php b/app/Jobs/Mail/EntityPaidMailer.php index 2ca18b4a8916..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*/ @@ -72,8 +65,9 @@ class EntityPaidMailer extends BaseMailerJob implements ShouldQueue public function handle() { /*If we are migrating data we don't want to fire these notification*/ - if ($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } //Set DB MultiDB::setDb($this->company->db); @@ -82,18 +76,15 @@ class EntityPaidMailer extends BaseMailerJob implements ShouldQueue $this->setMailDriver(); try { - $mail_obj = (new EntityPaidObject($this->payment))->build(); $mail_obj->from = [$this->user->email, $this->user->present()->name()]; //send email Mail::to($this->user->email) ->send(new EntityNotificationMailer($mail_obj)); - } catch (\Exception $e) { $this->failed($e); $this->logMailError($e->getMessage(), $this->payment->client); } - } } diff --git a/app/Jobs/Mail/EntitySentMailer.php b/app/Jobs/Mail/EntitySentMailer.php index 88b120913ee4..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*/ @@ -76,8 +70,9 @@ class EntitySentMailer extends BaseMailerJob implements ShouldQueue public function handle() { /*If we are migrating data we don't want to fire these notification*/ - if ($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } //Set DB MultiDB::setDb($this->company->db); @@ -91,12 +86,9 @@ class EntitySentMailer extends BaseMailerJob implements ShouldQueue try { Mail::to($this->user->email) ->send(new EntityNotificationMailer($mail_obj)); - }catch(\Exception $e) { - + } catch (\Exception $e) { $this->failed($e); $this->logMailError($e->getMessage(), $this->entity->client); - } - } } diff --git a/app/Jobs/Mail/EntityViewedMailer.php b/app/Jobs/Mail/EntityViewedMailer.php index ba01dd8b88f1..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*/ @@ -76,8 +70,9 @@ class EntityViewedMailer extends BaseMailerJob implements ShouldQueue public function handle() { /*If we are migrating data we don't want to fire these notification*/ - if ($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } //Set DB MultiDB::setDb($this->company->db); @@ -89,15 +84,12 @@ class EntityViewedMailer extends BaseMailerJob implements ShouldQueue $mail_obj->from = [$this->entity->user->email, $this->entity->user->present()->name()]; //send email - try{ + try { Mail::to($this->user->email) ->send(new EntityNotificationMailer($mail_obj)); - } - catch (\Exception $e) { - + } catch (\Exception $e) { $this->failed($e); $this->logMailError($e->getMessage(), $this->entity->client); - } } } diff --git a/app/Jobs/Mail/MailRouter.php b/app/Jobs/Mail/MailRouter.php index e0dcd4b31020..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*/ @@ -67,8 +59,9 @@ class MailRouter extends BaseMailerJob implements ShouldQueue public function handle() { /*If we are migrating data we don't want to fire these notification*/ - if ($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } MultiDB::setDb($this->company->db); @@ -79,13 +72,9 @@ class MailRouter extends BaseMailerJob implements ShouldQueue try { Mail::to($this->to_user->email) ->send($this->mailable); - } - catch (\Exception $e) { - + } catch (\Exception $e) { $this->failed($e); $this->logMailError($e->getMessage(), $this->to_user); - } - } } diff --git a/app/Jobs/Mail/PaymentFailureMailer.php b/app/Jobs/Mail/PaymentFailureMailer.php index 1c405d477ce8..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*/ @@ -77,8 +70,9 @@ class PaymentFailureMailer extends BaseMailerJob implements ShouldQueue public function handle() { /*If we are migrating data we don't want to fire these notification*/ - if ($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } //Set DB MultiDB::setDb($this->company->db); @@ -103,14 +97,10 @@ class PaymentFailureMailer extends BaseMailerJob implements ShouldQueue try { Mail::to($company_user->user->email) ->send(new EntityNotificationMailer($mail_obj)); - } - catch(\Exception $e) { - + } catch (\Exception $e) { $this->failed($e); $this->logMailError($e->getMessage(), $this->client); - } - } }); } 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/Ninja/RefundCancelledAccount.php b/app/Jobs/Ninja/RefundCancelledAccount.php index 9bc2e40ea74c..0a1154d153c6 100644 --- a/app/Jobs/Ninja/RefundCancelledAccount.php +++ b/app/Jobs/Ninja/RefundCancelledAccount.php @@ -41,16 +41,19 @@ class RefundCancelledAccount implements ShouldQueue $plan_details = $this->account->getPlanDetails(); - if(!$plan_details) + if (!$plan_details) { return; + } /* Trial user cancelling early.... */ - if ($plan_details['trial_plan']) + if ($plan_details['trial_plan']) { return; + } /* Is the plan Active? */ - if (! $plan_details['active']) + if (! $plan_details['active']) { return; + } /* Refundable client! */ diff --git a/app/Jobs/Ninja/SendReminders.php b/app/Jobs/Ninja/SendReminders.php index 6120332cd4c9..299dd1e0f607 100644 --- a/app/Jobs/Ninja/SendReminders.php +++ b/app/Jobs/Ninja/SendReminders.php @@ -47,26 +47,18 @@ class SendReminders implements ShouldQueue */ public function handle() { - info("Sending reminders ".Carbon::now()->format('Y-m-d h:i:s')); if (! config('ninja.db.multi_db_enabled')) { - $this->sendReminderEmails(); - - } else { //multiDB environment, need to - foreach (MultiDB::$dbs as $db) - { - + foreach (MultiDB::$dbs as $db) { MultiDB::setDB($db); $this->sendReminderEmails(); } - } - } @@ -80,21 +72,17 @@ class SendReminders implements ShouldQueue ->cursor(); //we only need invoices that are payable - $invoices->filter(function ($invoice){ - + $invoices->filter(function ($invoice) { return $invoice->isPayable(); + })->each(function ($invoice) { + $reminder_template = $invoice->calculateTemplate('invoice'); - })->each(function ($invoice){ - - $reminder_template = $invoice->calculateTemplate('invoice'); - - info("hitting a reminder for {$invoice->number} with template {$reminder_template}"); + info("hitting a reminder for {$invoice->number} with template {$reminder_template}"); - if(in_array($reminder_template, ['reminder1', 'reminder2', 'reminder3', 'endless_reminder'])) - $this->sendReminder($invoice, $reminder_template); - + if (in_array($reminder_template, ['reminder1', 'reminder2', 'reminder3', 'endless_reminder'])) { + $this->sendReminder($invoice, $reminder_template); + } }); - } private function checkSendSetting($invoice, $template) @@ -111,7 +99,7 @@ class SendReminders implements ShouldQueue break; case 'endless_reminder': return $invoice->client->getSetting('enable_reminder_endless'); - break; + break; default: return false; break; @@ -121,9 +109,9 @@ class SendReminders implements ShouldQueue /** * Create a collection of all possible reminder dates * and pass back the first one in chronology - * + * * @param Invoice $invoice - * @return Carbon $date + * @return Carbon $date */ private function calculateNextSendDate($invoice) { @@ -135,41 +123,41 @@ class SendReminders implements ShouldQueue $set_reminder2 = false; $set_reminder3 = false; - if((int)$settings->schedule_reminder1 > 0){ - + if ((int)$settings->schedule_reminder1 > 0) { $next_reminder_date = $this->calculateScheduledDate($invoice, (int)$settings->schedule_reminder1, (int)$settings->num_days_reminder1); - if($next_reminder_date->gt(Carbon::parse($invoice->last_sent_date))); - $dates->push($next_reminder_date); + if ($next_reminder_date->gt(Carbon::parse($invoice->last_sent_date))); + $dates->push($next_reminder_date); - if(!$invoice->reminder1_sent) + if (!$invoice->reminder1_sent) { $set_reminder1 = true; + } } - if((int)$settings->num_days_reminder2 > 0){ - + if ((int)$settings->num_days_reminder2 > 0) { $next_reminder_date = $this->calculateScheduledDate($invoice, (int)$settings->schedule_reminder2, (int)$settings->num_days_reminder2); - if($next_reminder_date->gt(Carbon::parse($invoice->last_sent_date))); - $dates->push($next_reminder_date); + if ($next_reminder_date->gt(Carbon::parse($invoice->last_sent_date))); + $dates->push($next_reminder_date); - if(!$invoice->reminder2_sent) + if (!$invoice->reminder2_sent) { $set_reminder3 = true; + } } - if((int)$settings->num_days_reminder3 > 0){ - + if ((int)$settings->num_days_reminder3 > 0) { $next_reminder_date = $this->calculateScheduledDate($invoice, (int)$settings->schedule_reminder3, (int)$settings->num_days_reminder3); - if($next_reminder_date->gt(Carbon::parse($invoice->last_sent_date))); - $dates->push($next_reminder_date); + if ($next_reminder_date->gt(Carbon::parse($invoice->last_sent_date))); + $dates->push($next_reminder_date); - if(!$invoice->reminder3_sent) + if (!$invoice->reminder3_sent) { $set_reminder3 = true; + } } //If all the available reminders have fired, we then start to fire the endless reminders - if((int)$settings->endless_reminder_frequency_id > 0 && !$set_reminder1 && !$set_reminder2 && !$set_reminder3) { + if ((int)$settings->endless_reminder_frequency_id > 0 && !$set_reminder1 && !$set_reminder2 && !$set_reminder3) { $dates->push($this->addTimeInterval($invoice->last_sent_date, (int)$settings->endless_reminder_frequency_id)); } @@ -179,10 +167,10 @@ class SendReminders implements ShouldQueue /** * Helper method which switches values based on the $schedule_reminder - * @param Invoice $invoice - * @param string $schedule_reminder - * @param int $num_days_reminder - * @return Carbon $date + * @param Invoice $invoice + * @param string $schedule_reminder + * @param int $num_days_reminder + * @return Carbon $date */ private function calculateScheduledDate($invoice, $schedule_reminder, $num_days_reminder) :?Carbon { @@ -204,48 +192,46 @@ class SendReminders implements ShouldQueue /** * Sends the reminder and/or late fee for the invoice. - * - * @param Invoice $invoice - * @param string $template - * @return void + * + * @param Invoice $invoice + * @param string $template + * @return void */ private function sendReminder($invoice, $template) :void { $invoice = $this->calcLateFee($invoice, $template); - $invoice->invitations->each(function ($invitation) use($template, $invoice){ + $invoice->invitations->each(function ($invitation) use ($template, $invoice) { //only send if enable_reminder setting is toggled to yes - if($this->checkSendSetting($invoice, $template)) { - + if ($this->checkSendSetting($invoice, $template)) { info("firing email"); EmailEntity::dispatchNow($invitation, $invitation->company, $template); - } - - }); - if($this->checkSendSetting($invoice, $template)) - event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars())); + if ($this->checkSendSetting($invoice, $template)) { + event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars())); + } - $invoice->last_sent_date = now(); - $invoice->next_send_date = $this->calculateNextSendDate($invoice); + $invoice->last_sent_date = now(); + $invoice->next_send_date = $this->calculateNextSendDate($invoice); - if(in_array($template, ['reminder1', 'reminder2', 'reminder3'])) - $invoice->{$template."_sent"} = now(); + if (in_array($template, ['reminder1', 'reminder2', 'reminder3'])) { + $invoice->{$template."_sent"} = now(); + } - $invoice->save(); + $invoice->save(); } /** * Calculates the late if - if any - and rebuilds the invoice - * - * @param Invoice $invoice - * @param string $template - * @return Invoice + * + * @param Invoice $invoice + * @param string $template + * @return Invoice */ private function calcLateFee($invoice, $template) :Invoice { @@ -268,7 +254,7 @@ class SendReminders implements ShouldQueue case 'endless_reminder': $late_fee_amount = $invoice->client->getSetting('late_fee_endless_amount'); $late_fee_percent = $invoice->client->getSetting('late_fee_endless_percent'); - break; + break; default: $late_fee_amount = 0; $late_fee_percent = 0; @@ -276,31 +262,32 @@ class SendReminders implements ShouldQueue } return $this->setLateFee($invoice, $late_fee_amount, $late_fee_percent); - } /** * Applies the late fee to the invoice line items - * - * @param Invoice $invoice + * + * @param Invoice $invoice * @param float $amount The fee amount * @param float $percent The fee percentage amount - * - * @return Invoice + * + * @return Invoice */ private function setLateFee($invoice, $amount, $percent) :Invoice { $temp_invoice_balance = $invoice->balance; - if ($amount <= 0 && $percent <= 0) + if ($amount <= 0 && $percent <= 0) { return $invoice; + } $fee = $amount; - if ($invoice->partial > 0) + if ($invoice->partial > 0) { $fee += round($invoice->partial * $percent / 100, 2); - else + } else { $fee += round($invoice->balance * $percent / 100, 2); + } $invoice_item = new InvoiceItem; $invoice_item->type_id = '5'; @@ -321,7 +308,5 @@ class SendReminders implements ShouldQueue $this->invoice->ledger()->updateInvoiceBalance($this->invoice->balance - $temp_invoice_balance); return $invoice; - } - -} \ No newline at end of file +} diff --git a/app/Jobs/Payment/EmailPayment.php b/app/Jobs/Payment/EmailPayment.php index 5e751b333f79..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 { @@ -73,37 +66,29 @@ class EmailPayment extends BaseMailerJob implements ShouldQueue */ public function handle() { - - if($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } if ($this->contact->email) { - - MultiDB::setDb($this->company->db); + MultiDB::setDb($this->company->db); //if we need to set an email driver do it now $this->setMailDriver(); $email_builder = (new PaymentEmailEngine($this->payment, $this->contact))->build(); - try{ - + try { $mail = Mail::to($this->contact->email, $this->contact->present()->name()); $mail->send(new TemplateEmail($email_builder, $this->contact->user, $this->contact->client)); - - }catch(\Exception $e) { - + } catch (\Exception $e) { info("mailing failed with message " . $e->getMessage()); event(new PaymentWasEmailedAndFailed($this->payment, $this->company, Mail::failures(), Ninja::eventVars())); $this->failed($e); return $this->logMailError($e->getMessage(), $this->payment->client); - } event(new PaymentWasEmailed($this->payment, $this->payment->company, Ninja::eventVars())); - } } - - } 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 4f7098b34ae8..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; @@ -60,9 +57,7 @@ class UpdateOrCreateProduct implements ShouldQueue //only update / create products - not tasks or gateway fees $updateable_products = collect($this->products)->filter(function ($item) { - return $item->type_id == 1; - }); foreach ($updateable_products as $item) { @@ -98,6 +93,6 @@ class UpdateOrCreateProduct implements ShouldQueue public function failed($exception = null) { info("update create failed with = "); - info(print_r($exception->getMessage(),1)); + info(print_r($exception->getMessage(), 1)); } } 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 3df78415c903..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 @@ -67,19 +65,18 @@ class SendRecurring implements ShouldQueue ->createInvitations() ->save(); - info("Invoice {$invoice->number} created"); + info("Invoice {$invoice->number} created"); $invoice->invitations->each(function ($invitation) use ($invoice) { - - if($invitation->contact && strlen($invitation->contact->email) >=1){ + if ($invitation->contact && strlen($invitation->contact->email) >=1) { EmailEntity::dispatch($invitation, $invoice->company); info("Firing email for invoice {$invoice->number}"); } - }); - if($invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $this->recurring_invoice->auto_bill_enabled) + if ($invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $this->recurring_invoice->auto_bill_enabled) { $invoice->service()->autoBill()->save(); + } info("updating recurring invoice dates"); /* Set next date here to prevent a recurring loop forming */ @@ -88,8 +85,9 @@ class SendRecurring implements ShouldQueue $this->recurring_invoice->last_sent_date = date('Y-m-d'); /* Set completed if we don't have any more cycles remaining*/ - if ($this->recurring_invoice->remaining_cycles == 0) + if ($this->recurring_invoice->remaining_cycles == 0) { $this->recurring_invoice->setCompleted(); + } info("next send date = " . $this->recurring_invoice->next_send_date); info("remaining cycles = " . $this->recurring_invoice->remaining_cycles); @@ -100,7 +98,6 @@ class SendRecurring implements ShouldQueue //this is duplicated!! // if ($invoice->invitations->count() > 0) // event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars())); - } public function failed($exception = null) @@ -116,5 +113,4 @@ class SendRecurring implements ShouldQueue info(print_r($exception->getMessage(), 1)); } - } 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 fb3a963d84a6..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; @@ -54,8 +52,9 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue public function handle() { - if($this->company->is_disabled) + if ($this->company->is_disabled) { return true; + } //Set DB MultiDB::setDb($this->company->db); @@ -74,19 +73,15 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue //Send email via a Mailable class // try { - Mail::to($this->old_email) + Mail::to($this->old_email) ->send(new UserNotificationMailer($mail_obj)); - Mail::to($this->new_email) + Mail::to($this->new_email) ->send(new UserNotificationMailer($mail_obj)); - } - catch (\Exception $e) { - + } catch (\Exception $e) { $this->failed($e); $this->logMailError($e->getMessage(), $this->company->owner()); - } - } private function getData() diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 5e26f3ceb784..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; @@ -156,7 +151,7 @@ class Import implements ShouldQueue // public $backoff = 86430; - // public $maxExceptions = 2; + // public $maxExceptions = 2; /** * Create a new job instance. * @@ -178,16 +173,15 @@ class Import implements ShouldQueue * * @return bool */ - public function handle() + public function handle() { set_time_limit(0); - // $jsonStream = \JsonMachine\JsonMachine::fromFile($this->file_path, "/data"); + // $jsonStream = \JsonMachine\JsonMachine::fromFile($this->file_path, "/data"); $array = json_decode(file_get_contents($this->file_path), 1); $data = $array['data']; foreach ($this->available_imports as $import) { - if (! array_key_exists($import, $data)) { //throw new ResourceNotAvailableForMigration("Resource {$key} is not available for migration."); info("Resource {$import} is not available for migration."); @@ -210,7 +204,6 @@ class Import implements ShouldQueue CompanySizeCheck::dispatch(); info('Completed🚀🚀🚀🚀🚀 at '.now()); - } private function setInitialCompanyLedgerBalances() @@ -268,15 +261,12 @@ class Import implements ShouldQueue $company_repository = new CompanyRepository(); $company_repository->save($data, $this->company); - if(isset($data['settings']->company_logo) && strlen($data['settings']->company_logo) > 0) { - + if (isset($data['settings']->company_logo) && strlen($data['settings']->company_logo) > 0) { try { $tempImage = tempnam(sys_get_temp_dir(), basename($data['settings']->company_logo)); copy($data['settings']->company_logo, $tempImage); $this->uploadLogo($tempImage, $this->company, $this->company); - } - catch(\Exception $e){ - + } catch (\Exception $e) { } } @@ -596,7 +586,6 @@ class Import implements ShouldQueue $invoice_repository = new InvoiceMigrationRepository(); foreach ($data as $key => $resource) { - $modified = $resource; if (array_key_exists('client_id', $resource) && ! array_key_exists('clients', $this->ids)) { @@ -621,7 +610,6 @@ class Import implements ShouldQueue 'old' => $resource['id'], 'new' => $invoice->id, ]; - } RecurringInvoice::reguard(); @@ -629,7 +617,6 @@ class Import implements ShouldQueue /*Improve memory handling by setting everything to null when we have finished*/ $data = null; $invoice_repository = null; - } private function processInvoices(array $data): void @@ -785,7 +772,6 @@ class Import implements ShouldQueue private function processPayments(array $data): void { - Payment::reguard(); $rules = [ @@ -818,14 +804,12 @@ class Import implements ShouldQueue if (isset($modified['invoices'])) { foreach ($modified['invoices'] as $key => $invoice) { - - if($this->tryTransformingId('invoices', $invoice['invoice_id'])) + if ($this->tryTransformingId('invoices', $invoice['invoice_id'])) { $modified['invoices'][$key]['invoice_id'] = $this->transformId('invoices', $invoice['invoice_id']); - else{ + } else { $modified['credits'][$key]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']); $modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount']; } - } } @@ -886,12 +870,12 @@ class Import implements ShouldQueue $payment->status_id = Payment::STATUS_PARTIALLY_REFUNDED; $payment->save(); return $payment; - break; + break; case 6: $payment->status_id = Payment::STATUS_REFUNDED; $payment->save(); return $payment; - break; + break; default: return $payment; @@ -901,11 +885,10 @@ class Import implements ShouldQueue private function processDocuments(array $data): void { - // Document::unguard(); + // Document::unguard(); /* No validators since data provided by database is already valid. */ - foreach($data as $resource) - { + foreach ($data as $resource) { $modified = $resource; if (array_key_exists('invoice_id', $resource) && $resource['invoice_id'] && ! array_key_exists('invoices', $this->ids)) { @@ -927,7 +910,6 @@ class Import implements ShouldQueue } $this->saveDocument(file_get_contents($resource['url']), $entity, $is_public = true); - } // foreach ($data as $resource) { @@ -1079,7 +1061,8 @@ class Import implements ShouldQueue } private function processTaskStatuses(array $data) :void - {info('in task statuses'); + { + info('in task statuses'); TaskStatus::unguard(); foreach ($data as $resource) { @@ -1149,17 +1132,21 @@ class Import implements ShouldQueue $modified['company_id'] = $this->company->id; $modified['user_id'] = $this->processUserId($resource); - if(isset($modified['client_id'])) + if (isset($modified['client_id'])) { $modified['client_id'] = $this->transformId('clients', $resource['client_id']); + } - if(isset($modified['invoice_id'])) + if (isset($modified['invoice_id'])) { $modified['invoice_id'] = $this->transformId('invoices', $resource['invoice_id']); + } - if(isset($modified['project_id'])) + if (isset($modified['project_id'])) { $modified['project_id'] = $this->transformId('projects', $resource['project_id']); + } - if(isset($modified['status_id'])) + if (isset($modified['status_id'])) { $modified['status_id'] = $this->transformId('task_statuses', $resource['status_id']); + } $task = Task::Create($modified); @@ -1190,8 +1177,9 @@ class Import implements ShouldQueue $modified['company_id'] = $this->company->id; $modified['user_id'] = $this->processUserId($resource); - if(isset($modified['client_id'])) + if (isset($modified['client_id'])) { $modified['client_id'] = $this->transformId('clients', $resource['client_id']); + } $project = Project::Create($modified); @@ -1201,7 +1189,6 @@ class Import implements ShouldQueue 'old' => $resource['id'], 'new' => $project->id, ]; - } Project::reguard(); @@ -1211,7 +1198,6 @@ class Import implements ShouldQueue private function processExpenses(array $data) :void { - Expense::unguard(); foreach ($data as $resource) { @@ -1222,20 +1208,25 @@ class Import implements ShouldQueue $modified['company_id'] = $this->company->id; $modified['user_id'] = $this->processUserId($resource); - if(isset($resource['client_id'])) + if (isset($resource['client_id'])) { $modified['client_id'] = $this->transformId('clients', $resource['client_id']); + } - if(isset($resource['category_id'])) + if (isset($resource['category_id'])) { $modified['category_id'] = $this->transformId('expense_categories', $resource['category_id']); + } - if(isset($resource['invoice_id'])) + if (isset($resource['invoice_id'])) { $modified['invoice_id'] = $this->transformId('invoices', $resource['invoice_id']); + } - if(isset($resource['project_id'])) + if (isset($resource['project_id'])) { $modified['project_id'] = $this->transformId('projects', $resource['project_id']); + } - if(isset($resource['vendor_id'])) + if (isset($resource['vendor_id'])) { $modified['vendor_id'] = $this->transformId('vendors', $resource['vendor_id']); + } $expense = Expense::Create($modified); @@ -1252,7 +1243,6 @@ class Import implements ShouldQueue Expense::reguard(); $data = null; - } /** * |-------------------------------------------------------------------------- @@ -1289,7 +1279,7 @@ class Import implements ShouldQueue public function transformId($resource, string $old): int { if (! array_key_exists($resource, $this->ids)) { - info(print_r($resource,1)); + info(print_r($resource, 1)); throw new Exception("Resource {$resource} not available."); } @@ -1345,7 +1335,5 @@ class Import implements ShouldQueue ->batch(); info(print_r($exception->getMessage(), 1)); - } - } 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 4ad02907e345..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 { @@ -55,37 +51,27 @@ class ReminderJob implements ShouldQueue $this->processReminders($db); } } - } private function processReminders($db = null) { - Invoice::where('next_send_date', Carbon::today()->format('Y-m-d'))->with('invitations')->cursor()->each(function ($invoice) { - if ($invoice->isPayable()) { - - $reminder_template = $invoice->calculateTemplate('invoice'); + $reminder_template = $invoice->calculateTemplate('invoice'); $invoice->service()->touchReminder($this->reminder_template)->save(); $invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) { - EmailEntity::dispatch($invitation, $invitation->company, $reminder_template); info("Firing email for invoice {$invoice->number}"); }); - if ($invoice->invitations->count() > 0) + if ($invoice->invitations->count() > 0) { event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars())); - - + } } else { - $invoice->next_send_date = null; $invoice->save(); - } - }); - } } diff --git a/app/Jobs/Util/SendFailedEmails.php b/app/Jobs/Util/SendFailedEmails.php index 19281c19a1e7..2882c11c0a19 100644 --- a/app/Jobs/Util/SendFailedEmails.php +++ b/app/Jobs/Util/SendFailedEmails.php @@ -55,7 +55,6 @@ class SendFailedEmails implements ShouldQueue private function processEmails() { - $email_jobs = SystemLog::where('event_id', SystemLog::EVENT_MAIL_RETRY_QUEUE)->get(); $email_jobs->each(function ($job) { @@ -64,7 +63,6 @@ class SendFailedEmails implements ShouldQueue $invitation = $job_meta_array['entity_name']::where('key', $job_meta_array['invitation_key'])->with('contact')->first(); if ($invitation->invoice) { - if ($invitation->contact->send_email && $invitation->contact->email) { EmailEntity::dispatch($invitation, $invitation->company, $job_meta_array['reminder_template']); } diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php index e782549ae958..78eabfe608da 100644 --- a/app/Jobs/Util/StartMigration.php +++ b/app/Jobs/Util/StartMigration.php @@ -55,7 +55,7 @@ class StartMigration implements ShouldQueue public $timeout = 0; - // public $maxExceptions = 2; + // public $maxExceptions = 2; //public $backoff = 86430; @@ -111,7 +111,6 @@ class StartMigration implements ShouldQueue //Import::dispatchNow($data['data'], $this->company, $this->user); Import::dispatchNow($file, $this->company, $this->user); } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing $e) { - Mail::to($this->user)->send(new MigrationFailed($e, $e->getMessage())); if (app()->environment() !== 'production') { @@ -126,6 +125,6 @@ class StartMigration implements ShouldQueue public function failed($exception = null) { - info(print_r($exception->getMessage(),1)); + info(print_r($exception->getMessage(), 1)); } } 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 11ec72cff38e..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 { @@ -63,21 +63,22 @@ class WebhookHandler implements ShouldQueue MultiDB::setDb($this->company->db); - if (! $this->company || $this->company->is_disabled) + if (! $this->company || $this->company->is_disabled) { return true; + } $subscriptions = Webhook::where('company_id', $this->company->id) ->where('event_id', $this->event_id) ->get(); - if (! $subscriptions || $subscriptions->count() == 0) + if (! $subscriptions || $subscriptions->count() == 0) { return; + } $subscriptions->each(function ($subscription) { $this->process($subscription); }); - } private function process($subscription) 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 95dec6fe1c2d..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 { @@ -62,7 +53,6 @@ class InvoiceEmailedNotification implements ShouldQueue EntitySentMailer::dispatch($event->invitation, 'invoice', $user, $event->invitation->company); $first_notification_sent = false; - } $notification->method = $methods; diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php index c90bf32afbb5..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 @@ -57,9 +52,8 @@ class InvoicePaidActivity implements ShouldQueue try { $event->invoice->service()->touchPdf(); - } - catch(\Exception $e){ - info(print_r($e->getMessage(),1)); + } catch (\Exception $e) { + info(print_r($e->getMessage(), 1)); } } } 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 78920d20da35..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 { @@ -50,8 +41,6 @@ class PaymentEmailFailureActivity implements ShouldQueue $payment = $event->payment; info("i failed emailing {$payment->number}"); - // info(print_r($event->errors,1)); - + // info(print_r($event->errors,1)); } } - diff --git a/app/Listeners/Payment/PaymentEmailedActivity.php b/app/Listeners/Payment/PaymentEmailedActivity.php index 60bc6e8785e1..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 { @@ -52,4 +43,3 @@ class PaymentEmailedActivity implements ShouldQueue info("i succeeded in emailing payment {$payment->number}"); } } - diff --git a/app/Listeners/Payment/PaymentNotification.php b/app/Listeners/Payment/PaymentNotification.php index 07f194170169..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 @@ -55,7 +50,6 @@ class PaymentNotification implements ShouldQueue /*User notifications*/ foreach ($payment->company->company_users as $company_user) { - $user = $company_user->user; $methods = $this->findUserEntityNotificationType($payment, $company_user, ['all_notifications']); @@ -64,7 +58,6 @@ class PaymentNotification implements ShouldQueue unset($methods[$key]); EntityPaidMailer::dispatch($payment, $payment->company, $user); - } $notification = new NewPaymentNotification($payment, $payment->company); 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 2c1eb8a4f983..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 { @@ -51,11 +48,8 @@ class SendVerificationNotification implements ShouldQueue $event->user->notify(new VerifyUser($event->user, $event->company)); Ninja::registerNinjaUser($event->user); - } catch (Exception $e) { - info("I couldn't send the email " . $e->getMessage()); - } } } 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 21c8a4990085..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; @@ -40,6 +38,5 @@ class DownloadInvoices extends Mailable 'logo' => $this->company->present()->logo, ] ); - } } diff --git a/app/Mail/Engine/BaseEmailEngine.php b/app/Mail/Engine/BaseEmailEngine.php index 4b41dd965266..37c13c1f263b 100644 --- a/app/Mail/Engine/BaseEmailEngine.php +++ b/app/Mail/Engine/BaseEmailEngine.php @@ -13,129 +13,132 @@ namespace App\Mail\Engine; class BaseEmailEngine implements EngineInterface { - public $footer; + public $footer; - public $variables; + public $variables; - public $contact; + public $contact; - public $subject; + public $subject; - public $body; + public $body; - public $template_style; + public $template_style; - public $attachments; + public $attachments; - public $link; + public $link; - public $text; + public $text; public function setFooter($footer) { - $this->footer = $footer; + $this->footer = $footer; - return $this; + return $this; } public function setVariables($variables) { - $this->variables = $variables; + $this->variables = $variables; - return $this; + return $this; } public function setContact($contact) { - $this->contact = $contact; + $this->contact = $contact; - return $this; + return $this; } public function setSubject($subject) { - if (! empty($this->variables)) + if (! empty($this->variables)) { $subject = str_replace(array_keys($this->variables), array_values($this->variables), $subject); + } - $this->subject = $subject; + $this->subject = $subject; - return $this; + return $this; } public function setBody($body) { - if (! empty($this->variables)) + if (! empty($this->variables)) { $body = str_replace(array_keys($this->variables), array_values($this->variables), $body); + } - $this->body = $body; + $this->body = $body; - return $this; + return $this; } public function setTemplate($template_style) { - $this->template_style = $template_style; + $this->template_style = $template_style; - return $this; + return $this; } public function setAttachments($attachments) { - $this->attachments = $attachments; + $this->attachments = $attachments; - return $this; + return $this; } public function setViewLink($link) { - $this->link = $link; + $this->link = $link; - return $this; + return $this; } public function setViewText($text) { - $this->text = $text; + $this->text = $text; - return $this; + return $this; } public function getSubject() { - return $this->subject; + return $this->subject; } public function getBody() { - return $this->body; + return $this->body; } public function getAttachments() { - return $this->attachments; + return $this->attachments; } public function getFooter() { - return $this->footer; + return $this->footer; } public function getTemplate() { - return $this->template_style; + return $this->template_style; } public function getViewLink() { - return $this->link; + return $this->link; } public function getViewText() { - return $this->text; + return $this->text; } - public function build(){} - -} \ No newline at end of file + public function build() + { + } +} diff --git a/app/Mail/Engine/CreditEmailEngine.php b/app/Mail/Engine/CreditEmailEngine.php index 7529767001eb..7cbcbc0ec44b 100644 --- a/app/Mail/Engine/CreditEmailEngine.php +++ b/app/Mail/Engine/CreditEmailEngine.php @@ -14,15 +14,15 @@ namespace App\Mail\Engine; use App\Utils\HtmlEngine; use App\Utils\Number; -class CreditEmailEngine extends BaseEmailEngine +class CreditEmailEngine extends BaseEmailEngine { - public $invitation; + public $invitation; - public $client; + public $client; - public $credit; + public $credit; - public $contact; + public $contact; public $reminder_template; @@ -30,7 +30,7 @@ class CreditEmailEngine extends BaseEmailEngine public function __construct($invitation, $reminder_template, $template_data) { - $this->invitation = $invitation; + $this->invitation = $invitation; $this->reminder_template = $reminder_template; $this->client = $invitation->contact->client; $this->credit = $invitation->credit; @@ -40,11 +40,11 @@ class CreditEmailEngine extends BaseEmailEngine public function build() { - - if(is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) + if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) { $body_template = $this->template_data['body']; - else + } else { $body_template = $this->client->getSetting('email_template_'.$this->reminder_template); + } /* Use default translations if a custom message has not been set*/ if (iconv_strlen($body_template) == 0) { @@ -60,13 +60,13 @@ class CreditEmailEngine extends BaseEmailEngine ); } - if(is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) + if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) { $subject_template = $this->template_data['subject']; - else + } else { $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template); + } if (iconv_strlen($subject_template) == 0) { - $subject_template = trans( 'texts.credit_subject', [ @@ -76,7 +76,6 @@ class CreditEmailEngine extends BaseEmailEngine null, $this->client->locale() ); - } $this->setTemplate($this->client->getSetting('email_style')) @@ -93,8 +92,5 @@ class CreditEmailEngine extends BaseEmailEngine } return $this; - } - } - diff --git a/app/Mail/Engine/EngineInterface.php b/app/Mail/Engine/EngineInterface.php index 9196b1a1619a..8518ffe8b535 100644 --- a/app/Mail/Engine/EngineInterface.php +++ b/app/Mail/Engine/EngineInterface.php @@ -13,7 +13,6 @@ namespace App\Mail\Engine; interface EngineInterface { - public function setFooter($footer); public function setVariables($variables); @@ -47,5 +46,4 @@ interface EngineInterface public function getViewText(); public function build(); - -} \ No newline at end of file +} diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php index 3a455925f846..af72ac485fe9 100644 --- a/app/Mail/Engine/InvoiceEmailEngine.php +++ b/app/Mail/Engine/InvoiceEmailEngine.php @@ -15,15 +15,15 @@ use App\DataMapper\EmailTemplateDefaults; use App\Utils\HtmlEngine; use App\Utils\Number; -class InvoiceEmailEngine extends BaseEmailEngine +class InvoiceEmailEngine extends BaseEmailEngine { - public $invitation; + public $invitation; - public $client; + public $client; - public $invoice; + public $invoice; - public $contact; + public $contact; public $reminder_template; @@ -31,7 +31,7 @@ class InvoiceEmailEngine extends BaseEmailEngine public function __construct($invitation, $reminder_template, $template_data) { - $this->invitation = $invitation; + $this->invitation = $invitation; $this->reminder_template = $reminder_template; $this->client = $invitation->contact->client; $this->invoice = $invitation->invoice; @@ -41,12 +41,11 @@ class InvoiceEmailEngine extends BaseEmailEngine public function build() { - - if(is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) + if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) { $body_template = $this->template_data['body']; - elseif(strlen($this->client->getSetting('email_template_'.$this->reminder_template)) > 0) + } elseif (strlen($this->client->getSetting('email_template_'.$this->reminder_template)) > 0) { $body_template = $this->client->getSetting('email_template_'.$this->reminder_template); - else{ + } else { $body_template = EmailTemplateDefaults::getDefaultTemplate('email_template_'.$this->reminder_template, $this->client->locale()); } @@ -64,22 +63,19 @@ class InvoiceEmailEngine extends BaseEmailEngine ); } - if(is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0){ + if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) { $subject_template = $this->template_data['subject']; info("subject = template data"); - } - elseif(strlen($this->client->getSetting('email_subject_'.$this->reminder_template)) > 0){ + } elseif (strlen($this->client->getSetting('email_subject_'.$this->reminder_template)) > 0) { $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template); info("subject = settings var"); - } - else{ + } else { info("subject = default template " . 'email_subject_'.$this->reminder_template); $subject_template = EmailTemplateDefaults::getDefaultTemplate('email_subject_'.$this->reminder_template, $this->client->locale()); - // $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template); + // $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template); } if (iconv_strlen($subject_template) == 0) { - $subject_template = trans( 'texts.invoice_subject', [ @@ -89,7 +85,6 @@ class InvoiceEmailEngine extends BaseEmailEngine null, $this->client->locale() ); - } $this->setTemplate($this->client->getSetting('email_style')) @@ -106,8 +101,5 @@ class InvoiceEmailEngine extends BaseEmailEngine } return $this; - } - } - diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php index 48724998d6bd..f76c395adb50 100644 --- a/app/Mail/Engine/PaymentEmailEngine.php +++ b/app/Mail/Engine/PaymentEmailEngine.php @@ -12,17 +12,16 @@ namespace App\Mail\Engine; use App\DataMapper\EmailTemplateDefaults; -use App\Utils\HtmlEngine; use App\Utils\Number; use App\Utils\Traits\MakesDates; -class PaymentEmailEngine extends BaseEmailEngine +class PaymentEmailEngine extends BaseEmailEngine { use MakesDates; - public $client; + public $client; - public $payment; + public $payment; public $template_data; @@ -44,12 +43,11 @@ class PaymentEmailEngine extends BaseEmailEngine public function build() { - - if(is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) + if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) { $body_template = $this->template_data['body']; - elseif(strlen($this->client->getSetting('email_template_payment')) > 0) + } elseif (strlen($this->client->getSetting('email_template_payment')) > 0) { $body_template = $this->client->getSetting('email_template_payment'); - else{ + } else { $body_template = EmailTemplateDefaults::getDefaultTemplate('email_template_payment', $this->client->locale()); } @@ -63,13 +61,11 @@ class PaymentEmailEngine extends BaseEmailEngine ); } - if(is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0){ + if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) { $subject_template = $this->template_data['subject']; - } - elseif(strlen($this->client->getSetting('email_subject_payment')) > 0){ + } elseif (strlen($this->client->getSetting('email_subject_payment')) > 0) { $subject_template = $this->client->getSetting('email_subject_payment'); - } - else{ + } else { $subject_template = EmailTemplateDefaults::getDefaultTemplate('email_subject_payment', $this->client->locale()); } @@ -92,7 +88,6 @@ class PaymentEmailEngine extends BaseEmailEngine ->setViewText(''); return $this; - } @@ -115,7 +110,7 @@ class PaymentEmailEngine extends BaseEmailEngine $data['$payment2'] = ['value' => $this->formatCustomFieldValue('payment2', $this->payment->custom_value2) ?: ' ', 'label' => $this->makeCustomField('payment2')]; $data['$payment3'] = ['value' => $this->formatCustomFieldValue('payment3', $this->payment->custom_value3) ?: ' ', 'label' => $this->makeCustomField('payment3')]; $data['$payment4'] = ['value' => $this->formatCustomFieldValue('payment4', $this->payment->custom_value4) ?: ' ', 'label' => $this->makeCustomField('payment4')]; - // $data['$type'] = ['value' => $this->payment->type->name ?: '', 'label' => ctrans('texts.payment_type')]; + // $data['$type'] = ['value' => $this->payment->type->name ?: '', 'label' => ctrans('texts.payment_type')]; $data['$client1'] = ['value' => $this->formatCustomFieldValue('client1', $this->client->custom_value1) ?: ' ', 'label' => $this->makeCustomField('client1')]; $data['$client2'] = ['value' => $this->formatCustomFieldValue('client2', $this->client->custom_value2) ?: ' ', 'label' => $this->makeCustomField('client2')]; @@ -200,8 +195,7 @@ class PaymentEmailEngine extends BaseEmailEngine { $invoice_list = ''; - foreach($this->payment->invoices as $invoice) - { + foreach ($this->payment->invoices as $invoice) { $invoice_list .= ctrans('texts.invoice_number_short') . " {$invoice->number} - " . Number::formatMoney($invoice->pivot->amount, $this->client) . "
"; } @@ -232,8 +226,9 @@ class PaymentEmailEngine extends BaseEmailEngine $custom_field = $custom_fields->{$field}; $custom_field_parts = explode('|', $custom_field); - if(count($custom_field_parts) >= 2) + if (count($custom_field_parts) >= 2) { $custom_field = $custom_field_parts[1]; + } } switch ($custom_field) { @@ -260,4 +255,3 @@ class PaymentEmailEngine extends BaseEmailEngine return $data; } } - diff --git a/app/Mail/Engine/QuoteEmailEngine.php b/app/Mail/Engine/QuoteEmailEngine.php index af74cb93fc4f..eeea79ccc26a 100644 --- a/app/Mail/Engine/QuoteEmailEngine.php +++ b/app/Mail/Engine/QuoteEmailEngine.php @@ -14,23 +14,23 @@ namespace App\Mail\Engine; use App\Utils\HtmlEngine; use App\Utils\Number; -class QuoteEmailEngine extends BaseEmailEngine +class QuoteEmailEngine extends BaseEmailEngine { - public $invitation; + public $invitation; - public $client; + public $client; - public $quote; + public $quote; - public $contact; + public $contact; public $reminder_template; - public $template_data; + public $template_data; public function __construct($invitation, $reminder_template, $template_data) { - $this->invitation = $invitation; + $this->invitation = $invitation; $this->reminder_template = $reminder_template; $this->client = $invitation->contact->client; $this->quote = $invitation->quote; @@ -40,11 +40,11 @@ class QuoteEmailEngine extends BaseEmailEngine public function build() { - - if(is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) + if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) { $body_template = $this->template_data['body']; - else + } else { $body_template = $this->client->getSetting('email_template_'.$this->reminder_template); + } /* Use default translations if a custom message has not been set*/ if (iconv_strlen($body_template) == 0) { @@ -60,13 +60,13 @@ class QuoteEmailEngine extends BaseEmailEngine ); } - if(is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) + if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) { $subject_template = $this->template_data['subject']; - else + } else { $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template); + } if (iconv_strlen($subject_template) == 0) { - $subject_template = trans( 'texts.quote_subject', [ @@ -76,7 +76,6 @@ class QuoteEmailEngine extends BaseEmailEngine null, $this->client->locale() ); - } $this->setTemplate($this->client->getSetting('email_style')) @@ -93,8 +92,5 @@ class QuoteEmailEngine extends BaseEmailEngine } return $this; - } - } - 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 2f180c365c48..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; @@ -47,7 +46,6 @@ class TemplateEmail extends Mailable */ public function build() { - $template_name = 'email.template.'.$this->build_email->getTemplate(); $settings = $this->client->getMergedSettings(); @@ -56,13 +54,15 @@ class TemplateEmail extends Mailable $this->from($this->user->email, $this->user->present()->name()); - if(strlen($settings->reply_to_email) > 1) + if (strlen($settings->reply_to_email) > 1) { $this->replyTo($settings->reply_to_email, $settings->reply_to_email); + } - if(strlen($settings->bcc_email) > 1) + if (strlen($settings->bcc_email) > 1) { $this->bcc($settings->bcc_email, $settings->bcc_email); + } - $this->subject($this->build_email->getSubject()) + $this->subject($this->build_email->getSubject()) ->text('email.template.plain', [ 'body' => $this->build_email->getBody(), 'footer' => $this->build_email->getFooter(), 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 607dc86890fa..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 { @@ -157,7 +156,7 @@ class Activity extends StaticModel return $this->belongsTo(Company::class); } - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { if (is_numeric($value)) { throw new ModelNotFoundException("Record with value {$value} not found"); 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 305fcd4ff451..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 { @@ -166,7 +161,7 @@ class BaseModel extends Model * @param null $field * @return Model|null */ - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { if (is_numeric($value)) { throw new ModelNotFoundException("Record with value {$value} not found"); diff --git a/app/Models/Client.php b/app/Models/Client.php index b9aee73742cc..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 @@ -243,7 +220,6 @@ class Client extends BaseModel implements HasLocalePreference return $date_formats->filter(function ($item) { return $item->id == $this->getSetting('date_format_id'); })->first()->format; - } public function currency() @@ -384,7 +360,7 @@ class Client extends BaseModel implements HasLocalePreference return array_search($model->id, $transformed_ids); }); } else { - $gateways = $this->company->company_gateways; + $gateways = $this->company->company_gateways; } foreach ($gateways as $gateway) { @@ -472,7 +448,6 @@ class Client extends BaseModel implements HasLocalePreference //we need to check for "0" here as we disable a payment gateway for a client with the number "0" if ($company_gateways || $company_gateways == '0') { - $transformed_ids = $this->transformKeys(explode(',', $company_gateways)); $gateways = $this->company ->company_gateways @@ -488,21 +463,13 @@ class Client extends BaseModel implements HasLocalePreference foreach ($gateways as $gateway) { foreach ($gateway->driver($this)->gatewayTypes() as $type) { - - if(isset($gateway->fees_and_limits) && property_exists($gateway->fees_and_limits, $type)) - { - - if($this->validGatewayForAmount($gateway->fees_and_limits->{$type}, $amount)) + if (isset($gateway->fees_and_limits) && property_exists($gateway->fees_and_limits, $type)) { + if ($this->validGatewayForAmount($gateway->fees_and_limits->{$type}, $amount)) { $payment_methods[] = [$gateway->id => $type]; - - } - else - { - + } + } else { $payment_methods[] = [$gateway->id => $type]; - } - } } @@ -527,8 +494,8 @@ class Client extends BaseModel implements HasLocalePreference } } - if(($this->getSetting('use_credits_payment') == 'option' || $this->getSetting('use_credits_payment') == 'always') && $this->service()->getCreditBalance() > 0) { - $payment_urls[] = [ + if (($this->getSetting('use_credits_payment') == 'option' || $this->getSetting('use_credits_payment') == 'always') && $this->service()->getCreditBalance() > 0) { + $payment_urls[] = [ 'label' => ctrans('texts.apply_credit'), 'company_gateway_id' => CompanyGateway::GATEWAY_CREDIT, 'gateway_type_id' => GatewayType::CREDIT, @@ -540,21 +507,21 @@ class Client extends BaseModel implements HasLocalePreference public function validGatewayForAmount($fees_and_limits_for_payment_type, $amount) :bool { - if (isset($fees_and_limits_for_payment_type)) { - $fees_and_limits = $fees_and_limits_for_payment_type; - } else { - return true; - } - - if ((property_exists($fees_and_limits, 'min_limit')) && $fees_and_limits->min_limit !== null && $fees_and_limits->min_limit != -1 && $amount < $fees_and_limits->min_limit) { - return false; - } - - if ((property_exists($fees_and_limits, 'max_limit')) && $fees_and_limits->max_limit !== null && $fees_and_limits->max_limit != -1 && $amount > $fees_and_limits->max_limit) { - return false; - } - + if (isset($fees_and_limits_for_payment_type)) { + $fees_and_limits = $fees_and_limits_for_payment_type; + } else { return true; + } + + if ((property_exists($fees_and_limits, 'min_limit')) && $fees_and_limits->min_limit !== null && $fees_and_limits->min_limit != -1 && $amount < $fees_and_limits->min_limit) { + return false; + } + + if ((property_exists($fees_and_limits, 'max_limit')) && $fees_and_limits->max_limit !== null && $fees_and_limits->max_limit != -1 && $amount > $fees_and_limits->max_limit) { + return false; + } + + return true; } public function preferredLocale() diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php index c800db4c8ff6..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 @@ -185,7 +178,7 @@ class ClientContact extends Authenticatable implements HasLocalePreference * @param null $field * @return Model|null */ - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this ->withTrashed() @@ -212,11 +205,8 @@ class ClientContact extends Authenticatable implements HasLocalePreference */ public function getLoginLink() { - $domain = isset($this->company->portal_domain) ?: $this->company->domain(); return $domain . 'client/key_login/' . $this->contact_key; - } - } diff --git a/app/Models/ClientGatewayToken.php b/app/Models/ClientGatewayToken.php index d8148e15c2d5..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; @@ -71,7 +66,7 @@ class ClientGatewayToken extends BaseModel * @param null $field * @return Model|null */ - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this ->where('id', $this->decodePrimaryKey($value))->firstOrFail(); diff --git a/app/Models/Company.php b/app/Models/Company.php index e7e333282d61..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 @@ -416,7 +391,7 @@ class Company extends BaseModel return User::find($c->user_id); } - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this->where('id', $this->decodePrimaryKey($value))->firstOrFail(); } @@ -439,6 +414,4 @@ class Company extends BaseModel { return $this->slack_webhook_url; } - - } diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index c9a98ef12591..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; @@ -241,7 +236,6 @@ class CompanyGateway extends BaseModel } return $this->fees_and_limits->{$gateway_type_id}; - } /** @@ -272,7 +266,6 @@ class CompanyGateway extends BaseModel public function calcGatewayFee($amount, $include_taxes = false, $gateway_type_id = GatewayType::CREDIT_CARD) { - $fees_and_limits = $this->getFeesAndLimits($gateway_type_id); if (! $fees_and_limits) { @@ -288,9 +281,9 @@ class CompanyGateway extends BaseModel if ($fees_and_limits->fee_percent) { if ($fees_and_limits->adjust_fee_percent) { - $fee += round(($amount / (1 - $fees_and_limits->fee_percent / 100) - $amount),2); + $fee += round(($amount / (1 - $fees_and_limits->fee_percent / 100) - $amount), 2); } else { - $fee += round(($amount * $fees_and_limits->fee_percent / 100),2); + $fee += round(($amount * $fees_and_limits->fee_percent / 100), 2); } info("fee after adding fee percent = {$fee}"); } @@ -305,17 +298,17 @@ class CompanyGateway extends BaseModel /**/ if ($include_taxes) { if ($fees_and_limits->fee_tax_rate1) { - $fee += round(($pre_tax_fee * $fees_and_limits->fee_tax_rate1 / 100),2); + $fee += round(($pre_tax_fee * $fees_and_limits->fee_tax_rate1 / 100), 2); info("fee after adding fee tax 1 = {$fee}"); } if ($fees_and_limits->fee_tax_rate2) { - $fee += round(($pre_tax_fee * $fees_and_limits->fee_tax_rate2 / 100),2); + $fee += round(($pre_tax_fee * $fees_and_limits->fee_tax_rate2 / 100), 2); info("fee after adding fee tax 2 = {$fee}"); } if ($fees_and_limits->fee_tax_rate3) { - $fee += round(($pre_tax_fee * $fees_and_limits->fee_tax_rate3 / 100),2); + $fee += round(($pre_tax_fee * $fees_and_limits->fee_tax_rate3 / 100), 2); info("fee after adding fee tax 3 = {$fee}"); } } @@ -359,7 +352,7 @@ class CompanyGateway extends BaseModel // $fee_component_tax_rate3 = $fees_and_limits->fee_tax_rate3 ? ($combined_fee_component * $fees_and_limits->fee_tax_rate3 / 100) : 0; // } - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this ->where('id', $this->decodePrimaryKey($value))->firstOrFail(); diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php index d202645047bb..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 @@ -51,7 +49,6 @@ class CompanyToken extends BaseModel public function company_user() { - return $this->hasOne(CompanyUser::class, 'user_id', 'user_id') ->where('company_id', $this->company_id) ->where('user_id', $this->user_id); diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php index 90386e136258..fd0c799adc70 100644 --- a/app/Models/CompanyUser.php +++ b/app/Models/CompanyUser.php @@ -16,7 +16,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; class CompanyUser extends Pivot { - use SoftDeletes; // protected $guarded = ['id']; 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 5a2ef08f1a30..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 = [ @@ -66,7 +63,7 @@ class Gateway extends StaticModel $link = 'https://applications.sagepay.com/apply/2C02C252-0F8A-1B84-E10D-CF933EFCAA99'; } elseif ($this->id == 20) { $link = 'https://dashboard.stripe.com/account/apikeys'; - } + } // $key = 'texts.gateway_help_'.$this->id; // $str = trans($key, [ @@ -82,8 +79,8 @@ class Gateway extends StaticModel /** * Returns an array of methods and the gatewaytypes possible - * - * @return array + * + * @return array *///todo remove methods replace with gatewaytype:: and then nest refund / token billing public function getMethods() { @@ -97,7 +94,7 @@ class Gateway extends StaticModel case 20: return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true], GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true], - GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false], + GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false], GatewayType::APPLE_PAY => ['refund' => false, 'token_billing' => false]]; //Stripe break; case 39: 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 f87dbb5c2979..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; @@ -64,7 +58,7 @@ class GroupSetting extends StaticModel * @param null $field * @return Model|null */ - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this ->where('id', $this->decodePrimaryKey($value))->firstOrFail(); 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 33b5760b1a59..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 @@ -207,7 +201,7 @@ class Payment extends BaseModel return new PaymentService($this); } - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this ->withTrashed() @@ -293,5 +287,4 @@ class Payment extends BaseModel { return route('client.payments.show', $this->hashed_id); } - } 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 4ca4eeade66c..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; @@ -12,7 +11,6 @@ use Laracasts\Presenter\PresentableTrait; */ class Project extends BaseModel { - use SoftDeletes; use PresentableTrait; use Filterable; 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 078202fbcfbb..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; @@ -181,15 +178,16 @@ class RecurringInvoice extends BaseModel public function getStatusAttribute() { - if ($this->status_id == self::STATUS_ACTIVE && Carbon::parse($this->next_send_date)->isFuture()) + if ($this->status_id == self::STATUS_ACTIVE && Carbon::parse($this->next_send_date)->isFuture()) { return self::STATUS_PENDING; - else + } else { return $this->status_id; + } } public function nextSendDate() :?Carbon { - if(!$this->next_send_date){ + if (!$this->next_send_date) { return null; // $this->next_send_date = now()->format('Y-m-d'); } @@ -224,7 +222,6 @@ class RecurringInvoice extends BaseModel public function nextDateByFrequency($date) { - switch ($this->frequency_id) { case self::FREQUENCY_WEEKLY: return Carbon::parse($date)->addWeek(); @@ -251,18 +248,15 @@ class RecurringInvoice extends BaseModel default: return null; } - } public function remainingCycles() : int { if ($this->remaining_cycles == 0) { return 0; - } - else if($this->remaining_cycles == -1) { + } elseif ($this->remaining_cycles == -1) { return -1; - } - else { + } else { return $this->remaining_cycles - 1; } } @@ -351,34 +345,33 @@ class RecurringInvoice extends BaseModel return $invoice_calc->build(); } - /* - * Important to note when playing with carbon dates - in order + /* + * Important to note when playing with carbon dates - in order * not to modify the original instance, always use a `->copy()` - * + * */ public function recurringDates() { - /* Return early if nothing to send back! */ - if( $this->status_id == self::STATUS_COMPLETED || + /* Return early if nothing to send back! */ + if ($this->status_id == self::STATUS_COMPLETED || $this->remaining_cycles == 0 || !$this->next_send_date) { - return []; } /* Endless - lets send 10 back*/ $iterations = $this->remaining_cycles; - if($this->remaining_cycles == -1) + if ($this->remaining_cycles == -1) { $iterations = 10; + } $next_send_date = Carbon::parse($this->next_send_date)->copy(); $data = []; - for($x=0; $x<$iterations; $x++) - { + for ($x=0; $x<$iterations; $x++) { // we don't add the days... we calc the day of the month!! $next_due_date = $this->calculateDueDate($next_send_date->copy()->format('Y-m-d')); $next_due_date_string = $next_due_date ? $next_due_date->format('Y-m-d') : ''; @@ -386,12 +379,11 @@ class RecurringInvoice extends BaseModel $next_send_date = Carbon::parse($next_send_date); $data[] = [ - 'send_date' => $next_send_date->format('Y-m-d'), + 'send_date' => $next_send_date->format('Y-m-d'), 'due_date' => $next_due_date_string ]; - $next_send_date = $this->nextDateByFrequency($next_send_date->format('Y-m-d')); - + $next_send_date = $this->nextDateByFrequency($next_send_date->format('Y-m-d')); } /*If no due date is set - unset the due_date value */ @@ -403,13 +395,11 @@ class RecurringInvoice extends BaseModel // } return $data; - } - public function calculateDueDate($date) + public function calculateDueDate($date) { - switch ($this->due_date_days) { case 'terms': return $this->calculateDateFromTerms($date); @@ -422,18 +412,19 @@ class RecurringInvoice extends BaseModel /** * Calculates a date based on the client payment terms. - * + * * @param Carbon $date A given date * @return NULL|Carbon The date */ - public function calculateDateFromTerms($date) + public function calculateDateFromTerms($date) { $new_date = Carbon::parse($date); $client_payment_terms = $this->client->getSetting('payment_terms'); - if($client_payment_terms == '')//no due date! return null; + if ($client_payment_terms == '') {//no due date! return null; return null; + } return $new_date->addDays($client_payment_terms); //add the number of days in the payment terms to the date } @@ -445,5 +436,4 @@ class RecurringInvoice extends BaseModel { return new RecurringService($this); } - } diff --git a/app/Models/RecurringInvoiceInvitation.php b/app/Models/RecurringInvoiceInvitation.php index bd24c7c535a7..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; @@ -86,5 +84,4 @@ class RecurringInvoiceInvitation extends BaseModel $this->opened_date = now(); $this->save(); } - } 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 54da10e23ad1..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; @@ -67,7 +66,7 @@ class SystemLog extends Model 'type_id', ]; - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { if (is_numeric($value)) { throw new ModelNotFoundException("Record with value {$value} not found"); @@ -86,4 +85,4 @@ class SystemLog extends Model return $query; } -} \ No newline at end of file +} diff --git a/app/Models/Task.php b/app/Models/Task.php index 47412d915618..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; @@ -115,7 +113,6 @@ class Task extends BaseModel } else { return ''; } - } public function calcDuration($start_time_cutoff = 0, $end_time_cutoff = 0) @@ -143,9 +140,4 @@ class Task extends BaseModel return round($duration); } - - - - - } diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php index c90ab601978a..e9a134a8b297 100644 --- a/app/Models/TaskStatus.php +++ b/app/Models/TaskStatus.php @@ -30,5 +30,4 @@ class TaskStatus extends BaseModel protected $dates = ['deleted_at']; protected $fillable = ['name']; - } 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 00653a53b18f..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; @@ -164,12 +157,11 @@ class User extends Authenticatable implements MustVerifyEmail */ public function getCompany() { - if ($this->company) { return $this->company; } - if(request()->header('X-API-TOKEN')){ + if (request()->header('X-API-TOKEN')) { $company_token = CompanyToken::whereRaw('BINARY `token`= ?', [request()->header('X-API-TOKEN')])->first(); return $company_token->company; } @@ -205,13 +197,11 @@ class User extends Authenticatable implements MustVerifyEmail $this->id = auth()->user()->id; } - if(request()->header('X-API-TOKEN')){ + if (request()->header('X-API-TOKEN')) { return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'company_id', 'id', 'company_id') ->where('company_tokens.token', request()->header('X-API-TOKEN')) ->withTrashed(); - } - else { - + } else { return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'company_id', 'id', 'company_id') ->where('company_user.user_id', $this->id) ->withTrashed(); @@ -354,7 +344,7 @@ class User extends Authenticatable implements MustVerifyEmail * @param null $field * @return Model|null */ - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this ->withTrashed() 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 acbff497cf43..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 @@ -137,7 +130,7 @@ class VendorContact extends Authenticatable implements HasLocalePreference * @param null $field * @return Model|null */ - public function resolveRouteBinding($value, $field = NULL) + public function resolveRouteBinding($value, $field = null) { return $this ->withTrashed() 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/ClientObserver.php b/app/Observers/ClientObserver.php index e6336c5eb2c3..5d0604174e90 100644 --- a/app/Observers/ClientObserver.php +++ b/app/Observers/ClientObserver.php @@ -29,8 +29,9 @@ class ClientObserver ->where('event_id', Webhook::EVENT_CREATE_CLIENT) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_CREATE_CLIENT, $client, $client->company); + } } /** @@ -45,8 +46,9 @@ class ClientObserver ->where('event_id', Webhook::EVENT_UPDATE_CLIENT) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_UPDATE_CLIENT, $client, $client->company); + } } /** @@ -61,8 +63,9 @@ class ClientObserver ->where('event_id', Webhook::EVENT_DELETE_CLIENT) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_DELETE_CLIENT, $client, $client->company); + } } /** 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/ExpenseObserver.php b/app/Observers/ExpenseObserver.php index e67abbd9e620..9df1ea328731 100644 --- a/app/Observers/ExpenseObserver.php +++ b/app/Observers/ExpenseObserver.php @@ -29,8 +29,9 @@ class ExpenseObserver ->where('event_id', Webhook::EVENT_CREATE_EXPENSE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_CREATE_EXPENSE, $expense, $expense->company); + } } /** @@ -45,8 +46,9 @@ class ExpenseObserver ->where('event_id', Webhook::EVENT_UPDATE_EXPENSE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_UPDATE_EXPENSE, $expense, $expense->company); + } } /** @@ -61,8 +63,9 @@ class ExpenseObserver ->where('event_id', Webhook::EVENT_DELETE_EXPENSE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_DELETE_EXPENSE, $expense, $expense->company); + } } /** diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php index 224456d68477..28c1b43b2cd5 100644 --- a/app/Observers/InvoiceObserver.php +++ b/app/Observers/InvoiceObserver.php @@ -26,13 +26,13 @@ class InvoiceObserver */ public function created(Invoice $invoice) { - $subscriptions = Webhook::where('company_id', $invoice->company->id) ->where('event_id', Webhook::EVENT_CREATE_INVOICE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_CREATE_INVOICE, $invoice, $invoice->company); + } } /** @@ -47,8 +47,9 @@ class InvoiceObserver ->where('event_id', Webhook::EVENT_UPDATE_INVOICE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_UPDATE_INVOICE, $invoice, $invoice->company); + } } /** @@ -63,8 +64,9 @@ class InvoiceObserver ->where('event_id', Webhook::EVENT_DELETE_INVOICE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_DELETE_INVOICE, $invoice, $invoice->company); + } } /** diff --git a/app/Observers/PaymentObserver.php b/app/Observers/PaymentObserver.php index 5eaa05de5a91..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; @@ -26,13 +25,13 @@ class PaymentObserver */ public function created(Payment $payment) { - $subscriptions = Webhook::where('company_id', $payment->company->id) ->where('event_id', Webhook::EVENT_CREATE_PAYMENT) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_CREATE_PAYMENT, $payment, $payment->company); + } } /** @@ -57,8 +56,9 @@ class PaymentObserver ->where('event_id', Webhook::EVENT_DELETE_PAYMENT) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_DELETE_PAYMENT, $payment, $payment->company); + } } /** diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php index 600382a0d8d8..e9cdfffd1fae 100644 --- a/app/Observers/QuoteObserver.php +++ b/app/Observers/QuoteObserver.php @@ -29,8 +29,9 @@ class QuoteObserver ->where('event_id', Webhook::EVENT_CREATE_QUOTE) ->exists(); - if($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company); + if ($subscriptions) { + WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company); + } } /** @@ -45,8 +46,9 @@ class QuoteObserver ->where('event_id', Webhook::EVENT_UPDATE_QUOTE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company); + } } /** @@ -61,8 +63,9 @@ class QuoteObserver ->where('event_id', Webhook::EVENT_DELETE_QUOTE) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company); + } } /** diff --git a/app/Observers/TaskObserver.php b/app/Observers/TaskObserver.php index e31371276c7c..03abb7c3a9d2 100644 --- a/app/Observers/TaskObserver.php +++ b/app/Observers/TaskObserver.php @@ -25,13 +25,13 @@ class TaskObserver */ public function created(Task $task) { - $subscriptions = Webhook::where('company_id', $task->company->id) ->where('event_id', Webhook::EVENT_CREATE_TASK) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_CREATE_TASK, $task, $task->company); + } } /** @@ -42,13 +42,13 @@ class TaskObserver */ public function updated(Task $task) { - $subscriptions = Webhook::where('company_id', $task->company->id) ->where('event_id', Webhook::EVENT_UPDATE_TASK) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_UPDATE_TASK, $task, $task->company); + } } /** @@ -59,14 +59,13 @@ class TaskObserver */ public function deleted(Task $task) { - - $subscriptions = Webhook::where('company_id', $task->company->id) ->where('event_id', Webhook::EVENT_DELETE_TASK) ->exists(); - if($subscriptions) + if ($subscriptions) { WebhookHandler::dispatch(Webhook::EVENT_DELETE_TASK, $task, $task->company); + } } /** 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 38ad15a89400..1aa011af3ecb 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. @@ -136,8 +131,7 @@ class AuthorizeCreditCard $response = $data['response']; if ($response != null && $response->getMessages()->getResultCode() == 'Ok') { - - $this->authorize->confirmGatewayFee($request); + $this->authorize->confirmGatewayFee($request); return $this->processSuccessfulResponse($data, $request); } diff --git a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php index b2bc21c3991f..ecb88b8421e8 100644 --- a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php +++ b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php @@ -15,18 +15,14 @@ namespace App\PaymentDrivers\Authorize; use App\Exceptions\GenericPaymentDriverFailure; use App\Models\ClientGatewayToken; use App\Models\GatewayType; -use App\PaymentDrivers\Authorize\AuthorizeCreateCustomer; use App\PaymentDrivers\AuthorizePaymentDriver; 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 b505d3e4e3fa..014556aa5aeb 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 f11aaf2bc3cf..b3c3b6e41ff5 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; @@ -239,13 +238,11 @@ class BaseDriver extends AbstractPaymentDriver */ public function unWindGatewayFees(PaymentHash $payment_hash) { - $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($payment_hash->invoices(), 'invoice_id')))->get(); $invoices->each(function ($invoice) { $invoice->service()->removeUnpaidGatewayFees(); }); - } /** 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..a3b34102e8bb 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; 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/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 764fc91c2e7d..5d117e6251f7 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; @@ -383,20 +379,19 @@ class StripePaymentDriver extends BaseDriver } /** - * Attach Stripe payment method to Stripe client. - * - * @param string $payment_method - * @param mixed $customer - * - * @return void + * Attach Stripe payment method to Stripe client. + * + * @param string $payment_method + * @param mixed $customer + * + * @return void */ public function attach(string $payment_method, $customer): void { try { $stripe_payment_method = $this->getStripePaymentMethod($payment_method); $stripe_payment_method->attach(['customer' => $customer->id]); - } - catch(\Stripe\Exception\ApiErrorException | \Exception $e) { + } catch (\Stripe\Exception\ApiErrorException | \Exception $e) { $this->processInternallyFailedPayment($this, $e); } } @@ -430,10 +425,10 @@ class StripePaymentDriver extends BaseDriver /** * Retrieve payment method from Stripe. - * - * @param string $source * - * @return \Stripe\PaymentMethod|void + * @param string $source + * + * @return \Stripe\PaymentMethod|void */ public function getStripePaymentMethod(string $source) { 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 0e52ea0cbb33..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. @@ -73,8 +69,9 @@ class ActivityRepository extends BaseRepository */ public function createBackup($entity, $activity) { - if($entity->company->is_disabled) + if ($entity->company->is_disabled) { return; + } $backup = new Backup(); @@ -107,13 +104,11 @@ class ActivityRepository extends BaseRepository { $entity_design_id = ''; - if($entity instanceof Invoice || $entity instanceof RecurringInvoice){ + if ($entity instanceof Invoice || $entity instanceof RecurringInvoice) { $entity_design_id = 'invoice_design_id'; - } - elseif($entity instanceof Quote){ + } elseif ($entity instanceof Quote) { $entity_design_id = 'quote_design_id'; - } - elseif($entity instanceof Credit){ + } elseif ($entity instanceof Credit) { $entity_design_id = 'credit_design_id'; } @@ -123,12 +118,12 @@ class ActivityRepository extends BaseRepository $html = new HtmlEngine($entity->invitations->first()); if ($design->is_custom) { - $options = [ + $options = [ 'custom_partials' => json_decode(json_encode($design->design), true) ]; - $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); + $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); } else { - $template = new PdfMakerDesign(strtolower($design->name)); + $template = new PdfMakerDesign(strtolower($design->name)); } $state = [ @@ -150,7 +145,5 @@ class ActivityRepository extends BaseRepository return $maker->design($template) ->build() ->getCompiledHTML(true); - } - } diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index 1f95fbfe4914..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; @@ -158,7 +152,6 @@ class BaseRepository */ protected function alternativeSave($data, $model) { - $class = new ReflectionClass($model); if (array_key_exists('client_id', $data)) { @@ -233,9 +226,7 @@ class BaseRepository //make sure we are creating an invite for a contact who belongs to the client only! $contact = ClientContact::find($invitation['client_contact_id']); - if ($contact && $model->client_id == $contact->client_id) - { - + if ($contact && $model->client_id == $contact->client_id) { $invitation_class = sprintf('App\\Models\\%sInvitation', $resource); $new_invitation = $invitation_class::withTrashed() @@ -251,7 +242,6 @@ class BaseRepository $new_invitation->client_contact_id = $contact->id; $new_invitation->save(); } - } } } @@ -286,11 +276,9 @@ class BaseRepository //links tasks and expenses back to the invoice. $model->service()->linkEntities()->save(); - } if ($class->name == Credit::class) { - $model = $model->calc()->getCredit(); $model->ledger()->updateCreditBalance(($state['finished_amount'] - $state['starting_amount'])); diff --git a/app/Repositories/ClientContactRepository.php b/app/Repositories/ClientContactRepository.php index fe14030a5b19..873be6d30e2c 100644 --- a/app/Repositories/ClientContactRepository.php +++ b/app/Repositories/ClientContactRepository.php @@ -61,9 +61,7 @@ class ClientContactRepository extends BaseRepository $update_contact->fill($contact); if (array_key_exists('password', $contact) && strlen($contact['password']) > 1) { - $update_contact->password = Hash::make($contact['password']); - } $update_contact->save(); diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php index d133ff887d1f..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. @@ -62,11 +60,13 @@ class ClientRepository extends BaseRepository $client->fill($data); - if (!isset($client->id_number)) + if (!isset($client->id_number)) { $client->id_number = $this->getNextClientNumber($client); + } - if (empty($data['name'])) + if (empty($data['name'])) { $data['name'] = $client->present()->name(); + } $client->save(); 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/DesignRepository.php b/app/Repositories/DesignRepository.php index 97a53dd8734e..ec3e4f7986c6 100644 --- a/app/Repositories/DesignRepository.php +++ b/app/Repositories/DesignRepository.php @@ -16,5 +16,4 @@ namespace App\Repositories; */ class DesignRepository extends BaseRepository { - } diff --git a/app/Repositories/DocumentRepository.php b/app/Repositories/DocumentRepository.php index b9521dc954cd..49736b80fa8f 100644 --- a/app/Repositories/DocumentRepository.php +++ b/app/Repositories/DocumentRepository.php @@ -19,7 +19,6 @@ use App\Utils\Ninja; */ class DocumentRepository extends BaseRepository { - public function delete($document) { $document->deleteFile(); 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/GroupSettingRepository.php b/app/Repositories/GroupSettingRepository.php index d1aac1dda4d9..c71298360397 100644 --- a/app/Repositories/GroupSettingRepository.php +++ b/app/Repositories/GroupSettingRepository.php @@ -15,7 +15,6 @@ use App\Models\GroupSetting; class GroupSettingRepository extends BaseRepository { - public function save($data, GroupSetting $group_setting) :?GroupSetting { $group_setting->fill($data); 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 bb8254e24962..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; /** @@ -100,7 +90,7 @@ class InvoiceMigrationRepository extends BaseRepository $invitations = collect($data['invitations']); /* Get array of Keys which have been removed from the invitations array and soft delete each invitation */ - $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use($resource){ + $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use ($resource) { $this->getInvitation($invitation, $resource)->delete(); }); diff --git a/app/Repositories/Migration/PaymentMigrationRepository.php b/app/Repositories/Migration/PaymentMigrationRepository.php index d4144ac42168..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; @@ -89,13 +86,13 @@ class PaymentMigrationRepository extends BaseRepository $payment->fill($data); //$payment->status_id = Payment::STATUS_COMPLETED; - if(!array_key_exists('status_id', $data)){ + if (!array_key_exists('status_id', $data)) { info("payment with no status id?"); - info(print_r($data,1)); + info(print_r($data, 1)); } $payment->status_id = $data['status_id']; - $payment->deleted_at = $data['deleted_at'] ?: NULL; + $payment->deleted_at = $data['deleted_at'] ?: null; $payment->save(); /*Ensure payment number generated*/ diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php index bdf05cfc6745..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; @@ -82,20 +80,17 @@ class PaymentRepository extends BaseRepository } $client->service()->updatePaidToDate($data['amount'])->save(); - } if (array_key_exists('credits', $data) && is_array($data['credits']) && count($data['credits']) > 0) { - $_credit_totals = array_sum(array_column($data['credits'], 'amount')); - if($data['amount'] == $_credit_totals) + if ($data['amount'] == $_credit_totals) { $data['amount'] = 0; - else + } else { $client->service()->updatePaidToDate($_credit_totals)->save(); - + } } - } /*Fill the payment*/ @@ -155,10 +150,11 @@ class PaymentRepository extends BaseRepository } } - if(!$is_existing_payment) + if (!$is_existing_payment) { event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); + } - $payment->applied += ($invoice_totals - $credit_totals); //wont work because - check tests + $payment->applied += ($invoice_totals - $credit_totals); //wont work because - check tests // $payment->applied += $invoice_totals; //wont work because - check tests $payment->save(); 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/ProjectRepository.php b/app/Repositories/ProjectRepository.php index 136ecadf9e55..1dd26a7792dd 100644 --- a/app/Repositories/ProjectRepository.php +++ b/app/Repositories/ProjectRepository.php @@ -18,5 +18,4 @@ use App\Models\Project; */ class ProjectRepository extends BaseRepository { - } diff --git a/app/Repositories/QuoteRepository.php b/app/Repositories/QuoteRepository.php index 33aa4e34e554..641ef9f74510 100644 --- a/app/Repositories/QuoteRepository.php +++ b/app/Repositories/QuoteRepository.php @@ -11,24 +11,14 @@ 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. */ class QuoteRepository extends BaseRepository { - - public function save($data, Quote $quote) : ?Quote { return $this->alternativeSave($data, $quote); diff --git a/app/Repositories/RecurringInvoiceRepository.php b/app/Repositories/RecurringInvoiceRepository.php index 9658caaaa533..f39fee0274f6 100644 --- a/app/Repositories/RecurringInvoiceRepository.php +++ b/app/Repositories/RecurringInvoiceRepository.php @@ -13,14 +13,12 @@ namespace App\Repositories; use App\Helpers\Invoice\InvoiceSum; use App\Models\RecurringInvoice; -use Illuminate\Http\Request; /** * RecurringInvoiceRepository. */ class RecurringInvoiceRepository extends BaseRepository { - public function save($data, RecurringInvoice $invoice) : ?RecurringInvoice { $invoice->fill($data); diff --git a/app/Repositories/RecurringQuoteRepository.php b/app/Repositories/RecurringQuoteRepository.php index a0894e8f3a9d..d4059b9a7710 100644 --- a/app/Repositories/RecurringQuoteRepository.php +++ b/app/Repositories/RecurringQuoteRepository.php @@ -20,8 +20,6 @@ use Illuminate\Http\Request; */ class RecurringQuoteRepository extends BaseRepository { - - public function save(Request $request, RecurringQuote $quote) : ?RecurringQuote { $quote->fill($request->input()); diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php index 75f0e7817570..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. @@ -34,7 +33,6 @@ class TaskRepository extends BaseRepository */ public function save(array $data, Task $task) : ?Task { - $task->fill($data); $task->save(); @@ -68,7 +66,7 @@ class TaskRepository extends BaseRepository } elseif ($data['action'] == 'stop' && $task->is_running) { $time_log[count($time_log) - 1][1] = time(); $task->is_running = false; - } elseif ($data['action'] == 'offline'){ + } elseif ($data['action'] == 'offline') { $task->is_running = $data['is_running'] ? 1 : 0; } } elseif (isset($data['is_running'])) { diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index 6a55bd1aa5a6..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; @@ -62,8 +61,9 @@ class UserRepository extends BaseRepository $user->fill($details); - if(!$user->confirmation_code) + if (!$user->confirmation_code) { $user->confirmation_code = $this->createDbHash(config('database.default')); + } $user->account_id = $account->id; $user->save(); @@ -95,7 +95,6 @@ class UserRepository extends BaseRepository public function destroy(array $data, User $user) { - if (array_key_exists('company_user', $data)) { $this->forced_includes = 'company_users'; @@ -121,7 +120,6 @@ class UserRepository extends BaseRepository */ public function delete($user) { - $company = auth()->user()->company(); $cu = CompanyUser::whereUserId($user->id) diff --git a/app/Repositories/VendorContactRepository.php b/app/Repositories/VendorContactRepository.php index 3700c59e6034..4432be9dfb0a 100644 --- a/app/Repositories/VendorContactRepository.php +++ b/app/Repositories/VendorContactRepository.php @@ -25,7 +25,6 @@ class VendorContactRepository extends BaseRepository public function save(array $data, Vendor $vendor) : void { - if (isset($data['contacts'])) { $contacts = collect($data['contacts']); } else { diff --git a/app/Repositories/VendorRepository.php b/app/Repositories/VendorRepository.php index 9b15eb5a3f5f..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. @@ -45,7 +43,6 @@ class VendorRepository extends BaseRepository */ public function save(array $data, Vendor $vendor) : ?Vendor { - $vendor->fill($data); $vendor->save(); diff --git a/app/Services/Client/ClientService.php b/app/Services/Client/ClientService.php index 9632db976cf1..0a3ddd03cab9 100644 --- a/app/Services/Client/ClientService.php +++ b/app/Services/Client/ClientService.php @@ -47,7 +47,6 @@ class ClientService public function getCreditBalance() :float { - $credits = $this->client->credits ->where('is_deleted', false) ->where('balance', '>', 0) @@ -58,12 +57,10 @@ class ClientService public function getCredits() :Collection { - return $this->client->credits ->where('is_deleted', false) ->where('balance', '>', 0) ->sortBy('created_at'); - } 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/ApplyPayment.php b/app/Services/Credit/ApplyPayment.php index 009aeb4d94b1..351c969f3134 100644 --- a/app/Services/Credit/ApplyPayment.php +++ b/app/Services/Credit/ApplyPayment.php @@ -21,7 +21,6 @@ use App\Utils\Ninja; class ApplyPayment { - private $credit; private $invoice; @@ -50,8 +49,7 @@ class ApplyPayment $credit_balance = $this->credit->balance; /* Check invoice partial for amount to be cleared first */ - if($this->invoice->partial > 0){ - + if ($this->invoice->partial > 0) { $partial_payment = min($this->invoice->partial, $applicable_amount); $this->invoice->partial -= $partial_payment; @@ -60,38 +58,34 @@ class ApplyPayment $credit_balance -= $partial_payment; $applicable_amount -= $partial_payment; $this->amount_applied += $partial_payment; - } /* If there is remaining amount use it on the balance */ - if($this->amount > 0 && $applicable_amount > 0 && $invoice_balance > 0){ - + if ($this->amount > 0 && $applicable_amount > 0 && $invoice_balance > 0) { $balance_payment = min($invoice_balance, min($this->amount, $credit_balance)); $invoice_balance -= $balance_payment; $this->amount -= $balance_payment; $this->amount_applied += $balance_payment; - } $this->credit->balance -= $this->amount_applied; - if((int)$this->credit->balance == 0) + if ((int)$this->credit->balance == 0) { $this->credit->status_id = Credit::STATUS_APPLIED; - else + } else { $this->credit->status_id = Credit::STATUS_PARTIAL; + } $this->credit->save(); $this->addPaymentToLedger(); return $this->credit; - } private function applyPaymentToCredit() { - $credit_item = new InvoiceItem; $credit_item->type_id = '1'; $credit_item->product_key = ctrans('texts.credit'); @@ -106,12 +100,10 @@ class ApplyPayment $this->credit = $this->credit->calc()->getCredit(); $this->credit->save(); - } private function addPaymentToLedger() { - $this->payment->amount += $this->amount_applied; $this->payment->applied += $this->amount_applied; $this->payment->status_id = Payment::STATUS_COMPLETED; @@ -126,11 +118,11 @@ class ApplyPayment ->credits() ->attach($this->credit->id, ['amount' => $this->amount_applied]); - $this->payment + $this->payment ->ledger() ->updatePaymentBalance($this->amount_applied * -1); - $this->payment + $this->payment ->client ->service() ->updateBalance($this->amount_applied * -1) @@ -138,22 +130,21 @@ class ApplyPayment ->updatePaidToDate($this->amount_applied) ->save(); - $this->invoice - ->service() + $this->invoice + ->service() ->updateBalance($this->amount_applied * -1) ->updateStatus() ->save(); - $this->credit + $this->credit ->ledger() ->updateCreditBalance(($this->amount_applied * -1), "Credit payment applied to Invoice {$this->invoice->number}"); - event(new InvoiceWasUpdated($this->invoice, $this->invoice->company, Ninja::eventVars())); - - if((int)$this->invoice->balance == 0){ - $this->invoice->service()->deletePdf(); - event(new InvoiceWasPaid($this->invoice, $this->payment->company, Ninja::eventVars())); - } + event(new InvoiceWasUpdated($this->invoice, $this->invoice->company, Ninja::eventVars())); + if ((int)$this->invoice->balance == 0) { + $this->invoice->service()->deletePdf(); + event(new InvoiceWasPaid($this->invoice, $this->payment->company, Ninja::eventVars())); + } } } diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php index cb2077378569..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 @@ -69,13 +65,13 @@ class CreditService public function setCalculatedStatus() { - - if((int)$this->credit->balance == 0) + if ((int)$this->credit->balance == 0) { $this->credit->status_id = Credit::STATUS_APPLIED; - elseif((string)$this->credit->amount == (string)$this->credit->balance) + } elseif ((string)$this->credit->amount == (string)$this->credit->balance) { $this->credit->status_id = Credit::STATUS_SENT; - elseif($this->credit->balance > 0) + } elseif ($this->credit->balance > 0) { $this->credit->status_id = Credit::STATUS_PARTIAL; + } return $this; } @@ -106,17 +102,20 @@ class CreditService { $settings = $this->credit->client->getMergedSettings(); - if(! $this->credit->design_id) + if (! $this->credit->design_id) { $this->credit->design_id = $this->decodePrimaryKey($settings->credit_design_id); + } - if(!isset($this->credit->footer)) + if (!isset($this->credit->footer)) { $this->credit->footer = $settings->credit_footer; + } - if(!isset($this->credit->terms)) + if (!isset($this->credit->terms)) { $this->credit->terms = $settings->credit_terms; + } - return $this; + return $this; } /** 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 39b3533f3bba..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 { @@ -50,7 +49,6 @@ class SendEmail // EmailCredit::dispatchNow($email_builder, $invitation, $invitation->company); EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template); - } }); diff --git a/app/Services/Invoice/AddGatewayFee.php b/app/Services/Invoice/AddGatewayFee.php index 84af200f026e..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 { @@ -48,8 +43,9 @@ class AddGatewayFee extends AbstractService { $gateway_fee = round($this->company_gateway->calcGatewayFee($this->amount, $this->gateway_type_id), $this->invoice->client->currency()->precision); - if((int)$gateway_fee == 0) + if ((int)$gateway_fee == 0) { return $this->invoice; + } $this->cleanPendingGatewayFees(); 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 43126dffcfbd..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 @@ -48,7 +43,7 @@ class ApplyRecurringNumber extends AbstractService break; case 'when_sent': if ($this->invoice->status_id == Invoice::STATUS_SENT) { - $this->invoice->number = $this->getNextRecurringInvoiceNumber($this->client); + $this->invoice->number = $this->getNextRecurringInvoiceNumber($this->client); } break; diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php index 102f1bee251b..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 @@ -45,39 +42,44 @@ class AutoBillInvoice extends AbstractService public function run() { /* Is the invoice payable? */ - if (! $this->invoice->isPayable()) + if (! $this->invoice->isPayable()) { return $this->invoice; + } /* Mark the invoice as sent */ $this->invoice = $this->invoice->service()->markSent()->save(); /* Mark the invoice as paid if there is no balance */ - if ((int)$this->invoice->balance == 0) + if ((int)$this->invoice->balance == 0) { return $this->invoice->service()->markPaid()->save(); + } //if the credits cover the payments, we stop here, build the payment with credits and exit early - if($this->client->getSetting('use_credits_payment') != 'off') + if ($this->client->getSetting('use_credits_payment') != 'off') { $this->applyCreditPayment(); + } // info("partial = {$this->invoice->partial}"); // info("balance = {$this->invoice->balance}"); /* Determine $amount */ - if ($this->invoice->partial > 0) + if ($this->invoice->partial > 0) { $amount = $this->invoice->partial; - elseif($this->invoice->balance > 0) + } elseif ($this->invoice->balance > 0) { $amount = $this->invoice->balance; - else + } else { return $this->invoice; + } info("balance remains to be paid!!"); $gateway_token = $this->getGateway($amount); /* Bail out if no payment methods available */ - if (! $gateway_token || ! $gateway_token->gateway->driver($this->client)->token_billing) + if (! $gateway_token || ! $gateway_token->gateway->driver($this->client)->token_billing) { return $this->invoice; + } /* $gateway fee */ $fee = $gateway_token->gateway->calcGatewayFee($amount, $this->invoice->uses_inclusive_taxes); @@ -107,7 +109,6 @@ class AutoBillInvoice extends AbstractService */ private function finalizePaymentUsingCredits() { - $amount = array_sum(array_column($this->used_credit, 'amount')); $payment = PaymentFactory::create($this->invoice->company_id, $this->invoice->user_id); @@ -124,35 +125,34 @@ class AutoBillInvoice extends AbstractService $this->invoice->service()->setStatus(Invoice::STATUS_PAID)->save(); - foreach($this->used_credit as $credit) - { - $current_credit = Credit::find($credit['credit_id']); - $payment->credits()->attach($current_credit->id, ['amount' => $credit['amount']]); + foreach ($this->used_credit as $credit) { + $current_credit = Credit::find($credit['credit_id']); + $payment->credits()->attach($current_credit->id, ['amount' => $credit['amount']]); - info("adjusting credit balance {$current_credit->balance} by this amount ". $credit['amount']); + info("adjusting credit balance {$current_credit->balance} by this amount ". $credit['amount']); - $current_credit->balance -= $credit['amount']; + $current_credit->balance -= $credit['amount']; - $current_credit->service()->setCalculatedStatus()->save(); - // $this->applyPaymentToCredit($current_credit, $credit['amount']); - } + $current_credit->service()->setCalculatedStatus()->save(); + // $this->applyPaymentToCredit($current_credit, $credit['amount']); + } - $payment->ledger() + $payment->ledger() ->updatePaymentBalance($amount * -1) ->save(); - $this->invoice->client->service() + $this->invoice->client->service() ->updateBalance($amount * -1) ->updatePaidToDate($amount) ->adjustCreditBalance($amount * -1) ->save(); - $this->invoice->ledger() + $this->invoice->ledger() ->updateInvoiceBalance($amount * -1, 'Invoice payment using Credit') ->updateCreditBalance($amount * -1, 'Credits used to pay down Invoice ' . $this->invoice->number) ->save(); - event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); + event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); return $this->invoice->service()->setCalculatedStatus()->save(); } @@ -165,7 +165,6 @@ class AutoBillInvoice extends AbstractService */ private function applyCreditPayment() { - $available_credits = $this->client ->credits ->where('is_deleted', false) @@ -176,8 +175,9 @@ class AutoBillInvoice extends AbstractService info("available credit balance = {$available_credit_balance}"); - if((int)$available_credit_balance == 0) + if ((int)$available_credit_balance == 0) { return; + } $is_partial_amount = false; @@ -187,40 +187,35 @@ class AutoBillInvoice extends AbstractService $this->used_credit = []; - foreach($available_credits as $key => $credit) { - - if($is_partial_amount) { + foreach ($available_credits as $key => $credit) { + if ($is_partial_amount) { //more credit than needed - if($credit->balance >= $this->invoice->partial) { + if ($credit->balance >= $this->invoice->partial) { $this->used_credit[$key]['credit_id'] = $credit->id; $this->used_credit[$key]['amount'] = $this->invoice->partial; $this->invoice->balance -= $this->invoice->partial; $this->invoice->partial = 0; break; - } - else { + } else { $this->used_credit[$key]['credit_id'] = $credit->id; $this->used_credit[$key]['amount'] = $credit->balance; $this->invoice->partial -= $credit->balance; $this->invoice->balance -= $credit->balance; } - } - else { + } else { //more credit than needed - if($credit->balance >= $this->invoice->balance) { + if ($credit->balance >= $this->invoice->balance) { $this->used_credit[$key]['credit_id'] = $credit->id; $this->used_credit[$key]['amount'] = $this->invoice->balance; $this->invoice->balance = 0; break; - } - else { + } else { $this->used_credit[$key]['credit_id'] = $credit->id; $this->used_credit[$key]['amount'] = $credit->balance; $this->invoice->balance -= $credit->balance; } - } } @@ -233,7 +228,6 @@ class AutoBillInvoice extends AbstractService private function applyPaymentToCredit($credit, $amount) :Credit { - $credit_item = new InvoiceItem; $credit_item->type_id = '1'; $credit_item->product_key = ctrans('texts.credit'); 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 9abac432f916..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; @@ -97,8 +93,7 @@ class HandleReversal extends AbstractService } /*If there is a payment linked, then the credit needs to be linked back to that payment in case of refund*/ - if($paymentables->count() > 0){ - + if ($paymentables->count() > 0) { $payment = $paymentables->first()->payment; $payment->credits()->save($credit); @@ -110,7 +105,6 @@ class HandleReversal extends AbstractService //harvest the credit record and add in the amount for the credit. $paymentable_credit->pivot->amount = $total_paid; $paymentable_credit->pivot->save(); - } /* Set invoice balance to 0 */ @@ -136,5 +130,4 @@ class HandleReversal extends AbstractService return $this->invoice; //create a ledger row for this with the resulting Credit ( also include an explanation in the notes section ) } - } diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php index 820da9613352..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; @@ -118,8 +105,9 @@ class InvoiceService { $this->invoice = (new UpdateBalance($this->invoice, $balance_adjustment))->run(); - if((int)$this->invoice->balance == 0) - $this->invoice->next_send_date = null; + if ((int)$this->invoice->balance == 0) { + $this->invoice->next_send_date = null; + } return $this; } @@ -143,7 +131,7 @@ class InvoiceService return (new GetInvoicePdf($this->invoice, $contact))->run(); } - public function getInvoiceDeliveryNote(\App\Models\Invoice $invoice, \App\Models\ClientContact $contact = null) + public function getInvoiceDeliveryNote(\App\Models\Invoice $invoice, \App\Models\ClientContact $contact = null) { return (new GenerateDeliveryNote($invoice, $contact))->run(); } @@ -225,22 +213,24 @@ class InvoiceService public function setCalculatedStatus() { - if((int)$this->invoice->balance == 0) + if ((int)$this->invoice->balance == 0) { $this->setStatus(Invoice::STATUS_PAID); - elseif($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) + } elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) { $this->setStatus(Invoice::STATUS_PARTIAL); + } return $this; } public function updateStatus() { - - if((int)$this->invoice->balance == 0) + if ((int)$this->invoice->balance == 0) { $this->setStatus(Invoice::STATUS_PAID); + } - if($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) + if ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) { $this->setStatus(Invoice::STATUS_PARTIAL); + } return $this; } @@ -265,7 +255,7 @@ class InvoiceService public function deletePdf() { - UnlinkFile::dispatchNow(config('filesystems.default'),$this->invoice->client->invoice_filepath() . $this->invoice->number.'.pdf'); + UnlinkFile::dispatchNow(config('filesystems.default'), $this->invoice->client->invoice_filepath() . $this->invoice->number.'.pdf'); return $this; } @@ -306,7 +296,7 @@ class InvoiceService */ public function touchPdf() { - $this->invoice->invitations->each(function ($invitation){ + $this->invoice->invitations->each(function ($invitation) { CreateEntityPdf::dispatch($invitation); }); @@ -344,20 +334,20 @@ class InvoiceService $this->invoice->tasks()->update(['invoice_id' => null]); //set all tasks.invoice_ids = x with the current line_items - $tasks = collect($this->invoice->line_items)->map(function ($item){ - - if(isset($item->task_id)) + $tasks = collect($this->invoice->line_items)->map(function ($item) { + if (isset($item->task_id)) { $item->task_id = $this->decodePrimaryKey($item->task_id); + } - if(isset($item->expense_id)) + if (isset($item->expense_id)) { $item->expense_id = $this->decodePrimaryKey($item->expense_id); + } return $item; - }); - Task::whereIn('id',$tasks->pluck('task_id'))->update(['invoice_id' => $this->invoice->id]); - Expense::whereIn('id',$tasks->pluck('expense_id'))->update(['invoice_id' => $this->invoice->id]); + Task::whereIn('id', $tasks->pluck('task_id'))->update(['invoice_id' => $this->invoice->id]); + Expense::whereIn('id', $tasks->pluck('expense_id'))->update(['invoice_id' => $this->invoice->id]); return $this; } @@ -367,17 +357,20 @@ class InvoiceService { $settings = $this->invoice->client->getMergedSettings(); - if(! $this->invoice->design_id) + if (! $this->invoice->design_id) { $this->invoice->design_id = $this->decodePrimaryKey($settings->invoice_design_id); + } - if(!isset($this->invoice->footer)) + if (!isset($this->invoice->footer)) { $this->invoice->footer = $settings->invoice_footer; + } - if(!isset($this->invoice->terms)) + if (!isset($this->invoice->terms)) { $this->invoice->terms = $settings->invoice_terms; + } - return $this; + return $this; } /** diff --git a/app/Services/Invoice/MarkInvoiceDeleted.php b/app/Services/Invoice/MarkInvoiceDeleted.php index 7d245d64b487..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 @@ -40,15 +28,13 @@ class MarkInvoiceDeleted extends AbstractService public function run() { - $check = false; - $x=0; - - do { - - $number = $this->calcNumber($x); - $check = $this->checkNumberAvailable(Invoice::class, $this->invoice, $number); - $x++; + $check = false; + $x=0; + do { + $number = $this->calcNumber($x); + $check = $this->checkNumberAvailable(Invoice::class, $this->invoice, $number); + $x++; } while (!$check); $this->invoice->number = $number; @@ -63,13 +49,12 @@ class MarkInvoiceDeleted extends AbstractService private function calcNumber($x) { - if($x==0) - $number = $this->invoice->number . '_' . ctrans('texts.deleted'); - else - $number = $this->invoice->number . '_' . ctrans('texts.deleted') . '_'. $x; - - return $number; + if ($x==0) { + $number = $this->invoice->number . '_' . ctrans('texts.deleted'); + } else { + $number = $this->invoice->number . '_' . ctrans('texts.deleted') . '_'. $x; + } + return $number; } - } diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php index a39d60885723..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; @@ -75,8 +74,9 @@ class MarkPaid extends AbstractService ->applyNumber() ->save(); - if($this->invoice->client->getSetting('client_manual_payment_notification')) + if ($this->invoice->client->getSetting('client_manual_payment_notification')) { EmailPayment::dispatch($payment, $payment->company, $payment->client->primary_contact()->first()); + } /* Update Invoice balance */ event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); diff --git a/app/Services/Invoice/SendEmail.php b/app/Services/Invoice/SendEmail.php index 4436a5e419bb..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 { @@ -47,7 +46,6 @@ class SendEmail extends AbstractService $this->invoice->invitations->each(function ($invitation) { if ($invitation->contact->send_email && $invitation->contact->email) { EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template); - } }); } diff --git a/app/Services/Invoice/TriggeredActions.php b/app/Services/Invoice/TriggeredActions.php index caa5a5e17314..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; @@ -68,7 +62,6 @@ class TriggeredActions extends AbstractService $reminder_template = 'payment'; $this->invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($reminder_template) { - EmailEntity::dispatch($invitation, $this->invoice->company, $reminder_template); }); 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 286012ca6a80..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; @@ -36,8 +31,9 @@ class DeletePayment public function run() { - if($this->payment->is_deleted) + if ($this->payment->is_deleted) { return $this->payment; + } return $this->setStatus(Payment::STATUS_CANCELLED) //sets status of payment ->updateCreditables() //return the credits first 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 29e4d79491c7..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; @@ -74,7 +73,6 @@ class RefundPayment { if ($this->refund_data['gateway_refund'] !== false && $this->total_refund > 0) { if ($this->payment->company_gateway) { - $response = $this->payment->company_gateway->driver($this->payment->client)->refund($this->payment, $this->total_refund); diff --git a/app/Services/Payment/UpdateInvoicePayment.php b/app/Services/Payment/UpdateInvoicePayment.php index 31643652ba2f..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; @@ -42,7 +39,6 @@ class UpdateInvoicePayment $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($paid_invoices, 'invoice_id')))->get(); collect($paid_invoices)->each(function ($paid_invoice) use ($invoices) { - $invoice = $invoices->first(function ($inv) use ($paid_invoice) { return $paid_invoice->invoice_id == $inv->hashed_id; }); @@ -81,7 +77,6 @@ class UpdateInvoicePayment ->save(); event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars())); - }); $this->payment->save(); diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index c5174df408b3..12502c74bed9 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -214,9 +214,9 @@ class Design extends BaseDesign public function deliveryNoteTable(): array { - if ($this->type !== 'delivery_note') { - return []; - } + if ($this->type !== 'delivery_note') { + return []; + } $elements = [ ['element' => 'thead', 'elements' => [ @@ -232,8 +232,8 @@ class Design extends BaseDesign /** * Parent method for building products table. - * - * @return array + * + * @return array */ public function productTable(): array { @@ -257,8 +257,8 @@ class Design extends BaseDesign /** * Parent method for building tasks table. - * - * @return array + * + * @return array */ public function taskTable(): array { @@ -282,9 +282,9 @@ class Design extends BaseDesign /** * Generate the structure of table headers. () - * + * * @param string $type "product" or "task" - * @return array + * @return array */ public function buildTableHeader(string $type): array { @@ -301,9 +301,9 @@ class Design extends BaseDesign /** * Generate the structure of table body. () - * + * * @param string $type "$product" or "$task" - * @return array + * @return array */ public function buildTableBody(string $type): array { @@ -315,7 +315,7 @@ class Design extends BaseDesign return []; } - if ($type == 'delivery_note') { + if ($type == 'delivery_note') { foreach ($items as $row) { $element = ['element' => 'tr', 'elements' => []]; @@ -365,9 +365,9 @@ class Design extends BaseDesign if ($cell == '$task.rate') { $element['elements'][] = ['element' => 'td', 'content' => $row['$task.cost']]; - } else if ($cell == '$task.hours') { + } elseif ($cell == '$task.hours') { $element['elements'][] = ['element' => 'td', 'content' => $row['$task.quantity']]; - } else if ($cell == '$task.description') { + } elseif ($cell == '$task.description') { $_element = ['element' => 'td', 'content' => '', 'elements' => [ ['element' => 'span', 'content' => $row[$cell]], ]]; diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php index 662ba2fcd343..f06837b25ed2 100644 --- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php +++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php @@ -98,7 +98,7 @@ trait DesignHelpers * * Logic below will help us calculate that & inject the result in the * global state of the $context (design state). - * + * * @param string $type "product" or "task" * @return void */ diff --git a/app/Services/PdfMaker/PdfMaker.php b/app/Services/PdfMaker/PdfMaker.php index cd288766f65f..da6242ba54ce 100644 --- a/app/Services/PdfMaker/PdfMaker.php +++ b/app/Services/PdfMaker/PdfMaker.php @@ -57,7 +57,7 @@ class PdfMaker public function build() { if (isset($this->data['template']) && isset($this->data['variables'])) { - $this->getEmptyElements($this->data['template'], $this->data['variables']); + $this->getEmptyElements($this->data['template'], $this->data['variables']); } if (isset($this->data['template'])) { diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php index dec845fc6aba..a4e9d506e36a 100644 --- a/app/Services/PdfMaker/PdfMakerUtilities.php +++ b/app/Services/PdfMaker/PdfMakerUtilities.php @@ -297,7 +297,7 @@ trait PdfMakerUtilities $this->document->getElementById('repeat-content')->appendChild($clone); } - // info($this->data['options']); + // info($this->data['options']); if ( $header = $this->document->getElementById('header') && @@ -324,26 +324,28 @@ trait PdfMakerUtilities } } - public function getEmptyElements(array &$elements, array $variables) { - foreach ($elements as &$element) { - if (isset($element['elements'])) { - $this->getEmptyChildrens($element['elements'], $variables); + public function getEmptyElements(array &$elements, array $variables) + { + foreach ($elements as &$element) { + if (isset($element['elements'])) { + $this->getEmptyChildrens($element['elements'], $variables); + } } - } } - public function getEmptyChildrens(array &$children, array $variables) { - foreach ($children as $key => &$child) { - if (isset($child['content']) && isset($child['show_empty']) && $child['show_empty'] === false) { - $value = strtr($child['content'], $variables['values']); - if ($value === '' || $value === ' ') { - $child['is_empty'] = true; - } - } + public function getEmptyChildrens(array &$children, array $variables) + { + foreach ($children as $key => &$child) { + if (isset($child['content']) && isset($child['show_empty']) && $child['show_empty'] === false) { + $value = strtr($child['content'], $variables['values']); + if ($value === '' || $value === ' ') { + $child['is_empty'] = true; + } + } - if (isset($child['elements'])) { - $this->getEmptyChildrens($child['elements'], $variables); + if (isset($child['elements'])) { + $this->getEmptyChildrens($child['elements'], $variables); + } } - } } } diff --git a/app/Services/Quote/QuoteService.php b/app/Services/Quote/QuoteService.php index 6d18c5dd9d26..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; @@ -117,8 +114,9 @@ class QuoteService { $this->setStatus(Quote::STATUS_APPROVED)->save(); - if(!$contact) + if (!$contact) { $contact = $this->quote->invitations->first()->contact; + } event(new QuoteWasApproved($contact, $this->quote, $this->quote->company, Ninja::eventVars())); @@ -165,17 +163,20 @@ class QuoteService { $settings = $this->quote->client->getMergedSettings(); - if(! $this->quote->design_id) + if (! $this->quote->design_id) { $this->quote->design_id = $this->decodePrimaryKey($settings->quote_design_id); + } - if(!isset($this->quote->footer)) + if (!isset($this->quote->footer)) { $this->quote->footer = $settings->quote_footer; + } - if(!isset($this->quote->terms)) + if (!isset($this->quote->terms)) { $this->quote->terms = $settings->quote_terms; + } - return $this; + return $this; } /** diff --git a/app/Services/Quote/SendEmail.php b/app/Services/Quote/SendEmail.php index ae42c3b7ad81..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 { @@ -46,7 +44,6 @@ class SendEmail $this->quote->invitations->each(function ($invitation) { if ($invitation->contact->send_email && $invitation->contact->email) { EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template); - } }); diff --git a/app/Services/Recurring/CreateRecurringInvitations.php b/app/Services/Recurring/CreateRecurringInvitations.php index b85a211e685e..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; @@ -44,10 +38,8 @@ class CreateRecurringInvitations extends AbstractService public function run() { - try { $this->entity->client->contacts->each(function ($contact) { - $invitation = $this->invitation_class::whereCompanyId($this->entity->company_id) ->whereClientContactId($contact->id) ->where($this->entity_id_name, $this->entity->id) @@ -62,11 +54,8 @@ class CreateRecurringInvitations extends AbstractService } elseif ($invitation && ! $contact->send_email) { $invitation->delete(); } - }); - } - catch(Exception $e) - { + } catch (Exception $e) { info($e->getMessage()); } diff --git a/app/Services/Recurring/RecurringService.php b/app/Services/Recurring/RecurringService.php index 56b75f5e679b..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 @@ -28,13 +26,13 @@ class RecurringService //set schedules - update next_send_dates /** - * Stops a recurring invoice - * + * Stops a recurring invoice + * * @return $this RecurringService object */ public function stop() { - $this->status_id = RecurringInvoice::STATUS_PAUSED; + $this->status_id = RecurringInvoice::STATUS_PAUSED; return $this; } @@ -48,17 +46,17 @@ class RecurringService public function start() { - //make sure next_send_date is either now or in the future else return. - // if(Carbon::parse($this->recurring_entity->next_send_date)->lt(now())) - // return $this; + //make sure next_send_date is either now or in the future else return. + // if(Carbon::parse($this->recurring_entity->next_send_date)->lt(now())) + // return $this; - if($this->recurring_entity->remaining_cycles == 0) + if ($this->recurring_entity->remaining_cycles == 0) { return $this; + } $this->createInvitations()->setStatus(RecurringInvoice::STATUS_ACTIVE); - return $this; - + return $this; } public function setStatus($status) @@ -81,8 +79,8 @@ class RecurringService public function save() { - $this->recurring_entity->save(); + $this->recurring_entity->save(); - return $this->recurring_entity; + return $this->recurring_entity; } } 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/ClientGatewayTokenTransformer.php b/app/Transformers/ClientGatewayTokenTransformer.php index 7c6958acda51..60954246e14d 100644 --- a/app/Transformers/ClientGatewayTokenTransformer.php +++ b/app/Transformers/ClientGatewayTokenTransformer.php @@ -48,20 +48,25 @@ class ClientGatewayTokenTransformer extends EntityTransformer { $casted = new stdClass; - if(property_exists($meta, 'exp_month')) + if (property_exists($meta, 'exp_month')) { $casted->exp_month = (string)$meta->exp_month; + } - if(property_exists($meta, 'exp_year')) + if (property_exists($meta, 'exp_year')) { $casted->exp_year = (string)$meta->exp_year; + } - if(property_exists($meta, 'brand')) + if (property_exists($meta, 'brand')) { $casted->brand = (string)$meta->brand; + } - if(property_exists($meta, 'last4')) + if (property_exists($meta, 'last4')) { $casted->last4 = (string)$meta->last4; + } - if(property_exists($meta, 'type')) + if (property_exists($meta, 'type')) { $casted->type = (int)$meta->type; + } return $casted; } 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 32147e183164..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; @@ -95,9 +91,8 @@ class UserTransformer extends EntityTransformer } public function includeCompanyUser(User $user) - { - - if(!$user->company_id && request()->header('X-API-TOKEN')){ + { + if (!$user->company_id && request()->header('X-API-TOKEN')) { $company_token = CompanyToken::whereRaw('BINARY `token`= ?', [request()->header('X-API-TOKEN')])->first(); $user->company_id = $company_token->company_id; } 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/Helpers.php b/app/Utils/Helpers.php index 961daef961be..5245d109c890 100644 --- a/app/Utils/Helpers.php +++ b/app/Utils/Helpers.php @@ -19,15 +19,13 @@ class Helpers { public static function sharedEmailVariables(?Client $client, array $settings = null): array { - if(!$client){ + if (!$client) { + $elements['signature'] = ''; + $elements['settings'] = new stdClass; + $elements['whitelabel'] = true; - $elements['signature'] = ''; - $elements['settings'] = new stdClass; - $elements['whitelabel'] = true; - - return $elements; - - } + return $elements; + } $_settings = is_null($settings) ? $client->getMergedSettings() : $settings; diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 5a1f48addc08..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; @@ -44,7 +43,6 @@ class HtmlEngine public function __construct($invitation) { - $this->invitation = $invitation; $this->entity_string = $this->resolveEntityString(); @@ -60,7 +58,6 @@ class HtmlEngine $this->settings = $this->client->getMergedSettings(); $this->entity_calc = $this->entity->calc(); - } @@ -153,10 +150,11 @@ class HtmlEngine $data['$subtotal'] = ['value' => Number::formatMoney($this->entity_calc->getSubTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.subtotal')]; $data['$invoice.subtotal'] = &$data['$subtotal']; - if($this->entity->partial > 0) + if ($this->entity->partial > 0) { $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')]; - else + } else { $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')]; + } $data['$quote.balance_due'] = &$data['$balance_due']; $data['$invoice.balance_due'] = &$data['$balance_due']; @@ -319,10 +317,11 @@ class HtmlEngine $data['$task.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['$task.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')]; - if($this->settings->signature_on_pdf) + if ($this->settings->signature_on_pdf) { $data['$contact.signature'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')]; - else + } else { $data['$contact.signature'] = ['value' => '', 'label' => '']; + } $data['$thanks'] = ['value' => '', 'label' => ctrans('texts.thanks')]; $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')]; @@ -384,7 +383,7 @@ class HtmlEngine $arrKeysLength = array_map('strlen', array_keys($data)); array_multisort($arrKeysLength, SORT_DESC, $data); -//info(print_r($data,1)); + //info(print_r($data,1)); return $data; } @@ -531,8 +530,9 @@ class HtmlEngine $custom_field = $custom_fields->{$field}; $custom_field_parts = explode('|', $custom_field); - if(count($custom_field_parts) >= 2) + if (count($custom_field_parts) >= 2) { $custom_field = $custom_field_parts[1]; + } } switch ($custom_field) { diff --git a/app/Utils/Ninja.php b/app/Utils/Ninja.php index d88bcf28664e..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; /** @@ -128,15 +126,14 @@ class Ninja $trans = (array)$settings->translations; - if(count($trans) == 0) + if (count($trans) == 0) { return $translations; + } - foreach($trans as $key => $value) - { - $translations['texts.'.$key] = $value; + foreach ($trans as $key => $value) { + $translations['texts.'.$key] = $value; } return $translations; - } } 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 fb95c27556ae..7748345eb3f1 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; @@ -36,7 +35,7 @@ class Phantom * * @param $invitation */ - public function generate($invitation) + public function generate($invitation) { $entity = false; @@ -68,7 +67,7 @@ class Phantom $file_path = $path.$entity_obj->number.'.pdf'; $url = config('ninja.app_url').'phantom/'.$entity.'/'.$invitation->key.'?phantomjs_secret='.config('ninja.phantomjs_secret'); -info($url); + info($url); $key = config('ninja.phantomjs_key'); $secret = config('ninja.phantomjs_key'); @@ -85,7 +84,6 @@ info($url); public function displayInvitation(string $entity, string $invitation_key) { - $key = $entity.'_id'; $invitation_instance = 'App\Models\\'.Str::camel(ucfirst($entity)).'Invitation'; @@ -105,12 +103,12 @@ info($url); $html = new HtmlEngine($invitation); if ($design->is_custom) { - $options = [ + $options = [ 'custom_partials' => json_decode(json_encode($design->design), true) ]; - $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); + $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); } else { - $template = new PdfMakerDesign(strtolower($design->name)); + $template = new PdfMakerDesign(strtolower($design->name)); } $state = [ diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php index 890d84af849e..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; /** @@ -106,7 +104,6 @@ class Statics })->values(); $data['templates'] = Cache::get('templates'); - } return $data; diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index 3e0283dcb3d3..4931fdd2fc3f 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -123,7 +123,6 @@ class SystemHealth private static function checkPhpCli() { - try { exec('php -v', $foo, $exitCode); @@ -133,7 +132,6 @@ class SystemHealth } catch (Exception $e) { return false; } - } private static function extensions() :array diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php index 1adbe37f2659..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; @@ -76,9 +75,9 @@ class TemplateEngine if (strlen($this->entity) > 1 && strlen($this->entity_id) > 1) { $class = 'App\Models\\'.ucfirst($this->entity); $this->entity_obj = $class::whereId($this->decodePrimaryKey($this->entity_id))->company()->first(); - } - else + } else { $this->mockEntity(); + } return $this; } @@ -100,23 +99,21 @@ class TemplateEngine private function setTemplates() { if (strlen($this->subject) == 0 && strlen($this->template) > 1) { - $subject_template = str_replace('template', 'subject', $this->template); - if(strlen($this->settings_entity->getSetting($subject_template)) > 1) + if (strlen($this->settings_entity->getSetting($subject_template)) > 1) { $this->subject = $this->settings_entity->getSetting($subject_template); - else + } else { $this->subject = EmailTemplateDefaults::getDefaultTemplate($subject_template, $this->settings_entity->locale()); - + } } if (strlen($this->body) == 0 && strlen($this->template) > 1) { - - if(strlen($this->settings_entity->getSetting($this->template)) > 1) + if (strlen($this->settings_entity->getSetting($this->template)) > 1) { $this->body = $this->settings_entity->getSetting($this->template); - else + } else { $this->body = EmailTemplateDefaults::getDefaultTemplate($this->template, $this->settings_entity->locale()); - + } } return $this; @@ -247,14 +244,10 @@ class TemplateEngine $this->entity_obj->load('client'); $client->setRelation('company', auth()->user()->company()); $client->load('company'); - } private function tearDown() { - DB::rollBack(); - } - } diff --git a/app/Utils/Traits/AppSetup.php b/app/Utils/Traits/AppSetup.php index 280d2a945374..debd5750c5e6 100644 --- a/app/Utils/Traits/AppSetup.php +++ b/app/Utils/Traits/AppSetup.php @@ -60,8 +60,9 @@ trait AppSetup } /*Build template cache*/ - if (request()->has('clear_cache') || !Cache::has('templates')) + if (request()->has('clear_cache') || !Cache::has('templates')) { $this->buildTemplates(); + } } diff --git a/app/Utils/Traits/CleanLineItems.php b/app/Utils/Traits/CleanLineItems.php index be2072a37a0c..2b68155bd2d7 100644 --- a/app/Utils/Traits/CleanLineItems.php +++ b/app/Utils/Traits/CleanLineItems.php @@ -28,9 +28,7 @@ trait CleanLineItems $cleaned_items = []; foreach ($items as $item) { - $cleaned_items[] = $this->cleanLineItem($item); - } return $cleaned_items; @@ -51,20 +49,17 @@ trait CleanLineItems //if the key has not been set, we set it to a default value if (! array_key_exists($key, $item) || ! isset($item[$key])) { - - $item[$key] = $value; + $item[$key] = $value; $item[$key] = BaseSettings::castAttribute(InvoiceItem::$casts[$key], $value); - - } - else{ + } else { //always cast the value! $item[$key] = BaseSettings::castAttribute(InvoiceItem::$casts[$key], $item[$key]); } - } - if (array_key_exists('id', $item)) + if (array_key_exists('id', $item)) { unset($item['id']); + } return $item; 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/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index da5c90d62009..66d37d7257d5 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -70,8 +70,9 @@ trait GeneratesCounter $padding = $client->getSetting('counter_padding'); $prefix = ''; - if($invoice && $invoice->recurring_id) + if ($invoice && $invoice->recurring_id) { $prefix = $client->getSetting('recurring_number_prefix'); + } $invoice_number = $this->checkEntityNumber(Invoice::class, $client, $counter, $padding, $pattern, $prefix); @@ -281,7 +282,6 @@ trait GeneratesCounter */ public function getNextProjectNumber(Project $project) :string { - $this->resetCompanyCounters($project->company); $counter = $project->company->settings->project_number_counter; @@ -370,15 +370,15 @@ trait GeneratesCounter $number = $this->prefixCounter($number, $prefix); - if ($class == Invoice::class || $class == RecurringInvoice::class) + if ($class == Invoice::class || $class == RecurringInvoice::class) { $check = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->first(); - elseif ($class == Client::class || $class == Vendor::class) + } elseif ($class == Client::class || $class == Vendor::class) { $check = $class::whereCompanyId($entity->company_id)->whereIdNumber($number)->withTrashed()->first(); - else + } else { $check = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->first(); + } $counter++; - } while ($check); return $number; @@ -388,8 +388,9 @@ trait GeneratesCounter /*Check if a number is available for use. */ public function checkNumberAvailable($class, $entity, $number) :bool { - if($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->first()) + if ($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->first()) { return false; + } return true; } @@ -600,7 +601,7 @@ trait GeneratesCounter $replace[] = str_replace($format, $date, $matches[1]); } - if($entity instanceof Client || $entity instanceof Vendor){ + if ($entity instanceof Client || $entity instanceof Vendor) { $search[] = '{$client_custom1}'; $replace[] = $entity->custom_value1; @@ -615,9 +616,7 @@ trait GeneratesCounter $search[] = '{$id_number}'; $replace[] = $entity->id_number; - } - else - { + } else { $search[] = '{$client_custom1}'; $replace[] = $entity->client->custom_value1; diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index af598a3ce12b..6765c3f65eb6 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -44,7 +44,6 @@ trait Inviteable public function getLink() :string { - $entity_type = Str::snake(class_basename($this->entityType())); $domain = isset($this->company->portal_domain) ?: $this->company->domain(); diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php index 739e24f741ab..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. @@ -58,8 +57,9 @@ trait MakesDates */ public function formatDate($date, string $format) :string { - if(!isset($date)) + if (!isset($date)) { return ''; + } // if (!$date || strlen($date) < 1) { // return ''; // } 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/MakesReminders.php b/app/Utils/Traits/MakesReminders.php index 2dd5e0f12899..6c87794df6e3 100644 --- a/app/Utils/Traits/MakesReminders.php +++ b/app/Utils/Traits/MakesReminders.php @@ -38,81 +38,72 @@ trait MakesReminders $settings->num_days_reminder1 > 0) { $reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder1); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder1 == 'before_due_date' && $settings->num_days_reminder1 > 0) { $reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder1); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder1 == 'after_due_date' && $settings->num_days_reminder1 > 0) { $reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder1); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder2 == 'after_invoice_date' && $settings->num_days_reminder2 > 0) { $reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder2); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder2 == 'before_due_date' && $settings->num_days_reminder2 > 0) { $reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder2); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder2 == 'after_due_date' && $settings->num_days_reminder2 > 0) { $reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder2); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder3 == 'after_invoice_date' && $settings->num_days_reminder3 > 0) { $reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder3); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder3 == 'before_due_date' && $settings->num_days_reminder3 > 0) { $reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder3); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } if ($settings->schedule_reminder3 == 'after_due_date' && $settings->num_days_reminder3 > 0) { $reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder3); - if($reminder_date->gt(Carbon::parse($this->next_send_date))); - $date_collection->push($reminder_date->format('Y-m-d')); - + if ($reminder_date->gt(Carbon::parse($this->next_send_date))); + $date_collection->push($reminder_date->format('Y-m-d')); } $this->next_send_date = $date_collection->sort()->first(); @@ -143,8 +134,9 @@ trait MakesReminders //if invoice is currently a draft, or being marked as sent, this will be the initial email $client = $this->client; - if($entity_string != 'invoice') + if ($entity_string != 'invoice') { return $entity_string; + } //if the invoice if ($this->inReminderWindow( @@ -162,13 +154,12 @@ trait MakesReminders $client->getSetting('num_days_reminder3') )) { return 'reminder3'; - } elseif($this->checkEndlessReminder( - $this->last_sent_date, + } elseif ($this->checkEndlessReminder( + $this->last_sent_date, $client->getSetting('endless_reminder_frequency_id') - )){ + )) { return 'endless_reminder'; - } - else { + } else { return $entity_string; } @@ -177,16 +168,18 @@ trait MakesReminders private function checkEndlessReminder($last_sent_date, $endless_reminder_frequency_id) :bool { - if(Carbon::now()->startOfDay()->eq($this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id))) + if (Carbon::now()->startOfDay()->eq($this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id))) { return true; + } return false; } private function addTimeInterval($date, $endless_reminder_frequency_id) :?Carbon { - if(!$date) + if (!$date) { return null; + } switch ($endless_reminder_frequency_id) { diff --git a/app/Utils/Traits/Notifications/UserNotifies.php b/app/Utils/Traits/Notifications/UserNotifies.php index 7a9f7c22b38c..20a1494c7020 100644 --- a/app/Utils/Traits/Notifications/UserNotifies.php +++ b/app/Utils/Traits/Notifications/UserNotifies.php @@ -78,5 +78,4 @@ trait UserNotifies return $notifiable_methods; } - } 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 e56bdcb00ab2..75bc9445508d 100644 --- a/app/Utils/Traits/Recurring/HasRecurrence.php +++ b/app/Utils/Traits/Recurring/HasRecurrence.php @@ -12,17 +12,16 @@ namespace App\Utils\Traits\Recurring; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; trait HasRecurrence { /** - * Calculates the first day of the month, this will ALWAYS + * Calculates the first day of the month, this will ALWAYS * be the first of NEXT month - * + * * @param Carbon $date The given date - * @return Carbon The first of NEXT month + * @return Carbon The first of NEXT month */ public function calculateFirstDayOfMonth($date) { @@ -33,21 +32,22 @@ trait HasRecurrence * Calculates the last day of the month. * * If it is the last day of the month - we add a month on. - * + * * @param Carbon $date The start date * @return Carbon The last day of month */ public function calculateLastDayOfMonth($date) { - if($date->isLastOfMonth()) + if ($date->isLastOfMonth()) { return $date->copy()->addMonthNoOverflow()->endOfMonth(); + } return $date->copy()->endOfMonth(); } /** * Sets the day of the month, if in the past we ADD a month - * + * * @param Carbon $date The start date * @param String|Int $day_of_month The day of the month */ @@ -59,14 +59,15 @@ trait HasRecurrence //If the set date is less than the original date we need to add a month. //If we are overflowing dates, then we need to diff the dates and ensure it doesn't equal 0 - if($set_date->lte($date) || $set_date->diffInDays($carbon_date) == 0) + if ($set_date->lte($date) || $set_date->diffInDays($carbon_date) == 0) { $set_date->addMonthNoOverflow(); + } - if($day_of_month == '31') + if ($day_of_month == '31') { $set_date->endOfMonth(); + } return $set_date; } - -} \ No newline at end of file +} diff --git a/app/Utils/Traits/SavesDocuments.php b/app/Utils/Traits/SavesDocuments.php index 2ce496f9b378..ff1b25575c63 100644 --- a/app/Utils/Traits/SavesDocuments.php +++ b/app/Utils/Traits/SavesDocuments.php @@ -67,6 +67,5 @@ trait SavesDocuments null, $is_public ); - } } diff --git a/app/Utils/Traits/Uploadable.php b/app/Utils/Traits/Uploadable.php index 7be78167d596..9f656f3b9734 100644 --- a/app/Utils/Traits/Uploadable.php +++ b/app/Utils/Traits/Uploadable.php @@ -20,7 +20,6 @@ use Illuminate\Support\Facades\Storage; */ trait Uploadable { - public function removeLogo($company) { $company_logo = $company->settings->company_logo; @@ -32,8 +31,6 @@ trait Uploadable if (Storage::exists($storage_path)) { UnlinkFile::dispatchNow(config('filesystems.default'), $storage_path); } - - } public function uploadLogo($file, $company, $entity) 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/routes/contact.php b/routes/contact.php index e20f5fef4346..d1b7d13625a0 100644 --- a/routes/contact.php +++ b/routes/contact.php @@ -1,6 +1,5 @@ withoutMiddleware( ThrottleRequests::class ); - - } public function testActivityGet() @@ -48,5 +44,4 @@ class ActivityApiTest extends TestCase $response->assertStatus(200); } - } diff --git a/tests/Feature/CancelInvoiceTest.php b/tests/Feature/CancelInvoiceTest.php index 654f165a8560..5eb7f63ef5d5 100644 --- a/tests/Feature/CancelInvoiceTest.php +++ b/tests/Feature/CancelInvoiceTest.php @@ -10,23 +10,11 @@ */ namespace Tests\Feature; -use App\Factory\CreditFactory; -use App\Factory\InvoiceItemFactory; -use App\Helpers\Invoice\InvoiceSum; -use App\Listeners\Credit\CreateCreditInvitation; -use App\Models\Client; -use App\Models\Credit; use App\Models\Invoice; -use App\Models\Payment; -use App\Models\Paymentable; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Carbon; -use Illuminate\Validation\ValidationException; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/ClientApiTest.php b/tests/Feature/ClientApiTest.php index 63b596bf94be..e9deaa60bc4f 100644 --- a/tests/Feature/ClientApiTest.php +++ b/tests/Feature/ClientApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/ClientPresenterTest.php b/tests/Feature/ClientPresenterTest.php index ca6df40f6950..7f33d7e19e50 100644 --- a/tests/Feature/ClientPresenterTest.php +++ b/tests/Feature/ClientPresenterTest.php @@ -11,7 +11,6 @@ namespace Tests\Feature; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\URL; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php index a087dac97d66..806a9e22e470 100644 --- a/tests/Feature/ClientTest.php +++ b/tests/Feature/ClientTest.php @@ -19,14 +19,9 @@ use App\Models\Company; use App\Models\CompanyToken; use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Illuminate\Support\Str; use Illuminate\Validation\ValidationException; diff --git a/tests/Feature/CompanyGatewayApiTest.php b/tests/Feature/CompanyGatewayApiTest.php index c16670bbb6f5..ccd4d504476e 100644 --- a/tests/Feature/CompanyGatewayApiTest.php +++ b/tests/Feature/CompanyGatewayApiTest.php @@ -10,25 +10,13 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; use App\DataMapper\FeesAndLimits; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; use App\Models\CompanyGateway; -use App\Models\User; use App\Utils\Traits\CompanyGatewayFeesAndLimitsSaver; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; -use PaymentLibrariesSeeder; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/CompanyGatewayResolutionTest.php b/tests/Feature/CompanyGatewayResolutionTest.php index 57236e7c866f..6395c8a7120e 100644 --- a/tests/Feature/CompanyGatewayResolutionTest.php +++ b/tests/Feature/CompanyGatewayResolutionTest.php @@ -10,29 +10,15 @@ */ namespace Tests\Feature; -use App\DataMapper\FeesAndLimits; -use App\Factory\CreditFactory; -use App\Factory\InvoiceItemFactory; -use App\Helpers\Invoice\InvoiceSum; -use App\Listeners\Credit\CreateCreditInvitation; use App\Models\Client; use App\Models\CompanyGateway; -use App\Models\Credit; use App\Models\GatewayType; -use App\Models\Invoice; -use App\Models\Payment; -use App\Models\Paymentable; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Carbon; -use Illuminate\Validation\ValidationException; use Tests\MockAccountData; use Tests\TestCase; -use Illuminate\Support\Facades\Crypt; /** * @test @@ -67,50 +53,48 @@ class CompanyGatewayResolutionTest extends TestCase $this->withoutExceptionHandling(); - $data = []; - $data[1]['min_limit'] = -1; - $data[1]['max_limit'] = -1; - $data[1]['fee_amount'] = 0.00; - $data[1]['fee_percent'] = 2; - $data[1]['fee_tax_name1'] = 'GST'; - $data[1]['fee_tax_rate1'] = 10; - $data[1]['fee_tax_name2'] = 'GST'; - $data[1]['fee_tax_rate2'] = 10; - $data[1]['fee_tax_name3'] = 'GST'; - $data[1]['fee_tax_rate3'] = 10; - $data[1]['adjust_fee_percent'] = true; - $data[1]['fee_cap'] = 0; + $data = []; + $data[1]['min_limit'] = -1; + $data[1]['max_limit'] = -1; + $data[1]['fee_amount'] = 0.00; + $data[1]['fee_percent'] = 2; + $data[1]['fee_tax_name1'] = 'GST'; + $data[1]['fee_tax_rate1'] = 10; + $data[1]['fee_tax_name2'] = 'GST'; + $data[1]['fee_tax_rate2'] = 10; + $data[1]['fee_tax_name3'] = 'GST'; + $data[1]['fee_tax_rate3'] = 10; + $data[1]['adjust_fee_percent'] = true; + $data[1]['fee_cap'] = 0; - $data[2]['min_limit'] = -1; - $data[2]['max_limit'] = -1; - $data[2]['fee_amount'] = 0.00; - $data[2]['fee_percent'] = 1; - $data[2]['fee_tax_name1'] = 'GST'; - $data[2]['fee_tax_rate1'] = 10; - $data[2]['fee_tax_name2'] = 'GST'; - $data[2]['fee_tax_rate2'] = 10; - $data[2]['fee_tax_name3'] = 'GST'; - $data[2]['fee_tax_rate3'] = 10; - $data[2]['adjust_fee_percent'] = true; - $data[2]['fee_cap'] = 0; + $data[2]['min_limit'] = -1; + $data[2]['max_limit'] = -1; + $data[2]['fee_amount'] = 0.00; + $data[2]['fee_percent'] = 1; + $data[2]['fee_tax_name1'] = 'GST'; + $data[2]['fee_tax_rate1'] = 10; + $data[2]['fee_tax_name2'] = 'GST'; + $data[2]['fee_tax_rate2'] = 10; + $data[2]['fee_tax_name3'] = 'GST'; + $data[2]['fee_tax_rate3'] = 10; + $data[2]['adjust_fee_percent'] = true; + $data[2]['fee_cap'] = 0; - //disable ach here - $json_config = json_decode(config('ninja.testvars.stripe')); - $json_config->enable_ach = "0"; - - $this->cg = new CompanyGateway; - $this->cg->company_id = $this->company->id; - $this->cg->user_id = $this->user->id; - $this->cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; - $this->cg->require_cvv = true; - $this->cg->require_billing_address = true; - $this->cg->require_shipping_address = true; - $this->cg->update_details = true; - $this->cg->config = encrypt(json_encode($json_config)); - $this->cg->fees_and_limits = $data; - $this->cg->save(); - + //disable ach here + $json_config = json_decode(config('ninja.testvars.stripe')); + $json_config->enable_ach = "0"; + $this->cg = new CompanyGateway; + $this->cg->company_id = $this->company->id; + $this->cg->user_id = $this->user->id; + $this->cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; + $this->cg->require_cvv = true; + $this->cg->require_billing_address = true; + $this->cg->require_shipping_address = true; + $this->cg->update_details = true; + $this->cg->config = encrypt(json_encode($json_config)); + $this->cg->fees_and_limits = $data; + $this->cg->save(); } /** @@ -118,12 +102,10 @@ class CompanyGatewayResolutionTest extends TestCase */ public function testGatewayResolution() { - $fee = $this->cg->calcGatewayFee(10, false, GatewayType::CREDIT_CARD); $this->assertEquals(0.2, $fee); $fee = $this->cg->calcGatewayFee(10, false, GatewayType::BANK_TRANSFER); $this->assertEquals(0.1, $fee); - } /** @@ -142,22 +124,16 @@ class CompanyGatewayResolutionTest extends TestCase $payment_methods = []; $this->assertInstanceOf("\\stdClass", $this->cg->fees_and_limits); - $this->assertObjectHasAttribute('min_limit',$this->cg->fees_and_limits->{1}); + $this->assertObjectHasAttribute('min_limit', $this->cg->fees_and_limits->{1}); - foreach ($this->cg->driver($this->client)->gatewayTypes() as $type) - { - - if(property_exists($this->cg->fees_and_limits, $type)) - { - if($this->client->validGatewayForAmount($this->cg->fees_and_limits->{$type}, $amount)){ + foreach ($this->cg->driver($this->client)->gatewayTypes() as $type) { + if (property_exists($this->cg->fees_and_limits, $type)) { + if ($this->client->validGatewayForAmount($this->cg->fees_and_limits->{$type}, $amount)) { $payment_methods[] = [$this->cg->id => $type]; } - } - else - { + } else { $payment_methods[] = [$this->cg->id => $type]; } - } $this->assertEquals(3, count($payment_methods)); diff --git a/tests/Feature/CompanyGatewayTest.php b/tests/Feature/CompanyGatewayTest.php index 639bd3d48bb0..a7dd8e42f216 100644 --- a/tests/Feature/CompanyGatewayTest.php +++ b/tests/Feature/CompanyGatewayTest.php @@ -13,7 +13,6 @@ namespace Tests\Feature; use App\Models\CompanyGateway; use App\Models\GatewayType; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\URL; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/CompanySettingsTest.php b/tests/Feature/CompanySettingsTest.php index c78a3e6d429f..597cd4e1a963 100644 --- a/tests/Feature/CompanySettingsTest.php +++ b/tests/Feature/CompanySettingsTest.php @@ -11,19 +11,9 @@ namespace Tests\Feature; use App\DataMapper\CompanySettings; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Session; use Illuminate\Validation\ValidationException; use Tests\MockAccountData; diff --git a/tests/Feature/CompanyTest.php b/tests/Feature/CompanyTest.php index 83a607f13067..f772a6b5bf70 100644 --- a/tests/Feature/CompanyTest.php +++ b/tests/Feature/CompanyTest.php @@ -11,22 +11,14 @@ namespace Tests\Feature; use App\DataMapper\CompanySettings; -use App\Models\Account; use App\Models\Company; use App\Models\CompanyToken; -use App\Models\Product; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; -use Illuminate\Validation\ValidationException; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/CompanyTokenApiTest.php b/tests/Feature/CompanyTokenApiTest.php index 77e7104b5ee3..f64c9ae3d224 100644 --- a/tests/Feature/CompanyTokenApiTest.php +++ b/tests/Feature/CompanyTokenApiTest.php @@ -10,21 +10,12 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; use App\Http\Middleware\PasswordProtection; -use App\Models\Account; -use App\Models\Company; use App\Models\CompanyToken; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/CreditTest.php b/tests/Feature/CreditTest.php index ff0a2b6497ce..a92d175704ba 100644 --- a/tests/Feature/CreditTest.php +++ b/tests/Feature/CreditTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Feature; -use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\Credit; diff --git a/tests/Feature/DesignApiTest.php b/tests/Feature/DesignApiTest.php index 3c093c2083b2..33af13f23042 100644 --- a/tests/Feature/DesignApiTest.php +++ b/tests/Feature/DesignApiTest.php @@ -10,21 +10,10 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; use App\Models\Design; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/DocumentsApiTest.php b/tests/Feature/DocumentsApiTest.php index 67976152f39a..0cfcc2695822 100644 --- a/tests/Feature/DocumentsApiTest.php +++ b/tests/Feature/DocumentsApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; @@ -53,7 +42,6 @@ class DocumentsApiTest extends TestCase public function testClientDocuments() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, @@ -62,13 +50,11 @@ class DocumentsApiTest extends TestCase $response->assertStatus(200); $arr = $response->json(); $this->assertArrayHasKey('documents', $arr['data'][0]); - } public function testInvoiceDocuments() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, @@ -77,13 +63,11 @@ class DocumentsApiTest extends TestCase $response->assertStatus(200); $arr = $response->json(); $this->assertArrayHasKey('documents', $arr['data'][0]); - } public function testProjectsDocuments() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, @@ -92,13 +76,11 @@ class DocumentsApiTest extends TestCase $response->assertStatus(200); $arr = $response->json(); $this->assertArrayHasKey('documents', $arr['data'][0]); - } public function testExpenseDocuments() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, @@ -107,13 +89,11 @@ class DocumentsApiTest extends TestCase $response->assertStatus(200); $arr = $response->json(); $this->assertArrayHasKey('documents', $arr['data'][0]); - } public function testVendorDocuments() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, @@ -122,13 +102,11 @@ class DocumentsApiTest extends TestCase $response->assertStatus(200); $arr = $response->json(); $this->assertArrayHasKey('documents', $arr['data'][0]); - } public function testProductDocuments() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, @@ -137,12 +115,10 @@ class DocumentsApiTest extends TestCase $response->assertStatus(200); $arr = $response->json(); $this->assertArrayHasKey('documents', $arr['data'][0]); - } public function testTaskDocuments() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, @@ -151,7 +127,5 @@ class DocumentsApiTest extends TestCase $response->assertStatus(200); $arr = $response->json(); $this->assertArrayHasKey('documents', $arr['data'][0]); - } - } diff --git a/tests/Feature/ExpenseApiTest.php b/tests/Feature/ExpenseApiTest.php index 9b9f9829377d..73f936a3a025 100644 --- a/tests/Feature/ExpenseApiTest.php +++ b/tests/Feature/ExpenseApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Expense; -use App\Models\ExpenseContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/ExpenseCategoryApiTest.php b/tests/Feature/ExpenseCategoryApiTest.php index 82eed58ccc29..937278fc0bd8 100644 --- a/tests/Feature/ExpenseCategoryApiTest.php +++ b/tests/Feature/ExpenseCategoryApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\ExpenseCategory; -use App\Models\ExpenseCategoryContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/GroupSettingTest.php b/tests/Feature/GroupSettingTest.php index b99aa2cb7fb0..a44262768622 100644 --- a/tests/Feature/GroupSettingTest.php +++ b/tests/Feature/GroupSettingTest.php @@ -10,9 +10,6 @@ */ namespace Tests\Feature; -use App\Models\Account; -use App\Models\Client; -use App\Models\Credit; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; diff --git a/tests/Feature/InvitationTest.php b/tests/Feature/InvitationTest.php index fee98df7a8b3..d71d79030c7c 100644 --- a/tests/Feature/InvitationTest.php +++ b/tests/Feature/InvitationTest.php @@ -10,28 +10,19 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; use App\DataMapper\DefaultSettings; -use App\Events\Invoice\InvoiceWasMarkedSent; use App\Factory\InvoiceInvitationFactory; -use App\Jobs\Account\CreateAccount; use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; use App\Models\Invoice; -use App\Models\InvoiceInvitation; use App\Models\User; use App\Utils\Traits\MakesHash; -use App\Utils\Traits\UserSessionAttributes; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Session; use Tests\TestCase; diff --git a/tests/Feature/InvoiceEmailTest.php b/tests/Feature/InvoiceEmailTest.php index 06e8d33d8058..0f39cae647cd 100644 --- a/tests/Feature/InvoiceEmailTest.php +++ b/tests/Feature/InvoiceEmailTest.php @@ -11,17 +11,9 @@ namespace Tests\Feature; use App\Jobs\Entity\EmailEntity; -use App\Mail\TemplateEmail; -use App\Models\ClientContact; -use App\Models\Invoice; -use App\Models\InvoiceInvitation; use App\Utils\Traits\GeneratesCounter; -use App\Utils\Traits\InvoiceEmailBuilder; use Illuminate\Database\Eloquent\Model; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; @@ -68,7 +60,6 @@ class InvoiceEmailTest extends TestCase $this->invoice->invitations->each(function ($invitation) { if ($invitation->contact->send_email && $invitation->contact->email) { - EmailEntity::dispatchNow($invitation, $invitation->company); $this->expectsJobs(EmailEntity::class); diff --git a/tests/Feature/InvoiceLinkTasksTest.php b/tests/Feature/InvoiceLinkTasksTest.php index 3a2c7b1eed84..05a74e715e04 100644 --- a/tests/Feature/InvoiceLinkTasksTest.php +++ b/tests/Feature/InvoiceLinkTasksTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Factory\InvoiceFactory; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Invoice; -use App\Models\Task; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; @@ -54,16 +43,16 @@ class InvoiceLinkTasksTest extends TestCase { $temp_invoice_id = $this->invoice->id; - $tasks = collect($this->invoice->line_items)->map(function ($item){ - - if(isset($item->task_id)) + $tasks = collect($this->invoice->line_items)->map(function ($item) { + if (isset($item->task_id)) { $item->task_id = $this->decodePrimaryKey($item->task_id); + } - if(isset($item->expense_id)) + if (isset($item->expense_id)) { $item->expense_id = $this->decodePrimaryKey($item->expense_id); + } return $item; - }); $this->assertEquals($tasks->first()->task_id, $this->task->id); diff --git a/tests/Feature/InvoiceTest.php b/tests/Feature/InvoiceTest.php index bb620767f769..c5f4c407eb65 100644 --- a/tests/Feature/InvoiceTest.php +++ b/tests/Feature/InvoiceTest.php @@ -10,19 +10,12 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Factory\InvoiceFactory; -use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\Invoice; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php index dc45714d001d..6d122d2d4e6c 100644 --- a/tests/Feature/LoginTest.php +++ b/tests/Feature/LoginTest.php @@ -12,19 +12,13 @@ namespace Tests\Feature; use App\DataMapper\CompanySettings; use App\Models\Account; -use App\Models\Client; use App\Models\Company; use App\Models\CompanyToken; use App\Models\User; -use App\Utils\Traits\UserSessionAttributes; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; -use Tests\TestCase; use Illuminate\Validation\ValidationException; +use Tests\TestCase; /** * @test @@ -142,7 +136,7 @@ class LoginTest extends TestCase public function testApiLogin() { - Account::all()->each(function ($account){ + Account::all()->each(function ($account) { $account->delete(); }); @@ -190,19 +184,18 @@ class LoginTest extends TestCase 'password' => '123456', ]; - try{ - $response = $this->withHeaders([ + try { + $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), ])->post('/api/v1/login', $data); - } catch (ValidationException $e) { $message = json_decode($e->validator->getMessageBag(), 1); - info(print_r($message,1)); + info(print_r($message, 1)); } $arr = $response->json(); - info(print_r($arr,1)); + info(print_r($arr, 1)); $response->assertStatus(200); } diff --git a/tests/Feature/MigrationTest.php b/tests/Feature/MigrationTest.php index 9ace31182d42..a18b6d59706b 100644 --- a/tests/Feature/MigrationTest.php +++ b/tests/Feature/MigrationTest.php @@ -10,21 +10,11 @@ */ namespace Tests\Feature; -use App\Jobs\Account\CreateAccount; -use App\Models\Account; use App\Models\Client; use App\Models\Company; use App\Models\Invoice; -use App\Models\User; -use App\Utils\Traits\UserSessionAttributes; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Http\UploadedFile; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; @@ -83,7 +73,5 @@ class MigrationTest extends TestCase $this->assertEquals($co->count(), 1); $this->assertEquals($inv->count(), 1); - } - } diff --git a/tests/Feature/PaymentTermsApiTest.php b/tests/Feature/PaymentTermsApiTest.php index 92b0e3577b47..37dc0b7b426a 100644 --- a/tests/Feature/PaymentTermsApiTest.php +++ b/tests/Feature/PaymentTermsApiTest.php @@ -10,26 +10,15 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; use App\Factory\PaymentTermFactory; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; use App\Models\PaymentTerm; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; +use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; -use Illuminate\Routing\Middleware\ThrottleRequests; /** * @test @@ -56,7 +45,6 @@ class PaymentTermsApiTest extends TestCase $this->withoutMiddleware( ThrottleRequests::class ); - } public function testPaymentTermsGet() diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php index 3b7d43e46a10..90eb26830576 100644 --- a/tests/Feature/PaymentTest.php +++ b/tests/Feature/PaymentTest.php @@ -11,14 +11,11 @@ namespace Tests\Feature; use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Factory\ClientFactory; use App\Factory\CreditFactory; use App\Factory\InvoiceFactory; use App\Factory\PaymentFactory; use App\Helpers\Invoice\InvoiceSum; -use App\Models\Account; -use App\Models\Activity; use App\Models\Client; use App\Models\ClientContact; use App\Models\Credit; @@ -27,11 +24,8 @@ use App\Models\Payment; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Foundation\Testing\WithoutEvents; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Session; use Illuminate\Validation\ValidationException; use Tests\MockAccountData; @@ -272,7 +266,7 @@ class PaymentTest extends TestCase $client = ClientFactory::create($this->company->id, $this->user->id); $client->save(); - ClientContact::factory()->create([ + ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $client->id, 'company_id' =>$this->company->id, @@ -348,7 +342,7 @@ class PaymentTest extends TestCase $client->setRelation('company', $this->company); $client->save(); - $client_contact = ClientContact::factory()->create([ + $client_contact = ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $client->id, 'company_id' => $this->company->id, @@ -424,7 +418,7 @@ class PaymentTest extends TestCase $client = ClientFactory::create($this->company->id, $this->user->id); $client->save(); - ClientContact::factory()->create([ + ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $client->id, 'company_id' => $this->company->id, @@ -432,7 +426,7 @@ class PaymentTest extends TestCase 'send_email' => true, ]); - ClientContact::factory()->create([ + ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $client->id, 'company_id' => $this->company->id, @@ -496,7 +490,7 @@ class PaymentTest extends TestCase $client = ClientFactory::create($this->company->id, $this->user->id); $client->save(); -$contact = ClientContact::factory()->create([ + $contact = ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $this->client->id, 'company_id' => $this->company->id, @@ -504,7 +498,7 @@ $contact = ClientContact::factory()->create([ 'send_email' => true, ]); - ClientContact::factory()->create([ + ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $this->client->id, 'company_id' => $this->company->id, @@ -1382,7 +1376,4 @@ $contact = ClientContact::factory()->create([ $this->assertEquals(1, $arr['data'][0]['is_deleted']); } - - - } diff --git a/tests/Feature/PdfCreatorTest.php b/tests/Feature/PdfCreatorTest.php index bf3fbf53d186..a8a72338582a 100644 --- a/tests/Feature/PdfCreatorTest.php +++ b/tests/Feature/PdfCreatorTest.php @@ -11,7 +11,6 @@ namespace Tests\Feature; use App\Jobs\Entity\CreateEntityPdf; -use Faker\Factory; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Support\Facades\Storage; @@ -23,7 +22,6 @@ use Tests\TestCase; */ class PdfCreatorTest extends TestCase { - use DatabaseTransactions; use MockAccountData; @@ -57,7 +55,5 @@ class PdfCreatorTest extends TestCase $quote_path = CreateEntityPdf::dispatchNow($this->quote->invitations->first()); $this->assertTrue(Storage::exists($this->client->quote_filepath().$this->quote->number.'.pdf')); - } - - + } } diff --git a/tests/Feature/PdfMaker/ExampleIntegrationTest.php b/tests/Feature/PdfMaker/ExampleIntegrationTest.php index 1d6b244b22eb..100e89ef279a 100644 --- a/tests/Feature/PdfMaker/ExampleIntegrationTest.php +++ b/tests/Feature/PdfMaker/ExampleIntegrationTest.php @@ -10,9 +10,7 @@ */ namespace Tests\Feature\PdfMaker; -use App\Models\Invoice; use App\Services\PdfMaker\Design; -use App\Services\PdfMaker\Designs\Playful; use App\Services\PdfMaker\PdfMaker; use App\Utils\HtmlEngine; use App\Utils\Traits\MakesInvoiceValues; diff --git a/tests/Feature/PingTest.php b/tests/Feature/PingTest.php index fa795f716d30..f4c5d1d61dbd 100644 --- a/tests/Feature/PingTest.php +++ b/tests/Feature/PingTest.php @@ -11,9 +11,9 @@ namespace Tests\Feature; use Illuminate\Foundation\Testing\DatabaseTransactions; +use Illuminate\Routing\Middleware\ThrottleRequests; use Tests\MockAccountData; use Tests\TestCase; -use Illuminate\Routing\Middleware\ThrottleRequests; /** * @test @@ -33,30 +33,25 @@ class PingTest extends TestCase $this->withoutMiddleware( ThrottleRequests::class ); - } public function testPingEndPoint() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, ])->get('/api/v1/ping'); $response->assertStatus(200); - } public function testHealthCheck() { - $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, ])->get('/api/v1/health_check'); $response->assertStatus(200); - } } diff --git a/tests/Feature/ProductTest.php b/tests/Feature/ProductTest.php index 8a45791223fd..fd6470397478 100644 --- a/tests/Feature/ProductTest.php +++ b/tests/Feature/ProductTest.php @@ -10,19 +10,11 @@ */ namespace Tests\Feature; -use App\Models\Account; -use App\Models\Company; use App\Models\Product; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/ProjectApiTest.php b/tests/Feature/ProjectApiTest.php index 237cf08089f8..5d5b4d600583 100644 --- a/tests/Feature/ProjectApiTest.php +++ b/tests/Feature/ProjectApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Project; -use App\Models\ProjectContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/QuoteTest.php b/tests/Feature/QuoteTest.php index 51500c0837b7..7b8423bda75f 100644 --- a/tests/Feature/QuoteTest.php +++ b/tests/Feature/QuoteTest.php @@ -10,19 +10,13 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\Quote; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/RecurringInvoiceTest.php b/tests/Feature/RecurringInvoiceTest.php index ed04d5e968df..c8641de4e59a 100644 --- a/tests/Feature/RecurringInvoiceTest.php +++ b/tests/Feature/RecurringInvoiceTest.php @@ -10,19 +10,13 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; use App\Models\RecurringInvoice; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; @@ -57,7 +51,6 @@ class RecurringInvoiceTest extends TestCase public function testRecurringInvoiceList() { Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id])->each(function ($c) { - ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $c->id, @@ -87,7 +80,6 @@ class RecurringInvoiceTest extends TestCase public function testRecurringInvoiceRESTEndPoints() { Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id])->each(function ($c) { - ClientContact::factory()->create([ 'user_id' => $this->user->id, 'client_id' => $c->id, diff --git a/tests/Feature/RecurringInvoicesCronTest.php b/tests/Feature/RecurringInvoicesCronTest.php index ebd65b533817..6c90a7346178 100644 --- a/tests/Feature/RecurringInvoicesCronTest.php +++ b/tests/Feature/RecurringInvoicesCronTest.php @@ -10,19 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\Account; -use App\Models\Client; use App\Models\RecurringInvoice; -use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; @@ -39,7 +29,7 @@ class RecurringInvoicesCronTest extends TestCase { parent::setUp(); - RecurringInvoice::all()->each(function ($ri){ + RecurringInvoice::all()->each(function ($ri) { $ri->forceDelete(); }); diff --git a/tests/Feature/RecurringQuoteTest.php b/tests/Feature/RecurringQuoteTest.php index 36b4d1ceec7a..c8f784328d60 100644 --- a/tests/Feature/RecurringQuoteTest.php +++ b/tests/Feature/RecurringQuoteTest.php @@ -10,18 +10,11 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\Account; -use App\Models\Client; use App\Models\RecurringQuote; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/RefundTest.php b/tests/Feature/RefundTest.php index 23a39d7d554f..9e64ce5d5d87 100644 --- a/tests/Feature/RefundTest.php +++ b/tests/Feature/RefundTest.php @@ -10,25 +10,16 @@ */ namespace Tests\Feature; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Factory\ClientFactory; use App\Factory\CreditFactory; use App\Factory\InvoiceFactory; -use App\Factory\PaymentFactory; use App\Helpers\Invoice\InvoiceSum; -use App\Models\Account; -use App\Models\Activity; -use App\Models\Client; use App\Models\Invoice; use App\Models\Payment; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Session; use Illuminate\Validation\ValidationException; use Tests\MockAccountData; diff --git a/tests/Feature/ReminderTest.php b/tests/Feature/ReminderTest.php index 1a444de3c5d4..07bb7f7eea60 100644 --- a/tests/Feature/ReminderTest.php +++ b/tests/Feature/ReminderTest.php @@ -10,23 +10,13 @@ */ namespace Tests\Feature; -use App\Jobs\Account\CreateAccount; use App\Jobs\Util\ReminderJob; -use App\Models\Account; -use App\Models\Client; use App\Models\Invoice; -use App\Models\User; use App\Utils\Traits\MakesHash; -use App\Utils\Traits\UserSessionAttributes; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/ReverseInvoiceTest.php b/tests/Feature/ReverseInvoiceTest.php index 3a69276d6095..8a99fff642dc 100644 --- a/tests/Feature/ReverseInvoiceTest.php +++ b/tests/Feature/ReverseInvoiceTest.php @@ -13,7 +13,6 @@ namespace Tests\Feature; use App\Factory\CreditFactory; use App\Factory\InvoiceItemFactory; use App\Helpers\Invoice\InvoiceSum; -use App\Listeners\Credit\CreateCreditInvitation; use App\Models\Client; use App\Models\Credit; use App\Models\Invoice; @@ -22,11 +21,7 @@ use App\Models\Paymentable; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Carbon; -use Illuminate\Validation\ValidationException; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/Shop/ShopInvoiceTest.php b/tests/Feature/Shop/ShopInvoiceTest.php index 0ca066f580d5..db006919bffe 100644 --- a/tests/Feature/Shop/ShopInvoiceTest.php +++ b/tests/Feature/Shop/ShopInvoiceTest.php @@ -10,8 +10,6 @@ */ namespace Tests\Feature\Shop; -use App\Factory\CompanyUserFactory; -use App\Models\CompanyToken; use App\Models\Product; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; diff --git a/tests/Feature/SystemLogApiTest.php b/tests/Feature/SystemLogApiTest.php index b4c9ab9f5a26..f55691b17ec9 100644 --- a/tests/Feature/SystemLogApiTest.php +++ b/tests/Feature/SystemLogApiTest.php @@ -10,22 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; use App\Models\SystemLog; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; -use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/TaskApiTest.php b/tests/Feature/TaskApiTest.php index 937846ec2a04..b343d790b64d 100644 --- a/tests/Feature/TaskApiTest.php +++ b/tests/Feature/TaskApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Task; -use App\Models\TaskContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; @@ -83,8 +72,6 @@ class TaskApiTest extends TestCase $response->assertStatus(200); $this->assertGreaterThan(0, $arr['data']['start_time']); - - } public function testTaskPut() diff --git a/tests/Feature/TaskStatusApiTest.php b/tests/Feature/TaskStatusApiTest.php index dc87c43cbec7..add976fc8dd5 100644 --- a/tests/Feature/TaskStatusApiTest.php +++ b/tests/Feature/TaskStatusApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\TaskStatus; -use App\Models\TaskStatusContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/UpdateExchangeRatesTest.php b/tests/Feature/UpdateExchangeRatesTest.php index f1b2a16daa0c..ea5cd022545b 100644 --- a/tests/Feature/UpdateExchangeRatesTest.php +++ b/tests/Feature/UpdateExchangeRatesTest.php @@ -10,25 +10,13 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; use App\Jobs\Util\UpdateExchangeRates; use App\Libraries\Currency\Conversion\CurrencyApi; -use App\Models\Account; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Company; use App\Models\Currency; -use App\Models\User; use App\Utils\Traits\MakesHash; -use AshAllenDesign\LaravelExchangeRates\Facades\ExchangeRate; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php index 850f59933642..fbf25050ce5c 100644 --- a/tests/Feature/UserTest.php +++ b/tests/Feature/UserTest.php @@ -13,18 +13,11 @@ namespace Tests\Feature; use App\Factory\CompanyUserFactory; use App\Factory\UserFactory; use App\Http\Middleware\PasswordProtection; -use App\Models\Account; -use App\Models\Activity; use App\Models\Company; -use App\Models\CompanyLedger; use App\Models\CompanyToken; use App\Models\CompanyUser; -use App\Models\Invoice; -use App\Models\Payment; use App\Models\User; -use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Support\Facades\Session; diff --git a/tests/Feature/VendorApiTest.php b/tests/Feature/VendorApiTest.php index 3ad6fdb38a84..4da4e88df275 100644 --- a/tests/Feature/VendorApiTest.php +++ b/tests/Feature/VendorApiTest.php @@ -10,20 +10,9 @@ */ namespace Tests\Feature; -use App\DataMapper\DefaultSettings; -use App\Models\Account; -use App\Models\Vendor; -use App\Models\VendorContact; -use App\Models\Company; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Faker\Factory; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Feature/WebhookAPITest.php b/tests/Feature/WebhookAPITest.php index a489b4b6ef83..7ea2b7c32029 100644 --- a/tests/Feature/WebhookAPITest.php +++ b/tests/Feature/WebhookAPITest.php @@ -13,11 +13,7 @@ namespace Tests\Feature; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Carbon; -use Illuminate\Validation\ValidationException; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/CheckCacheTest.php b/tests/Integration/CheckCacheTest.php index a389ceea79e9..5941bfbc8a4d 100644 --- a/tests/Integration/CheckCacheTest.php +++ b/tests/Integration/CheckCacheTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Integration; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\Cache; use Tests\MockAccountData; diff --git a/tests/Integration/CheckLockedInvoiceValidationTest.php b/tests/Integration/CheckLockedInvoiceValidationTest.php index 05d1728e6f3d..4a448398d019 100644 --- a/tests/Integration/CheckLockedInvoiceValidationTest.php +++ b/tests/Integration/CheckLockedInvoiceValidationTest.php @@ -10,9 +10,7 @@ */ namespace Tests\Integration; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Cache; use JsonSchema\Exception\ValidationException; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/CheckRemindersTest.php b/tests/Integration/CheckRemindersTest.php index 580435ed830a..dccef6635148 100644 --- a/tests/Integration/CheckRemindersTest.php +++ b/tests/Integration/CheckRemindersTest.php @@ -12,10 +12,8 @@ namespace Tests\Integration; use App\Models\Invoice; use App\Utils\Traits\MakesReminders; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Cache; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/CompanyLedgerTest.php b/tests/Integration/CompanyLedgerTest.php index d7216518ffd5..bb856de2c895 100644 --- a/tests/Integration/CompanyLedgerTest.php +++ b/tests/Integration/CompanyLedgerTest.php @@ -11,32 +11,22 @@ namespace Tests\Integration; use App\DataMapper\CompanySettings; -use App\Events\Invoice\InvoiceWasCreated; -use App\Events\Invoice\InvoiceWasUpdated; -use App\Events\Payment\PaymentWasCreated; use App\Factory\CompanyUserFactory; -use App\Factory\InvoiceItemFactory; -use App\Jobs\Invoice\MarkInvoicePaid; use App\Models\Account; -use App\Models\Activity; use App\Models\Client; use App\Models\ClientContact; use App\Models\Company; -use App\Models\CompanyLedger; use App\Models\CompanyToken; use App\Models\Invoice; use App\Models\Payment; use App\Models\User; use App\Utils\Traits\MakesHash; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; -use Illuminate\Foundation\Testing\DatabaseMigrations; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Schema; -use Tests\MockAccountData; -use Tests\TestCase; use Illuminate\Validation\ValidationException; +use Tests\TestCase; /** @test*/ class CompanyLedgerTest extends TestCase @@ -227,11 +217,10 @@ class CompanyLedgerTest extends TestCase ]; try { - $response = $this->withHeaders([ + $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, ])->post('/api/v1/payments/', $data); - } catch (ValidationException $e) { info(print_r($e->validator->getMessageBag(), 1)); } diff --git a/tests/Integration/ContainerTest.php b/tests/Integration/ContainerTest.php index 1596c1987705..01150063b746 100644 --- a/tests/Integration/ContainerTest.php +++ b/tests/Integration/ContainerTest.php @@ -11,9 +11,6 @@ namespace Tests\Integration; use App\Models\Company; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; -use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Cache; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/DownloadHistoricalInvoiceTest.php b/tests/Integration/DownloadHistoricalInvoiceTest.php index 4d7773641d92..0b37102b18fd 100644 --- a/tests/Integration/DownloadHistoricalInvoiceTest.php +++ b/tests/Integration/DownloadHistoricalInvoiceTest.php @@ -10,14 +10,10 @@ */ namespace Tests\Integration; -use App\Events\Invoice\InvoiceWasUpdated; -use App\Models\Activity; use App\Repositories\ActivityRepository; use App\Utils\Ninja; use App\Utils\Traits\MakesHash; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Cache; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/EventTest.php b/tests/Integration/EventTest.php index 991a6254f5be..738ca7510dc3 100644 --- a/tests/Integration/EventTest.php +++ b/tests/Integration/EventTest.php @@ -10,8 +10,6 @@ */ namespace Tests\Integration; -use App\Designs\Bold; -use App\Designs\Designer; use App\Events\Client\ClientWasArchived; use App\Events\Client\ClientWasCreated; use App\Events\Client\ClientWasDeleted; @@ -53,18 +51,9 @@ use App\Events\Vendor\VendorWasCreated; use App\Events\Vendor\VendorWasDeleted; use App\Events\Vendor\VendorWasRestored; use App\Events\Vendor\VendorWasUpdated; -use App\Models\Credit; -use App\Models\Design; use App\Models\Invoice; use App\Models\Quote; -use App\Models\RecurringInvoice; -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; -use Faker\Factory; use Tests\MockAccountData; use Tests\TestCase; @@ -140,7 +129,6 @@ class EventTest extends TestCase 'X-API-TOKEN' => $this->token, ])->post('/api/v1/expenses/bulk?action=delete', $data) ->assertStatus(200); - } @@ -200,7 +188,6 @@ class EventTest extends TestCase 'X-API-TOKEN' => $this->token, ])->post('/api/v1/vendors/bulk?action=delete', $data) ->assertStatus(200); - } @@ -263,7 +250,6 @@ class EventTest extends TestCase 'X-API-TOKEN' => $this->token, ])->post('/api/v1/tasks/bulk?action=delete', $data) ->assertStatus(200); - } public function testCreditEvents() @@ -325,7 +311,6 @@ class EventTest extends TestCase 'X-API-TOKEN' => $this->token, ])->post('/api/v1/credits/bulk?action=delete', $data) ->assertStatus(200); - } public function testQuoteEvents() @@ -398,7 +383,6 @@ class EventTest extends TestCase 'X-API-TOKEN' => $this->token, ])->post('/api/v1/quotes/bulk?action=delete', $data) ->assertStatus(200); - } @@ -407,7 +391,6 @@ class EventTest extends TestCase public function testPaymentEvents() { - $this->expectsEvents([ PaymentWasCreated::class, PaymentWasUpdated::class, @@ -530,7 +513,6 @@ class EventTest extends TestCase 'X-API-TOKEN' => $this->token, ])->post('/api/v1/invoices/bulk?action=delete', $data) ->assertStatus(200); - } @@ -590,7 +572,5 @@ class EventTest extends TestCase 'X-API-TOKEN' => $this->token, ])->post('/api/v1/clients/bulk?action=delete', $data) ->assertStatus(200); - } - } diff --git a/tests/Integration/HtmlGenerationTest.php b/tests/Integration/HtmlGenerationTest.php index 1871425d3e85..258756232fd2 100644 --- a/tests/Integration/HtmlGenerationTest.php +++ b/tests/Integration/HtmlGenerationTest.php @@ -10,21 +10,19 @@ */ namespace Tests\Integration; -use App\Designs\Bold; -use App\Designs\Designer; use App\Models\Credit; use App\Models\Design; use App\Models\Invoice; use App\Models\Quote; use App\Models\RecurringInvoice; -use App\Utils\HtmlEngine; -use App\Utils\Traits\MakesHash; -use App\Utils\Traits\MakesInvoiceHtml; -use Tests\MockAccountData; -use Tests\TestCase; 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 Tests\MockAccountData; +use Tests\TestCase; + /** * @test */ @@ -51,13 +49,11 @@ class HtmlGenerationTest extends TestCase { $entity_design_id = ''; - if($entity instanceof Invoice || $entity instanceof RecurringInvoice){ + if ($entity instanceof Invoice || $entity instanceof RecurringInvoice) { $entity_design_id = 'invoice_design_id'; - } - elseif($entity instanceof Quote){ + } elseif ($entity instanceof Quote) { $entity_design_id = 'quote_design_id'; - } - elseif($entity instanceof Credit){ + } elseif ($entity instanceof Credit) { $entity_design_id = 'credit_design_id'; } @@ -67,12 +63,12 @@ class HtmlGenerationTest extends TestCase $html = new HtmlEngine($entity->invitations->first()); if ($design->is_custom) { - $options = [ + $options = [ 'custom_partials' => json_decode(json_encode($design->design), true) ]; - $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); + $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options); } else { - $template = new PdfMakerDesign(strtolower($design->name)); + $template = new PdfMakerDesign(strtolower($design->name)); } $state = [ @@ -94,6 +90,5 @@ class HtmlGenerationTest extends TestCase return $maker->design($template) ->build() ->getCompiledHTML(true); - } } diff --git a/tests/Integration/InvoiceUploadTest.php b/tests/Integration/InvoiceUploadTest.php index 180c6b599a57..e958b1c15f4e 100644 --- a/tests/Integration/InvoiceUploadTest.php +++ b/tests/Integration/InvoiceUploadTest.php @@ -11,10 +11,7 @@ namespace Tests\Integration; use App\Jobs\Entity\CreateEntityPdf; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Storage; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/MarkInvoicePaidTest.php b/tests/Integration/MarkInvoicePaidTest.php index 65a95089649a..e673bac1daf7 100644 --- a/tests/Integration/MarkInvoicePaidTest.php +++ b/tests/Integration/MarkInvoicePaidTest.php @@ -10,12 +10,7 @@ */ namespace Tests\Integration; -use App\Models\Account; -use App\Models\Company; use App\Models\Invoice; -use App\Models\Payment; -use App\Models\User; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/MultiDBUserTest.php b/tests/Integration/MultiDBUserTest.php index 525e68d45910..89b416462975 100644 --- a/tests/Integration/MultiDBUserTest.php +++ b/tests/Integration/MultiDBUserTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Integration; -use App\DataMapper\CompanySettings; use App\Factory\CompanyUserFactory; use App\Libraries\MultiDB; use App\Models\Account; @@ -18,8 +17,6 @@ use App\Models\Company; use App\Models\CompanyToken; use App\Models\CompanyUser; use App\Models\User; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Tests\TestCase; diff --git a/tests/Integration/PaymentDrivers/AuthorizeTest.php b/tests/Integration/PaymentDrivers/AuthorizeTest.php index 302661343505..68bf0d6ec8fc 100644 --- a/tests/Integration/PaymentDrivers/AuthorizeTest.php +++ b/tests/Integration/PaymentDrivers/AuthorizeTest.php @@ -10,10 +10,6 @@ */ namespace Tests\Integration\PaymentDrivers; -use App\Factory\PaymentFactory; -use App\Models\CompanyGateway; -use App\PaymentDrivers\AuthorizePaymentDriver; -use net\authorize\api\constants\ANetEnvironment; use net\authorize\api\contract\v1 as AnetAPI; use net\authorize\api\contract\v1\CreateCustomerPaymentProfileRequest; use net\authorize\api\contract\v1\CreateTransactionRequest; @@ -24,8 +20,6 @@ use net\authorize\api\contract\v1\CustomerProfilePaymentType; use net\authorize\api\contract\v1\CustomerProfileType; use net\authorize\api\contract\v1\GetCustomerProfileIdsRequest; use net\authorize\api\contract\v1\GetCustomerProfileRequest; -use net\authorize\api\contract\v1\GetMerchantDetailsRequest; -use net\authorize\api\contract\v1\MerchantAuthenticationType; use net\authorize\api\contract\v1\PaymentProfileType; use net\authorize\api\contract\v1\PaymentType; use net\authorize\api\contract\v1\TransactionRequestType; @@ -179,7 +173,7 @@ class AuthorizeTest extends TestCase if (($response != null) && ($response->getMessages()->getResultCode() == 'Ok')) { info('Succesfully created customer profile : '.$response->getCustomerProfileId()."\n"); $paymentProfiles = $response->getCustomerPaymentProfileIdList(); - // info(print_r($paymentProfiles, 1)); + // info(print_r($paymentProfiles, 1)); } else { info("ERROR : Invalid response\n"); $errorMessages = $response->getMessages()->getMessage(); @@ -276,11 +270,11 @@ class AuthorizeTest extends TestCase $response = $controller->executeWithApiResponse(\net\authorize\api\constants\ANetEnvironment::SANDBOX); if (($response != null) && ($response->getMessages()->getResultCode() == 'Ok')) { - // info('Create Customer Payment Profile SUCCESS: '.$response->getCustomerPaymentProfileId()."\n"); + // info('Create Customer Payment Profile SUCCESS: '.$response->getCustomerPaymentProfileId()."\n"); } else { - // info("Create Customer Payment Profile: ERROR Invalid response\n"); + // info("Create Customer Payment Profile: ERROR Invalid response\n"); $errorMessages = $response->getMessages()->getMessage(); - // info('Response : '.$errorMessages[0]->getCode().' '.$errorMessages[0]->getText()."\n"); + // info('Response : '.$errorMessages[0]->getCode().' '.$errorMessages[0]->getText()."\n"); } $this->assertNotNull($response); @@ -353,6 +347,5 @@ class AuthorizeTest extends TestCase $this->assertNotNull($response); $this->assertNotNull($tresponse); - } } diff --git a/tests/Integration/SendFailedEmailsTest.php b/tests/Integration/SendFailedEmailsTest.php index c7b0a4afa397..39c6083c6fd7 100644 --- a/tests/Integration/SendFailedEmailsTest.php +++ b/tests/Integration/SendFailedEmailsTest.php @@ -10,14 +10,9 @@ */ namespace Tests\Integration; -use App\Jobs\Invoice\EmailInvoice; use App\Jobs\Util\SendFailedEmails; -use App\Jobs\Util\SystemLogger; use App\Models\SystemLog; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Queue; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/SystemHealthTest.php b/tests/Integration/SystemHealthTest.php index 58285561ac52..e9327f435f77 100644 --- a/tests/Integration/SystemHealthTest.php +++ b/tests/Integration/SystemHealthTest.php @@ -10,9 +10,7 @@ */ namespace Tests\Integration; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Cache; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/UniqueEmailTest.php b/tests/Integration/UniqueEmailTest.php index 650fe58f2f2e..c836555273a6 100644 --- a/tests/Integration/UniqueEmailTest.php +++ b/tests/Integration/UniqueEmailTest.php @@ -14,7 +14,6 @@ use App\Http\ValidationRules\NewUniqueUserRule; use App\Models\Account; use App\Models\Company; use App\Models\User; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; diff --git a/tests/Integration/UpdateCompanyLedgerTest.php b/tests/Integration/UpdateCompanyLedgerTest.php index d331591ac088..330862c190b2 100644 --- a/tests/Integration/UpdateCompanyLedgerTest.php +++ b/tests/Integration/UpdateCompanyLedgerTest.php @@ -10,18 +10,7 @@ */ namespace Tests\Integration; -use App\Events\Invoice\InvoiceWasCreated; -use App\Events\Invoice\InvoiceWasUpdated; -use App\Events\Payment\PaymentWasCreated; -use App\Jobs\Invoice\MarkInvoicePaid; -use App\Models\Account; -use App\Models\Activity; -use App\Models\Company; use App\Models\CompanyLedger; -use App\Models\Invoice; -use App\Models\Payment; -use App\Models\User; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; use Tests\TestCase; @@ -60,7 +49,6 @@ class UpdateCompanyLedgerTest extends TestCase */ public function testInvoiceIsPresentInLedger() { - $invoice = $this->invoice->service()->markPaid()->save(); $this->assertGreaterThan(0, $invoice->company_ledger()->count()); diff --git a/tests/Integration/UpdateCompanyUserTest.php b/tests/Integration/UpdateCompanyUserTest.php index 5a73ec7a67ad..be33b2830132 100644 --- a/tests/Integration/UpdateCompanyUserTest.php +++ b/tests/Integration/UpdateCompanyUserTest.php @@ -13,9 +13,7 @@ namespace Tests\Integration; use App\Models\CompanyUser; use App\Models\User; use App\Utils\Traits\MakesHash; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Cache; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/UploadFileTest.php b/tests/Integration/UploadFileTest.php index 1430f1a54f76..92ac77a82e7f 100644 --- a/tests/Integration/UploadFileTest.php +++ b/tests/Integration/UploadFileTest.php @@ -10,24 +10,10 @@ */ namespace Tests\Integration; -use App\Events\Invoice\InvoiceWasCreated; -use App\Events\Invoice\InvoiceWasUpdated; -use App\Events\Payment\PaymentWasCreated; -use App\Jobs\Invoice\MarkInvoicePaid; use App\Jobs\Util\UploadFile; -use App\Models\Account; -use App\Models\Activity; -use App\Models\Company; -use App\Models\CompanyLedger; -use App\Models\Invoice; -use App\Models\Payment; -use App\Models\User; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Http\UploadedFile; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Storage; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Integration/UploadLogoTest.php b/tests/Integration/UploadLogoTest.php index 9208ab5caaec..b4d6a35047a1 100644 --- a/tests/Integration/UploadLogoTest.php +++ b/tests/Integration/UploadLogoTest.php @@ -10,24 +10,10 @@ */ namespace Tests\Integration; -use App\Events\Invoice\InvoiceWasCreated; -use App\Events\Invoice\InvoiceWasUpdated; -use App\Events\Payment\PaymentWasCreated; -use App\Jobs\Invoice\MarkInvoicePaid; -use App\Jobs\Util\UploadFile; -use App\Models\Account; -use App\Models\Activity; use App\Models\Company; -use App\Models\CompanyLedger; -use App\Models\Invoice; -use App\Models\Payment; -use App\Models\User; use App\Utils\Traits\MakesHash; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Http\UploadedFile; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php index 5dfeae55c8cb..6e973b4eb979 100644 --- a/tests/MockAccountData.php +++ b/tests/MockAccountData.php @@ -182,7 +182,6 @@ trait MockAccountData $this->user = User::whereEmail('user@example.com')->first(); if (! $this->user) { - $this->user = User::factory()->create([ 'account_id' => $this->account->id, 'confirmation_code' => $this->createDbHash(config('database.default')), diff --git a/tests/Pdf/PdfGenerationTest.php b/tests/Pdf/PdfGenerationTest.php index 04dafac0b5d3..d2ed99562d73 100644 --- a/tests/Pdf/PdfGenerationTest.php +++ b/tests/Pdf/PdfGenerationTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Pdf; -use Illuminate\Support\Facades\Storage; use Spatie\Browsershot\Browsershot; use Tests\TestCase; diff --git a/tests/TestCase.php b/tests/TestCase.php index d8e8e5c32bb9..2932d4a69d65 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -3,7 +3,6 @@ namespace Tests; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; -use Illuminate\Routing\Middleware\ThrottleRequests; abstract class TestCase extends BaseTestCase { diff --git a/tests/Unit/AutoBillInvoiceTest.php b/tests/Unit/AutoBillInvoiceTest.php index dc8fbbce8116..dc7b80747959 100644 --- a/tests/Unit/AutoBillInvoiceTest.php +++ b/tests/Unit/AutoBillInvoiceTest.php @@ -33,7 +33,6 @@ class AutoBillInvoiceTest extends TestCase public function testAutoBillFunctionality() { - $this->assertEquals($this->client->balance, 10); $this->assertEquals($this->client->paid_to_date, 0); $this->assertEquals($this->client->credit_balance, 10); @@ -46,7 +45,6 @@ class AutoBillInvoiceTest extends TestCase $this->assertEquals($this->client->balance, 0); $this->assertEquals($this->client->paid_to_date, 10); $this->assertEquals($this->client->credit_balance, 0); - } diff --git a/tests/Unit/BaseSettingsTest.php b/tests/Unit/BaseSettingsTest.php index 95719e86db58..f9640cdc03f6 100644 --- a/tests/Unit/BaseSettingsTest.php +++ b/tests/Unit/BaseSettingsTest.php @@ -11,8 +11,6 @@ namespace Tests\Unit; use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; /** diff --git a/tests/Unit/CloneQuoteToInvoiceFactoryTest.php b/tests/Unit/CloneQuoteToInvoiceFactoryTest.php index e5f67ceea139..b5a855ee3f40 100644 --- a/tests/Unit/CloneQuoteToInvoiceFactoryTest.php +++ b/tests/Unit/CloneQuoteToInvoiceFactoryTest.php @@ -11,9 +11,6 @@ namespace Tests\Unit; use App\Factory\CloneQuoteToInvoiceFactory; -use App\Factory\InvoiceFactory; -use App\Factory\InvoiceItemFactory; -use App\Helpers\Invoice\InvoiceSum; use App\Models\Invoice; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; diff --git a/tests/Unit/CollectionMergingTest.php b/tests/Unit/CollectionMergingTest.php index 37cb02eec362..ad35c0f04e1d 100644 --- a/tests/Unit/CollectionMergingTest.php +++ b/tests/Unit/CollectionMergingTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Unit; -use App\Models\PaymentTerm; use App\Utils\Traits\UserSessionAttributes; use Illuminate\Support\Facades\Session; use Tests\TestCase; diff --git a/tests/Unit/CompareObjectTest.php b/tests/Unit/CompareObjectTest.php index 88e95a4d2b5e..a9946f38afcd 100644 --- a/tests/Unit/CompareObjectTest.php +++ b/tests/Unit/CompareObjectTest.php @@ -12,7 +12,6 @@ namespace Tests\Unit; use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; -use Illuminate\Support\Facades\Log; use Tests\TestCase; /** diff --git a/tests/Unit/EncryptionSettingsTest.php b/tests/Unit/EncryptionSettingsTest.php index a9d7cb910b38..4fa197b0c2a7 100644 --- a/tests/Unit/EncryptionSettingsTest.php +++ b/tests/Unit/EncryptionSettingsTest.php @@ -10,9 +10,6 @@ */ namespace Tests\Unit; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; /** diff --git a/tests/Unit/EntityTest.php b/tests/Unit/EntityTest.php index bed6bf72f6b2..f5091c5d69f9 100644 --- a/tests/Unit/EntityTest.php +++ b/tests/Unit/EntityTest.php @@ -10,8 +10,6 @@ */ namespace Tests\Unit; -use App\Factory\InvoiceFactory; -use App\Factory\InvoiceItemFactory; use App\Helpers\Invoice\InvoiceSum; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; diff --git a/tests/Unit/EvaluateStringTest.php b/tests/Unit/EvaluateStringTest.php index 069b3c762481..e995f7df82d9 100644 --- a/tests/Unit/EvaluateStringTest.php +++ b/tests/Unit/EvaluateStringTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Unit; -use App\DataMapper\DefaultSettings; use App\Models\Client; use Tests\TestCase; diff --git a/tests/Unit/FactoryCreationTest.php b/tests/Unit/FactoryCreationTest.php index 1340156d0b4c..44948c96736d 100644 --- a/tests/Unit/FactoryCreationTest.php +++ b/tests/Unit/FactoryCreationTest.php @@ -10,13 +10,11 @@ */ namespace Tests\Unit; -use App\Factory\ClientContactFactory; use App\Factory\ClientFactory; use App\Factory\CloneInvoiceFactory; use App\Factory\InvoiceFactory; use App\Factory\ProductFactory; use App\Factory\UserFactory; -use App\Models\Client; use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; diff --git a/tests/Unit/GeneratesCounterTest.php b/tests/Unit/GeneratesCounterTest.php index 2528f779912e..0fd66e7d0d75 100644 --- a/tests/Unit/GeneratesCounterTest.php +++ b/tests/Unit/GeneratesCounterTest.php @@ -11,7 +11,6 @@ namespace Tests\Unit; use App\DataMapper\ClientSettings; -use App\DataMapper\DefaultSettings; use App\Factory\ClientFactory; use App\Factory\VendorFactory; use App\Models\Client; @@ -19,13 +18,10 @@ use App\Models\Company; use App\Models\Credit; use App\Models\Invoice; use App\Models\RecurringInvoice; -use App\Models\User; use App\Utils\Traits\GeneratesCounter; -use App\Utils\Traits\GeneratesNumberCounter; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Unit/GoogleAnalyticsTest.php b/tests/Unit/GoogleAnalyticsTest.php index 76295f627e4d..afb2c851cd7a 100644 --- a/tests/Unit/GoogleAnalyticsTest.php +++ b/tests/Unit/GoogleAnalyticsTest.php @@ -10,11 +10,7 @@ */ namespace Tests\Unit; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; -use App\Models\GroupSetting; use App\Utils\Ninja; -use App\Utils\Traits\ClientGroupSettingsSaver; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Unit/GroupSettingsTest.php b/tests/Unit/GroupSettingsTest.php index e888e32791bc..62619cb3d0d2 100644 --- a/tests/Unit/GroupSettingsTest.php +++ b/tests/Unit/GroupSettingsTest.php @@ -12,7 +12,6 @@ namespace Tests\Unit; use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; -use App\Models\GroupSetting; use App\Utils\Traits\ClientGroupSettingsSaver; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; diff --git a/tests/Unit/GroupTest.php b/tests/Unit/GroupTest.php index e417e478fe1e..6e44c111b761 100644 --- a/tests/Unit/GroupTest.php +++ b/tests/Unit/GroupTest.php @@ -12,7 +12,6 @@ namespace Tests\Unit; use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; /** diff --git a/tests/Unit/InvitationTest.php b/tests/Unit/InvitationTest.php index fddfd47ccf56..19b8493af899 100644 --- a/tests/Unit/InvitationTest.php +++ b/tests/Unit/InvitationTest.php @@ -11,12 +11,8 @@ namespace Tests\Unit; use App\Factory\InvoiceInvitationFactory; -use App\Jobs\Util\UploadFile; -use App\Models\Document; use Illuminate\Foundation\Testing\DatabaseTransactions; -use Illuminate\Http\UploadedFile; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\Storage; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Unit/InvoiceInclusiveTest.php b/tests/Unit/InvoiceInclusiveTest.php index 0bb0d0689523..6a9f0e821d0a 100644 --- a/tests/Unit/InvoiceInclusiveTest.php +++ b/tests/Unit/InvoiceInclusiveTest.php @@ -10,9 +10,7 @@ */ namespace Tests\Unit; -use App\Factory\InvoiceFactory; use App\Factory\InvoiceItemFactory; -use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSumInclusive; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; diff --git a/tests/Unit/InvoiceItemInclusiveTest.php b/tests/Unit/InvoiceItemInclusiveTest.php index 5f87449d79b1..c46a1d0ca531 100644 --- a/tests/Unit/InvoiceItemInclusiveTest.php +++ b/tests/Unit/InvoiceItemInclusiveTest.php @@ -11,7 +11,6 @@ namespace Tests\Unit; use App\Factory\InvoiceItemFactory; -use App\Helpers\Invoice\InvoiceItemSum; use App\Helpers\Invoice\InvoiceItemSumInclusive; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php index 3c4b5d0f7888..5e3f1b0c037a 100644 --- a/tests/Unit/InvoiceTest.php +++ b/tests/Unit/InvoiceTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Unit; -use App\Factory\InvoiceFactory; use App\Factory\InvoiceItemFactory; use App\Helpers\Invoice\InvoiceSum; use Illuminate\Foundation\Testing\DatabaseTransactions; diff --git a/tests/Unit/Migration/FeesAndLimitsTest.php b/tests/Unit/Migration/FeesAndLimitsTest.php index ef737f075d6a..efc74f7d13e7 100644 --- a/tests/Unit/Migration/FeesAndLimitsTest.php +++ b/tests/Unit/Migration/FeesAndLimitsTest.php @@ -13,7 +13,6 @@ namespace Tests\Unit\Migration; use App\DataMapper\BaseSettings; use App\DataMapper\FeesAndLimits; -use Illuminate\Support\Facades\Log; use Tests\TestCase; class FeesAndLimitsTest extends TestCase diff --git a/tests/Unit/Migration/ImportTest.php b/tests/Unit/Migration/ImportTest.php index 9d4b5451c381..a2e9c46d1767 100644 --- a/tests/Unit/Migration/ImportTest.php +++ b/tests/Unit/Migration/ImportTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Unit\Migration; -use App\Exceptions\MigrationValidatorFailed; use App\Exceptions\ResourceDependencyMissing; use App\Exceptions\ResourceNotAvailableForMigration; use App\Jobs\Util\Import; @@ -24,7 +23,6 @@ use App\Models\CompanyGateway; use App\Models\Credit; use App\Models\Document; use App\Models\Invoice; -use App\Models\InvoiceInvitation; use App\Models\Payment; use App\Models\Product; use App\Models\Quote; @@ -32,7 +30,6 @@ use App\Models\TaxRate; use App\Models\User; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\Mail; -use Illuminate\Support\Str; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Unit/PdfVariablesTest.php b/tests/Unit/PdfVariablesTest.php index 35e55a834194..5dada4a89dd9 100644 --- a/tests/Unit/PdfVariablesTest.php +++ b/tests/Unit/PdfVariablesTest.php @@ -10,9 +10,7 @@ */ namespace Tests\Unit; -use App\DataMapper\ClientSettings; use App\DataMapper\CompanySettings; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; /** diff --git a/tests/Unit/PrimaryKeyTransformationTest.php b/tests/Unit/PrimaryKeyTransformationTest.php index 813b9e4fa19e..1c9add075499 100644 --- a/tests/Unit/PrimaryKeyTransformationTest.php +++ b/tests/Unit/PrimaryKeyTransformationTest.php @@ -10,10 +10,7 @@ */ namespace Tests\Unit; -use App\DataMapper\ClientSettings; -use App\DataMapper\CompanySettings; use App\Utils\Traits\MakesHash; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; /** diff --git a/tests/Unit/RecurringDatesTest.php b/tests/Unit/RecurringDatesTest.php index 44341112094f..382fdcea3448 100644 --- a/tests/Unit/RecurringDatesTest.php +++ b/tests/Unit/RecurringDatesTest.php @@ -10,17 +10,12 @@ */ namespace Tests\Unit; -use App\Factory\CloneQuoteToInvoiceFactory; -use App\Factory\InvoiceFactory; -use App\Factory\InvoiceItemFactory; use App\Factory\RecurringInvoiceFactory; -use App\Helpers\Invoice\InvoiceSum; -use App\Models\Invoice; use App\Models\RecurringInvoice; use Illuminate\Foundation\Testing\DatabaseTransactions; +use Illuminate\Support\Carbon; use Tests\MockAccountData; use Tests\TestCase; -use Illuminate\Support\Carbon; /** * @test @@ -40,7 +35,6 @@ class RecurringDatesTest extends TestCase public function testRecurringDatesDraftInvoice() { - $recurring_invoice = RecurringInvoiceFactory::create($this->company->id, $this->user->id); $recurring_invoice->line_items = $this->buildLineItems(); $recurring_invoice->client_id = $this->client->id; @@ -49,12 +43,10 @@ class RecurringDatesTest extends TestCase $recurring_invoice->calc()->getInvoice(); $this->assertEquals(0, count($recurring_invoice->recurringDates())); - } public function testRecurringDatesPendingInvoice() { - $recurring_invoice = RecurringInvoiceFactory::create($this->company->id, $this->user->id); $recurring_invoice->line_items = $this->buildLineItems(); $recurring_invoice->client_id = $this->client->id; @@ -70,13 +62,11 @@ class RecurringDatesTest extends TestCase $recurring_invoice->calc()->getInvoice(); $this->assertEquals(5, count($recurring_invoice->recurringDates())); - } public function testRecurringDatesPendingInvoiceWithNoDueDate() { - $recurring_invoice = RecurringInvoiceFactory::create($this->company->id, $this->user->id); $recurring_invoice->line_items = $this->buildLineItems(); $recurring_invoice->client_id = $this->client->id; @@ -92,7 +82,6 @@ class RecurringDatesTest extends TestCase $recurring_invoice->calc()->getInvoice(); $this->assertEquals(5, count($recurring_invoice->recurringDates())); - } public function testCompareDatesLogic() @@ -100,7 +89,5 @@ class RecurringDatesTest extends TestCase $date = now()->startOfDay()->format('Y-m-d'); $this->assertTrue(Carbon::parse($date)->lte(now()->startOfDay())); - } - } diff --git a/tests/Unit/RecurringDueDatesTest.php b/tests/Unit/RecurringDueDatesTest.php index fa153791a076..797ec64a26b3 100644 --- a/tests/Unit/RecurringDueDatesTest.php +++ b/tests/Unit/RecurringDueDatesTest.php @@ -21,13 +21,11 @@ use Tests\TestCase; */ class RecurringDueDatesTest extends TestCase { - use HasRecurrence; public function testFirstDate() { - $date = Carbon::parse('2020-02-15'); $due_date = $this->calculateFirstDayOfMonth($date); @@ -37,59 +35,49 @@ class RecurringDueDatesTest extends TestCase public function testFirstOfMonthOnFirst() { - $date = Carbon::parse('2020-02-01'); $due_date = $this->calculateFirstDayOfMonth($date); $this->assertEquals('2020-03-01', $due_date->format('Y-m-d')); - - } + } public function testFirstOfMonthOnLast() { - $date = Carbon::parse('2020-03-31'); $due_date = $this->calculateFirstDayOfMonth($date); $this->assertEquals('2020-04-01', $due_date->format('Y-m-d')); - - } + } public function testLastOfMonth() { - $date = Carbon::parse('2020-02-15'); $due_date = $this->calculateLastDayOfMonth($date); $this->assertEquals('2020-02-29', $due_date->format('Y-m-d')); - - } + } public function testLastOfMonthOnFirst() { - $date = Carbon::parse('2020-02-1'); $due_date = $this->calculateLastDayOfMonth($date); $this->assertEquals('2020-02-29', $due_date->format('Y-m-d')); - - } + } public function testLastOfMonthOnLast() { - $date = Carbon::parse('2020-02-29'); $due_date = $this->calculateLastDayOfMonth($date); $this->assertEquals('2020-03-31', $due_date->format('Y-m-d')); - - } + } public function testDayOfMonth() { @@ -98,7 +86,6 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '15'); $this->assertEquals('2020-02-15', $due_date->format('Y-m-d')); - } public function testDayOfMonthInFuture() @@ -108,7 +95,6 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '15'); $this->assertEquals('2020-03-15', $due_date->format('Y-m-d')); - } public function testDayOfMonthSameDay() @@ -118,7 +104,6 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '1'); $this->assertEquals('2020-03-01', $due_date->format('Y-m-d')); - } @@ -129,7 +114,6 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '31'); $this->assertEquals('2020-02-29', $due_date->format('Y-m-d')); - } public function testDayOfMonthWithOverflow2() @@ -139,7 +123,6 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '31'); $this->assertEquals('2020-03-31', $due_date->format('Y-m-d')); - } public function testDayOfMonthWithOverflow3() @@ -149,7 +132,6 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '30'); $this->assertEquals('2020-02-29', $due_date->format('Y-m-d')); - } public function testDayOfMonthWithOverflow4() @@ -159,7 +141,6 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '31'); $this->assertEquals('2019-03-31', $due_date->format('Y-m-d')); - } public function testDayOfMonthWithOverflow5() @@ -169,7 +150,5 @@ class RecurringDueDatesTest extends TestCase $due_date = $this->setDayOfMonth($date, '31'); $this->assertEquals('2019-02-28', $due_date->format('Y-m-d')); - } - } diff --git a/tests/Unit/SentryTest.php b/tests/Unit/SentryTest.php index 42abb51ced57..9b2b0a4a0b30 100644 --- a/tests/Unit/SentryTest.php +++ b/tests/Unit/SentryTest.php @@ -10,8 +10,6 @@ */ namespace Tests\Unit; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Foundation\Testing\WithFaker; use Tests\TestCase; class SentryTest extends TestCase diff --git a/tests/Unit/Shop/ShopProfileTest.php b/tests/Unit/Shop/ShopProfileTest.php index e8d41a1a2a1c..965618541bda 100644 --- a/tests/Unit/Shop/ShopProfileTest.php +++ b/tests/Unit/Shop/ShopProfileTest.php @@ -10,9 +10,6 @@ */ namespace Tests\Unit\Shop; -use App\Factory\InvoiceFactory; -use App\Factory\InvoiceItemFactory; -use App\Helpers\Invoice\InvoiceSum; use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\MockAccountData; use Tests\TestCase; diff --git a/tests/Unit/SystemHealthTest.php b/tests/Unit/SystemHealthTest.php index 57daadddcfe0..d13001436aa1 100644 --- a/tests/Unit/SystemHealthTest.php +++ b/tests/Unit/SystemHealthTest.php @@ -11,7 +11,6 @@ namespace Tests\Unit; use App\Utils\SystemHealth; -use Illuminate\Foundation\Testing\DatabaseTransactions; use Tests\TestCase; /** diff --git a/tests/Unit/UBLInvoiceTest.php b/tests/Unit/UBLInvoiceTest.php index 5305a61f7138..b9d25db7f253 100644 --- a/tests/Unit/UBLInvoiceTest.php +++ b/tests/Unit/UBLInvoiceTest.php @@ -10,10 +10,6 @@ */ namespace Tests\Unit; -use App\Factory\InvoiceFactory; -use App\Factory\InvoiceItemFactory; -use App\Helpers\Invoice\InvoiceSum; -use App\Helpers\Invoice\InvoiceSumInclusive; use App\Jobs\Invoice\CreateUbl; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Routing\Middleware\ThrottleRequests;