cancel order

beike/Services/StateMachineService.php

@@ -35,6 +35,7 @@ class StateMachineService
         self::PAID,
         self::SHIPPED,
         self::COMPLETED,
+        self::CANCELLED,
     ];
 
     const MACHINES = [

beike/Shop/Routes/shop.php

@@ -76,6 +76,7 @@ Route::prefix('/')
                 Route::post('checkout/confirm', [CheckoutController::class, 'confirm'])->name('checkout.confirm');
                 Route::get('orders/{number}/success', [OrderController::class, 'success'])->name('orders.success');
                 Route::get('orders/{number}/pay', [OrderController::class, 'pay'])->name('orders.pay');
+                Route::post('orders/{number}/cancel', [OrderController::class, 'cancel'])->name('orders.cancel');
                 Route::post('orders/{number}/complete', [OrderController::class, 'complete'])->name('orders.complete');
             });
 

resources/lang/en/common.php

@@ -47,5 +47,6 @@ return [
         'paid' => 'Paid',
         'shipped' => 'Shipped',
         'completed' => 'Completed',
+        'cancelled' => 'Cancelled',
     ],
 ];

resources/lang/en/shop/account.php

@@ -51,6 +51,7 @@ return [
     'order' => [
         'index' => 'Order',
         'completed' => 'Completed',
+        'cancelled' => 'Cancelled',
         'order_details' => 'Order Details',
         'amount' => 'Amount',
         'state' => 'State',
@@ -61,6 +62,7 @@ return [
             'index' => 'Order Info',
             'order_details' => 'Order Details',
             'to_pay' => 'To Pay',
+            'cancel' => 'Cancel',
             'confirm_receipt' => 'Confirm the receipt of goods',
             'order_number' => 'Order Number',
             'order_date' => 'Order Date',

resources/lang/zh_cn/common.php

@@ -46,6 +46,7 @@ return [
         'paid' => '已支付',
         'shipped' => '已发货',
         'completed' => '已完成',
+        'cancelled' => '已取消',
     ]
 ];
 

resources/lang/zh_cn/shop/account.php

@@ -51,6 +51,7 @@ return [
     'order' => [
         'index' => '我的订单',
         'completed' => '已确认收货',
+        'cancelled' => '订单已取消',
         'order_details' => '订单详情',
         'amount' => '金额',
         'state' => '状态',
@@ -61,6 +62,7 @@ return [
             'index' => '订单详情',
             'order_details' => '订单详情',
             'to_pay' => '去支付',
+            'cancel' => '取消订单',
             'confirm_receipt' => '确认收货',
             'order_number' => '订单号',
             'order_date' => '下单日期',

themes/default/account/order_info.blade.php

@@ -17,6 +17,7 @@
             <div>
               @if ($order->status == 'unpaid')
                 <a href="{{ shop_route('orders.pay', $order->number) }}" class="btn btn-primary btn-sm nowrap">{{ __('shop/account.order.order_info.to_pay') }}</a>
+                <a href="{{ shop_route('orders.cancel', $order->number) }}" class="btn btn-primary btn-sm nowrap">{{ __('shop/account.order.order_info.cancel') }}</a>
               @endif
               @if ($order->status == 'shipped')
                 <button class="btn btn-primary btn-sm shipped-ed" type="button">{{ __('shop/account.order.order_info.confirm_receipt') }}</button>