Skip to content

semour / semour_admin

Go to a project
Commit 2f378093 by 孙龙
Options

中英文翻译

parent 82d8f8f7
Inline Side-by-side
Showing with 264 additions and 222 deletions
app/Admin/Actions/OrderAuditAction.php
......@@ -26,13 +26,14 @@ class OrderAuditAction extends BatchAction
*/
public function title()
{
return '审核';
return '审核1';
}
public function html()
{
$class = $this->getElementClass();
return '<a style="cursor: pointer;" class="'.$class. ' btn btn-primary" href="javascript:void(0)">审核</a>';
$label = admin_trans("order.labels.审核");
return '<a style="cursor: pointer;" class="'.$class. ' btn btn-primary" href="javascript:void(0)">'.$label.'</a>';
}
/**
......@@ -46,7 +47,8 @@ class OrderAuditAction extends BatchAction
// return '您确定要发送新的提醒消息吗？';
// 显示标题和内容
return ['是否确认审核？'];
$msg = admin_trans("order.labels.是否确认审核");
return [sprintf('%s?',$msg)];
}
/**
......@@ -60,7 +62,7 @@ class OrderAuditAction extends BatchAction
// 你的代码逻辑
$orderIdArr = $this->getKey();
OrderModel::auditOrder($orderIdArr);
return $this->response()->success('审核成功')->refresh();
return $this->response()->success(admin_trans("order.return_msg.50000"))->refresh();
}
/**
......
app/Admin/Actions/OrderReverseAuditAction.php
......@@ -32,7 +32,8 @@ class OrderReverseAuditAction extends BatchAction
public function html()
{
$class = $this->getElementClass();
return '<a style="cursor: pointer;" class="'.$class. ' btn btn-primary" href="javascript:void(0)">反审核</a>';
$label = admin_trans("order.labels.反审核");
return '<a style="cursor: pointer;" class="'.$class. ' btn btn-primary" href="javascript:void(0)">'.$label.'</a>';
}
/**
......@@ -46,7 +47,8 @@ class OrderReverseAuditAction extends BatchAction
// return '您确定要发送新的提醒消息吗？';
// 显示标题和内容
return ['是否确认反审核？'];
$msg = admin_trans("order.labels.是否确认反审核");
return [sprintf('%s?',$msg)];
}
/**
......@@ -60,7 +62,8 @@ class OrderReverseAuditAction extends BatchAction
// 你的代码逻辑
$orderIdArr = $this->getKey();
OrderModel::reverseAuditOrder($orderIdArr);
return $this->response()->success('反审核成功')->refresh();
return $this->response()->success(admin_trans("order.return_msg.50000"))->refresh();
}
/**
......
app/Admin/Controllers/Api/OrderApiController.php
......@@ -87,7 +87,7 @@ class OrderApiController extends BaseController
$orderInfo["orderItemList"][$k]["return_price"] = $returnItems["return_price"] ?? "";
$orderInfo["orderItemList"][$k]["return_amount"] = $returnItems["return_amount"] ?? "";
$orderInfo["orderItemList"][$k]["type"] = $returnItems["type"] ?? "";
$orderInfo["orderItemList"][$k]["type_cn"] = Arr::get(OrderReturnItems::$TYPE,$returnItems["type"] ?? 0,"");
$orderInfo["orderItemList"][$k]["type_cn"] = Arr::get(admin_trans("order.options.order_return_type"),$returnItems["type"] ?? 0,"");
}
$returnAmount = OrderService::getOrderReturnAmount($order_id);
......
app/Admin/Controllers/OrderController.php
......@@ -75,8 +75,8 @@ class OrderController extends AdminController
$grid->column('scmUser.name',admin_trans('scm-user.options.name'));
$grid->column('order_amount')->help('订单详情里-结算信息的“运费”“支付手续费”“其他费用”为空时；应付金额一栏为“待确认”');
$grid->column('order_pay_type')->using(admin_trans('order.options.order_pay_type'))->sortable();
$grid->column('fukuanfangshi',"付款方式")->display(function () {
return "---不知道--";
$grid->column('order_user_pay_type',admin_trans("order.field.order_user_pay_type"))->display(function () {
return Arr::get(admin_trans("order.options_user_pay_type"),$this->order_user_pay_type,"");
});
$grid->column('sale_name');
$grid->column('order_remark')->limit(10);
......@@ -107,9 +107,7 @@ class OrderController extends AdminController
})->datetime()->width(3);
$filter->startWith('company_name')->width(3);
$filter->startWith('scmUser.user_sn',admin_trans('scm-user.fields.user_sn'))->width(3);
$filter->equal('status')->select([
"1"=>"待审核","2"=>"待付款","4"=>"待发货","8"=>"待收货","10"=>"交易成功","-1"=>"已取消"
])->width(3);
$filter->equal('status')->select(admin_trans("order.options.status_search"))->width(3);
$filter->equal('sales_id',trans('inquiry.fields.sales_name'))->select(CmsUser::pluck('name', 'userId')->where("status",0)->toArray())->width(3);
});
......
resources/lang/en/order.php
......@@ -3,136 +3,158 @@ return [
'labels' => [
'Order' => 'Order',
'order' => 'Order',
'edit_status_handle' => '修改状态',
'将该订单状态置为' => '将该订单状态置为',
'edit_status_handle' => 'Modify the status',
'将该订单状态置为' => 'Set the order status to',
'审核' => 'audit',
'反审核' => 'Counter audit',
'是否确认审核' => 'Do you confirm the audit',
'审核成功' => 'Successful audit',
'是否确认反审核' => 'Whether to confirm counteraudit',
],
'fields' => [
'order_sn' => '订单编号号',
'status' => '订单状态',
'order_remark' => '订单备注',
'company_name' => '公司名称',
'order_type' => '订单类型',
'order_source' => '订单来源',
'order_pay_type' => '付款类型',
'user_id' => '用户ID',
'order_amount' => '订单金额',
'advance_amount' => '预付款金额，预付款时默认订单金额30%',
'currency' => '币种1CNY 2USD',
'create_time' => '下单时间',
'update_time' => '更新时间',
'sale_id' => '业务员id',
'sale_name' => '业务员',
],
"return_msg"=>[
"50000"=>"操作成功",
"50001"=>"只能修改不是待审核的订单状态",
"50002"=>"取消订单失败",
"50003"=>"修改订单失败",
],
"validator"=>[
'order_id_required' => '订单id必填',
'order_items_required' => '订单明细数据错误',
'order_sn' => 'Order No.',
'status' => 'Order status',
'order_remark' => 'order_remark',
'company_name' => 'company_name',
'order_type' => 'order_type',
'order_source' => 'order_source',
'order_pay_type' => 'order_pay_type',
'user_id' => 'user_id',
'order_amount' => 'order_amount',
'advance_amount' => 'advance_amount',
'currency' => 'currency',
'create_time' => 'create_time',
'update_time' => 'update_time',
'sale_id' => 'sale_id',
'sale_name' => 'sale_name',
'order_user_pay_type' => 'Terms of payment',
],
"return_msg" => [
"50000" => "Operation succeeded",
"50001" => "You can only change the status of orders that are not to be reviewed",
"50002" => "Order cancellation failed",
"50003" => "Failed to modify the order",
],
"validator" => [
'order_id_required' => 'Order id required',
'order_items_required' => 'Order details data is wrong',
'goods_price' => [
"gt"=>"商品单价不能小于0"
"gt" => "The unit price cannot be less than 0"
],
'goods_number' => [
"gt"=>"商品数量不能小于0"
"gt" => "The quantity of goods cannot be less than 0"
],
'return_goods_price' => [
"gt"=>"售后单价不能小于0"
"gt" => "After-sales unit price shall not be less than 0"
],
'return_goods_number' => [
"gt"=>"售后数量不能小于0"
"gt" => "The after-sale quantity cannot be less than 0"
],
'order_address_type' => [
"required"=>"订单地址类型是必须的"
"required" => "The order address type is required"
],
],
'options' => [
"status"=>[
"-1"=>"已取消",
"-2"=>"审核不通过",
"1"=>"待审核",
"2"=>"待付款",
"3"=>"待付尾款",
"4"=>"待发货",
"7"=>"部分发货",
"8"=>"待收货",
"10"=>" 交易成功",
],
"order_pay_type"=>[
"1"=>"全款支付",
"2"=>"预付款支付",
"3"=>"账期支付",
"4"=>"预收自定义",
"5"=>"预收50%",
],
"edit_status"=>[
"4"=>"待发货",
"8"=>"待收货",
"10"=>" 交易成功",
"-1"=>"已取消",
],
],
"order_page"=>[
"基本信息"=>"Basic Information",
"订单编号"=>"Order No.",
"订单状态"=>"Order status",
"公司名称"=>"Name of Company",
"客户编码"=>"Customer code",
"联系人"=>"Contact Person",
"商品信息"=>"Product Information",
"订单备注"=>"Remarks",
"商品总金额"=>"Total amount",
"退款总金额"=>"Total refund Amount",
"收货信息"=>"Receiving information",
"修改"=>"modify",
"取消"=>"cancel",
"快递公司"=>"Express delivery company",
"快递单号"=>"Express tracking number",
"邮箱"=>"email",
"电话"=>"phone",
"国家地区"=>"Country/region",
"请选择国家"=>"Please select country",
"省州"=>"Province/State",
"城市"=>"city",
"邮编"=>"Zip code",
"地址"=>"address",
"账单邮寄信息"=>"Bill mailing Information",
"同收货地址"=>"Same as the delivery address",
"结算信息"=>"Information of settlement",
"运费"=>"The freight",
"支付手续费"=>"Pay service fee",
"支付方式"=>"Pay service fee",
"订单总金额"=>"Total order amount",
"status" => [
"-1" => "cancelled",
"-2" => "Failed to pass the audit",
"1" => "To be reviewed",
"2" => "To be paid",
"3" => "Balance to be paid",
"4" => "Goods to be shipped",
"7" => "Partial delivery",
"8" => "Goods to be received",
"10" => "Successful transaction",
],
"status_search" => [
"1" => "To be reviewed",
"2" => "To be paid",
"4" => "Goods to be shipped",
"8" => "Goods to be received",
"10" => "Successful transaction",
"-1" => "cancelled",
],
"order_pay_type" => [
"1" => "Pay in full",
"2" => "Prepayment payment",
"3" => "Payment at account period",
"4" => "Pre-receive custom",
"5" => "50% in advance",
],
"edit_status" => [
"4" => "Goods to be shipped",
"8" => "Goods to be received",
"10" => " Successful transaction",
"-1" => "cancelled",
],
"order_return_type" => [
"1" => "Refund of returned goods",
"2" => "Refund only",
],
"order_user_pay_type" => [
"1" => "Paypal",
"2" => "TT",
]
],
"order_page" => [
"基本信息" => "Basic Information",
"订单编号" => "Order No.",
"订单状态" => "Order status",
"公司名称" => "Name of Company",
"客户编码" => "Customer code",
"联系人" => "Contact Person",
"商品信息" => "Product Information",
"订单备注" => "Remarks",
"商品总金额" => "Total amount",
"退款总金额" => "Total refund Amount",
"收货信息" => "Receiving information",
"修改" => "modify",
"取消" => "cancel",
"快递公司" => "Express delivery company",
"快递单号" => "Express tracking number",
"邮箱" => "email",
"电话" => "phone",
"国家地区" => "Country/region",
"请选择国家" => "Please select country",
"省州" => "Province/State",
"城市" => "city",
"邮编" => "Zip code",
"地址" => "address",
"账单邮寄信息" => "Bill mailing Information",
"同收货地址" => "Same as the delivery address",
"结算信息" => "Information of settlement",
"运费" => "The freight",
"支付手续费" => "Pay service fee",
"支付方式" => "Pay service fee",
"订单总金额" => "Total order amount",
],
"order_page_list"=>[
"numbers"=>"numbers",
"goods_id"=>"SKUID",
"goods_name"=>"goods_name",
"standard_brand_name"=>"standard_brand_name",
"supplier_name"=>"supplier_name",
"raw_goods_sn"=>"raw_goods_sn",
"raw_brand_name"=>"raw_brand_name",
"purchase_name"=>"purchase_name",
"currncy"=>"currency",
"goods_price"=>"goods_price",
"goods_number"=>"goods_number",
"total_amount"=>"total_amount",
"delivery_time"=>"delivery_time",
"batch"=>"batch",
"remarks"=>"remarks",
"type_cn"=>"type_cn",
"return_num"=>"return_num",
"return_amount"=>"return_amount",
"return_price"=>"return_price",
"all"=>"all",
"refund_of_returned_goods"=>"refund_of_returned_goods",
"refund_only"=>"refund_only",
"modified_success"=>"modified_success",
"modify"=>"modify",
"save"=>"save",
"operation_success"=>"operation_success",
"order_page_list" => [
"numbers" => "numbers",
"goods_id" => "SKUID",
"goods_name" => "goods_name",
"standard_brand_name" => "standard_brand_name",
"supplier_name" => "supplier_name",
"raw_goods_sn" => "raw_goods_sn",
"raw_brand_name" => "raw_brand_name",
"purchase_name" => "purchase_name",
"currncy" => "currency",
"goods_price" => "goods_price",
"goods_number" => "goods_number",
"total_amount" => "total_amount",
"delivery_time" => "delivery_time",
"batch" => "batch",
"remarks" => "remarks",
"type_cn" => "type_cn",
"return_num" => "return_num",
"return_amount" => "return_amount",
"return_price" => "return_price",
"all" => "all",
"refund_of_returned_goods" => "refund_of_returned_goods",
"refund_only" => "refund_only",
"modified_success" => "modified_success",
"modify" => "modify",
"save" => "save",
"operation_success" => "operation_success",
]
];
resources/lang/zh_CN/order.php
......@@ -5,6 +5,11 @@ return [
'order' => 'Order',
'edit_status_handle' => '修改状态',
'将该订单状态置为' => '将该订单状态置为',
'审核' => '审核',
'反审核' => '反审核',
'是否确认审核' => '是否确认审核',
'审核成功' => '是否确认审核',
'是否确认反审核' => '是否确认审核',
],
'fields' => [
'order_sn' => '订单编号号',
......@@ -22,117 +27,129 @@ return [
'update_time' => '更新时间',
'sale_id' => '业务员id',
'sale_name' => '业务员',
'order_user_pay_type' => '付款方式',
],
"return_msg"=>[
"50000"=>"操作成功",
"50001"=>"只能修改不是待审核的订单状态",
"50002"=>"取消订单失败",
"50003"=>"修改订单失败",
"return_msg" => [
"50000" => "操作成功",
"50001" => "只能修改不是待审核的订单状态",
"50002" => "取消订单失败",
"50003" => "修改订单失败",
],
"validator"=>[
"validator" => [
'order_id_required' => '订单id必填',
'order_items_required' => '订单明细数据错误',
'goods_price' => [
"gt"=>"商品单价不能小于0"
"gt" => "商品单价不能小于0"
],
'goods_number' => [
"gt"=>"商品数量不能小于0"
"gt" => "商品数量不能小于0"
],
'return_goods_price' => [
"gt"=>"售后单价不能小于0"
"gt" => "售后单价不能小于0"
],
'return_goods_number' => [
"gt"=>"售后数量不能小于0"
"gt" => "售后数量不能小于0"
],
'order_address_type' => [
"required"=>"订单地址类型是必须的"
"required" => "订单地址类型是必须的"
],
],
'options' => [
"status"=>[
"-1"=>"已取消",
"-2"=>"审核不通过",
"1"=>"待审核",
"2"=>"待付款",
"3"=>"待付尾款",
"4"=>"待发货",
"7"=>"部分发货",
"8"=>"待收货",
"10"=>" 交易成功",
],
"order_pay_type"=>[
"1"=>"全款支付",
"2"=>"预付款支付",
"3"=>"账期支付",
"4"=>"预收自定义",
"5"=>"预收50%",
],
"edit_status"=>[
"4"=>"待发货",
"8"=>"待收货",
"10"=>" 交易成功",
"-1"=>"已取消",
],
],
"order_page"=>[
"基本信息"=>"基本信息",
"订单编号"=>"订单编号",
"订单状态"=>"订单状态",
"公司名称"=>"公司名称",
"客户编码"=>"客户编码",
"联系人"=>"联系人",
"商品信息"=>"商品信息",
"订单备注"=>"订单备注",
"商品总金额"=>"商品总金额",
"退款总金额"=>"退款总金额",
"收货信息"=>"收货信息",
"修改"=>"修改",
"取消"=>"取消",
"快递公司"=>"快递公司",
"快递单号"=>"快递单号",
"邮箱"=>"邮箱",
"电话"=>"电话",
"国家地区"=>"国家/地区",
"请选择国家"=>"请选择国家",
"省州"=>"省/州",
"城市"=>"城市",
"邮编"=>"邮编",
"地址"=>"地址",
"账单邮寄信息"=>"账单邮寄信息",
"同收货地址"=>"同收货地址",
"结算信息"=>"结算信息",
"运费"=>"运费",
"支付手续费"=>"支付手续费",
"支付方式"=>"支付方式",
"订单总金额"=>"订单总金额",
"status" => [
"-1" => "已取消",
"-2" => "审核不通过",
"1" => "待审核",
"2" => "待付款",
"3" => "待付尾款",
"4" => "待发货",
"7" => "部分发货",
"8" => "待收货",
"10" => " 交易成功",
],
"status_search" => [
"1" => "待审核", "2" => "待付款", "4" => "待发货", "8" => "待收货", "10" => "交易成功", "-1" => "已取消"
],
"order_pay_type" => [
"1" => "全款支付",
"2" => "预付款支付",
"3" => "账期支付",
"4" => "预收自定义",
"5" => "预收50%",
],
"edit_status" => [
"4" => "待发货",
"8" => "待收货",
"10" => " 交易成功",
"-1" => "已取消",
],
"order_return_type" => [
"1" => "退货退款",
"2" => "仅退款",
],
"order_user_pay_type" => [
"1" => "Paypal",
"2" => "TT",
]
],
"order_page" => [
"基本信息" => "基本信息",
"订单编号" => "订单编号",
"订单状态" => "订单状态",
"公司名称" => "公司名称",
"客户编码" => "客户编码",
"联系人" => "联系人",
"商品信息" => "商品信息",
"订单备注" => "订单备注",
"商品总金额" => "商品总金额",
"退款总金额" => "退款总金额",
"收货信息" => "收货信息",
"修改" => "修改",
"取消" => "取消",
"快递公司" => "快递公司",
"快递单号" => "快递单号",
"邮箱" => "邮箱",
"电话" => "电话",
"国家地区" => "国家/地区",
"请选择国家" => "请选择国家",
"省州" => "省/州",
"城市" => "城市",
"邮编" => "邮编",
"地址" => "地址",
"账单邮寄信息" => "账单邮寄信息",
"同收货地址" => "同收货地址",
"结算信息" => "结算信息",
"运费" => "运费",
"支付手续费" => "支付手续费",
"支付方式" => "支付方式",
"订单总金额" => "订单总金额",
],
"order_page_list"=>[
"numbers"=>"序号",
"goods_id"=>"SKUID",
"goods_name"=>"商品型号",
"standard_brand_name"=>"标准品牌",
"supplier_name"=>"供应商",
"raw_goods_sn"=>"供应商物料唯一编码",
"raw_brand_name"=>"供应商物料品牌",
"purchase_name"=>"采购员",
"currncy"=>"币种",
"goods_price"=>"单价",
"goods_number"=>"数量",
"total_amount"=>"小计",
"delivery_time"=>"货期",
"batch"=>"批次",
"remarks"=>"客户备注",
"type_cn"=>"售后类型",
"return_num"=>"售后数量",
"return_amount"=>"售后金额",
"return_price"=>"售后单价",
"all"=>"全部",
"refund_of_returned_goods"=>"退货退款",
"refund_only"=>"仅退款",
"modified_success"=>"修改成功",
"modify"=>"修改",
"save"=>"保存",
"operation_success"=>"操作成功",
"order_page_list" => [
"numbers" => "序号",
"goods_id" => "SKUID",
"goods_name" => "商品型号",
"standard_brand_name" => "标准品牌",
"supplier_name" => "供应商",
"raw_goods_sn" => "供应商物料唯一编码",
"raw_brand_name" => "供应商物料品牌",
"purchase_name" => "采购员",
"currncy" => "币种",
"goods_price" => "单价",
"goods_number" => "数量",
"total_amount" => "小计",
"delivery_time" => "货期",
"batch" => "批次",
"remarks" => "客户备注",
"type_cn" => "售后类型",
"return_num" => "售后数量",
"return_amount" => "售后金额",
"return_price" => "售后单价",
"all" => "全部",
"refund_of_returned_goods" => "退货退款",
"refund_only" => "仅退款",
"modified_success" => "修改成功",
"modify" => "修改",
"save" => "保存",
"operation_success" => "操作成功",
]
];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment