Merge remote-tracking branch 'origin/master' into master

application/admin/lang/zh-cn/order_hotel.php

@@ -20,7 +20,7 @@ return [
     'Check_out_date' => '离店时间',
     'Prod_num'       => '产品数量',
     'Total_price'    => '总金额 ',
-    'Total_cose'     => '总成本价格',
+    'Total_cost'     => '总成本价格',
     'Profit'         => '利润',
     'Log'            => '日志',
     'Del_flag'       => '是否删除',

application/admin/lang/zh-cn/order_item.php

@@ -11,7 +11,7 @@ return [
     'Use_date'       => '使用日期',
     'Prod_num'       => '产品数量',
     'Total_price'    => '总金额',
-    'Total_cose'     => '总成本价格',
+    'Total_cost'     => '总成本价格',
     'Profit'         => '利润',
     'Log'            => '日志',
     'Country_name'   => '国家名称',

application/admin/view/order_hotel/add.html

@@ -109,9 +109,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cose')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cost')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-total_cose" data-rule="required" class="form-control" step="0.01" name="row[total_cose]" type="number" value="0.00">
+            <input id="c-total_cost" data-rule="required" class="form-control" step="0.01" name="row[total_cost]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">

application/admin/view/order_hotel/edit.html

@@ -109,9 +109,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cose')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cost')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-total_cose" data-rule="required" class="form-control" step="0.01" name="row[total_cose]" type="number" value="{$row.total_cose|htmlentities}">
+            <input id="c-total_cost" data-rule="required" class="form-control" step="0.01" name="row[total_cost]" type="number" value="{$row.total_cost|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/admin/view/order_item/add.html

@@ -55,9 +55,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cose')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cost')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-total_cose" data-rule="required" class="form-control" step="0.01" name="row[total_cose]" type="number" value="0.00">
+            <input id="c-total_cost" data-rule="required" class="form-control" step="0.01" name="row[total_cost]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">

application/admin/view/order_item/edit.html

@@ -55,9 +55,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cose')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_cost')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-total_cose" data-rule="required" class="form-control" step="0.01" name="row[total_cose]" type="number" value="{$row.total_cose|htmlentities}">
+            <input id="c-total_cost" data-rule="required" class="form-control" step="0.01" name="row[total_cost]" type="number" value="{$row.total_cost|htmlentities}">
         </div>
     </div>
     <div class="form-group">

public/assets/js/backend/order_hotel.js

@@ -44,7 +44,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'check_out_date', title: __('Check_out_date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'prod_num', title: __('Prod_num')},
                         {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
-                        {field: 'total_cose', title: __('Total_cose'), operate:'BETWEEN'},
+                        {field: 'total_cost', title: __('Total_cost'), operate:'BETWEEN'},
                         {field: 'profit', title: __('Profit'), operate:'BETWEEN'},
                         {field: 'log', title: __('Log'), operate: 'LIKE'},
                         {field: 'del_flag', title: __('Del_flag'), formatter: Table.api.formatter.flag},

public/assets/js/backend/order_item.js

@@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'use_date', title: __('Use_date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'prod_num', title: __('Prod_num')},
                         {field: 'total_price', title: __('Total_price'), operate: 'LIKE'},
-                        {field: 'total_cose', title: __('Total_cose'), operate:'BETWEEN'},
+                        {field: 'total_cost', title: __('Total_cost'), operate:'BETWEEN'},
                         {field: 'profit', title: __('Profit'), operate:'BETWEEN'},
                         {field: 'log', title: __('Log'), operate: 'LIKE'},
                         {field: 'country_name', title: __('Country_name'), operate: 'LIKE'},