fix dashboard card payment amount

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml

@@ -356,10 +356,10 @@
                 ifnull(sum(CASE WHEN s.channel = 'LakalaPay' THEN s.total ELSE 0 END),0) lakalapayamount,
                 ifnull(sum(CASE WHEN s.channel = 'LakalaPay' THEN s.orders ELSE 0 END),0) lakalapay_order_count,
                 ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'LakalaPay',TRUE,NULL)),0) lakala_client_count,
-                ifnull(sum(CASE WHEN s.channel = 'rpaypmt_card' THEN s.total ELSE 0 END),0) rpaypmt_cardpayamount,
+                ifnull(sum(CASE WHEN s.channel = 'rpaypmt_card' THEN s.total ELSE 0 END),0) rpaypmt_cardamount,
                 ifnull(sum(CASE WHEN s.channel = 'rpaypmt_card' THEN s.orders ELSE 0 END),0) rpaypmt_card_order_count,
                 ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'rpaypmt_card',TRUE,NULL)),0) rpaypmt_card_client_count,
-                ifnull(sum(CASE WHEN s.channel = 'rpaypmt_dd' THEN s.total ELSE 0 END),0) rpaypmt_ddpayamount,
+                ifnull(sum(CASE WHEN s.channel = 'rpaypmt_dd' THEN s.total ELSE 0 END),0) rpaypmt_ddamount,
                 ifnull(sum(CASE WHEN s.channel = 'rpaypmt_dd' THEN s.orders ELSE 0 END),0) rpaypmt_dd_order_count,
                 ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'rpaypmt_dd',TRUE,NULL)),0) rpaypmt_dd_client_count,
                 ifnull(sum(s.orders), 0) all_count,

src/main/ui/static/analysis/templates/trans_analysis.html

@@ -272,7 +272,7 @@
                                     <div class="description-header text-bold"><small><img src="/static/images/card_payment_sign.png"/>Card Payment</small></div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.rpaypmt_cardpayamount|currency: ' $ '"></label></br>
+                                               ng-bind="totalChannelAmount.rpaypmt_cardamount|currency: ' $ '"></label></br>
                                         <label class="description-text text-red">交易笔数：{{ totalChannelAmount.rpaypmt_card_order_count }}</label>
                                         <label class="description-text text-red">交易商户数：{{ totalChannelAmount.rpaypmt_card_client_count }}</label>
                                     </div>
@@ -283,7 +283,7 @@
                                     <div class="description-header text-bold"><small><img src="/static/images/direct_debit_sign.png"/>Direct Debit</small></div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.rpaypmt_ddpayamount|currency: ' $ '"></label></br>
+                                               ng-bind="totalChannelAmount.rpaypmt_ddamount|currency: ' $ '"></label></br>
                                         <label class="description-text text-red">交易笔数：{{ totalChannelAmount.rpaypmt_dd_order_count }}</label>
                                         <label class="description-text text-red">交易商户数：{{ totalChannelAmount.rpaypmt_dd_client_count }}</label>
                                     </div>

src/main/ui/static/analysis/templates/trans_analysis_monthly.html

@@ -239,7 +239,7 @@
                                     <div class="description-header text-bold"><img src="/static/images/card_payment_sign.png"/>Card Payment</div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.rpaypmt_cardpayamount|currency: ' $ '"></label></br>
+                                               ng-bind="totalChannelAmount.rpaypmt_cardamount|currency: ' $ '"></label></br>
                                         <label class="description-text text-red">交易笔数：{{ totalChannelAmount.rpaypmt_card_order_count }}</label>
                                         <label class="description-text text-red">交易商户数：{{ totalChannelAmount.rpaypmt_card_client_count }}</label>
                                     </div>
@@ -250,7 +250,7 @@
                                     <div class="description-header text-bold"><img src="/static/images/direct_debit_sign.png"/>Direct Debit</div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.rpaypmt_ddpayamount|currency: ' $ '"></label></br>
+                                               ng-bind="totalChannelAmount.rpaypmt_ddamount|currency: ' $ '"></label></br>
                                         <label class="description-text text-red">交易笔数：{{ totalChannelAmount.rpaypmt_dd_order_count }}</label>
                                         <label class="description-text text-red">交易商户数：{{ totalChannelAmount.rpaypmt_dd_client_count }}</label>
                                     </div>