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

商户资料 日期多种选择

Browse Source
master
dalong306 4 years ago
parent 72af9c83fb
commit 8ba52a1513
10 changed files with 475 additions and 67 deletions
Show Stats Download Patch File Download Diff File

5
src/db/modify.sql
Unescape View File

@ -771,3 +771,8 @@ alter table sys_wx_merchant_apply
ALTER TABLE `sys_clients` ALTER TABLE `sys_clients`
ADD COLUMN certificat_expire_date date DEFAULT NULL COMMENT '注册证书过期时间'; ADD COLUMN certificat_expire_date date DEFAULT NULL COMMENT '注册证书过期时间';
-- 商户表 日期类型改为varchar 2020.12.23
ALTER TABLE `sys_clients`
modify COLUMN certificat_expire_date varchar(20) DEFAULT NULL COMMENT '注册证书过期时间';

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

@ -134,7 +134,7 @@ public class ClientRegisterInfo {
private String director_id_number; private String director_id_number;
private String principal_name; private String principal_name;
private String principal_id_number; private String principal_id_number;
private Date certificat_expire_date;//注册证书过期时间 private String certificat_expire_date;//注册证书过期时间
private String mc_code;//微信mccode private String mc_code;//微信mccode
@ -675,11 +675,11 @@ public class ClientRegisterInfo {
this.principal_id_number = principal_id_number; this.principal_id_number = principal_id_number;
} }
public Date getCertificat_expire_date() { public String getCertificat_expire_date() {
return certificat_expire_date; return certificat_expire_date;
} }
public void setCertificat_expire_date(Date certificat_expire_date) { public void setCertificat_expire_date(String certificat_expire_date) {
this.certificat_expire_date = certificat_expire_date; this.certificat_expire_date = certificat_expire_date;
} }

120
src/main/ui/static/commons/services/industryMap.js
Unescape View File

@ -158,6 +158,126 @@ define(['../app'], function (app) {
{ {
"label": "Medical Service", "label": "Medical Service",
"value": "533" "value": "533"
},
{
"label": "Online games (Top-up)",
"value": "644"
},
{
"label": "Online Shopping Mall",
"value": "648"
},
{
"label": "Supermarket",
"value": "649"
},
{
"label": "Convenience Store",
"value": "651"
},
{
"label": "Duty-free Shop",
"value": "652"
},
{
"label": "Pharmacy",
"value": "653"
},
{
"label": "Vending Machine",
"value": "654"
},
{
"label": "Department Store /Shopping Centre",
"value": "655"
},
{
"label": "Food/Beverages",
"value": "656"
},
{
"label": "Catering Services",
"value": "657"
},
{
"label": "Furniture/Household Products",
"value": "658"
},
{
"label": "Home Appliances/Camera Equipment/Office Equipment",
"value": "659"
},
{
"label": "Beauty/Personal Care Products",
"value": "660"
},
{
"label": "Flowers/Plants/Interior Decorations/Decorations",
"value": "661"
},
{
"label": "Nursery Products/Toys",
"value": "662"
},
{
"label": "Clothing/Shoes/Other Accessories",
"value": "663"
},
{
"label": "Sports/Fitness Equipment/Security",
"value": "664"
},
{
"label": "Watches/Eyewear/Jewellery",
"value": "665"
},
{
"label": "Outdoor Products /Travel Products",
"value": "666"
},
{
"label": "Books / Records / Stationery / Musical Instruments",
"value": "667"
},
{
"label": "Flight ticket/ticketing agent",
"value": "668"
},
{
"label": "Sightseeing Passes",
"value": "669"
},
{
"label": "Hotel/Resort",
"value": "670"
},
{
"label": "Online Books/Video/Music",
"value": "671"
},
{
"label": "Online games (Download)",
"value": "672"
},
{
"label": "University Education",
"value": "677"
},
{
"label": "Public hospitals/Medical Institutions",
"value": "679"
},
{
"label": "Private hospitals/Clinics/Medical institutions",
"value": "678"
},
{
"label": "Public transit",
"value": "680"
},
{
"label": "Logistics/ Courier Service",
"value": "684"
} }
]; ];
app.factory('industryMap', function () { app.factory('industryMap', function () {

91
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', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc) { 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) {
if ($scope.partner_application) { if ($scope.partner_application) {
$scope.partner = angular.copy($scope.partner_application); $scope.partner = angular.copy($scope.partner_application);
delete $rootScope.partner_application; delete $rootScope.partner_application;
@ -57,7 +57,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.contact_phone_c = 61; $scope.partner.contact_phone_c = 61;
$scope.partner.client_pay_type = []; $scope.partner.client_pay_type = [];
$scope.partner.client_pay_desc = []; $scope.partner.client_pay_desc = [];
$scope.checkExpriedate=function (value) {
if(value){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_NA=false;
}
}
$scope.checkExpriedateOther=function (value) {
if(value=='PERMANENT'){
if($scope.partner.certificat_expire_date_premanent){
$scope.partner.certificat_expire_date_NA=false;
$scope.partner.certificat_expire_date_d=null;
}
}else if(value=='N/A'){
if($scope.partner.certificat_expire_date_NA){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_d=null;
}
}
}
var resetClientPayDescByTpey = function (type) { var resetClientPayDescByTpey = function (type) {
type = parseInt(type); type = parseInt(type);
if (type == 1) { if (type == 1) {
@ -232,6 +250,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('Please select the business structure'); alert('Please select the business structure');
return; return;
} }
if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
if ($scope.partner.certificat_expire_date_d) {
$scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
} else if ($scope.partner.certificat_expire_date_premanent) {
$scope.partner.certificat_expire_date = "PERMANENT";
}
else if ($scope.partner.certificat_expire_date_NA) {
$scope.partner.certificat_expire_date = "N/A";
} else {
alert("Certificate expiration time is required");
return;
}
}
if (!$scope.partner.enable_cross_payment && !$scope.partner.enable_card_payment) { if (!$scope.partner.enable_cross_payment && !$scope.partner.enable_card_payment) {
alert("商户至少开通一种支付方式，请检查是否选择了跨境支付或卡支付！"); alert("商户至少开通一种支付方式，请检查是否选择了跨境支付或卡支付！");
return; return;
@ -441,16 +472,45 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
} }
} }
}]); }]);
app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc', app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc','$filter',
function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc) { function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc,$filter) {
$scope.upayIndustrys = upayIndustryMap.configs(); $scope.upayIndustrys = upayIndustryMap.configs();
$scope.timezones = timezone.configs(); $scope.timezones = timezone.configs();
$scope.wechatMccIndustries = wechatGoodMcc.configs(); $scope.wechatMccIndustries = wechatGoodMcc.configs();
$scope.partner = partner.data; $scope.partner = partner.data;
// if(partner.data.certificat_expire_date) {
// var datestr = partner.data.certificat_expire_date.replace(/-/g, '/');
// $scope.partner.certificat_expire_date=new Date(datestr);
// }
if(partner.data.certificat_expire_date) { if(partner.data.certificat_expire_date) {
var datestr = partner.data.certificat_expire_date.replace(/-/g, '/'); if( $scope.partner.certificat_expire_date=="PERMANENT"){
$scope.partner.certificat_expire_date=new Date(datestr); $scope.partner.certificat_expire_date_premanent=true;
}else if( $scope.partner.certificat_expire_date=="N/A"){
$scope.partner.certificat_expire_date_NA=true;
}else {
var datestr = $scope.partner.certificat_expire_date.replace(/-/g, '/');
$scope.partner.certificat_expire_date_d = new Date(datestr);
}
}
$scope.checkExpriedate=function (value) {
if(value){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_NA=false;
}
}
$scope.checkExpriedateOther=function (value) {
if(value=='PERMANENT'){
if($scope.partner.certificat_expire_date_premanent){
$scope.partner.certificat_expire_date_NA=false;
$scope.partner.certificat_expire_date_d=null;
}
}else if(value=='N/A'){
if($scope.partner.certificat_expire_date_NA){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_d=null;
}
}
} }
if($scope.partner.mc_code ){ if($scope.partner.mc_code ){
$scope.partner.mc_code=parseInt($scope.partner.mc_code); $scope.partner.mc_code=parseInt($scope.partner.mc_code);
@ -664,7 +724,23 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}); });
return; return;
} }
if (!$scope.partner.business_structure||$scope.partner.business_structure == '') {
alert('Please select the business structure');
return;
}
if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
if ($scope.partner.certificat_expire_date_d) {
$scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
} else if ($scope.partner.certificat_expire_date_premanent) {
$scope.partner.certificat_expire_date = "PERMANENT";
}
else if ($scope.partner.certificat_expire_date_NA) {
$scope.partner.certificat_expire_date = "N/A";
} else {
alert("Certificate expiration time is required");
return;
}
}
if ($scope.partner.company_name.indexOf("Migration") != -1) { if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！"); alert("Company Name包含敏感词汇，请检查后重新提交！");
return; return;
@ -705,6 +781,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
} }
}) })
} }
var content = ''; var content = '';
if (!origin_referrer_id && $scope.partner.referrer_id) { if (!origin_referrer_id && $scope.partner.referrer_id) {
content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!'; content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!';

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

@ -152,6 +152,126 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
{ {
"label": "Medical Service", "label": "Medical Service",
"value": "533" "value": "533"
},
{
"label": "Online games (Top-up)",
"value": "644"
},
{
"label": "Online Shopping Mall",
"value": "648"
},
{
"label": "Supermarket",
"value": "649"
},
{
"label": "Convenience Store",
"value": "651"
},
{
"label": "Duty-free Shop",
"value": "652"
},
{
"label": "Pharmacy",
"value": "653"
},
{
"label": "Vending Machine",
"value": "654"
},
{
"label": "Department Store /Shopping Centre",
"value": "655"
},
{
"label": "Food/Beverages",
"value": "656"
},
{
"label": "Catering Services",
"value": "657"
},
{
"label": "Furniture/Household Products",
"value": "658"
},
{
"label": "Home Appliances/Camera Equipment/Office Equipment",
"value": "659"
},
{
"label": "Beauty/Personal Care Products",
"value": "660"
},
{
"label": "Flowers/Plants/Interior Decorations/Decorations",
"value": "661"
},
{
"label": "Nursery Products/Toys",
"value": "662"
},
{
"label": "Clothing/Shoes/Other Accessories",
"value": "663"
},
{
"label": "Sports/Fitness Equipment/Security",
"value": "664"
},
{
"label": "Watches/Eyewear/Jewellery",
"value": "665"
},
{
"label": "Outdoor Products /Travel Products",
"value": "666"
},
{
"label": "Books / Records / Stationery / Musical Instruments",
"value": "667"
},
{
"label": "Flight ticket/ticketing agent",
"value": "668"
},
{
"label": "Sightseeing Passes",
"value": "669"
},
{
"label": "Hotel/Resort",
"value": "670"
},
{
"label": "Online Books/Video/Music",
"value": "671"
},
{
"label": "Online games (Download)",
"value": "672"
},
{
"label": "University Education",
"value": "677"
},
{
"label": "Public hospitals/Medical Institutions",
"value": "679"
},
{
"label": "Private hospitals/Clinics/Medical institutions",
"value": "678"
},
{
"label": "Public transit",
"value": "680"
},
{
"label": "Logistics/ Courier Service",
"value": "684"
} }
]; ];
var removeClientPayDesc = function (items, key) { var removeClientPayDesc = function (items, key) {
@ -3138,8 +3258,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
} }
}]); }]);
app.controller('partnerNewSubPartnerDialogCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', app.controller('partnerNewSubPartnerDialogCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone',
'clientMoniker', 'industryMap', 'businessStructuresMap', 'stateMap', 'countryMap','wechatGoodMcc', 'clientMoniker', 'industryMap', 'businessStructuresMap', 'stateMap', 'countryMap','wechatGoodMcc','$filter',
function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap,wechatGoodMcc) { function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap,wechatGoodMcc,$filter) {
if ($scope.partner_application) { if ($scope.partner_application) {
$scope.partner = angular.copy($scope.partner_application); $scope.partner = angular.copy($scope.partner_application);
delete $rootScope.partner_application; delete $rootScope.partner_application;
@ -3161,7 +3281,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.merchantIsValid = false; $scope.merchantIsValid = false;
$scope.merchantCodeChecked = false; $scope.merchantCodeChecked = false;
$scope.wechatMccIndustries = wechatGoodMcc.configs(); $scope.wechatMccIndustries = wechatGoodMcc.configs();
$scope.checkExpriedate=function (value) {
if(value){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_NA=false;
}
}
$scope.checkExpriedateOther=function (value) {
if(value=='PERMANENT'){
if($scope.partner.certificat_expire_date_premanent){
$scope.partner.certificat_expire_date_NA=false;
$scope.partner.certificat_expire_date_d=null;
}
}else if(value=='N/A'){
if($scope.partner.certificat_expire_date_NA){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_d=null;
}
}
}
var resetClientPayDescByTpey = function (type) { var resetClientPayDescByTpey = function (type) {
type = parseInt(type); type = parseInt(type);
if (type == 1) { if (type == 1) {
@ -3352,6 +3490,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('Please select the business structure'); alert('Please select the business structure');
return; return;
} }
if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
if ($scope.partner.certificat_expire_date_d) {
$scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
} else if ($scope.partner.certificat_expire_date_premanent) {
$scope.partner.certificat_expire_date = "PERMANENT";
}
else if ($scope.partner.certificat_expire_date_NA) {
$scope.partner.certificat_expire_date = "N/A";
} else {
alert("Certificate expiration time is required");
return;
}
}
if ($scope.partner.company_name.indexOf("Migration") != -1) { if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！"); alert("Company Name包含敏感词汇，请检查后重新提交！");
return; return;
@ -5544,7 +5695,37 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.subMerchantInfo.certificat_expire_date=new Date(datestr); $scope.subMerchantInfo.certificat_expire_date=new Date(datestr);
} }
if($scope.subMerchantInfo.business_structure ){ if($scope.subMerchantInfo.business_structure ){
$scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure == 'Company'? "ENTERPRISE":"INDIVIDUAL"; $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)'? "ENTERPRISE":"INDIVIDUAL";
}
if(subMerchantInfo.certificat_expire_date) {
if(subMerchantInfo.certificat_expire_date=="PERMANENT"){
$scope.subMerchantInfo.certificat_expire_date_premanent=true;
}else if(subMerchantInfo.certificat_expire_date=="N/A"){
$scope.subMerchantInfo.certificat_expire_date_NA=true;
}else {
var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/');
$scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr);
}
}
$scope.checkExpriedate=function (value) {
if(value){
$scope.subMerchantInfo.certificat_expire_date_premanent=false;
$scope.subMerchantInfo.certificat_expire_date_NA=false;
}
}
$scope.checkExpriedateOther=function (value) {
if(value=='PERMANENT'){
if($scope.subMerchantInfo.certificat_expire_date_premanent){
$scope.subMerchantInfo.certificat_expire_date_NA=false;
$scope.subMerchantInfo.certificat_expire_date_d=null;
}
}else if(value=='N/A'){
if($scope.subMerchantInfo.certificat_expire_date_NA){
$scope.subMerchantInfo.certificat_expire_date_premanent=false;
$scope.subMerchantInfo.certificat_expire_date_d=null;
}
}
} }
$scope.saveAppliy = function (form) { $scope.saveAppliy = function (form) {
$scope.errmsg = null; $scope.errmsg = null;
@ -5585,8 +5766,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
params.director_id_number = $scope.subMerchantInfo.director_id_number; params.director_id_number = $scope.subMerchantInfo.director_id_number;
params.company_register_no = $scope.subMerchantInfo.company_register_no; params.company_register_no = $scope.subMerchantInfo.company_register_no;
params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date; params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date;
if($scope.subMerchantInfo.certificat_expire_date) {
params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date) if($scope.subMerchantInfo.certificat_expire_date_d) {
params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date_d)
}else if($scope.subMerchantInfo.certificat_expire_date_premanent){
params.certificat_expire_date="PERMANENT";
}
else if($scope.subMerchantInfo.certificat_expire_date_NA){
params.certificat_expire_date="N/A";
}else{
alert("Certificate expiration time is required");
return;
} }
}else{ }else{
params.principal_name = $scope.subMerchantInfo.principal_name; params.principal_name = $scope.subMerchantInfo.principal_name;
@ -5635,7 +5825,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.businessTypesMap=businessTypesMap.configs(); $scope.businessTypesMap=businessTypesMap.configs();
if($scope.subMerchantInfo.business_structure ){ if($scope.subMerchantInfo.business_structure ){
$scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure == 'Company'? "ENTERPRISE":"INDIVIDUAL"; $scope.subMerchantInfo.merchant_type=$scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)'? "ENTERPRISE":"INDIVIDUAL";
} }
if($scope.subMerchantInfo.industry) { if($scope.subMerchantInfo.industry) {
$scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.subMerchantInfo.industry); $scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.subMerchantInfo.industry);

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

@ -309,25 +309,28 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.business_structure == 'Company'&&partner.business_structure != null" <div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}"> ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label> <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">
<!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"--> <!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"-->
<!--type="text" name="company_register_date" id="company_register_date_input">--> <!--type="text" name="company_register_date" id="company_register_date_input">-->
<div style="display: inline-block"> <input class="control-label col-sm-2" id="certificat_expire_date_input"
<input class="form-control" id="certificat_expire_date_input" ng-model="partner.certificat_expire_date_d"
ng-model="partner.certificat_expire_date" uib-datepicker-popup size="10"
uib-datepicker-popup size="10" ng-change="checkExpriedate(partner.certificat_expire_date_d)"
required name="certificat_expire_date"
name="certificat_expire_date" is-open="certificat_expire_date.open"
is-open="certificat_expire_date.open" ng-click="certificat_expire_date.open=true"
ng-click="certificat_expire_date.open=true" >&nbsp;
> <span class="checkbox-inline">
</div>
<div ng-messages="partnerForm.certificat_expire_date.$error" ng-if="partnerForm.certificat_expire_date.$dirty"> <input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="partner.certificat_expire_date_premanent"> <p>PERMANENT</p>
<p class="small text-danger" ng-message="required">Required Field</p> </span>
</div> <span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="partner.certificat_expire_date_NA"><p>N/A</p>
</span>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group"

29
src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
Unescape View File

@ -233,25 +233,26 @@
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.business_structure == 'Company'" <div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}"> ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label> <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">
<!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"--> <!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"-->
<!--type="text" name="company_register_date" id="company_register_date_input">--> <!--type="text" name="company_register_date" id="company_register_date_input">-->
<div style="display: inline-block"> <input class="control-label col-sm-2" id="certificat_expire_date_input"
<input class="form-control" id="certificat_expire_date_input" ng-model="partner.certificat_expire_date_d"
ng-model="partner.certificat_expire_date" uib-datepicker-popup size="10"
uib-datepicker-popup size="10" ng-change="checkExpriedate(partner.certificat_expire_date_d)"
required name="certificat_expire_date"
name="certificat_expire_date" is-open="certificat_expire_date.open"
is-open="certificat_expire_date.open" ng-click="certificat_expire_date.open=true"
ng-click="certificat_expire_date.open=true" >&nbsp;
> <span class="checkbox-inline">
</div> <input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="partner.certificat_expire_date_premanent"> <p>PERMANENT</p>
<div ng-messages="partnerForm.certificat_expire_date.$error" ng-if="partnerForm.certificat_expire_date.$dirty"> </span>
<p class="small text-danger" ng-message="required">Required Field</p> <span class="checkbox-inline">
</div> <input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="partner.certificat_expire_date_NA"><p>N/A</p>
</span>
</div> </div>
</div> </div>

21
src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
Unescape View File

@ -228,18 +228,25 @@
ng-class="{'has-error':subForm.certificat_expire_date.$invalid && subForm.certificat_expire_date.$dirty}"> ng-class="{'has-error':subForm.certificat_expire_date.$invalid && subForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-3" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label> <label class="control-label col-sm-3" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" id="certificat_expire_date_input" <input class="control-label col-sm-4" id="certificat_expire_date_input"
ng-model="subMerchantInfo.certificat_expire_date" ng-model="subMerchantInfo.certificat_expire_date_d"
uib-datepicker-popup size="10" uib-datepicker-popup size="10"
required ng-change="checkExpriedate(subMerchantInfo.certificat_expire_date_d)"
name="certificat_expire_date" name="certificat_expire_date"
is-open="certificat_expire_date.open" is-open="certificat_expire_date.open"
ng-click="certificat_expire_date.open=true" ng-click="certificat_expire_date.open=true"
> >
<div ng-messages="subForm.certificat_expire_date.$error" ng-if="subForm.certificat_expire_date.$dirty"> &nbsp;
<p class="small text-danger" ng-message="required">Required Field</p> <span class="checkbox-inline">
<p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
</div> <input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="subMerchantInfo.certificat_expire_date_premanent"> <p>PERMANENT</p>
</span>
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="subMerchantInfo.certificat_expire_date_NA"><p>N/A</p>
</span>
</div> </div>
</div> </div>

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

@ -330,25 +330,29 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.business_structure == 'Company'" <div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}"> ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label> <label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8"> <div class="col-sm-8">
<!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"--> <!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"-->
<!--type="text" name="company_register_date" id="company_register_date_input">--> <!--type="text" name="company_register_date" id="company_register_date_input">-->
<div style="display: inline-block"> <input class="control-label col-sm-2" id="certificat_expire_date_input"
<input class="form-control" id="certificat_expire_date_input" ng-model="partner.certificat_expire_date_d"
ng-model="partner.certificat_expire_date" uib-datepicker-popup size="10"
uib-datepicker-popup size="10" ng-change="checkExpriedate(partner.certificat_expire_date_d)"
required name="certificat_expire_date"
name="certificat_expire_date" is-open="certificat_expire_date.open"
is-open="certificat_expire_date.open" ng-click="certificat_expire_date.open=true"
ng-click="certificat_expire_date.open=true" >&nbsp;
> <span class="checkbox-inline">
</div>
<div ng-messages="partnerForm.certificat_expire_date.$error" ng-if="partnerForm.certificat_expire_date.$dirty"> <input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="partner.certificat_expire_date_premanent"> <p>PERMANENT</p>
<p class="small text-danger" ng-message="required">Required Field</p>
</div> </span>
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="partner.certificat_expire_date_NA"><p>N/A</p>
</span>
</div> </div>
</div> </div>
<!--<div hidden class="form-group" ng-if="!partner.parent_client_id || ('00010'|withRole)">--> <!--<div hidden class="form-group" ng-if="!partner.parent_client_id || ('00010'|withRole)">-->

3
src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
Unescape View File

@ -67,7 +67,8 @@
</li> </li>
<li class="list-group-item list-group-item-success"> <li class="list-group-item list-group-item-success">
Mcc Code Mcc Code
<span style="float: right;">{{id_apply.mcc_code | wechatMcc }}</span> <span class="col-sm-10" style="float: right;margin-left:10px;overflow:hidden;text-overflow:ellipsis;" ><span style="float: right;margin-left:10px;margin-right:-10px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{id_apply.mcc_code | wechatMcc }}</span>
</span>
</li> </li>
<li class="list-group-item list-group-item-success"> <li class="list-group-item list-group-item-success">
Operator Operator

Write Preview
Loading…
Cancel
Save