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

6 years ago · fba1e85c27
parent bf700de857 fd8ed9ffef
commit fba1e85c27
2 changed files with 1 additions and 1 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@ -2025,7 +2025,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
        JSONObject client = clientDetail(manager, clientMoniker);
        try {
            JSONObject qrboardConfig = new JSONObject();
-            qrboardConfig.put("src", PlatformEnvironment.getEnv().concatUrl("/static/images/aggregate_qr_board.png"));
+            qrboardConfig.put("src", PlatformEnvironment.getEnv().concatUrl("/static/images/cbbank_aggregate_qr_board.png"));
            qrboardConfig.put("type", "royalpay");
            qrboardConfig.put("x", "835");
            qrboardConfig.put("y", "1290");
--- a/src/main/ui/static/images/cbbank_aggregate_qr_board.png
+++ b/src/main/ui/static/images/cbbank_aggregate_qr_board.png