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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
master
yixian 4 years ago
parent 38ee861d03 3062338db3
commit 8a7ff2322a
8 changed files with 880 additions and 427 deletions
Show Stats Download Patch File Download Diff File

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

@ -100,10 +100,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.sameAddress = function (){ $scope.sameAddress = function (){
$scope.partner.sameAsAddress = !($scope.partner.sameAsAddress); $scope.partner.sameAsAddress = !($scope.partner.sameAsAddress);
if($scope.partner.sameAsAddress) { if($scope.partner.sameAsAddress) {
$scope.partner.registered_address = $scope.partner.address; // $scope.partner.registered_address = $scope.partner.address;
$scope.partner.registered_suburb = $scope.partner.suburb; // $scope.partner.registered_suburb = $scope.partner.suburb;
$scope.partner.registered_postcode = $scope.partner.postcode; // $scope.partner.registered_postcode = $scope.partner.postcode;
$scope.partner.registered_state = $scope.partner.state; // $scope.partner.registered_state = $scope.partner.state;
$scope.partner.address = $scope.partner.registered_address;
$scope.partner.suburb = $scope.partner.registered_suburb;
$scope.partner.postcode = $scope.partner.registered_postcode;
$scope.partner.state = $scope.partner.registered_state;
} }
} }

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

@ -211,8 +211,451 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
url: '/incremental_service', url: '/incremental_service',
templateUrl: 'static/payment/partner/templates/incremental_service.html', templateUrl: 'static/payment/partner/templates/incremental_service.html',
controller: 'incrementalServiceCtrl' controller: 'incrementalServiceCtrl'
}); })/*.state('partners.edit', {
url: '/{clientMoniker}/edit',
params: {"commitCardPayment": false, "commitCrossBorderPayment": false},
templateUrl: 'static/payment/partner/templates/partner_edit.html',
controller: 'partnerEditCtrl',
resolve: {
partner: ['$http', '$stateParams', function ($http, $stateParams) {
return $http.get('/sys/partners/' + $stateParams.clientMoniker);
}]
}
})*/;
}]); }]);
app.controller('partnerEditCtrl', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner', 'upayIndustryMap',
function ($scope, $http, $state, Upload, commonDialog, timezone, partner, upayIndustryMap) {
$scope.upayIndustrys = upayIndustryMap.configs();
$scope.timezones = timezone.configs();
$scope.partner = partner.data;
if (!$scope.partner.client_type) {
$scope.partner.client_type = 'cross-border';
}
if ($scope.partner.representativeInfo != null) {
$scope.partner.registered_address = $scope.partner.representativeInfo.address;
$scope.partner.registered_suburb = $scope.partner.representativeInfo.suburb;
$scope.partner.registered_postcode = $scope.partner.representativeInfo.postcode;
$scope.partner.registered_state = $scope.partner.representativeInfo.state;
$scope.partner.legal_representative_person = $scope.partner.representativeInfo.representative_person;
$scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone;
$scope.partner.legal_representative_email = $scope.partner.representativeInfo.email;
$scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title;
$scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person;
$scope.partner.marketing_phone = $scope.partner.representativeInfo.marketing_phone;
$scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email;
$scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title;
$scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.legal_representative_wechatid;
$scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid;
}
$scope.enablePaymentType = function (type) {
$scope.partner[type] = !$scope.partner[type];
};
if ($state.params.commitCardPayment) {
$scope.enablePaymentType('enable_card_payment');
}
if ($state.params.commitCrossBorderPayment) {
$scope.enablePaymentType('enable_cross_payment');
}
function hasRole() {
var rolenum;
switch (sessionStorage.getItem('role')) {
case "administrator":
rolenum = 1;
break;
case "bduser":
rolenum = 4;
break;
case "salesmanager":
rolenum = 8192;
break;
case "accountant":
rolenum = 8;
break;
case "sitemanager":
rolenum = 128;
break;
case "director":
rolenum = 64;
break;
case "developer":
rolenum = 256;
break;
case "compliance":
rolenum = 2;
break;
case "guest":
rolenum = 2048;
break;
case "orgmanager":
rolenum = 4096;
break;
case "riskmanager":
rolenum = 1024;
break;
default:
break;
}
if ((window.currentUser.role & rolenum) > 0) {
return true;
} else {
sessionStorage.removeItem('role');
return false;
}
}
if (hasRole()) {
$scope.role = sessionStorage.getItem('role');
}
var origin_referrer_id = angular.copy($scope.partner.referrer_id);
var resetClientPayDescByTpey = function (type) {
type = parseInt(type);
if (type == 1) {
removeClientPayDesc($scope.partner.client_pay_desc, '10');
}
if (type == 2) {
removeClientPayDesc($scope.partner.client_pay_desc, '20');
}
};
var compare = function (x, y) {
x = parseInt(x);
y = parseInt(y);
if (x < y) {
return -1;
} else if (x > y) {
return 1;
} else {
return 0;
}
}
$scope.toggleClientPayType = function (type) {
if (!$scope.partner.client_pay_type) {
$scope.partner.client_pay_type = [];
}
var $idx = $scope.partner.client_pay_type.indexOf(type);
if ($idx >= 0) {
$scope.partner.client_pay_type.splice($idx, 1);
resetClientPayDescByTpey(type);
} else {
$scope.partner.client_pay_type.push(type);
$scope.partner.client_pay_type.sort(compare);
}
};
$scope.toggleClientPayDesc = function (type) {
if (!$scope.partner.client_pay_desc) {
$scope.partner.client_pay_desc = [];
}
var $idx = $scope.partner.client_pay_desc.indexOf(type);
if ($idx >= 0) {
if (type == '203') {
removeClientPayDesc($scope.partner.client_pay_desc, '2030')
}
$scope.partner.client_pay_desc.splice($idx, 1);
} else {
$scope.partner.client_pay_desc.push(type);
$scope.partner.client_pay_desc.sort(compare);
}
};
$scope.partner.sameAsContactPerson = false;
$scope.checkboxOnclick = function () {
$scope.partner.sameAsContactPerson = !($scope.partner.sameAsContactPerson);
if ($scope.partner.sameAsContactPerson) {
$scope.partner.legal_representative_person = $scope.partner.contact_person;
$scope.partner.legal_representative_phone = $scope.partner.contact_phone;
$scope.partner.legal_representative_email = $scope.partner.contact_email;
$scope.partner.legal_representative_job = $scope.partner.contact_job;
$scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid;
}
}
$scope.partner.marketingSameAsContact = false;
$scope.checkMarketingSameAsContact = function () {
$scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact);
if ($scope.partner.marketingSameAsContact) {
$scope.partner.marketing_person = $scope.partner.contact_person;
$scope.partner.marketing_phone = $scope.partner.contact_phone;
$scope.partner.marketing_email = $scope.partner.contact_email;
$scope.partner.marketing_job = $scope.partner.contact_job;
$scope.partner.marketing_wechatid = $scope.partner.contact_wechatid;
}
}
$scope.partner.sameAsAddress = false;
$scope.sameAddress = function () {
$scope.partner.sameAsAddress = !($scope.partner.sameAsAddress);
if ($scope.partner.sameAsAddress) {
// $scope.partner.registered_address = $scope.partner.address;
// $scope.partner.registered_suburb = $scope.partner.suburb;
// $scope.partner.registered_postcode = $scope.partner.postcode;
// $scope.partner.registered_state = $scope.partner.state;
$scope.partner.address = $scope.partner.registered_address;
$scope.partner.suburb = $scope.partner.registered_suburb;
$scope.partner.postcode = $scope.partner.registered_postcode;
$scope.partner.state = $scope.partner.registered_state;
}
}
$scope.listReferrers = function () {
$http.get('/sys/orgs/referrer').then(function (resp) {
$scope.referrers = resp.data;
})
};
$scope.listReferrers();
$scope.loadAlipayCategory = function () {
$http.get('/static/data/alipayMcc.json').then(function (resp) {
$scope.alipayMccCategory = resp.data;
})
};
$scope.loadAlipayCategory();
$scope.loadJDindustry = function () {
$http.get('/static/data/jdindustry.json').then(function (resp) {
$scope.jdindustry = resp.data;
})
};
$scope.loadJDindustry();
$scope.loadLakalaPayindustry = function () {
$http.get('/static/data/lakalapayindustry.json').then(function (resp) {
$scope.lakalapayindustry = resp.data;
})
};
$scope.loadLakalaPayindustry();
$scope.loadLakalaPaySettle = function () {
$http.get('/static/data/lakalapaysettle.json').then(function (resp) {
$scope.lakalapaysettle = resp.data;
})
};
$scope.loadLakalaPaySettle();
$scope.loadLakalaPayGoods = function () {
$http.get('/static/data/lakalapaygoods.json').then(function (resp) {
$scope.lakalapaygoods = resp.data;
})
};
$scope.loadLakalaPayGoods();
$scope.loadRoyalpayindustry = function () {
$http.get('/static/data/royalpayindustry.json').then(function (resp) {
$scope.royalpayindustry = resp.data;
})
};
$scope.loadRoyalpayindustry();
$scope.loadHfindustry = function () {
$http.get('/static/data/hfindustry.json').then(function (resp) {
$scope.hfindustry = resp.data;
})
};
$scope.loadHfindustry();
$scope.onAlipayMccSelect = function (selectedItem) {
$scope.partner.alipay_category = selectedItem.label;
$scope.partner.alipayindustry = selectedItem.mccCode;
};
$scope.onRoyalPayIndustrySelect = function (selectedItem) {
$scope.partner.royalpay_label = selectedItem.label;
$scope.partner.royalpayindustry = selectedItem.mccCode;
};
$scope.onHfIndustrySelect = function (selectedItem) {
$scope.partner.hf_label = selectedItem.label;
$scope.partner.hfindustry = selectedItem.mccCode;
};
$scope.updatePartner = function (form) {
if (form.$invalid) {
angular.forEach(form, function (item, key) {
if (key.indexOf('$') < 0) {
item.$dirty = true;
}
});
return;
}
if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！");
return;
}
if ($scope.partner.company_phone.indexOf(' ') != -1) {
alert('Company Phone can not contain space character');
return;
}
if ($scope.partner.contact_email.indexOf(' ') != -1) {
alert('Contact email Phone can not contain space character');
return;
}
if ($scope.partner.suburb.indexOf(' ') != -1) {
alert('suburb can not contain two and more continuous space characters');
return;
}
if ($scope.partner.client_pay_type.indexOf('2') >= 0) {
if (!$scope.partner.company_photo) {
alert('Shop Photo1 is necessary');
return;
}
if (!$scope.partner.store_photo) {
alert('Shop Photo2 is necessary');
return;
}
}
if ($scope.partner.acn && $scope.partner.business_structure == 'Company') {
if ($scope.partner.acn.length != 9) {
alert('Acn is not valid');
}
}
if ($scope.partner.referrer_id) {
$scope.referrers.forEach(function (e) {
if ($scope.partner.referrer_id == e.org_id) {
$scope.partner.referrer_name = e.name;
return;
}
})
}
var content = '';
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!';
}
if ($scope.partner.client_pay_type.length == 0) {
alert('请选择商户支付场景')
return;
}
if ($scope.partner.client_pay_desc.length == 0) {
alert('请选择商户支付方式')
return;
}
if ($scope.partner.client_pay_type.indexOf('1') >= 0) {
if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) {
alert("请检查线上支付场景是否已选择支付方式");
return;
}
}
if ($scope.partner.client_pay_type.indexOf('2') >= 0) {
if ($scope.partner.client_pay_desc.join(',').indexOf('20') < 0) {
alert("请检查线下支付场景是否已选择支付方式");
return;
}
}
if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
alert("请检查线下支付是否已选择收银系统类型");
return;
}
}
$scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',');
$scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',');
$http.put('/sys/partners/' + $scope.partner.client_moniker, $scope.partner).then(function () {
if (content != '') {
commonDialog.alert({
title: 'Warning',
content: content,
type: 'error'
});
} else {
commonDialog.alert({
title: 'Success',
content: 'Update partner information successfully',
type: 'success'
});
}
$scope.updateMerchantLocation();
$scope.loadPartners();
$state.go('^.detail', {clientMoniker: $scope.partner.client_moniker}, {reload: true});
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
});
};
$scope.uploadLogo = function (file) {
if (file != null) {
if (file.size > 1 * 1024 * 1024) {
commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
} else {
$scope.logoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
delete $scope.logoProgress;
$scope.partner.logo_id = resp.data.fileid;
$scope.partner.logo_url = resp.data.url;
}, function (resp) {
delete $scope.logoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) {
$scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
}
};
$scope.uploadShopPhoto = function (file) {
if (file != null) {
if (file.size > 2 * 1024 * 1024) {
commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
} else {
$scope.shopPhotoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url;
}, function (resp) {
delete $scope.shopPhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) {
$scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
}
};
$scope.uploadStorePhoto = function (file) {
if (file != null) {
if (file.size > 2 * 1024 * 1024) {
commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
} else {
$scope.storePhotoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
delete $scope.storePhotoProgress;
$scope.partner.store_photo = resp.data.url;
}, function (resp) {
delete $scope.storePhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) {
$scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
}
};
$scope.getMerchantLocation = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) {
$scope.merchant_location = resp.data;
});
};
$scope.getMerchantLocation();
$scope.updateMerchantLocation = function () {
var params = window.frames['merchant_detail'].merchant_location;
if (params) {
$http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () {
});
}
}
}]);
app.controller('partnerListCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', app.controller('partnerListCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap',
function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) {

12
src/main/ui/static/payment/partner/partner.js
Unescape View File

@ -592,10 +592,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
$scope.sameAddress = function (){ $scope.sameAddress = function (){
$scope.partner.sameAsAddress=!($scope.partner.sameAsAddress); $scope.partner.sameAsAddress=!($scope.partner.sameAsAddress);
if($scope.partner.sameAsAddress) { if($scope.partner.sameAsAddress) {
$scope.partner.registered_address = $scope.partner.address; // $scope.partner.registered_address = $scope.partner.address;
$scope.partner.registered_suburb = $scope.partner.suburb; // $scope.partner.registered_suburb = $scope.partner.suburb;
$scope.partner.registered_postcode = $scope.partner.postcode; // $scope.partner.registered_postcode = $scope.partner.postcode;
$scope.partner.registered_state = $scope.partner.state; // $scope.partner.registered_state = $scope.partner.state;
$scope.partner.address = $scope.partner.registered_address;
$scope.partner.suburb = $scope.partner.registered_suburb;
$scope.partner.postcode = $scope.partner.registered_postcode;
$scope.partner.state = $scope.partner.registered_state;
} }
}; };

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

@ -993,19 +993,26 @@
</div> </div>
<!--end 商户联系资料--> <!--end 商户联系资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div> <div class="panel-heading">Registered Office Address(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group col-sm-6" <div class="form-group col-sm-6"
ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}"> ng-class="{'has-error':partnerForm.registered_address.$invalid && partnerForm.registered_address.$dirty}">
<label class="control-label col-sm-4" for="address-input">* <label class="control-label col-sm-4" for="registered_address-input">*
Address</label> Registered Office Address</label>
<div class="col-sm-8"> <div class="col-sm-8" >
<textarea class="form-control" ng-model="partner.address" <div ng-if="role !='compliance'">
name="address" <textarea class="form-control" ng-model="partner.registered_address"
id="address-input" maxlength="200" required></textarea> name="registered_address"
<div ng-messages="partnerForm.address.$error" id="registered_address-input" maxlength="200" required></textarea>
ng-if="partnerForm.address.$dirty"> </div>
<div ng-if="role =='compliance'">
<textarea class="form-control" ng-model="partner.registered_address"
name="registered_address"
id="registered_address-input" maxlength="200"></textarea>
</div>
<div ng-messages="partnerForm.registered_address.$error"
ng-if="partnerForm.registered_address.$dirty">
<p class="small text-danger" ng-message="maxlength">Less <p class="small text-danger" ng-message="maxlength">Less
Than 200 Than 200
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>
@ -1015,42 +1022,47 @@
</div> </div>
</div> </div>
<div class="form-group col-sm-6" <div class="form-group col-sm-6"
ng-class="{'has-error':partnerForm.suburb.$invalid && partnerForm.suburb.$dirty}"> ng-class="{'has-error':partnerForm.registered_suburb.$invalid && partnerForm.registered_suburb.$dirty}">
<label class="control-label col-sm-4" for="suburb-input">* <label class="control-label col-sm-4" for="registered_suburb-input">*
Suburb</label> Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.suburb" <div ng-if="role !='compliance'">
name="suburb" <input class="form-control" ng-model="partner.registered_suburb"
id="suburb-input" maxlength="50" required> name="registered_suburb"
<div ng-messages="partnerForm.suburb.$error" id="registered_suburb-input" maxlength="50" required>
ng-if="partnerForm.suburb.$dirty"> </div>
<div ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.registered_suburb"
name="registered_suburb"
id="registered_suburb-input" maxlength="50">
</div>
<div ng-messages="partnerForm.registered_suburb.$error"
ng-if="partnerForm.registered_suburb.$dirty">
<p class="small text-danger" ng-message="maxlength">Less <p class="small text-danger" ng-message="maxlength">Less
Than 50 Than 50
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
Field</p> Field</p>
</div> </div>
<!--</div>-->
<!--<select class="form-control" name="suburb" required ng-model="partner.suburb"-->
<!--id="suburb-input"-->
<!--ng-options="t2c.key as t2c.value for t2c in t2city_map">-->
<!--<option value="">Please Choose</option>-->
<!--</select>-->
<!--<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">-->
<!--<p class="small text-danger" ng-message="required">Required Field</p>-->
<!--</div>-->
</div> </div>
</div> </div>
<div class="form-group col-sm-6" <div class="form-group col-sm-6"
ng-class="{'has-error':partnerForm.postcode.$invalid && partnerForm.postcode.$dirty}"> ng-class="{'has-error':partnerForm.registered_postcode.$invalid && partnerForm.registered_postcode.$dirty}">
<label class="control-label col-sm-4" for="postcode-input">* <label class="control-label col-sm-4" for="registered_postcode-input">*
PostCode</label> PostCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.postcode" <div ng-if="role !='compliance'">
name="postcode" <input class="form-control" ng-model="partner.registered_postcode"
id="postcode-input" maxlength="10" required> name="registered_postcode"
<div ng-messages="partnerForm.postcode.$error" id="registered_postcode-input" maxlength="10" required>
ng-if="partnerForm.postcode.$dirty"> </div>
<div ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.registered_postcode"
name="registered_postcode"
id="registered_postcode-input" maxlength="10" >
</div>
<div ng-messages="partnerForm.registered_postcode.$error"
ng-if="partnerForm.registered_postcode.$dirty">
<p class="small text-danger" ng-message="maxlength">Less <p class="small text-danger" ng-message="maxlength">Less
Than 10 Than 10
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>
@ -1060,161 +1072,104 @@
</div> </div>
</div> </div>
<div class="form-group col-sm-6" <div class="form-group col-sm-6"
ng-class="{'has-error':partnerForm.state.$invalid && partnerForm.state.$dirty}"> ng-class="{'has-error':partnerForm.registered_state.$invalid && partnerForm.registered_state.$dirty}">
<label class="control-label col-sm-4" for="state-input">* <label class="control-label col-sm-4" for="registered_state-input">*
State</label> State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<!--<input class="form-control" ng-model="partner.state" name="state" id="state-input"--> <div ng-if="role !='compliance'">
<!--maxlength="20">--> <select class="form-control" name="registered_state" required
<!--<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">--> ng-model="partner.registered_state"
<!--<p class="small text-danger" ng-message="maxlength">Less Than 20--> id="registered_state-input"
<!--Characters(including symbols and spaces)</p>--> ng-options="state.value as state.label for state in states">
<!--</div>--> <option value="">Please Choose</option>
<select class="form-control" name="state" required </select>
ng-model="partner.state"
id="state-input"
ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.state.$error"
ng-if="partnerForm.state.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
</div> </div>
</div> <div ng-if="role =='compliance'">
</div> <select class="form-control" name="registered_state"
<div class="form-group col-sm-6" ng-model="partner.registered_state"
ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}"> id="registered_state-input"
<label class="control-label col-sm-4" for="country-input">* ng-options="state.value as state.label for state in states">
Country</label> <option value="">Please Choose</option>
<div class="col-sm-8"> </select>
<input class="form-control" </div>
ng-init="partner.country=partner.country||'AUS'" <div ng-messages="partnerForm.registered_state.$error"
ng-model="partner.country" name="country" ng-if="partnerForm.registered_state.$dirty">
id="country-input" maxlength="20" required
placeholder="AUS" readonly="readonly">
<div ng-messages="partnerForm.country.$error"
ng-if="partnerForm.country.$dirty">
<p class="small text-danger" ng-message="maxlength">Less
Than 20
Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
Field</p> Field</p>
</div> </div>
<!--选择框-->
<!--<select class="form-control" name="country" required ng-model="partner.country"-->
<!--id="country-input"-->
<!--ng-options="country.value as country.label for country in countries">-->
<!--<option value="">Please Choose</option>-->
<!--</select>-->
<!--<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">-->
<!--<p class="small text-danger" ng-message="required">Required Field</p>-->
<!--</div>-->
</div> </div>
</div> </div>
<div>
<label><input type="checkbox" ng-click="sameAddress()"> Registered Office Address Same As Trading Address</label>
</div>
</div> </div>
</div> </div>
<div style="padding-left: 20px">
<label><input type="checkbox" ng-click="sameAddress()">Trading Office Address is same as Registered Office Address</label>
</div>
<hr/> <hr/>
<div>&nbsp;&nbsp;Registered Office Address</div> <div>&nbsp;&nbsp;Trading Office Address</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group col-sm-6" <div class="form-group col-sm-6">
ng-class="{'has-error':partnerForm.registered_address.$invalid && partnerForm.registered_address.$dirty}"> <label class="control-label col-sm-4" for="address-input">Address</label>
<label class="control-label col-sm-4" for="registered_address-input">*
Registered Office Address</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea class="form-control" ng-model="partner.registered_address" <textarea class="form-control" ng-model="partner.address" name="address"
name="registered_address" id="address-input" maxlength="200"></textarea>
id="registered_address-input" maxlength="200" required></textarea> <div ng-messages="partnerForm.address.$error" ng-if="partnerForm.address.$dirty">
<div ng-messages="partnerForm.registered_address.$error" <p class="small text-danger" ng-message="maxlength">Less Than 200
ng-if="partnerForm.registered_address.$dirty">
<p class="small text-danger" ng-message="maxlength">Less
Than 200
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required
Field</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-sm-6" <div class="form-group col-sm-6">
ng-class="{'has-error':partnerForm.registered_suburb.$invalid && partnerForm.registered_suburb.$dirty}"> <label class="control-label col-sm-4" for="suburb-input">* Suburb</label>
<label class="control-label col-sm-4" for="registered_suburb-input">*
Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.registered_suburb" <input class="form-control" ng-model="partner.suburb" name="suburb"
name="registered_suburb" id="suburb-input" maxlength="50">
id="registered_suburb-input" maxlength="50" required> <div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">
<div ng-messages="partnerForm.registered_suburb.$error" <p class="small text-danger" ng-message="maxlength">Less Than 50
ng-if="partnerForm.registered_suburb.$dirty">
<p class="small text-danger" ng-message="maxlength">Less
Than 50
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required
Field</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-sm-6" <div class="form-group col-sm-6">
ng-class="{'has-error':partnerForm.registered_postcode.$invalid && partnerForm.registered_postcode.$dirty}"> <label class="control-label col-sm-4" for="postcode-input">PostCode</label>
<label class="control-label col-sm-4" for="registered_postcode-input">*
PostCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.registered_postcode" <input class="form-control" ng-model="partner.postcode" name="postcode"
name="registered_postcode" id="postcode-input" maxlength="10">
id="registered_postcode-input" maxlength="10" required> <div ng-messages="partnerForm.postcode.$error" ng-if="partnerForm.postcode.$dirty">
<div ng-messages="partnerForm.registered_postcode.$error" <p class="small text-danger" ng-message="maxlength">Less Than 10
ng-if="partnerForm.registered_postcode.$dirty">
<p class="small text-danger" ng-message="maxlength">Less
Than 10
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required
Field</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-sm-6" <div class="form-group col-sm-6">
ng-class="{'has-error':partnerForm.registered_state.$invalid && partnerForm.registered_state.$dirty}"> <label class="control-label col-sm-4" for="state-input">State</label>
<label class="control-label col-sm-4" for="registered_state-input">*
State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="registered_state" required <select class="form-control" name="state" required ng-model="partner.state"
ng-model="partner.registered_state" id="state-input"
id="registered_state-input"
ng-options="state.value as state.label for state in states"> ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option> <option value="">Please Choose</option>
</select> </select>
<div ng-messages="partnerForm.registered_state.$error" <div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">
ng-if="partnerForm.registered_state.$dirty"> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="required">Required
Field</p>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="form-group col-sm-6" ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
</div> <label class="control-label col-sm-4" for="country-input">* Country</label>
<div class="col-sm-8">
<hr/> <input class="form-control" ng-init="partner.country=partner.country||'AUS'" ng-model="partner.country" name="country"
<div class="panel-body"> id="country-input" maxlength="20" required placeholder="AUS" readonly="readonly">
<div class="form-horizontal"> <div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">
<div class="form-group"> <p class="small text-danger" ng-message="maxlength">Less Than 20
<label class="control-label col-sm-2" Characters(including symbols and spaces)</p>
for="tz-select">TimeZone</label> <p class="small text-danger" ng-message="required">Required Field</p>
<div class="col-sm-9"> </div>
<select class="form-control" name="timezone"
ng-model="partner.timezone"
id="tz-select"
ng-options="tz.key as tz.detail for tz in timezones">
</select>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" style="font-size: larger">Location <div class="panel-heading" style="font-size: larger">Location

84
src/main/ui/static/payment/partner/templates/client_partner_detail.html
Unescape View File

@ -506,86 +506,98 @@
</div> </div>
<!--end 商户联系资料--> <!--end 商户联系资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div> <div class="panel-heading">Registered Office Address</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6"> <div ng-if="partner.representativeInfo">
<label class="control-label col-sm-4">Address</label> <!-- <hr/>-->
<!-- <div class="panel-heading">Registered Address Information(<span style="color: red">Registered address on your business license.</span>)</div>-->
<div class="panel-body">
<div class="form-horizontal">
<div class="col-sm-8"> <div class="form-group col-sm-6">
<p class="form-control-static" ng-bind="partner.address"></p> <label class="control-label col-sm-4">Registered Address</label>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.suburb"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.address"></p>
</div>
</div> </div>
</div> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label class="control-label col-sm-4">Suburb</label>
<label class="control-label col-sm-4">PostCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.postcode"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.suburb"></p>
</div>
</div> </div>
</div> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label class="control-label col-sm-4">PostCode</label>
<label class="control-label col-sm-4">State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.state"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.postcode"></p>
</div>
</div> </div>
</div> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label class="control-label col-sm-4">State</label>
<label class="control-label col-sm-4">Country</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.country"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.state"></p>
</div>
</div> </div>
</div> </div>
</div> </div>
<hr/>
</div> </div>
<div ng-if="partner.representativeInfo"><hr/> <div>
<div class="panel-heading">Registered Address Information</div> <div class="panel-heading">Trading Office Address</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">Registered Address</label> <label class="control-label col-sm-4">Address</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.address"></p> <p class="form-control-static" ng-bind="partner.address"></p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_address"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label> <label class="control-label col-sm-4">Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.suburb"></p> <p class="form-control-static" ng-bind="partner.suburb"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">PostCode</label> <label class="control-label col-sm-4">PostCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.postcode"></p> <p class="form-control-static" ng-bind="partner.postcode"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">State</label> <label class="control-label col-sm-4">State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.state"></p> <p class="form-control-static" ng-bind="partner.state"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Country</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.country"></p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr/>
</div> </div>
</div> </div>
//end
<span id="merchant_location" hidden>{{merchant_location}}</span> <span id="merchant_location" hidden>{{merchant_location}}</span>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" style="font-size: larger">Location <div class="panel-heading" style="font-size: larger">Location

197
src/main/ui/static/payment/partner/templates/client_partner_edit.html
Unescape View File

@ -618,85 +618,24 @@
<!--end 商户联系资料--> <!--end 商户联系资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div> <div class="panel-heading">Registered Office Address(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="address-input">Address</label>
<div class="col-sm-8">
<textarea class="form-control" ng-model="partner.address" name="address"
id="address-input" maxlength="200"></textarea>
<div ng-messages="partnerForm.address.$error" ng-if="partnerForm.address.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 200
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="suburb-input">* Suburb</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.suburb" name="suburb"
id="suburb-input" maxlength="50">
<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="postcode-input">PostCode</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.postcode" name="postcode"
id="postcode-input" maxlength="10">
<div ng-messages="partnerForm.postcode.$error" ng-if="partnerForm.postcode.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 10
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="state-input">State</label>
<div class="col-sm-8">
<select class="form-control" name="state" required ng-model="partner.state"
id="state-input"
ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
</div>
</div>
<div class="form-group col-sm-6" ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
<label class="control-label col-sm-4" for="country-input">* Country</label>
<div class="col-sm-8">
<input class="form-control" ng-init="partner.country=partner.country||'AUS'" ng-model="partner.country" name="country"
id="country-input" maxlength="20" required placeholder="AUS" readonly="readonly">
<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 20
Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
</div>
</div>
<div>
<label><input type="checkbox" ng-click="sameAddress()"> Registered Office Address Same As Trading Address</label>
</div>
</div>
</div>
<hr/>
<div>&nbsp;&nbsp;Registered Office Address</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group col-sm-6" <div class="form-group col-sm-6"
ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}"> ng-class="{'has-error':partnerForm.registered_address.$invalid && partnerForm.registered_address.$dirty}">
<label class="control-label col-sm-4" for="registered_address-input">* <label class="control-label col-sm-4" for="registered_address-input">*
Registered Office Address</label> Registered Office Address</label>
<div class="col-sm-8"> <div class="col-sm-8" >
<div ng-if="role !='compliance'">
<textarea class="form-control" ng-model="partner.registered_address" <textarea class="form-control" ng-model="partner.registered_address"
name="registered_address" name="registered_address"
id="registered_address-input" maxlength="200" required></textarea> id="registered_address-input" maxlength="200" required></textarea>
</div>
<div ng-if="role =='compliance'">
<textarea class="form-control" ng-model="partner.registered_address"
name="registered_address"
id="registered_address-input" maxlength="200"></textarea>
</div>
<div ng-messages="partnerForm.registered_address.$error" <div ng-messages="partnerForm.registered_address.$error"
ng-if="partnerForm.registered_address.$dirty"> ng-if="partnerForm.registered_address.$dirty">
<p class="small text-danger" ng-message="maxlength">Less <p class="small text-danger" ng-message="maxlength">Less
@ -712,9 +651,16 @@
<label class="control-label col-sm-4" for="registered_suburb-input">* <label class="control-label col-sm-4" for="registered_suburb-input">*
Suburb</label> Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.registered_suburb" <div ng-if="role !='compliance'">
name="registered_suburb" <input class="form-control" ng-model="partner.registered_suburb"
id="registered_suburb-input" maxlength="50" required> name="registered_suburb"
id="registered_suburb-input" maxlength="50" required>
</div>
<div ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.registered_suburb"
name="registered_suburb"
id="registered_suburb-input" maxlength="50">
</div>
<div ng-messages="partnerForm.registered_suburb.$error" <div ng-messages="partnerForm.registered_suburb.$error"
ng-if="partnerForm.registered_suburb.$dirty"> ng-if="partnerForm.registered_suburb.$dirty">
<p class="small text-danger" ng-message="maxlength">Less <p class="small text-danger" ng-message="maxlength">Less
@ -730,9 +676,16 @@
<label class="control-label col-sm-4" for="registered_postcode-input">* <label class="control-label col-sm-4" for="registered_postcode-input">*
PostCode</label> PostCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.registered_postcode" <div ng-if="role !='compliance'">
name="registered_postcode" <input class="form-control" ng-model="partner.registered_postcode"
id="registered_postcode-input" maxlength="10" required> name="registered_postcode"
id="registered_postcode-input" maxlength="10" required>
</div>
<div ng-if="role =='compliance'">
<input class="form-control" ng-model="partner.registered_postcode"
name="registered_postcode"
id="registered_postcode-input" maxlength="10" >
</div>
<div ng-messages="partnerForm.registered_postcode.$error" <div ng-messages="partnerForm.registered_postcode.$error"
ng-if="partnerForm.registered_postcode.$dirty"> ng-if="partnerForm.registered_postcode.$dirty">
<p class="small text-danger" ng-message="maxlength">Less <p class="small text-danger" ng-message="maxlength">Less
@ -748,12 +701,23 @@
<label class="control-label col-sm-4" for="registered_state-input">* <label class="control-label col-sm-4" for="registered_state-input">*
State</label> State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="registered_state" required <div ng-if="role !='compliance'">
ng-model="partner.registered_state" <select class="form-control" name="registered_state" required
id="registered_state-input" ng-model="partner.registered_state"
ng-options="state.value as state.label for state in states"> id="registered_state-input"
<option value="">Please Choose</option> ng-options="state.value as state.label for state in states">
</select> <option value="">Please Choose</option>
</select>
</div>
<div ng-if="role =='compliance'">
<select class="form-control" name="registered_state"
ng-model="partner.registered_state"
id="registered_state-input"
ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option>
</select>
</div>
<div ng-messages="partnerForm.registered_state.$error" <div ng-messages="partnerForm.registered_state.$error"
ng-if="partnerForm.registered_state.$dirty"> ng-if="partnerForm.registered_state.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -764,6 +728,73 @@
</div> </div>
</div> </div>
</div> </div>
<div style="padding-left: 20px">
<label><input type="checkbox" ng-click="sameAddress()">Trading Office Address is same as Registered Office Address</label>
</div>
<hr/>
<div>&nbsp;&nbsp;Trading Office Address</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="address-input">Address</label>
<div class="col-sm-8">
<textarea class="form-control" ng-model="partner.address" name="address"
id="address-input" maxlength="200"></textarea>
<div ng-messages="partnerForm.address.$error" ng-if="partnerForm.address.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 200
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="suburb-input">* Suburb</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.suburb" name="suburb"
id="suburb-input" maxlength="50">
<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="postcode-input">PostCode</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.postcode" name="postcode"
id="postcode-input" maxlength="10">
<div ng-messages="partnerForm.postcode.$error" ng-if="partnerForm.postcode.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 10
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="state-input">State</label>
<div class="col-sm-8">
<select class="form-control" name="state" required ng-model="partner.state"
id="state-input"
ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
</div>
</div>
<div class="form-group col-sm-6" ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
<label class="control-label col-sm-4" for="country-input">* Country</label>
<div class="col-sm-8">
<input class="form-control" ng-init="partner.country=partner.country||'AUS'" ng-model="partner.country" name="country"
id="country-input" maxlength="20" required placeholder="AUS" readonly="readonly">
<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 20
Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="btn-group margin-bottom margin-top"> <div class="btn-group margin-bottom margin-top">

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

@ -1082,99 +1082,103 @@
</div> </div>
<!--end 商户联系资料--> <!--end 商户联系资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div> <div class="panel-heading">Registered Office Address</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6"> <div ng-if="partner.representativeInfo">
<label class="control-label col-sm-4">Address</label> <!-- <hr/>-->
<!-- <div class="panel-heading">Registered Address Information(<span style="color: red">Registered address on your business license.</span>)</div>-->
<div class="panel-body">
<div class="form-horizontal">
<div class="col-sm-8"> <div class="form-group col-sm-6">
<p class="form-control-static" ng-bind="partner.address"></p> <label class="control-label col-sm-4">Registered Address</label>
<p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_address"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.suburb"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.address"></p>
</div>
</div> </div>
</div> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label class="control-label col-sm-4">Suburb</label>
<label class="control-label col-sm-4">PostCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.postcode"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.suburb"></p>
</div>
</div> </div>
</div> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label class="control-label col-sm-4">PostCode</label>
<label class="control-label col-sm-4">State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.state"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.postcode"></p>
</div>
</div> </div>
</div> <div class="form-group col-sm-6">
<div class="form-group col-sm-6"> <label class="control-label col-sm-4">State</label>
<label class="control-label col-sm-4">Country</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.country"></p> <p class="form-control-static"
ng-bind="partner.representativeInfo.state"></p>
</div>
</div> </div>
</div> </div>
</div> </div>
<hr/>
</div> </div>
<div ng-if="partner.representativeInfo"> <div>
<hr/> <div class="panel-heading">Trading Office Address</div>
<div class="panel-heading">Registered Address Information</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">Registered Address</label> <label class="control-label col-sm-4">Address</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.address"></p>
ng-bind="partner.representativeInfo.address"></p> <p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_address"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label> <label class="control-label col-sm-4">Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.suburb"></p>
ng-bind="partner.representativeInfo.suburb"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">PostCode</label> <label class="control-label col-sm-4">PostCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.postcode"></p>
ng-bind="partner.representativeInfo.postcode"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">State</label> <label class="control-label col-sm-4">State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.state"></p>
ng-bind="partner.representativeInfo.state"></p> </div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Country</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.country"></p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr/>
</div> <div class="panel-body">
<div class="form-horizontal">
<div class="panel-body"> <div class="form-group ">
<div class="form-horizontal"> <label class="control-label col-sm-2">Timezone</label>
<div class="form-group "> <div class="col-sm-10">
<label class="control-label col-sm-2">Timezone</label> <p class="form-control-static" ng-bind="partner.timezone|timezoneLabel"></p>
<div class="col-sm-10"> </div>
<p class="form-control-static" ng-bind="partner.timezone|timezoneLabel"></p>
</div> </div>
</div> </div>
</div> </div>

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

@ -901,107 +901,7 @@
<!--end 商户联系资料--> <!--end 商户联系资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div> <div class="panel-heading">Registered Office Address(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="address-input">Address</label>
<div class="col-sm-8">
<textarea class="form-control" ng-model="partner.address" name="address"
id="address-input" maxlength="200"></textarea>
<div ng-messages="partnerForm.address.$error" ng-if="partnerForm.address.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 200
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="suburb-input">* Suburb</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.suburb" name="suburb"
id="suburb-input" maxlength="50">
<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="postcode-input">PostCode</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.postcode" name="postcode"
id="postcode-input" maxlength="10">
<div ng-messages="partnerForm.postcode.$error" ng-if="partnerForm.postcode.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 10
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="state-input">State</label>
<div class="col-sm-8">
<!--<input class="form-control" ng-model="partner.state" name="state" id="state-input" maxlength="20">-->
<!--<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">-->
<!--<p class="small text-danger" ng-message="maxlength">Less Than 20 Characters(including symbols and spaces)</p>-->
<!--</div>-->
<!--</div>-->
<select class="form-control" name="state" required ng-model="partner.state"
id="state-input"
ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
</div>
</div>
<div class="form-group col-sm-6" ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
<label class="control-label col-sm-4" for="country-input">* Country</label>
<div class="col-sm-8">
<input class="form-control" ng-init="partner.country=partner.country||'AUS'" ng-model="partner.country" name="country"
id="country-input" maxlength="20" required placeholder="AUS" readonly="readonly">
<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 20
Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
<!--选择框-->
<!--<select class="form-control" name="country" required ng-model="partner.country"-->
<!--id="country-input"-->
<!--ng-options="country.value as country.label for country in countries">-->
<!--<option value="">Please Choose</option>-->
<!--</select>-->
<!--<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">-->
<!--<p class="small text-danger" ng-message="required">Required Field</p>-->
<!--</div>-->
</div>
</div>
<!--<div class="form-group col-sm-6">-->
<!--<label class="control-label col-sm-4" for="country-input">Country</label>-->
<!--<div class="col-sm-8">-->
<!--&lt;!&ndash;<input class="form-control" ng-model="partner.country" name="country"&ndash;&gt;-->
<!--&lt;!&ndash;id="country-input" maxlength="20">&ndash;&gt;-->
<!--&lt;!&ndash;<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">&ndash;&gt;-->
<!--&lt;!&ndash;<p class="small text-danger" ng-message="maxlength">Less Than 20 Characters(including symbols and spaces)</p>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--<select class="form-control" name="state" required ng-model="partner.country"-->
<!--id="country-input"-->
<!--ng-options="country.value as country.label for country in countries">-->
<!--<option value="">Please Choose</option>-->
<!--</select>-->
<!--<div ng-messages="partnerForm.country.$error"-->
<!--ng-if="partnerForm.country.$dirty">-->
<!--<p class="small text-danger" ng-message="required">Required Field</p>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div>
<label><input type="checkbox" ng-click="sameAddress()"> Registered Office Address Same As Trading Address</label>
</div>
</div>
</div>
<hr/>
<div>&nbsp;&nbsp;Registered Office Address</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group col-sm-6" <div class="form-group col-sm-6"
@ -1111,6 +1011,106 @@
</div> </div>
</div> </div>
</div> </div>
<div style="padding-left: 20px">
<label><input type="checkbox" ng-click="sameAddress()">Trading Office Address is same as Registered Office Address</label>
</div>
<hr/>
<div>&nbsp;&nbsp;Trading Office Address</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="address-input">Address</label>
<div class="col-sm-8">
<textarea class="form-control" ng-model="partner.address" name="address"
id="address-input" maxlength="200"></textarea>
<div ng-messages="partnerForm.address.$error" ng-if="partnerForm.address.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 200
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="suburb-input">* Suburb</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.suburb" name="suburb"
id="suburb-input" maxlength="50">
<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="postcode-input">PostCode</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.postcode" name="postcode"
id="postcode-input" maxlength="10">
<div ng-messages="partnerForm.postcode.$error" ng-if="partnerForm.postcode.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 10
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4" for="state-input">State</label>
<div class="col-sm-8">
<!--<input class="form-control" ng-model="partner.state" name="state" id="state-input" maxlength="20">-->
<!--<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">-->
<!--<p class="small text-danger" ng-message="maxlength">Less Than 20 Characters(including symbols and spaces)</p>-->
<!--</div>-->
<!--</div>-->
<select class="form-control" name="state" required ng-model="partner.state"
id="state-input"
ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
</div>
</div>
<div class="form-group col-sm-6" ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
<label class="control-label col-sm-4" for="country-input">* Country</label>
<div class="col-sm-8">
<input class="form-control" ng-init="partner.country=partner.country||'AUS'" ng-model="partner.country" name="country"
id="country-input" maxlength="20" required placeholder="AUS" readonly="readonly">
<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">
<p class="small text-danger" ng-message="maxlength">Less Than 20
Characters(including symbols and spaces)</p>
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
<!--选择框-->
<!--<select class="form-control" name="country" required ng-model="partner.country"-->
<!--id="country-input"-->
<!--ng-options="country.value as country.label for country in countries">-->
<!--<option value="">Please Choose</option>-->
<!--</select>-->
<!--<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">-->
<!--<p class="small text-danger" ng-message="required">Required Field</p>-->
<!--</div>-->
</div>
</div>
<!--<div class="form-group col-sm-6">-->
<!--<label class="control-label col-sm-4" for="country-input">Country</label>-->
<!--<div class="col-sm-8">-->
<!--&lt;!&ndash;<input class="form-control" ng-model="partner.country" name="country"&ndash;&gt;-->
<!--&lt;!&ndash;id="country-input" maxlength="20">&ndash;&gt;-->
<!--&lt;!&ndash;<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">&ndash;&gt;-->
<!--&lt;!&ndash;<p class="small text-danger" ng-message="maxlength">Less Than 20 Characters(including symbols and spaces)</p>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--<select class="form-control" name="state" required ng-model="partner.country"-->
<!--id="country-input"-->
<!--ng-options="country.value as country.label for country in countries">-->
<!--<option value="">Please Choose</option>-->
<!--</select>-->
<!--<div ng-messages="partnerForm.country.$error"-->
<!--ng-if="partnerForm.country.$dirty">-->
<!--<p class="small text-danger" ng-message="required">Required Field</p>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
<hr/> <hr/>
<div class="panel-body"> <div class="panel-body">

Write Preview
Loading…
Cancel
Save