Browse Source

update: rename order/detail api

tokumeikoi 3 years ago
parent
commit
adc9e9e241

+ 4 - 1
app/Http/Controllers/User/OrderController.php

@@ -47,7 +47,7 @@ class OrderController extends Controller
         ]);
     }
 
-    public function details(Request $request)
+    public function detail(Request $request)
     {
         $order = Order::where('user_id', $request->session()->get('id'))
             ->where('trade_no', $request->input('trade_no'))
@@ -60,6 +60,9 @@ class OrderController extends Controller
         if (!$order['plan']) {
             abort(500, __('Subscription plan does not exist'));
         }
+        if ($order->surplus_order_ids) {
+            $order['surplus_orders'] = Order::whereIn(id, $order->surplus_order_ids)->get();
+        }
         return response([
             'data' => $order
         ]);

+ 1 - 1
app/Http/Routes/UserRoute.php

@@ -25,7 +25,7 @@ class UserRoute
             $router->post('/order/save', 'User\\OrderController@save');
             $router->post('/order/checkout', 'User\\OrderController@checkout');
             $router->get ('/order/check', 'User\\OrderController@check');
-            $router->get ('/order/details', 'User\\OrderController@details');
+            $router->get ('/order/detail', 'User\\OrderController@detail');
             $router->get ('/order/fetch', 'User\\OrderController@fetch');
             $router->get ('/order/getPaymentMethod', 'User\\OrderController@getPaymentMethod');
             $router->post('/order/cancel', 'User\\OrderController@cancel');

File diff suppressed because it is too large
+ 0 - 0
public/theme/v2board/assets/umi.js


Some files were not shown because too many files changed in this diff