中英文翻译 -》 订单

app/Admin/Controllers/OrderController.php

@@ -310,8 +310,7 @@ JS
         $info["settlementInfo"]["order_user_pay_type_cn"] = Arr::get(array_flip(Order::$ORDER_USER_PAY_TYPE),$orderInfo["order_user_pay_type"],"");
 
 
-
-
+        $info["translation"]=admin_trans("order.order_page_list");
 
 //dump($info);
 

app/Admin/Service/OrderService.php

@@ -132,6 +132,8 @@ class OrderService extends BaseService
 //                    "return_amount"=> decimal_number_format($orderItem["return_goods_number"] * $orderItem["return_goods_price"]),
                 ];
 
+//                dump($insertReturnItemData);
+
                 $createOrEdit = false;
                 if(!empty($returnItems)){
 
@@ -154,7 +156,11 @@ class OrderService extends BaseService
                         }
 
                     }
+                }else{
+                    $createOrEdit = true;
                 }
+
+
                 if($createOrEdit){
                     $insertReturnItemData["return_amount"] = decimal_number_format($orderItem["return_goods_number"] * $orderItem["return_goods_price"]);
                 }

resources/lang/en/order.php

@@ -28,8 +28,6 @@ return [
         "50001"=>"只能修改不是待审核的订单状态",
         "50002"=>"取消订单失败",
         "50003"=>"修改订单失败",
-        "50004"=>"修改结算信息失败",
-        "50005"=>"没找到订单相关数据",
     ],
     "validator"=>[
         'order_id_required' => '订单id必填',
@@ -76,4 +74,65 @@ return [
             "-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",
+    ],
+
+    "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

@@ -74,4 +74,65 @@ return [
             "-1"=>"已取消",
         ],
     ],
+    "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"=>"操作成功",
+    ]
 ];