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

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

@@ -210,7 +210,7 @@
                   max(t.transaction_time)                                                            transation_time,
                   c.client_moniker                                                                   client_moniker
               FROM pmt_transactions t INNER JOIN sys_clients c
-                      ON t.client_id = c.client_id AND c.enable_refund_auth = 0
+                      ON t.client_id = c.client_id AND c.enable_pre_refund = 1
               GROUP BY c.client_id) a
         WHERE a.amount < 0
     </select>

src/main/ui/static/config/devtools/templates/wx_settlements.html

@@ -26,6 +26,7 @@
                     <select ng-model="params.merchant" id="merchant-select" class="form-control">
                         <option value="1307485301">1307485301</option>
                         <option value="1431999902">1431999902</option>
+                        <option value="1487387142">1487387142</option>
                     </select>
                 </div>
                 <button class="btn btn-primary" ng-click="loadSettlements()">