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({ $uibModal.open({
templateUrl: '/static/analysis/templates/settle_tasks_customized_task_dialog.html', templateUrl: '/static/analysis/templates/settle_tasks_customized_task_dialog.html',
controller: 'newCustomizedSettleDialogCtrl' controller: 'newCustomizedSettleDialogCtrl'
}).result.then(function () {
commonDialog.alert({type: 'success', title: 'Success', content: 'Settle Submitted'})
}) })
} }
$scope.checkProgressStatus = function () { $scope.checkProgressStatus = function () {
@ -258,7 +260,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
} }
$http.post('/sys/settle_tasks/customized_settle', data).then(function () { $http.post('/sys/settle_tasks/customized_settle', data).then(function () {
$scope.task = {} $scope.task = {}
$scope.$dismiss() $scope.$close('OK')
}, function (resp) { }, function (resp) {
$scope.errorMsg = resp.data.message $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="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"> <table class="table table-striped table-bordered table-hover" ng-if="customizedLogs.length">
<thead> <thead>
<tr> <tr>

@ -20,6 +20,15 @@
</div> </div>
</div> </div>
<div class="alert alert-danger" ng-bind="errorMsg" ng-if="errorMsg"></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>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-success" ng-click="submitSettle()" ng-disabled="submitting">Submit</button> <button class="btn btn-success" ng-click="submitSettle()" ng-disabled="submitting">Submit</button>

Loading…
Cancel
Save