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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/main/ui/static/payment/partner/partner-manage.js
#	src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
master
dalong306 4 years ago
parent 8ba52a1513 a1d914418e
commit 5c21eb1be2
8 changed files with 1628 additions and 924 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.72</version> <version>2.3.74-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

46
src/db/2.3.73/update.sql
Unescape View File

@ -0,0 +1,46 @@
--2020-11-24微信渠道-商户进件字段添加
alter table sys_wx_merchant_apply modify contact_phone varchar(20) not null;
alter table sys_wx_merchant_apply
add merchant_country_code varchar(5) not null comment '商户国家编码';
alter table sys_wx_merchant_apply
add extra_merchant_type varchar(15) not null comment '商户类型:1.Enterprise 2.Individual';
alter table sys_wx_merchant_apply
add mcc_code varchar(4) not null comment 'Mcc编码';
alter table sys_wx_merchant_apply
add extra_reg_cer_number varchar(50) null comment '公司注册文件编号';
alter table sys_wx_merchant_apply
add extra_reg_cer_exp_date varchar(10) null comment '公司注册文件日期，格式:yyyy-MM-dd';
alter table sys_wx_merchant_apply
add stores_address varchar(128) null comment '店铺地址';
alter table sys_wx_merchant_apply
add business_type varchar(10) not null comment 'BOTH,OFFLINE,ONLINE,固定值为BOTH';
alter table sys_wx_merchant_apply
add director_name varchar(128) null comment '董事';
alter table sys_wx_merchant_apply
add director_id_number varchar(128) null comment '董事身份证号';
alter table sys_wx_merchant_apply
add principal_name varchar(128) null comment '负责人';
alter table sys_wx_merchant_apply
add principal_id_number varchar(128) null comment '负责人身份证号';
alter table sys_wx_merchant_apply
add is_valid tinyint(1) default '1' null comment '微信子商户进件信息是否有效';
-- 商户表 增加信息
ALTER TABLE `sys_clients`
ADD COLUMN certificat_expire_date date DEFAULT NULL COMMENT '注册证书过期时间';

1073
src/main/ui/static/payment/partner/partner-manage.js
View File

File diff suppressed because it is too large Load Diff

23
src/main/ui/static/payment/partner/templates/md_sub_merchant_id.html
Unescape View File

@ -0,0 +1,23 @@
<div class="modal-header">
<h4>Modify</h4>
</div>
<div class="modal-body">
<div class="row">
<div style="display: flex;justify-content: center;width: 100%;">
<form novalidate name="customerInfoForm" class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-4" style="white-space: nowrap;">Sub Merchant Id:</label>
<div class="col-sm-8">
<input class="form-control" type="text" ng-model="merchantId">
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="modal-footer" style="text-align: center;">
<div class="btn-group">
<button class="btn btn-info" style="width: 100px;" ng-click="confirm()" ng-disabled='flag'>确定</button>
</div>
</div>

402
src/main/ui/static/payment/partner/templates/partner_detail.html
Unescape View File

@ -36,7 +36,7 @@
.btn-default:active, .btn-default:active,
.btn-default.active, .btn-default.active,
.open > .dropdown-toggle.btn-default { .open>.dropdown-toggle.btn-default {
color: #333; color: #333;
background-color: #f7bf90; background-color: #f7bf90;
border-color: #adadad; border-color: #adadad;
@ -44,12 +44,13 @@
</style> </style>
<section class="content-header"> <section class="content-header">
<h1> <h1>
<span ng-bind="partner.company_name"></span><span ng-if="partner.source==5" style="color:red;font-size:14px">(Gateway API)</span> <span ng-bind="partner.company_name"></span><span ng-if="partner.source==5"
style="color:red;font-size:14px">(Gateway API)</span>
<i ng-if="partner.parent_client_id" class="fa fa-sitemap" title="Sub Partner"></i> <i ng-if="partner.parent_client_id" class="fa fa-sitemap" title="Sub Partner"></i>
<a class="text-primary" ng-if="'00011'|withRole" title="Mock Login" <a class="text-primary" ng-if="'00011'|withRole" title="Mock Login"
ng-href="/global/userstatus/current_manager/clients/{{partner.client_moniker}}/auth" target="_blank"><i ng-href="/global/userstatus/current_manager/clients/{{partner.client_moniker}}/auth" target="_blank"><i
class="fa fa-share"></i></a><span ng-if="partner.is_valid==0" class="fa fa-share"></i></a><span ng-if="partner.is_valid==0"
ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span> ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
@ -64,13 +65,12 @@
<div class="box box-warning" ng-if="('10'|withRole)"> <div class="box box-warning" ng-if="('10'|withRole)">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><img style="height: 20px;width: 20px" height="20px" <h3 class="box-title"><img style="height: 20px;width: 20px" height="20px"
src="/static/images/royalpay_sign_s.png">Cross-border payment Compliance <span src="/static/images/royalpay_sign_s.png">Cross-border payment Compliance <span
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0" ng-if="partner.approve_result==5 || partner.refuse_remark.length>0" 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>
<span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2" <span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
style="color: green">(The Partner Using Green Channel Now!)</span> style="color: green">(The Partner Using Green Channel Now!)</span>
【目前状态】- 【目前状态】-
<b ng-if="partner.source==4"> <b ng-if="partner.source==4">
<span ng-if="!partner.approve_result">(自助申请)资料完善中</span> <span ng-if="!partner.approve_result">(自助申请)资料完善中</span>
@ -91,7 +91,7 @@
<span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span> <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
</h3> </h3>
<button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;" <button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;"
ng-click="revertClient()">Revert ng-click="revertClient()">Revert
</button> </button>
</div> </div>
<div class="box-body" ng-if="partner.is_valid==1"> <div class="box-body" ng-if="partner.is_valid==1">
@ -103,15 +103,16 @@
<a role="button" type="button" class="btn btn-success" ng-click="exportAgreegatePDF()"> <a role="button" type="button" class="btn btn-success" ng-click="exportAgreegatePDF()">
制作全支付合同</a> 制作全支付合同</a>
<a role="button" type="button" class="btn btn-warning" ngf-select="uploadAgreeFile($file)" <a role="button" type="button" class="btn btn-warning" ngf-select="uploadAgreeFile($file)"
accept="pdf/*"> accept="pdf/*">
上传合同</a> (通用合同请选择制作合同,非通用合同模板请人工制作合同后上传) 上传合同</a> (通用合同请选择制作合同,非通用合同模板请人工制作合同后上传)
</div> </div>
<div class="btn-group pull-right" role="group" aria-label="..."> <div class="btn-group pull-right" role="group" aria-label="...">
<button type="button" ng-if="partner.open_status!=10 && partner.approve_result!=1" <button type="button" ng-if="partner.open_status!=10 && partner.approve_result!=1"
class="btn btn-success" ng-click="passClient()">Pass class="btn btn-success" ng-click="passClient()">Pass
</button> </button>
<button ng-if="(partner.open_status==1||partner.open_status==10) && partner.approve_result>3 || partner.open_status==4" <button
type="button" class="btn btn-primary" ng-click="refuse()">Refuse 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> </button>
</div> </div>
@ -122,14 +123,13 @@
</button> </button>
</div> </div>
<a style="margin-top: 5px" ng-if="fileManager.source_agree_file" role="button" <a style="margin-top: 5px" ng-if="fileManager.source_agree_file" role="button"
class="btn-group btn btn-warning" style="margin-top: 5px" class="btn-group btn btn-warning" style="margin-top: 5px" type="button"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"><i ng-href="{{fileManager.source_agree_file}}" target="_blank"><i class="fa fa-download"></i>下载合同</a>
class="fa fa-download"></i>下载合同</a>
<span style="margin-top: 5px" ng-if="partner.open_status != 5"> <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" <a ng-if="partner.open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="notifyBD()"> ng-click="notifyBD()">
<i class="fa fa-thumb-tack"></i> Notify BD</a> <i class="fa fa-thumb-tack"></i> Notify BD</a>
</span> </span>
<div ng-if="partner.audit_logs"> <div ng-if="partner.audit_logs">
<hr> <hr>
<!--<p>--> <!--<p>-->
@ -148,11 +148,11 @@
<i class="fa fa-arrow-right" aria-hidden="true"></i> <i class="fa fa-arrow-right" aria-hidden="true"></i>
<div class="btn-group-vertical"> <div class="btn-group-vertical">
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.remark}}
</button> </button>
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.operator}} | {{log.create_time}}
</button> </button>
</div> </div>
@ -162,15 +162,15 @@
</div> </div>
</div> </div>
<div class="box" ng-if="('100'|withRole) && partner.show_all_permission" <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}"> ng-class="{'box-warning':partner.approve_result!=5,'box-danger':partner.approve_result==5}">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"> <h3 class="box-title">
<img style="height: 20px;width: 20px" src="/static/images/royalpay_sign_s.png"> <img style="height: 20px;width: 20px" src="/static/images/royalpay_sign_s.png">
Operation <span ng-if="partner.approve_result==5" style="color: red"> Operation <span ng-if="partner.approve_result==5" style="color: red">
(Refused (Refused
<small class="" ng-if="partner.approve_result==5">:{{partner.refuse_remark}}</small> <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" )</span><span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
style="color: green">(The Partner Using Green Channel Now!)</span> style="color: green">(The Partner Using Green Channel Now!)</span>
【目前状态】- 【目前状态】-
<span ng-if="!partner.open_status">暂未提交申请</span> <span ng-if="!partner.open_status">暂未提交申请</span>
<span ng-if="partner.open_status==1">待审核（合同制作中）</span> <span ng-if="partner.open_status==1">待审核（合同制作中）</span>
@ -184,15 +184,14 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<!--<div class="pull-left" ng-if="partner.approve_result==5">Remark:{{partner.refuse_remark}}</div>--> <!--<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" <a ng-if="fileManager.source_agree_file" role="button" class="btn-group btn btn-warning" type="button"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"> <i ng-href="{{fileManager.source_agree_file}}" target="_blank"> <i class="fa fa-download"></i>下载合同</a>
class="fa fa-download"></i>下载合同</a>
<div ng-if="partner.open_status==3" class="btn-group pull-right" role="group" aria-label="..."> <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 type="button" class="btn btn-danger" ng-click="commitToCompliance()">Commit to Compliance
</button> </button>
</div> </div>
<div ng-if="!partner.open_status || (partner.open_status==9 && partner.approve_result==5)" <div ng-if="!partner.open_status || (partner.open_status==9 && partner.approve_result==5)"
class="btn-group pull-right" role="group" aria-label="..."> class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-success" ng-click="commit2GreenChannel()"> <button type="button" class="btn btn-success" ng-click="commit2GreenChannel()">
<i class="fa fa-paper-plane"></i> <i class="fa fa-paper-plane"></i>
绿色通道 绿色通道
@ -222,11 +221,11 @@
<i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px"></i> <i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px"></i>
<div class="btn-group-vertical" style="margin-top: 5px"> <div class="btn-group-vertical" style="margin-top: 5px">
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.remark}}
</button> </button>
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.operator}} | {{log.create_time}}
</button> </button>
</div> </div>
@ -241,10 +240,11 @@
<div class="box box-warning" ng-if="('10'|withRole)"> <div class="box box-warning" ng-if="('10'|withRole)">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><span style="width: 20px;height: 20px"><img style="height: 20px;width: 20px" <h3 class="box-title"><span style="width: 20px;height: 20px"><img style="height: 20px;width: 20px"
src="/static/images/card_payment_sign.png"></span> src="/static/images/card_payment_sign.png"></span>
Card Payment Compliance Card Payment Compliance
<span ng-if="partner.upay_approve_result==5" style="color: red">(Refused <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>) <small class=""
ng-if="partner.upay_approve_result==5 || partner.upay_refuse_remark.length>0">:{{partner.upay_refuse_remark}}</small>)
</span> </span>
【目前状态】- 【目前状态】-
<b ng-if="partner.source==4"> <b ng-if="partner.source==4">
@ -265,38 +265,38 @@
<span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span> <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
</h3> </h3>
<button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;" <button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;"
ng-click="revertClient()">Revert ng-click="revertClient()">Revert
</button> </button>
</div> </div>
<div class="box-body" ng-if="partner.is_valid==1"> <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" <a ng-if="partner.upay_open_status != 5 && partner.upay_open_status" role="button" type="button"
class="btn btn-success" ng-click="exportCardAgreegatePDF()"> class="btn btn-success" ng-click="exportCardAgreegatePDF()">
制作Card Payment合同</a> 制作Card Payment合同</a>
<div class="btn-group pull-right" role="group" aria-label="..."> <div class="btn-group pull-right" role="group" aria-label="...">
<button type="button" <button type="button"
ng-if="partner.upay_open_status==1 && partner.upay_approve_result>1 || partner.upay_open_status==4" 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 class="btn btn-success" ng-click="passCardClient()">Pass
</button> </button>
<button ng-if="partner.upay_open_status==1 ||partner.upay_open_status==4" <button ng-if="partner.upay_open_status==1 ||partner.upay_open_status==4" type="button"
type="button" class="btn btn-primary" ng-click="cardRefuse()">Refuse class="btn btn-primary" ng-click="cardRefuse()">Refuse
</button> </button>
</div> </div>
<a ng-if="letterOfOfferFileManager.letter_of_offer_file" role="button" class="btn-group btn btn-warning" <a ng-if="letterOfOfferFileManager.letter_of_offer_file" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Letter Of Offer合同</a> class="fa fa-download"></i>下载Letter Of Offer合同</a>
<!-- <a ng-if="termsAndConditionsFile.terms_and_conditions_file" role="button" class="btn-group btn btn-warning"--> <!-- <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--> <!-- type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i-->
<!-- class="fa fa-download"></i>下载Terms And Conditions合同</a>--> <!-- 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" <a ng-if="partner.upay_open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="cardNotifyBD()"> ng-click="cardNotifyBD()">
<i class="fa fa-thumb-tack"></i> Notify BD</a> <i class="fa fa-thumb-tack"></i> Notify BD</a>
<div ng-if="!partner.upay_open_status" class="btn-group pull-right" role="group" aria-label="..."> <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()"> <button type="button" class="btn btn-primary" ng-click="apply2makeCardAgreeFile()">
<i class="fa fa-paper-plane"></i> <i class="fa fa-paper-plane"></i>
提交合规制作卡支付合同 提交合规制作卡支付合同
</button> </button>
</div> </div>
</span> </span>
<div ng-if="partner.audit_card_logs"> <div ng-if="partner.audit_card_logs">
<hr> <hr>
@ -310,11 +310,11 @@
<i class="fa fa-arrow-right" aria-hidden="true"></i> <i class="fa fa-arrow-right" aria-hidden="true"></i>
<div class="btn-group-vertical"> <div class="btn-group-vertical">
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.remark}}
</button> </button>
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.operator}} | {{log.create_time}}
</button> </button>
</div> </div>
@ -325,14 +325,14 @@
</div> </div>
<!-- 给BD权限查看 --> <!-- 给BD权限查看 -->
<div class="box" ng-if="('100'|withRole) && partner.show_all_permission" <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}"> ng-class="{'box-warning':partner.upay_approve_result!=5,'box-danger':partner.upay_approve_result==5}">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><img style="height: 20px;width: 20px" src="/static/images/card_payment_sign.png"> <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"> Operation <span ng-if="partner.upay_approve_result==5" style="color: red">
(Refused (Refused
<small class="" ng-if="partner.upay_approve_result==5">:{{partner.upay_refuse_remark}}</small> <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" )</span><span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
style="color: green">(The Partner Using Green Channel Now!)</span> style="color: green">(The Partner Using Green Channel Now!)</span>
【目前状态】- 【目前状态】-
<span ng-if="!partner.upay_open_status">暂未提交申请</span> <span ng-if="!partner.upay_open_status">暂未提交申请</span>
<span ng-if="partner.upay_open_status==1">待审核（合同制作中）</span> <span ng-if="partner.upay_open_status==1">待审核（合同制作中）</span>
@ -346,8 +346,8 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<a ng-if="letterOfOfferFileManager.letter_of_offer_file && partner.upay_approve_result!=1" role="button" <a ng-if="letterOfOfferFileManager.letter_of_offer_file && partner.upay_approve_result!=1" role="button"
class="btn-group btn btn-warning" class="btn-group btn btn-warning" type="button"
type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Letter Of Offer合同</a> class="fa fa-download"></i>下载Letter Of Offer合同</a>
<!--<a ng-if="termsAndConditionsFile.terms_and_conditions_file && partner.upay_approve_result!=1" role="button" <!--<a ng-if="termsAndConditionsFile.terms_and_conditions_file && partner.upay_approve_result!=1" role="button"
class="btn-group btn btn-warning" class="btn-group btn btn-warning"
@ -375,11 +375,11 @@
<i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px"></i> <i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px"></i>
<div class="btn-group-vertical"> <div class="btn-group-vertical">
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.remark}}
</button> </button>
<button type="button" class="btn btn-xs btn-primary" <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)}"> 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}} {{log.operator}} | {{log.create_time}}
</button> </button>
</div> </div>
@ -420,8 +420,7 @@
<li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1"> <li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1">
<a ui-sref=".accounts">Partner Accounts</a> <a ui-sref=".accounts">Partner Accounts</a>
</li> </li>
<li ui-sref-active="active" <li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1">
ng-if="partner.show_all_permission && partner.is_valid==1">
<a ui-sref=".subpartners">Subpartners</a> <a ui-sref=".subpartners">Subpartners</a>
</li> </li>
<li ui-sref-active="active" ng-if="false && partner.is_valid==1"> <li ui-sref-active="active" ng-if="false && partner.is_valid==1">
@ -455,7 +454,7 @@
<a ui-sref=".product">Product</a> <a ui-sref=".product">Product</a>
</li> </li>
<li ui-sref-active="active" ng-if="('10'|withRole) && partner.is_valid==1"> <li ui-sref-active="active" ng-if="('10'|withRole) && partner.is_valid==1">
<a ui-sref=".sub_merchant_applicaitons">Merchant Id Applicaitons</a> <a ui-sref=".sub_merchant_applicaitons">MID Management</a>
</li> </li>
<li ui-sref-active="active" ng-if="partner.is_valid==1"> <li ui-sref-active="active" ng-if="partner.is_valid==1">
<a ui-sref=".permission_client">Permissions</a> <a ui-sref=".permission_client">Permissions</a>
@ -469,12 +468,12 @@
<div class="panel-heading"> <div class="panel-heading">
Partner Basic Information Partner Basic Information
<a role="button" class="" ng-click="configMasterMerchant()" <a role="button" class="" ng-click="configMasterMerchant()"
ng-if="partner.show_all_permission && ('10'|withRole)||(partner.show_all_permission && ('1'|withRole))"> ng-if="partner.show_all_permission && ('10'|withRole)||(partner.show_all_permission && ('1'|withRole))">
(<i class="fa fa-arrows" aria-hidden="true"></i> Config master merchant) (<i class="fa fa-arrows" aria-hidden="true"></i> Config master merchant)
</a> </a>
<a role="button" class="pull-right" <a role="button" class="pull-right"
ng-if="partner.show_all_permission && ('110'|withRole)||(partner.show_all_permission && ('1'|withRole))" ng-if="partner.show_all_permission && ('110'|withRole)||(partner.show_all_permission && ('1'|withRole))"
ui-sref="partners.edit({clientMoniker:partner.client_moniker})"> ui-sref="partners.edit({clientMoniker:partner.client_moniker})">
<i class="fa fa-edit"></i> Edit <i class="fa fa-edit"></i> Edit
</a> </a>
</div> </div>
@ -487,10 +486,10 @@
<span id="parent_code">{{partner.client_moniker}}</span> <span id="parent_code">{{partner.client_moniker}}</span>
<span ng-if="partner.parent_client_id!=null">(Sub Partner of <span ng-if="partner.parent_client_id!=null">(Sub Partner of
<a ui-sref="partners.detail({clientMoniker:partner.parent_client.client_moniker})" <a ui-sref="partners.detail({clientMoniker:partner.parent_client.client_moniker})"
ng-bind="partner.parent_client.client_moniker"></a>) ng-bind="partner.parent_client.client_moniker"></a>)
</span> </span>
<span ng-if="partner.is_valid==0" <span ng-if="partner.is_valid==0"
ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span> ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
</p> </p>
</div> </div>
</div> </div>
@ -500,13 +499,12 @@
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static"> <p class="form-control-static">
<span ng-bind="partner.company_name"></span> <span ng-bind="partner.company_name"></span>
<span <span ng-if="isComplianceOfCompanyName && partner.open_status"
ng-if="isComplianceOfCompanyName && partner.open_status" style="margin-left: 10px;font-weight: 700;color: red;">
style="margin-left: 10px;font-weight: 700;color: red;"> 注意:（微信渠道可能不合规）
注意:（微信渠道可能不合规） </span>
</span>
<span ng-if="('10000000010' | withRole)" class="description-text text-red" <span ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_company_name"></span> ng-bind="partner.same_company_name"></span>
</p> </p>
</div> </div>
</div> </div>
@ -516,8 +514,8 @@
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static pull-left" ng-bind="partner.short_name"></p> <p class="form-control-static pull-left" ng-bind="partner.short_name"></p>
<p class="form-control-static pull-left" <p class="form-control-static pull-left"
ng-if="isComplianceOfShortName && partner.open_status" ng-if="isComplianceOfShortName && partner.open_status"
style="margin-left: 10px;font-weight: 700;color: red;"> style="margin-left: 10px;font-weight: 700;color: red;">
注意:（微信渠道可能不合规） 注意:（微信渠道可能不合规）
</p> </p>
</div> </div>
@ -540,8 +538,8 @@
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static pull-left" ng-bind="partner.store_name"></p> <p class="form-control-static pull-left" ng-bind="partner.store_name"></p>
<p class="form-control-static pull-left" <p class="form-control-static pull-left"
ng-if="isComplianceOfShortName && partner.open_status" ng-if="isComplianceOfShortName && partner.open_status"
style="margin-left: 10px;font-weight: 700;color: red;"> style="margin-left: 10px;font-weight: 700;color: red;">
注意:（微信渠道可能不合规） 注意:（微信渠道可能不合规）
</p> </p>
</div> </div>
@ -552,41 +550,37 @@
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static pull-left" <p class="form-control-static pull-left"
ng-bind="partner.business_structure|business_structure"></p> ng-bind="partner.business_structure|business_structure"></p>
<p class="form-control-static pull-left" <p class="form-control-static pull-left"
ng-if="isComplianceOfBusinessStructure && partner.open_status" ng-if="isComplianceOfBusinessStructure && partner.open_status"
style="margin-left: 10px;font-weight: 700;color: red;"> style="margin-left: 10px;font-weight: 700;color: red;">
注意:（微信渠道可能不合规） 注意:（微信渠道可能不合规）
</p> </p>
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.director_name" > <div class="form-group" ng-if="partner.director_name">
<label <label class="control-label col-sm-2">Director Name</label>
class="control-label col-sm-2">Director Name</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.director_name"></p> <p class="form-control-static" ng-bind="partner.director_name"></p>
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.director_id_number"> <div class="form-group" ng-if="partner.director_id_number">
<label <label class="control-label col-sm-2">Director Id</label>
class="control-label col-sm-2">Director Id</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.director_id_number"></p> <p class="form-control-static" ng-bind="partner.director_id_number"></p>
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.principal_name"> <div class="form-group" ng-if="partner.principal_name">
<label <label class="control-label col-sm-2">Principal Name</label>
class="control-label col-sm-2">Principal Name</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.principal_name"></p> <p class="form-control-static" ng-bind="partner.principal_name"></p>
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.principal_id_number"> <div class="form-group" ng-if="partner.principal_id_number">
<label <label class="control-label col-sm-2">Principal Id</label>
class="control-label col-sm-2">Principal Id</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.principal_id_number"></p> <p class="form-control-static" ng-bind="partner.principal_id_number"></p>
@ -611,8 +605,9 @@
<p class="form-control-static" ng-bind="partner.acn"></p> <p class="form-control-static" ng-bind="partner.acn"></p>
</div> </div>
</div> </div>
<div class="form-group" > <div class="form-group">
<label class="control-label col-sm-2">Expiration Date of Registration Certificat</label> <label class="control-label col-sm-2">Expiration Date of Registration
Certificat</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.certificat_expire_date"></p> <p class="form-control-static" ng-bind="partner.certificat_expire_date"></p>
@ -643,7 +638,7 @@
<label class="control-label col-sm-2">Local Merchant</label> <label class="control-label col-sm-2">Local Merchant</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="partner.local_merchant" bs-switch <input type="checkbox" ng-model="partner.local_merchant" bs-switch
switch-change="changeLocalMerchant()"> switch-change="changeLocalMerchant()">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -684,36 +679,39 @@
<!--</p>--> <!--</p>-->
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th>Start Date</th> <th>Start Date</th>
<th>End Date</th> <th>End Date</th>
<th>BD Name</th> <th>BD Name</th>
<th>Proportion</th> <th>Proportion</th>
<th ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission)"> <th
Operation ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission)">
</th> Operation
</tr> </th>
</tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="bd in partner.client_bds"> <tr ng-repeat="bd in partner.client_bds">
<td ng-bind="bd.start_date|date:'yyyy-MM-dd'"></td> <td ng-bind="bd.start_date|date:'yyyy-MM-dd'"></td>
<td ng-bind="bd.end_date|date:'yyyy-MM-dd'"></td> <td ng-bind="bd.end_date|date:'yyyy-MM-dd'"></td>
<td ng-bind="bd.bd_name"></td> <td ng-bind="bd.bd_name"></td>
<td ng-bind="bd.proportion"></td> <td ng-bind="bd.proportion"></td>
<td ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission) "> <td
<a role="button" ng-click="editBDUser()" ng-if="bd.end_date==null"> ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission) ">
<i class="fa fa-pencil-square-o"></i> <a role="button" ng-click="editBDUser()"
</a> ng-if="bd.end_date==null">
</td> <i class="fa fa-pencil-square-o"></i>
</tr> </a>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
<p class="form-control-static"> <p class="form-control-static">
<!--<span ng-bind="partner.bd_user_name||'Not Bind'"></span>--> <!--<span ng-bind="partner.bd_user_name||'Not Bind'"></span>-->
<a role="button" ng-click="bindBDUser()" <a role="button" ng-click="bindBDUser()" ng-if="('00010'|withRole)">New
ng-if="('00010'|withRole)">New Policy +</a> Policy +</a>
</p> </p>
</div> </div>
</div> </div>
@ -730,44 +728,43 @@
Merchant Payment Scenario Type</label> Merchant Payment Scenario Type</label>
<div class="col-sm-8"> <div class="col-sm-8">
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_type.indexOf('1')>=0}"> ng-class="{active:partner.client_pay_type.indexOf('1')>=0}">
<i class="fa fa-mixcloud"></i> <i class="fa fa-mixcloud"></i>
线上 线上
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_type.indexOf('2')>=0}"> ng-class="{active:partner.client_pay_type.indexOf('2')>=0}">
<i class="fa fa-shopping-basket"></i> <i class="fa fa-shopping-basket"></i>
线下 线下
</button> </button>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group" ng-if="partner.client_pay_type.indexOf('1')>=0">
ng-if="partner.client_pay_type.indexOf('1')>=0">
<label class="control-label col-sm-2"> <label class="control-label col-sm-2">
Online</label> Online</label>
<div class="col-sm-8"> <div class="col-sm-8">
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('101')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('101')>=0}">
<i class="fa fa-desktop"></i> <i class="fa fa-desktop"></i>
PC网站 PC网站
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('102')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('102')>=0}">
<i class="fa fa-mobile-phone"></i> <i class="fa fa-mobile-phone"></i>
手机端网站 手机端网站
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('103')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('103')>=0}">
<i class="fa fa-mobile-phone"></i> <i class="fa fa-mobile-phone"></i>
APP APP
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('104')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('104')>=0}">
<i class="fa fa-wechat"></i> <i class="fa fa-wechat"></i>
微信内、支付宝内网站 微信内、支付宝内网站
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('105')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('105')>=0}">
<i class="fa fa-wechat"></i> <i class="fa fa-wechat"></i>
小程序 小程序
</button> </button>
@ -775,26 +772,26 @@
</div> </div>
<div ng-if="partner.client_pay_type.indexOf('2')>=0"> <div ng-if="partner.client_pay_type.indexOf('2')>=0">
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}"> ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
<label class="control-label col-sm-2">Offline</label> <label class="control-label col-sm-2">Offline</label>
<div class="col-sm-8"> <div class="col-sm-8">
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('201')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('201')>=0}">
<i class="fa fa-qrcode"></i> <i class="fa fa-qrcode"></i>
二维码立牌 二维码立牌
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('202')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('202')>=0}">
<i class="fa fa-user"></i> <i class="fa fa-user"></i>
RoyalPay POS RoyalPay POS
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:(partner.client_pay_desc.join(',').indexOf('203')>=0)}"> ng-class="{active:(partner.client_pay_desc.join(',').indexOf('203')>=0)}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
收银系统 收银系统
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('204')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('204')>=0}">
<i class="fa fa-shopping-cart"></i> <i class="fa fa-shopping-cart"></i>
无人售货机 无人售货机
</button> </button>
@ -803,51 +800,51 @@
</div> </div>
<div ng-if="partner.client_pay_desc.join(',').indexOf('203')>=0"> <div ng-if="partner.client_pay_desc.join(',').indexOf('203')>=0">
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}"> ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">
<label class="control-label col-sm-2">* POS</label> <label class="control-label col-sm-2">* POS</label>
<div class="col-sm-8"> <div class="col-sm-8">
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20301')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20301')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
ipos ipos
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20302')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20302')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
pospal pospal
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20304')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20304')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
Lotus Lotus
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20305')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20305')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
AoShangBao AoShangBao
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20306')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20306')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
Infinity Infinity
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20307')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20307')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
EasyCloud EasyCloud
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20303')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20303')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
Aus Post Aus Post
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20308')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20308')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
AoMaiKe AoMaiKe
</button> </button>
<button class="btn btn-default" <button class="btn btn-default"
ng-class="{active:partner.client_pay_desc.indexOf('20399')>=0}"> ng-class="{active:partner.client_pay_desc.indexOf('20399')>=0}">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
其他 其他
</button> </button>
@ -855,12 +852,12 @@
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group"
ng-if="partner.company_website!='' && partner.company_website.length>0"> ng-if="partner.company_website!='' && partner.company_website.length>0">
<label class="control-label col-sm-2">Website</label> <label class="control-label col-sm-2">Website</label>
<div class="col-sm-10" style="padding-top: 7px;"> <div class="col-sm-10" style="padding-top: 7px;">
<a class="form-control-static" target="_blank" ng-bind="partner.company_website" <a class="form-control-static" target="_blank" ng-bind="partner.company_website"
href="{{partner.company_website}}"></a> href="{{partner.company_website}}"></a>
</div> </div>
</div> </div>
<div class="form-group" ng-if="partner.client_pay_type.indexOf('2')>=0"> <div class="form-group" ng-if="partner.client_pay_type.indexOf('2')>=0">
@ -869,7 +866,7 @@
<div class="col-sm-3 col-xs-5"><em>1:</em>&nbsp; <div class="col-sm-3 col-xs-5"><em>1:</em>&nbsp;
<div> <div>
<a class="thumbnail" target="_blank" <a class="thumbnail" target="_blank"
ng-href="{{partner.company_photo}}"> ng-href="{{partner.company_photo}}">
<img ng-src="{{partner.company_photo}}" style="max-height: 100px"> <img ng-src="{{partner.company_photo}}" style="max-height: 100px">
</a> </a>
</div> </div>
@ -965,7 +962,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.contact_phone"></p> <p class="form-control-static" ng-bind="partner.contact_phone"></p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red" <p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_phone"></p> ng-bind="partner.same_phone"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -977,17 +974,15 @@
</span> </span>
</p> </p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red" <p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_email"> ng-bind="partner.same_email">
<div> <div>
<a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))" <a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
role="button" role="button" ng-click="resendApproveEmail('crossborder')">
ng-click="resendApproveEmail('crossborder')">
<i class="fa fa-envelope"></i> Resend Cross-Border <i class="fa fa-envelope"></i> Resend Cross-Border
</a> </a>
<br/> <br />
<a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))" <a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
role="button" role="button" ng-click="resendApproveEmail('cardpayment')">
ng-click="resendApproveEmail('cardpayment')">
<i class="fa fa-envelope"></i> Resend CardPayment <i class="fa fa-envelope"></i> Resend CardPayment
</a> </a>
</div> </div>
@ -1018,7 +1013,7 @@
</div> </div>
<div ng-if="partner.representativeInfo"> <div ng-if="partner.representativeInfo">
<hr/> <hr />
<div class="panel-heading">Legal Representative</div> <div class="panel-heading">Legal Representative</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
@ -1027,7 +1022,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static"
ng-bind="partner.representativeInfo.representative_person "></p> ng-bind="partner.representativeInfo.representative_person "></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -1035,15 +1030,15 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static"
ng-bind="partner.representativeInfo.legal_representative_wechatid"></p> ng-bind="partner.representativeInfo.legal_representative_wechatid"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">Phone</label> <label class="control-label col-sm-4">Phone</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.representativeInfo.phone">
ng-bind="partner.representativeInfo.phone"></p> </p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -1069,7 +1064,7 @@
</div> </div>
<div ng-if="partner.representativeInfo && partner.representativeInfo.marketing_person"> <div ng-if="partner.representativeInfo && partner.representativeInfo.marketing_person">
<hr/> <hr />
<div class="panel-heading">Marketing Person</div> <div class="panel-heading">Marketing Person</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
@ -1078,7 +1073,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static"
ng-bind="partner.representativeInfo.marketing_person"></p> ng-bind="partner.representativeInfo.marketing_person"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -1086,7 +1081,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static"
ng-bind="partner.representativeInfo.marketing_wechatid"></p> ng-bind="partner.representativeInfo.marketing_wechatid"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -1094,7 +1089,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static"
ng-bind="partner.representativeInfo.marketing_phone"></p> ng-bind="partner.representativeInfo.marketing_phone"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -1121,11 +1116,11 @@
</div> </div>
<!--end 商户联系资料--> <!--end 商户联系资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Registered Office Address</div> <div class="panel-heading">Registered Office Address</div>
<div ng-if="partner.representativeInfo"> <div ng-if="partner.representativeInfo">
<!-- <hr/>--> <!-- <hr/>-->
<!-- <div class="panel-heading">Registered Address Information(<span style="color: red">Registered address on your business license.</span>)</div>--> <!-- <div class="panel-heading">Registered Address Information(<span style="color: red">Registered address on your business license.</span>)</div>-->
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
@ -1133,16 +1128,16 @@
<label class="control-label col-sm-4">Registered Address</label> <label class="control-label col-sm-4">Registered Address</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.representativeInfo.address">
ng-bind="partner.representativeInfo.address"></p> </p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label> <label class="control-label col-sm-4">Suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.representativeInfo.suburb">
ng-bind="partner.representativeInfo.suburb"></p> </p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -1150,20 +1145,20 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static"
ng-bind="partner.representativeInfo.postcode"></p> ng-bind="partner.representativeInfo.postcode"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="control-label col-sm-4">State</label> <label class="control-label col-sm-4">State</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" <p class="form-control-static" ng-bind="partner.representativeInfo.state">
ng-bind="partner.representativeInfo.state"></p> </p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr />
</div> </div>
<div> <div>
@ -1177,7 +1172,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.address"></p> <p class="form-control-static" ng-bind="partner.address"></p>
<p ng-if="('10000000010' | withRole)" class="description-text text-red" <p ng-if="('10000000010' | withRole)" class="description-text text-red"
ng-bind="partner.same_address"></p> ng-bind="partner.same_address"></p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
@ -1210,7 +1205,7 @@
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr />
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group "> <div class="form-group ">
@ -1232,7 +1227,7 @@
<div class="form-group"> <div class="form-group">
<div class="embed-responsive" style="height: 300px;"> <div class="embed-responsive" style="height: 300px;">
<iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item" <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item"
src="one_locations.html"></iframe> src="one_locations.html"></iframe>
</div> </div>
</div> </div>
</div> </div>
@ -1307,9 +1302,9 @@
<label class="control-label col-sm-2">RoyalPay商户类别</label> <label class="control-label col-sm-2">RoyalPay商户类别</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static industry-p" <p class="form-control-static industry-p"
ng-bind="partner.royalpayindustry|partner_royalpay_industry"></p> ng-bind="partner.royalpayindustry|partner_royalpay_industry"></p>
<i class="fa fa-check-square-o check-i" aria-hidden="true" <i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i> ng-if="$root.complianceCheck.clientInfo"></i>
</div> </div>
</div> </div>
@ -1318,9 +1313,9 @@
<label class="control-label col-sm-5">Wechat Industry</label> <label class="control-label col-sm-5">Wechat Industry</label>
<div class="col-sm-7"> <div class="col-sm-7">
<p class="form-control-static industry-p" <p class="form-control-static industry-p"
ng-bind="partner.industry|partner_industry"></p> ng-bind="partner.industry|partner_industry"></p>
<i class="fa fa-check-square-o check-i" aria-hidden="true" <i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i> ng-if="$root.complianceCheck.clientInfo"></i>
</div> </div>
</div> </div>
<div class="col-sm-5" ng-if="('1'|withRole)||('10'|withRole)"> <div class="col-sm-5" ng-if="('1'|withRole)||('10'|withRole)">
@ -1328,7 +1323,7 @@
<label class="col-sm-7 control-label">是否是微信合规商户</label> <label class="col-sm-7 control-label">是否是微信合规商户</label>
<div class="col-sm-5"> <div class="col-sm-5">
<input type="checkbox" ng-model="partner.wechat_compliance" bs-switch <input type="checkbox" ng-model="partner.wechat_compliance" bs-switch
switch-change="changeWechatCompliance()"> switch-change="changeWechatCompliance()">
</div> </div>
</div> </div>
</div> </div>
@ -1354,7 +1349,7 @@
&nbsp;&nbsp;&nbsp;({{partner.alipayindustry}}) &nbsp;&nbsp;&nbsp;({{partner.alipayindustry}})
</p> </p>
<i class="fa fa-check-square-o check-i" aria-hidden="true" <i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i> ng-if="$root.complianceCheck.clientInfo"></i>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -1364,32 +1359,29 @@
{{partner.mw_industry}} {{partner.mw_industry}}
</p> </p>
<i class="fa fa-check-square-o check-i" aria-hidden="true" <i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i> ng-if="$root.complianceCheck.clientInfo"></i>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2"> <label class="control-label col-sm-2">
Card Service Selection</label> Card Service Selection</label>
<div class="col-sm-8"> <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">
AU Credit Card | AU 信用卡支付
</label>
</span>
<span class="checkbox-inline"> <span class="checkbox-inline">
<label> <label>
<input type="checkbox" <input type="checkbox" checked disabled ng-if="partner.mw_industry">
ng-if="partner.enable_international_card" checked <input type="checkbox" disabled ng-if="!partner.mw_industry">
disabled> AU Credit Card | AU 信用卡支付
<input type="checkbox" </label>
ng-if="!partner.enable_international_card" disabled> </span>
Intl Credit Card|国际信用卡 <span class="checkbox-inline">
</label> <label>
</span> <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>
</div> </div>
</div> </div>
</div> </div>
@ -1398,9 +1390,9 @@
<div style="text-align: center"> <div style="text-align: center">
<a role="button" style="margin-bottom: 25px;" class="btn btn-danger btn-sm ng-scope" <a role="button" style="margin-bottom: 25px;" class="btn btn-danger btn-sm ng-scope"
ng-click="deleteClient()">Destroy</a> ng-click="deleteClient()">Destroy</a>
<a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope" <a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope"
ng-if="('10'|withRole)" ng-click="complianceCheck()">check</a> ng-if="('10'|withRole)" ng-click="complianceCheck()">check</a>
</div> </div>
</div> </div>
</div> </div>
@ -1416,4 +1408,4 @@
<!--<span class="sr-only">Requesting...</span>--> <!--<span class="sr-only">Requesting...</span>-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->

304
src/main/ui/static/payment/partner/templates/partner_payment_info.html
Unescape View File

@ -4,28 +4,33 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-horizontal" ng-form="configForm"> <div class="form-horizontal" ng-form="configForm">
<div class="form-group"> <!-- <div class="form-group">
<label class="col-sm-3 control-label">WeChat Sub Merchant Id</label> <label class="col-sm-3 control-label">WeChat Sub Merchant Id</label>
<div class="col-sm-9"> <div class="col-sm-9">
<p ng-if="!ctrl.editSubMerchant" class="form-control-static"> <p ng-if="!ctrl.editSubMerchant" class="form-control-static">
{{paymentInfo.sub_merchant_id||'Not Configure'}} {{paymentInfo.sub_merchant_id||'Not Configure'}}
<a role="button" ng-click="ctrl.editSubMerchant=true" ng-if="'011'|withRole"><i class="fa fa-edit"></i></a> <a role="button" ng-click="ctrl.editSubMerchant=true" ng-if="'011'|withRole"><i
<a role="button" ng-click="queryWechatSubMerchantIdStatus()"><i class="fa fa-refresh"></i></a> class="fa fa-edit"></i></a>
<i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="paymentInfo.temp_sub_merchant"></i> <a role="button" ng-click="queryWechatSubMerchantIdStatus()"><i
&nbsp;&nbsp;<span class="small" ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.merchant_id"><b>Merchant ID</b>:{{paymentInfo.merchant_id | choose_merchant_id}}</span> class="fa fa-refresh"></i></a>
<i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID"
ng-if="paymentInfo.temp_sub_merchant"></i>
&nbsp;&nbsp;<span class="small"
ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.merchant_id"><b>Merchant
ID</b>:{{paymentInfo.merchant_id | choose_merchant_id}}</span>
<span class="small" <span class="small"
ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.sub_merchant_id_log"> ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.sub_merchant_id_log">
<a class="text-primary" role="button" title="modify logs" <a class="text-primary" role="button" title="modify logs"
ng-click="showSubMerchantLogs(sub_merchant_id_logs)"> ng-click="showSubMerchantLogs(sub_merchant_id_logs)">
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label label-primary">history</span> <span class="label label-primary">history</span>
</span> </span>
</a> </a>
</span> </span>
</p> </p>
<div class="input-group" ng-if="ctrl.editSubMerchant"> <div class="input-group" ng-if="ctrl.editSubMerchant">
<input type="text" class="form-control" ng-model="paymentInfo.sub_merchant_id" <input type="text" class="form-control" ng-model="paymentInfo.sub_merchant_id"
title="WeChat Sub Merchant Id"> title="WeChat Sub Merchant Id">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" ng-click="saveSubMerchantId()"> <button class="btn btn-success" ng-click="saveSubMerchantId()">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
@ -44,7 +49,8 @@
<div class="col-sm-9"> <div class="col-sm-9">
<p class="form-control-static"> <p class="form-control-static">
{{paymentInfo.wechat_institution_merchant_id||'初始化'}} {{paymentInfo.wechat_institution_merchant_id||'初始化'}}
<a role="button" ng-click="refreshWechatInstitutionMerchantId()"><i class="fa fa-refresh"></i></a> <a role="button" ng-click="refreshWechatInstitutionMerchantId()"><i
class="fa fa-refresh"></i></a>
</p> </p>
</div> </div>
</div> </div>
@ -62,17 +68,22 @@
<div class="col-sm-9"> <div class="col-sm-9">
<p ng-if="!ctrl.editAliSubMerchant" class="form-control-static"> <p ng-if="!ctrl.editAliSubMerchant" class="form-control-static">
{{paymentInfo.ali_sub_merchant_id||'Not Configure'}} {{paymentInfo.ali_sub_merchant_id||'Not Configure'}}
<a role="button" ng-click="ctrl.editAliSubMerchant=true" ng-if="'10'|withRole"><i class="fa fa-edit"></i></a> <a role="button" ng-click="ctrl.editAliSubMerchant=true" ng-if="'10'|withRole"><i
<a role="button" ng-click="submitAlipaySubId()"><i class="fa fa-arrow-up" title="Alipay进件"></i></a> class="fa fa-edit"></i></a>
<a role="button" ng-click="queryAlipayGms()"><i class="fa fa-refresh" title="Alipay进件"></i></a> <a role="button" ng-click="submitAlipaySubId()"><i class="fa fa-arrow-up"
title="Alipay进件"></i></a>
<a role="button" ng-click="queryAlipayGms()"><i class="fa fa-refresh"
title="Alipay进件"></i></a>
| |
<a role="button" ng-click="submitAlipayOnlineSubId()"><i class="fa fa-arrow-up" title="AlipayOnline进件"></i></a> <a role="button" ng-click="submitAlipayOnlineSubId()"><i class="fa fa-arrow-up"
<a role="button" ng-click="queryAlipayOnlineGms()"><i class="fa fa-refresh" title="AlipayOnline进件"></i></a> title="AlipayOnline进件"></i></a>
<a role="button" ng-click="queryAlipayOnlineGms()"><i class="fa fa-refresh"
title="AlipayOnline进件"></i></a>
(AlipayOnline) (AlipayOnline)
</p> </p>
<div class="input-group" ng-if="ctrl.editAliSubMerchant"> <div class="input-group" ng-if="ctrl.editAliSubMerchant">
<input type="text" class="form-control" ng-model="paymentInfo.ali_sub_merchant_id" <input type="text" class="form-control" ng-model="paymentInfo.ali_sub_merchant_id"
title="Ali Sub Merchant Id"> title="Ali Sub Merchant Id">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" ng-click="saveAliSubMerchantId()"> <button class="btn btn-success" ng-click="saveAliSubMerchantId()">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
@ -89,9 +100,10 @@
<div class="form-group" ng-if="'10'|withRole"> <div class="form-group" ng-if="'10'|withRole">
<label class="col-sm-3 control-label">Common Sub Merchant Id</label> <label class="col-sm-3 control-label">Common Sub Merchant Id</label>
<div class="col-xs-9"> <div class="col-xs-9">
<input type="checkbox" ng-model="paymentInfo.common_sub_merchant_id" bs-switch switch-change="switchCommonSubMerchantId()"> <input type="checkbox" ng-model="paymentInfo.common_sub_merchant_id" bs-switch
switch-change="switchCommonSubMerchantId()">
</div> </div>
</div> </div> -->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">Max Order Amount</label> <label class="col-sm-3 control-label">Max Order Amount</label>
<div class="col-sm-9"> <div class="col-sm-9">
@ -102,19 +114,22 @@
<div class="input-group" ng-if="ctrl.editMaxOrderAmount"> <div class="input-group" ng-if="ctrl.editMaxOrderAmount">
<div class="input-group-addon">AUD</div> <div class="input-group-addon">AUD</div>
<input type="number" class="form-control" ng-model="paymentInfo.max_order_amount" <input type="number" class="form-control" ng-model="paymentInfo.max_order_amount"
title="Max Order Amount"> title="Max Order Amount">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" title="Save" ng-click="saveMaxOrderAmount(paymentInfo.max_order_amount)"> <button class="btn btn-success" title="Save"
ng-click="saveMaxOrderAmount(paymentInfo.max_order_amount)">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
</button> </button>
</div> </div>
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-danger" title="Clear Limit" ng-click="saveMaxOrderAmount(null)"> <button class="btn btn-danger" title="Clear Limit"
ng-click="saveMaxOrderAmount(null)">
<i class="fa fa-ban"></i> <i class="fa fa-ban"></i>
</button> </button>
</div> </div>
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-danger" title="Cancel" ng-click="ctrl.editMaxOrderAmount=false"> <button class="btn btn-danger" title="Cancel"
ng-click="ctrl.editMaxOrderAmount=false">
<i class="fa fa-remove"></i> <i class="fa fa-remove"></i>
</button> </button>
</div> </div>
@ -126,15 +141,18 @@
<div class="col-sm-9"> <div class="col-sm-9">
<p ng-if="!ctrl.editCustomerSurchargeRate" class="form-control-static"> <p ng-if="!ctrl.editCustomerSurchargeRate" class="form-control-static">
{{paymentInfo.customer_surcharge_rate||'Not Configure'}} {{paymentInfo.customer_surcharge_rate||'Not Configure'}}
<a role="button" ng-click="ctrl.editCustomerSurchargeRate=true"><i class="fa fa-edit"></i></a> <a role="button" ng-click="ctrl.editCustomerSurchargeRate=true"><i
class="fa fa-edit"></i></a>
</p> </p>
<div class="input-group" ng-if="ctrl.editCustomerSurchargeRate"> <div class="input-group" ng-if="ctrl.editCustomerSurchargeRate">
<input type="number" class="form-control" ng-model="paymentInfo.customer_surcharge_rate" <input type="number" class="form-control" ng-model="paymentInfo.customer_surcharge_rate"
title="Customer Surcharge Rate" max="{{paymentInfo.max_customer_surcharge_rate}}" min="{{paymentInfo.min_customer_surcharge_rate}}" name="customer_surcharge_rate"> title="Customer Surcharge Rate" max="{{paymentInfo.max_customer_surcharge_rate}}"
min="{{paymentInfo.min_customer_surcharge_rate}}" name="customer_surcharge_rate">
<div class="input-group-addon">%</div> <div class="input-group-addon">%</div>
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" title="Save" ng-click="saveCustomerSurchargeRate(paymentInfo.customer_surcharge_rate)"> <button class="btn btn-success" title="Save"
ng-click="saveCustomerSurchargeRate(paymentInfo.customer_surcharge_rate)">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
</button> </button>
</div> </div>
@ -144,12 +162,15 @@
</button> </button>
</div> </div>
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-danger" title="Cancel" ng-click="ctrl.editCustomerSurchargeRate=false"> <button class="btn btn-danger" title="Cancel"
ng-click="ctrl.editCustomerSurchargeRate=false">
<i class="fa fa-remove"></i> <i class="fa fa-remove"></i>
</button> </button>
</div> </div>
</div> </div>
<p ng-if="configForm.customer_surcharge_rate.$invalid" class="text-danger">valid range({{paymentInfo.min_customer_surcharge_rate}}%~{{paymentInfo.max_customer_surcharge_rate}}%)</p> <p ng-if="configForm.customer_surcharge_rate.$invalid" class="text-danger">valid
range({{paymentInfo.min_customer_surcharge_rate}}%~{{paymentInfo.max_customer_surcharge_rate}}%)
</p>
</div> </div>
</div> </div>
@ -158,13 +179,15 @@
<div class="col-sm-9"> <div class="col-sm-9">
<p ng-if="!ctrl.editOrderExpiryConfig" class="form-control-static"> <p ng-if="!ctrl.editOrderExpiryConfig" class="form-control-static">
{{paymentInfo.order_expiry_config||'Not Configure'}} {{paymentInfo.order_expiry_config||'Not Configure'}}
<a role="button" ng-click="ctrl.editOrderExpiryConfig=true" ng-if="'01'|withRole"><i class="fa fa-edit"></i></a> <a role="button" ng-click="ctrl.editOrderExpiryConfig=true" ng-if="'01'|withRole"><i
class="fa fa-edit"></i></a>
</p> </p>
<div class="input-group" ng-if="ctrl.editOrderExpiryConfig"> <div class="input-group" ng-if="ctrl.editOrderExpiryConfig">
<input type="text" class="form-control" ng-model="paymentInfo.order_expiry_config" <input type="text" class="form-control" ng-model="paymentInfo.order_expiry_config"
title="Prevent not enough refund"> title="Prevent not enough refund">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" ng-click="saveOrderExpiryConfig(paymentInfo.order_expiry_config)"> <button class="btn btn-success"
ng-click="saveOrderExpiryConfig(paymentInfo.order_expiry_config)">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
</button> </button>
</div> </div>
@ -177,10 +200,10 @@
</div> </div>
</div> </div>
<!--<div class="form-group" ng-if="('10'|withRole) && partner.parent_client_id==null">--> <!--<div class="form-group" ng-if="('10'|withRole) && partner.parent_client_id==null">-->
<!--<label class="col-sm-3 control-label">Sub Partners Manage</label>--> <!--<label class="col-sm-3 control-label">Sub Partners Manage</label>-->
<!--<div class="col-xs-9" title="开启后，父商户具有帮子商户新建账户、退款等管理权限">--> <!--<div class="col-xs-9" title="开启后，父商户具有帮子商户新建账户、退款等管理权限">-->
<!--<input type="checkbox" ng-model="paymentInfo.sub_manage" bs-switch switch-change="switchSubManage()">--> <!--<input type="checkbox" ng-model="paymentInfo.sub_manage" bs-switch switch-change="switchSubManage()">-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
</div> </div>
</div> </div>
@ -194,32 +217,37 @@
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label class="col-xs-6 control-label">Alipay|支付宝</label> <label class="col-xs-6 control-label">Alipay|支付宝</label>
<div class="col-xs-6"> <div class="col-xs-6">
<input type="checkbox" ng-model="paymentInfo.enable_alipay" bs-switch switch-change="toggleChannel('alipay')"> <input type="checkbox" ng-model="paymentInfo.enable_alipay" bs-switch
switch-change="toggleChannel('alipay')">
</div> </div>
</div> </div>
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label class="col-xs-6 control-label">WeChat|微信</label> <label class="col-xs-6 control-label">WeChat|微信</label>
<div class="col-xs-6"> <div class="col-xs-6">
<input type="checkbox" ng-model="paymentInfo.enable_wechat" bs-switch switch-change="toggleChannel('wechat')"> <input type="checkbox" ng-model="paymentInfo.enable_wechat" bs-switch
switch-change="toggleChannel('wechat')">
</div> </div>
</div> </div>
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label class="col-xs-6 control-label">CB BankPay|快捷支付</label> <label class="col-xs-6 control-label">CB BankPay|快捷支付</label>
<div class="col-xs-6"> <div class="col-xs-6">
<input type="checkbox" ng-model="paymentInfo.enable_cb_bankpay" bs-switch switch-change="toggleChannel('cb_bankpay')"> <input type="checkbox" ng-model="paymentInfo.enable_cb_bankpay" bs-switch
switch-change="toggleChannel('cb_bankpay')">
</div> </div>
</div> </div>
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label class="col-xs-6 control-label">Card Payment|银行卡支付</label> <label class="col-xs-6 control-label">Card Payment|银行卡支付</label>
<div class="col-xs-6"> <div class="col-xs-6">
<input type="checkbox" ng-model="paymentInfo.enable_rpaypmt_card" bs-switch switch-change="toggleChannel('rpaypmt_card')"> <input type="checkbox" ng-model="paymentInfo.enable_rpaypmt_card" bs-switch
switch-change="toggleChannel('rpaypmt_card')">
</div> </div>
</div> </div>
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label class="col-xs-6 control-label">Direct Debit|银行账户支付</label> <label class="col-xs-6 control-label">Direct Debit|银行账户支付</label>
<div class="col-xs-6"> <div class="col-xs-6">
<input type="checkbox" ng-model="paymentInfo.enable_rpaypmt_dd" bs-switch switch-change="toggleChannel('rpaypmt_dd')"> <input type="checkbox" ng-model="paymentInfo.enable_rpaypmt_dd" bs-switch
switch-change="toggleChannel('rpaypmt_dd')">
</div> </div>
</div> </div>
@ -239,7 +267,8 @@
<div class="form-group" ng-if="'qrcode_surcharge'|withFunc"> <div class="form-group" ng-if="'qrcode_surcharge'|withFunc">
<label class="col-sm-2 control-label">Customer Pay for Surcharge On QRCode</label> <label class="col-sm-2 control-label">Customer Pay for Surcharge On QRCode</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.qrcode_surcharge" bs-switch switch-change="updateClientQRCodePaySurCharge()"> <input type="checkbox" ng-model="paymentInfo.qrcode_surcharge" bs-switch
switch-change="updateClientQRCodePaySurCharge()">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -255,13 +284,13 @@
<input type="checkbox" ng-model="qrConfig.preauth" ng-change="reloadQRCode()"> <input type="checkbox" ng-model="qrConfig.preauth" ng-change="reloadQRCode()">
Pre Authorization Pre Authorization
<i class="fa fa-question-circle text-gray" <i class="fa fa-question-circle text-gray"
uib-tooltip="Pre Authorize means this bill will not be settled until completion"></i> uib-tooltip="Pre Authorize means this bill will not be settled until completion"></i>
</label> </label>
<label> <label>
<input type="checkbox" ng-model="qrConfig.customerrate" ng-change="reloadQRCode()"> <input type="checkbox" ng-model="qrConfig.customerrate" ng-change="reloadQRCode()">
Customer Pay for Surcharge Customer Pay for Surcharge
<i class="fa fa-question-circle text-gray" <i class="fa fa-question-circle text-gray"
uib-tooltip="Customer pay for rate means after customer input the price, system will add rate value into the final price. Client will receive full value customer input after settlement. 客户支付费率勾选后将自动在输入金额基础上加上手续费金额，商户将在清算时收到用户输入的金额"></i> uib-tooltip="Customer pay for rate means after customer input the price, system will add rate value into the final price. Client will receive full value customer input after settlement. 客户支付费率勾选后将自动在输入金额基础上加上手续费金额，商户将在清算时收到用户输入的金额"></i>
</label> </label>
</p> </p>
@ -271,26 +300,29 @@
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<p> <p>
<a ng-href="{{qrcode.qrcode}}" download><i class="fa fa-download"></i> Download QR Code Image (支付二维码)</a> <a ng-href="{{qrcode.qrcode}}" download><i class="fa fa-download"></i> Download QR Code
Image (支付二维码)</a>
</p> </p>
<!--<p>--> <!--<p>-->
<!--<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"--> <!--<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"-->
<!--download><i class="fa fa-download"></i> Download QR Board Image (微信支付水晶立牌)</a>--> <!--download><i class="fa fa-download"></i> Download QR Board Image (微信支付水晶立牌)</a>-->
<!--</p>--> <!--</p>-->
<!--<p>--> <!--<p>-->
<!--<a ng-href="/sys/partners/{{partner.client_moniker}}/poster" target="_blank"><i class="fa fa-download"></i> Download Poster (微信支付海报)</a>--> <!--<a ng-href="/sys/partners/{{partner.client_moniker}}/poster" target="_blank"><i class="fa fa-download"></i> Download Poster (微信支付海报)</a>-->
<!--</p>--> <!--</p>-->
<!--<p>--> <!--<p>-->
<!--<a ng-href="/sys/partners/{{partner.client_moniker}}/activities/alipayluckmoney/poster" target="_blank">--> <!--<a ng-href="/sys/partners/{{partner.client_moniker}}/activities/alipayluckmoney/poster" target="_blank">-->
<!--<i class="fa fa-download"></i> Alipay Lucky Money Poster (支付宝店长红包海报)--> <!--<i class="fa fa-download"></i> Alipay Lucky Money Poster (支付宝店长红包海报)-->
<!--</a>--> <!--</a>-->
<!--</p>--> <!--</p>-->
<p> <p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/poster/aggregate" target="_blank"><i class="fa fa-download"></i> Download Aggregate Poster (聚合支付海报)</a> <a ng-href="/sys/partners/{{partner.client_moniker}}/poster/aggregate" target="_blank"><i
class="fa fa-download"></i> Download Aggregate Poster (聚合支付海报)</a>
</p> </p>
<p> <p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board/aggregate?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}" <a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board/aggregate?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"
download><i class="fa fa-download"></i> Download Aggregate QR Board Image (聚合支付水晶立牌:支持支付宝、微信、翼支付)</a> download><i class="fa fa-download"></i> Download Aggregate QR Board Image
(聚合支付水晶立牌:支持支付宝、微信、翼支付)</a>
</p> </p>
</div> </div>
</div> </div>
@ -306,28 +338,33 @@
<label class="col-sm-2 control-label">Enable Socket</label> <label class="col-sm-2 control-label">Enable Socket</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_gateway" bs-switch <input type="checkbox" ng-model="paymentInfo.enable_gateway" bs-switch
switch-change="toggleGateway()"> switch-change="toggleGateway()">
</div> </div>
</div> </div>
<div class="form-group" ng-if="'gateway_upgrade'|withFunc"> <div class="form-group" ng-if="'gateway_upgrade'|withFunc">
<label class="col-sm-2 control-label">Upgrade QRCode</label> <label class="col-sm-2 control-label">Upgrade QRCode</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.gateway_upgrade" bs-switch switch-change="toggleGatewayUpgrade()"> <input type="checkbox" ng-model="paymentInfo.gateway_upgrade" bs-switch
switch-change="toggleGatewayUpgrade()">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">Use Alipay Online</label> <label class="col-sm-2 control-label">Use Alipay Online</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.gateway_alipay_online" bs-switch switch-change="toggleGatewayAlipayOnline()"> <input type="checkbox" ng-model="paymentInfo.gateway_alipay_online" bs-switch
switch-change="toggleGatewayAlipayOnline()">
</div> </div>
</div> </div>
<div class="form-group" ng-if="'api_surcharge'|withFunc"> <div class="form-group" ng-if="'api_surcharge'|withFunc">
<label class="col-sm-2 control-label">Customer Pay for Surcharge On Gateway</label> <label class="col-sm-2 control-label">Customer Pay for Surcharge On Gateway</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.api_surcharge" bs-switch switch-change="updateClientApiSurCharge()"> <input type="checkbox" ng-model="paymentInfo.api_surcharge" bs-switch
switch-change="updateClientApiSurCharge()">
<p class="text-info"> <p class="text-info">
<i class="fa fa-info"></i> If client have already attached surcharge in their own system, ignore this choice.<br> <i class="fa fa-info"></i> If client have already attached surcharge in their own system, ignore
<i class="fa fa-info"></i> It is recommended to notice customers about they will pay addition money as surcharge in the payment page. <br> this choice.<br>
<i class="fa fa-info"></i> It is recommended to notice customers about they will pay addition
money as surcharge in the payment page. <br>
<i class="fa fa-info"></i> 如果商户已有系统已经自动添加了手续费，请忽略本选项<br> <i class="fa fa-info"></i> 如果商户已有系统已经自动添加了手续费，请忽略本选项<br>
<i class="fa fa-info"></i> 建议使用此功能的商户在自有系统支付页中提示用户将会支付额外的手续费 <i class="fa fa-info"></i> 建议使用此功能的商户在自有系统支付页中提示用户将会支付额外的手续费
</p> </p>
@ -401,25 +438,30 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">CB Bank Pay Link</label> <label class="col-sm-2 control-label">CB Bank Pay Link</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_cb_bankpay_link" bs-switch ng-change="toggleCBBankPayLink()"> <input type="checkbox" ng-model="paymentInfo.enable_cb_bankpay_link" bs-switch
&nbsp;&nbsp;<a href={{paymentInfo.cb_bankpay_url}} target="_Blank"><span ng-if="paymentInfo.enable_cb_bankpay_link">{{paymentInfo.cb_bankpay_url}}</span></a> ng-change="toggleCBBankPayLink()">
<i ng-if="paymentInfo.enable_cb_bankpay_link" class="fa fa-clipboard margin-r-5" style="cursor: pointer" ng-click="copyCBBankPayLink()"></i> &nbsp;&nbsp;<a href={{paymentInfo.cb_bankpay_url}} target="_Blank"><span
<input ng-if="paymentInfo.enable_cb_bankpay_link" style="opacity: 0" id="cpcbbankpay" value={{paymentInfo.cb_bankpay_url}} readonly> ng-if="paymentInfo.enable_cb_bankpay_link">{{paymentInfo.cb_bankpay_url}}</span></a>
<i ng-if="paymentInfo.enable_cb_bankpay_link" class="fa fa-clipboard margin-r-5"
style="cursor: pointer" ng-click="copyCBBankPayLink()"></i>
<input ng-if="paymentInfo.enable_cb_bankpay_link" style="opacity: 0" id="cpcbbankpay"
value={{paymentInfo.cb_bankpay_url}} readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">Customer Pay for Surcharge for CBBank Pay</label> <label class="col-sm-2 control-label">Customer Pay for Surcharge for CBBank Pay</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.cbbank_surcharge" bs-switch ng-change="updateClientCBBankPaySurCharge()"> <input type="checkbox" ng-model="paymentInfo.cbbank_surcharge" bs-switch
ng-change="updateClientCBBankPaySurCharge()">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">CB Bank Pay Channel</label> <label class="col-sm-2 control-label">CB Bank Pay Channel</label>
<div class="col-sm-3"> <div class="col-sm-3">
<select class="form-control" name="industry" ng-change="updateCBBankPayConfig('cb_channel_id',partner.cb_channel_id)" <select class="form-control" name="industry"
ng-model="partner.cb_channel_id" ng-change="updateCBBankPayConfig('cb_channel_id',partner.cb_channel_id)"
id="cbbankpay-input" required ng-model="partner.cb_channel_id" id="cbbankpay-input" required
ng-options="channel.channel_id as channel.channel_name for channel in cb_bankpay"> ng-options="channel.channel_id as channel.channel_name for channel in cb_bankpay">
<option value="">跟随系统</option> <option value="">跟随系统</option>
</select> </select>
</div> </div>
@ -427,20 +469,22 @@
<div class="form-group" ng-if="paymentInfo.enable_cb_bankpay && paymentInfo.enable_cb_bankpay_link"> <div class="form-group" ng-if="paymentInfo.enable_cb_bankpay && paymentInfo.enable_cb_bankpay_link">
<label class="col-sm-2 control-label">CB Bank Pay QR Code</label> <label class="col-sm-2 control-label">CB Bank Pay QR Code</label>
<div class="col-sm-10"> <div class="col-sm-10">
<img ng-src="{{paymentInfo.cbBankPayQrcodeUrl}}" class="img-responsive" /> <img ng-src="{{paymentInfo.cbBankPayQrcodeUrl}}" class="img-responsive" />
<div> <div>
&nbsp;&nbsp;<span style="padding-left: 4.2%;font-size:9px;">仅支持微信客户端扫描</span> &nbsp;&nbsp;<span style="padding-left: 4.2%;font-size:9px;">仅支持微信客户端扫描</span>
</div> </div>
<p> <p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board/CBBankAggregate" <a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board/CBBankAggregate" download><i
download><i class="fa fa-download"></i> Download Aggregate QR Board Image (聚合支付水晶立牌:支持支付宝、微信、翼支付)</a> class="fa fa-download"></i> Download Aggregate QR Board Image
</p> (聚合支付水晶立牌:支持支付宝、微信、翼支付)</a>
</p>
</div> </div>
</div> </div>
<div class="form-group col-sm-6" ng-if="paymentInfo.enable_cb_bankpay"> <div class="form-group col-sm-6" ng-if="paymentInfo.enable_cb_bankpay">
<label class="col-sm-4 control-label">Select Version</label> <label class="col-sm-4 control-label">Select Version</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-control" ng-change="changeCBBankPaymentPage()" ng-model="paymentInfo.cbbank_paypad_version" title="Payment Page"> <select class="form-control" ng-change="changeCBBankPaymentPage()"
ng-model="paymentInfo.cbbank_paypad_version" title="Payment Page">
<option value="v1">v1</option> <option value="v1">v1</option>
<option value="v2">v2</option> <option value="v2">v2</option>
</select> </select>
@ -448,8 +492,10 @@
<div class="col-sm-12"> <div class="col-sm-12">
<label class="col-sm-4 control-label"></label> <label class="col-sm-4 control-label"></label>
<div class="col-sm-8" style="margin-top: 10px;"> <div class="col-sm-8" style="margin-top: 10px;">
<img style="width: 200px" ng-if="paymentInfo.cbbank_paypad_version=='v1'" src="/static/images/cbbank_payment_page_v1.jpg"> <img style="width: 200px" ng-if="paymentInfo.cbbank_paypad_version=='v1'"
<img style="width: 200px" ng-if="paymentInfo.cbbank_paypad_version=='v2'" src="/static/images/cbbank_payment_page_v2.jpg"> src="/static/images/cbbank_payment_page_v1.jpg">
<img style="width: 200px" ng-if="paymentInfo.cbbank_paypad_version=='v2'"
src="/static/images/cbbank_payment_page_v2.jpg">
</div> </div>
</div> </div>
</div> </div>
@ -467,14 +513,14 @@
<label class="col-sm-2 control-label">Enable International Card</label> <label class="col-sm-2 control-label">Enable International Card</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_international_card" bs-switch <input type="checkbox" ng-model="paymentInfo.enable_international_card" bs-switch
switch-change="switchInternationalCard()"> switch-change="switchInternationalCard()">
</div> </div>
</div> </div>
<div class="form-group" ng-if="'111'|withRole"> <div class="form-group" ng-if="'111'|withRole">
<label class="col-sm-2 control-label">Enable 3DS</label> <label class="col-sm-2 control-label">Enable 3DS</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_threeds" bs-switch <input type="checkbox" ng-model="paymentInfo.enable_threeds" bs-switch
switch-change="switchThreeDS()"> switch-change="switchThreeDS()">
</div> </div>
</div> </div>
</div> </div>
@ -490,13 +536,14 @@
<label class="col-sm-2 control-label">Enable Socket</label> <label class="col-sm-2 control-label">Enable Socket</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_retail" bs-switch <input type="checkbox" ng-model="paymentInfo.enable_retail" bs-switch
switch-change="toggleOffline()"> switch-change="toggleOffline()">
</div> </div>
</div> </div>
<div class="form-group" ng-if="'retail_surcharge'|withFunc"> <div class="form-group" ng-if="'retail_surcharge'|withFunc">
<label class="col-sm-2 control-label">Customer Pay for Surcharge for Retail</label> <label class="col-sm-2 control-label">Customer Pay for Surcharge for Retail</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.retail_surcharge" bs-switch switch-change="updateClientRetailPaySurCharge()"> <input type="checkbox" ng-model="paymentInfo.retail_surcharge" bs-switch
switch-change="updateClientRetailPaySurCharge()">
</div> </div>
</div> </div>
</div> </div>
@ -511,7 +558,7 @@
<label class="col-sm-2 control-label">Enable Refund</label> <label class="col-sm-2 control-label">Enable Refund</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_refund" bs-switch <input type="checkbox" ng-model="paymentInfo.enable_refund" bs-switch
switch-change="toggleRefund()"> switch-change="toggleRefund()">
</div> </div>
</div> </div>
@ -519,7 +566,7 @@
<label class="col-sm-2 control-label">Enable Pre-authorize Refund</label> <label class="col-sm-2 control-label">Enable Pre-authorize Refund</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_pre_refund" bs-switch <input type="checkbox" ng-model="paymentInfo.enable_pre_refund" bs-switch
switch-change="togglePreRefund()"> switch-change="togglePreRefund()">
</div> </div>
</div> </div>
@ -534,10 +581,9 @@
</p> </p>
<div class="input-group" ng-if="ctrl.editRefundCreditLine"> <div class="input-group" ng-if="ctrl.editRefundCreditLine">
<input type="number" maxlength="6" class="form-control" <input type="number" maxlength="6" class="form-control"
ng-model="paymentInfo.refund_credit_line"> ng-model="paymentInfo.refund_credit_line">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" <button class="btn btn-success" ng-click="setRefundCreditLine()">
ng-click="setRefundCreditLine()">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
</button> </button>
</div> </div>
@ -558,10 +604,10 @@
class="fa fa-edit"></i></a> class="fa fa-edit"></i></a>
</p> </p>
<div class="input-group" ng-if="ctrl.editRefundPwd"> <div class="input-group" ng-if="ctrl.editRefundPwd">
<input type="text" class="form-control" maxlength="6" minlength="1" ng-model="paymentInfo.new_refund_password"> <input type="text" class="form-control" maxlength="6" minlength="1"
ng-model="paymentInfo.new_refund_password">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" <button class="btn btn-success" ng-click="resetRefundPwd(paymentInfo.new_refund_password)">
ng-click="resetRefundPwd(paymentInfo.new_refund_password)">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
</button> </button>
</div> </div>
@ -586,14 +632,14 @@
<label class="col-sm-2 control-label">Require Customer Information</label> <label class="col-sm-2 control-label">Require Customer Information</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.require_custinfo" bs-switch <input type="checkbox" ng-model="paymentInfo.require_custinfo" bs-switch
switch-change="toggleRequireCustInfo()"> switch-change="toggleRequireCustInfo()">
</div> </div>
</div> </div>
<div class="form-group" ng-if="'1000000000111'|withRole"> <div class="form-group" ng-if="'1000000000111'|withRole">
<label class="col-sm-2 control-label">Require Remark</label> <label class="col-sm-2 control-label">Require Remark</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.require_remark" bs-switch <input type="checkbox" ng-model="paymentInfo.require_remark" bs-switch
switch-change="toggleRequireRemark()"> switch-change="toggleRequireRemark()">
</div> </div>
</div> </div>
</div> </div>
@ -602,23 +648,24 @@
<div class="panel panel-default" ng-if="('100000000'|withRole) && paymentInfo.ext_params"> <div class="panel panel-default" ng-if="('100000000'|withRole) && paymentInfo.ext_params">
<div class="panel-heading">Ext Config</div> <div class="panel-heading">Ext Config</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal" > <div class="form-horizontal">
<div class="form-group" ng-repeat="param in convertExtParams"> <div class="form-group" ng-repeat="param in convertExtParams">
<label class="col-sm-2 control-label">{{param.name.toUpperCase()}}</label> <label class="col-sm-2 control-label">{{param.name.toUpperCase()}}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<div ng-if="param.type=='boolean'"> <div ng-if="param.type=='boolean'">
<input type="checkbox" ng-model="param.value" bs-switch <input type="checkbox" ng-model="param.value" bs-switch
ng-change="extChangeParam(param.name,param.value)"> ng-change="extChangeParam(param.name,param.value)">
</div> </div>
<div ng-if="param.type == 'string'"> <div ng-if="param.type == 'string'">
<p ng-if="!param.flag" class="form-control-static"> <p ng-if="!param.flag" class="form-control-static">
{{param.value}} {{param.value}}
<a role="button" ng-click="param.flag=true" ng-if="'01'|withRole"><i class="fa fa-edit"></i></a> <a role="button" ng-click="param.flag=true" ng-if="'01'|withRole"><i
class="fa fa-edit"></i></a>
</p> </p>
<div class="input-group" ng-if="param.flag"> <div class="input-group" ng-if="param.flag">
<input type="text" class="form-control" ng-model="param.value" <input type="text" class="form-control" ng-model="param.value"
title="Prevent not enough refund"> title="Prevent not enough refund">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-success" ng-click="extChangeParam(param.name,param.value)"> <button class="btn btn-success" ng-click="extChangeParam(param.name,param.value)">
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
@ -645,7 +692,8 @@
<div class="form-group col-sm-6"> <div class="form-group col-sm-6">
<label class="col-sm-4 control-label">Select Version</label> <label class="col-sm-4 control-label">Select Version</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-control" ng-change="changePaymentPage()" ng-model="paymentInfo.paypad_version" title="Payment Page"> <select class="form-control" ng-change="changePaymentPage()" ng-model="paymentInfo.paypad_version"
title="Payment Page">
<option value="v1">v1</option> <option value="v1">v1</option>
<option value="v2">v2</option> <option value="v2">v2</option>
<option value="v3">v3</option> <option value="v3">v3</option>
@ -657,36 +705,42 @@
<div class="col-sm-12"> <div class="col-sm-12">
<label class="col-sm-4 control-label"></label> <label class="col-sm-4 control-label"></label>
<div class="col-sm-8" style="margin-top: 10px;"> <div class="col-sm-8" style="margin-top: 10px;">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v1'" src="/static/images/payment_page_v1.jpg"> <img style="width: 200px" ng-if="paymentInfo.paypad_version=='v1'"
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v2'" src="/static/images/payment_page_v2.jpg"> src="/static/images/payment_page_v1.jpg">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v3'" src="/static/images/payment_page_v3.jpg"> <img style="width: 200px" ng-if="paymentInfo.paypad_version=='v2'"
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v4'" src="/static/images/payment_page_v4.jpg"> src="/static/images/payment_page_v2.jpg">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v5'" src="/static/images/payment_page_v5.jpg"> <img style="width: 200px" ng-if="paymentInfo.paypad_version=='v3'"
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v6'" src="/static/images/payment_page_v6.jpg"> src="/static/images/payment_page_v3.jpg">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v4'"
src="/static/images/payment_page_v4.jpg">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v5'"
src="/static/images/payment_page_v5.jpg">
<img style="width: 200px" ng-if="paymentInfo.paypad_version=='v6'"
src="/static/images/payment_page_v6.jpg">
</div> </div>
</div> </div>
</div> </div>
<!--先注释支付成功页选项--> <!--先注释支付成功页选项-->
<!--<div class="form-group col-sm-6">--> <!--<div class="form-group col-sm-6">-->
<!--<label class="col-sm-4 control-label">Select Version</label>--> <!--<label class="col-sm-4 control-label">Select Version</label>-->
<!--<div class="col-sm-6">--> <!--<div class="col-sm-6">-->
<!--<select class="form-control" ng-change="changePaySuccessPage()" ng-model="paymentInfo.paysuccess_version"--> <!--<select class="form-control" ng-change="changePaySuccessPage()" ng-model="paymentInfo.paysuccess_version"-->
<!--title="Payment Success Page">--> <!--title="Payment Success Page">-->
<!--<option value="v1">v1</option>--> <!--<option value="v1">v1</option>-->
<!--<option value="v2">v2</option>--> <!--<option value="v2">v2</option>-->
<!--</select>--> <!--</select>-->
<!--</div>--> <!--</div>-->
<!--<div class="col-sm-12">--> <!--<div class="col-sm-12">-->
<!--<label class="col-sm-4 control-label"></label>--> <!--<label class="col-sm-4 control-label"></label>-->
<!--<div class="col-sm-8" style="margin-top: 10px;">--> <!--<div class="col-sm-8" style="margin-top: 10px;">-->
<!--<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v1'"--> <!--<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v1'"-->
<!--src="/static/images/paysuccess_v1.png">--> <!--src="/static/images/paysuccess_v1.png">-->
<!--<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v2'"--> <!--<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v2'"-->
<!--src="/static/images/paysuccess_v2.png">--> <!--src="/static/images/paysuccess_v2.png">-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
</div> </div>
</div> </div>
</div> </div>

107
src/main/ui/static/payment/partner/templates/sub_merchant_detail.html
Unescape View File

@ -0,0 +1,107 @@
<div class="panel panel-warning">
<div class="panel-body">
<ul class="list-group" ng-if="channel === 'Wechat'">
<li class="list-group-item flex-between">
<b>Sub Merchant Id</b>
<span>{{subMerchantInfo.sub_merchant_id}}</span>
</li>
<li class="list-group-item flex-between">
<b>Apply Time</b>
<span ng-bind="subMerchantInfo.create_time"></span>
</li>
<li class="list-group-item flex-between">
<b>Merchant Short Name</b>
<span>{{subMerchantInfo.merchant_shortname | cut:true:20:'...'}}</span>
</li>
<li class="list-group-item flex-between">
<b>Business Category</b>
<span>{{subMerchantInfo.business_category | newWxMerchants}}</span>
</li>
<li class="list-group-item flex-between">
<b>Mcc Code</b>
<span>{{subMerchantInfo.mcc_code | wechatMcc }}</span>
</li>
<li class="list-group-item flex-between">
<b>Operator</b>
<span ng-bind="subMerchantInfo.operator"></span>
</li>
</ul>
<ul class="list-group" ng-if="channel === 'MerchantWarrior'">
<li class="list-group-item flex-between">
<b>Sub Merchant Id</b>
<span>{{subMerchantInfo.cardInfo.rpMerchantId}}</span>
</li>
<li class="list-group-item flex-between">
<b>Name</b>
<span ng-bind="subMerchantInfo.cardInfo.name"></span>
</li>
<li class="list-group-item flex-between">
<b>Company Name</b>
<span>{{subMerchantInfo.cardInfo.company_name}}</span>
</li>
<li class="list-group-item flex-between">
<b>Address</b>
<span>{{subMerchantInfo.cardInfo.address | newWxMerchants}}</span>
</li>
<li class="list-group-item flex-between">
<b>Suburb</b>
<span>{{subMerchantInfo.cardInfo.suburb}}</span>
</li>
<li class="list-group-item flex-between">
<b>Postcode</b>
<span ng-bind="subMerchantInfo.cardInfo.postcode"></span>
</li>
<li class="list-group-item flex-between">
<b>State</b>
<span ng-bind="subMerchantInfo.cardInfo.state"></span>
</li>
<li class="list-group-item flex-between">
<b>Abn</b>
<span ng-bind="subMerchantInfo.cardInfo.abn"></span>
</li>
<li class="list-group-item flex-between">
<b>Email</b>
<span ng-bind="subMerchantInfo.cardInfo.email"></span>
</li>
<li class="list-group-item flex-between">
<b>Contact Name</b>
<span ng-bind="subMerchantInfo.cardInfo.contact_name"></span>
</li>
<li class="list-group-item flex-between">
<b>Phone</b>
<span ng-bind="subMerchantInfo.cardInfo.phone"></span>
</li>
<li class="list-group-item flex-between">
<b>BSB</b>
<span ng-bind="subMerchantInfo.cardInfo.bsb"></span>
</li>
<li class="list-group-item flex-between">
<b>Account No</b>
<span ng-bind="subMerchantInfo.cardInfo.accountNo"></span>
</li>
<li class="list-group-item flex-between">
<b>Account Name</b>
<span ng-bind="subMerchantInfo.cardInfo.accountName"></span>
</li>
<li class="list-group-item flex-between">
<b>Website</b>
<span ng-bind="subMerchantInfo.cardInfo.website"></span>
</li>
<li class="list-group-item flex-between">
<b>Timezone</b>
<span ng-bind="subMerchantInfo.cardInfo.timezone"></span>
</li>
<li class="list-group-item flex-between">
<b>Category</b>
<span ng-bind="subMerchantInfo.cardInfo.category|partner_royalpay_industry"></span>
</li>
</ul>
</div>
</div>
<style>
.flex-between {
display: flex;
justify-content: space-between;
}
</style>

595
src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
Unescape View File

@ -1,19 +1,21 @@
<style> <style>
.box_desk{ .box_desk {
width: 96%; width: 96%;
height: 87%; height: 87%;
background: rgba(0, 0, 0, .65); background: rgba(0, 0, 0, .65);
position: absolute; position: absolute;
bottom: 28px; bottom: 28px;
transition: all linear 0.5s; transition: all linear 0.5s;
opacity:0; opacity: 0;
} }
.box-body:hover .box_desk{
.box-body:hover .box_desk {
padding: 0px; padding: 0px;
opacity: 0.8; opacity: 0.8;
display: block; display: block;
} }
.content_button{
.content_button {
display: block; display: block;
position: absolute; position: absolute;
top: 50%; top: 50%;
@ -23,68 +25,220 @@
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
} }
.flex-between {
display: flex;
justify-content: space-between;
}
.flex-align-center {
display: flex;
align-items: center;
}
.bootstrap-switch {
height: fit-content;
}
.content-mine {
width: 50%;
min-height: unset;
margin: unset;
}
</style> </style>
<div class="content"> <div style="display: flex;flex-wrap: wrap;">
<div class="row"> <!-- Wechat -->
<div class="col-sm-12"> <div class="content content-mine">
<div class="box-solid"> <div class="row">
<div class="box box-warning"> <div class="col-sm-12">
<div class="box-header"> <div class="box-solid">
<h3 class="box-title pull-left" > <div class="panel panel-default">
Wechat Sub Merchant Id : <span ng-bind="partner.sub_merchant_id"></span> <span ng-if="!partner.sub_merchant_id">none</span> <div class="panel-heading">
<i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i> <div class="flex-between">
</h3> <div class="flex-align-center">
<button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id" <img src="/static/images/wechatpay_sign.png" uib-tooltip="WechatPay" />
ng-click="applyWxSubMerchantId()"> <h5 style="margin-left: 5px;">
<i class="fa fa-plus"></i> Wechat : <span ng-bind="partnerInfo.sub_merchant_id"></span>
Apply Sub Merchant Id <span ng-if="!partnerInfo.sub_merchant_id">none</span>
</button> <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID"
ng-if="partnerInfo.temp_sub_merchant"></i>
</h5>
<a role="button"
ng-click="modifySubMerchantId(partnerInfo.sub_merchant_id,'Wechat')"
style="margin-left: 5px;"><i class="fa fa-edit"></i></a>
<!-- <div class="input-group" ng-if="ctrl.editSubMerchant">
<input type="text" class="form-control" ng-model="partnerInfo.sub_merchant_id"
title="WeChat Sub Merchant Id">
<div class="input-group-btn">
<button class="btn btn-success" ng-click="saveSubMerchantId()">
<i class="fa fa-check"></i>
</button>
</div>
<div class="input-group-btn">
<button class="btn btn-danger" ng-click="ctrl.editSubMerchant=false">
<i class="fa fa-remove"></i>
</button>
</div>
</div>
<a role="button" ng-click="queryWechatSubMerchantIdStatus()"><i
class="fa fa-search"></i></a> -->
</div>
<div>
<button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
ng-click="applyWxSubMerchantId()">
<i class="fa fa-plus"></i>
Apply
</button>
<button role="button" class="btn btn-info"
ng-click="queryWechatSubMerchantIdStatus()">
<i class="fa fa-search"></i>Result
</button>
<button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
Modify
</button>
</div>
</div>
</div>
<div class="panel-body">
<i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID"
ng-if="partnerInfo.temp_sub_merchant"></i>
<span class="small">
<b>Merchant ID : </b>
{{partnerInfo.merchant_id | choose_merchant_id}}
</span>
<span class="small">
<a class="text-primary" role="button" title="modify logs"
ng-click="showSubMerchantLogs(sub_merchant_id_logs)">
<span class="pull-right-container">
<span class="label label-primary">history</span>
</span>
</a>
</span>
<div class="flex-between" style="margin-top: 10px;">
<div class="box-title">
<b>Wechat Institution Merchant Id : </b>
<span>
{{partnerInfo.wechat_institution_merchant_id||'初始化'}}
<a role="button" ng-click="refreshWechatInstitutionMerchantId()"><i
class="fa fa-refresh"></i></a>
</span>
</div>
<span class="box-title flex-align-center">
<b>Common Sub Merchant Id : </b>
<input type="checkbox" name="switch" ng-model="partnerInfo.common_sub_merchant_id">
</span>
</div>
<ul class="list-group" style="margin-top: 20px;">
<li class="list-group-item flex-between" ng-repeat="id_apply in subMerchantInfos">
<b>Sub Merchant Id : {{id_apply.sub_merchant_id}}
<span ng-if="partner.sub_merchant_id == id_apply.sub_merchant_id"><small
class="text-red">(当前使用)</small>
</b>
<span>
<a role="button" ng-click="useSubMerchantId(id_apply.sub_merchant_id)">use</a>
<a role="button" style="margin-left: 10px;"
ng-click="checkDetail(id_apply,'Wechat')">detail</a>
</span>
</li>
</ul>
<!-- <div class="box-body col-sm-6" ng-repeat="id_apply in subMerchantInfos">
<ul class="list-group ui_desk">
<li class="list-group-item list-group-item-success">
<b>Sub Merchant Id</b>
<b style="float: right"><span
ng-if="partner.sub_merchant_id == id_apply.sub_merchant_id"><small
class="text-red">(当前使用)</small></span>{{id_apply.sub_merchant_id}}</b>
</li>
<li class="list-group-item list-group-item-success">
Apply Time
<span style="float: right" ng-bind="id_apply.create_time"></span>
</li>
<li class="list-group-item list-group-item-success">
Merchant Short Name
<span style="float:right;">{{id_apply.merchant_shortname | cut:true:20:'
...'}}</span>
</li>
<li class="list-group-item list-group-item-success">
Business Category
<span style="float: right">{{id_apply.business_category |
newWxMerchants}}</span>
</li>
<li class="list-group-item list-group-item-success">
Mcc Code
<span style="float: right;">{{id_apply.mcc_code | wechatMcc }}</span>
</li>
<li class="list-group-item list-group-item-success">
Operator
<span style="float: right" ng-bind="id_apply.operator"></span>
</li>
</ul>
<div class="box_desk">
<div class="content_button">
<button role="button" class="btn btn-info" title="use"
ng-click="useSubMerchantId(id_apply.sub_merchant_id)">
USE
</button>
</div>
</div>
</div> -->
</div>
</div> </div>
</div> </div>
<div class="box"> </div>
<div class="box-header"> </div>
<h3 class="box-title">List of Sub Merchant Id</h3> </div>
</div> <!-- Alipay -->
<div class="box-body col-sm-6" ng-repeat="id_apply in subMerchantInfos"> <div class="content content-mine">
<ul class="list-group ui_desk"> <div class="row">
<li class="list-group-item list-group-item-success"> <div class="col-sm-12">
<b>Sub Merchant Id</b> <div class="box-solid">
<b style="float: right"><span <div class="panel panel-default">
ng-if="partner.sub_merchant_id == id_apply.sub_merchant_id"><small <div class="panel-heading">
class="text-red">(当前使用)</small></span>{{id_apply.sub_merchant_id}}</b> <div class="flex-between">
</li> <div class="flex-align-center">
<li class="list-group-item list-group-item-success"> <img src="/static/images/alipay_sign.png" uib-tooltip="Alipay" />
Apply Time <h5 style="margin-left: 5px;">
<span style="float: right" ng-bind="id_apply.create_time"></span> Alipay : <span ng-bind="partnerInfo.ali_sub_merchant_id"></span>
</li> <span ng-if="!partnerInfo.ali_sub_merchant_id">none</span>
<li class="list-group-item list-group-item-success"> </h5>
Merchant Short Name <a role="button"
<span style="float:right;">{{id_apply.merchant_shortname | cut:true:20:' ...'}}</span> ng-click="modifySubMerchantId(partnerInfo.ali_sub_merchant_id,'Alipay')"
</li> style="margin-left: 5px;"><i class="fa fa-edit"></i></a>
<li class="list-group-item list-group-item-success"> <!-- <div class="input-group" ng-if="ctrl.editAliSubMerchant">
Business Category <input type="text" class="form-control"
<span style="float: right">{{id_apply.business_category | newWxMerchants}}</span> ng-model="partnerInfo.ali_sub_merchant_id" title="Ali Sub Merchant Id">
</li> <div class="input-group-btn">
<li class="list-group-item list-group-item-success"> <button class="btn btn-success" ng-click="saveAliSubMerchantId()">
Mcc Code <i class="fa fa-check"></i>
<span class="col-sm-10" style="float: right;margin-left:10px;overflow:hidden;text-overflow:ellipsis;" ><span style="float: right;margin-left:10px;margin-right:-10px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{id_apply.mcc_code | wechatMcc }}</span> </button>
</span> </div>
</li> <div class="input-group-btn">
<li class="list-group-item list-group-item-success"> <button class="btn btn-danger" ng-click="ctrl.editAliSubMerchant=false">
Operator <i class="fa fa-remove"></i>
<span style="float: right" ng-bind="id_apply.operator"></span> </button>
</li> </div>
</ul> </div>
<div class="box_desk"> <a role="button" ng-click="queryAlipayGms()"><i class="fa fa-search"
<div class="content_button"> title="Alipay进件"></i></a> -->
<button role="button" class="btn btn-info" title="use" </div>
ng-click="useSubMerchantId(id_apply.sub_merchant_id)"> <div>
USE <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
</button> ng-click="submitAlipaySubId()">
<!--<button role="button" class="btn btn-info" title="update"--> <i class="fa fa-plus"></i>Apply
<!--ng-click="updateSubMerchantId(id_apply.merchant_app_id)">--> </button>
<!--UPDATE--> <button role="button" class="btn btn-info" ng-click="queryAlipayGms()">
<!--</button>--> <i class="fa fa-search"></i>Result
</button>
<button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
Modify
</button>
</div>
</div>
</div>
<div class="panel-body">
<div style="display: flex;justify-content: center;">
<small style="color: rgba(0,0,0,.25);">No Data</small>
</div> </div>
</div> </div>
</div> </div>
@ -92,108 +246,225 @@
</div> </div>
</div> </div>
</div> </div>
</div> <!-- Online -->
<div class="content content-mine">
<div class="row">
<div class="col-sm-12">
<div class="box-solid">
<div class="panel panel-default">
<div class="panel-heading">
<div class="flex-between">
<div class="flex-align-center">
<img src="/static/images/alipay_online.png" style="width: 16px;height: 16px;"
uib-tooltip="AlipayOnline" />
<h5 style="margin-left: 5px;">
AlipayOnline : <span ng-bind="partnerInfo.ali_sub_merchant_id"></span>
<span ng-if="!partnerInfo.ali_sub_merchant_id">none</span>
</h5>
<a role="button"
ng-click="modifySubMerchantId(partnerInfo.ali_sub_merchant_id,'AlipayOnline')"
style="margin-left: 5px;"><i class="fa fa-edit"></i></a>
<!-- <div class="input-group" ng-if="ctrl.editAlipaySubMerchant">
<input type="text" class="form-control"
ng-model="partnerInfo.ali_sub_merchant_id" title="Ali Sub Merchant Id">
<div class="input-group-btn">
<button class="btn btn-success" ng-click="saveAliSubMerchantId()">
<i class="fa fa-check"></i>
</button>
</div>
<div class="input-group-btn">
<button class="btn btn-danger" ng-click="ctrl.editAlipaySubMerchant=false">
<i class="fa fa-remove"></i>
</button>
</div>
</div>
<a role="button" ng-click="queryAlipayOnlineGms()"><i class="fa fa-search"
title="AlipayOnline进件"></i></a> -->
</div>
<div>
<div class="content"> <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
<div class="row"> ng-click="submitAlipayOnlineSubId()">
<div class="col-sm-12"> <i class="fa fa-plus"></i>
<div class="box-solid"> Apply
<div class="box box-warning"> </button>
<div class="box-header"> <button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()">
<h3 class="box-title pull-left" > <i class="fa fa-search"></i>Result
Merchant Warrior Sub Merchant Id : </button>
<span ng-if="partner.cardInfo.rpMerchantId"> <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
<span ng-if="partner.cardInfo.available" style="color:green;">审核通过</span> Modify
<span ng-if="!partner.cardInfo.available && partner.cardInfo.pending" style="color:#f39c12;">审核中</span> </button>
<span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending" style="color:red;">打回</span> </div>
({{partner.cardInfo.rpMerchantId}})</span> </div>
<span ng-if="!partner.cardInfo">未申请</span> </div>
</h3> <div class="panel-body">
<button role="button" class="btn btn-info pull-right" title="Apply MW Sub Merchant Id" <div style="display: flex;justify-content: center;">
ng-click="applyMWSubMerchantId()"> <small style="color: rgba(0,0,0,.25);">No Data</small>
<i class="fa fa-plus"></i> </div>
Apply Merchant Warrior Sub Merchant Id </div>
</button>
</div> </div>
<div class="box"> </div>
<div class="box-body col-sm-6"> </div>
<ul class="list-group ui_desk"> </div>
<li class="list-group-item list-group-item-success"> </div>
<b>Sub Merchant Id</b> <!-- Rpay+ -->
<b style="float: right"> <div class="content content-mine">
{{partner.cardInfo.rpMerchantId}}</b> <div class="row">
</li> <div class="col-sm-12">
<li class="list-group-item list-group-item-success"> <div class="box-solid">
Name <div class="panel panel-default">
<span style="float: right" ng-bind="partner.cardInfo.name"></span> <div class="panel-heading">
</li> <h5>
<li class="list-group-item list-group-item-success"> Rpay+ Institution Merchant Id : <span ng-bind="partner.rpay_enterprise_id"></span>
Company Name <span ng-if="!partner.rpay_enterprise_id">none</span>
<span style="float:right;">{{partner.cardInfo.company_name}}</span> </h5>
</li> </div>
<li class="list-group-item list-group-item-success"> <div class="panel-body">
Address <div style="display: flex;justify-content: center;">
<span style="float: right">{{partner.cardInfo.address}}</span> <small style="color: rgba(0,0,0,.25);">No Data</small>
</li> </div>
<li class="list-group-item list-group-item-success"> </div>
Suburb </div>
<span style="float: right;">{{partner.cardInfo.suburb}}</span> </div>
</li> </div>
<li class="list-group-item list-group-item-success"> </div>
Postcode </div>
<span style="float: right" ng-bind="partner.cardInfo.postcode"></span>
</li> <div class="content content-mine">
<li class="list-group-item list-group-item-success" style="text-align: center" ng-if="!showMoreMerchantInfo" ng-click="hideMerchantInfo()"> <div class="row">
<span> More.....</span> <div class="col-sm-12">
</li> <div class="box-solid">
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> <div class="panel panel-default">
State <div class="panel-heading">
<span style="float: right" ng-bind="partner.cardInfo.state"></span> <div class="flex-between">
</li> <div class="flex-align-center">
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> <img src="/static/images/card_payment_sign.png" uib-tooltip="Card Payment" />
Abn <h5 style="margin-left: 5px;">
<span style="float: right" ng-bind="partner.cardInfo.abn"></span> Merchant Warrior :
</li> <span ng-if="partner.cardInfo.rpMerchantId">
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> <span ng-if="partner.cardInfo.available" style="color:green;">审核通过</span>
Email <span ng-if="!partner.cardInfo.available && partner.cardInfo.pending"
<span style="float: right" ng-bind="partner.cardInfo.email"></span> style="color:#f39c12;">审核中</span>
</li> <span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending"
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> style="color:red;">打回</span>
Contact Name ({{partner.cardInfo.rpMerchantId}})</span>
<span style="float: right" ng-bind="partner.cardInfo.contact_name"></span> <span ng-if="!partner.cardInfo">未申请</span>
</li> </h5>
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> </div>
Phone <button role="button" class="btn btn-info" title="Apply MW Sub Merchant Id"
<span style="float: right" ng-bind="partner.cardInfo.phone"></span> ng-click="applyMWSubMerchantId()">
</li> <i class="fa fa-plus"></i>
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> Apply
BSB </button>
<span style="float: right" ng-bind="partner.cardInfo.bsb"></span> </div>
</li> </div>
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> <div class="panel-body">
Account No <div style="display: flex;justify-content: center;" ng-if="!partner.cardInfo.rpMerchantId">
<span style="float: right" ng-bind="partner.cardInfo.accountNo"></span> <small style="color: rgba(0,0,0,.25);">No Data</small>
</li> </div>
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo">
Account Name <ul class="list-group" style="margin-top: 20px;" ng-if="partner.cardInfo.rpMerchantId">
<span style="float: right" ng-bind="partner.cardInfo.accountName"></span> <li class="list-group-item flex-between">
</li> <b>Sub Merchant Id : {{partner.cardInfo.rpMerchantId}}</b>
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo"> <a role="button" ng-click="checkDetail(partner,'MerchantWarrior')">detail</a>
Website
<span style="float: right" ng-bind="partner.cardInfo.website"></span>
</li>
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo">
Timezone
<span style="float: right" ng-bind="partner.cardInfo.timezone"></span>
</li>
<li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo">
Category
<span style="float: right" ng-bind="partner.cardInfo.category|partner_royalpay_industry"></span>
</li>
<li class="list-group-item list-group-item-success" style="text-align: center" ng-if="showMoreMerchantInfo" ng-click="hideMerchantInfo()">
<span> Hide.....</span>
</li> </li>
</ul> </ul>
<!-- <div class="box">
<div class="box-body col-sm-6">
<ul class="list-group ui_desk">
<li class="list-group-item list-group-item-success">
<b>Sub Merchant Id</b>
<b style="float: right">
{{partner.cardInfo.rpMerchantId}}</b>
</li>
<li class="list-group-item list-group-item-success">
Name
<span style="float: right" ng-bind="partner.cardInfo.name"></span>
</li>
<li class="list-group-item list-group-item-success">
Company Name
<span style="float:right;">{{partner.cardInfo.company_name}}</span>
</li>
<li class="list-group-item list-group-item-success">
Address
<span style="float: right">{{partner.cardInfo.address}}</span>
</li>
<li class="list-group-item list-group-item-success">
Suburb
<span style="float: right;">{{partner.cardInfo.suburb}}</span>
</li>
<li class="list-group-item list-group-item-success">
Postcode
<span style="float: right" ng-bind="partner.cardInfo.postcode"></span>
</li>
<li class="list-group-item list-group-item-success" style="text-align: center"
ng-if="!showMoreMerchantInfo" ng-click="hideMerchantInfo()">
<span> More.....</span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
State
<span style="float: right" ng-bind="partner.cardInfo.state"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Abn
<span style="float: right" ng-bind="partner.cardInfo.abn"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Email
<span style="float: right" ng-bind="partner.cardInfo.email"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Contact Name
<span style="float: right" ng-bind="partner.cardInfo.contact_name"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Phone
<span style="float: right" ng-bind="partner.cardInfo.phone"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
BSB
<span style="float: right" ng-bind="partner.cardInfo.bsb"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Account No
<span style="float: right" ng-bind="partner.cardInfo.accountNo"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Account Name
<span style="float: right" ng-bind="partner.cardInfo.accountName"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Website
<span style="float: right" ng-bind="partner.cardInfo.website"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Timezone
<span style="float: right" ng-bind="partner.cardInfo.timezone"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Category
<span style="float: right"
ng-bind="partner.cardInfo.category|partner_royalpay_industry"></span>
</li>
<li class="list-group-item list-group-item-success" style="text-align: center"
ng-if="showMoreMerchantInfo" ng-click="hideMerchantInfo()">
<span> Hide.....</span>
</li>
</ul>
</div>
</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -333,4 +604,4 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!--</div>--> <!--</div>-->
</div> </div>
Write Preview
Loading…
Cancel
Save