diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index 37dd12f9b658..7c22fe41f86d 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -264,17 +264,17 @@ class InvitationController extends Controller abort(404, "Invoice not found"); } - public function unsubscribe(Request $request, string $entity_type, string $invitation_key) + public function unsubscribe(Request $request, string $entity, string $invitation_key) { - if($entity_type == 'invoice'){ + if($entity == 'invoice'){ $invite = InvoiceInvitation::withTrashed()->where('key', $invitation_key)->first(); $invite->contact->send_email = false; $invite->contact->save(); - }elseif($entity_type == 'quote'){ + }elseif($entity == 'quote'){ $invite = QuoteInvitation::withTrashed()->where('key', $invitation_key)->first(); $invite->contact->send_email = false; $invite->contact->save(); - }elseif($entity_type == 'credit'){ + }elseif($entity == 'credit'){ $invite = CreditInvitation::withTrashed()->where('key', $invitation_key)->first(); $invite->contact->send_email = false; $invite->contact->save(); diff --git a/app/Import/Transformer/Csv/PaymentTransformer.php b/app/Import/Transformer/Csv/PaymentTransformer.php index 22ec6d349112..f293260a5476 100644 --- a/app/Import/Transformer/Csv/PaymentTransformer.php +++ b/app/Import/Transformer/Csv/PaymentTransformer.php @@ -36,7 +36,7 @@ class PaymentTransformer extends BaseTransformer } $transformed = [ - 'company_id' => $this->maps['company']->id, + 'company_id' => $this->company->id, 'number' => $this->getString($data, 'payment.number'), 'user_id' => $this->getString($data, 'payment.user_id'), 'amount' => $this->getFloat($data, 'payment.amount'), diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index faf492857824..1b38a97e76b7 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -175,7 +175,7 @@ } #table-totals > .totals-table-right-side > * > :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .75rem; } diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index ff2c2652db18..86b92c656c22 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -179,7 +179,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .75rem; padding-left: 7px; } diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index aac1b3969f96..745dbeba06df 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -156,7 +156,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .75rem; } diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html index c8ed0c19e492..673ed0a77130 100644 --- a/resources/views/pdf-designs/creative.html +++ b/resources/views/pdf-designs/creative.html @@ -148,7 +148,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .75rem; } diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index fe21484ca208..62e4eb37447a 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -152,7 +152,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .75rem; } diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index a8b64113a343..f5ae7a60d4b1 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -159,7 +159,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .75rem; } diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index 43f51401c935..adda7899c00c 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -126,7 +126,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .25rem; padding-left: 7px; } diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html index a9c6135e5e3a..67af0330b2b5 100644 --- a/resources/views/pdf-designs/playful.html +++ b/resources/views/pdf-designs/playful.html @@ -174,7 +174,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; margin-top: .75rem; } diff --git a/resources/views/pdf-designs/tech.html b/resources/views/pdf-designs/tech.html index 5c2ac1e61873..ca132d31bbef 100644 --- a/resources/views/pdf-designs/tech.html +++ b/resources/views/pdf-designs/tech.html @@ -185,7 +185,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: "$dir_text_align"; + text-align: $dir_text_align; padding: 7px; } diff --git a/routes/client.php b/routes/client.php index 855c206b81d2..47b1a9b7e443 100644 --- a/routes/client.php +++ b/routes/client.php @@ -114,7 +114,7 @@ Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'clie Route::get('{entity}/{invitation_key}/download', 'ClientPortal\InvitationController@routerForDownload'); Route::get('pay/{invitation_key}', 'ClientPortal\InvitationController@payInvoice')->name('pay.invoice'); - Route::get('unsubscribe/{entity_type}/{invitation_key}', 'ClientPortal\InvitationController@unsubscribe')->name('unsubscribe'); + Route::get('unsubscribe/{entity}/{invitation_key}', 'ClientPortal\InvitationController@unsubscribe')->name('unsubscribe'); // Route::get('{entity}/{client_hash}/{invitation_key}', 'ClientPortal\InvitationController@routerForIframe')->name('invoice.client_hash_and_invitation_key'); //should never need this