From aa70bf4d4142aaa59b1dd7cae6a77bf539d11510 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 30 Jul 2018 21:14:58 +0800
Subject: [PATCH] update

---
 src/main/ui/index.html                        |  2 +-
 .../payment/custom/templates/custom.html      | 24 +++++++++----------
 .../payment/custom/templates/custom_add.html  | 16 ++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/ui/index.html b/src/main/ui/index.html
index 48a7044ec..fffcf5385 100644
--- a/src/main/ui/index.html
+++ b/src/main/ui/index.html
@@ -934,7 +934,7 @@ margin-bottom: 10%;"/>
 
                             <li ng-if="currentUser.client.client_moniker=='WOWW' || currentUser.client.client_moniker=='PINE'">
                                 <a ui-sref="custom">
-                                    Declare Custom
+                                    Report Custom
                                 </a>
                             </li>
                         </ul>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index 934722e1e..f497f7063 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -10,7 +10,7 @@
             <li>
                 <i class="fa fa-sitemap"></i> Custom
             </li>
-            <li class="active">Custom Management</li>
+            <li class="active">Report Custom </li>
         </ol>
     </section>
 
@@ -41,13 +41,13 @@
                                             <a role="button" ng-class="{'bg-primary':params.report_status=='ALL'}"
                                                ng-click="params.report_status='ALL';loadList()">All</a> |
                                             <a role="button" ng-class="{'bg-primary':params.report_status=='0'}"
-                                               ng-click="params.report_status='0';loadList()">暂存</a> |
+                                               ng-click="params.report_status='0';loadList()">Saved</a> |
                                             <a role="button" ng-class="{'bg-primary':params.report_status=='1'}"
-                                               ng-click="params.report_status='1';loadList()">提交</a> |
+                                               ng-click="params.report_status='1';loadList()">Submitted</a> |
                                             <a role="button" ng-class="{'bg-primary':params.report_status=='2'}"
-                                               ng-click="params.report_status='2';loadList()">提交失败</a> |
+                                               ng-click="params.report_status='2';loadList()">Failed</a> |
                                             <a role="button" ng-class="{'bg-primary':params.report_status=='3'}"
-                                               ng-click="params.report_status='3';loadList()">提交成功</a> |
+                                               ng-click="params.report_status='3';loadList()">Success</a> |
                                         </p>
                                     </div>
                                 </div>
@@ -75,13 +75,13 @@
                             <table class="table table-striped">
                                 <thead>
                                 <tr>
-                                    <th>渠道</th>
-                                    <th>订单号</th>
-                                    <th>时间</th>
-                                    <th>订单金额</th>
-                                    <th>人民币金额</th>
-                                    <th>报关状态</th>
-                                    <th>操作</th>
+                                    <th>Channel</th>
+                                    <th>Order Id</th>
+                                    <th>Time</th>
+                                    <th>Order Amount</th>
+                                    <th>CNY Amount</th>
+                                    <th>Report Status</th>
+                                    <th>Operation</th>
                                 </tr>
                                 </thead>
                                 <tbody>
diff --git a/src/main/ui/static/payment/custom/templates/custom_add.html b/src/main/ui/static/payment/custom/templates/custom_add.html
index 0f53b86bc..c01098cf4 100644
--- a/src/main/ui/static/payment/custom/templates/custom_add.html
+++ b/src/main/ui/static/payment/custom/templates/custom_add.html
@@ -8,7 +8,7 @@
             <form class="form-horizontal" novalidate name="rate_form">
 
                 <div class="form-group">
-                    <label class="control-label col-sm-4">海关</label>
+                    <label class="control-label col-sm-4">Customs</label>
                     <div class="col-sm-6">
                         <select class="form-control" name="industry"
                                 ng-model="custom.custom"
@@ -19,14 +19,14 @@
                 </div>
 
                 <div class="form-group">
-                    <label class="control-label col-sm-4" for="mch_custom_no">备案号</label>
+                    <label class="control-label col-sm-4" for="mch_custom_no">Customs No</label>
                     <div class="col-sm-6">
                         <input class="form-control" ng-model="custom.mch_custom_no"  id="mch_custom_no" type="text">
                     </div>
                 </div>
 
                 <div class="form-group">
-                    <label class="control-label col-sm-4" for="has_sub">是否拆单</label>
+                    <label class="control-label col-sm-4" for="has_sub">Split</label>
                     <div class="col-sm-6">
                         <input ng-model="custom.has_sub" id="has_sub" type="checkbox">
                     </div>
@@ -39,11 +39,11 @@
                     <table class="table table-striped">
                         <thead>
                         <tr>
-                            <th>海关金额</th>
-                            <th>运费金额</th>
+                            <th>Order Amount</th>
+                            <th>Transport Fee</th>
                             <!--<th>消费者名称</th>-->
                             <!--<th>消费者ID</th>-->
-                            <th>操作</th>
+                            <th>Operation</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -63,14 +63,14 @@
 
                 <div ng-if="custom.has_sub">
                     <div class="form-group">
-                        <label class="control-label col-sm-4" for="order_fee">订单金额</label>
+                        <label class="control-label col-sm-4" for="order_fee">Order Amount</label>
                         <div class="col-sm-6">
                             <input class="form-control" ng-model="subOrder.order_fee" id="order_fee"  type="text">
                         </div>
                     </div>
 
                     <div class="form-group">
-                        <label class="control-label col-sm-4" for="transport_fee">运费金额</label>
+                        <label class="control-label col-sm-4" for="transport_fee">Transport Fee</label>
                         <div class="col-sm-6">
                             <input class="form-control" ng-model="subOrder.transport_fee" id="transport_fee"  type="text">
                         </div>