From 0eda9b8cecf5e7a8c6312f3c00a3136b6c4e385b Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Fri, 13 Jan 2023 14:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A6=82=E6=9E=9C=E8=AE=A2=E5=8D=95=E5=B7=B2=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=88=99=E8=B7=B3=E8=BD=AC=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/Account/OrderController.php    | 13 ++++++++-----
 resources/lang/en/shop/order.php                    |  2 +-
 themes/default/account/order_info.blade.php         |  7 +++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php
index 5f845c76..18305451 100644
--- a/beike/Shop/Http/Controllers/Account/OrderController.php
+++ b/beike/Shop/Http/Controllers/Account/OrderController.php
@@ -16,7 +16,6 @@ use Beike\Services\StateMachineService;
 use Beike\Shop\Http\Controllers\Controller;
 use Beike\Shop\Http\Resources\Account\OrderList;
 use Beike\Shop\Services\PaymentService;
-use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 
@@ -78,15 +77,19 @@ class OrderController extends Controller
      *
      * @param Request $request
      * @param $number
-     * @return Factory|View
+     * @return mixed
      * @throws \Exception
      */
     public function pay(Request $request, $number)
     {
-        $customer = current_customer();
-        $order    = OrderRepo::getOrderByNumber($number, $customer);
+        try {
+            $customer = current_customer();
+            $order    = OrderRepo::getOrderByNumber($number, $customer);
 
-        return (new PaymentService($order))->pay();
+            return (new PaymentService($order))->pay();
+        } catch (\Exception $e) {
+            return redirect(shop_route('account.order.show', $number))->withErrors($e->getMessage());
+        }
     }
 
     /**
diff --git a/resources/lang/en/shop/order.php b/resources/lang/en/shop/order.php
index a36f8f9b..8eca5962 100644
--- a/resources/lang/en/shop/order.php
+++ b/resources/lang/en/shop/order.php
@@ -14,5 +14,5 @@ return [
     'invalid_order'      => 'Invalid order',
     'confirm_order'      => 'Customer confirm received package',
     'cancel_order'       => 'Customer cancel the order',
-    'order_already_paid' => 'The order is paid already',
+    'order_already_paid' => 'The order already has been paid',
 ];
diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php
index e0ddcbbc..96935bf6 100644
--- a/themes/default/account/order_info.blade.php
+++ b/themes/default/account/order_info.blade.php
@@ -11,6 +11,13 @@
       <x-shop-sidebar />
 
       <div class="col-12 col-md-9">
+
+        @if ($errors->any())
+          @foreach ($errors->all() as $error)
+            <x-shop-alert type="danger" msg="{{ $error }}" class="mt-4" />
+          @endforeach
+        @endif
+
         <div class="card mb-4 order-head">
           <div class="card-header d-flex align-items-center justify-content-between">
             <h6 class="card-title">{{ __('shop/account.order.order_info.order_details') }}</h6>