apply php-cs-fixeR

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;

app/Http/Requests/Invoice/ActionInvoiceRequest.php

@@ -18,8 +18,8 @@ use App\Utils\Traits\MakesHash;
 
 class ActionInvoiceRequest extends Request
 {
-	use MakesHash;
+    use MakesHash;
-	use ActionsInvoice;
+    use ActionsInvoice;
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -36,31 +36,28 @@ class ActionInvoiceRequest extends Request
 
     public function rules()
     {
-    	return [
+        return [
-    		'action' => 'required'
+            '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)) {
+        if (!array_key_exists('action', $input)) {
-        	$this->error_msg = 'Action is a required field';	
+            $this->error_msg = 'Action is a required field';
-        }
+        } elseif (!$this->invoiceDeletable($this->invoice)) {
-        elseif(!$this->invoiceDeletable($this->invoice)){
+            unset($input['action']);
-        	unset($input['action']);	
+            $this->error_msg = 'This invoice cannot be deleted';
-        	$this->error_msg = 'This invoice cannot be deleted';
+        } elseif (!$this->invoiceCancellable($this->invoice)) {
-        }
+            unset($input['action']);
-        elseif(!$this->invoiceCancellable($this->invoice)) {
+            $this->error_msg = 'This invoice cannot be cancelled';
-        	unset($input['action']);	
+        } elseif (!$this->invoiceReversable($this->invoice)) {
-        	$this->error_msg = 'This invoice cannot be cancelled';
+            unset($input['action']);
-        }
+            $this->error_msg = 'This invoice cannot be reversed';
-        else if(!$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 [
+        return [
-    		'action' => $this->error_msg,
+            'action' => $this->error_msg,
-    	];
+        ];
     }
-
-
-
-
 }
-

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
 {

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))
+            if (array_key_exists('invitations', $resource)) {
-            {    
+                foreach ($resource['invitations'] as $key => $invite) {
-                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))
+            if (array_key_exists('invitations', $resource)) {
-            {
+                foreach ($resource['invitations'] as $key => $invite) {
-                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();
             }

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()

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();
 

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;

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();
-
     }
 
     /**

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'])) {
+                if (isset($data['invitations'])) {
-            $invitations = collect($data['invitations']);
+                    $invitations = collect($data['invitations']);
 
-            $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();
+                        $this->getInvitation($invitation, $resource)->delete();
-            });
+                    });
 
-            foreach ($data['invitations'] as $invitation) {
+                    foreach ($data['invitations'] as $invitation) {
 
-                //if no invitations are present - create one.
+                        //if no invitations are present - create one.
-                if (! $this->getInvitation($invitation, $resource)) {
+                        if (! $this->getInvitation($invitation, $resource)) {
-                    if (isset($invitation['id'])) {
+                            if (isset($invitation['id'])) {
-                        unset($invitation['id']);
+                                unset($invitation['id']);
-                    }
+                            }
 
-                    //make sure we are creating an invite for a contact who belongs to the client only!
+                            //make sure we are creating an invite for a contact who belongs to the client only!
-                    $contact = ClientContact::find($invitation['client_contact_id']);
+                            $contact = ClientContact::find($invitation['client_contact_id']);
 
-                    if ($contact && $model->client_id == $contact->client_id) {
+                            if ($contact && $model->client_id == $contact->client_id) {
-                        $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id);
+                                $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id);
-                        $new_invitation->{$lcfirst_resource_id} = $model->id;
+                                $new_invitation->{$lcfirst_resource_id} = $model->id;
-                        $new_invitation->client_contact_id = $contact->id;
+                                $new_invitation->client_contact_id = $contact->id;
-                        $new_invitation->save();
+                                $new_invitation->save();
+                            }
+                        }
                     }
                 }
-            }
+        */
-        }
-*/
         $model->load('invitations');
 
         /* If no invitations have been created, this is our fail safe to maintain state*/

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']);
         }
 

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){
+        $users = $company->users->map(function ($user) use ($company) {
-                $user->company_id = $company->id;
+            $user->company_id = $company->id;
-                return $user;
+            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);
     }
-}
+}

app/Utils/Traits/GeneratesCounter.php

@@ -629,7 +629,6 @@ trait GeneratesCounter
         }
         
         if ($entity->client || ($entity instanceof Client)) {
-
             $client = $entity->client ?: $entity;
 
             $search[] = '{$client_custom1}';

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);
     }

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 =
+        $data =
-    		[
+            [
-    	    'entity_type' => 'invoice',
+            'entity_type' => 'invoice',
-		    'entity_id' => '', 
+            'entity_id' => '',
-		    'design' => [
+            'design' => [
-		            'name' => '', 
+                    'name' => '',
-		            'design' => [
+                    'design' => [
                     'includes' => '</style>',
                     'header' => '<div id="header"></div>',
                     'body' => '<div id="body">',
                     'product' => '',
                     'task' => '',
                     'footer' => '<div id="footer">$entity_footer</div>'
-                   	],
+                       ],
-		        ],
+                ],
             'is_custom' => 1,
         ];
 
         return $data;
     }
-}
+}