fix

app/Http/Controllers/DeliverySytemsController.php

@@ -63,9 +63,9 @@ class DeliverySytemsController extends Controller
             'is_default',
             'type',
             'created',
-            DB::raw('(select title_uz from country where id = address_info.country) as country'),
+            DB::raw('(select title_ru from country where id = address_info.country) as country_name'),
             DB::raw('(SELECT (sum(orders.amount)-1000)*(-1) FROM orders where orders.to_address_id=address_info.id) as r_limit'),
-            DB::raw('(select title_uz from city where id = address_info.city) as city')
+            DB::raw('(select title_uz from city where id = address_info.city) as city_name')
         ])->where([
             ['id', '=', $order->from_address]
         ])->get();
@@ -104,7 +104,7 @@ class DeliverySytemsController extends Controller
 //                ->setStreetLines([$street])
                 ->setCity($city)
 //                ->setCity($city)
-                ->setStateOrProvinceCode('NJ')
+                ->setStateOrProvinceCode($stateOrProvinceCode)
 //                ->setStateOrProvinceCode($stateOrProvinceCode)
                 ->setPostalCode($postalCode)
                 ->setCountryCode('US');

app/Http/Controllers/OrderController.php

@@ -249,32 +249,14 @@ class OrderController extends Controller
         return view('pages.parcels.payment', ['order' => $order[0], 'payment' => $payment[0]]);
     }
 
-    public function paymentSuccess($orderId)
+    public function paymentSuccess()
     {
+        return view('pages.parcels.payment_success');
+    }
 
-//        dd($orderId);
-
-        $client = PayPalClient::client();
-        $response = $client->execute(new OrdersGetRequest($orderId));
-
-        /**
-         *Enable the following line to print complete response as JSON.
-         */
-        //print json_encode($response->result);
-        print "Status Code: {$response->statusCode}\n";
-        print "Status: {$response->result->status}\n";
-        print "Order ID: {$response->result->id}\n";
-        print "Intent: {$response->result->intent}\n";
-        print "Links:\n";
-        foreach ($response->result->links as $link) {
-            print "\t{$link->rel}: {$link->href}\tCall Type: {$link->method}\n";
-        }
-        // 4. Save the transaction in your database. Implement logic to save transaction to your database for future reference.
-        print "Gross Amount: {$response->result->purchase_units[0]->amount->currency_code} {$response->result->purchase_units[0]->amount->value}\n";
-
-        if (!count(debug_backtrace())) {
-            GetOrder::getOrder($response->result->id);
-        }
+    public function paymentError()
+    {
+        return view('pages.parcels.payment_error');
     }
 
     public function orderStore(Request $request)
@@ -293,7 +275,7 @@ class OrderController extends Controller
 
         if ($delOptions != null) {
             foreach ($delOptions as $item) {
-                $delInfo = $delInfo.' '.$item;
+                $delInfo = $delInfo . ' ' . $item;
             }
         }
         if ($orderProducts != null) {

resources/views/pages/parcels/payment.blade.php

@@ -145,19 +145,23 @@
                                 });
                             },
                             onApprove: function (data, actions) {
-                                return actions.order.capture().then(function (details) {
-                                    console.log(data);
-                                    // alert('Transaction completed by ' + details.payer.name.given_name + '!');
-                                    return fetch('/packages/paypal-transaction-complete', {
-                                        method: 'post',
-                                        headers: {
-                                            'content-type': 'application/json'
-                                        },
-                                        body: JSON.stringify({
-                                            orderID: data.orderID
-                                        })
-                                    });
-                                });
+                                // return actions.order.capture().then(function (details) {
+                                //     console.log(data);
+                                //     // alert('Transaction completed by ' + details.payer.name.given_name + '!');
+                                //     return fetch('/packages/paypal-transaction-complete', {
+                                //         method: 'post',
+                                //         headers: {
+                                //             'content-type': 'application/json'
+                                //         },
+                                //         body: JSON.stringify({
+                                //             orderID: data.orderID
+                                //         })
+                                //     });
+                                // });
+                                window.location.href = "{{ route('package.payment.success') }}";
+                            },
+                            onCancel: (data, actions) => {
+                                window.location.href = "{{ route('package.payment.error') }}";
                             }
                         }).render('#paypal-button-container'); </script>
 

resources/views/pages/parcels/payment_error.blade.php

+@extends('layouts.user_new')
+@section('content')
+    <section class="section section-inset-1">
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <h4 class="mb-5">
+                        <span class="text-top-title">Оплата</span>
+                    </h4>
+                </div>
+            </div>
+            <form class="border border-1 bg-white p-5">
+
+                <div style="width: 100%; text-align: center">
+                    <i class="fa fa-exclamation-circle" style="color: #f70300; font-size: 300px;"></i>
+                </div>
+                <div style="width: 100%; text-align: center">
+                    <h1>Ошибка оплаты</h1>
+                </div>
+
+
+
+            </form>
+        </div>
+    </section>
+
+@endsection

resources/views/pages/parcels/payment_success.blade.php

+@extends('layouts.user_new')
+@section('content')
+    <section class="section section-inset-1">
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <h4 class="mb-5">
+                        <span class="text-top-title">Оплата</span>
+                    </h4>
+                </div>
+            </div>
+            <form class="border border-1 bg-white p-5">
+
+                <div style="width: 100%; text-align: center">
+                    <i class="fa fa-check-circle-o" style="color: #1c7430; font-size: 300px;"></i>
+                </div>
+                <div style="width: 100%; text-align: center">
+                    <h1>Платеж успешно подтвержден</h1>
+                </div>
+
+
+
+            </form>
+        </div>
+    </section>
+
+@endsection

routes/web.php

@@ -70,7 +70,9 @@ Route::post('/feedback/add', 'FeedbackController@addGuest');
 Route::get('/packages', 'OrderController@index')->name('package')->middleware('auth');
 Route::get('/packages/create/{id}', 'OrderController@create')->name('package.create')->middleware('auth');
 Route::get('/packages/payment/{orderId}', 'OrderController@payment')->name('package.payment')->middleware('auth');
-Route::post('/packages/paypal-transaction-complete', 'OrderController@paymentSuccess')->name('package.payment.success')->middleware('auth');
+Route::get('/packages/payment-success', 'OrderController@paymentSuccess')->name('package.payment.success')->middleware('auth');
+Route::get('/packages/payment-error', 'OrderController@paymentError')->name('package.payment.error')->middleware('auth');
+//Route::post('/packages/paypal-transaction-complete', 'OrderController@paymentSuccess')->name('package.payment.success')->middleware('auth');
 Route::post('/packages/order-store', 'OrderController@orderStore')->name('package.store')->middleware('auth');
 Route::get('/packages/get-address-ajax-s', 'OrderController@getAddressAjaxS')->name('package.getAddressAjaxS')->middleware('auth');
 Route::get('/packages/get-address-ajax-r', 'OrderController@getAddressAjaxR')->name('package.getAddressAjaxR')->middleware('auth');