From 2e44dd421413bdb107e1e0e896ac4ed2bd684494 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 23 Apr 2018 14:19:02 +0800
Subject: [PATCH 01/56] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0store=5Fphoto=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../merchants/beans/ClientRegisterInfo.java | 10 +++
.../static/payment/partner/partner-manage.js | 74 +++++++++++++++++--
.../partner/templates/add_partner.html | 45 ++++++++---
.../partner/templates/partner_detail.html | 21 ++++--
.../partner/templates/partner_edit.html | 34 +++++++--
5 files changed, 152 insertions(+), 32 deletions(-)
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
index be305c8fc..f5725e2ca 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
@@ -35,6 +35,8 @@ public class ClientRegisterInfo {
private String alipayIndustry;
@JSONField(name = "company_photo")
private String companyPhoto;
+ @JSONField(name = "store_photo")
+ private String storePhoto;
@JSONField(name = "company_website")
private String companyWebsite;
@JSONField(name = "company_phone")
@@ -145,6 +147,14 @@ public class ClientRegisterInfo {
this.companyPhoto = companyPhoto;
}
+ public String getStorePhoto() {
+ return storePhoto;
+ }
+
+ public void setStorePhoto(String storePhoto) {
+ this.storePhoto = storePhoto;
+ }
+
public String getCompanyWebsite() {
return companyWebsite;
}
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 549a40736..c6456d83c 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -385,6 +385,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert("Logo is necessary!");
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) {
$scope.referrers.forEach(function (e) {
if ($scope.partner.referrer_id == e.org_id) {
@@ -423,18 +434,36 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.uploadShopPhoto = function (file) {
if (file != null) {
- $scope.photoProgress = {value: 0};
+ $scope.shopPhotoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url;
}, function (resp) {
- delete $scope.photoProgress;
+ 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) {
+ $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.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
+ $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');
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.length != 9) {
alert('Acn is not valid');
@@ -954,18 +994,36 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.uploadShopPhoto = function (file) {
if (file != null) {
- $scope.photoProgress = {value: 0};
+ $scope.shopPhotoProgress = {value: 0};
Upload.upload({
url: '/attachment/files',
data: {file: file}
}).then(function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
$scope.partner.company_photo = resp.data.url;
}, function (resp) {
- delete $scope.photoProgress;
+ delete $scope.shopPhotoProgress;
commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
}, 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);
})
}
};
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 9dbb2a3fd..f6b5aba16 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -1,3 +1,9 @@
+