msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
master
james.zhao 6 years ago
parent 7c0f7cf4f6 d71faf795d
commit b4ecfe8f15
4 changed files with 103 additions and 6 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -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")){

14
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -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;

44
src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html
Unescape View File

@ -39,16 +39,29 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':subForm.company_name.$invalid && subForm.company_name.$dirty}">
<label class="control-label col-sm-3" for="company_name_input">* Merchant Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_name"
type="text" name="company_name" id="company_name_input" required maxlength="50">
<div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty">
<p class="small text-danger" ng-message="required">Required Fiel</p>
<p class="small text-danger" ng-message="maxlength">More Than 50</p>
</div>
</div>
</div>
<div class="form-group" ng-class="{'has-error':subForm.company_website.$invalid && subForm.company_website.$dirty}">
<label class="control-label col-sm-3" for="company_website_input">* Website</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_website" required
type="url" name="company_website" id="company_website_input">
type="text" name="company_website" id="company_website_input">
<div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
<div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
<p class="small text-danger" ng-message="url">eg:https://www.royalpay.com.au</p>
<div>
<p class="small text-danger">eg:https://www.royalpay.com.au or 无网站</p>
</div>
</div>
</div>
@ -320,6 +333,31 @@
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="contact_name_input">* Contact Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_person"
type="text" name="contact_name" id="contact_name_input">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="contact_phone_input">* Contact Phone</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_phone"
type="text" name="contact_phone" id="contact_phone_input">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_email"
type="text" name="contact_email" id="contact_email_input">
</div>
</div>
</div>
</div>
</div>

43
src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html
Unescape View File

@ -39,16 +39,29 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':subForm.company_name.$invalid && subForm.company_name.$dirty}">
<label class="control-label col-sm-3" for="company_name_input">* Merchant Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_name"
type="text" name="company_name" id="company_name_input" required maxlength="50">
<div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty">
<p class="small text-danger" ng-message="required">Required Fiel</p>
<p class="small text-danger" ng-message="maxlength">More Than 50</p>
</div>
</div>
</div>
<div class="form-group" ng-class="{'has-error':subForm.company_website.$invalid && subForm.company_website.$dirty}">
<label class="control-label col-sm-3" for="company_website_input">* Website</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_website" required
type="url" name="company_website" id="company_website_input">
type="text" name="company_website" id="company_website_input">
<div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
<div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
<p class="small text-danger" ng-message="url">eg:https://www.royalpay.com.au</p>
<div>
<p class="small text-danger">eg:https://www.royalpay.com.au or 无网站</p>
</div>
</div>
</div>
@ -320,6 +333,30 @@
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="contact_name_input">* Contact Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_person"
type="text" name="contact_name" id="contact_name_input">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="contact_phone_input">* Contact Phone</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_phone"
type="text" name="contact_phone" id="contact_phone_input">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
<div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_email"
type="text" name="contact_email" id="contact_email_input">
</div>
</div>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save