applied new route macros and structure

Author: denisdulici

Http/Controllers/Payment.php

@@ -7,7 +7,6 @@
 use App\Http\Requests\Portal\InvoicePayment as PaymentRequest;
 use App\Models\Document\Document;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\URL;
 
 class Payment extends PaymentController
 {
@@ -29,34 +28,9 @@ public function show(Document $invoice, PaymentRequest $request)
             }
         }
 
-        $html = view('offline-payments::show', compact('setting', 'invoice'))->render();
+        $confirm_url = $this->getConfirmUrl($invoice);
 
-        return response()->json([
-            'code' => $setting['code'],
-            'name' => $setting['name'],
-            'description' => $setting['description'],
-            'redirect' => false,
-            'html' => $html,
-        ]);
-    }
-
-    public function signed(Document $invoice, PaymentRequest $request)
-    {
-        $setting = [];
-
-        $payment_methods = json_decode(setting('offline-payments.methods'), true);
-
-        foreach ($payment_methods as $payment_method) {
-            if ($payment_method['code'] == $request['payment_method']) {
-                $setting = $payment_method;
-
-                break;
-            }
-        }
-
-        $confirm_url = URL::signedRoute('signed.invoices.offline-payments.confirm', [$invoice->id, 'company_id' => session('company_id')]);
-
-        $html = view('offline-payments::signed', compact('setting', 'invoice', 'confirm_url'))->render();
+        $html = view('offline-payments::show', compact('setting', 'invoice', 'confirm_url'))->render();
 
         return response()->json([
             'code' => $setting['code'],

Resources/views/show.blade.php

@@ -13,7 +13,7 @@
     <div class="buttons">
         <div class="pull-right">
             {!! Form::open([
-                'url' => route("portal.invoices.offline-payments.confirm", $invoice->id),
+                'url' => $confirm_url,
                 'id' => 'redirect-form',
                 'role' => 'form',
                 'autocomplete' => "off",
@@ -24,7 +24,7 @@
                 </button>
                 {!! Form::hidden('payment_method', $setting['code']) !!}
                 {!! Form::hidden('type', 'income') !!}
-                
+
             {!! Form::close() !!}
         </div>
     </div>

Resources/views/signed.blade.php

@@ -1,16 +1,18 @@
 <?php
 
-Route::group([
-    'prefix' => '{company_id}',
-    'middleware' => 'admin',
-    'namespace' => 'Modules\OfflinePayments\Http\Controllers'
-], function () {
-    Route::group(['prefix' => 'offline-payments', 'as' => 'offline-payments.'], function () {
-        Route::group(['prefix' => 'settings', 'as' => 'settings.'], function () {
-            Route::get('/', 'Settings@edit')->name('edit');
-            Route::post('/', 'Settings@update')->name('update');
-            Route::post('get', 'Settings@get')->name('get');
-            Route::delete('delete', 'Settings@destroy')->name('delete');
-        });
+use Illuminate\Support\Facades\Route;
+
+/**
+ * 'admin' middleware and 'offline-payments' prefix applied to all routes (including names)
+ *
+ * @see \App\Providers\Route::register
+ */
+
+Route::admin('offline-payments', function () {
+    Route::group(['prefix' => 'settings', 'as' => 'settings.'], function () {
+        Route::get('/', 'Settings@edit')->name('edit');
+        Route::post('/', 'Settings@update')->name('update');
+        Route::post('get', 'Settings@get')->name('get');
+        Route::delete('delete', 'Settings@destroy')->name('delete');
     });
 });

Routes/admin.php

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

Routes/portal.php

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