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

商户管理增加store_photo字段

Browse Source
master
yuan 7 years ago
parent baec160c2d
commit 2e44dd4214
5 changed files with 152 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -35,6 +35,8 @@ public class ClientRegisterInfo {
private String alipayIndustry; private String alipayIndustry;
@JSONField(name = "company_photo") @JSONField(name = "company_photo")
private String companyPhoto; private String companyPhoto;
@JSONField(name = "store_photo")
private String storePhoto;
@JSONField(name = "company_website") @JSONField(name = "company_website")
private String companyWebsite; private String companyWebsite;
@JSONField(name = "company_phone") @JSONField(name = "company_phone")
@ -145,6 +147,14 @@ public class ClientRegisterInfo {
this.companyPhoto = companyPhoto; this.companyPhoto = companyPhoto;
} }
public String getStorePhoto() {
return storePhoto;
}
public void setStorePhoto(String storePhoto) {
this.storePhoto = storePhoto;
}
public String getCompanyWebsite() { public String getCompanyWebsite() {
return companyWebsite; return companyWebsite;
} }

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

@ -385,6 +385,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert("Logo is necessary!"); alert("Logo is necessary!");
return; return;
} }
if($scope.partner.partner_type == 'photo'){
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.referrer_id) { if ($scope.partner.referrer_id) {
$scope.referrers.forEach(function (e) { $scope.referrers.forEach(function (e) {
if ($scope.partner.referrer_id == e.org_id) { if ($scope.partner.referrer_id == e.org_id) {
@ -423,18 +434,36 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.uploadShopPhoto = function (file) { $scope.uploadShopPhoto = function (file) {
if (file != null) { if (file != null) {
$scope.photoProgress = {value: 0}; $scope.shopPhotoProgress = {value: 0};
Upload.upload({ Upload.upload({
url: '/attachment/files', url: '/attachment/files',
data: {file: file} data: {file: file}
}).then(function (resp) { }).then(function (resp) {
delete $scope.photoProgress; delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url; $scope.partner.company_photo = resp.data.url;
}, function (resp) { }, function (resp) {
delete $scope.photoProgress; delete $scope.shopPhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) { }, function (evt) {
$scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total); $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
};
$scope.uploadStorePhoto = function (file) {
if (file != null) {
$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);
}) })
} }
}; };
@ -895,6 +924,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('suburb can not contain two and more continuous space characters'); alert('suburb can not contain two and more continuous space characters');
return; return;
} }
if($scope.partner.partner_type == 'photo'){
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 && $scope.partner.business_structure == 'Company') {
if ($scope.partner.acn.length != 9) { if ($scope.partner.acn.length != 9) {
alert('Acn is not valid'); alert('Acn is not valid');
@ -954,18 +994,36 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.uploadShopPhoto = function (file) { $scope.uploadShopPhoto = function (file) {
if (file != null) { if (file != null) {
$scope.photoProgress = {value: 0}; $scope.shopPhotoProgress = {value: 0};
Upload.upload({ Upload.upload({
url: '/attachment/files', url: '/attachment/files',
data: {file: file} data: {file: file}
}).then(function (resp) { }).then(function (resp) {
delete $scope.photoProgress; delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url; $scope.partner.company_photo = resp.data.url;
}, function (resp) { }, function (resp) {
delete $scope.photoProgress; delete $scope.shopPhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, function (evt) { }, function (evt) {
$scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total); $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
})
}
};
$scope.uploadStorePhoto = function (file) {
if (file != null) {
$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);
}) })
} }
}; };

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

@ -1,3 +1,9 @@
<style>
.img-size{
height: 100px;
margin-left: 20px;
}
</style>
<section class="content-header"> <section class="content-header">
<h1>New Partner</h1> <h1>New Partner</h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
@ -127,7 +133,7 @@
</div> </div>
<uib-progressbar value="logoProgress.value" <uib-progressbar value="logoProgress.value"
ng-if="logoProgress"></uib-progressbar> ng-if="logoProgress"></uib-progressbar>
<img ng-src="{{partner.logo_url}}" class="col-sm-3"> <img ng-src="{{partner.logo_url}}" ng-if="partner.logo_url" style="height: 100px;">
</div> </div>
</div> </div>
<!--<div class="form-group"--> <!--<div class="form-group"-->
@ -210,6 +216,8 @@
a photo of shop is a photo of shop is
required while an online store shall choose required while an online store shall choose
companyWebsite</p> companyWebsite</p>
<p class="small text-info">
只要有可能产生线下交易（商户静态码、POS），就必须上传照片，否则支付宝会禁止交易</p>
<div ng-messages="partnerForm.partner_type.$error" <div ng-messages="partnerForm.partner_type.$error"
ng-if="partnerForm.partner_type.$dirty"> ng-if="partnerForm.partner_type.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger" ng-message="required">Required
@ -219,19 +227,32 @@
</div> </div>
<div class="form-group" ng-if="partner.partner_type == 'photo'"> <div class="form-group" ng-if="partner.partner_type == 'photo'">
<label class="control-label col-sm-2">* Shop Photo</label> <label class="control-label col-sm-2">* Shop Photo</label>
<div class="col-sm-8"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static"><em>1:</em>&nbsp;
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button"
ngf-select="uploadShopPhoto($file)" accept="image/*" ngf-select="uploadShopPhoto($file)" accept="image/*"
ngf-max-size="2MB"> ngf-max-size="2MB">
<i class="fa fa-upload"></i> Upload Shop Photo <i class="fa fa-upload"></i> Upload Shop Photo1
</button>
</div>
<uib-progressbar value="shopPhotoProgress.value"
ng-if="shopPhotoProgress"></uib-progressbar>
<img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo" class="thumbnail img-size">
</div>
<div class="col-sm-4">
<div class="form-control-static"><em>2:</em>&nbsp;
<button class="btn btn-primary" type="button"
ngf-select="uploadStorePhoto($file)" accept="image/*"
ngf-max-size="2MB">
<i class="fa fa-upload"></i> Upload Shop Photo2
</button> </button>
</div> </div>
<uib-progressbar value="photoProgress.value" <uib-progressbar value="storePhotoProgress.value"
ng-if="photoProgress"></uib-progressbar> ng-if="storePhotoProgress"></uib-progressbar>
<img ng-src="{{partner.company_photo}}" class="col-sm-4"> <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo" class="thumbnail img-size">
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.partner_type == 'companyWebsite'" <div class="form-group" ng-if="partner.partner_type == 'companyWebsite'"
ng-class="{'has-error':partnerForm.company_website.$invalid && partnerForm.company_website.$dirty}"> ng-class="{'has-error':partnerForm.company_website.$invalid && partnerForm.company_website.$dirty}">
<label class="control-label col-sm-2" for="company_website-input">* <label class="control-label col-sm-2" for="company_website-input">*

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

@ -28,6 +28,10 @@
width: 95%; width: 95%;
float: left; float: left;
} }
.img-size{
height: 100px;
margin-left: 20px;
}
</style> </style>
<section class="content-header"> <section class="content-header">
<h1> <h1>
@ -304,7 +308,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Logo</label> <label class="control-label col-sm-2">Logo</label>
<div class="col-sm-10"> <div class="col-sm-10">
<img ng-src="{{partner.logo_url}}" class="col-sm-3 col-xs-5"> <img ng-src="{{partner.logo_url}}" ng-if="partner.logo_url" style="height: 100px;">
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.abn"> <div class="form-group" ng-if="partner.abn">
@ -336,11 +340,18 @@
</div> </div>
<div class="form-group" ng-if="partner.company_photo"> <div class="form-group" ng-if="partner.company_photo">
<label class="control-label col-sm-2">Shop Photo</label> <label class="control-label col-sm-2">Shop Photo</label>
<div class="col-sm-5"><em>1:</em>&nbsp;
<div>
<a target="_blank" ng-href="{{partner.company_photo}}">
<img ng-src="{{partner.company_photo}}" class="thumbnail img-size">
</a>
</div>
</div>
<div class="col-sm-10"> <div class="col-sm-5" ng-if="partner.store_photo"><em>2:</em>&nbsp;
<div class="col-sm-3 col-xs-5"> <div>
<a class="thumbnail" target="_blank" ng-href="{{partner.company_photo}}"> <a target="_blank" ng-href="{{partner.store_photo}}" >
<img ng-src="{{partner.company_photo}}"> <img ng-src="{{partner.store_photo}}" class="thumbnail img-size">
</a> </a>
</div> </div>
</div> </div>

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

@ -1,3 +1,9 @@
<style>
.img-size{
height: 100px;
margin-left: 20px;
}
</style>
<section class="content-header"> <section class="content-header">
<h1 ng-bind="partner.short_name"></h1> <h1 ng-bind="partner.short_name"></h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
@ -90,7 +96,7 @@
</button> </button>
</div> </div>
<uib-progressbar value="logoProgress.value" ng-if="logoProgress"></uib-progressbar> <uib-progressbar value="logoProgress.value" ng-if="logoProgress"></uib-progressbar>
<img ng-src="{{partner.logo_url}}" class="col-sm-3"> <img ng-src="{{partner.logo_url}}" ng-if="partner.logo_url" style="height: 100px;">
</div> </div>
</div> </div>
<!--<div class="form-group"--> <!--<div class="form-group"-->
@ -160,6 +166,8 @@
</select> </select>
<p class="small text-info">If the partner is a offline shop then a photo of shop is <p class="small text-info">If the partner is a offline shop then a photo of shop is
required while an online store shall choose company website</p> required while an online store shall choose company website</p>
<p class="small text-info">
只要有可能产生线下交易（商户静态码、POS），就必须上传照片，否则支付宝会禁止交易</p>
<div ng-messages="partnerForm.partner_type.$error" <div ng-messages="partnerForm.partner_type.$error"
ng-if="partnerForm.partner_type.$dirty"> ng-if="partnerForm.partner_type.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
@ -169,16 +177,28 @@
<div class="form-group" <div class="form-group"
ng-if="partner.partner_type == 'photo' && (!partner.parent_client_id || ('00110'|withRole))"> ng-if="partner.partner_type == 'photo' && (!partner.parent_client_id || ('00110'|withRole))">
<label class="control-label col-sm-2">* Shop Photo</label> <label class="control-label col-sm-2">* Shop Photo</label>
<div class="col-sm-8"> <div class="col-sm-5">
<div class="form-control-static"> <div class="form-control-static"><em>1:</em>&nbsp;
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button"
ngf-select="uploadShopPhoto($file)" accept="image/*" ngf-max-size="2MB"> ngf-select="uploadShopPhoto($file)" accept="image/*" ngf-max-size="2MB">
<i class="fa fa-upload"></i> Upload Shop Photo <i class="fa fa-upload"></i> Upload Shop Photo1
</button>
</div>
<uib-progressbar value="shopPhotoProgress.value"
ng-if="shopPhotoProgress"></uib-progressbar>
<img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo" class="thumbnail img-size">
</div>
<div class="col-sm-5">
<div class="form-control-static"><em>2:</em>&nbsp;
<button class="btn btn-primary" type="button"
ngf-select="uploadStorePhoto($file)" accept="image/*"
ngf-max-size="2MB">
<i class="fa fa-upload"></i> Upload Shop Photo2
</button> </button>
</div> </div>
<uib-progressbar value="photoProgress.value" <uib-progressbar value="storePhotoProgress.value"
ng-if="photoProgress"></uib-progressbar> ng-if="storePhotoProgress"></uib-progressbar>
<img ng-src="{{partner.company_photo}}" class="col-sm-4"> <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo" class="thumbnail img-size">
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group"

Write Preview
Loading…
Cancel
Save