order expiry setter

src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java

@@ -241,7 +241,7 @@ public interface ClientManager {
 
     void setCustomerSurchargeRate(String clientMoniker, BigDecimal customer_surcharge_rate);
 
-    void setOrderExpiryConfig(String clientMoniker, String order_expiry_config);
+    void setOrderExpiryConfig(String clientMoniker, String orderExpiryConfig);
 
     void getAgreeFile(String clientMoniker, JSONObject manager) throws Exception;
 

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -1673,18 +1673,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public void setOrderExpiryConfig(String clientMoniker, String order_expiry_config) {
+    public void setOrderExpiryConfig(String clientMoniker, String orderExpiryConfig) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
         }
         JSONObject update = new JSONObject();
         update.put("client_id", client.getIntValue("client_id"));
-        if (order_expiry_config != null) {
+        if (orderExpiryConfig != null) {
-            OrderExpiryRuleResolver.resolveExpiryTime("order_expiry_config", new Date());
+            OrderExpiryRuleResolver.resolveExpiryTime(orderExpiryConfig, new Date());
+            update.put("order_expiry_config", orderExpiryConfig);
+            clientMapper.update(update);
         }
-        update.put("order_expiry_config", order_expiry_config == "" ? null : order_expiry_config);
-        clientMapper.update(update);
     }
 
     @Override