- + Complete your company information
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index fab009d85..45d74b963 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -15,10 +15,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct return $http.get('/client/partner_info'); }] } - }).state('basic.payment_info_edit', { - url: '/payment/edit', - templateUrl: '/static/payment/partner/templates/client_partner_edit.html', - controller: 'clientPaymentInfoEditCtrl' }).state('basic.payment_info', { url: '/payment', templateUrl: '/static/payment/partner/templates/client_payment_info.html', @@ -59,46 +55,11 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct controller: 'clientDeviceCtrl' }) }]); - app.controller('clientPartnerDetailCtrl', ['$scope', '$http', 'partner','industryMap','businessStructuresMap', function ($scope, $http, partner,industryMap,businessStructuresMap) { + app.controller('clientPartnerDetailCtrl', ['$scope', '$http', 'partner','industryMap','businessStructuresMap','commonDialog','Upload','$state', function ($scope, $http, partner,industryMap,businessStructuresMap,commonDialog,Upload,$state) { $scope.business_structures = businessStructuresMap.configs(); $scope.industries = industryMap.configs(); $scope.partner = partner.data; - //修改邮箱 - $scope.updateEmail = function () { - $http.put('/client/partner_info/compliance_audit').then( - ); - }; - - $scope.commitToCompliance = function () { - $http.get('/client/partner_info/compliance/files').then(function (resp) { - $scope.complianceFiles = resp.data; - if($scope.complianceFiles.client_id_file == null||$scope.complianceFiles.client_bank_file == null || $scope.complianceFiles.client_company_file == null){ - alert("请前去完善合规资料，再进行提交"); - return; - } - if($scope.partner.business_structure == null ||$scope.partner.logo_url == null || $scope.partner.description == null || (($scope.partner.store_photo == null || $scope.partner.company_photo == null) && $scope.currentUser.client.company_website == null)){ - alert("请前去完善商户资料，再进行提交"); - return; - } - if(($scope.partner.business_structure == "Company" && $scope.partner.acn == null) || ($scope.partner.business_structure != "Company" && $scope.partner.abn == null)){ - alert("请前去完善商户资料，再进行提交"); - return; - } - if(!$scope.partner.mail_confirm){ - alert("请验证邮箱后，再进行提交"); - return; - } - $http.post('/client/partner_info/compliance_audit').then( - ); - }); - } - }]); - app.controller('clientPaymentInfoEditCtrl', ['$scope', '$http','industryMap', 'commonDialog','$state','Upload',function ($scope, $http,industryMap,commonDialog,$state,Upload) { - /* $scope.loadClient = function () { - $http.get('/client/partner_info').then(function (resp) { - $scope.partner = resp.data; - }) - };*/ + $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo'; $scope.uploadLogo = function (file) { if (file != null) { @@ -199,6 +160,36 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) }); }; + //修改邮箱 + $scope.updateEmail = function () { + $http.put('/client/partner_info/compliance_audit').then( + ); + }; + + $scope.commitToCompliance = function () { + $http.get('/client/partner_info/compliance/files').then(function (resp) { + $scope.complianceFiles = resp.data; + if($scope.complianceFiles.client_id_file == null||$scope.complianceFiles.client_bank_file == null || $scope.complianceFiles.client_company_file == null){ + commonDialog.alert({title: 'Message', content: '请前去完善合规资料，再进行提交！', type: 'info'}); + return; + } + if($scope.partner.business_structure == null ||$scope.partner.logo_url == null || $scope.partner.description == null || (($scope.partner.store_photo == null || $scope.partner.company_photo == null) && $scope.currentUser.client.company_website == null)){ + commonDialog.alert({title: 'Message', content: '请前去完善商户资料，再进行提交！', type: 'info'}); + return; + } + if(($scope.partner.business_structure == "Company" && $scope.partner.acn == null) || ($scope.partner.business_structure != "Company" && $scope.partner.abn == null)){ + commonDialog.alert({title: 'Message', content: '请前去完善商户资料，再进行提交！', type: 'info'}); + return; + } + if(!$scope.partner.mail_confirm){ + commonDialog.alert({title: 'Message', content: '请验证邮箱后，再进行提交！', type: 'info'}); + return; + } + $http.post('/client/partner_info/compliance_audit').then( + commonDialog.alert({title: 'Success', content: '已提交至合规，请耐心等待审核！', type: 'info'}) + ); + }); + } }]); app.controller('clientComplianceFilesCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', 'Upload', 'file', function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 0dfd9e30d..608371ab8 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -23,7 +23,7 @@ (自助申请)待审核（材料已提交） -
+
@@ -43,110 +43,370 @@
Clearing Config
-
+
Compliance files
+
+
+
+
+ Partner Basic Information
+
+
+
+
+
+
+
+
+ Partner Contact Information
+
+
+
+ Address Information
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Partner Basic Information
-
+