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

✨feat(royalpay): MID Management任务初步完成

Browse Source
master
xiao.tang 4 years ago
parent fd8e739c7a
commit 564a822f0e
5 changed files with 1462 additions and 795 deletions
Show Stats Download Patch File Download Diff File

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

@ -5280,7 +5280,194 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
} }
} }
}]); }]);
// Merchant Id Management
app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', '$sce', function ($scope, $http, $uibModal, $state, commonDialog, $sce) { app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', '$sce', function ($scope, $http, $uibModal, $state, commonDialog, $sce) {
$scope.loadPartnerInfo = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) {
$scope.partnerInfo = resp.data;
$scope.doSwitchCommonSubMerchantId();
})
};
$scope.loadPartnerInfo()
// 编辑Wechat Sub Merchant Id
$scope.saveSubMerchantId = function () {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', { sub_merchant_id: $scope.partnerInfo.sub_merchant_id }).then(function (resp) {
$scope.loadPartnerInfo();
$scope.ctrl.editSubMerchant = false;
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
};
// 刷新Wechat Sub Merchant Id
$scope.queryWechatSubMerchantIdStatus = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.partnerInfo.sub_merchant_id + '/status').then(function (resp) {
commonDialog.alert({
title: 'Wechat Apply Status(' + resp.data.apply_status + ")",
content: resp.data.response_str,
type: 'info'
})
$scope.loadPartnerInfo();
})
}
// history
$scope.showSubMerchantLogs = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/client_sub_merchant_id_log.html',
controller: 'clientSubMerchantIdLogCtrl',
size: 'lg',
resolve: {
logs: ['$http', function ($http) {
return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_sub_merchant_id_logs');
}]
}
})
};
// 刷新Wechat Institution Merchant Id
$scope.refreshWechatInstitutionMerchantId = function () {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_institution_merchant_id', { wechat_institution_merchant_id: $scope.partnerInfo.wechat_institution_merchant_id }).then(function (resp) {
$scope.loadPartnerInfo()
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
};
// switch开关
$scope.doSwitchCommonSubMerchantId = function () {
$("input[name='switch']").bootstrapSwitch({
onText: "ON",
offText: "OFF",
size: 'mini',
state: $scope.partnerInfo.common_sub_merchant_id,
onSwitchChange: function (event, state) {
//监听switch change事件，可以根据状态把相应的业务逻辑代码写在这里
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/common_sub_merchant_id', { allow: state }).then(function () {
$scope.loadPartnerInfo();
}, function (resp) {
commonDialog.alert({
title: 'Failed to change common_sub_merchant_id permission status',
content: resp.data.message,
type: 'error'
})
})
}
})
};
// Alipay保存名称修改
$scope.saveAliSubMerchantId = function () {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.partnerInfo.ali_sub_merchant_id }).then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Modify Ali Sub Merchant ID successfully',
type: 'success'
});
$scope.loadPartnerInfo();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
};
// 刷新Alipay
$scope.queryAlipayGms = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms').then(function (resp) {
commonDialog.alert({ title: 'Success', content: resp.data.result_status, type: 'success' });
}, function (resp) {
commonDialog.alert({ title: 'Error', content: "查询失败：" + resp.data.message, type: 'error' });
})
};
// 刷新AlipayOnline
$scope.queryAlipayOnlineGms = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms').then(function (resp) {
commonDialog.alert({ title: 'Success', content: resp.data.result_status, type: 'success' });
}, function (resp) {
commonDialog.alert({ title: 'Error', content: "查询失败：" + resp.data.message, type: 'error' });
})
}
// Alipay进件
$scope.submitAlipaySubId = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms_json').then(function (resp) {
$scope.alipay_gms_json = resp.data;
commonDialog.confirm({
title: 'Warning',
content: '是否使用该商户的现有信息进件？',
json: $scope.alipay_gms_json
}).then(function () {
$http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then(function () {
commonDialog.alert({ title: 'Success', content: 'Alipay进件成功', type: 'success' });
}, function (resp) {
commonDialog.alert({ title: 'Error', content: "进件失败：" + resp.data.message, type: 'error' });
})
});
})
};
// AlipayOnline进件
$scope.submitAlipayOnlineSubId = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms_json').then(function (resp) {
$scope.alipayOnline_gms_json = resp.data;
commonDialog.confirm({
title: 'Warning',
content: '是否使用该商户的现有信息进件？',
json: $scope.alipayOnline_gms_json
}).then(function () {
$http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms').then(function () {
commonDialog.alert({ title: 'Success', content: '提示：AlipayOnline进件成功', type: 'success' });
}, function (resp) {
commonDialog.alert({ title: 'Error', content: "进件失败：" + resp.data.message, type: 'error' });
});
})
});
};
// use sub_merchant_id
$scope.useSubMerchantId = function (sub_merchant_id) {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', { sub_merchant_id: sub_merchant_id }).then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Modify Wechat Sub Merchant ID successfully',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
}
// 查看sub_merchant_id详情
$scope.checkDetail = function (merchantInfo, channel) {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/sub_merchant_detail.html',
controller: 'subMerchantDetailCtrl',
resolve: {
subMerchantInfo: function () {
return merchantInfo
},
channel: function () {
return channel
}
}
})
}
// 修改sub_merchant_id
$scope.modifySubMerchantId = function (subMerchantId, channel) {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/md_sub_merchant_id.html',
controller: 'ModifysubMerchantIdCtrl',
resolve: {
clientMoniker: function () {
return $scope.partner.client_moniker
},
merchantId: function () {
return subMerchantId
},
channel: function () {
return channel
}
}
}).result.then(function () {
$scope.loadPartnerInfo()
commonDialog.alert({
title: 'Success',
content: 'Modify successfully',
type: 'success'
});
})
}
$scope.showMoreMerchantInfo = false; $scope.showMoreMerchantInfo = false;
$scope.hideMerchantInfo = function () { $scope.hideMerchantInfo = function () {
$scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo; $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo;
@ -5300,18 +5487,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.cardInfo = resp.data; $scope.partner.cardInfo = resp.data;
}); });
}; };
$scope.useSubMerchantId = function (sub_merchant_id) {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', {sub_merchant_id: sub_merchant_id}).then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Modify Wechat Sub Merchant ID successfully',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
});
}
$scope.updateSubMerchantId = function (merchant_app_id) { $scope.updateSubMerchantId = function (merchant_app_id) {
$uibModal.open({ $uibModal.open({
templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html', templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html',
@ -5512,6 +5687,42 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}) })
} }
}]); }]);
// 展示信息
app.controller('subMerchantDetailCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', 'subMerchantInfo', 'channel', function ($scope, $http, $uibModal, $state, commonDialog, subMerchantInfo, channel) {
$scope.channel = channel
$scope.subMerchantInfo = subMerchantInfo
}]);
// 修改sub_merchant_id
app.controller('ModifysubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', 'clientMoniker', 'merchantId', 'channel', function ($scope, $http, $uibModal, $state, commonDialog, clientMoniker, merchantId, channel) {
console.log(merchantId, channel);
$scope.merchantId = merchantId
$scope.flag = false
$scope.confirm = function () {
$scope.flag = true
if (channel === 'Wechat') {
$http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: merchantId }).then(function (resp) {
$scope.$close();
}, function (resp) {
$scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
} else if (channel === 'Alipay') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) {
$scope.$close();
}, function (resp) {
$scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
} else if (channel = 'AlipayOnline') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) {
$scope.$close();
}, function (resp) {
$scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
}
}
}]);
app.controller('newApplyWxSubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', 'wechatGoodMcc', 'businessTypesMap', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, businessTypesMap) { app.controller('newApplyWxSubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', 'wechatGoodMcc', 'businessTypesMap', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, businessTypesMap) {
$scope.wxIndustries = angular.copy(wxMerchantIndustries); $scope.wxIndustries = angular.copy(wxMerchantIndustries);
$scope.subMerchantInfo = angular.copy(subMerchantInfo); $scope.subMerchantInfo = angular.copy(subMerchantInfo);
@ -5540,7 +5751,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.subMerchantInfo.mcc_code = $scope.subMerchantInfo.mc_code; $scope.subMerchantInfo.mcc_code = $scope.subMerchantInfo.mc_code;
} }
if (subMerchantInfo.certificat_expire_date) { if (subMerchantInfo.certificat_expire_date) {
var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/'); var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/');
$scope.subMerchantInfo.certificat_expire_date = new Date(datestr); $scope.subMerchantInfo.certificat_expire_date = new Date(datestr);
} }
if ($scope.subMerchantInfo.business_structure) { if ($scope.subMerchantInfo.business_structure) {

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>

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

@ -4,15 +4,20 @@
<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"
@ -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,12 +68,17 @@
<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">
@ -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
</div> switch-change="switchCommonSubMerchantId()">
</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">
@ -104,17 +116,20 @@
<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>
@ -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">
@ -271,7 +300,8 @@
</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}}"-->
@ -286,11 +316,13 @@
<!--</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>
@ -312,22 +344,27 @@
<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,24 +438,29 @@
<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>
@ -432,15 +474,17 @@
&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
(聚合支付水晶立牌:支持支付宝、微信、翼支付)</a>
</p> </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>
@ -496,7 +542,8 @@
<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>
@ -536,8 +583,7 @@
<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>
@ -614,7 +660,8 @@
<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"
@ -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,12 +705,18 @@
<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>

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>

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

@ -8,11 +8,13 @@
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;
@ -23,29 +25,124 @@
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;">
<!-- Wechat -->
<div class="content content-mine">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="box-solid"> <div class="box-solid">
<div class="box box-warning"> <div class="panel panel-warning">
<div class="box-header"> <div class="panel-heading">
<h3 class="box-title pull-left" > <div class="flex-between">
Wechat Sub Merchant Id : <span ng-bind="partner.sub_merchant_id"></span> <span ng-if="!partner.sub_merchant_id">none</span> <div class="flex-align-center">
<i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i> <img src="/static/images/wechatpay_sign.png" uib-tooltip="WechatPay" />
</h3> <h5 style="margin-left: 5px;">
<button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id" 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()"> ng-click="applyWxSubMerchantId()">
<i class="fa fa-plus"></i> <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>
<button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
Modify
</button>
</div>
</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>
<div class="box"> <span class="box-title flex-align-center">
<div class="box-header"> <b>Common Sub Merchant Id : </b>
<h3 class="box-title">List of Sub Merchant Id</h3> <input type="checkbox" name="switch" ng-model="partnerInfo.common_sub_merchant_id">
</span>
</div> </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"> <ul class="list-group ui_desk">
<li class="list-group-item list-group-item-success"> <li class="list-group-item list-group-item-success">
<b>Sub Merchant Id</b> <b>Sub Merchant Id</b>
@ -59,11 +156,13 @@
</li> </li>
<li class="list-group-item list-group-item-success"> <li class="list-group-item list-group-item-success">
Merchant Short Name 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>
<li class="list-group-item list-group-item-success"> <li class="list-group-item list-group-item-success">
Business Category Business Category
<span style="float: right">{{id_apply.business_category | newWxMerchants}}</span> <span style="float: right">{{id_apply.business_category |
newWxMerchants}}</span>
</li> </li>
<li class="list-group-item list-group-item-success"> <li class="list-group-item list-group-item-success">
Mcc Code Mcc Code
@ -80,41 +179,198 @@
ng-click="useSubMerchantId(id_apply.sub_merchant_id)"> ng-click="useSubMerchantId(id_apply.sub_merchant_id)">
USE USE
</button> </button>
<!--<button role="button" class="btn btn-info" title="update"--> </div>
<!--ng-click="updateSubMerchantId(id_apply.merchant_app_id)">--> </div>
<!--UPDATE--> </div> -->
<!--</button>--> </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-warning">
<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>
</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> </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-warning">
<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-warning">
<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="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="box-solid"> <div class="box-solid">
<div class="box box-warning"> <div class="panel panel-warning">
<div class="box-header"> <div class="panel-heading">
<h3 class="box-title pull-left" > <div class="flex-between">
Merchant Warrior Sub Merchant Id : <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.rpMerchantId">
<span ng-if="partner.cardInfo.available" style="color:green;">审核通过</span> <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"
<span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending" style="color:red;">打回</span> style="color:#f39c12;">审核中</span>
<span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending"
style="color:red;">打回</span>
({{partner.cardInfo.rpMerchantId}})</span> ({{partner.cardInfo.rpMerchantId}})</span>
<span ng-if="!partner.cardInfo">未申请</span> <span ng-if="!partner.cardInfo">未申请</span>
</h3> </h5>
<button role="button" class="btn btn-info pull-right" title="Apply MW Sub Merchant Id" </div>
<button role="button" class="btn btn-info" title="Apply MW Sub Merchant Id"
ng-click="applyMWSubMerchantId()"> ng-click="applyMWSubMerchantId()">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Apply Merchant Warrior Sub Merchant Id Apply
</button> </button>
</div> </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"> <div class="box-body col-sm-6">
<ul class="list-group ui_desk"> <ul class="list-group ui_desk">
<li class="list-group-item list-group-item-success"> <li class="list-group-item list-group-item-success">
@ -142,58 +398,74 @@
Postcode Postcode
<span style="float: right" ng-bind="partner.cardInfo.postcode"></span> <span style="float: right" ng-bind="partner.cardInfo.postcode"></span>
</li> </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> <span> More.....</span>
</li> </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 State
<span style="float: right" ng-bind="partner.cardInfo.state"></span> <span style="float: right" ng-bind="partner.cardInfo.state"></span>
</li> </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 Abn
<span style="float: right" ng-bind="partner.cardInfo.abn"></span> <span style="float: right" ng-bind="partner.cardInfo.abn"></span>
</li> </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 Email
<span style="float: right" ng-bind="partner.cardInfo.email"></span> <span style="float: right" ng-bind="partner.cardInfo.email"></span>
</li> </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 Contact Name
<span style="float: right" ng-bind="partner.cardInfo.contact_name"></span> <span style="float: right" ng-bind="partner.cardInfo.contact_name"></span>
</li> </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 Phone
<span style="float: right" ng-bind="partner.cardInfo.phone"></span> <span style="float: right" ng-bind="partner.cardInfo.phone"></span>
</li> </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 BSB
<span style="float: right" ng-bind="partner.cardInfo.bsb"></span> <span style="float: right" ng-bind="partner.cardInfo.bsb"></span>
</li> </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 Account No
<span style="float: right" ng-bind="partner.cardInfo.accountNo"></span> <span style="float: right" ng-bind="partner.cardInfo.accountNo"></span>
</li> </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 Account Name
<span style="float: right" ng-bind="partner.cardInfo.accountName"></span> <span style="float: right" ng-bind="partner.cardInfo.accountName"></span>
</li> </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 Website
<span style="float: right" ng-bind="partner.cardInfo.website"></span> <span style="float: right" ng-bind="partner.cardInfo.website"></span>
</li> </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 Timezone
<span style="float: right" ng-bind="partner.cardInfo.timezone"></span> <span style="float: right" ng-bind="partner.cardInfo.timezone"></span>
</li> </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 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>
<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> <span> Hide.....</span>
</li> </li>
</ul> </ul>
</div> </div>
</div> -->
</div>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save