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

fix~~

Browse Source
master
yuan 7 years ago
parent e6ac37fd05
commit 451b6f2a7b
6 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
src/main/ui/index.html
Unescape View File

@ -786,7 +786,7 @@ margin-bottom: 10%;"/>
<ul class="dropdown-menu user-dropdown-menu" ng-cloak> <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
<!-- User image --> <!-- User image -->
<li class="user-header user-header-yedian"> <li class="user-header user-header-yedian">
<img src="static/images/customer_service.jpg" <img src="static/images/customer_service2.jpg"
alt="Customer Service Qrcode"> alt="Customer Service Qrcode">
<p> <p>
Technical Support WeChat Technical Support WeChat
@ -1048,7 +1048,7 @@ margin-bottom: 10%;"/>
</style> </style>
<span style="font-size: smaller"> ( <i class="fa fa-phone" aria-hidden="true"></i> 1300-10-77-50 | <span style="font-size: smaller"> ( <i class="fa fa-phone" aria-hidden="true"></i> 1300-10-77-50 |
<i class="fa fa-envelope-o" aria-hidden="true"></i> support@royalpay.com.au | <i class="fa fa-envelope-o" aria-hidden="true"></i> support@royalpay.com.au |
WeChat <i class="fa fa-qrcode" aria-hidden="true" tooltip-class="customClass" uib-tooltip-html="'<img src=static/images/customer_service.jpg>'"></i> ) WeChat <i class="fa fa-qrcode" aria-hidden="true" tooltip-class="customClass" uib-tooltip-html="'<img src=static/images/customer_service2.jpg>'"></i> )
</span> </span>
</footer> </footer>

2
src/main/ui/static/css/merchant_application.css
Unescape View File

@ -475,7 +475,7 @@ body .dis_before:nth-child(5):before {
border-left: 2px solid currentColor; border-right: 2px solid currentColor; border-left: 2px solid currentColor; border-right: 2px solid currentColor;
background-color: currentColor; background-clip: content-box; background-color: currentColor; background-clip: content-box;
box-sizing: border-box; box-sizing: border-box;
animation: dot 4s infinite step-start both; animation: dot 2s infinite step-start both;
} }
.dotting:before { content: '...'; } /* IE8 */ .dotting:before { content: '...'; } /* IE8 */
.dotting::before { content: ''; } .dotting::before { content: ''; }

2
src/main/ui/static/dashboard/templates/partner_dashboard.html
Unescape View File

@ -299,7 +299,7 @@
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<small style="color: grey">As soon as you create a RoyalPay account, you can use all of RoyalPay's features, including accepting payments from customers. <small style="color: grey">As soon as you create a RoyalPay account, you can use all of RoyalPay's features, including accepting payments from customers.
But before you activate your account, RoyalPay will not execute settlement.Therefore, it is recommended that you submit your compliance materials as soon as possible, and our compliance department will notify you when the audit is completed. If you have any questions, you can contact our<a href="" ng-click="contactCustomerService()"> customer service!</a>.</small> But before you activate your account, RoyalPay will not execute settlement.Therefore, it is recommended that you submit your compliance materials as soon as possible, and our compliance department will notify you when the audit is completed. If you have any questions, you can contact our<a href="" ng-click="contactCustomerService()"> customer service</a>.</small>
</div> </div>
</div> </div>
</div> </div>

2
src/main/ui/static/merchantapplication/merchant_application.js
Unescape View File

@ -258,10 +258,10 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
}); });
return; return;
} }
$scope.initParam();
if(index == 4){ if(index == 4){
$scope.submit = true; $scope.submit = true;
} }
$scope.initParam();
$http.post('/register/info/update/' + $scope.partner.username, $scope.partner).then(function (resp) { $http.post('/register/info/update/' + $scope.partner.username, $scope.partner).then(function (resp) {
if (index == 3) { if (index == 3) {
$scope.getRateConfig(); $scope.getRateConfig();

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

@ -167,41 +167,43 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
}; };
$scope.commitToCompliance = function () { $scope.commitToCompliance = function () {
commonDialog.confirm({ $http.get('/client/partner_info/compliance/files').then(function (resp) {
title: 'Commit to Compliance', $scope.complianceFiles = resp.data;
content: 'Are you sure to commit ' + $scope.partner.company_name + ' to compliance？', if($scope.complianceFiles.client_id_file == null||$scope.complianceFiles.client_bank_file == null || $scope.complianceFiles.client_company_file == null){
choises: [ commonDialog.alert({title: 'Message', content: '请前去完善合规资料，再进行提交！', type: 'info'});
{label: 'Submit', className: 'btn-success', key: 1}, return;
{label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true} }
] 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)){
}).then(function (choice) { commonDialog.alert({title: 'Message', content: '请前去完善商户资料，再进行提交！', type: 'info'});
if (choice == 1) { return;
$http.get('/client/partner_info/compliance/files').then(function (resp) { }
$scope.complianceFiles = resp.data; if(($scope.partner.business_structure == "Company" && $scope.partner.acn == null) || ($scope.partner.business_structure != "Company" && $scope.partner.abn == null)){
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'});
commonDialog.alert({title: 'Message', content: '请前去完善合规资料，再进行提交！', type: 'info'}); return;
return; }
} if(!$scope.partner.mail_confirm){
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'});
commonDialog.alert({title: 'Message', content: '请前去完善商户资料，再进行提交！', type: 'info'}); return;
return; }
} commonDialog.confirm({
if(($scope.partner.business_structure == "Company" && $scope.partner.acn == null) || ($scope.partner.business_structure != "Company" && $scope.partner.abn == null)){ title: 'Commit to Compliance',
commonDialog.alert({title: 'Message', content: '请前去完善商户资料，再进行提交！', type: 'info'}); content: 'Are you sure to commit ' + $scope.partner.company_name + ' to compliance？',
return; choises: [
} {label: 'Submit', className: 'btn-success', key: 1},
if(!$scope.partner.mail_confirm){ {label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true}
commonDialog.alert({title: 'Message', content: '请验证邮箱后，再进行提交！', type: 'info'}); ]
return; }).then(function (choice) {
} $scope.submitted = true;
if (choice == 1) {
$http.post('/client/partner_info/compliance_audit').then(function (){ $http.post('/client/partner_info/compliance_audit').then(function (){
commonDialog.alert({title: 'Success', content: '已提交至合规，请耐心等待审核！', type: 'info'}); commonDialog.alert({title: 'Success', content: '已提交至合规，请耐心等待审核！', type: 'info'});
$state.reload(); $state.reload();
}, function () {
$state.reload();
}); });
}); }
} })
}) });
} }
}]); }]);
app.controller('clientComplianceFilesCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', 'Upload', 'file', function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { app.controller('clientComplianceFilesCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', 'Upload', 'file', function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) {

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

@ -11,7 +11,7 @@
<div class="content"> <div class="content">
<div class="box box-warning" ng-if="partner.source == 4"> <div class="box box-warning" ng-if="partner.source == 4">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Compliance <span ng-if="partner.approve_result==5 || partner.refuse_remark.length>0" <h3 class="box-title">Compliance <span ng-if="partner.approve_result==5"
style="color: red">(Refused style="color: red">(Refused
<small class="" <small class=""
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}</small>)</span> ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}</small>)</span>
@ -25,7 +25,7 @@
</b> </b>
</h3> </h3>
<div class="btn-group pull-right" role="group" aria-label="..." ng-hide="partner.approve_result ==3 || partner.approve_result == 1"> <div class="btn-group pull-right" role="group" aria-label="..." ng-hide="partner.approve_result ==3 || partner.approve_result == 1">
<button type="button" class="btn btn-danger" ng-click="commitToCompliance()">Commit to Compliance <button ng-disabled="submitted" type="button" class="btn btn-danger" ng-click="commitToCompliance()">Commit to Compliance
</button> </button>
</div> </div>
</div> </div>
@ -158,7 +158,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Description</label> <label class="control-label col-sm-2">*Description</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.description"></p> <p class="form-control-static" ng-bind="partner.description"></p>

Write Preview
Loading…
Cancel
Save