diff --git a/beike/Services/StateMachineService.php b/beike/Services/StateMachineService.php index 7cf829ea..5821ad90 100644 --- a/beike/Services/StateMachineService.php +++ b/beike/Services/StateMachineService.php @@ -35,6 +35,7 @@ class StateMachineService self::PAID, self::SHIPPED, self::COMPLETED, + self::CANCELLED, ]; const MACHINES = [ diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php index bea501d7..27f5e369 100644 --- a/beike/Shop/Routes/shop.php +++ b/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'); }); diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 30d58c44..beacffe0 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -47,5 +47,6 @@ return [ 'paid' => 'Paid', 'shipped' => 'Shipped', 'completed' => 'Completed', + 'cancelled' => 'Cancelled', ], ]; diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index ae04bc7b..439062e5 100644 --- a/resources/lang/en/shop/account.php +++ b/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', diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index b2ca6813..ce900d47 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -46,6 +46,7 @@ return [ 'paid' => '已支付', 'shipped' => '已发货', 'completed' => '已完成', + 'cancelled' => '已取消', ] ]; diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 6a0d6ed1..7bd27270 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/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' => '下单日期', diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php index bda73a75..42971412 100644 --- a/themes/default/account/order_info.blade.php +++ b/themes/default/account/order_info.blade.php @@ -17,6 +17,7 @@