diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index d2eb34f8f..fd119646a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -3767,6 +3767,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject yeepayConfig = yeePayClientConfigMapper.findMerchantConfig(client.getIntValue("client_id")); yeepayConfig.put("company_website",merchantInfo.getString("company_website")); yeepayConfig.put("abn",merchantInfo.getString("abn")); + yeepayConfig.put("company_name",merchantInfo.getString("company_name")); + yeepayConfig.put("contact_phone",merchantInfo.getString("contact_phone")); + yeepayConfig.put("contact_email",merchantInfo.getString("contact_email")); + yeepayConfig.put("contact_person",merchantInfo.getString("contact_person")); SubmerchantRegisterResult result = yeePayClient.registerMerchant(client,yeepayConfig); if(result.getStatus().equals("FAILED")){ throw new BadRequestException(result.getErrorMsg()); @@ -3799,6 +3803,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid yeePayClientConfigMapper.update(yeepayConfig); yeepayConfig.put("company_website",merchantInfo.getString("company_website")); yeepayConfig.put("abn",merchantInfo.getString("abn")); + yeepayConfig.put("company_name",merchantInfo.getString("company_name")); + yeepayConfig.put("contact_phone",merchantInfo.getString("contact_phone")); + yeepayConfig.put("contact_email",merchantInfo.getString("contact_email")); + yeepayConfig.put("contact_person",merchantInfo.getString("contact_person")); yeepayConfig.put("mode","UPDATE"); SubmerchantRegisterResult result = yeePayClient.registerMerchant(client,yeepayConfig); if(result.getStatus().equals("FAILED")){ diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index d9da711e5..0d86a6440 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -3561,6 +3561,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.yeepay_industries = yeepayIndustryMap.configs(); $scope.yeepay_business_contents = yeepayBusinessContentMap.configs(); $scope.subMerchantInfo = angular.copy(subMerchantInfo); + if(!$scope.subMerchantInfo.abn){ + $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn; + } var vouchers={}; $scope.directors={}; @@ -3839,6 +3842,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter // } // } // }); + merchantInfo['company_name'] = $scope.subMerchantInfo.company_name; + merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person; + merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone; + merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email; merchantInfo['company_website'] = $scope.subMerchantInfo.company_website; merchantInfo['abn'] = $scope.subMerchantInfo.abn; merchantInfo['executives'] = $scope.executives; @@ -3871,6 +3878,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.yeepay_industries = yeepayIndustryMap.configs(); $scope.yeepay_business_contents = yeepayBusinessContentMap.configs(); $scope.subMerchantInfo = angular.copy(subMerchantInfo); + if(!$scope.subMerchantInfo.abn){ + $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn; + } var vouchers={}; $scope.directors={}; @@ -4149,6 +4159,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter // } // } // }); + merchantInfo['company_name'] = $scope.subMerchantInfo.company_name; + merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person; + merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone; + merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email; merchantInfo['company_website'] = $scope.subMerchantInfo.company_website; merchantInfo['abn'] = $scope.subMerchantInfo.abn; merchantInfo['executives'] = $scope.executives; diff --git a/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html index 6eed12f07..4f11f7bef 100644 --- a/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html +++ b/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html @@ -39,16 +39,29 @@ +
+ +
+ +
+

Required Fiel

+

More Than 50

+
+
+
+
+ type="text" name="company_website" id="company_website_input">

Required Field

-
-

eg:https://www.royalpay.com.au

+
+

eg:https://www.royalpay.com.au or 无网站

@@ -320,6 +333,31 @@
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ diff --git a/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html index 05059b18a..5407e34dd 100644 --- a/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html +++ b/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html @@ -39,16 +39,29 @@ +
+ +
+ +
+

Required Fiel

+

More Than 50

+
+
+
+
+ type="text" name="company_website" id="company_website_input">

Required Field

-
-

eg:https://www.royalpay.com.au

+
+

eg:https://www.royalpay.com.au or 无网站

@@ -320,6 +333,30 @@
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+