wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code format

This commit is contained in:
Edward Yang 2023-05-31 18:06:14 +08:00
parent 8b711fa653
commit fc609a9b67
6 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beike/Admin/Http/Controllers/FileManagerController.php
View File

@ -126,7 +126,7 @@ class FileManagerController extends Controller
$savePath = $request->get('path'); $savePath = $request->get('path');
$originName = $file->getClientOriginalName(); $originName = $file->getClientOriginalName();
$filePath = (new FileManagerService)->uploadFile($file, $savePath, $originName); $filePath = (new FileManagerService)->uploadFile($file, $savePath, $originName);
return [ return [
'name' => $originName, 'name' => $originName,

2
beike/Admin/Services/FileManagerService.php
View File

@ -14,6 +14,7 @@ namespace Beike\Admin\Services;
class FileManagerService class FileManagerService
{ {
protected $fileBasePath = ''; protected $fileBasePath = '';
protected $basePath = ''; protected $basePath = '';
public function __construct() public function __construct()
@ -187,6 +188,7 @@ class FileManagerService
public function uploadFile($file, $savePath, $originName) public function uploadFile($file, $savePath, $originName)
{ {
$savePath = $this->basePath . $savePath; $savePath = $this->basePath . $savePath;
return $file->storeAs($savePath, $originName, 'catalog'); return $file->storeAs($savePath, $originName, 'catalog');
} }

3
beike/Exceptions/InvalidException.php
View File

@ -13,5 +13,4 @@ namespace Beike\Exceptions;
class InvalidException extends \Exception class InvalidException extends \Exception
{ {
}
}

1
beike/Repositories/OrderRepo.php
View File

@ -267,6 +267,7 @@ class OrderRepo
OrderTotalRepo::createTotals($order, $totals); OrderTotalRepo::createTotals($order, $totals);
hook_filter('repository.order.create.after', ['order' => $order, 'data' => $data]); hook_filter('repository.order.create.after', ['order' => $order, 'data' => $data]);
return $order; return $order;
} }

38
resources/lang/en/admin/order.php
View File

@ -12,24 +12,24 @@
return [ return [
'list' => 'Order List', 'list' => 'Order List',
'order_quantity' => 'Order Quantity', 'order_quantity' => 'Order Quantity',
'order_amount' => 'Order Amount', 'order_amount' => 'Order Amount',
'orders_index' => 'Index', 'orders_index' => 'Index',
'orders_create' => 'Create', 'orders_create' => 'Create',
'orders_show' => 'Detail', 'orders_show' => 'Detail',
'orders_export' => 'Export', 'orders_export' => 'Export',
'orders_update' => 'Update', 'orders_update' => 'Update',
'orders_delete' => 'Delete', 'orders_delete' => 'Delete',
'notify' => 'Whether to remind', 'notify' => 'Whether to remind',
'orders_update_status' => 'Update Status', 'orders_update_status' => 'Update Status',
'error_status' => 'Please select a status', 'error_status' => 'Please select a status',
'payments_history' => 'Payment History', 'payments_history' => 'Payment History',
'text_response' => 'Pesponse', 'text_response' => 'Pesponse',
'text_request' => 'Pequest', 'text_request' => 'Pequest',
'text_callback' => 'Callback', 'text_callback' => 'Callback',
'text_callback' => 'Callback', 'text_callback' => 'Callback',
'text_receipt' => 'Receipt', 'text_receipt' => 'Receipt',
'order_id' => 'Order Id', 'order_id' => 'Order Id',
'text_transaction_id' => 'Transaction Id', 'text_transaction_id' => 'Transaction Id',
'text_click_view' => 'Click To View', 'text_click_view' => 'Click To View',
]; ];

36
resources/lang/zh_cn/admin/order.php
View File

@ -12,23 +12,23 @@
return [ return [
'list' => '订单列表', 'list' => '订单列表',
'order_quantity' => '订单数量', 'order_quantity' => '订单数量',
'order_amount' => '订单金额', 'order_amount' => '订单金额',
'orders_index' => '订单列表', 'orders_index' => '订单列表',
'orders_create' => '创建订单', 'orders_create' => '创建订单',
'orders_show' => '订单详情', 'orders_show' => '订单详情',
'orders_export' => '导出订单', 'orders_export' => '导出订单',
'orders_update' => '更新订单', 'orders_update' => '更新订单',
'orders_delete' => '删除订单', 'orders_delete' => '删除订单',
'notify' => '是否提醒', 'notify' => '是否提醒',
'orders_update_status' => '更新状态', 'orders_update_status' => '更新状态',
'error_status' => '请选择状态', 'error_status' => '请选择状态',
'payments_history' => '支付记录', 'payments_history' => '支付记录',
'text_response' => '返回数据', 'text_response' => '返回数据',
'text_request' => '请求参数', 'text_request' => '请求参数',
'text_callback' => '回调', 'text_callback' => '回调',
'text_receipt' => '凭据', 'text_receipt' => '凭据',
'order_id' => '订单ID', 'order_id' => '订单ID',
'text_transaction_id' => '交易ID', 'text_transaction_id' => '交易ID',
'text_click_view' => '点击查看', 'text_click_view' => '点击查看',
]; ];