applied new route macros and structure

Resources/views/show.blade.php

@@ -39,8 +39,8 @@
                 <input type="hidden" name="no_note" value="1" />
                 <input type="hidden" name="no_shipping" value="1" />
                 <input type="hidden" name="charset" value="utf-8" />
-                <input type="hidden" name="return" value="{{ route('portal.invoices.paypal-standard.return', $invoice->id) }}" />
-                <input type="hidden" name="notify_url" value="{{ route('portal.invoices.paypal-standard.complete', $invoice->id) }}" />
+                <input type="hidden" name="return" value="{{ route('portal.paypal-standard.invoices.return', $invoice->id) }}" />
+                <input type="hidden" name="notify_url" value="{{ route('portal.paypal-standard.invoices.complete', $invoice->id) }}" />
                 <input type="hidden" name="cancel_return" value="{{ $invoice_url }}" />
                 <input type="hidden" name="paymentaction" value="{{ $setting['transaction'] }}" />
                 <input type="hidden" name="custom" value="{{ $invoice->id }}" />

Routes/guest.php

@@ -1,10 +1,14 @@
 <?php
 
-Route::group([
-    'prefix' => '{company_id}/portal',
-    'middleware' => 'guest',
-    'namespace' => 'Modules\PaypalStandard\Http\Controllers'
-], function () {
-    Route::post('invoices/{invoice}/paypal-standard/return', 'Payment@return')->name('portal.invoices.paypal-standard.return');
-    Route::post('invoices/{invoice}/paypal-standard/complete', 'Payment@complete')->name('portal.invoices.paypal-standard.complete');
-});
+use Illuminate\Support\Facades\Route;
+
+/**
+ * 'guest' middleware and 'portal/paypal-standard' prefix applied to all routes (including names)
+ *
+ * @see \App\Providers\Route::register
+ */
+
+Route::portal('paypal-standard', function () {
+    Route::get('invoices/{invoice}/complete', 'Payment@return')->name('invoices.return');
+    Route::post('invoices/{invoice}/complete', 'Payment@complete')->name('invoices.complete');
+}, ['middleware' => 'guest']);

Routes/portal.php

@@ -1,9 +1,13 @@
 <?php
 
-Route::group([
-    'prefix' => '{company_id}/portal',
-    'middleware' => 'portal',
-    'namespace' => 'Modules\PaypalStandard\Http\Controllers'
-], function () {
-    Route::get('invoices/{invoice}/paypal-standard', 'Payment@show')->name('portal.invoices.paypal-standard.show');
+use Illuminate\Support\Facades\Route;
+
+/**
+ * 'portal' middleware and 'portal/paypal-standard' prefix applied to all routes (including names)
+ *
+ * @see \App\Providers\Route::register
+ */
+
+Route::portal('paypal-standard', function () {
+    Route::get('invoices/{invoice}', 'Payment@show')->name('invoices.show');
 });

Routes/signed.php

@@ -1,9 +1,13 @@
 <?php
 
-Route::group([
-    'prefix' => '{company_id}/signed',
-    'middleware' => 'signed',
-    'namespace' => 'Modules\PaypalStandard\Http\Controllers'
-], function () {
-    Route::get('invoices/{invoice}/paypal-standard', 'Payment@show')->name('signed.invoices.paypal-standard.show');
+use Illuminate\Support\Facades\Route;
+
+/**
+ * 'signed' middleware and 'signed/paypal-standard' prefix applied to all routes (including names)
+ *
+ * @see \App\Providers\Route::register
+ */
+
+Route::signed('paypal-standard', function () {
+    Route::get('invoices/{invoice}', 'Payment@show')->name('invoices.show');
 });