feature: new customized settle dialog

master
Yixian 3 years ago
parent 83cf8f7f06
commit 79fda53713

@ -47,6 +47,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$uibModal.open({
templateUrl: '/static/analysis/templates/settle_tasks_customized_task_dialog.html',
controller: 'newCustomizedSettleDialogCtrl'
}).result.then(function () {
commonDialog.alert({type: 'success', title: 'Success', content: 'Settle Submitted'})
})
}
$scope.checkProgressStatus = function () {
@ -248,7 +250,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.errorMsg = 'Already Submitting'
}
$scope.submitting = true
if(!$scope.task.amount || $scope.task.amount<0){
if (!$scope.task.amount || $scope.task.amount < 0) {
$scope.errorMsg = 'Invalid amount'
}
$scope.errorMsg = null
@ -256,10 +258,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
client_moniker: $scope.task.client_moniker,
amount: $scope.task.amount
}
$http.post('/sys/settle_tasks/customized_settle', data).then(function (){
$http.post('/sys/settle_tasks/customized_settle', data).then(function () {
$scope.task = {}
$scope.$dismiss()
},function (resp){
$scope.$close('OK')
}, function (resp) {
$scope.errorMsg = resp.data.message
})
}

@ -1,6 +1,6 @@
<div class="modal-header">Manual Settlements</div>
<div class="modal-header">Customized Settlements</div>
<div class="modal-body">
<div class="alert alert-info">Click on row to choose file</div>
<div class="alert alert-info">Click on client moniker to choose file</div>
<table class="table table-striped table-bordered table-hover" ng-if="customizedLogs.length">
<thead>
<tr>

@ -20,6 +20,15 @@
</div>
</div>
<div class="alert alert-danger" ng-bind="errorMsg" ng-if="errorMsg"></div>
<div class="alert alert-info">
<ul>
<li>Please confirm the merchant you input. It is difficult to revoke a customized settle.</li>
<li>One Merchant can only have one customized settle task on each day.</li>
<li>Settle amount should be no more than merchant balance.</li>
<li>For Cross-Border channels only.</li>
<li>For more details please contact with developers.</li>
</ul>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-success" ng-click="submitSettle()" ng-disabled="submitting">Submit</button>

Loading…
Cancel
Save