diff --git a/app/Events/PurchaseOrder/PurchaseOrderWasViewed.php b/app/Events/PurchaseOrder/PurchaseOrderWasViewed.php index 7a0d67b56615..100ab7ab2d45 100644 --- a/app/Events/PurchaseOrder/PurchaseOrderWasViewed.php +++ b/app/Events/PurchaseOrder/PurchaseOrderWasViewed.php @@ -13,6 +13,7 @@ namespace App\Events\PurchaseOrder; use App\Models\Company; use App\Models\PurchaseOrder; +use App\Models\PurchaseOrderInvitation; use Illuminate\Queue\SerializesModels; /** @@ -25,7 +26,7 @@ class PurchaseOrderWasViewed /** * @var PurchaseOrder */ - public $purchase_order; + public $invitation; public $company; @@ -38,9 +39,9 @@ class PurchaseOrderWasViewed * @param Company $company * @param array $event_vars */ - public function __construct(PurchaseOrder $purchase_order, Company $company, array $event_vars) + public function __construct(PurchaseOrderInvitation $invitation, Company $company, array $event_vars) { - $this->purchase_order = $purchase_order; + $this->invitation = $invitation; $this->company = $company; $this->event_vars = $event_vars; } diff --git a/app/Http/Controllers/Auth/VendorContactLoginController.php b/app/Http/Controllers/Auth/VendorContactLoginController.php index c9cc34802d7f..59fb20004e8f 100644 --- a/app/Http/Controllers/Auth/VendorContactLoginController.php +++ b/app/Http/Controllers/Auth/VendorContactLoginController.php @@ -34,12 +34,16 @@ class VendorContactLoginController extends Controller public function __construct() { - // $this->middleware('guest:vendor', ['except' => ['logout']]); + $this->middleware('guest:vendor', ['except' => ['logout']]); } public function catch() { + $data = [ + + ]; + return $this->render('purchase_orders.catch'); } public function logout() @@ -47,7 +51,7 @@ class VendorContactLoginController extends Controller Auth::guard('vendor')->logout(); request()->session()->invalidate(); - return redirect('/vendor'); + return redirect('/vendors'); } diff --git a/resources/views/portal/ninja2020/purchase_orders/catch.blade.php b/resources/views/portal/ninja2020/purchase_orders/catch.blade.php index f3a8543df73a..dd71106f5169 100644 --- a/resources/views/portal/ninja2020/purchase_orders/catch.blade.php +++ b/resources/views/portal/ninja2020/purchase_orders/catch.blade.php @@ -1,18 +1,11 @@ -@extends('portal.ninja2020.layout.vendor_app') -@section('meta_title', ctrans('texts.purchase_orders')) +@extends('portal.ninja2020.layout.clean') +@section('meta_title', ctrans('texts.vendor')) -@section('header') - @if($errors->any()) -
{{ $error }}
- @endforeach -