Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -244,7 +244,12 @@ public class RetailAppServiceImp implements RetailAppService {
     public JSONObject getClientInfo(JSONObject device) {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
-        return SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientManager.getClientInfo(device.getIntValue("client_id")));
+        JSONObject res = SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientManager.getClientInfo(device.getIntValue("client_id")));
+        res.put("is_skip_clearing",res.getBoolean("skip_clearing"));
+        if (clientType.equals("iphone")) {
+            res.put("skip_clearing",!res.getBoolean("skip_clearing"));
+        }
+        return res;
     }
 
     @Override