Merge branch 'develop'

master
taylor.dang 5 years ago
commit e0422b3568

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>2.3.2</version>
<version>2.3.3</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.2.0</jib-maven-plugin.version>

@ -44,6 +44,8 @@ public interface ClientMapper {
@AutoSql(SqlType.SELECT)
JSONObject findClientIgnoreInvalid(int clientId);
JSONObject findClientAprrovingStatus(@Param("client_id") int clientId);
@AutoSql(SqlType.SELECT)
@AdvanceSelect(addonWhereClause = "is_valid=1")
JSONObject findClientByMoniker(@Param("client_moniker") String clientMoniker);

@ -84,7 +84,7 @@ public interface ClientManager {
@Transactional(noRollbackFor = EmailException.class)
void auditClientGreenChannel(JSONObject manager, String clientMoniker);
void checkAndSendInitEmail(JSONObject manager, String clientMoniker);
void checkAndSendInitEmail(JSONObject manager, String clientMoniker,String type);
void markApproveEmailSendStatus(String clientMoniker, JSONObject manager);

@ -1269,19 +1269,14 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}
}
sendInitEmail(client, username.toLowerCase(), pwd, isUpayEmail);
// sendInitEmail(manager, client, username, pwd);
}
@Override
public void checkAndSendInitEmail(JSONObject manager, String clientMoniker) {
public void checkAndSendInitEmail(JSONObject manager, String clientMoniker, String type) {
JSONObject client = getClientInfoByMoniker(clientMoniker);
if (client == null) {
throw new InvalidShortIdException();
}
int sendStatus = client.getIntValue("approve_email_send");
if (sendStatus >= 3) {
throw new BadRequestException("Email validating... Wait for a moment");
}
int clientId = client.getIntValue("client_id");
clientModifySupport.processClientModify(new EmailModify(manager, clientMoniker, 4, null));
if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
@ -1291,19 +1286,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}
}
List<JSONObject> accounts = clientAccountMapper.listAdminAccounts(clientId);
JSONObject cardProfile = clientMapper.findClientAprrovingStatus(clientId);
boolean cardApproving = cardProfile != null && StringUtils.equals("cardpayment", type);
if (client.getIntValue("source") == 4) {
JSONObject account = accounts.get(0);
// sendInitEmail(manager, client, account.getString("username"), "*****");
sendInitEmail(client, account.getString("username"), "*****", false);
sendInitEmail(client, account.getString("username"), "*****", cardApproving);
} else {
if (accounts.size() == 0) {
initAdminUserAndSendEmail(manager, clientMoniker, client, false);
initAdminUserAndSendEmail(manager, clientMoniker, client, cardApproving);
} else {
JSONObject account = accounts.get(0);
String pwd = RandomStringUtils.random(8, true, true);
resetAccountPwd(manager, clientMoniker, account.getString("account_id"), pwd);
// sendInitEmail(manager, client, account.getString("username"), pwd);
sendInitEmail(client, account.getString("username"), pwd, false);
sendInitEmail(client, account.getString("username"), pwd, cardApproving);
}
}
}
@ -1348,42 +1345,39 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
emails.add(email);
}
}
new Thread() {
@Override
public void run() {
try {
String emailId = mailService.sendEmail("Your RoyalPay Cross-border Payment has been set up", StringUtils.join(mailTos, ","), "", content);
mailService.sendEmail("Your RoyalPay Cross-border Payment has been set up", emails.isEmpty() ? "" : StringUtils.join(emails, ","),
"", contentBd);
JSONObject clientUpdate = new JSONObject();
if (isUpayAuditPass) {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("upay_approve_email_send", 3);
clientUpdate.put("upay_approve_email_id", emailId);
sysClientUpayProfileMapper.update(clientUpdate);
} else {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("approve_email_send", 3);
clientUpdate.put("approve_email_id", emailId);
clientMapper.update(clientUpdate);
}
} catch (Exception e) {
JSONObject clientUpdate = new JSONObject();
if (isUpayAuditPass) {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("upay_approve_email_send", 0);
clientUpdate.put("upay_approve_email_id", null);
sysClientUpayProfileMapper.update(clientUpdate);
} else {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("approve_email_send", 0);
clientUpdate.put("approve_email_id", null);
clientMapper.update(clientUpdate);
}
throw new EmailException("Email Sending Failed", e);
new Thread(() -> {
try {
String emailId = mailService.sendEmail("Your RoyalPay Cross-border Payment has been set up", StringUtils.join(mailTos, ","), "", content);
mailService.sendEmail("Your RoyalPay Cross-border Payment has been set up", emails.isEmpty() ? "" : StringUtils.join(emails, ","),
"", contentBd);
JSONObject clientUpdate = new JSONObject();
if (isUpayAuditPass) {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("upay_approve_email_send", 3);
clientUpdate.put("upay_approve_email_id", emailId);
sysClientUpayProfileMapper.update(clientUpdate);
} else {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("approve_email_send", 3);
clientUpdate.put("approve_email_id", emailId);
clientMapper.update(clientUpdate);
}
} catch (Exception e) {
JSONObject clientUpdate = new JSONObject();
if (isUpayAuditPass) {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("upay_approve_email_send", 0);
clientUpdate.put("upay_approve_email_id", null);
sysClientUpayProfileMapper.update(clientUpdate);
} else {
clientUpdate.put("client_id", client.getIntValue("client_id"));
clientUpdate.put("approve_email_send", 0);
clientUpdate.put("approve_email_id", null);
clientMapper.update(clientUpdate);
}
throw new EmailException("Email Sending Failed", e);
}
}.start();
}).start();
}

@ -285,8 +285,8 @@ public class PartnerManageController {
}
@ManagerMapping(value = "/{clientMoniker}/audit/send_email", method = RequestMethod.PUT, role = {ManagerRole.BD_USER, ManagerRole.OPERATOR})
public void resendEmail(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String clientMoniker) {
clientManager.checkAndSendInitEmail(manager, clientMoniker);
public void resendEmail(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String clientMoniker,@RequestParam String type) {
clientManager.checkAndSendInitEmail(manager, clientMoniker,type);
}
@ManagerMapping(value = "/{clientMoniker}/audit/email_sending_status", method = RequestMethod.PUT, role = ManagerRole.OPERATOR)

@ -841,6 +841,10 @@
GROUP BY address
</select>
<select id="findClientAprrovingStatus" resultType="com.alibaba.fastjson.JSONObject">
SELECT * FROM sys_client_upay_profile scup
WHERE scup.client_id=#{client_id} and ((scup.upay_approve_result=4 and scup.upay_open_status is null) or scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4)
</select>
<select id="listUseAlipayMerchant" resultType="int">
select client_id
from sys_clients

@ -2,7 +2,7 @@
<div style="margin-left: 1rem;margin-right: 1rem;margin-top: 2rem;margin-bottom: 2rem">
<h4 style="font-family: Avenir-Heavy;font-size: 2rem;color: #000000;letter-spacing: 0;">Dear <span
th:text="${short_name}"></span> :</h4>
<p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;">I'm happy to let you know
<p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;" th:unless="${card_approving}">I'm happy to let you know
that your RoyalPay Cross-border Payment account has been set up.<br>
很高兴通知您贵司RoyalPay跨境全支付已经开通</p>
<p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;" th:if="${card_approving}">I'm
@ -122,14 +122,14 @@
</div>
<div style="font-family: Avenir-Light;font-size: 1rem;color: #002A00;letter-spacing: 0;padding-left: 2rem;">
<a style="color: #FF6600"
href="https://mpay.royalpay.com.au/docs/cn/">https://mpay.royalpay.com.au/docs/cn/</a>
href="https://developer.royalpay.com.au/cn/">https://developer.royalpay.com.au/cn/</a>
</div>
<div style="font-family: Avenir-Heavy;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;padding-left: 2rem;padding-top: 2rem">
English version:
</div>
<div style="font-family: Avenir-Light;font-size: 1rem;color: #002A00;letter-spacing: 0;padding-left: 2rem;">
<a style="color: #FF6600"
href="https://mpay.royalpay.com.au/docs/en/">https://mpay.royalpay.com.au/docs/en/</a>
href="https://developer.royalpay.com.au/en/">https://developer.royalpay.com.au/en/</a>
</div>
<div style="font-family: Avenir-Heavy;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;padding-left: 2rem;padding-top: 2rem">
<span th:text="'Partner Code:'+${client_moniker}"></span>

@ -205,8 +205,8 @@
<li class="nav-item dropdown">
<a role="button" class="nav-link dropdown-toggle" data-toggle="dropdown">GATEWAY API</a>
<ul class="dropdown-menu">
<li><a href="https://mpay.royalpay.com.au/docs/en/" target="_blank">En</a></li>
<li><a href="https://mpay.royalpay.com.au/docs/cn/" target="_blank">中文</a></li>
<li><a href="https://developer.royalpay.com.au/en/" target="_blank">En</a></li>
<li><a href="https://developer.royalpay.com.au/cn/" target="_blank">中文</a></li>
</ul>
</li>
<li class="nav-item">
@ -910,7 +910,7 @@ margin-bottom: 10%;"/>
<div class="col-xs-6">
<p><a href="/">RoyalPay</a></p>
<p><a href="https://mpay.royalpay.com.au/docs/en/">Gateway API</a></p>
<p><a href="https://developer.royalpay.com.au/en/">Gateway API</a></p>
<p><a href="https://www.royalpay.com.au/industry.html">Industry Solution</a></p>
<p><a href="https://www.royalpay.com.au/marketing.html">Marketing Service</a></p>
</div>

@ -288,8 +288,8 @@
<li class="nav-item dropdown">
<a role="button" class="nav-link dropdown-toggle" data-toggle="dropdown">GATEWAY API</a>
<ul class="dropdown-menu">
<li><a href="https://mpay.royalpay.com.au/docs/en/" target="_blank">En</a></li>
<li><a href="https://mpay.royalpay.com.au/docs/cn/" target="_blank">中文</a></li>
<li><a href="https://developer.royalpay.com.au/en/" target="_blank">En</a></li>
<li><a href="https://developer.royalpay.com.au/cn/" target="_blank">中文</a></li>
</ul>
</li>
<li class="nav-item">
@ -583,7 +583,7 @@
<div class="col-xs-6">
<p><a href="/">RoyalPay</a></p>
<p><a href="https://mpay.royalpay.com.au/docs/en/">Gateway API</a></p>
<p><a href="https://developer.royalpay.com.au/en/">Gateway API</a></p>
<p><a href="https://www.royalpay.com.au/industry.html">Industry Solution</a></p>
<p><a href="https://www.royalpay.com.au/marketing.html">Marketing Service</a></p>
</div>
@ -630,4 +630,4 @@
<div id="fp-nav" class="right"></div>
<div id="cli_dialog_div"></div>
</body>
</html>
</html>

@ -72,8 +72,8 @@
<li class="nav-item dropdown">
<a role="button" class="nav-link dropdown-toggle" data-toggle="dropdown">GATEWAY API</a>
<ul class="dropdown-menu">
<li><a href="https://mpay.royalpay.com.au/docs/en/" target="_blank">En</a></li>
<li><a href="https://mpay.royalpay.com.au/docs/cn/" target="_blank">中文</a></li>
<li><a href="https://developer.royalpay.com.au/en/" target="_blank">En</a></li>
<li><a href="https://developer.royalpay.com.au/cn/" target="_blank">中文</a></li>
</ul>
</li>
<li class="nav-item">
@ -142,7 +142,7 @@
<div class="col-xs-6">
<p><a href="/">RoyalPay</a></p>
<p><a href="https://mpay.royalpay.com.au/docs/en/">Gateway API</a></p>
<p><a href="https://developer.royalpay.com.au/en/">Gateway API</a></p>
<p><a href="https://www.royalpay.com.au/industry.html">Industry Solution</a></p>
<p><a href="https://www.royalpay.com.au/marketing.html">Marketing Service</a></p>
</div>
@ -189,4 +189,4 @@
<div id="fp-nav" class="right"></div>
<div id="cli_dialog_div"></div>
</body>
</html>
</html>

@ -70,8 +70,8 @@
<li class="nav-item dropdown">
<a role="button" class="nav-link dropdown-toggle" data-toggle="dropdown">GATEWAY API</a>
<ul class="dropdown-menu">
<li><a href="https://mpay.royalpay.com.au/docs/en/" target="_blank">En</a></li>
<li><a href="https://mpay.royalpay.com.au/docs/cn/" target="_blank">中文</a></li>
<li><a href="https://developer.royalpay.com.au/en/" target="_blank">En</a></li>
<li><a href="https://developer.royalpay.com.au/cn/" target="_blank">中文</a></li>
</ul>
</li>
<li class="nav-item">
@ -140,7 +140,7 @@
<div class="col-xs-6">
<p><a href="/">RoyalPay</a></p>
<p><a href="https://mpay.royalpay.com.au/docs/en/">Gateway API</a></p>
<p><a href="https://developer.royalpay.com.au/en/">Gateway API</a></p>
<p><a href="https://www.royalpay.com.au/industry.html">Industry Solution</a></p>
<p><a href="https://www.royalpay.com.au/marketing.html">Marketing Service</a></p>
</div>

@ -953,8 +953,8 @@
<li class="nav-item dropdown">
<a role="button" class="nav-link dropdown-toggle" data-toggle="dropdown">GATEWAY API</a>
<ul class="dropdown-menu">
<li><a href="https://mpay.royalpay.com.au/docs/en/" target="_blank">En</a></li>
<li><a href="https://mpay.royalpay.com.au/docs/cn/" target="_blank">中文</a></li>
<li><a href="https://developer.royalpay.com.au/en/" target="_blank">En</a></li>
<li><a href="https://developer.royalpay.com.au/cn/" target="_blank">中文</a></li>
</ul>
</li>
<li class="nav-item">
@ -1103,7 +1103,7 @@
<div class="col-xs-6">
<p><a href="/">RoyalPay</a></p>
<p><a href="https://mpay.royalpay.com.au/docs/en/">Gateway API</a></p>
<p><a href="https://developer.royalpay.com.au/en/">Gateway API</a></p>
<p><a href="https://www.royalpay.com.au/industry.html">Industry Solution</a></p>
<p><a href="https://www.royalpay.com.au/marketing.html">Marketing Service</a></p>
</div>
@ -1150,4 +1150,4 @@
<div id="fp-nav" class="right"></div>
<div id="cli_dialog_div"></div>
</body>
</html>
</html>

@ -130,7 +130,7 @@
<div class="box-header">
<h3 class="box-title" style="display: inherit">
报关订单列表
<a style="float: right;padding-right: 40px" href="https://mpay.royalpay.com.au/docs/en/#api-CustomsDeclare-declare_report">商户报关API</a>
<a style="float: right;padding-right: 40px" href="https://developer.royalpay.com.au/en/#api-CustomsDeclare-declare_report">商户报关API</a>
</h3>
</div>
<div class="box-body table-responsive">

@ -966,12 +966,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
})
})
};
$scope.resendApproveEmail = function () {
$scope.resendApproveEmail = function (type) {
commonDialog.confirm({
title: 'Warning',
content: 'This operation will reset the password of admin user. Are you sure this email is correct ? Or you may update this information first.'
}).then(function () {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/send_email').then(function () {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/send_email?type=' + type).then(function () {
$state.reload();
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});

@ -33,6 +33,7 @@
height: 100px;
margin-left: 20px;
}
.btn-default:active,
.btn-default.active,
.open > .dropdown-toggle.btn-default {
@ -60,183 +61,187 @@
</section>
<div class="content">
<!-- 跨境支付审核 -->
<div class="box box-warning" ng-if="('10'|withRole)">
<div class="box-header with-border">
<h3 class="box-title"> <img style="height: 20px;width: 20px" height="20px" src="/static/images/royalpay_sign_s.png">Cross-border payment Compliance <span ng-if="partner.approve_result==5 || partner.refuse_remark.length>0"
style="color: red">(Refused
<div class="box box-warning" ng-if="('10'|withRole)">
<div class="box-header with-border">
<h3 class="box-title"><img style="height: 20px;width: 20px" height="20px"
src="/static/images/royalpay_sign_s.png">Cross-border payment Compliance <span
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0"
style="color: red">(Refused
<small class=""
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}</small>)</span>
<span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
style="color: green">(The Partner Using Green Channel Now!)</span>
【目前状态】-
<b ng-if="partner.source==4">
<span ng-if="!partner.approve_result">(自助申请)资料完善中</span>
<span ng-if="partner.approve_result==1">(自助申请)已开通</span>
<span ng-if="partner.approve_result==2">(自助申请)快速开通等待提交合规材料</span>
<span ng-if="partner.approve_result==3">(自助申请)待审核(材料已提交)</span>
</b>
<b ng-if="partner.source!=4">
<span ng-if="!partner.open_status">暂未提交申请</span>
<span ng-if="partner.open_status==1">待审核(合同制作中)</span>
<span ng-if="partner.open_status==2">合同制作完成</span>
<span ng-if="partner.open_status==3">BD处理中</span>
<span ng-if="partner.open_status==4">待审核(合规文件已提交)</span>
<span ng-if="partner.open_status==5">通过</span>
<span ng-if="partner.open_status==0">不通过</span>
<span ng-if="partner.open_status==10">绿色通道申请中</span>
</b>
<span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
</h3>
<button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;"
ng-click="revertClient()">Revert
</button>
</div>
<div class="box-body" ng-if="partner.is_valid==1">
<div ng-if="partner.open_status != 5 && partner.open_status!=10">
<!--<a role="button" type="button" class="btn btn-success" ng-click="exportPDF()">-->
<!--制作合同</a>-->
<a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{Export()}}">
<i class="fa fa-download"></i>制作临时合同</a>
<a role="button" type="button" class="btn btn-success" ng-click="exportAgreegatePDF()">
制作全支付合同</a>
<a role="button" type="button" class="btn btn-warning" ngf-select="uploadAgreeFile($file)"
accept="pdf/*">
上传合同</a> (通用合同请选择制作合同,非通用合同模板请人工制作合同后上传)
</div>
<div class="btn-group pull-right" role="group" aria-label="...">
<button type="button" ng-if="partner.open_status!=10 && partner.approve_result!=1"
class="btn btn-success" ng-click="passClient()">Pass
</button>
<button ng-if="(partner.open_status==1||partner.open_status==10) && partner.approve_result>3 || partner.open_status==4"
type="button" class="btn btn-primary" ng-click="refuse()">Refuse
</button>
</div>
<div ng-if="partner.open_status==10" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-success" ng-click="pass2GreenChannel()">
<i class="fa fa-paper-plane"></i>
Agree Green Channel
</button>
</div>
<a style="margin-top: 5px" ng-if="fileManager.source_agree_file" role="button" class="btn-group btn btn-warning" style="margin-top: 5px"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"><i
class="fa fa-download"></i>下载合同</a>
<span style="margin-top: 5px" ng-if="partner.open_status != 5">
<span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
style="color: green">(The Partner Using Green Channel Now!)</span>
【目前状态】-
<b ng-if="partner.source==4">
<span ng-if="!partner.approve_result">(自助申请)资料完善中</span>
<span ng-if="partner.approve_result==1">(自助申请)已开通</span>
<span ng-if="partner.approve_result==2">(自助申请)快速开通等待提交合规材料</span>
<span ng-if="partner.approve_result==3">(自助申请)待审核(材料已提交)</span>
</b>
<b ng-if="partner.source!=4">
<span ng-if="!partner.open_status">暂未提交申请</span>
<span ng-if="partner.open_status==1">待审核(合同制作中)</span>
<span ng-if="partner.open_status==2">合同制作完成</span>
<span ng-if="partner.open_status==3">BD处理中</span>
<span ng-if="partner.open_status==4">待审核(合规文件已提交)</span>
<span ng-if="partner.open_status==5">通过</span>
<span ng-if="partner.open_status==0">不通过</span>
<span ng-if="partner.open_status==10">绿色通道申请中</span>
</b>
<span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
</h3>
<button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;"
ng-click="revertClient()">Revert
</button>
</div>
<div class="box-body" ng-if="partner.is_valid==1">
<div ng-if="partner.open_status != 5 && partner.open_status!=10">
<!--<a role="button" type="button" class="btn btn-success" ng-click="exportPDF()">-->
<!--制作合同</a>-->
<a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{Export()}}">
<i class="fa fa-download"></i>制作临时合同</a>
<a role="button" type="button" class="btn btn-success" ng-click="exportAgreegatePDF()">
制作全支付合同</a>
<a role="button" type="button" class="btn btn-warning" ngf-select="uploadAgreeFile($file)"
accept="pdf/*">
上传合同</a> (通用合同请选择制作合同,非通用合同模板请人工制作合同后上传)
</div>
<div class="btn-group pull-right" role="group" aria-label="...">
<button type="button" ng-if="partner.open_status!=10 && partner.approve_result!=1"
class="btn btn-success" ng-click="passClient()">Pass
</button>
<button ng-if="(partner.open_status==1||partner.open_status==10) && partner.approve_result>3 || partner.open_status==4"
type="button" class="btn btn-primary" ng-click="refuse()">Refuse
</button>
</div>
<div ng-if="partner.open_status==10" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-success" ng-click="pass2GreenChannel()">
<i class="fa fa-paper-plane"></i>
Agree Green Channel
</button>
</div>
<a style="margin-top: 5px" ng-if="fileManager.source_agree_file" role="button"
class="btn-group btn btn-warning" style="margin-top: 5px"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"><i
class="fa fa-download"></i>下载合同</a>
<span style="margin-top: 5px" ng-if="partner.open_status != 5">
<a ng-if="partner.open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="notifyBD()">
<i class="fa fa-thumb-tack"></i> Notify BD</a>
</span>
<div ng-if="partner.audit_logs">
<hr>
<!--<p>-->
<!--<large><span class="label label-primary">BD完善资料</span></large>-->
<!--<large ng-repeat="log in partner.audit_logs"><i class="fa fa-arrow-right" aria-hidden="true"></i>-->
<!--<span class="label label-primary" ng-class="{'label-danger':log.remark.indexOf('打回')>-1,'label-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.remark}} (<b>{{log.operator}}</b> | {{log.create_time}})</span>-->
<!--</large>-->
<!--</p>-->
<div class="box-body table-responsive pad">
<small>
<div class="btn-group-vertical">
<button type="button" class="btn btn-xs btn-primary">完善资料</button>
</div>
</small>
<small ng-repeat="log in partner.audit_logs">
<i class="fa fa-arrow-right" aria-hidden="true"></i>
<div class="btn-group-vertical">
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.remark}}
</button>
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.operator}} | {{log.create_time}}
</button>
</div>
</small>
</div>
</div>
</div>
</div>
<div class="box" ng-if="('100'|withRole) && partner.show_all_permission"
ng-class="{'box-warning':partner.approve_result!=5,'box-danger':partner.approve_result==5}">
<div class="box-header with-border">
<h3 class="box-title">
<img style="height: 20px;width: 20px" src="/static/images/royalpay_sign_s.png">
Operation <span ng-if="partner.approve_result==5" style="color: red">
<div ng-if="partner.audit_logs">
<hr>
<!--<p>-->
<!--<large><span class="label label-primary">BD完善资料</span></large>-->
<!--<large ng-repeat="log in partner.audit_logs"><i class="fa fa-arrow-right" aria-hidden="true"></i>-->
<!--<span class="label label-primary" ng-class="{'label-danger':log.remark.indexOf('打回')>-1,'label-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.remark}} (<b>{{log.operator}}</b> | {{log.create_time}})</span>-->
<!--</large>-->
<!--</p>-->
<div class="box-body table-responsive pad">
<small>
<div class="btn-group-vertical">
<button type="button" class="btn btn-xs btn-primary">完善资料</button>
</div>
</small>
<small ng-repeat="log in partner.audit_logs">
<i class="fa fa-arrow-right" aria-hidden="true"></i>
<div class="btn-group-vertical">
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.remark}}
</button>
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.operator}} | {{log.create_time}}
</button>
</div>
</small>
</div>
</div>
</div>
</div>
<div class="box" ng-if="('100'|withRole) && partner.show_all_permission"
ng-class="{'box-warning':partner.approve_result!=5,'box-danger':partner.approve_result==5}">
<div class="box-header with-border">
<h3 class="box-title">
<img style="height: 20px;width: 20px" src="/static/images/royalpay_sign_s.png">
Operation <span ng-if="partner.approve_result==5" style="color: red">
(Refused
<small class="" ng-if="partner.approve_result==5">:{{partner.refuse_remark}}</small>
)</span><span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
style="color: green">(The Partner Using Green Channel Now!)</span>
【目前状态】-
<span ng-if="!partner.open_status">暂未提交申请</span>
<span ng-if="partner.open_status==1">待审核(合同制作中)</span>
<span ng-if="partner.open_status==2">合同制作完成</span>
<span ng-if="partner.open_status==3">BD处理中</span>
<span ng-if="partner.open_status==4">待审核(合规文件已提交)</span>
<span ng-if="partner.open_status==5">通过</span>
<span ng-if="partner.open_status==0">不通过</span>
<span ng-if="partner.open_status==10">绿色通道申请中</span>
</h3>
</div>
<div class="box-body">
<!--<div class="pull-left" ng-if="partner.approve_result==5">Remark:{{partner.refuse_remark}}</div>-->
<a ng-if="fileManager.source_agree_file" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"> <i
class="fa fa-download"></i>下载合同</a>
<div ng-if="partner.open_status==3" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-danger" ng-click="commitToCompliance()">Commit to Compliance
</button>
</div>
<div ng-if="!partner.open_status || (partner.open_status==9 && partner.approve_result==5)"
class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-success" ng-click="commit2GreenChannel()">
<i class="fa fa-paper-plane"></i>
绿色通道
</button>
</div>
<div ng-if="!partner.open_status" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-primary" ng-click="apply2makeAgreeFile()">
<i class="fa fa-paper-plane"></i>
提交合规制作合同
</button>
</div>
<div ng-if="partner.audit_logs">
<hr>
<!--<p>-->
<!--<large><span class="label label-primary">BD完善资料</span></large>-->
<!--<large ng-repeat="log in partner.audit_logs"><i class="fa fa-arrow-right" aria-hidden="true"></i>-->
<!--<span class="label label-primary" ng-class="{'label-danger':log.remark.indexOf('打回')>-1,'label-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.remark}} (<b>{{log.operator}}</b> | {{log.create_time}})</span>-->
<!--</large>-->
<!--</p>-->
<div class="box-body table-responsive pad">
<small>
<div class="btn-group-vertical" style="margin-top: 5px">
<button type="button" class="btn btn-xs btn-primary">BD完善资料</button>
</div>
</small>
<small ng-repeat="log in partner.audit_logs">
<i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px"></i>
<div class="btn-group-vertical" style="margin-top: 5px">
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.remark}}
</button>
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.operator}} | {{log.create_time}}
</button>
</div>
</small>
</div>
</div>
</div>
</div>
【目前状态】-
<span ng-if="!partner.open_status">暂未提交申请</span>
<span ng-if="partner.open_status==1">待审核(合同制作中)</span>
<span ng-if="partner.open_status==2">合同制作完成</span>
<span ng-if="partner.open_status==3">BD处理中</span>
<span ng-if="partner.open_status==4">待审核(合规文件已提交)</span>
<span ng-if="partner.open_status==5">通过</span>
<span ng-if="partner.open_status==0">不通过</span>
<span ng-if="partner.open_status==10">绿色通道申请中</span>
</h3>
</div>
<div class="box-body">
<!--<div class="pull-left" ng-if="partner.approve_result==5">Remark:{{partner.refuse_remark}}</div>-->
<a ng-if="fileManager.source_agree_file" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"> <i
class="fa fa-download"></i>下载合同</a>
<div ng-if="partner.open_status==3" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-danger" ng-click="commitToCompliance()">Commit to Compliance
</button>
</div>
<div ng-if="!partner.open_status || (partner.open_status==9 && partner.approve_result==5)"
class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-success" ng-click="commit2GreenChannel()">
<i class="fa fa-paper-plane"></i>
绿色通道
</button>
</div>
<div ng-if="!partner.open_status" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-primary" ng-click="apply2makeAgreeFile()">
<i class="fa fa-paper-plane"></i>
提交合规制作合同
</button>
</div>
<div ng-if="partner.audit_logs">
<hr>
<!--<p>-->
<!--<large><span class="label label-primary">BD完善资料</span></large>-->
<!--<large ng-repeat="log in partner.audit_logs"><i class="fa fa-arrow-right" aria-hidden="true"></i>-->
<!--<span class="label label-primary" ng-class="{'label-danger':log.remark.indexOf('打回')>-1,'label-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.remark}} (<b>{{log.operator}}</b> | {{log.create_time}})</span>-->
<!--</large>-->
<!--</p>-->
<div class="box-body table-responsive pad">
<small>
<div class="btn-group-vertical" style="margin-top: 5px">
<button type="button" class="btn btn-xs btn-primary">BD完善资料</button>
</div>
</small>
<small ng-repeat="log in partner.audit_logs">
<i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px"></i>
<div class="btn-group-vertical" style="margin-top: 5px">
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.remark}}
</button>
<button type="button" class="btn btn-xs btn-primary"
ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
{{log.operator}} | {{log.create_time}}
</button>
</div>
</small>
</div>
</div>
</div>
</div>
<!-- 卡支付审核 -->
<!-- 给合规权限查看 -->
<!-- 给合规权限查看 -->
<div class="box box-warning" ng-if="('10'|withRole)">
<div class="box-header with-border">
<h3 class="box-title"><span style="width: 20px;height: 20px"><img style="height: 20px;width: 20px" src="/static/images/card_payment_sign.png"></span>
<h3 class="box-title"><span style="width: 20px;height: 20px"><img style="height: 20px;width: 20px"
src="/static/images/card_payment_sign.png"></span>
Card Payment Compliance
<span ng-if="partner.upay_approve_result==5" style="color: red">(Refused
<small class="" ng-if="partner.upay_approve_result==5 || partner.upay_refuse_remark.length>0">:{{partner.upay_refuse_remark}}</small>)
@ -264,10 +269,12 @@
</button>
</div>
<div class="box-body" ng-if="partner.is_valid==1">
<a ng-if="partner.upay_open_status != 5 && partner.upay_open_status" role="button" type="button" class="btn btn-success" ng-click="exportCardAgreegatePDF()">
<a ng-if="partner.upay_open_status != 5 && partner.upay_open_status" role="button" type="button"
class="btn btn-success" ng-click="exportCardAgreegatePDF()">
制作Card Payment合同</a>
<div class="btn-group pull-right" role="group" aria-label="...">
<button type="button" ng-if="partner.upay_open_status==1 && partner.upay_approve_result>1 || partner.upay_open_status==4"
<button type="button"
ng-if="partner.upay_open_status==1 && partner.upay_approve_result>1 || partner.upay_open_status==4"
class="btn btn-success" ng-click="passCardClient()">Pass
</button>
<button ng-if="partner.upay_open_status==1 ||partner.upay_open_status==4"
@ -280,7 +287,7 @@
<a ng-if="termsAndConditionsFile.terms_and_conditions_file" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Terms And Conditions合同</a>
<span style="margin-top: 5px"ng-if="partner.upay_open_status != 5">
<span style="margin-top: 5px" ng-if="partner.upay_open_status != 5">
<a ng-if="partner.upay_open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="cardNotifyBD()">
<i class="fa fa-thumb-tack"></i> Notify BD</a>
@ -316,11 +323,12 @@
</div>
</div>
</div>
<!-- 给BD权限查看 -->
<!-- 给BD权限查看 -->
<div class="box" ng-if="('100'|withRole) && partner.show_all_permission"
ng-class="{'box-warning':partner.upay_approve_result!=5,'box-danger':partner.upay_approve_result==5}">
<div class="box-header with-border">
<h3 class="box-title"><img style="height: 20px;width: 20px" src="/static/images/card_payment_sign.png"> Operation <span ng-if="partner.upay_approve_result==5" style="color: red">
<h3 class="box-title"><img style="height: 20px;width: 20px" src="/static/images/card_payment_sign.png">
Operation <span ng-if="partner.upay_approve_result==5" style="color: red">
(Refused
<small class="" ng-if="partner.upay_approve_result==5">:{{partner.upay_refuse_remark}}</small>
)</span><span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
@ -337,14 +345,17 @@
</h3>
</div>
<div class="box-body">
<a ng-if="letterOfOfferFileManager.letter_of_offer_file && partner.upay_approve_result!=1" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Letter Of Offer合同</a>
<a ng-if="termsAndConditionsFile.terms_and_conditions_file && partner.upay_approve_result!=1" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Terms And Conditions合同</a>
<a ng-if="letterOfOfferFileManager.letter_of_offer_file && partner.upay_approve_result!=1" role="button"
class="btn-group btn btn-warning"
type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Letter Of Offer合同</a>
<a ng-if="termsAndConditionsFile.terms_and_conditions_file && partner.upay_approve_result!=1" role="button"
class="btn-group btn btn-warning"
type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Terms And Conditions合同</a>
<div ng-if="partner.upay_open_status==3" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-danger" ng-click="commitToCardCompliance()">Commit to Compliance</button>
<button type="button" class="btn btn-danger" ng-click="commitToCardCompliance()">Commit to Compliance
</button>
</div>
<div ng-if="!partner.upay_open_status" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-primary" ng-click="apply2makeCardAgreeFile()">
@ -377,7 +388,7 @@
</div>
</div>
</div>
<!-- 邮件重发通知 -->
<!-- 邮件重发通知 -->
<div class="box box-warning" ng-if="(partner.approve_result==1 && partner.approve_email_send==2) ||
(partner.upay_approve_result==1 && partner.upay_approve_email_send==2)">
@ -488,13 +499,14 @@
<div class="col-sm-10">
<p class="form-control-static">
<span ng-bind="partner.company_name"></span>
<span
ng-if="isComplianceOfCompanyName && partner.open_status"
style="margin-left: 10px;font-weight: 700;color: red;">
<span ng-bind="partner.company_name"></span>
<span
ng-if="isComplianceOfCompanyName && partner.open_status"
style="margin-left: 10px;font-weight: 700;color: red;">
注意:(微信渠道可能不合规)
</span>
<span ng-if="('10000000010' | withRole)" class="description-text text-red" ng-bind="partner.same_company_name"></span>
<span ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_company_name"></span>
</p>
</div>
</div>
@ -681,11 +693,13 @@
<button class="btn btn-default"
ng-class="{active:partner.client_pay_type.indexOf('1')>=0}">
<i class="fa fa-mixcloud"></i>
线上</button>
线上
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_type.indexOf('2')>=0}">
<i class="fa fa-shopping-basket"></i>
线下</button>
线下
</button>
</div>
</div>
<div class="form-group"
@ -696,23 +710,28 @@
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('101')>=0}">
<i class="fa fa-desktop"></i>
PC网站</button>
PC网站
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('102')>=0}">
<i class="fa fa-mobile-phone"></i>
手机端网站</button>
手机端网站
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('103')>=0}">
<i class="fa fa-mobile-phone"></i>
APP</button>
APP
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('104')>=0}">
<i class="fa fa-wechat"></i>
微信内、支付宝内网站</button>
微信内、支付宝内网站
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('105')>=0}">
<i class="fa fa-wechat"></i>
小程序</button>
小程序
</button>
</div>
</div>
<div ng-if="partner.client_pay_type.indexOf('2')>=0">
@ -723,19 +742,23 @@
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('201')>=0}">
<i class="fa fa-qrcode"></i>
二维码立牌</button>
二维码立牌
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('202')>=0}">
<i class="fa fa-user"></i>
RoyalPay POS</button>
RoyalPay POS
</button>
<button class="btn btn-default"
ng-class="{active:(partner.client_pay_desc.join(',').indexOf('203')>=0)}">
<i class="fa fa-laptop"></i>
收银系统</button>
收银系统
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('204')>=0}">
<i class="fa fa-shopping-cart"></i>
无人售货机</button>
无人售货机
</button>
</div>
</div>
</div>
@ -747,43 +770,53 @@
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20301')>=0}">
<i class="fa fa-laptop"></i>
ipos</button>
ipos
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20302')>=0}">
<i class="fa fa-laptop"></i>
pospal</button>
pospal
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20304')>=0}">
<i class="fa fa-laptop"></i>
Lotus</button>
Lotus
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20305')>=0}">
<i class="fa fa-laptop"></i>
AoShangBao</button>
AoShangBao
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20306')>=0}">
<i class="fa fa-laptop"></i>
Infinity</button>
Infinity
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20307')>=0}">
<i class="fa fa-laptop"></i>
EasyCloud</button>
EasyCloud
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20303')>=0}">
<i class="fa fa-laptop"></i>
Aus Post</button>
Aus Post
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20308')>=0}">
<i class="fa fa-laptop"></i>
AoMaiKe</button>
AoMaiKe
</button>
<button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20399')>=0}">
<i class="fa fa-laptop"></i>
其他</button>
其他
</button>
</div>
</div>
</div>
<div class="form-group" ng-if="partner.company_website!='' && partner.company_website.length>0">
<div class="form-group"
ng-if="partner.company_website!='' && partner.company_website.length>0">
<label class="control-label col-sm-2">Website</label>
<div class="col-sm-10" style="padding-top: 7px;">
@ -796,7 +829,8 @@
<label class="control-label col-sm-2">Shop Photo</label>
<div class="col-sm-3 col-xs-5"><em>1:</em>&nbsp;
<div>
<a class="thumbnail" target="_blank" ng-href="{{partner.company_photo}}">
<a class="thumbnail" target="_blank"
ng-href="{{partner.company_photo}}">
<img ng-src="{{partner.company_photo}}" style="max-height: 100px">
</a>
</div>
@ -812,14 +846,16 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Expected credit card monthly revenue ($)</label>
<label class="control-label col-sm-2">Expected credit card monthly revenue
($)</label>
<div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.expected_card_revenue"></p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Average credit card transaction value ($)</label>
<label class="control-label col-sm-2">Average credit card transaction value
($)</label>
<div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.average_card_transaction"></p>
@ -889,7 +925,8 @@
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.contact_phone"></p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red" ng-bind="partner.same_phone"></p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_phone"></p>
</div>
</div>
<div class="form-group col-sm-6">
@ -898,19 +935,24 @@
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.contact_email"></span>
</span>
</p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_email">
<div>
<a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
role="button"
ng-click="resendApproveEmail()">
<i class="fa fa-envelope"></i> Resend Email
ng-click="resendApproveEmail('crossborder')">
<i class="fa fa-envelope"></i> Resend Cross-Border
</a>
<span ng-if="('10'|withRole)">
<i style="cursor: pointer" ng-click="addSub()" ng-if="!partner.unsubscribe"
class="fa fa-star text-yellow"></i>
<i style="cursor: pointer" ng-click="removeSub()"
ng-if="partner.unsubscribe" class="fa fa-star-o text-yellow"></i>
</span>
<br/>
<a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
role="button"
ng-click="resendApproveEmail('cardpayment')">
<i class="fa fa-envelope"></i> Resend CardPayment
</a>
</div>
</p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red" ng-bind="partner.same_email"></p>
</div>
</div>
@ -936,54 +978,59 @@
</div>
</div>
<div ng-if="partner.representativeInfo"><hr/>
<div class="panel-heading">Legal Representative</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Representative Name</label>
<div ng-if="partner.representativeInfo">
<hr/>
<div class="panel-heading">Legal Representative</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Representative Name</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.representative_person "></p>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.representative_person "></p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.legal_representative_wechatid"></p>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.legal_representative_wechatid"></p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.phone"></p>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.phone"></p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">E-mail</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">E-mail</label>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.email"></span>
</p>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.email"></span>
</p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Job Title</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Job Title</label>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.job_title"></span>
</p>
<div class="col-sm-8">
<p class="form-control-static">
<span ng-bind="partner.representativeInfo.job_title"></span>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-if="partner.representativeInfo && partner.representativeInfo.marketing_person"><hr/>
<div ng-if="partner.representativeInfo && partner.representativeInfo.marketing_person">
<hr/>
<div class="panel-heading">Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
@ -991,21 +1038,24 @@
<label class="control-label col-sm-4">Marketing Name</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_person"></p>
<p class="form-control-static"
ng-bind="partner.representativeInfo.marketing_person"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_wechatid"></p>
<p class="form-control-static"
ng-bind="partner.representativeInfo.marketing_wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.marketing_phone"></p>
<p class="form-control-static"
ng-bind="partner.representativeInfo.marketing_phone"></p>
</div>
</div>
<div class="form-group col-sm-6">
@ -1041,7 +1091,8 @@
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.address"></p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red" ng-bind="partner.same_address"></p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_address"></p>
</div>
</div>
<div class="form-group col-sm-6">
@ -1075,41 +1126,46 @@
</div>
</div>
<div ng-if="partner.representativeInfo"><hr/>
<div class="panel-heading">Registered Address Information</div>
<div class="panel-body">
<div class="form-horizontal">
<div ng-if="partner.representativeInfo">
<hr/>
<div class="panel-heading">Registered Address Information</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Registered Address</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Registered Address</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.address"></p>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.address"></p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.suburb"></p>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.suburb"></p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">PostCode</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">PostCode</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.postcode"></p>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.postcode"></p>
</div>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">State</label>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">State</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.state"></p>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.state"></p>
</div>
</div>
</div>
</div>
</div>
<hr/>
</div>
@ -1264,15 +1320,20 @@
<div class="col-sm-8">
<span class="checkbox-inline">
<label>
<input type="checkbox" checked disabled ng-if="partner.mw_industry">
<input type="checkbox" disabled ng-if="!partner.mw_industry">
<input type="checkbox" checked disabled
ng-if="partner.mw_industry">
<input type="checkbox" disabled
ng-if="!partner.mw_industry">
AU Credit Card | AU 信用卡支付
</label>
</span>
<span class="checkbox-inline">
<label>
<input type="checkbox" ng-if="partner.enable_international_card" checked disabled>
<input type="checkbox" ng-if="!partner.enable_international_card" disabled>
<input type="checkbox"
ng-if="partner.enable_international_card" checked
disabled>
<input type="checkbox"
ng-if="!partner.enable_international_card" disabled>
Intl Credit Card|国际信用卡
</label>
</span>
@ -1283,7 +1344,8 @@
</div>
<div style="text-align: center">
<a role="button" style="margin-bottom: 25px;" class="btn btn-danger btn-sm ng-scope" ng-click="deleteClient()">Destroy</a>
<a role="button" style="margin-bottom: 25px;" class="btn btn-danger btn-sm ng-scope"
ng-click="deleteClient()">Destroy</a>
<a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope"
ng-if="('10'|withRole)" ng-click="complianceCheck()">check</a>
</div>

Loading…
Cancel
Save