From fc609a9b6770f49c346554d1347554456bfcb429 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Wed, 31 May 2023 18:06:14 +0800 Subject: [PATCH] Code format --- .../Controllers/FileManagerController.php | 2 +- beike/Admin/Services/FileManagerService.php | 2 + beike/Exceptions/InvalidException.php | 3 +- beike/Repositories/OrderRepo.php | 1 + resources/lang/en/admin/order.php | 38 +++++++++---------- resources/lang/zh_cn/admin/order.php | 36 +++++++++--------- 6 files changed, 42 insertions(+), 40 deletions(-) diff --git a/beike/Admin/Http/Controllers/FileManagerController.php b/beike/Admin/Http/Controllers/FileManagerController.php index c824b369..2ff42eb9 100644 --- a/beike/Admin/Http/Controllers/FileManagerController.php +++ b/beike/Admin/Http/Controllers/FileManagerController.php @@ -126,7 +126,7 @@ class FileManagerController extends Controller $savePath = $request->get('path'); $originName = $file->getClientOriginalName(); - $filePath = (new FileManagerService)->uploadFile($file, $savePath, $originName); + $filePath = (new FileManagerService)->uploadFile($file, $savePath, $originName); return [ 'name' => $originName, diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index cc673f98..3270db7c 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -14,6 +14,7 @@ namespace Beike\Admin\Services; class FileManagerService { protected $fileBasePath = ''; + protected $basePath = ''; public function __construct() @@ -187,6 +188,7 @@ class FileManagerService public function uploadFile($file, $savePath, $originName) { $savePath = $this->basePath . $savePath; + return $file->storeAs($savePath, $originName, 'catalog'); } diff --git a/beike/Exceptions/InvalidException.php b/beike/Exceptions/InvalidException.php index 976654ba..fe31080b 100644 --- a/beike/Exceptions/InvalidException.php +++ b/beike/Exceptions/InvalidException.php @@ -13,5 +13,4 @@ namespace Beike\Exceptions; class InvalidException extends \Exception { - -} \ No newline at end of file +} diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php index 307f21c8..a26dc7b0 100644 --- a/beike/Repositories/OrderRepo.php +++ b/beike/Repositories/OrderRepo.php @@ -267,6 +267,7 @@ class OrderRepo OrderTotalRepo::createTotals($order, $totals); hook_filter('repository.order.create.after', ['order' => $order, 'data' => $data]); + return $order; } diff --git a/resources/lang/en/admin/order.php b/resources/lang/en/admin/order.php index b5b00d89..09f6e6d6 100644 --- a/resources/lang/en/admin/order.php +++ b/resources/lang/en/admin/order.php @@ -12,24 +12,24 @@ return [ 'list' => 'Order List', - 'order_quantity' => 'Order Quantity', - 'order_amount' => 'Order Amount', - 'orders_index' => 'Index', - 'orders_create' => 'Create', - 'orders_show' => 'Detail', - 'orders_export' => 'Export', - 'orders_update' => 'Update', - 'orders_delete' => 'Delete', - 'notify' => 'Whether to remind', - 'orders_update_status' => 'Update Status', - 'error_status' => 'Please select a status', - 'payments_history' => 'Payment History', - 'text_response' => 'Pesponse', - 'text_request' => 'Pequest', - 'text_callback' => 'Callback', - 'text_callback' => 'Callback', - 'text_receipt' => 'Receipt', - 'order_id' => 'Order Id', + 'order_quantity' => 'Order Quantity', + 'order_amount' => 'Order Amount', + 'orders_index' => 'Index', + 'orders_create' => 'Create', + 'orders_show' => 'Detail', + 'orders_export' => 'Export', + 'orders_update' => 'Update', + 'orders_delete' => 'Delete', + 'notify' => 'Whether to remind', + 'orders_update_status' => 'Update Status', + 'error_status' => 'Please select a status', + 'payments_history' => 'Payment History', + 'text_response' => 'Pesponse', + 'text_request' => 'Pequest', + 'text_callback' => 'Callback', + 'text_callback' => 'Callback', + 'text_receipt' => 'Receipt', + 'order_id' => 'Order Id', 'text_transaction_id' => 'Transaction Id', - 'text_click_view' => 'Click To View', + 'text_click_view' => 'Click To View', ]; diff --git a/resources/lang/zh_cn/admin/order.php b/resources/lang/zh_cn/admin/order.php index 9a743bdb..f5ff993f 100644 --- a/resources/lang/zh_cn/admin/order.php +++ b/resources/lang/zh_cn/admin/order.php @@ -12,23 +12,23 @@ return [ 'list' => '订单列表', - 'order_quantity' => '订单数量', - 'order_amount' => '订单金额', - 'orders_index' => '订单列表', - 'orders_create' => '创建订单', - 'orders_show' => '订单详情', - 'orders_export' => '导出订单', - 'orders_update' => '更新订单', - 'orders_delete' => '删除订单', - 'notify' => '是否提醒', - 'orders_update_status' => '更新状态', - 'error_status' => '请选择状态', - 'payments_history' => '支付记录', - 'text_response' => '返回数据', - 'text_request' => '请求参数', - 'text_callback' => '回调', - 'text_receipt' => '凭据', - 'order_id' => '订单ID', + 'order_quantity' => '订单数量', + 'order_amount' => '订单金额', + 'orders_index' => '订单列表', + 'orders_create' => '创建订单', + 'orders_show' => '订单详情', + 'orders_export' => '导出订单', + 'orders_update' => '更新订单', + 'orders_delete' => '删除订单', + 'notify' => '是否提醒', + 'orders_update_status' => '更新状态', + 'error_status' => '请选择状态', + 'payments_history' => '支付记录', + 'text_response' => '返回数据', + 'text_request' => '请求参数', + 'text_callback' => '回调', + 'text_receipt' => '凭据', + 'order_id' => '订单ID', 'text_transaction_id' => '交易ID', - 'text_click_view' => '点击查看', + 'text_click_view' => '点击查看', ];