diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 15e17db04..0df335678 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -320,7 +320,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
"company_name", "address","business_name","business_structure", "abn","acn","company_phone","suburb","postcode","state","contact_person","contact_phone","contact_email",
"short_name", "logo_url", "enable_refund", "enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark",
"logo_thumbnail", "creator", "create_time", "approver", "approve_result", "approve_time", "timezone",
- "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay","manual_settle"};
+ "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay","manual_settle","skip_clearing"};
for (String col : columns) {
simpleClient.put(col, client.get(col));
}
diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index 05cebe661..f84151330 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -35,15 +35,19 @@
- 参与商户每周一即可获得营销补贴
-
- 营销补贴金额,以发放时账户余额为基数,折算年化比率不低于15%,最高20%
+ 营销补贴金额,以发放时账户余额为基数,折算年化比率不低于15%,最高20%,2000$封顶
-
- 每周一15:00~16:00(GMT+10时区)发放营销补贴至商户营销账户。 参与商户周一暂停清算,进行补贴的计算和发放,周二恢复原有规则。
+ 每周一15:00~16:00(GMT+10时区)发放营销补贴至商户营销账户。
+
+ -
+ 参与活动商户系统不再自动清算,商户可以根据自己的需要自行提现,提现完第二天会清算到商户银行账户。
-
补贴活动周期:2018/3/20-2018/6/30
- 商户自愿参加,可以随时取消(除周一外,周一为补贴的计算和发放日,在此期间无法进行报名和取消操作,17:00之后恢复报名和取消报名)
+ - 商户一旦取消,则放弃活动补贴,第二天系统会恢复自动清算
- 本活动最终解释权归RoyalPay所有
@@ -52,45 +56,45 @@
敬请期待
-
-
-
-
-
-
-
补贴金额记录
-
+
+
+
+
+
+
+
补贴金额记录
+
-
+
-
-
-
-
- 时间 |
- 补贴金额 |
-
-
-
-
- >04-01 12:00 |
- $5.00 |
-
-
-
+
+
+
+
+ 时间 |
+ 补贴金额 |
+
+
+
+
+ >04-01 12:00 |
+ $5.00 |
+
+
+
+
-
-
-
-
+
+
+
@@ -131,7 +135,7 @@
} else if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
window.webkit.messageHandlers.appCmd.postMessage({type:'cmd_join_mondelay'});
} else if (/(Android)/i.test(navigator.userAgent)) {
- android.appCmd('{\"type\":\"cmd_join_mondelay\"}');
+ android.appCmd('{\"type\":\"cmd_join_mondelay\",\"cancel_waring\":\"'+cancel_waring+'\"}');
} else {
}
@@ -145,8 +149,7 @@
} else if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
window.webkit.messageHandlers.appCmd.postMessage({type:'cmd_cancel_mondelay',cancel_waring:cancel_waring});
} else if (/(Android)/i.test(navigator.userAgent)) {
- android.appCmd('{\"type\":\"cmd_cancel_mondelay\"}');
- } else {
+ android.appCmd('{\"type\":\"cmd_cancel_mondelay\",\"cancel_waring\":\"'+cancel_waring+'\"}'); } else {
}