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 @@ +

New Partner

    @@ -127,7 +133,7 @@ - + @@ -210,6 +216,8 @@ a photo of shop is required while an online store shall choose companyWebsite

    +

    + 只要有可能产生线下交易（商户静态码、POS），就必须上传照片，否则支付宝会禁止交易

    Required @@ -219,19 +227,32 @@

    -
    -
    - +
    +
    1:  + +
    + + +
    +
    +
    2:  + +
    + +
    - - -
    +