From 7fcca73b1d18203b51e0a7ef3a2b1534616977a1 Mon Sep 17 00:00:00 2001 From: TL Date: Tue, 30 Aug 2022 15:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=90=8E=E7=AB=AF=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Account/ForgottenController.php | 4 ++-- .../Controllers/Account/OrderController.php | 8 ++++---- .../Http/Controllers/Account/RmaController.php | 2 +- beike/Shop/Http/Controllers/FileController.php | 2 +- beike/Shop/Http/Controllers/ZoneController.php | 2 +- beike/Shop/Http/Resources/CustomerResource.php | 2 +- beike/Shop/Services/AccountService.php | 6 +++--- beike/Shop/Services/PaymentService.php | 4 ++-- .../TotalServices/OrderTotalService.php | 2 +- .../Services/TotalServices/ShippingService.php | 2 +- .../Services/TotalServices/SubtotalService.php | 2 +- resources/lang/en/shop/account.php | 3 +++ resources/lang/en/shop/carts.php | 5 +++-- resources/lang/en/shop/file.php | 14 ++++++++++++++ resources/lang/en/shop/forgotten.php | 4 +++- resources/lang/en/shop/order.php | 18 ++++++++++++++++++ resources/lang/zh_cn/shop/account.php | 3 +++ resources/lang/zh_cn/shop/carts.php | 3 ++- resources/lang/zh_cn/shop/file.php | 14 ++++++++++++++ resources/lang/zh_cn/shop/forgotten.php | 4 +++- resources/lang/zh_cn/shop/order.php | 18 ++++++++++++++++++ themes/default/cart/cart.blade.php | 2 +- 22 files changed, 100 insertions(+), 24 deletions(-) create mode 100644 resources/lang/en/shop/file.php create mode 100644 resources/lang/en/shop/order.php create mode 100644 resources/lang/zh_cn/shop/file.php create mode 100644 resources/lang/zh_cn/shop/order.php diff --git a/beike/Shop/Http/Controllers/Account/ForgottenController.php b/beike/Shop/Http/Controllers/Account/ForgottenController.php index f1e9ec5a..09294243 100644 --- a/beike/Shop/Http/Controllers/Account/ForgottenController.php +++ b/beike/Shop/Http/Controllers/Account/ForgottenController.php @@ -34,7 +34,7 @@ class ForgottenController public function sendVerifyCode(Request $request) { AccountService::sendVerifyCodeForForgotten($request->get('email'), 'email'); - return json_success('验证码已发送，请查看并输入验证码'); + return json_success(trans('shop/forgotten.verification_code_sent')); } /** @@ -46,6 +46,6 @@ class ForgottenController { AccountService::verifyAndChangePassword($request->get('code'), $request->get('email'), $request->get('password')); - return json_success('密码已修改'); + return json_success(trans('shop/forgotten.password_updated')); } } diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php index 04cde79c..b11fe3c2 100644 --- a/beike/Shop/Http/Controllers/Account/OrderController.php +++ b/beike/Shop/Http/Controllers/Account/OrderController.php @@ -101,9 +101,9 @@ class OrderController extends Controller $customer = current_customer(); $order = OrderRepo::getOrderByNumber($number, $customer); if (empty($order)) { - throw new \Exception('无效的订单'); + throw new \Exception(trans('shop/order.invalid_order')); } - $comment = '用户确认收货'; + $comment = trans('shop/order.confirm_order'); StateMachineService::getInstance($order)->changeStatus(StateMachineService::COMPLETED, $comment); return json_success(trans('shop/account.order.completed')); } @@ -122,9 +122,9 @@ class OrderController extends Controller $customer = current_customer(); $order = OrderRepo::getOrderByNumber($number, $customer); if (empty($order)) { - throw new \Exception('无效的订单'); + throw new \Exception(trans('shop/order.invalid_order')); } - $comment = '用户取消订单'; + $comment = trans('shop/order.cancel_order'); StateMachineService::getInstance($order)->changeStatus(StateMachineService::CANCELLED, $comment); return json_success(trans('shop/account.order.cancelled')); } diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php index 6521d52e..3eed43f9 100644 --- a/beike/Shop/Http/Controllers/Account/RmaController.php +++ b/beike/Shop/Http/Controllers/Account/RmaController.php @@ -65,6 +65,6 @@ class RmaController extends Controller { $rma = RmaService::createFromShop($request->only('order_product_id', 'quantity', 'opened', 'rma_reason_id', 'type', 'comment')); - return redirect()->to(shop_route('account.rma.index'))->with('success', '售后服务申请提交成功'); + return redirect()->to(shop_route('account.rma.index'))->with('success', trans('common.success')); } } diff --git a/beike/Shop/Http/Controllers/FileController.php b/beike/Shop/Http/Controllers/FileController.php index 1168f5ab..188656f4 100644 --- a/beike/Shop/Http/Controllers/FileController.php +++ b/beike/Shop/Http/Controllers/FileController.php @@ -13,7 +13,7 @@ class FileController extends Controller $path = $file->store($type . '/', 'upload'); - return json_success('上传成功', [ + return json_success(trans('shop/file.uploaded_success'), [ 'url' => asset('upload/' . $path), 'value' => 'upload/' . $path, ]); diff --git a/beike/Shop/Http/Controllers/ZoneController.php b/beike/Shop/Http/Controllers/ZoneController.php index 598491c3..a3e2c3f9 100644 --- a/beike/Shop/Http/Controllers/ZoneController.php +++ b/beike/Shop/Http/Controllers/ZoneController.php @@ -24,6 +24,6 @@ class ZoneController extends Controller 'zones' => ZoneRepo::listByCountry($countryId), ]; - return json_success('成功!', $data); + return json_success(trans('common.success'), $data); } } diff --git a/beike/Shop/Http/Resources/CustomerResource.php b/beike/Shop/Http/Resources/CustomerResource.php index 03cf4f49..4225e8f2 100644 --- a/beike/Shop/Http/Resources/CustomerResource.php +++ b/beike/Shop/Http/Resources/CustomerResource.php @@ -20,7 +20,7 @@ class CustomerResource extends JsonResource 'id' => $this->id, 'name' => $this->name, 'email' => $this->email, - 'status' => $this->status ? '启用' : '禁用', + 'status' => $this->status ? trans('common.enable') : trans('common.disable'), 'avatar' => image_resize($this->avatar), 'from' => $this->from, 'customer_group_name' => $this->customer_group_name, diff --git a/beike/Shop/Services/AccountService.php b/beike/Shop/Services/AccountService.php index 3a156f12..35d8aefd 100644 --- a/beike/Shop/Services/AccountService.php +++ b/beike/Shop/Services/AccountService.php @@ -76,17 +76,17 @@ class AccountService $verifyCode = VerifyCodeRepo::findByAccount($account); if ($verifyCode->created_at->addMinutes(10) < Carbon::now()) { $verifyCode->delete(); - throw new \Exception("您的验证码已过期（10分钟），请重新获取"); + throw new \Exception(trans('shop/account.verify_code_expired')); } if ($verifyCode->code != $code) { - throw new \Exception("您的验证码错误"); + throw new \Exception(trans('shop/account.verify_code_error')); } if ($type == 'email') { $customer = CustomerRepo::findByEmail($account); if (!$customer) { - throw new \Exception("账号不存在"); + throw new \Exception(trans('shop/account.account_not_exist')); } } elseif ($type == 'telephone') { throw new \Exception("暂不支持手机号码找回密码"); diff --git a/beike/Shop/Services/PaymentService.php b/beike/Shop/Services/PaymentService.php index 0f2a1caf..6e1a2a0a 100644 --- a/beike/Shop/Services/PaymentService.php +++ b/beike/Shop/Services/PaymentService.php @@ -35,10 +35,10 @@ class PaymentService $this->order = $order; } if (empty($this->order)) { - throw new \Exception("无效订单"); + throw new \Exception(trans('shop/order.invalid_order')); } if ($this->order->status != 'unpaid') { - throw new \Exception('订单已支付'); + throw new \Exception(trans('shop/order.order_already_paid')); } $this->orderId = (int)$this->order->id; $this->paymentMethodCode = $this->order->payment_method_code; diff --git a/beike/Shop/Services/TotalServices/OrderTotalService.php b/beike/Shop/Services/TotalServices/OrderTotalService.php index 480b57eb..dc5b068a 100644 --- a/beike/Shop/Services/TotalServices/OrderTotalService.php +++ b/beike/Shop/Services/TotalServices/OrderTotalService.php @@ -20,7 +20,7 @@ class OrderTotalService $amount = $totalService->amount; $totalData = [ 'code' => 'order_total', - 'title' => '应付总金额', + 'title' => trans('shop/carts.order_total'), 'amount' => $amount, 'amount_format' => currency_format($amount) ]; diff --git a/beike/Shop/Services/TotalServices/ShippingService.php b/beike/Shop/Services/TotalServices/ShippingService.php index ca585dca..eaa22c01 100644 --- a/beike/Shop/Services/TotalServices/ShippingService.php +++ b/beike/Shop/Services/TotalServices/ShippingService.php @@ -33,7 +33,7 @@ class ShippingService $amount = (float)(new $className)->getShippingFee($totalService); $totalData = [ 'code' => 'shipping', - 'title' => '运费', + 'title' => trans('shop/carts.shipping_fee'), 'amount' => $amount, 'amount_format' => currency_format($amount) ]; diff --git a/beike/Shop/Services/TotalServices/SubtotalService.php b/beike/Shop/Services/TotalServices/SubtotalService.php index 1faee86e..11c81988 100644 --- a/beike/Shop/Services/TotalServices/SubtotalService.php +++ b/beike/Shop/Services/TotalServices/SubtotalService.php @@ -22,7 +22,7 @@ class SubtotalService $amount = collect($carts)->sum('subtotal'); $totalData = [ 'code' => 'sub_total', - 'title' => '商品总额', + 'title' => trans('shop/carts.product_total'), 'amount' => $amount, 'amount_format' => currency_format($amount) ]; diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index 439062e5..43b999ce 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -29,6 +29,9 @@ return [ 'check_details' => 'Check Details', 'all' => 'All', 'items' => 'Items', + 'verify_code_expired' => 'The verify code expired (10 minute), please retry.', + 'verify_code_error' => 'Verify code error!', + 'account_not_exist' => 'Account not exist!', 'edit' => [ 'index' => 'Edit', diff --git a/resources/lang/en/shop/carts.php b/resources/lang/en/shop/carts.php index 8960ff51..c80dd55d 100644 --- a/resources/lang/en/shop/carts.php +++ b/resources/lang/en/shop/carts.php @@ -16,10 +16,11 @@ return [ 'commodity' => 'Commodity', 'quantity' => 'Quantity', 'subtotal' => 'Subtotal', - 'product_total' => 'Product Totals', + 'product_total' => 'Product Total', + 'order_total' => 'Order Total', + 'shipping_fee' => 'Shipping Fee', 'all' => 'All', 'selected' => 'Selected', - 'total_price' => 'Total_Price', 'to_checkout' => 'To Checkout', 'cart_empty' => 'Your shopping cart is empty', 'go_buy' => 'You can go and see what you want to buy', diff --git a/resources/lang/en/shop/file.php b/resources/lang/en/shop/file.php new file mode 100644 index 00000000..1a445498 --- /dev/null +++ b/resources/lang/en/shop/file.php @@ -0,0 +1,14 @@ + + * @created 2022-08-30 12:03:19 + * @modified 2022-08-30 12:03:19 + */ + +return [ + 'uploaded_success' => 'Uploaded Success', +]; diff --git a/resources/lang/en/shop/forgotten.php b/resources/lang/en/shop/forgotten.php index f0e4739a..70da25fc 100644 --- a/resources/lang/en/shop/forgotten.php +++ b/resources/lang/en/shop/forgotten.php @@ -1,7 +1,7 @@ 'The passwords entered twice do not match!', 'email_err' => 'Please enter a valid email address!', 'enter_code' => 'Please enter verification code', + 'verification_code_sent' => 'Verification code has sent. Please input the code', + 'password_updated' => 'Password updated', ]; diff --git a/resources/lang/en/shop/order.php b/resources/lang/en/shop/order.php new file mode 100644 index 00000000..089a4c4f --- /dev/null +++ b/resources/lang/en/shop/order.php @@ -0,0 +1,18 @@ + + * @created 2022-07-28 17:21:38 + * @modified 2022-07-28 17:21:38 + */ + +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', +]; diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 7bd27270..33281a46 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -29,6 +29,9 @@ return [ 'check_details' => '查看详情', 'all' => '共', 'items' => '件商品', + 'verify_code_expired' => '您的验证码已过期（10分钟），请重新获取', + 'verify_code_error' => '您的验证码错误', + 'account_not_exist' => '账号不存在', 'edit' => [ 'index' => '修改个人信息', diff --git a/resources/lang/zh_cn/shop/carts.php b/resources/lang/zh_cn/shop/carts.php index e924b084..2492294e 100644 --- a/resources/lang/zh_cn/shop/carts.php +++ b/resources/lang/zh_cn/shop/carts.php @@ -17,9 +17,10 @@ return [ 'quantity' => '数量', 'subtotal' => '小计', 'product_total' => '商品总计', + 'order_total' => '应付总金额', + 'shipping_fee' => '运费', 'all' => '全部', 'selected' => '已选', - 'total_price' => '总价', 'to_checkout' => '去结账', 'cart_empty' => '您的购物车是空的', 'go_buy' => '您可以去看看有哪些想买的', diff --git a/resources/lang/zh_cn/shop/file.php b/resources/lang/zh_cn/shop/file.php new file mode 100644 index 00000000..c9048ea6 --- /dev/null +++ b/resources/lang/zh_cn/shop/file.php @@ -0,0 +1,14 @@ + + * @created 2022-08-30 12:03:19 + * @modified 2022-08-30 12:03:19 + */ + +return [ + 'uploaded_success' => '上传成功', +]; diff --git a/resources/lang/zh_cn/shop/forgotten.php b/resources/lang/zh_cn/shop/forgotten.php index 0dabec70..ff777a74 100644 --- a/resources/lang/zh_cn/shop/forgotten.php +++ b/resources/lang/zh_cn/shop/forgotten.php @@ -1,7 +1,7 @@ '两次输入密码不一致!', 'email_err' => '请输入正确邮箱地址!', 'enter_code' => '请输入验证码', + 'verification_code_sent' => '验证码已发送，请查看并输入验证码', + 'password_updated' => '密码已修改', ]; diff --git a/resources/lang/zh_cn/shop/order.php b/resources/lang/zh_cn/shop/order.php new file mode 100644 index 00000000..60a4e6fc --- /dev/null +++ b/resources/lang/zh_cn/shop/order.php @@ -0,0 +1,18 @@ + + * @created 2022-07-28 17:21:38 + * @modified 2022-07-28 17:21:38 + */ + +return [ + 'invalid_order' => '无效的订单', + 'confirm_order' => '用户确认收货', + 'cancel_order' => '用户取消订单', + 'order_already_paid' => '订单已支付', +]; diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php index 9c32d582..4b64bdff 100644 --- a/themes/default/cart/cart.blade.php +++ b/themes/default/cart/cart.blade.php @@ -78,7 +78,7 @@