Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -290,11 +290,11 @@ public class RetailAppServiceImp implements RetailAppService {
             res.put("alipay_rate", paymentApi.channelApi("Alipay").queryExchangeRateDecimal(clientId));
         }
         params.put("channel", "system");
-        res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
         params.put("channel", "rpaypmt_card");
-        res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
         params.put("channel", "rpaypmt_dd");
-        res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
         return res;
     }
 
@@ -870,7 +870,7 @@ public class RetailAppServiceImp implements RetailAppService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         int clientId = device.getIntValue("client_id");
-        JSONObject client = clientManager.getClientInfo(9);
+        JSONObject client = clientManager.getClientInfo(clientId);
         String timezoneClient = client.getString("timezone");
         if (timezoneClient != null && !timezone.isEmpty()) {
             timezone = timezoneClient;

src/main/ui/static/payment/partner/templates/add_partner.html

@@ -220,7 +220,7 @@
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.abn.$invalid && partnerForm.abn.$dirty}"
                                  ng-if="partner.business_structure != 'Company' || partner.enable_card_payment">
-                                <label class="control-label col-sm-2" for="abn-input"><span ng-if="partner.enable_card_payment">*</span>ABN</label>
+                                <label class="control-label col-sm-2" for="abn-input">* ABN</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.abn" type="text"
                                            name="abn" required