diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index 7cb3c536d8e7..d09befc71655 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -17,6 +17,7 @@ use App\Events\Misc\InvitationWasViewed; use App\Events\Quote\QuoteWasViewed; use App\Http\Controllers\Controller; use App\Models\InvoiceInvitation; +use App\Models\RecurringInvoiceInvitation; use App\Utils\Ninja; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; diff --git a/app/Models/RecurringInvoiceInvitation.php b/app/Models/RecurringInvoiceInvitation.php index 31aeb6043363..d958f6b28a1b 100644 --- a/app/Models/RecurringInvoiceInvitation.php +++ b/app/Models/RecurringInvoiceInvitation.php @@ -50,7 +50,7 @@ class RecurringInvoiceInvitation extends BaseModel */ public function contact() { - return $this->belongsTo(ClientContact::class)->withTrashed(); + return $this->belongsTo(ClientContact::class, 'client_contact_id', 'id')->withTrashed(); } /** diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index 0b7012738ac5..3ff2afda17af 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -11,6 +11,8 @@ namespace App\Utils\Traits; +use Illuminate\Support\Str; + /** * Class Inviteable. */ @@ -42,7 +44,9 @@ trait Inviteable public function getLink() :string { - $entity_type = strtolower(class_basename($this->entityType())); + //$entity_type = strtolower(class_basename($this->entityType())); + + $entity_type = Str::snake(class_basename($this->entityType())); //$this->with('company','contact',$this->entity_type); //$this->with('company'); diff --git a/routes/client.php b/routes/client.php index 685482d0ed5b..b08dd2739b65 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_invoices.show'); + Route::get('recurring_invoices/{recurring_invoice}', 'ClientPortal\RecurringInvoiceController@show')->name('recurring_invoice.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');