Fixed issue with returning after payment

Author: EnesSacid-Buker

Http/Controllers/Payment.php

@@ -33,53 +33,35 @@ public function show(Document $invoice, PaymentRequest $request, $cards = [])
         $return_url = $this->getReturnUrl($invoice);
         $confirm_url = $this->getConfirmUrl($invoice);
 
-        $html = view('paypal-standard::show', compact('setting', 'invoice', 'invoice_url', 'return_url', 'confirm_url'))->render();
-
         return response()->json([
             'code' => $setting['code'],
             'name' => $setting['name'],
             'description' => trans('paypal-standard::general.description'),
             'redirect' => false,
-            'html' => $html,
+            'html' => view('paypal-standard::show', compact('setting', 'invoice', 'invoice_url', 'return_url', 'confirm_url'))->render(),
         ]);
     }
 
     public function return(Document $invoice, Request $request)
     {
-        $success = true;
+        if ($request['payment_status'] === 'Completed') {
+            $this->setReference($invoice, $request->id);
 
-        switch ($request['payment_status']) {
-            case 'Completed':
-                $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
-                break;
-            case 'Canceled_Reversal':
-            case 'Denied':
-            case 'Expired':
-            case 'Failed':
-            case 'Pending':
-            case 'Processed':
-            case 'Refunded':
-            case 'Reversed':
-            case 'Voided':
-                $message = trans('messages.error.added', ['type' => trans_choice('general.payments', 1)]);
-                $success = false;
-                break;
+            $this->finish($invoice, $request);
+
+            return redirect($this->getFinishUrl($invoice));
         }
 
-        if ($success) {
-            flash($message)->success();
+        if (in_array($request['payment_status'], ['Pending', 'Canceled_Reversal', 'Denied', 'Expired', 'Failed', 'Processed', 'Refunded', 'Reversed', 'Voided'])) {
+            $message = $request['payment_status'] === 'Pending' ? trans('paypal-standard::general.payment.pending') : trans('paypal-standard::general.payment.not_added');
 
-            $url = $this->getFinishUrl($invoice);
-        } else {
             flash($message)->warning();
 
-            $url = $this->getInvoiceUrl($invoice);
+            return redirect($this->getInvoiceUrl($invoice));
         }
-
-        return redirect($url);
     }
 
-    public function complete(Document $invoice, Request $request)
+    public function confirm(Document $invoice, Request $request)
     {
         $setting = $this->setting;
 
@@ -91,7 +73,7 @@ public function complete(Document $invoice, Request $request)
             return;
         }
 
-        $url = ($setting['mode'] == 'live') ? 'https://ipnpb.paypal.com/cgi-bin/webscr' : 'https://www.sandbox.paypal.com/cgi-bin/webscr';
+        $url = ($setting['mode'] == 'live') ? 'https://ipnpb.paypal.com/cgi-bin/webscr' : 'https://ipnpb.sandbox.paypal.com/cgi-bin/webscr';
 
         $client = new Client(['verify' => false]);
 
@@ -104,7 +86,7 @@ public function complete(Document $invoice, Request $request)
         $response = $client->post($url, $paypal_request);
 
         if ($response->getStatusCode() != 200) {
-            $paypal_log->info('PAYPAL_STANDARD :: CURL failed ', $response->getBody()->getContents());
+            $paypal_log->info('PAYPAL_STANDARD :: CURL failed ' . $response->getBody()->getContents());
         } else {
             $response = $response->getBody()->getContents();
         }

Providers/Main.php

@@ -59,7 +59,6 @@ public function loadRoutes()
         }
 
         $routes = [
-            'guest.php',
             'portal.php',
             'signed.php',
         ];

Resources/lang/en-GB/general.php

@@ -14,6 +14,11 @@
         'order'         => 'Order',
     ],
 
+    'payment' => [
+        'pending'       => 'Payment is pending',
+        'not_added'     => 'Payment not added!',
+    ],
+
     'test_mode'         => 'Warning: The payment gateway is in \'Sandbox Mode\'. Your account will not be charged.',
     //'description'       => 'Pay with PAYPAL',
 

Resources/views/show.blade.php

@@ -30,10 +30,10 @@
                 <input type="hidden" name="currency_code" value="{{ $invoice->currency_code}}" />
                 <input type="hidden" name="first_name" value="{{ $invoice->first_name }}" />
                 <input type="hidden" name="last_name" value="{{ $invoice->last_name }}" />
-                <input type="hidden" name="address1" value="{{ $invoice->customer_address }}" />
+                <input type="hidden" name="address1" value="{{ $invoice->contact_address }}" />
                 <input type="hidden" name="address_override" value="0" />
-                <input type="hidden" name="email" value="{{ $invoice->customer_email }}" />
-                <input type="hidden" name="invoice" value="{{ $invoice->id . '-' . $invoice->customer_name }}" />
+                <input type="hidden" name="email" value="{{ $invoice->contact_email }}" />
+                <input type="hidden" name="invoice" value="{{ $invoice->id . '-' . $invoice->contact_name }}" />
                 <input type="hidden" name="lc" value="{{ $setting['language'] }}" />
                 <input type="hidden" name="rm" value="2" />
                 <input type="hidden" name="no_note" value="1" />
@@ -50,4 +50,4 @@
             </form>
         </div>
     </div>
-</div>
+</div>

Routes/guest.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Support\Facades\Route;
 
 /**
@@ -9,6 +10,8 @@
  */
 
 Route::portal('paypal-standard', function () {
-    Route::get('invoices/{invoice}/complete', 'Payment@return')->name('invoices.return');
-    Route::post('invoices/{invoice}/complete', 'Payment@complete')->name('invoices.confirm');
+    Route::get('invoices/{invoice}', 'Payment@show')->name('invoices.show');
+    Route::post('invoices/{invoice}/confirm', 'Payment@confirm')->withoutMiddleware(VerifyCsrfToken::class)->name('invoices.confirm');
+    Route::post('invoices/{invoice}/return', 'Payment@return')->withoutMiddleware(VerifyCsrfToken::class)->name('invoices.return');
+    Route::get('invoices/{invoice}/cancel', 'Payment@cancel')->name('invoices.cancel');
 }, ['middleware' => 'guest']);

Routes/portal.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Support\Facades\Route;
 
 /**
@@ -10,4 +11,7 @@
 
 Route::portal('paypal-standard', function () {
     Route::get('invoices/{invoice}', 'Payment@show')->name('invoices.show');
+    Route::post('invoices/{invoice}/confirm', 'Payment@confirm')->withoutMiddleware(VerifyCsrfToken::class)->name('invoices.confirm');
+    Route::post('invoices/{invoice}/return', 'Payment@return')->withoutMiddleware(VerifyCsrfToken::class)->name('invoices.return');
+    Route::get('invoices/{invoice}/cancel', 'Payment@cancel')->name('invoices.cancel');
 });

Routes/signed.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Support\Facades\Route;
 
 /**
@@ -10,6 +11,7 @@
 
 Route::signed('paypal-standard', function () {
     Route::get('invoices/{invoice}', 'Payment@show')->name('invoices.show');
-    Route::get('invoices/{invoice}/complete', 'Payment@return')->name('invoices.return');
-    Route::post('invoices/{invoice}/complete', 'Payment@complete')->name('invoices.confirm');
+    Route::post('invoices/{invoice}/confirm', 'Payment@confirm')->withoutMiddleware(VerifyCsrfToken::class)->name('invoices.confirm');
+    Route::post('invoices/{invoice}/return', 'Payment@return')->withoutMiddleware(VerifyCsrfToken::class)->name('invoices.return');
+    Route::get('invoices/{invoice}/cancel', 'Payment@cancel')->name('invoices.cancel');
 });