diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 4985bef85b19..08218aa91482 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -12,6 +12,7 @@ namespace App\Http\Controllers; +use \Illuminate\Support\Facades\DB; use App\Http\Requests\Setup\CheckDatabaseRequest; use App\Http\Requests\Setup\CheckMailRequest; use App\Http\Requests\Setup\StoreSetupRequest; @@ -22,7 +23,6 @@ use App\Utils\CurlUtils; use App\Utils\SystemHealth; use App\Utils\Traits\AppSetup; use Beganovich\Snappdf\Snappdf; -use \Illuminate\Support\Facades\DB; use Exception; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Routing\ResponseFactory; diff --git a/app/Http/Requests/Invoice/ActionInvoiceRequest.php b/app/Http/Requests/Invoice/ActionInvoiceRequest.php index d98b43f94c71..fbe5c8c9c222 100644 --- a/app/Http/Requests/Invoice/ActionInvoiceRequest.php +++ b/app/Http/Requests/Invoice/ActionInvoiceRequest.php @@ -18,8 +18,8 @@ use App\Utils\Traits\MakesHash; class ActionInvoiceRequest extends Request { - use MakesHash; - use ActionsInvoice; + use MakesHash; + use ActionsInvoice; /** * Determine if the user is authorized to make this request. * @@ -36,31 +36,28 @@ class ActionInvoiceRequest extends Request public function rules() { - return [ - 'action' => 'required' - ]; + return [ + 'action' => 'required' + ]; } protected function prepareForValidation() { $input = $this->all(); - $this->invoice = Invoice::find($this->decodePrimary($invoice_id)); + $this->invoice = Invoice::find($this->decodePrimary($invoice_id)); - if(!array_key_exists('action', $input)) { - $this->error_msg = 'Action is a required field'; - } - elseif(!$this->invoiceDeletable($this->invoice)){ - unset($input['action']); - $this->error_msg = 'This invoice cannot be deleted'; - } - elseif(!$this->invoiceCancellable($this->invoice)) { - unset($input['action']); - $this->error_msg = 'This invoice cannot be cancelled'; - } - else if(!$this->invoiceReversable($this->invoice)) { - unset($input['action']); - $this->error_msg = 'This invoice cannot be reversed'; + if (!array_key_exists('action', $input)) { + $this->error_msg = 'Action is a required field'; + } elseif (!$this->invoiceDeletable($this->invoice)) { + unset($input['action']); + $this->error_msg = 'This invoice cannot be deleted'; + } elseif (!$this->invoiceCancellable($this->invoice)) { + unset($input['action']); + $this->error_msg = 'This invoice cannot be cancelled'; + } elseif (!$this->invoiceReversable($this->invoice)) { + unset($input['action']); + $this->error_msg = 'This invoice cannot be reversed'; } $this->replace($input); @@ -68,13 +65,8 @@ class ActionInvoiceRequest extends Request public function messages() { - return [ - 'action' => $this->error_msg, - ]; + return [ + 'action' => $this->error_msg, + ]; } - - - - } - diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index f741688994c2..cd6be762e38d 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -16,7 +16,6 @@ use App\Libraries\MultiDB; use App\Models\RecurringInvoice; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Log; class RecurringInvoicesCron { diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 4c42c935647e..d5593e76ba26 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -464,19 +464,16 @@ class Import implements ShouldQueue $client->fresh(); $new_contacts = $client->contacts; - foreach($resource['contacts'] as $key => $old_contact) - { + foreach ($resource['contacts'] as $key => $old_contact) { $contact_match = $new_contacts->where('contact_key', $old_contact['contact_key'])->first(); - if($contact_match) - { + if ($contact_match) { $this->ids['client_contacts']['client_contacts_'.$old_contact['id']] = [ 'old' => $old_contact['id'], 'new' => $contact_match->id, ]; } } - } $key = "clients_{$resource['id']}"; @@ -629,16 +626,12 @@ class Import implements ShouldQueue unset($modified['id']); - if(array_key_exists('invitations', $resource)) - { - foreach($resource['invitations'] as $key => $invite) - { - + if (array_key_exists('invitations', $resource)) { + foreach ($resource['invitations'] as $key => $invite) { $resource['invitations'][$key]['client_contact_id'] = $this->transformId('client_contacts', $invite['client_contact_id']); $resource['invitations'][$key]['user_id'] = $modified['user_id']; $resource['invitations'][$key]['company_id'] = $this->company->id; unset($resource['invitations'][$key]['recurring_invoice_id']); - } $modified['invitations'] = $resource['invitations']; @@ -694,19 +687,15 @@ class Import implements ShouldQueue unset($modified['id']); - if(array_key_exists('invitations', $resource)) - { - foreach($resource['invitations'] as $key => $invite) - { + if (array_key_exists('invitations', $resource)) { + foreach ($resource['invitations'] as $key => $invite) { $resource['invitations'][$key]['client_contact_id'] = $this->transformId('client_contacts', $invite['client_contact_id']); $resource['invitations'][$key]['user_id'] = $modified['user_id']; $resource['invitations'][$key]['company_id'] = $this->company->id; unset($resource['invitations'][$key]['invoice_id']); - } $modified['invitations'] = $resource['invitations']; - } $invoice = $invoice_repository->save( $modified, @@ -877,7 +866,7 @@ class Import implements ShouldQueue PaymentFactory::create($this->company->id, $modified['user_id']) ); - if($resource['company_gateway_id'] != 'NULL' && $resource['company_gateway_id'] != NULL){ + if ($resource['company_gateway_id'] != 'NULL' && $resource['company_gateway_id'] != null) { $payment->company_gateway_id = $this->transformId('company_gateways', $resource['company_gateway_id']); $payment->save(); } diff --git a/app/Models/Presenters/ClientContactPresenter.php b/app/Models/Presenters/ClientContactPresenter.php index 7e1a4de8efb4..09fdbaa3c0ad 100644 --- a/app/Models/Presenters/ClientContactPresenter.php +++ b/app/Models/Presenters/ClientContactPresenter.php @@ -20,13 +20,14 @@ class ClientContactPresenter extends EntityPresenter * @return string */ public function name() - { + { $contact_name = $this->entity->first_name.' '.$this->entity->last_name; - if(strlen($contact_name) > 1) + if (strlen($contact_name) > 1) { return $contact_name; + } - return $this->entity->client->present()->name(); + return $this->entity->client->present()->name(); } public function first_name() diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index c13fa48aeff3..1c34f6c5e98e 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -376,8 +376,9 @@ class RecurringInvoice extends BaseModel $data = []; - if(!Carbon::parse($this->next_send_date)) + if (!Carbon::parse($this->next_send_date)) { return $data; + } $next_send_date = Carbon::parse($this->next_send_date)->copy(); diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index c42d72b0a450..12f366d41576 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -123,8 +123,8 @@ 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; @@ -132,8 +132,8 @@ use App\Listeners\Invoice\InvoiceReversedActivity; use App\Listeners\Invoice\InvoiceViewedActivity; use App\Listeners\Invoice\UpdateInvoiceActivity; 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; diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 7f64ef8804c0..008092a8088b 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -11,7 +11,6 @@ namespace App\Providers; -use App\Models\RecurringInvoice; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Support\Facades\Route; @@ -37,7 +36,6 @@ class RouteServiceProvider extends ServiceProvider { // parent::boot(); - } /** diff --git a/app/Repositories/Migration/InvoiceMigrationRepository.php b/app/Repositories/Migration/InvoiceMigrationRepository.php index eddd511cb5c9..832af28d8e44 100644 --- a/app/Repositories/Migration/InvoiceMigrationRepository.php +++ b/app/Repositories/Migration/InvoiceMigrationRepository.php @@ -92,11 +92,11 @@ class InvoiceMigrationRepository extends BaseRepository InvoiceInvitation::unguard(); RecurringInvoiceInvitation::unguard(); - if($model instanceof RecurringInvoice) + if ($model instanceof RecurringInvoice) { $lcfirst_resource_id = 'recurring_invoice_id'; + } - foreach($data['invitations'] as $invitation) - { + foreach ($data['invitations'] as $invitation) { nlog($invitation); $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id); @@ -107,35 +107,35 @@ class InvoiceMigrationRepository extends BaseRepository InvoiceInvitation::reguard(); RecurringInvoiceInvitation::reguard(); -/* - if (isset($data['invitations'])) { - $invitations = collect($data['invitations']); + /* + if (isset($data['invitations'])) { + $invitations = collect($data['invitations']); - $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use ($resource) { - $this->getInvitation($invitation, $resource)->delete(); - }); + $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use ($resource) { + $this->getInvitation($invitation, $resource)->delete(); + }); - foreach ($data['invitations'] as $invitation) { + foreach ($data['invitations'] as $invitation) { - //if no invitations are present - create one. - if (! $this->getInvitation($invitation, $resource)) { - if (isset($invitation['id'])) { - unset($invitation['id']); - } + //if no invitations are present - create one. + if (! $this->getInvitation($invitation, $resource)) { + if (isset($invitation['id'])) { + unset($invitation['id']); + } - //make sure we are creating an invite for a contact who belongs to the client only! - $contact = ClientContact::find($invitation['client_contact_id']); + //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) { - $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id); - $new_invitation->{$lcfirst_resource_id} = $model->id; - $new_invitation->client_contact_id = $contact->id; - $new_invitation->save(); + if ($contact && $model->client_id == $contact->client_id) { + $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id); + $new_invitation->{$lcfirst_resource_id} = $model->id; + $new_invitation->client_contact_id = $contact->id; + $new_invitation->save(); + } + } } } - } - } -*/ + */ $model->load('invitations'); /* If no invitations have been created, this is our fail safe to maintain state*/ diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index f22b802dc23e..294c07f7962e 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -63,8 +63,7 @@ class UserRepository extends BaseRepository $user->fill($details); //allow users to change only their passwords - not others! - if(auth()->user()->id == $user->id && array_key_exists('password', $data) && isset($data['password'])) - { + if (auth()->user()->id == $user->id && array_key_exists('password', $data) && isset($data['password'])) { $user->password = Hash::make($data['password']); } diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index f41c4bddcb46..9f461cf7504e 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -211,10 +211,10 @@ class CompanyTransformer extends EntityTransformer { $transformer = new UserTransformer($this->serializer); - $users = $company->users->map(function ($user) use ($company){ - $user->company_id = $company->id; - return $user; - }); + $users = $company->users->map(function ($user) use ($company) { + $user->company_id = $company->id; + return $user; + }); return $this->includeCollection($users, $transformer, User::class); } @@ -351,4 +351,4 @@ class CompanyTransformer extends EntityTransformer return $this->includeCollection($company->system_logs, $transformer, SystemLog::class); } -} \ No newline at end of file +} diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index 3e31bc94f9d5..8a7bec7af7b1 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -629,7 +629,6 @@ trait GeneratesCounter } if ($entity->client || ($entity instanceof Client)) { - $client = $entity->client ?: $entity; $search[] = '{$client_custom1}'; diff --git a/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php b/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php index 2b4d0e415230..c4fd282f3d21 100644 --- a/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php +++ b/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php @@ -3,8 +3,6 @@ use App\Models\Currency; use App\Utils\Traits\AppSetup; use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; class UpdateCanadianDollarSymbol extends Migration { @@ -18,8 +16,9 @@ class UpdateCanadianDollarSymbol extends Migration { $currency = Currency::find(9); - if($currency) + if ($currency) { $currency->update(['symbol' => '$']); + } $this->buildCache(true); } diff --git a/tests/Feature/PreviewTest.php b/tests/Feature/PreviewTest.php index 87f395f47c50..661a6878778e 100644 --- a/tests/Feature/PreviewTest.php +++ b/tests/Feature/PreviewTest.php @@ -37,50 +37,49 @@ class PreviewTest extends TestCase public function testPreviewRoute() { - $data = $this->getData(); + $data = $this->getData(); - $response = $this->withHeaders([ + $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, ])->post('/api/v1/preview/', $data); - $response->assertStatus(200); + $response->assertStatus(200); } public function testPreviewHtmlResponse() { - $data = $this->getData(); + $data = $this->getData(); - $response = $this->withHeaders([ + $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, ])->post('/api/v1/preview?html=true', $data); - $response->assertStatus(200); - + $response->assertStatus(200); } private function getData() { - $data = - [ - 'entity_type' => 'invoice', - 'entity_id' => '', - 'design' => [ - 'name' => '', - 'design' => [ + $data = + [ + 'entity_type' => 'invoice', + 'entity_id' => '', + 'design' => [ + 'name' => '', + 'design' => [ 'includes' => '', 'header' => '', 'body' => '
', 'product' => '', 'task' => '', 'footer' => '' - ], - ], + ], + ], 'is_custom' => 1, ]; return $data; } -} \ No newline at end of file +}