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

master
Yixian 3 years ago
commit 868520e697

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.4.16</version> <version>2.4.17</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

@ -360,13 +360,13 @@
{{transcommon_total.not_settled|currency:'AUD '}} <i class="fa fa-ellipsis-v" ng-click="hideNotSettleDetail()" style="cursor: pointer"></i> {{transcommon_total.not_settled|currency:'AUD '}} <i class="fa fa-ellipsis-v" ng-click="hideNotSettleDetail()" style="cursor: pointer"></i>
</span> </span>
<div ng-if="showUnSettleDetail"> <div ng-if="showUnSettleDetail">
<span class="counter text-white" style="font-size: 1px"> <span class="counter text-white" style="font-size: 14px">
Cross-border Payment : {{transcommon_system.system_not_settled|currency:'AUD '}} Cross-border Payment : {{transcommon_system.system_not_settled|currency:'AUD '}}
</span> </span>
<span class="counter text-white" style="font-size: 1px"> <span class="counter text-white" style="font-size: 14px">
Card Payment : {{transcommon_rpaypmt_card.rpaypmt_card_not_settled|currency:'AUD '}} Card Payment : {{transcommon_rpaypmt_card.rpaypmt_card_not_settled|currency:'AUD '}}
</span> </span>
<span class="counter text-white" style="font-size: 1px"> <span class="counter text-white" style="font-size: 14px">
Direct Debit : {{transcommon_rpaypmt_dd.rpaypmt_dd_not_settled|currency:'AUD '}} Direct Debit : {{transcommon_rpaypmt_dd.rpaypmt_dd_not_settled|currency:'AUD '}}
</span> </span>
</div> </div>

Loading…
Cancel
Save