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

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java

@@ -81,7 +81,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
 
     @Override
     public void exportData(JSONObject params, HttpServletResponse resp) {
-        params.put("channels", new String []{"Alipay", "AlipayOnline"});
+        params.put("channels", new String []{"Alipay", "AlipayOnline","AlipayAps"});
         String[] title = {"Channel", "Total Amount(AUD)", "Total orders", "Transaction Partners", "Enable Partners"};
         JSONObject count = customerAndOrdersStatisticsMapper.countChannel(params);
         int enablePartners = customerAndOrdersStatisticsMapper.countEnableAlipay(params);

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

@@ -18,6 +18,7 @@
             o.client_order_id,
             o.gateway,
             o.channel,
+            o.pay_type,
             o.pre_authorization,
             p.client_moniker,
             p.short_name,
@@ -48,6 +49,7 @@
             o.confirm_time                             pay_time,
             o.pre_authorization,
             o.source,
+            o.pay_type,
             CASE o.status
             WHEN 0
                 THEN 'SUBMITTING'
@@ -159,7 +161,7 @@
         select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount,
         oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency,
         oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail,
-        oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source
+        oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type
         from pmt_orders oo
         <where>
             <if test="search_text != null">
@@ -301,7 +303,7 @@
         select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount,
         oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency,
         oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail,
-        oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source
+        oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type
         from pmt_orders oo
         <where>
             <if test="search_text != null">

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

@@ -293,7 +293,7 @@
                             </div>
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
-                                    <div class="description-header text-bold"><small><img src="/static/images/alipay_sign.png"/>Alipay+</small></div>
+                                    <div class="description-header text-bold"><small><img src="/static/images/alipay_aps.jpg" style="height: 30px"/>Alipay+</small></div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
                                                ng-bind="totalChannelAmount.alipayapsamount|currency: ' $ '"></label></br>

src/main/ui/static/payment/partner/templates/partner_pay_logs.html

@@ -376,6 +376,8 @@
                                 ng-if="trade.channel=='Alipay'" />
                             <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline"
                                 ng-if="trade.channel=='AlipayOnline'" />
+                            <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
+                                ng-if="trade.channel=='AlipayAps'" />
                             <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'" />
                             <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'" />
                             <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+"

src/main/ui/static/payment/partner/templates/partner_payment_info.html

@@ -250,13 +250,13 @@
                            ng-change="toggleChannel('rpaypmt_dd')">
                 </div>
             </div>
-            <div class="form-group col-sm-4">
+<!--            <div class="form-group col-sm-4">-->
-                <label class="col-xs-6 control-label">Alipay+|支付宝</label>
+<!--                <label class="col-xs-6 control-label">Alipay+|支付宝</label>-->
-                <div class="col-xs-6">
+<!--                <div class="col-xs-6">-->
-                    <input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch
+<!--                    <input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch-->
-                           ng-change="toggleChannel('alipayplus')">
+<!--                           ng-change="toggleChannel('alipayplus')">-->
-                </div>
+<!--                </div>-->
-            </div>
+<!--            </div>-->
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">Alipay+(APS)</label>
                 <div class="col-xs-6">
@@ -556,7 +556,7 @@
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">AlipayCN channel</label>
                 <div class="col-xs-6">
-                    <input type="checkbox" ng-model="paymentInfo.alipay_cn_switch" bs-switch switch-on-text="APS"
+                    <input type="checkbox" ng-model="paymentInfo.alipay_cn_switch" bs-switch switch-on-text="Alipay+(APS)"
                            switch-off-text="Alipay"
                            ng-change="switchAlipayCn(paymentInfo.client_id,paymentInfo.aps_config_id,paymentInfo.alipay_cn_switch)">
                 </div>

src/main/ui/static/payment/tradelog/templates/balance_report.html

@@ -540,6 +540,8 @@
                                          uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/>
                                     <img src="/static/images/direct_debit_sign.png"
                                          uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
+                                    <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
+                                         ng-if="trade.channel=='AlipayAps'" />
                                     {{trade.order_id2}}<span
                                         ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i
                                         class="fa fa-question-circle-o" uib-tooltip-html="trade.htmlTooltip"></i></span>

src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html

@@ -374,6 +374,8 @@
                                          uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/>
                                     <img src="/static/images/direct_debit_sign.png"
                                          uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
+                                    <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
+                                         ng-if="trade.channel=='AlipayAps'" />
                                     {{trade.order_id}}
                                 </td>
                                 <td>

src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html

@@ -349,6 +349,8 @@
                                      <img src="/static/images/lakalapay_sign.png" uib-tooltip="LakalaPay" ng-if="trade.channel=='LakalaPay'"/>
                                      <img src="/static/images/card_payment_sign.png" uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/>
                                      <img src="/static/images/direct_debit_sign.png" uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
+                                     <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
+                                          ng-if="trade.channel=='AlipayAps'" />
                                      {{trade.order_id}}
                                  </td>
                                  <td>

src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html

@@ -731,6 +731,9 @@
                                         <img src="/static/images/lazada-logo.png" style="height: 20px"
                                             uib-tooltip="Lazada Wallet"
                                             ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='lazada_wallet_my'" />
+                                        <img src="/static/images/alipay_aps.jpg" style="height: 25px"
+                                             uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
+                                             ng-if="trade.channel=='AlipayAps'" />
                                         {{trade.order_id}}<span
                                             ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i
                                                 class="fa fa-question-circle-o"

src/main/ui/static/payment/tradelog/templates/trade_logs.html

@@ -502,6 +502,9 @@
                                             ng-if="trade.channel=='rpaypmt_card'" />
                                         <img src="/static/images/direct_debit_sign.png" uib-tooltip="Direct Debit"
                                             ng-if="trade.channel=='rpaypmt_dd'" />
+                                        <img src="/static/images/alipay_aps.jpg" style="height: 25px"
+                                            uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
+                                            ng-if="trade.channel=='AlipayAps'" />
                                         <img src="/static/images/alipay_sign.png" style="height: 20px"
                                             uib-tooltip="Alipay CN"
                                             ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='alipay_cn'" />