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

add Merchant Category Code

Browse Source
master
Todking 4 years ago
parent c2c7026a34
commit 87e70a5fb4
8 changed files with 1354 additions and 4 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
Unescape View File

@ -123,6 +123,8 @@ public class ClientRegisterInfo {
private String averageCardTransaction;
@JSONField(name = "mw_industry")
private String mwIndustry;
@JSONField(name = "mc_industry")
private String mcIndustry;
@JSONField(name = "enable_international_card")
private boolean enableInternaltionCard;
@JSONField(name = "enable_cross_payment")
@ -611,6 +613,10 @@ public class ClientRegisterInfo {
return mwIndustry;
}
public String getMcIndustry() {
return mcIndustry;
}
public void setAverageCardTransaction(String averageCardTransaction) {
this.averageCardTransaction = averageCardTransaction;
}
@ -627,6 +633,10 @@ public class ClientRegisterInfo {
this.mwIndustry = mwIndustry;
}
public void setMcIndustry(String mcIndustry) {
this.mcIndustry = mcIndustry;
}
public boolean isEnableCardPayment() {
return enableCardPayment;
}

1
src/main/ui/static/commons/commons.js
Unescape View File

@ -15,6 +15,7 @@ define(['./app',
'./services/stateMap',
'./services/industryMap',
'./services/upayIndustryMap',
'./services/upayMcc',
'./services/wechatGoodMcc',
'./services/sectorMap',
'./services/countryMap',

1285
src/main/ui/static/commons/services/upayMcc.js
View File

File diff suppressed because it is too large Load Diff

8
src/main/ui/static/payment/partner/add-partner.js
Unescape View File

@ -32,7 +32,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
})
}]);
app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc','$filter', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc,$filter) {
app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap','upayMcc', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc','$filter', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, upayMcc, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc,$filter) {
if ($scope.partner_application) {
$scope.partner = angular.copy($scope.partner_application);
delete $rootScope.partner_application;
@ -172,6 +172,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.industries = industryMap.configs();
$scope.wechatMccIndustries = wechatGoodMcc.configs();
$scope.upayIndustrys = upayIndustryMap.configs();
$scope.upayMccs = upayMcc.configs();
$scope.states = stateMap.configs();
$scope.countries = countryMap.configs();
$scope.sectors = sectorMap.configs();
@ -472,10 +473,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
}
}]);
app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc','$filter',
function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc,$filter) {
app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','upayMcc','wechatGoodMcc','$filter',
function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,upayMcc,wechatGoodMcc,$filter) {
$scope.upayIndustrys = upayIndustryMap.configs();
$scope.upayMccs = upayMcc.configs();
$scope.timezones = timezone.configs();
$scope.wechatMccIndustries = wechatGoodMcc.configs();
$scope.partner = partner.data;

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

@ -1177,7 +1177,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
'commonDialog',
'partner',
'$sce',
function ($scope, $http, $state, $uibModal, $rootScope, Upload, commonDialog, partner, $sce) {
'upayMcc',
function ($scope, $http, $state, $uibModal, $rootScope, Upload, commonDialog, partner, $sce,upayMcc) {
$scope.upayMccs = upayMcc.configs();
$scope.init = { wechat_compliance: false, local_merchant: false }
$scope.partner = partner.data
$scope.isComplianceOfCompanyName = false

18
src/main/ui/static/payment/partner/templates/add_partner.html
Unescape View File

@ -1363,6 +1363,24 @@
</div>
</div>
</div>
<div class="form-group" ng-if="partner.enable_card_payment"
ng-class="{'has-error':partnerForm.mcindustry.$invalid && partnerForm.mcindustry.$dirty}">
<label class="control-label col-sm-2" for="mw-industry-input">
*Merchant Category Code</label>
<div class="col-sm-8">
<select class="form-control" name="mcindustry"
ng-model="partner.mc_industry"
id="mc-industry-input" required
ng-options="mcc.value as mcc.label for mcc in upayMccs">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.mcindustry.$error"
ng-if="partnerForm.mcindustry.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
</div>
</div>
</div>
<div class="form-group" ng-if="partner.enable_card_payment">
<label class="control-label col-sm-2" for="mw-industry-input">
*Card Service Selection</label>

14
src/main/ui/static/payment/partner/templates/partner_detail.html
Unescape View File

@ -1362,6 +1362,20 @@
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
<div class="form-group" ng-if="partner.mc_industry">
<label class="control-label col-sm-2">Merchant Category Code</label>
<div class="col-sm-10">
<select class="form-control" name="mcindustry"
ng-model="partner.mc_industry"
readonly
disabled
id="mc-industry-input"
ng-options="mcc.value as mcc.label for mcc in upayMccs">
</select>
<i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Card Service Selection</label>

18
src/main/ui/static/payment/partner/templates/partner_edit.html
Unescape View File

@ -1320,6 +1320,24 @@
</div>
</div>
</div>
<div class="form-group" ng-if="partner.enable_card_payment"
ng-class="{'has-error':partnerForm.mc-industry.$invalid && partnerForm.mc-industry.$dirty}">
<label class="control-label col-sm-2" for="mc-industry-input">
*Merchant Category Code</label>
<div class="col-sm-8">
<select class="form-control" name="mc-industry"
ng-model="partner.mc_industry" required
id="mc-industry-input"
ng-options="mcc.value as mcc.label for mcc in upayMccs">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.mc-industry.$error"
ng-if="partnerForm.mc-industry.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
</div>
</div>
</div>
<div class="form-group" ng-if="partner.enable_card_payment">
<label class="control-label col-sm-2" for="mw-industry-input">
*Card Service Selection</label>

Write Preview
Loading…
Cancel
Save