Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

# Conflicts:
#	resources/views/admin/pages/order-page.blade.php

app/Admin/Controllers/Api/OrderApiController.php

@@ -43,7 +43,7 @@ class OrderApiController extends BaseController
 
         $info["orderList"]["adminUser"] = CmsUser::getInfoByUserId($info["orderList"]["sale_id"]);
 
-        dump($info["orderList"]);
+//        dump($info["orderList"]);
         if($type == "1"){
             //PI
             return view('export.order_contract_PI',[
@@ -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(admin_trans("order.options.order_return_type"),$returnItems["type"] ?? 0,"");
+            $orderInfo["orderItemList"][$k]["type_cn"] = Arr::get(admin_trans_v2("order.options.order_return_type"),$returnItems["type"] ?? 0,"");
         }
 
         $returnAmount = OrderService::getOrderReturnAmount($order_id);
@@ -157,12 +157,12 @@ class OrderApiController extends BaseController
             'order_items.*.return_goods_number' => 'gt:0',
             'order_items' => 'required',
         ], [
-            'order_id.required' => admin_trans("order.validator.order_id_required"),
-            'order_items.required' => admin_trans("order.validator.order_items_required"),
-            'order_items.*.goods_price.gt' => admin_trans("order.validator.goods_price.gt"),
-            'order_items.*.goods_number.gt' => admin_trans("order.validator.goods_number.gt"),
-            'order_items.*.return_goods_price.gt' => admin_trans("order.validator.return_goods_price.gt"),
-            'order_items.*.return_goods_number.gt' => admin_trans("order.validator.return_goods_number.gt"),
+            'order_id.required' => admin_trans_v2("order.validator.order_id_required"),
+            'order_items.required' => admin_trans_v2("order.validator.order_items_required"),
+            'order_items.*.goods_price.gt' => admin_trans_v2("order.validator.goods_price.gt"),
+            'order_items.*.goods_number.gt' => admin_trans_v2("order.validator.goods_number.gt"),
+            'order_items.*.return_goods_price.gt' => admin_trans_v2("order.validator.return_goods_price.gt"),
+            'order_items.*.return_goods_number.gt' => admin_trans_v2("order.validator.return_goods_number.gt"),
         ], [
 
 //            'order_id' => '订单id',
@@ -183,8 +183,8 @@ class OrderApiController extends BaseController
             'order_id' => 'required',
             'order_address_type' => 'required',
         ], [
-            'order_id.required' => admin_trans("order.validator.order_id_required"),
-            'order_address_type.required' => admin_trans("order.validator.order_address.required"),
+            'order_id.required' => admin_trans_v2("order.validator.order_id_required"),
+            'order_address_type.required' => admin_trans_v2("order.validator.order_address.required"),
         ], []);
 
         if ($validator->fails()) {

app/Admin/Controllers/OrderController.php

@@ -313,6 +313,10 @@ JS
 
         $lang = $GLOBALS["app"]["config"]["admin"]["lang"] ?? "";
         $info["lang"] = $lang == "zh_CN" ? 1 : 2;
+        $info["lang_str"] = $lang;
+//        dump($info);
+//        dd(user_admin_config("lang"));
+
         return view('admin.pages.order-page',["info"=>$info]);
 
     }

app/Admin/Service/OrderService.php

@@ -138,10 +138,9 @@ class OrderService extends BaseService
                 if(!empty($returnItems)){
 
                     foreach($insertReturnItemData as $field=>$val){
-                        if($field == "type" && !in_array($val["type"],[1,2])){
+                        if($field != "type" ||  !in_array($val,[1,2])){
                             continue;
                         }
-
                         if($field == "return_goods_number" && !$val){
                             continue;
                         }
@@ -166,6 +165,7 @@ class OrderService extends BaseService
                 if($createOrEdit){
                     $insertReturnItemData["return_amount"] = decimal_number_format($insertReturnItemData["return_price"] * $insertReturnItemData["return_num"]);
                 }
+
                 $createOrEdit   &&  OrderReturnItems::create(array_merge($insertReturnItemData,["create_time"=>time()]));
             }
 
@@ -287,6 +287,8 @@ class OrderService extends BaseService
             if(empty($orderInfo)){
                 throw new InvalidRequestException(admin_trans("order.return_msg.50005"));
             }
+            $freightCharge = $freightCharge <= 0 ? 0 : $freightCharge;
+            $payCommission = $payCommission <= 0 ? 0 : $payCommission;
             OrderPrice::editOrderSettlement($orderId,$orderInfo["order_sn"],$freightCharge,$payCommission);
             Order::updateOrder(["order_id"=>$orderId],[
                 "order_user_pay_type"=>$orderUserPayType,

app/Admin/bootstrap.php

@@ -31,7 +31,9 @@ use Dcat\Admin\Show\Field;
 
 // 覆盖默认配置
 config(['admin' => user_admin_config()]);
-config(['app.locale' => config('admin.lang') ?: config('app.locale')]);
+config(['app.locale' =>  config('admin.lang') ?: config('app.locale')]);
+
+setcookie('app_lang', config('admin.lang') ?: config('app.locale'));
 
 $primaryColor = Admin::color()->primary();
 $primaryColor = '#009688';

app/Models/OrderPrice.php

@@ -37,8 +37,6 @@ class OrderPrice extends Model
 
     //新增或者修改订单的 运费 支付手续费
     public static  function  editOrderSettlement($orderId,$orderSn,$freightCharge,$payCommission){
-
-        if($freightCharge){
             self::updateOrCreate([
                 "order_id"=>$orderId,
                 "price_type"=>self::$PRICE_TYPE_LIST["运费"],
@@ -48,9 +46,8 @@ class OrderPrice extends Model
                 "currency"=>2,
                 "create_time"=>time(),
             ]);
-        }
 
-        if($payCommission){
+
             self::updateOrCreate([
                 "order_id"=>$orderId,
                 "price_type"=>self::$PRICE_TYPE_LIST["支付手续费"],
@@ -60,7 +57,7 @@ class OrderPrice extends Model
                 "currency"=>2,
                 "create_time"=>time(),
             ]);
-        }
+
 
     }
 

app/helpers.php

@@ -431,3 +431,9 @@ function buildQueryTimeRange($time = "")
     $buildTimeQueryData["end_time"] = isset($time[1]) ? $time[1] : "";
     return $buildTimeQueryData;
 }
+
+function admin_trans_v2($key){
+    $lang = \Illuminate\Support\Facades\Cookie::get("app_lang");
+    $lang = $lang ? $lang : "en";
+    return admin_trans($key,[],$lang);
+}

public/assets/js/order/index.js

@@ -17,7 +17,7 @@ layui.use(['form', 'table', 'laydate'], function () {
       //列表
       table.render({
         elem: '#list',
-        url: '/api/orderList',
+        url: '/api/orderList?lang='+lang_str,
         toolbar: '#toolbar',
         method: 'GET',
         where: {

resources/lang/en/inquiry.php

@@ -10,7 +10,7 @@ return [
     'fields' => [
         'inquiry_id' => 'Id',
         'sales_name' => 'Sales Name',
-        'inquiry_sn' => 'Inquiry Sn',
+        'inquiry_sn' => 'Inquiry No',
         'status' => 'Status',
         'remark' => 'Remark',
         'priority' => 'Priority',
@@ -21,6 +21,7 @@ return [
         'email' => 'email',
         'user' => [
             'phone' => 'Phone',
+            'user_sn' => 'Customer No',
         ],
         'sales_user' => [
             'name' => 'Sales Name',

resources/views/admin/pages/order-page.blade.php

@@ -423,10 +423,10 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">{{admin_trans("order.order_page.支付方式")}}：</label>
                 <div class="layui-input-block">
-                    <div class="layui-form-mid">{{$info["settlementInfo"]["order_user_pay_type_cn"]}}</div>
+                    <div class="layui-form-mid">{{$info["settlementInfo"]["order_user_pay_type_cn"]}} </div>
                     <div class="show" style="display: none">
-                        <input type="radio" name="order_user_pay_type" value="1" title="Paypal" checked>
-                        <input type="radio" name="order_user_pay_type" value="2" title="TT">
+                        <input type="radio" name="order_user_pay_type" value="1" title="Paypal" @if($info["settlementInfo"]["order_user_pay_type"] == "1") checked @endif >
+                        <input type="radio" name="order_user_pay_type" value="2" @if($info["settlementInfo"]["order_user_pay_type"] == "2") checked @endif  title="TT">
                     </div>
                 </div>
             </div>
@@ -451,6 +451,7 @@
 <script>
   var translation = <?php echo json_encode($info["translation"]); ?>;
   var lang = <?php echo $info["lang"]; ?>;
+  var lang_str = "<?php echo $info["lang_str"]; ?>";
 </script>
 <script type="text/javascript" src="/assets/js/order/index.js?v={{time()}}"></script>
 

resources/views/export/order_contract_PI.blade.php

 <table  border="1">
     <tr>
         <td rowspan="4">
+            <img src="./assets/images/logo.png" width="50" height="50" >
 
         </td>
     </tr>