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

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

Browse Source
master
zhangtao 4 years ago
parent 4d41df91bb fcbadc0502
commit b0683edc6d
3 changed files with 200 additions and 371 deletions
Show Stats Download Patch File Download Diff File

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

@ -5431,24 +5431,65 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
}
}]);
// Merchant Id Management
// MID Management
app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', '$sce', function ($scope, $http, $uibModal, $state, commonDialog, $sce) {
// 初始化子商户
$scope.loadSubMerchantInfos = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_sub_applices', { params: {} }).then(function (resp) {
$scope.subMerchantInfos = resp.data;
});
// $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_rpay_sub_applices', {params: {}}).then(function (resp) {
// $scope.subRpayMerchantInfos = resp.data;
// });
//
// $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_yeepay_sub_applices', {params: {}}).then(function (resp) {
// $scope.subYeepayMerchantInfos = resp.data;
// });
// $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) {
// $scope.partner.cardInfo = resp.data;
// });
};
$scope.loadSubMerchantInfos();
// 加载卡支付信息
$scope.loadCardInfos = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) {
$scope.cardInfo = resp.data;
});
}
$scope.loadCardInfos();
// 初始化信息
$scope.loadPartnerInfo = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) {
$scope.partnerInfo = resp.data;
$scope.doSwitchCommonSubMerchantId();
})
};
$scope.loadPartnerInfo()
$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-applay
$scope.applyWxSubMerchantId = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html',
controller: 'newApplyWxSubMerchantIdCtrl',
resolve: {
subMerchantInfo: function () {
return $scope.partner;
},
merchantIds: ['$http', '$stateParams', function ($http) {
return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
}]
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
};
// 刷新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) {
@ -5458,6 +5499,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
type: 'info'
})
$scope.loadPartnerInfo();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
})
}
// history
@ -5476,7 +5519,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
// 刷新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()
$scope.loadPartnerInfo();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
@ -5542,6 +5585,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}).then(function () {
$http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then(function () {
commonDialog.alert({ title: 'Success', content: 'Alipay进件成功', type: 'success' });
$scope.loadPartnerInfo();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: "进件失败：" + resp.data.message, type: 'error' });
})
@ -5559,6 +5603,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}).then(function () {
$http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms').then(function () {
commonDialog.alert({ title: 'Success', content: '提示：AlipayOnline进件成功', type: 'success' });
$scope.loadPartnerInfo();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: "进件失败：" + resp.data.message, type: 'error' });
});
@ -5573,7 +5618,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
content: 'Modify Wechat Sub Merchant ID successfully',
type: 'success'
});
$state.reload();
$scope.loadPartnerInfo();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
@ -5610,109 +5655,15 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}
}
}).result.then(function () {
$state.reload();
commonDialog.alert({
title: 'Success',
content: 'Modify successfully',
type: 'success'
});
$scope.loadPartnerInfo();
})
}
$scope.showMoreMerchantInfo = false;
$scope.hideMerchantInfo = function () {
$scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo;
};
$scope.loadSubMerchantInfos = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_sub_applices', { params: {} }).then(function (resp) {
$scope.subMerchantInfos = resp.data;
});
// $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_rpay_sub_applices', {params: {}}).then(function (resp) {
// $scope.subRpayMerchantInfos = resp.data;
// });
//
// $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_yeepay_sub_applices', {params: {}}).then(function (resp) {
// $scope.subYeepayMerchantInfos = resp.data;
// });
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) {
$scope.partner.cardInfo = resp.data;
});
};
$scope.updateSubMerchantId = function (merchant_app_id) {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html',
controller: 'updateApplyWxSubMerchantIdCtrl',
resolve: {
merchantInfo: $scope.partner,
merchantIds: ['$http', '$stateParams', function ($http) {
return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
}],
subMerchantInfo: ['$http', '$stateParams', function ($http) {
return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + merchant_app_id);
}]
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
}
$scope.useRpaySubMerchantId = function (sub_merchant_id) {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/rpay_payment_config', { rpay_enterprise_id: sub_merchant_id }).then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Modify Rpay+ Sub Merchant ID successfully',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
}
$scope.useYeepaySubMerchantId = function (sub_merchant_id) {
$http.put('/sys/partners/' + $scope.partner.client_moniker + '/yeepay_payment_config', { yeepay_sub_merchant_id: sub_merchant_id }).then(function (resp) {
commonDialog.alert({
title: 'Success',
content: 'Modify Yeepay Sub Merchant ID successfully',
type: 'success'
});
$state.reload();
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
}
/*$scope.applyWxSubMerchantId = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/apply_wx_sub_merchant_id.html',
controller: 'applyWxSubMerchantIdCtrl',
resolve: {
subMerchantInfo: function () {
return $scope.partner;
},
merchantIds: ['$http', '$stateParams', function ($http) {
return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
}]
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
};*/
$scope.applyWxSubMerchantId = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html',
controller: 'newApplyWxSubMerchantIdCtrl',
resolve: {
subMerchantInfo: function () {
return $scope.partner;
},
merchantIds: ['$http', '$stateParams', function ($http) {
return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
}]
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
};
// 卡支付apply
$scope.applyMWSubMerchantId = function () {
$http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/mw_info').then(function (resp) {
commonDialog.confirm({
@ -5726,69 +5677,130 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
content: 'Apply Merchant Warrior Sub Merchant ID successfully',
type: 'success'
});
$scope.partner.cardInfo = res.data;
$scope.cardInfo = res.data;
}, function (resp) {
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' });
})
})
});
};
$scope.applyRpaySubMerchantId = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/apply_rpay_sub_merchant_id.html',
controller: 'applyRpaySubMerchantIdCtrl',
resolve: {
subMerchantInfo: function () {
return $scope.partner;
}
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
};
$scope.applyYeepaySubMerchantId = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html',
controller: 'applyYeepaySubMerchantIdCtrl',
resolve: {
subMerchantInfo: function () {
return $scope.partner;
}
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
};
$scope.addYeepaySubMerchantId = function () {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/add_yeepay_sub_merchant_id.html',
controller: 'addYeepaySubMerchantIdCtrl',
resolve: {
subMerchantInfo: function () {
return $scope.partner;
}
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
};
$scope.updateYeepaySubMerchantId = function (sub_merchant_id) {
$uibModal.open({
templateUrl: '/static/payment/partner/templates/update_yeepay_sub_merchant_id.html',
controller: 'updateYeepaySubMerchantIdCtrl',
resolve: {
subMerchantInfo: function () {
return $scope.partner;
},
subMerchantId: function () {
return sub_merchant_id;
}
}
}).result.then(function () {
$scope.loadSubMerchantInfos();
})
};
$scope.loadSubMerchantInfos();
// $scope.showMoreMerchantInfo = false;
// $scope.hideMerchantInfo = function () {
// $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo;
// };
// $scope.updateSubMerchantId = function (merchant_app_id) {
// $uibModal.open({
// templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html',
// controller: 'updateApplyWxSubMerchantIdCtrl',
// resolve: {
// merchantInfo: $scope.partner,
// merchantIds: ['$http', '$stateParams', function ($http) {
// return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
// }],
// subMerchantInfo: ['$http', '$stateParams', function ($http) {
// return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + merchant_app_id);
// }]
// }
// }).result.then(function () {
// $scope.loadSubMerchantInfos();
// })
// }
// $scope.useRpaySubMerchantId = function (sub_merchant_id) {
// $http.put('/sys/partners/' + $scope.partner.client_moniker + '/rpay_payment_config', { rpay_enterprise_id: sub_merchant_id }).then(function (resp) {
// commonDialog.alert({
// title: 'Success',
// content: 'Modify Rpay+ Sub Merchant ID successfully',
// type: 'success'
// });
// $state.reload();
// }, function (resp) {
// commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
// });
// }
// $scope.useYeepaySubMerchantId = function (sub_merchant_id) {
// $http.put('/sys/partners/' + $scope.partner.client_moniker + '/yeepay_payment_config', { yeepay_sub_merchant_id: sub_merchant_id }).then(function (resp) {
// commonDialog.alert({
// title: 'Success',
// content: 'Modify Yeepay Sub Merchant ID successfully',
// type: 'success'
// });
// $state.reload();
// }, function (resp) {
// commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
// });
// }
// $scope.applyWxSubMerchantId = function () {
// $uibModal.open({
// templateUrl: '/static/payment/partner/templates/apply_wx_sub_merchant_id.html',
// controller: 'applyWxSubMerchantIdCtrl',
// resolve: {
// subMerchantInfo: function () {
// return $scope.partner;
// },
// merchantIds: ['$http', '$stateParams', function ($http) {
// return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
// }]
// }
// }).result.then(function () {
// $scope.loadSubMerchantInfos();
// })
// };
// $scope.applyRpaySubMerchantId = function () {
// $uibModal.open({
// templateUrl: '/static/payment/partner/templates/apply_rpay_sub_merchant_id.html',
// controller: 'applyRpaySubMerchantIdCtrl',
// resolve: {
// subMerchantInfo: function () {
// return $scope.partner;
// }
// }
// }).result.then(function () {
// $scope.loadSubMerchantInfos();
// })
// };
// $scope.applyYeepaySubMerchantId = function () {
// $uibModal.open({
// templateUrl: '/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html',
// controller: 'applyYeepaySubMerchantIdCtrl',
// resolve: {
// subMerchantInfo: function () {
// return $scope.partner;
// }
// }
// }).result.then(function () {
// $scope.loadSubMerchantInfos();
// })
// };
// $scope.addYeepaySubMerchantId = function () {
// $uibModal.open({
// templateUrl: '/static/payment/partner/templates/add_yeepay_sub_merchant_id.html',
// controller: 'addYeepaySubMerchantIdCtrl',
// resolve: {
// subMerchantInfo: function () {
// return $scope.partner;
// }
// }
// }).result.then(function () {
// $scope.loadSubMerchantInfos();
// })
// };
// $scope.updateYeepaySubMerchantId = function (sub_merchant_id) {
// $uibModal.open({
// templateUrl: '/static/payment/partner/templates/update_yeepay_sub_merchant_id.html',
// controller: 'updateYeepaySubMerchantIdCtrl',
// resolve: {
// subMerchantInfo: function () {
// return $scope.partner;
// },
// subMerchantId: function () {
// return sub_merchant_id;
// }
// }
// }).result.then(function () {
// $scope.loadSubMerchantInfos();
// })
// };
}]);
app.controller('applyWxSubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) {
$scope.wxIndustries = angular.copy(wxMerchantIndustries);

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

@ -29,71 +29,71 @@
<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>
<span>{{subMerchantInfo.rpMerchantId}}</span>
</li>
<li class="list-group-item flex-between">
<b>Name</b>
<span ng-bind="subMerchantInfo.cardInfo.name"></span>
<span ng-bind="subMerchantInfo.name"></span>
</li>
<li class="list-group-item flex-between">
<b>Company Name</b>
<span>{{subMerchantInfo.cardInfo.company_name}}</span>
<span>{{subMerchantInfo.company_name}}</span>
</li>
<li class="list-group-item flex-between">
<b>Address</b>
<span>{{subMerchantInfo.cardInfo.address | newWxMerchants}}</span>
<span>{{subMerchantInfo.address | newWxMerchants}}</span>
</li>
<li class="list-group-item flex-between">
<b>Suburb</b>
<span>{{subMerchantInfo.cardInfo.suburb}}</span>
<span>{{subMerchantInfo.suburb}}</span>
</li>
<li class="list-group-item flex-between">
<b>Postcode</b>
<span ng-bind="subMerchantInfo.cardInfo.postcode"></span>
<span ng-bind="subMerchantInfo.postcode"></span>
</li>
<li class="list-group-item flex-between">
<b>State</b>
<span ng-bind="subMerchantInfo.cardInfo.state"></span>
<span ng-bind="subMerchantInfo.state"></span>
</li>
<li class="list-group-item flex-between">
<b>Abn</b>
<span ng-bind="subMerchantInfo.cardInfo.abn"></span>
<span ng-bind="subMerchantInfo.abn"></span>
</li>
<li class="list-group-item flex-between">
<b>Email</b>
<span ng-bind="subMerchantInfo.cardInfo.email"></span>
<span ng-bind="subMerchantInfo.email"></span>
</li>
<li class="list-group-item flex-between">
<b>Contact Name</b>
<span ng-bind="subMerchantInfo.cardInfo.contact_name"></span>
<span ng-bind="subMerchantInfo.contact_name"></span>
</li>
<li class="list-group-item flex-between">
<b>Phone</b>
<span ng-bind="subMerchantInfo.cardInfo.phone"></span>
<span ng-bind="subMerchantInfo.phone"></span>
</li>
<li class="list-group-item flex-between">
<b>BSB</b>
<span ng-bind="subMerchantInfo.cardInfo.bsb"></span>
<span ng-bind="subMerchantInfo.bsb"></span>
</li>
<li class="list-group-item flex-between">
<b>Account No</b>
<span ng-bind="subMerchantInfo.cardInfo.accountNo"></span>
<span ng-bind="subMerchantInfo.accountNo"></span>
</li>
<li class="list-group-item flex-between">
<b>Account Name</b>
<span ng-bind="subMerchantInfo.cardInfo.accountName"></span>
<span ng-bind="subMerchantInfo.accountName"></span>
</li>
<li class="list-group-item flex-between">
<b>Website</b>
<span ng-bind="subMerchantInfo.cardInfo.website"></span>
<span ng-bind="subMerchantInfo.website"></span>
</li>
<li class="list-group-item flex-between">
<b>Timezone</b>
<span ng-bind="subMerchantInfo.cardInfo.timezone"></span>
<span ng-bind="subMerchantInfo.timezone"></span>
</li>
<li class="list-group-item flex-between">
<b>Category</b>
<span ng-bind="subMerchantInfo.cardInfo.category|partner_royalpay_industry"></span>
<span ng-bind="subMerchantInfo.category|partner_royalpay_industry"></span>
</li>
</ul>
</div>

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

@ -82,22 +82,6 @@
<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>
@ -147,7 +131,7 @@
<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
<span ng-if="partnerInfo.sub_merchant_id == id_apply.sub_merchant_id"><small
class="text-red">(当前使用)</small>
</b>
<span>
@ -157,46 +141,6 @@
</span>
</li>
</ul>
<!-- <div class="box-body col-sm-6" ng-repeat="id_apply in subMerchantInfos">
<ul class="list-group ui_desk">
<li class="list-group-item list-group-item-success">
<b>Sub Merchant Id</b>
<b style="float: right"><span
ng-if="partner.sub_merchant_id == id_apply.sub_merchant_id"><small
class="text-red">(当前使用)</small></span>{{id_apply.sub_merchant_id}}</b>
</li>
<li class="list-group-item list-group-item-success">
Apply Time
<span style="float: right" ng-bind="id_apply.create_time"></span>
</li>
<li class="list-group-item list-group-item-success">
Merchant Short Name
<span style="float:right;">{{id_apply.merchant_shortname | cut:true:20:'
...'}}</span>
</li>
<li class="list-group-item list-group-item-success">
Business Category
<span style="float: right">{{id_apply.business_category |
newWxMerchants}}</span>
</li>
<li class="list-group-item list-group-item-success">
Mcc Code
<span style="float: right;">{{id_apply.mcc_code | wechatMcc }}</span>
</li>
<li class="list-group-item list-group-item-success">
Operator
<span style="float: right" ng-bind="id_apply.operator"></span>
</li>
</ul>
<div class="box_desk">
<div class="content_button">
<button role="button" class="btn btn-info" title="use"
ng-click="useSubMerchantId(id_apply.sub_merchant_id)">
USE
</button>
</div>
</div>
</div> -->
</div>
</div>
</div>
@ -220,22 +164,6 @@
<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"
@ -276,22 +204,6 @@
<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>
@ -323,8 +235,8 @@
<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>
Rpay+ Institution Merchant Id : <span ng-bind="partnerInfo.rpay_enterprise_id"></span>
<span ng-if="!partnerInfo.rpay_enterprise_id">none</span>
</h5>
</div>
<div class="panel-body">
@ -349,14 +261,14 @@
<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"
<span ng-if="cardInfo.rpMerchantId">
<span ng-if="cardInfo.available" style="color:green;">审核通过</span>
<span ng-if="!cardInfo.available && cardInfo.pending"
style="color:#f39c12;">审核中</span>
<span ng-if="!partner.cardInfo.available && !partner.cardInfo.pending"
<span ng-if="!cardInfo.available && !cardInfo.pending"
style="color:red;">打回</span>
({{partner.cardInfo.rpMerchantId}})</span>
<span ng-if="!partner.cardInfo">未申请</span>
({{cardInfo.rpMerchantId}})</span>
<span ng-if="!cardInfo">未申请</span>
</h5>
</div>
<button role="button" class="btn btn-info" title="Apply MW Sub Merchant Id"
@ -367,112 +279,17 @@
</div>
</div>
<div class="panel-body">
<div style="display: flex;justify-content: center;" ng-if="!partner.cardInfo.rpMerchantId">
<div style="display: flex;justify-content: center;" ng-if="!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">
<ul class="list-group" style="margin-top: 20px;" ng-if="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>
<b>Sub Merchant Id : {{cardInfo.rpMerchantId}}</b>
<a role="button" ng-click="checkDetail(cardInfo,'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">
<b>Sub Merchant Id</b>
<b style="float: right">
{{partner.cardInfo.rpMerchantId}}</b>
</li>
<li class="list-group-item list-group-item-success">
Name
<span style="float: right" ng-bind="partner.cardInfo.name"></span>
</li>
<li class="list-group-item list-group-item-success">
Company Name
<span style="float:right;">{{partner.cardInfo.company_name}}</span>
</li>
<li class="list-group-item list-group-item-success">
Address
<span style="float: right">{{partner.cardInfo.address}}</span>
</li>
<li class="list-group-item list-group-item-success">
Suburb
<span style="float: right;">{{partner.cardInfo.suburb}}</span>
</li>
<li class="list-group-item list-group-item-success">
Postcode
<span style="float: right" ng-bind="partner.cardInfo.postcode"></span>
</li>
<li class="list-group-item list-group-item-success" style="text-align: center"
ng-if="!showMoreMerchantInfo" ng-click="hideMerchantInfo()">
<span> More.....</span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
State
<span style="float: right" ng-bind="partner.cardInfo.state"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Abn
<span style="float: right" ng-bind="partner.cardInfo.abn"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Email
<span style="float: right" ng-bind="partner.cardInfo.email"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Contact Name
<span style="float: right" ng-bind="partner.cardInfo.contact_name"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Phone
<span style="float: right" ng-bind="partner.cardInfo.phone"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
BSB
<span style="float: right" ng-bind="partner.cardInfo.bsb"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Account No
<span style="float: right" ng-bind="partner.cardInfo.accountNo"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Account Name
<span style="float: right" ng-bind="partner.cardInfo.accountName"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Website
<span style="float: right" ng-bind="partner.cardInfo.website"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Timezone
<span style="float: right" ng-bind="partner.cardInfo.timezone"></span>
</li>
<li class="list-group-item list-group-item-success"
ng-if="showMoreMerchantInfo">
Category
<span style="float: right"
ng-bind="partner.cardInfo.category|partner_royalpay_industry"></span>
</li>
<li class="list-group-item list-group-item-success" style="text-align: center"
ng-if="showMoreMerchantInfo" ng-click="hideMerchantInfo()">
<span> Hide.....</span>
</li>
</ul>
</div>
</div> -->
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save