From 84b0fdaa8538f073c07ca964a7658fc943f8b970 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Fri, 2 Mar 2018 14:11:58 +0800
Subject: [PATCH 1/2] hide gst in customer's view

---
 .../static/payment/partner/templates/partner_bankaccounts.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index fe75673dc..3f7857156 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -14,7 +14,7 @@
         </h3>
         <div class="form-horizontal">
             <div class="form-group" ng-if="'modify_tax_in_surcharge'|withFunc">
-                <label class="col-sm-4">Skip Clearing</label>
+                <label class="col-sm-4">RoyalPay Pay GST</label>
                 <div class="col-sm-6">
                     <input type="checkbox" ng-model="partner.tax_in_surcharge" bs-switch
                            switch-change="taxInSurcharge(partner.tax_in_surcharge)">

From 3b7ff0c8895c0b5f0148a1f2082381561a8c6598 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 5 Mar 2018 18:28:41 +0800
Subject: [PATCH 2/2] app udpate

---
 .../appclient/core/impls/RetailAppServiceImp.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index efeb6d09a..2601aa5a9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -1032,15 +1032,12 @@ public class RetailAppServiceImp implements RetailAppService {
         Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
         String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
         int update_type = 0;// 0:不更新 1：更新 2：强制更新
-        String[] versionArr = version.split("\\.");
-        String[] newVersionArr = newAppVersion.split("\\.");
-        for (int i = 0; i < newVersionArr.length; i++) {
-            if (Integer.valueOf(newVersionArr[i]) > Integer.valueOf(versionArr[i])) {
-                update_type = 1;
-                if (isUpdate) {
-                    update_type = 2;
-                }
-                i = newVersionArr.length + 1;
+        String versionInt = version.replace(".","");
+        String newAppVersionInt = newAppVersion.replace(".","");
+        if (Integer.valueOf(versionInt)<Integer.valueOf(newAppVersionInt)){
+            update_type = 1;
+            if(isUpdate){
+                update_type=2;
             }
         }
         JSONObject res = new JSONObject();