diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 5683116bd..e610c6ee9 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -543,7 +543,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html index d28281419..db731d054 100644 --- a/src/main/ui/static/analysis/templates/customer_analysis.html +++ b/src/main/ui/static/analysis/templates/customer_analysis.html @@ -179,7 +179,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/> - <img src="/static/images/rpayplus.png" + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/> {{order.order_id}} </td> diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html index 531eadff2..bb65421f4 100644 --- a/src/main/ui/static/analysis/templates/manage_customers_orders.html +++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html @@ -91,7 +91,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='hf'}" ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> | - <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a> </p> </div> diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html index 247848535..7f19fc00e 100644 --- a/src/main/ui/static/analysis/templates/settlement_transactions.html +++ b/src/main/ui/static/analysis/templates/settlement_transactions.html @@ -50,7 +50,7 @@ </li> <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay"> <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY"> - <img src="/static/images/rpayplus.png" class="channel-icon-lg"> + <img src="/static/images/rpayplus_sign_lg.png" class="channel-icon-lg"> </a> </li> </ul> diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 14d91b836..4918d98d9 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -98,7 +98,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='hf'}" ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> | - <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a> </p> </div> diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html index 7c393b9d2..7896d249a 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -68,7 +68,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='hf'}" ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> | - <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a> </p> </div> diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html index 6267766b8..5f4be2c4e 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -32,7 +32,7 @@ ng-click="params.channel='jd';loadTradeLogs()">JD Pay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='hf'}" ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a> - <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> </p> </div> diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js index c77d3fe80..fc23d7390 100644 --- a/src/main/ui/static/commons/services/clearingDetailService.js +++ b/src/main/ui/static/commons/services/clearingDetailService.js @@ -61,7 +61,7 @@ define(['../app','decimal'], function (app,Decimal) { case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html index 3184f16b2..3c63f639c 100644 --- a/src/main/ui/static/commons/templates/order_detail.html +++ b/src/main/ui/static/commons/templates/order_detail.html @@ -45,7 +45,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/> - <img src="/static/images/rpayplus.png" + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/> {{order.order_id}} </td> diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index 3c418044d..6b5fa2f4c 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -393,7 +393,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html index a97dd0384..5c49583b6 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html @@ -135,7 +135,7 @@ <div class="col-xs-4" ng-if="detail.RpayDetail"> <div class="info-box" style="background: lightcyan"> <div class="info-box-icon" style=" background: bottom;"> - <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png"> + <img uib-tooltip="Rpay+" src="/static/images/rpayplus_sign_lg.png"> </div> <div class="info-box-content"> <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5> @@ -187,7 +187,7 @@ <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png"> <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png"> <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png"> - <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus.png"> + <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus_sign_lg.png"> </td> </tr> </tbody> diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html index 213408c10..4d314367a 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html @@ -110,7 +110,7 @@ <div class="col-xs-4" ng-if="report.RpayReport"> <div class="info-box" style="background: lightcyan"> <div class="info-box-icon" style=" background: bottom;"> - <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png"> + <img uib-tooltip="Rpay+" src="/static/images/rpayplus_sign_lg.png"> </div> <div class="info-box-content"> <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5> diff --git a/src/main/ui/static/images/rpayplus_sign.png b/src/main/ui/static/images/rpayplus_sign.png new file mode 100644 index 000000000..4c53e791c Binary files /dev/null and b/src/main/ui/static/images/rpayplus_sign.png differ diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus_sign_lg.png similarity index 100% rename from src/main/ui/static/images/rpayplus.png rename to src/main/ui/static/images/rpayplus_sign_lg.png diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index a477b413a..d00a3a693 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -206,7 +206,7 @@ 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.png" + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/> {{trade.order_id2}} </td> diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html index c4b3299e2..c3e911d21 100644 --- a/src/main/ui/static/payment/custom/templates/custom.html +++ b/src/main/ui/static/payment/custom/templates/custom.html @@ -101,7 +101,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/> - <img src="/static/images/rpayplus.png" + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/> {{order.order_id}} </td> diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index 6a49339c8..a26005322 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -200,7 +200,7 @@ 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.png" + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/> {{trade.order_id2}} </td> diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html index 0939919a9..ea3913570 100644 --- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html +++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html @@ -86,7 +86,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JDpay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='HF'}" ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> | - <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> </p> </div> @@ -187,7 +187,7 @@ <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/> <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.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/> + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/> {{trade.order_id}} </td> <td> diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 7d5d17fe9..915719219 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -96,7 +96,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='HF'}" ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> | - <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> </p> </div> @@ -296,7 +296,7 @@ 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.png" + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay" ng-if="trade.channel=='Rpay'"/> {{trade.order_id2}} </td> diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index 1d1f07f0e..527e66e50 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -7,7 +7,7 @@ <ul class="nav nav-pills"> <li ng-class="{active:ctrl.channel==null}"> <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All"> - <img src="/static/images/rpayplus.png"> + <img src="/static/images/rpayplus_sign_lg.png"> </a> </li> <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat"> @@ -42,7 +42,7 @@ </li> <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay"> <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay"> - <img src="/static/images/rpayplus.png"> + <img src="/static/images/rpayplus_sign_lg.png"> </a> </li> </ul> diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index efb867200..41ea8d8a6 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -96,7 +96,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='HF'}" ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> - <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+</a> </p> </div> @@ -324,7 +324,7 @@ <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/> <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.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/> + <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/> {{trade.order_id}} </td> <td> diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 13496d1a2..e17a89559 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -134,7 +134,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> | <a role="button" ng-class="{'bg-primary':params.channel=='HF'}" ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> | - <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}" + <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}" ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> </p> </div> @@ -353,7 +353,7 @@ 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.png" + <img src="/static/images/rpayplus_sign.png" uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/> {{trade.order_id}} </td>