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

Merge branch 'develop'

Browse Source
master
AlanFenng 4 years ago
parent 1747b19c18 fbeda072f8
commit e0539d4264
15 changed files with 2055 additions and 989 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

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

5
src/db/modify.sql
Unescape View File

@ -771,3 +771,8 @@ alter table sys_wx_merchant_apply
ALTER TABLE `sys_clients`
ADD COLUMN certificat_expire_date date DEFAULT NULL COMMENT '注册证书过期时间';
-- 商户表 日期类型改为varchar 2020.12.23
ALTER TABLE `sys_clients`
modify COLUMN certificat_expire_date varchar(20) DEFAULT NULL COMMENT '注册证书过期时间';

6
src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
Unescape View File

@ -134,7 +134,7 @@ public class ClientRegisterInfo {
private String director_id_number;
private String principal_name;
private String principal_id_number;
private Date certificat_expire_date;//注册证书过期时间
private String certificat_expire_date;//注册证书过期时间
private String mc_code;//微信mccode
@ -675,11 +675,11 @@ public class ClientRegisterInfo {
this.principal_id_number = principal_id_number;
}
public Date getCertificat_expire_date() {
public String getCertificat_expire_date() {
return certificat_expire_date;
}
public void setCertificat_expire_date(Date certificat_expire_date) {
public void setCertificat_expire_date(String certificat_expire_date) {
this.certificat_expire_date = certificat_expire_date;
}

120
src/main/ui/static/commons/services/industryMap.js
Unescape View File

@ -158,6 +158,126 @@ define(['../app'], function (app) {
{
"label": "Medical Service",
"value": "533"
},
{
"label": "Online games (Top-up)",
"value": "644"
},
{
"label": "Online Shopping Mall",
"value": "648"
},
{
"label": "Supermarket",
"value": "649"
},
{
"label": "Convenience Store",
"value": "651"
},
{
"label": "Duty-free Shop",
"value": "652"
},
{
"label": "Pharmacy",
"value": "653"
},
{
"label": "Vending Machine",
"value": "654"
},
{
"label": "Department Store /Shopping Centre",
"value": "655"
},
{
"label": "Food/Beverages",
"value": "656"
},
{
"label": "Catering Services",
"value": "657"
},
{
"label": "Furniture/Household Products",
"value": "658"
},
{
"label": "Home Appliances/Camera Equipment/Office Equipment",
"value": "659"
},
{
"label": "Beauty/Personal Care Products",
"value": "660"
},
{
"label": "Flowers/Plants/Interior Decorations/Decorations",
"value": "661"
},
{
"label": "Nursery Products/Toys",
"value": "662"
},
{
"label": "Clothing/Shoes/Other Accessories",
"value": "663"
},
{
"label": "Sports/Fitness Equipment/Security",
"value": "664"
},
{
"label": "Watches/Eyewear/Jewellery",
"value": "665"
},
{
"label": "Outdoor Products /Travel Products",
"value": "666"
},
{
"label": "Books / Records / Stationery / Musical Instruments",
"value": "667"
},
{
"label": "Flight ticket/ticketing agent",
"value": "668"
},
{
"label": "Sightseeing Passes",
"value": "669"
},
{
"label": "Hotel/Resort",
"value": "670"
},
{
"label": "Online Books/Video/Music",
"value": "671"
},
{
"label": "Online games (Download)",
"value": "672"
},
{
"label": "University Education",
"value": "677"
},
{
"label": "Public hospitals/Medical Institutions",
"value": "679"
},
{
"label": "Private hospitals/Clinics/Medical institutions",
"value": "678"
},
{
"label": "Public transit",
"value": "680"
},
{
"label": "Logistics/ Courier Service",
"value": "684"
}
];
app.factory('industryMap', function () {

91
src/main/ui/static/payment/partner/add-partner.js
Unescape View File

@ -32,7 +32,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
})
}]);
app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc) {
app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'upayIndustryMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap','wechatGoodMcc','$filter', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, upayIndustryMap, industryMap, stateMap, sectorMap, countryMap,wechatGoodMcc,$filter) {
if ($scope.partner_application) {
$scope.partner = angular.copy($scope.partner_application);
delete $rootScope.partner_application;
@ -57,7 +57,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.contact_phone_c = 61;
$scope.partner.client_pay_type = [];
$scope.partner.client_pay_desc = [];
$scope.checkExpriedate=function (value) {
if(value){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_NA=false;
}
}
$scope.checkExpriedateOther=function (value) {
if(value=='PERMANENT'){
if($scope.partner.certificat_expire_date_premanent){
$scope.partner.certificat_expire_date_NA=false;
$scope.partner.certificat_expire_date_d=null;
}
}else if(value=='N/A'){
if($scope.partner.certificat_expire_date_NA){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_d=null;
}
}
}
var resetClientPayDescByTpey = function (type) {
type = parseInt(type);
if (type == 1) {
@ -232,6 +250,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
alert('Please select the business structure');
return;
}
if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
if ($scope.partner.certificat_expire_date_d) {
$scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
} else if ($scope.partner.certificat_expire_date_premanent) {
$scope.partner.certificat_expire_date = "PERMANENT";
}
else if ($scope.partner.certificat_expire_date_NA) {
$scope.partner.certificat_expire_date = "N/A";
} else {
alert("Certificate expiration time is required");
return;
}
}
if (!$scope.partner.enable_cross_payment && !$scope.partner.enable_card_payment) {
alert("商户至少开通一种支付方式，请检查是否选择了跨境支付或卡支付！");
return;
@ -441,16 +472,45 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
}
}]);
app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc',
function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc) {
app.controller('partnerEditCtrl2', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'partner','upayIndustryMap','wechatGoodMcc','$filter',
function ($scope, $http, $state, Upload, commonDialog, timezone, partner,upayIndustryMap,wechatGoodMcc,$filter) {
$scope.upayIndustrys = upayIndustryMap.configs();
$scope.timezones = timezone.configs();
$scope.wechatMccIndustries = wechatGoodMcc.configs();
$scope.partner = partner.data;
// if(partner.data.certificat_expire_date) {
// var datestr = partner.data.certificat_expire_date.replace(/-/g, '/');
// $scope.partner.certificat_expire_date=new Date(datestr);
// }
if(partner.data.certificat_expire_date) {
var datestr = partner.data.certificat_expire_date.replace(/-/g, '/');
$scope.partner.certificat_expire_date=new Date(datestr);
if( $scope.partner.certificat_expire_date=="PERMANENT"){
$scope.partner.certificat_expire_date_premanent=true;
}else if( $scope.partner.certificat_expire_date=="N/A"){
$scope.partner.certificat_expire_date_NA=true;
}else {
var datestr = $scope.partner.certificat_expire_date.replace(/-/g, '/');
$scope.partner.certificat_expire_date_d = new Date(datestr);
}
}
$scope.checkExpriedate=function (value) {
if(value){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_NA=false;
}
}
$scope.checkExpriedateOther=function (value) {
if(value=='PERMANENT'){
if($scope.partner.certificat_expire_date_premanent){
$scope.partner.certificat_expire_date_NA=false;
$scope.partner.certificat_expire_date_d=null;
}
}else if(value=='N/A'){
if($scope.partner.certificat_expire_date_NA){
$scope.partner.certificat_expire_date_premanent=false;
$scope.partner.certificat_expire_date_d=null;
}
}
}
if($scope.partner.mc_code ){
$scope.partner.mc_code=parseInt($scope.partner.mc_code);
@ -664,7 +724,23 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
});
return;
}
if (!$scope.partner.business_structure||$scope.partner.business_structure == '') {
alert('Please select the business structure');
return;
}
if ($scope.partner.business_structure!='Registered body(Sole Trader)') {
if ($scope.partner.certificat_expire_date_d) {
$scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d)
} else if ($scope.partner.certificat_expire_date_premanent) {
$scope.partner.certificat_expire_date = "PERMANENT";
}
else if ($scope.partner.certificat_expire_date_NA) {
$scope.partner.certificat_expire_date = "N/A";
} else {
alert("Certificate expiration time is required");
return;
}
}
if ($scope.partner.company_name.indexOf("Migration") != -1) {
alert("Company Name包含敏感词汇，请检查后重新提交！");
return;
@ -705,6 +781,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
})
}
var content = '';
if (!origin_referrer_id && $scope.partner.referrer_id) {
content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!';

1227
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/add_partner.html
Unescape View File

@ -309,25 +309,28 @@
</div>
</div>
</div>
<div class="form-group" ng-if="partner.business_structure == 'Company'&&partner.business_structure != null"
<div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8">
<!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"-->
<!--type="text" name="company_register_date" id="company_register_date_input">-->
<div style="display: inline-block">
<input class="form-control" id="certificat_expire_date_input"
ng-model="partner.certificat_expire_date"
<input class="control-label col-sm-2" id="certificat_expire_date_input"
ng-model="partner.certificat_expire_date_d"
uib-datepicker-popup size="10"
required
ng-change="checkExpriedate(partner.certificat_expire_date_d)"
name="certificat_expire_date"
is-open="certificat_expire_date.open"
ng-click="certificat_expire_date.open=true"
>
</div>
<div ng-messages="partnerForm.certificat_expire_date.$error" ng-if="partnerForm.certificat_expire_date.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
>&nbsp;
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="partner.certificat_expire_date_premanent"> <p>PERMANENT</p>
</span>
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="partner.certificat_expire_date_NA"><p>N/A</p>
</span>
</div>
</div>
<div class="form-group"

21
src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
Unescape View File

@ -233,25 +233,26 @@
</div>
</div>
<div class="form-group" ng-if="partner.business_structure == 'Company'"
<div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8">
<!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"-->
<!--type="text" name="company_register_date" id="company_register_date_input">-->
<div style="display: inline-block">
<input class="form-control" id="certificat_expire_date_input"
ng-model="partner.certificat_expire_date"
<input class="control-label col-sm-2" id="certificat_expire_date_input"
ng-model="partner.certificat_expire_date_d"
uib-datepicker-popup size="10"
required
ng-change="checkExpriedate(partner.certificat_expire_date_d)"
name="certificat_expire_date"
is-open="certificat_expire_date.open"
ng-click="certificat_expire_date.open=true"
>
</div>
<div ng-messages="partnerForm.certificat_expire_date.$error" ng-if="partnerForm.certificat_expire_date.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
>&nbsp;
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="partner.certificat_expire_date_premanent"> <p>PERMANENT</p>
</span>
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="partner.certificat_expire_date_NA"><p>N/A</p>
</span>
</div>
</div>

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>

21
src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
Unescape View File

@ -228,18 +228,25 @@
ng-class="{'has-error':subForm.certificat_expire_date.$invalid && subForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-3" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8">
<input class="form-control" id="certificat_expire_date_input"
ng-model="subMerchantInfo.certificat_expire_date"
<input class="control-label col-sm-4" id="certificat_expire_date_input"
ng-model="subMerchantInfo.certificat_expire_date_d"
uib-datepicker-popup size="10"
required
ng-change="checkExpriedate(subMerchantInfo.certificat_expire_date_d)"
name="certificat_expire_date"
is-open="certificat_expire_date.open"
ng-click="certificat_expire_date.open=true"
>
<div ng-messages="subForm.certificat_expire_date.$error" ng-if="subForm.certificat_expire_date.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
</div>
&nbsp;
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="subMerchantInfo.certificat_expire_date_premanent"> <p>PERMANENT</p>
</span>
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="subMerchantInfo.certificat_expire_date_NA"><p>N/A</p>
</span>
</div>
</div>

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

@ -36,7 +36,7 @@
.btn-default:active,
.btn-default.active,
.open > .dropdown-toggle.btn-default {
.open>.dropdown-toggle.btn-default {
color: #333;
background-color: #f7bf90;
border-color: #adadad;
@ -44,7 +44,8 @@
</style>
<section class="content-header">
<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>
<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
@ -65,8 +66,7 @@
<div class="box-header with-border">
<h3 class="box-title"><img style="height: 20px;width: 20px" height="20px"
src="/static/images/royalpay_sign_s.png">Cross-border payment Compliance <span
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0"
style="color: red">(Refused
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0" style="color: red">(Refused
<small class=""
ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}</small>)</span>
<span ng-if="(partner.source==1 || partner.source==2) && partner.approve_result==2"
@ -110,7 +110,8 @@
<button type="button" ng-if="partner.open_status!=10 && partner.approve_result!=1"
class="btn btn-success" ng-click="passClient()">Pass
</button>
<button ng-if="(partner.open_status==1||partner.open_status==10) && partner.approve_result>3 || partner.open_status==4"
<button
ng-if="(partner.open_status==1||partner.open_status==10) && partner.approve_result>3 || partner.open_status==4"
type="button" class="btn btn-primary" ng-click="refuse()">Refuse
</button>
@ -122,9 +123,8 @@
</button>
</div>
<a style="margin-top: 5px" ng-if="fileManager.source_agree_file" role="button"
class="btn-group btn btn-warning" style="margin-top: 5px"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"><i
class="fa fa-download"></i>下载合同</a>
class="btn-group btn btn-warning" style="margin-top: 5px" type="button"
ng-href="{{fileManager.source_agree_file}}" target="_blank"><i class="fa fa-download"></i>下载合同</a>
<span style="margin-top: 5px" ng-if="partner.open_status != 5">
<a ng-if="partner.open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="notifyBD()">
@ -184,9 +184,8 @@
</div>
<div class="box-body">
<!--<div class="pull-left" ng-if="partner.approve_result==5">Remark:{{partner.refuse_remark}}</div>-->
<a ng-if="fileManager.source_agree_file" role="button" class="btn-group btn btn-warning"
type="button" ng-href="{{fileManager.source_agree_file}}" target="_blank"> <i
class="fa fa-download"></i>下载合同</a>
<a ng-if="fileManager.source_agree_file" role="button" class="btn-group btn btn-warning" type="button"
ng-href="{{fileManager.source_agree_file}}" target="_blank"> <i class="fa fa-download"></i>下载合同</a>
<div ng-if="partner.open_status==3" class="btn-group pull-right" role="group" aria-label="...">
<button type="button" class="btn btn-danger" ng-click="commitToCompliance()">Commit to Compliance
</button>
@ -244,7 +243,8 @@
src="/static/images/card_payment_sign.png"></span>
Card Payment Compliance
<span ng-if="partner.upay_approve_result==5" style="color: red">(Refused
<small class="" ng-if="partner.upay_approve_result==5 || partner.upay_refuse_remark.length>0">:{{partner.upay_refuse_remark}}</small>)
<small class=""
ng-if="partner.upay_approve_result==5 || partner.upay_refuse_remark.length>0">:{{partner.upay_refuse_remark}}</small>)
</span>
【目前状态】-
<b ng-if="partner.source==4">
@ -277,16 +277,16 @@
ng-if="partner.upay_open_status==1 && partner.upay_approve_result>1 || partner.upay_open_status==4"
class="btn btn-success" ng-click="passCardClient()">Pass
</button>
<button ng-if="partner.upay_open_status==1 ||partner.upay_open_status==4"
type="button" class="btn btn-primary" ng-click="cardRefuse()">Refuse
<button ng-if="partner.upay_open_status==1 ||partner.upay_open_status==4" type="button"
class="btn btn-primary" ng-click="cardRefuse()">Refuse
</button>
</div>
<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
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"-->
<!-- type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i-->
<!-- class="fa fa-download"></i>下载Terms And Conditions合同</a>-->
<!-- <a ng-if="termsAndConditionsFile.terms_and_conditions_file" role="button" class="btn-group btn btn-warning"-->
<!-- type="button" ng-href="{{termsAndConditionsFile.terms_and_conditions_file}}" target="_blank"> <i-->
<!-- class="fa fa-download"></i>下载Terms And Conditions合同</a>-->
<span style="margin-top: 5px" ng-if="partner.upay_open_status != 5">
<a ng-if="partner.upay_open_status==2" role="button" type="button" class="btn btn-primary"
ng-click="cardNotifyBD()">
@ -346,8 +346,8 @@
</div>
<div class="box-body">
<a ng-if="letterOfOfferFileManager.letter_of_offer_file && partner.upay_approve_result!=1" role="button"
class="btn-group btn btn-warning"
type="button" ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="btn-group btn btn-warning" type="button"
ng-href="{{letterOfOfferFileManager.letter_of_offer_file}}" target="_blank"> <i
class="fa fa-download"></i>下载Letter Of Offer合同</a>
<!--<a ng-if="termsAndConditionsFile.terms_and_conditions_file && partner.upay_approve_result!=1" role="button"
class="btn-group btn btn-warning"
@ -420,8 +420,7 @@
<li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1">
<a ui-sref=".accounts">Partner Accounts</a>
</li>
<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=".subpartners">Subpartners</a>
</li>
<li ui-sref-active="active" ng-if="false && partner.is_valid==1">
@ -455,7 +454,7 @@
<a ui-sref=".product">Product</a>
</li>
<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 ui-sref-active="active" ng-if="partner.is_valid==1">
<a ui-sref=".permission_client">Permissions</a>
@ -500,8 +499,7 @@
<div class="col-sm-10">
<p class="form-control-static">
<span ng-bind="partner.company_name"></span>
<span
ng-if="isComplianceOfCompanyName && partner.open_status"
<span ng-if="isComplianceOfCompanyName && partner.open_status"
style="margin-left: 10px;font-weight: 700;color: red;">
注意:（微信渠道可能不合规）
</span>
@ -560,33 +558,29 @@
</p>
</div>
</div>
<div class="form-group" ng-if="partner.director_name" >
<label
class="control-label col-sm-2">Director Name</label>
<div class="form-group" ng-if="partner.director_name">
<label class="control-label col-sm-2">Director Name</label>
<div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.director_name"></p>
</div>
</div>
<div class="form-group" ng-if="partner.director_id_number">
<label
class="control-label col-sm-2">Director Id</label>
<label class="control-label col-sm-2">Director Id</label>
<div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.director_id_number"></p>
</div>
</div>
<div class="form-group" ng-if="partner.principal_name">
<label
class="control-label col-sm-2">Principal Name</label>
<label class="control-label col-sm-2">Principal Name</label>
<div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.principal_name"></p>
</div>
</div>
<div class="form-group" ng-if="partner.principal_id_number">
<label
class="control-label col-sm-2">Principal Id</label>
<label class="control-label col-sm-2">Principal Id</label>
<div class="col-sm-10">
<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>
</div>
</div>
<div class="form-group" >
<label class="control-label col-sm-2">Expiration Date of Registration Certificat</label>
<div class="form-group">
<label class="control-label col-sm-2">Expiration Date of Registration
Certificat</label>
<div class="col-sm-10">
<p class="form-control-static" ng-bind="partner.certificat_expire_date"></p>
@ -689,7 +684,8 @@
<th>End Date</th>
<th>BD Name</th>
<th>Proportion</th>
<th ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission)">
<th
ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission)">
Operation
</th>
</tr>
@ -700,8 +696,10 @@
<td ng-bind="bd.end_date|date:'yyyy-MM-dd'"></td>
<td ng-bind="bd.bd_name"></td>
<td ng-bind="bd.proportion"></td>
<td ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission) ">
<a role="button" ng-click="editBDUser()" ng-if="bd.end_date==null">
<td
ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission) ">
<a role="button" ng-click="editBDUser()"
ng-if="bd.end_date==null">
<i class="fa fa-pencil-square-o"></i>
</a>
</td>
@ -712,8 +710,8 @@
<div class="col-sm-2">
<p class="form-control-static">
<!--<span ng-bind="partner.bd_user_name||'Not Bind'"></span>-->
<a role="button" ng-click="bindBDUser()"
ng-if="('00010'|withRole)">New Policy +</a>
<a role="button" ng-click="bindBDUser()" ng-if="('00010'|withRole)">New
Policy +</a>
</p>
</div>
</div>
@ -741,8 +739,7 @@
</button>
</div>
</div>
<div class="form-group"
ng-if="partner.client_pay_type.indexOf('1')>=0">
<div class="form-group" ng-if="partner.client_pay_type.indexOf('1')>=0">
<label class="control-label col-sm-2">
Online</label>
<div class="col-sm-8">
@ -980,14 +977,12 @@
ng-bind="partner.same_email">
<div>
<a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
role="button"
ng-click="resendApproveEmail('crossborder')">
role="button" ng-click="resendApproveEmail('crossborder')">
<i class="fa fa-envelope"></i> Resend Cross-Border
</a>
<br/>
<br />
<a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
role="button"
ng-click="resendApproveEmail('cardpayment')">
role="button" ng-click="resendApproveEmail('cardpayment')">
<i class="fa fa-envelope"></i> Resend CardPayment
</a>
</div>
@ -1018,7 +1013,7 @@
</div>
<div ng-if="partner.representativeInfo">
<hr/>
<hr />
<div class="panel-heading">Legal Representative</div>
<div class="panel-body">
<div class="form-horizontal">
@ -1042,8 +1037,8 @@
<label class="control-label col-sm-4">Phone</label>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.phone"></p>
<p class="form-control-static" ng-bind="partner.representativeInfo.phone">
</p>
</div>
</div>
<div class="form-group col-sm-6">
@ -1069,7 +1064,7 @@
</div>
<div ng-if="partner.representativeInfo && partner.representativeInfo.marketing_person">
<hr/>
<hr />
<div class="panel-heading">Marketing Person</div>
<div class="panel-body">
<div class="form-horizontal">
@ -1124,8 +1119,8 @@
<div class="panel-heading">Registered Office Address</div>
<div ng-if="partner.representativeInfo">
<!-- <hr/>-->
<!-- <div class="panel-heading">Registered Address Information(<span style="color: red">Registered address on your business license.</span>)</div>-->
<!-- <hr/>-->
<!-- <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="form-horizontal">
@ -1133,16 +1128,16 @@
<label class="control-label col-sm-4">Registered Address</label>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.address"></p>
<p class="form-control-static" ng-bind="partner.representativeInfo.address">
</p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Suburb</label>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.suburb"></p>
<p class="form-control-static" ng-bind="partner.representativeInfo.suburb">
</p>
</div>
</div>
<div class="form-group col-sm-6">
@ -1157,13 +1152,13 @@
<label class="control-label col-sm-4">State</label>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.state"></p>
<p class="form-control-static" ng-bind="partner.representativeInfo.state">
</p>
</div>
</div>
</div>
</div>
<hr/>
<hr />
</div>
<div>
@ -1210,7 +1205,7 @@
</div>
</div>
</div>
<hr/>
<hr />
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group ">
@ -1373,20 +1368,17 @@
<div class="col-sm-8">
<span class="checkbox-inline">
<label>
<input type="checkbox" checked disabled
ng-if="partner.mw_industry">
<input type="checkbox" disabled
ng-if="!partner.mw_industry">
<input type="checkbox" checked disabled ng-if="partner.mw_industry">
<input type="checkbox" disabled ng-if="!partner.mw_industry">
AU Credit Card | AU 信用卡支付
</label>
</span>
<span class="checkbox-inline">
<label>
<input type="checkbox"
ng-if="partner.enable_international_card" checked
<input type="checkbox" ng-if="partner.enable_international_card" checked
disabled>
<input type="checkbox" ng-if="!partner.enable_international_card"
disabled>
<input type="checkbox"
ng-if="!partner.enable_international_card" disabled>
Intl Credit Card|国际信用卡
</label>
</span>

24
src/main/ui/static/payment/partner/templates/partner_edit.html
Unescape View File

@ -330,25 +330,29 @@
</div>
</div>
</div>
<div class="form-group" ng-if="partner.business_structure == 'Company'"
<div class="form-group" ng-if="partner.business_structure != null&&partner.business_structure!='Registered body(Sole Trader)'"
ng-class="{'has-error':partnerForm.certificat_expire_date.$invalid && partnerForm.certificat_expire_date.$dirty}">
<label class="control-label col-sm-2" for="certificat_expire_date_input">* Expiration Date of Registration Certificat</label>
<div class="col-sm-8">
<!--<input class="form-control" ng-model="subMerchantInfo.company_register_date" required maxlength="50"-->
<!--type="text" name="company_register_date" id="company_register_date_input">-->
<div style="display: inline-block">
<input class="form-control" id="certificat_expire_date_input"
ng-model="partner.certificat_expire_date"
<input class="control-label col-sm-2" id="certificat_expire_date_input"
ng-model="partner.certificat_expire_date_d"
uib-datepicker-popup size="10"
required
ng-change="checkExpriedate(partner.certificat_expire_date_d)"
name="certificat_expire_date"
is-open="certificat_expire_date.open"
ng-click="certificat_expire_date.open=true"
>
</div>
<div ng-messages="partnerForm.certificat_expire_date.$error" ng-if="partnerForm.certificat_expire_date.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
</div>
>&nbsp;
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('PERMANENT')" ng-model="partner.certificat_expire_date_premanent"> <p>PERMANENT</p>
</span>
<span class="checkbox-inline">
<input type="checkbox" ng-change="checkExpriedateOther('N/A')" ng-model="partner.certificat_expire_date_NA"><p>N/A</p>
</span>
</div>
</div>
<!--<div hidden class="form-group" ng-if="!partner.parent_client_id || ('00010'|withRole)">-->

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

@ -4,15 +4,20 @@
<div class="row">
<div class="col-sm-12">
<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>
<div class="col-sm-9">
<p ng-if="!ctrl.editSubMerchant" class="form-control-static">
{{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="queryWechatSubMerchantIdStatus()"><i 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>
<a role="button" ng-click="ctrl.editSubMerchant=true" ng-if="'011'|withRole"><i
class="fa fa-edit"></i></a>
<a role="button" ng-click="queryWechatSubMerchantIdStatus()"><i
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"
ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.sub_merchant_id_log">
<a class="text-primary" role="button" title="modify logs"
@ -44,7 +49,8 @@
<div class="col-sm-9">
<p class="form-control-static">
{{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>
</div>
</div>
@ -62,12 +68,17 @@
<div class="col-sm-9">
<p ng-if="!ctrl.editAliSubMerchant" class="form-control-static">
{{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="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="ctrl.editAliSubMerchant=true" ng-if="'10'|withRole"><i
class="fa fa-edit"></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="queryAlipayOnlineGms()"><i class="fa fa-refresh" title="AlipayOnline进件"></i></a>
<a role="button" ng-click="submitAlipayOnlineSubId()"><i class="fa fa-arrow-up"
title="AlipayOnline进件"></i></a>
<a role="button" ng-click="queryAlipayOnlineGms()"><i class="fa fa-refresh"
title="AlipayOnline进件"></i></a>
(AlipayOnline)
</p>
<div class="input-group" ng-if="ctrl.editAliSubMerchant">
@ -89,9 +100,10 @@
<div class="form-group" ng-if="'10'|withRole">
<label class="col-sm-3 control-label">Common Sub Merchant Id</label>
<div class="col-xs-9">
<input type="checkbox" ng-model="paymentInfo.common_sub_merchant_id" bs-switch switch-change="switchCommonSubMerchantId()">
</div>
<input type="checkbox" ng-model="paymentInfo.common_sub_merchant_id" bs-switch
switch-change="switchCommonSubMerchantId()">
</div>
</div> -->
<div class="form-group">
<label class="col-sm-3 control-label">Max Order Amount</label>
<div class="col-sm-9">
@ -104,17 +116,20 @@
<input type="number" class="form-control" ng-model="paymentInfo.max_order_amount"
title="Max Order Amount">
<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>
</button>
</div>
<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>
</button>
</div>
<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>
</button>
</div>
@ -126,15 +141,18 @@
<div class="col-sm-9">
<p ng-if="!ctrl.editCustomerSurchargeRate" class="form-control-static">
{{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>
<div class="input-group" ng-if="ctrl.editCustomerSurchargeRate">
<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-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>
</button>
</div>
@ -144,12 +162,15 @@
</button>
</div>
<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>
</button>
</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>
@ -158,13 +179,15 @@
<div class="col-sm-9">
<p ng-if="!ctrl.editOrderExpiryConfig" class="form-control-static">
{{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>
<div class="input-group" ng-if="ctrl.editOrderExpiryConfig">
<input type="text" class="form-control" ng-model="paymentInfo.order_expiry_config"
title="Prevent not enough refund">
<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>
</button>
</div>
@ -194,32 +217,37 @@
<div class="form-group col-sm-4">
<label class="col-xs-6 control-label">Alipay|支付宝</label>
<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 class="form-group col-sm-4">
<label class="col-xs-6 control-label">WeChat|微信</label>
<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 class="form-group col-sm-4">
<label class="col-xs-6 control-label">CB BankPay|快捷支付</label>
<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 class="form-group col-sm-4">
<label class="col-xs-6 control-label">Card Payment|银行卡支付</label>
<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 class="form-group col-sm-4">
<label class="col-xs-6 control-label">Direct Debit|银行账户支付</label>
<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>
@ -239,7 +267,8 @@
<div class="form-group" ng-if="'qrcode_surcharge'|withFunc">
<label class="col-sm-2 control-label">Customer Pay for Surcharge On QRCode</label>
<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 class="form-group">
@ -271,7 +300,8 @@
</div>
<div class="col-xs-12">
<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>-->
<!--<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}}"-->
@ -286,11 +316,13 @@
<!--</a>-->
<!--</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>
<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>
</div>
</div>
@ -312,22 +344,27 @@
<div class="form-group" ng-if="'gateway_upgrade'|withFunc">
<label class="col-sm-2 control-label">Upgrade QRCode</label>
<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 class="form-group">
<label class="col-sm-2 control-label">Use Alipay Online</label>
<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 class="form-group" ng-if="'api_surcharge'|withFunc">
<label class="col-sm-2 control-label">Customer Pay for Surcharge On Gateway</label>
<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">
<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> 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> If client have already attached surcharge in their own system, ignore
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> 建议使用此功能的商户在自有系统支付页中提示用户将会支付额外的手续费
</p>
@ -401,24 +438,29 @@
<div class="form-group">
<label class="col-sm-2 control-label">CB Bank Pay Link</label>
<div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_cb_bankpay_link" bs-switch ng-change="toggleCBBankPayLink()">
&nbsp;&nbsp;<a href={{paymentInfo.cb_bankpay_url}} target="_Blank"><span 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>
<input type="checkbox" ng-model="paymentInfo.enable_cb_bankpay_link" bs-switch
ng-change="toggleCBBankPayLink()">
&nbsp;&nbsp;<a href={{paymentInfo.cb_bankpay_url}} target="_Blank"><span
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 class="form-group">
<label class="col-sm-2 control-label">Customer Pay for Surcharge for CBBank Pay</label>
<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 class="form-group">
<label class="col-sm-2 control-label">CB Bank Pay Channel</label>
<div class="col-sm-3">
<select class="form-control" name="industry" ng-change="updateCBBankPayConfig('cb_channel_id',partner.cb_channel_id)"
ng-model="partner.cb_channel_id"
id="cbbankpay-input" required
<select class="form-control" name="industry"
ng-change="updateCBBankPayConfig('cb_channel_id',partner.cb_channel_id)"
ng-model="partner.cb_channel_id" id="cbbankpay-input" required
ng-options="channel.channel_id as channel.channel_name for channel in cb_bankpay">
<option value="">跟随系统</option>
</select>
@ -432,15 +474,17 @@
&nbsp;&nbsp;<span style="padding-left: 4.2%;font-size:9px;">仅支持微信客户端扫描</span>
</div>
<p>
<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board/CBBankAggregate"
download><i class="fa fa-download"></i> Download Aggregate QR Board Image (聚合支付水晶立牌:支持支付宝、微信、翼支付)</a>
<a ng-href="/sys/partners/{{partner.client_moniker}}/qrcode_board/CBBankAggregate" download><i
class="fa fa-download"></i> Download Aggregate QR Board Image
(聚合支付水晶立牌:支持支付宝、微信、翼支付)</a>
</p>
</div>
</div>
<div class="form-group col-sm-6" ng-if="paymentInfo.enable_cb_bankpay">
<label class="col-sm-4 control-label">Select Version</label>
<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="v2">v2</option>
</select>
@ -448,8 +492,10 @@
<div class="col-sm-12">
<label class="col-sm-4 control-label"></label>
<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=='v2'" src="/static/images/cbbank_payment_page_v2.jpg">
<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=='v2'"
src="/static/images/cbbank_payment_page_v2.jpg">
</div>
</div>
</div>
@ -496,7 +542,8 @@
<div class="form-group" ng-if="'retail_surcharge'|withFunc">
<label class="col-sm-2 control-label">Customer Pay for Surcharge for Retail</label>
<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>
@ -536,8 +583,7 @@
<input type="number" maxlength="6" class="form-control"
ng-model="paymentInfo.refund_credit_line">
<div class="input-group-btn">
<button class="btn btn-success"
ng-click="setRefundCreditLine()">
<button class="btn btn-success" ng-click="setRefundCreditLine()">
<i class="fa fa-check"></i>
</button>
</div>
@ -558,10 +604,10 @@
class="fa fa-edit"></i></a>
</p>
<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">
<button class="btn btn-success"
ng-click="resetRefundPwd(paymentInfo.new_refund_password)">
<button class="btn btn-success" ng-click="resetRefundPwd(paymentInfo.new_refund_password)">
<i class="fa fa-check"></i>
</button>
</div>
@ -602,7 +648,7 @@
<div class="panel panel-default" ng-if="('100000000'|withRole) && paymentInfo.ext_params">
<div class="panel-heading">Ext Config</div>
<div class="panel-body">
<div class="form-horizontal" >
<div class="form-horizontal">
<div class="form-group" ng-repeat="param in convertExtParams">
<label class="col-sm-2 control-label">{{param.name.toUpperCase()}}</label>
<div class="col-sm-10">
@ -614,7 +660,8 @@
<div ng-if="param.type == 'string'">
<p ng-if="!param.flag" class="form-control-static">
{{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>
<div class="input-group" ng-if="param.flag">
<input type="text" class="form-control" ng-model="param.value"
@ -645,7 +692,8 @@
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">Select Version</label>
<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="v2">v2</option>
<option value="v3">v3</option>
@ -657,12 +705,18 @@
<div class="col-sm-12">
<label class="col-sm-4 control-label"></label>
<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=='v2'" src="/static/images/payment_page_v2.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=='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">
<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=='v2'"
src="/static/images/payment_page_v2.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=='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>

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>

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

@ -1,19 +1,21 @@
<style>
.box_desk{
.box_desk {
width: 96%;
height: 87%;
background: rgba(0, 0, 0, .65);
position: absolute;
bottom: 28px;
transition: all linear 0.5s;
opacity:0;
opacity: 0;
}
.box-body:hover .box_desk{
.box-body:hover .box_desk {
padding: 0px;
opacity: 0.8;
display: block;
}
.content_button{
.content_button {
display: block;
position: absolute;
top: 50%;
@ -23,29 +25,124 @@
text-align: left;
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>
<div class="content">
<div style="display: flex;flex-wrap: wrap;">
<!-- Wechat -->
<div class="content content-mine">
<div class="row">
<div class="col-sm-12">
<div class="box-solid">
<div class="box box-warning">
<div class="box-header">
<h3 class="box-title pull-left" >
Wechat Sub Merchant Id : <span ng-bind="partner.sub_merchant_id"></span> <span ng-if="!partner.sub_merchant_id">none</span>
<i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
</h3>
<button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
<div class="panel panel-default">
<div class="panel-heading">
<div class="flex-between">
<div class="flex-align-center">
<img src="/static/images/wechatpay_sign.png" uib-tooltip="WechatPay" />
<h5 style="margin-left: 5px;">
Wechat : <span ng-bind="partnerInfo.sub_merchant_id"></span>
<span ng-if="!partnerInfo.sub_merchant_id">none</span>
<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 Sub Merchant Id
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>
<div class="box">
<div class="box-header">
<h3 class="box-title">List of Sub Merchant Id</h3>
<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>
<div class="box-body col-sm-6" ng-repeat="id_apply in subMerchantInfos">
<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>
@ -59,11 +156,13 @@
</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>
<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>
<span style="float: right">{{id_apply.business_category |
newWxMerchants}}</span>
</li>
<li class="list-group-item list-group-item-success">
Mcc Code
@ -80,41 +179,198 @@
ng-click="useSubMerchantId(id_apply.sub_merchant_id)">
USE
</button>
<!--<button role="button" class="btn btn-info" title="update"-->
<!--ng-click="updateSubMerchantId(id_apply.merchant_app_id)">-->
<!--UPDATE-->
<!--</button>-->
</div>
</div>
</div> -->
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Alipay -->
<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_sign.png" uib-tooltip="Alipay" />
<h5 style="margin-left: 5px;">
Alipay : <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,'Alipay')"
style="margin-left: 5px;"><i class="fa fa-edit"></i></a>
<!-- <div class="input-group" ng-if="ctrl.editAliSubMerchant">
<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.editAliSubMerchant=false">
<i class="fa fa-remove"></i>
</button>
</div>
</div>
<a role="button" ng-click="queryAlipayGms()"><i class="fa fa-search"
title="Alipay进件"></i></a> -->
</div>
<div>
<button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
ng-click="submitAlipaySubId()">
<i class="fa fa-plus"></i>Apply
</button>
<button role="button" class="btn btn-info" ng-click="queryAlipayGms()">
<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>
</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"
ng-click="submitAlipayOnlineSubId()">
<i class="fa fa-plus"></i>
Apply
</button>
<button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()">
<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>
</div>
<!-- Rpay+ -->
<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">
<h5>
Rpay+ Institution Merchant Id : <span ng-bind="partner.rpay_enterprise_id"></span>
<span ng-if="!partner.rpay_enterprise_id">none</span>
</h5>
</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>
</div>
<div class="content content-mine">
<div class="row">
<div class="col-sm-12">
<div class="box-solid">
<div class="box box-warning">
<div class="box-header">
<h3 class="box-title pull-left" >
Merchant Warrior Sub Merchant Id :
<div class="panel panel-default">
<div class="panel-heading">
<div class="flex-between">
<div class="flex-align-center">
<img src="/static/images/card_payment_sign.png" uib-tooltip="Card Payment" />
<h5 style="margin-left: 5px;">
Merchant Warrior :
<span ng-if="partner.cardInfo.rpMerchantId">
<span ng-if="partner.cardInfo.available" style="color:green;">审核通过</span>
<span ng-if="!partner.cardInfo.available && partner.cardInfo.pending" style="color:#f39c12;">审核中</span>
<span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending" style="color:red;">打回</span>
<span ng-if="!partner.cardInfo.available && partner.cardInfo.pending"
style="color:#f39c12;">审核中</span>
<span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending"
style="color:red;">打回</span>
({{partner.cardInfo.rpMerchantId}})</span>
<span ng-if="!partner.cardInfo">未申请</span>
</h3>
<button role="button" class="btn btn-info pull-right" title="Apply MW Sub Merchant Id"
</h5>
</div>
<button role="button" class="btn btn-info" title="Apply MW Sub Merchant Id"
ng-click="applyMWSubMerchantId()">
<i class="fa fa-plus"></i>
Apply Merchant Warrior Sub Merchant Id
Apply
</button>
</div>
<div class="box">
</div>
<div class="panel-body">
<div style="display: flex;justify-content: center;" ng-if="!partner.cardInfo.rpMerchantId">
<small style="color: rgba(0,0,0,.25);">No Data</small>
</div>
<ul class="list-group" style="margin-top: 20px;" ng-if="partner.cardInfo.rpMerchantId">
<li class="list-group-item flex-between">
<b>Sub Merchant Id : {{partner.cardInfo.rpMerchantId}}</b>
<a role="button" ng-click="checkDetail(partner,'MerchantWarrior')">detail</a>
</li>
</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">
@ -142,58 +398,74 @@
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()">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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>
<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()">
<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>

Write Preview
Loading…
Cancel
Save