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

master
Yixian 3 years ago
commit e6e236839d

@ -7535,7 +7535,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
config.put("enable_cross_payment",clientConfig.getBoolean("enable_cross_payment"));
config.put("enable_card_payment",clientConfig.getBoolean("enable_card_payment"));
config.put("manual", client.getBooleanValue("manual_settle") );
config.put("min", client.getBigDecimal("min_settle"));
config.put("min", new BigDecimal( client.getString("min_settle")).toPlainString());
config.put("settle_hour", client.getInteger("settle_hour"));
if (clientConfig == null) {
clientConfig = new JSONObject();

@ -3,6 +3,18 @@
width: 95%;
float: left;
}
.panel-new {
margin-left: 20px;
margin-right: 20px;
background-color: #fff;
border: 1px solid transparent;
border-radius: 4px;
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
}
.panel-info-new {
border-color: #bce8f1;
}
.panel-heading-new {
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
background-image: -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
@ -125,7 +137,7 @@
</div>
</div>
<div ng-if="settleRule.enable_cross_payment&&sysParams['app.settle-workday-only']!='true'" >
<div class="panel-new panel-info-new" ng-if="settleRule.enable_cross_payment&&sysParams['app.settle-workday-only']!='true'" >
<div class="panel-heading-new" >
<h4>
Cross Payment Settle Rule Config
@ -133,7 +145,7 @@
<i class="fa fa-edit"></i></a>
</h4>
</div>
<div class="panel-body">
<div class="panel-body" style="margin-left: 10px;margin-right: 10px">
<div class="row form-horizontal">
<!--<div class="form-group">-->
<!--<label class="control-label col-sm-2" for="settle_rule_manual">{{'settle_rule_config.manual_settle'|translate}}</label>-->
@ -252,7 +264,7 @@
<label class="control-label col-sm-2"
for="settle_rule_min">Min Settle Amount</label>
<div class="col-sm-10">
<input type="number" class="form-control" ng-readonly="!settle_rule_form.edit" id="settle_rule_min"
<input type="text" onkeyup="value=value.replace(/[^\d.]/g,'')" class="form-control" ng-readonly="!settle_rule_form.edit" id="settle_rule_min"
ng-model="settleRule.min">
</div>
</div>
@ -269,13 +281,13 @@
</div>
<div class="panel-footer" ng-if="settle_rule_form.edit">
<div class="panel-footer" ng-if="settle_rule_form.edit" style="margin-left: 10px;margin-right: 10px">
<button class="btn btn-success" ng-click="submitSettleRule()"> Save</button>
<button class="btn btn-danger" ng-click="cancelSettleRule()"> Cancel</button>
</div>
</div>
<div ng-if="settleRule.enable_card_payment&&sysParams['app.settle-workday-only']!='true'" >
<div class="panel-new panel-info-new" style="margin-bottom: 20px" ng-if="settleRule.enable_card_payment&&sysParams['app.settle-workday-only']!='true'" >
<div class="panel-heading-new" >
<h4>
Card Payment Settle Rule Config
@ -287,7 +299,7 @@
<i class="fa fa-edit"></i></a>
</h4>
</div>
<div class="panel-body" ng-if="statusCtrl.isShowSettings">
<div class="panel-body" ng-if="statusCtrl.isShowSettings" style="margin-left: 10px;margin-right: 10px">
<div class="row form-horizontal">
<div class="form-group"
ng-if="(!cardSettings.manual&&cardSettings.everyday&&!statusCtrl.isCanEdit)||(!cardSettings.manual&&statusCtrl.isCanEdit)">
@ -400,7 +412,7 @@
</div>
</div>
<div class="panel-footer" ng-if="statusCtrl.isShowSettings && statusCtrl.isCanEdit">
<div class="panel-footer" ng-if="statusCtrl.isShowSettings && statusCtrl.isCanEdit" style="margin-left: 10px;margin-right: 10px">
<button class="btn btn-success" ng-click="submitCardSettings()">Save</button>
<button class="btn btn-danger" ng-click="cancelCardSettings()">Cancel</button>
</div>

Loading…
Cancel
Save