diff --git a/app/Notifications/Admin/EntityViewedNotification.php b/app/Notifications/Admin/EntityViewedNotification.php index 13adb05d9201..04c73dfbca10 100644 --- a/app/Notifications/Admin/EntityViewedNotification.php +++ b/app/Notifications/Admin/EntityViewedNotification.php @@ -51,7 +51,7 @@ class EntityViewedNotification extends Notification implements ShouldQueue $this->entity = $invitation->{$entity_name}; $this->contact = $invitation->contact; $this->company = $invitation->company; - $this->settings = $this->entity->client->getMergedSettings(); + $this->settings = $invitation->contact->client->getMergedSettings(); $this->is_system = $is_system; $this->invitation = $invitation; $this->method = null; 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 22ea62bd6c61..9125c6953a05 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 @@ -51,7 +51,6 @@ class ProjectNameUniqueRemoval extends Migration $table->decimal('rate', 16, 4)->default(0); $table->renameColumn('task_status_id', 'status_id'); $table->renameColumn('task_status_sort_order', 'sort_order'); - }); } diff --git a/routes/client.php b/routes/client.php index b08dd2739b65..685482d0ed5b 100644 --- a/routes/client.php +++ b/routes/client.php @@ -31,7 +31,7 @@ Route::group(['middleware' => ['auth:contact', 'locale'], 'prefix' => 'client', Route::get('invoices/{invoice_invitation}', 'ClientPortal\InvoiceController@show')->name('invoice.show_invitation'); Route::get('recurring_invoices', 'ClientPortal\RecurringInvoiceController@index')->name('recurring_invoices.index')->middleware('portal_enabled'); - Route::get('recurring_invoices/{recurring_invoice}', 'ClientPortal\RecurringInvoiceController@show')->name('recurring_invoice.show'); + Route::get('recurring_invoices/{recurring_invoice}', 'ClientPortal\RecurringInvoiceController@show')->name('recurring_invoices.show'); Route::get('recurring_invoices/{recurring_invoice}/request_cancellation', 'ClientPortal\RecurringInvoiceController@requestCancellation')->name('recurring_invoices.request_cancellation'); Route::post('payments/process', 'ClientPortal\PaymentController@process')->name('payments.process');