From 8890cab76f29749517c7cd055bb17fdc5986f970 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Tue, 7 Sep 2021 19:55:58 +0800 Subject: [PATCH 01/50] test --- .../au/com/royalpay/payment/manage/dev/web/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 27d1a9919..db7ca8c13 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -220,7 +220,7 @@ public class TestController { client.put("located_country", "Australia"); if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){ // clean_1 clean_1_friday clean_1_saturday - // second, third or fourth + // first, second, third or fourth client.put("clean_1", weChatRate.getString("clean_days")); client.put("clean_1_friday", "first"); client.put("clean_1_saturday", "second"); From 7b0f130ffe2bef37ca1f69df28c8923e165d0e94 Mon Sep 17 00:00:00 2001 From: Todking Date: Mon, 13 Sep 2021 13:53:19 +0800 Subject: [PATCH 02/50] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9Eaps=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8CalipayCN=E6=B8=A0=E9=81=93=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../mappers/system/aps/ApsConfigMapper.java | 20 + .../merchants/core/ApsConfigService.java | 13 + .../core/descriptor/ApsConfigDescriptor.java | 17 + .../core/impls/ApsConfigServiceImpl.java | 38 + .../core/impls/ClientManagerImpl.java | 153 +- .../merchants/entity/ApsConfigData.java | 46 + .../merchants/web/ApsConfigController.java | 55 + .../mappers/system/aps/ApsConfigMapper.xml | 23 + .../static/payment/partner/partner-manage.js | 16485 ++++++++-------- .../templates/partner_payment_info.html | 150 +- 11 files changed, 8681 insertions(+), 8321 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java create mode 100644 src/main/resources/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.xml diff --git a/pom.xml b/pom.xml index 2934cc261..d66c495f6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 2.2.31 + 2.3.0 4.0.0 manage diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.java new file mode 100644 index 000000000..e819edb63 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.java @@ -0,0 +1,20 @@ +package au.com.royalpay.payment.manage.mappers.system.aps; + +import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; +import com.alibaba.fastjson.JSONObject; +import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; +import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; +import com.yixsoft.support.mybatis.autosql.annotations.SqlType; +import org.apache.ibatis.annotations.Param; + +@AutoMapper(tablename = "sys_client_aps_config", pkName = "id") +public interface ApsConfigMapper { + + @AutoSql(SqlType.SELECT) + ApsConfigData findByClientId(@Param("client_id") String clientId); + + @AutoSql(SqlType.INSERT) + void saveApsConfigClientId(ApsConfigData apsConfigData); + + void updateApsConfigClientId(JSONObject apsConfigData); +} diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java new file mode 100644 index 000000000..6fa193b6d --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java @@ -0,0 +1,13 @@ +package au.com.royalpay.payment.manage.merchants.core; + +import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; +import com.alibaba.fastjson.JSONObject; + +public interface ApsConfigService { + ApsConfigData getApsConfigByClientId(String clientId); + + ApsConfigData saveApsConfigClientId(String managerId, String clientId, ApsConfigDescriptor apsConfigDescriptor); + + ApsConfigData updateApsConfigClientId(String managerId,String clientId, JSONObject apsConfig); +} diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java new file mode 100644 index 000000000..9274fc04c --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java @@ -0,0 +1,17 @@ +package au.com.royalpay.payment.manage.merchants.core.descriptor; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = true) +public class ApsConfigDescriptor { + + private Boolean enableAlipayAps = false; + + private Boolean alipayCnSwitch = false; +} diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java new file mode 100644 index 000000000..6444876b4 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java @@ -0,0 +1,38 @@ +package au.com.royalpay.payment.manage.merchants.core.impls; + +import au.com.royalpay.payment.manage.mappers.system.aps.ApsConfigMapper; +import au.com.royalpay.payment.manage.merchants.core.ApsConfigService; +import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; +import com.alibaba.fastjson.JSONObject; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + + +@Service +public class ApsConfigServiceImpl implements ApsConfigService { + + @Resource + private ApsConfigMapper apsConfigMapper; + + @Override + public ApsConfigData getApsConfigByClientId(String clientId) { + return apsConfigMapper.findByClientId(clientId); + } + + @Override + public ApsConfigData saveApsConfigClientId(String managerId, String clientId, ApsConfigDescriptor apsConfigDescriptor) { + ApsConfigData apsConfigData = ApsConfigData.saveData(managerId, clientId, apsConfigDescriptor); + apsConfigMapper.saveApsConfigClientId(apsConfigData); + return apsConfigMapper.findByClientId(clientId); + } + + @Override + public ApsConfigData updateApsConfigClientId(String managerId, String clientId, JSONObject apsConfig) { + apsConfig.put("clientId", clientId); + apsConfig.put("modifier", managerId); + apsConfigMapper.updateApsConfigClientId(apsConfig); + return apsConfigMapper.findByClientId(clientId); + } +} diff --git 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 index 209f609dc..7e016ae24 100644 --- 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 @@ -55,13 +55,12 @@ import au.com.royalpay.payment.manage.mappers.redpack.ActClientInvitationCodeMap import au.com.royalpay.payment.manage.mappers.risk.RiskAttentionMerchantsMapper; import au.com.royalpay.payment.manage.mappers.system.*; import au.com.royalpay.payment.manage.merchants.beans.*; -import au.com.royalpay.payment.manage.merchants.core.ClientConfigService; -import au.com.royalpay.payment.manage.merchants.core.ClientInfoCacheSupport; -import au.com.royalpay.payment.manage.merchants.core.ClientManager; -import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport; +import au.com.royalpay.payment.manage.merchants.core.*; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBank; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankClientNullException; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankInfo; +import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import au.com.royalpay.payment.manage.merchants.entity.impls.*; import au.com.royalpay.payment.manage.merchants.enums.UPayAuthFileEnum; import au.com.royalpay.payment.manage.notice.core.MailService; @@ -329,6 +328,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid private PaymentApi paymentApi; @Resource private MerchantChannelPermissionManager merchantChannelPermissionManager; + @Resource + private ApsConfigService apsConfigService; DateTimeFormatter formatter = DateTimeFormat.forPattern("dd MMM yyyy"); @@ -356,7 +357,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid private String agreetemplatePdfPath; @Value("${app.agreetemplate.aggregate.path}") private String aggregateAgreetemplatePdfPath; -// private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf"; + // private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf"; private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2021/09/07/1630997571126_fqWcLQ5Rx0wFm8pVwpKuI1gjf6FmwX.pdf"; @@ -554,7 +555,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid resolver.newOrderEnabled(client, null, PlatformEnvironment.getEnv().getForeignCurrency())) { client.put("enable_alipayplus", true); } - + ApsConfigData apsConfig = apsConfigService.getApsConfigByClientId(client.getString("client_id")); + if (apsConfig == null) { + apsConfig = apsConfigService.saveApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), new ApsConfigDescriptor()); + } + client.put("aps_config_id", apsConfig.getId()); + client.put("enable_alipayaps", apsConfig.getEnableAlipayAps()); + client.put("alipay_cn_switch", apsConfig.getAlipayCnSwitch()); return client; } @@ -1583,11 +1590,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new NotFoundException("Client Not Exists"); } - merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow); - try { - clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow)); - } catch (Exception e) { - logger.error("Failed to change channel switch:{}", channel); + if (channelApi.channel().equalsIgnoreCase("alipayaps")) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("enableAlipayAps", allow); + apsConfigService.updateApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), jsonObject); + } else { + merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow); + try { + clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow)); + } catch (Exception e) { + logger.error("Failed to change channel switch:{}", channel); + } } logger.info("{}({}) switched client {} channel {} to {}", manager.getString("display_name"), manager.getString("manager_id"), clientMoniker, channel, allow); if (allow && (StringUtils.equalsAnyIgnoreCase("Wechat", channel) || StringUtils.equalsAnyIgnoreCase("Alipay", channel))) { @@ -2050,12 +2063,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } else { List existRate = clientRateMapper.listCurrentClientRates(clientId, config.getDate("active_time"), channel); existRate.stream().filter(existConfig -> { - if (existConfig.getDate("active_time").equals(config.getDate("active_time")) && existConfig.getDate("expiry_time").equals(config.getDate("expiry_time"))) { - return false; - } - return true; - } - ) + if (existConfig.getDate("active_time").equals(config.getDate("active_time")) && existConfig.getDate("expiry_time").equals(config.getDate("expiry_time"))) { + return false; + } + return true; + } + ) .forEach((rateLog) -> { rateLog.put("expiry_time", DateUtils.addDays(config.getDate("active_time"), -1)); clientRateMapper.updateConfig(rateLog); @@ -2980,24 +2993,24 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new BadRequestException("The Partner's Rate is not config!"); } client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN)); - client.put("clean", "T+"+weChatRate.getString("clean_days")); + client.put("clean", "T+" + weChatRate.getString("clean_days")); client.put("clean_days", weChatRate.getString("clean_days")); client.put("located_country", "Australia"); - if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){ + if ("1".equalsIgnoreCase(weChatRate.getString("clean_days"))) { // clean_1 clean_1_friday clean_1_saturday // second, third or fourth - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "first"); - client.put("clean_1_saturday", "second"); - }else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){ - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "second"); - client.put("clean_1_saturday", "third"); - - }else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){ - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "third"); - client.put("clean_1_saturday", "fourth"); + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "first"); + client.put("clean_1_saturday", "second"); + } else if ("2".equalsIgnoreCase(weChatRate.getString("clean_days"))) { + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "second"); + client.put("clean_1_saturday", "third"); + + } else if ("3".equalsIgnoreCase(weChatRate.getString("clean_days"))) { + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "third"); + client.put("clean_1_saturday", "fourth"); } try { JSONObject alipayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Alipay"); @@ -3116,19 +3129,19 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("wechat_rate", p.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN)); client.put("clean", "T+" + p.getString("clean_days")); client.put("clean_days", p.getString("clean_days")); - if("1".equalsIgnoreCase(p.getString("clean_days"))){ - client.put("clean_1", p.getString("clean_days")); - client.put("clean_1_friday", "first"); - client.put("clean_1_saturday", "second"); - }else if("2".equalsIgnoreCase(p.getString("clean_days"))){ - client.put("clean_1", p.getString("clean_days")); - client.put("clean_1_friday", "second"); - client.put("clean_1_saturday", "third"); - - }else if("3".equalsIgnoreCase(p.getString("clean_days"))){ - client.put("clean_1", p.getString("clean_days")); - client.put("clean_1_friday", "third"); - client.put("clean_1_saturday", "fourth"); + if ("1".equalsIgnoreCase(p.getString("clean_days"))) { + client.put("clean_1", p.getString("clean_days")); + client.put("clean_1_friday", "first"); + client.put("clean_1_saturday", "second"); + } else if ("2".equalsIgnoreCase(p.getString("clean_days"))) { + client.put("clean_1", p.getString("clean_days")); + client.put("clean_1_friday", "second"); + client.put("clean_1_saturday", "third"); + + } else if ("3".equalsIgnoreCase(p.getString("clean_days"))) { + client.put("clean_1", p.getString("clean_days")); + client.put("clean_1_friday", "third"); + client.put("clean_1_saturday", "fourth"); } } else if ("Alipay".equals(rate_name)) { client.put("alipay_rate", p.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN)); @@ -3205,21 +3218,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("clean", "T+" + weChatRate.getString("clean_days")); client.put("clean_days", weChatRate.getString("clean_days")); client.put("located_country", "Australia"); - if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){ + if ("1".equalsIgnoreCase(weChatRate.getString("clean_days"))) { // clean_1 clean_1_friday clean_1_saturday // second, third or fourth - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "first"); - client.put("clean_1_saturday", "second"); - }else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){ - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "second"); - client.put("clean_1_saturday", "third"); + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "first"); + client.put("clean_1_saturday", "second"); + } else if ("2".equalsIgnoreCase(weChatRate.getString("clean_days"))) { + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "second"); + client.put("clean_1_saturday", "third"); - }else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){ - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "third"); - client.put("clean_1_saturday", "fourth"); + } else if ("3".equalsIgnoreCase(weChatRate.getString("clean_days"))) { + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "third"); + client.put("clean_1_saturday", "fourth"); } try { @@ -4106,21 +4119,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("clean", "T+" + weChatRate.getString("clean_days")); client.put("clean_days", weChatRate.getString("clean_days")); client.put("located_country", "Australia"); - if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){ + if ("1".equalsIgnoreCase(weChatRate.getString("clean_days"))) { // clean_1 clean_1_friday clean_1_saturday // second, third or fourth - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "first"); - client.put("clean_1_saturday", "second"); - }else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){ - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "second"); - client.put("clean_1_saturday", "third"); - - }else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){ - client.put("clean_1", weChatRate.getString("clean_days")); - client.put("clean_1_friday", "third"); - client.put("clean_1_saturday", "fourth"); + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "first"); + client.put("clean_1_saturday", "second"); + } else if ("2".equalsIgnoreCase(weChatRate.getString("clean_days"))) { + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "second"); + client.put("clean_1_saturday", "third"); + + } else if ("3".equalsIgnoreCase(weChatRate.getString("clean_days"))) { + client.put("clean_1", weChatRate.getString("clean_days")); + client.put("clean_1_friday", "third"); + client.put("clean_1_saturday", "fourth"); } String rateConfig = sysConfigManager.getSysConfig().getString("sys_rates"); JSONObject sysConfigRate = JSON.parseObject(rateConfig); @@ -4201,7 +4214,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc"))); logs.forEach(log -> log.put("padding", log.getBooleanValue("editable"))); JSONObject result = PageListUtils.buildPageListResult(logs); - result.put("padding", logs.stream().anyMatch(log->log.getBooleanValue("editable"))); + result.put("padding", logs.stream().anyMatch(log -> log.getBooleanValue("editable"))); logger.info("##editable{}", result.getBooleanValue("padding")); return result; } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java new file mode 100644 index 000000000..5a945f842 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java @@ -0,0 +1,46 @@ +package au.com.royalpay.payment.manage.merchants.entity; + + +import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import com.alibaba.fastjson.JSONObject; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; +import java.util.UUID; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = true) +public class ApsConfigData implements Serializable { + + private String id; + + private String creator; + + private Date createTime; + + private String modifier; + + private Date modifyTime; + + private String clientId; + + private Boolean enableAlipayAps; + + private Boolean alipayCnSwitch; + + public static ApsConfigData saveData(String managerId, String clientId, ApsConfigDescriptor apsConfigDescriptor) { + return new ApsConfigData() + .setClientId(clientId) + .setId(UUID.randomUUID().toString().replace("-", "")) + .setAlipayCnSwitch(apsConfigDescriptor.getAlipayCnSwitch()) + .setEnableAlipayAps(apsConfigDescriptor.getEnableAlipayAps()) + .setCreator(managerId) + .setCreateTime(new Date()); + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java new file mode 100644 index 000000000..5b64f54bc --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java @@ -0,0 +1,55 @@ +package au.com.royalpay.payment.manage.merchants.web; + +import au.com.royalpay.payment.manage.merchants.core.ApsConfigService; +import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; +import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; +import au.com.royalpay.payment.tools.CommonConsts; +import au.com.royalpay.payment.tools.permission.enums.ManagerRole; +import com.alibaba.fastjson.JSONObject; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/sys/partners/aps") +public class ApsConfigController { + + @Resource + private ApsConfigService apsConfigService; + + /** + * 获取aps配置信息 + * + * @param clientId + * @return + */ + @GetMapping("/{clientId}") + public ApsConfigData getApsConfigByClientId(@PathVariable("clientId") String clientId) { + return apsConfigService.getApsConfigByClientId(clientId); + } + + /** + * 初始化aps配置 + * + * @param clientId + * @param apsConfigDescriptor + * @return + */ + @ManagerMapping(value = "/{clientId}", method = RequestMethod.POST, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER }) + public ApsConfigData saveApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable("clientId") String clientId, @RequestBody ApsConfigDescriptor apsConfigDescriptor) { + return apsConfigService.saveApsConfigClientId(manager.getString("managerId"), clientId, apsConfigDescriptor); + } + + /** + * 修改aps配置 + * + * @param clientId + * @param apsConfig + * @return + */ + @ManagerMapping(value = "/{clientId}", method = RequestMethod.PUT, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER }) + public ApsConfigData updateApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable("clientId") String clientId, @RequestBody JSONObject apsConfig) { + return apsConfigService.updateApsConfigClientId(manager.getString("managerId"),clientId, apsConfig); + } +} diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.xml new file mode 100644 index 000000000..3c0630c8f --- /dev/null +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/aps/ApsConfigMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + UPDATE sys_client_aps_config SET modify_time = now(), modifier = #{modifier} + , alipay_cn_switch = #{alipayCnSwitch} + , enable_alipayaps = #{enableAlipayAps} + WHERE client_id = #{clientId} + + + \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 4e63e0fb4..d3b0b07e2 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -2,459 +2,459 @@ * Created by yixian on 2016-06-29. */ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiSelect'], function (angular, Decimal) { - 'use strict' - var clean_days_map = [ - { - label: 'T+1', - value: '1', - }, - { - label: 'T+2', - value: '2', - }, - { - label: 'T+3', - value: '3', - }, - ] - var bd_city_map = [ - { - label: 'Sydney', - value: 'Sydney', - }, - { - label: 'Melbourne', - value: 'Melbourne', - }, - ] - var partnerRoles = [ - { code: 1, label: 'Admin' }, - { code: 2, label: 'Manager' }, - { code: 3, label: 'Cashier' }, - ] - // var wxMerchantIndustries = [ - // { - // "label": "鞋包服饰|Shoes&Garments", - // "value": "343" - // }, - // { - // "label": "机票行业|Air Ticket", - // "value": "493" - // }, - // { - // "label": "文具/办公用品|Stationery/office supplies", - // "value": "492" - // }, - // { - // "label": "酒店行业|Hotel Industry", - // "value": "491" - // }, - // { - // "label": "教育行业|Education Industry", - // "value": "490" - // }, - // { - // "label": "国际物流|Logistics", - // "value": "489" - // }, - // { - // "label": "数码电器|Digital appliance", - // "value": "488" - // }, - // { - // "label": "母婴|Maternal and infant", - // "value": "487" - // }, - // { - // "label": "化妆品|Cosmetics", - // "value": "486" - // }, - // { - // "label": "食品|Food", - // "value": "485" - // }, - // { - // "label": "综合商城|Comprehensive mall", - // "value": "484" - // }, - // { - // "label": "其它货物贸易行业|Other trade industry", - // "value": "494" - // } - // ]; - - var wxMerchantIndustries = [ - { - label: 'Shoes&Garments', - value: '343', - }, - { - label: 'Comprehensive mall', - value: '484', - }, - { - label: 'Food', - value: '485', - }, - { - label: 'Cosmetics', - value: '486', - }, - { - label: 'Maternal and infant', - value: '487', - }, - { - label: 'Digital appliance', - value: '488', - }, - { - label: 'Logistics', - value: '489', - }, - { - label: 'Education Industry', - value: '490', - }, - { - label: 'Hotel Industry', - value: '491', - }, - { - label: 'Stationery/office supplies', - value: '492', - }, - { - label: 'Air Ticket', - value: '493', - }, - { - label: 'Other trade industry', - value: '494', - }, - { - label: 'Overseas Education', - value: '528', - }, - { - label: 'Travel ticket', - value: '529', - }, - { - label: 'Car rental', - value: '530', - }, - { - label: 'International Conference', - value: '531', - }, - { - label: 'Software', - value: '532', - }, - { - label: 'Medical Service', - value: '533', - }, - { - label: 'Online games (Top-up)', - value: '644', - }, - { - label: 'Online Shopping Mall', - value: '648', - }, - { - label: 'Supermarket', - value: '649', - }, - { - label: 'Convenience Store', - value: '651', - }, - { - label: 'Duty-free Shop', - value: '652', - }, - { - label: 'Pharmacy', - value: '653', - }, - { - label: 'Vending Machine', - value: '654', - }, - { - label: 'Department Store /Shopping Centre', - value: '655', - }, - { - label: 'Food/Beverages', - value: '656', - }, - { - label: 'Catering Services', - value: '657', - }, - { - label: 'Furniture/Household Products', - value: '658', - }, - { - label: 'Home Appliances/Camera Equipment/Office Equipment', - value: '659', - }, - { - label: 'Beauty/Personal Care Products', - value: '660', - }, - { - label: 'Flowers/Plants/Interior Decorations/Decorations', - value: '661', - }, - { - label: 'Nursery Products/Toys', - value: '662', - }, - { - label: 'Clothing/Shoes/Other Accessories', - value: '663', - }, - { - label: 'Sports/Fitness Equipment/Security', - value: '664', - }, - { - label: 'Watches/Eyewear/Jewellery', - value: '665', - }, - { - label: 'Outdoor Products /Travel Products', - value: '666', - }, - { - label: 'Books / Records / Stationery / Musical Instruments', - value: '667', - }, - { - label: 'Flight ticket/ticketing agent', - value: '668', - }, - { - label: 'Sightseeing Passes', - value: '669', - }, - { - label: 'Hotel/Resort', - value: '670', - }, - { - label: 'Online Books/Video/Music', - value: '671', - }, - { - label: 'Online games (Download)', - value: '672', - }, - { - label: 'University Education', - value: '677', - }, - { - label: 'Public hospitals/Medical Institutions', - value: '679', - }, - { - label: 'Private hospitals/Clinics/Medical institutions', - value: '678', - }, - { - label: 'Public transit', - value: '680', - }, - { - label: 'Logistics/ Courier Service', - value: '684', - }, - ] - var removeClientPayDesc = function (items, key) { - for (var i = 0; i < items.length; i++) { - var item = items[i] - if (item.indexOf(key) >= 0) { - items.splice(items.indexOf(item), 1) - i = i - 1 - } + 'use strict' + var clean_days_map = [ + { + label: 'T+1', + value: '1', + }, + { + label: 'T+2', + value: '2', + }, + { + label: 'T+3', + value: '3', + }, + ] + var bd_city_map = [ + { + label: 'Sydney', + value: 'Sydney', + }, + { + label: 'Melbourne', + value: 'Melbourne', + }, + ] + var partnerRoles = [ + {code: 1, label: 'Admin'}, + {code: 2, label: 'Manager'}, + {code: 3, label: 'Cashier'}, + ] + // var wxMerchantIndustries = [ + // { + // "label": "鞋包服饰|Shoes&Garments", + // "value": "343" + // }, + // { + // "label": "机票行业|Air Ticket", + // "value": "493" + // }, + // { + // "label": "文具/办公用品|Stationery/office supplies", + // "value": "492" + // }, + // { + // "label": "酒店行业|Hotel Industry", + // "value": "491" + // }, + // { + // "label": "教育行业|Education Industry", + // "value": "490" + // }, + // { + // "label": "国际物流|Logistics", + // "value": "489" + // }, + // { + // "label": "数码电器|Digital appliance", + // "value": "488" + // }, + // { + // "label": "母婴|Maternal and infant", + // "value": "487" + // }, + // { + // "label": "化妆品|Cosmetics", + // "value": "486" + // }, + // { + // "label": "食品|Food", + // "value": "485" + // }, + // { + // "label": "综合商城|Comprehensive mall", + // "value": "484" + // }, + // { + // "label": "其它货物贸易行业|Other trade industry", + // "value": "494" + // } + // ]; + + var wxMerchantIndustries = [ + { + label: 'Shoes&Garments', + value: '343', + }, + { + label: 'Comprehensive mall', + value: '484', + }, + { + label: 'Food', + value: '485', + }, + { + label: 'Cosmetics', + value: '486', + }, + { + label: 'Maternal and infant', + value: '487', + }, + { + label: 'Digital appliance', + value: '488', + }, + { + label: 'Logistics', + value: '489', + }, + { + label: 'Education Industry', + value: '490', + }, + { + label: 'Hotel Industry', + value: '491', + }, + { + label: 'Stationery/office supplies', + value: '492', + }, + { + label: 'Air Ticket', + value: '493', + }, + { + label: 'Other trade industry', + value: '494', + }, + { + label: 'Overseas Education', + value: '528', + }, + { + label: 'Travel ticket', + value: '529', + }, + { + label: 'Car rental', + value: '530', + }, + { + label: 'International Conference', + value: '531', + }, + { + label: 'Software', + value: '532', + }, + { + label: 'Medical Service', + value: '533', + }, + { + label: 'Online games (Top-up)', + value: '644', + }, + { + label: 'Online Shopping Mall', + value: '648', + }, + { + label: 'Supermarket', + value: '649', + }, + { + label: 'Convenience Store', + value: '651', + }, + { + label: 'Duty-free Shop', + value: '652', + }, + { + label: 'Pharmacy', + value: '653', + }, + { + label: 'Vending Machine', + value: '654', + }, + { + label: 'Department Store /Shopping Centre', + value: '655', + }, + { + label: 'Food/Beverages', + value: '656', + }, + { + label: 'Catering Services', + value: '657', + }, + { + label: 'Furniture/Household Products', + value: '658', + }, + { + label: 'Home Appliances/Camera Equipment/Office Equipment', + value: '659', + }, + { + label: 'Beauty/Personal Care Products', + value: '660', + }, + { + label: 'Flowers/Plants/Interior Decorations/Decorations', + value: '661', + }, + { + label: 'Nursery Products/Toys', + value: '662', + }, + { + label: 'Clothing/Shoes/Other Accessories', + value: '663', + }, + { + label: 'Sports/Fitness Equipment/Security', + value: '664', + }, + { + label: 'Watches/Eyewear/Jewellery', + value: '665', + }, + { + label: 'Outdoor Products /Travel Products', + value: '666', + }, + { + label: 'Books / Records / Stationery / Musical Instruments', + value: '667', + }, + { + label: 'Flight ticket/ticketing agent', + value: '668', + }, + { + label: 'Sightseeing Passes', + value: '669', + }, + { + label: 'Hotel/Resort', + value: '670', + }, + { + label: 'Online Books/Video/Music', + value: '671', + }, + { + label: 'Online games (Download)', + value: '672', + }, + { + label: 'University Education', + value: '677', + }, + { + label: 'Public hospitals/Medical Institutions', + value: '679', + }, + { + label: 'Private hospitals/Clinics/Medical institutions', + value: '678', + }, + { + label: 'Public transit', + value: '680', + }, + { + label: 'Logistics/ Courier Service', + value: '684', + }, + ] + var removeClientPayDesc = function (items, key) { + for (var i = 0; i < items.length; i++) { + var item = items[i] + if (item.indexOf(key) >= 0) { + items.splice(items.indexOf(item), 1) + i = i - 1 + } + } } - } - var app = angular.module('partnerManageApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ui.select', 'ngFileUpload']) - app.config([ - '$stateProvider', - function ($stateProvider) { - $stateProvider - .state('partners', { - url: '/partners', - templateUrl: '/static/payment/partner/templates/partners.html', - controller: 'partnerListCtrl', - data: { label: '商户列表' }, - }) - .state('businessCompliance', { - url: '/partners/compliance', - templateUrl: '/static/payment/partner/templates/partner_compliance.html', - controller: 'compliancePartnerCtrl', - }) - .state('complianceDocumentAudit', { - url: '/partners/compliance', - templateUrl: '/static/payment/partner/templates/partner_compliance.html', - controller: 'compliancePartnerCtrl', - }) - .state('partners.detail', { - url: '/{clientMoniker}/detail', - templateUrl: '/static/payment/partner/templates/partner_detail.html', - controller: 'partnerDetailCtrl', - resolve: { - partner: [ - '$http', - '$stateParams', - function ($http, $stateParams) { - return $http.get('/sys/partners/' + $stateParams.clientMoniker) - }, - ], - }, - }) - .state('partners.detail.payment_info', { - url: '/payment', - templateUrl: '/static/payment/partner/templates/partner_payment_info.html', - controller: 'partnerPaymentInfoCtrl', - }) - .state('partners.detail.payment_info_invalid', { - url: '/payment_invalid', - templateUrl: '/static/payment/partner/templates/partner_payment_info_invalid.html', - controller: 'partnerPaymentInfoCtrl', - }) - .state('partners.detail.subpartners', { - url: '/sub_partners', - templateUrl: '/static/payment/partner/templates/sub_partners.html', - controller: 'partnerSubCtrl', - }) - .state('partners.detail.accounts', { - url: '/accounts', - templateUrl: '/static/payment/partner/templates/partner_accounts.html', - controller: 'partnerAccountsCtrl', - }) - .state('partners.detail.paylogs', { - url: '/pay_logs', - templateUrl: '/static/payment/partner/templates/partner_pay_logs.html', - controller: 'partnerPayLogCtrl', - }) - .state('partners.detail.rates', { - url: '/rates', - templateUrl: '/static/payment/partner/templates/partner_bankaccounts.html', - controller: 'partnerRatesCtrl', - }) - .state('partners.detail.plugins', { - url: '/plugins', - templateUrl: '/static/payment/partner/templates/partner_plugins.html', - controller: 'partnerPluginsCtrl', - }) - .state('partners.detail.devices', { - url: '/devices', - templateUrl: '/static/payment/partner/templates/partner_devices.html', - controller: 'partnerDeviceCtrl', - }) - .state('partners.detail.files', { - url: '/files', - params: { commitType: 'cross-border' }, - templateUrl: '/static/payment/partner/templates/partner_auth_files.html', - controller: 'partnerAuthFileCtrl', - }) - .state('partners.detail.files.CP_files', { - url: '/cp_files', - templateUrl: '/static/payment/partner/templates/partner_cp_auth_files.html', - controller: 'partnerCPAuthFileCtrl', - resolve: { - file: [ - '$http', - '$stateParams', - function ($http, $stateParams) { - return $http.get('/sys/partners/' + $stateParams.clientMoniker + '/file') - }, - ], - }, - }) - .state('partners.detail.files.MW_files', { - url: '/mw_files', - templateUrl: '/static/payment/partner/templates/partner_mw_auth_files.html', - controller: 'partnerMWAuthFileCtrl', - resolve: { - file: [ - '$http', - '$stateParams', - function ($http, $stateParams) { - return $http.get('/sys/partners/' + $stateParams.clientMoniker + '/mw_file') - }, - ], - }, - }) - .state('partners.detail.kyc_files', { - url: '/kyc_files', - templateUrl: '/static/payment/kyc/templates/partner_kyc_files.html', - controller: 'partnerKycFileCtrl', - resolve: { - file: [ - '$http', - '$stateParams', - function ($http, $stateParams) { - return $http.get('/sys/partners/' + $stateParams.clientMoniker + '/kycFile') - }, - ], - }, - }) - .state('partners.detail.settlement', { - url: '/settlement', - templateUrl: '/static/payment/partner/templates/partner_settlement.html', - controller: 'partnerSettlementCtrl', - resolve: { - clientMoniker: [ - '$stateParams', - function ($stateParams) { - return $stateParams.clientMoniker - }, - ], - }, - }) - .state('partners.detail.surcharge_account', { - url: '/surcharge_account', - templateUrl: '/static/payment/partner/templates/partner_surcharge_account.html', - controller: 'partnerSurchargeAccountCtrl', - resolve: { - clientMoniker: [ - '$stateParams', - function ($stateParams) { - return $stateParams.clientMoniker - }, - ], - }, - }) - .state('partners.detail.product', { - url: '/partner_product', - templateUrl: 'static/payment/product/templates/partner_product.html', - controller: 'productCtrl', - }) - .state('partners.detail.sub_merchant_applicaitons', { - url: '/sub_merchant_applicaitons', - templateUrl: 'static/payment/partner/templates/sub_merchant_id_apply.html', - controller: 'subMerchantIdApplicaitonsCtrl', - }) - .state('partners.detail.permission_client', { - url: '/permission_client', - templateUrl: 'static/payment/partner/templates/partner_permission.html', - controller: 'permissionClientCtrl', - }) - .state('partners.detail.incremental_service', { - url: '/incremental_service', - templateUrl: 'static/payment/partner/templates/incremental_service.html', - controller: 'incrementalServiceCtrl', - }) /*.state('partners.edit', { + var app = angular.module('partnerManageApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ui.select', 'ngFileUpload']) + app.config([ + '$stateProvider', + function ($stateProvider) { + $stateProvider + .state('partners', { + url: '/partners', + templateUrl: '/static/payment/partner/templates/partners.html', + controller: 'partnerListCtrl', + data: {label: '商户列表'}, + }) + .state('businessCompliance', { + url: '/partners/compliance', + templateUrl: '/static/payment/partner/templates/partner_compliance.html', + controller: 'compliancePartnerCtrl', + }) + .state('complianceDocumentAudit', { + url: '/partners/compliance', + templateUrl: '/static/payment/partner/templates/partner_compliance.html', + controller: 'compliancePartnerCtrl', + }) + .state('partners.detail', { + url: '/{clientMoniker}/detail', + templateUrl: '/static/payment/partner/templates/partner_detail.html', + controller: 'partnerDetailCtrl', + resolve: { + partner: [ + '$http', + '$stateParams', + function ($http, $stateParams) { + return $http.get('/sys/partners/' + $stateParams.clientMoniker) + }, + ], + }, + }) + .state('partners.detail.payment_info', { + url: '/payment', + templateUrl: '/static/payment/partner/templates/partner_payment_info.html', + controller: 'partnerPaymentInfoCtrl', + }) + .state('partners.detail.payment_info_invalid', { + url: '/payment_invalid', + templateUrl: '/static/payment/partner/templates/partner_payment_info_invalid.html', + controller: 'partnerPaymentInfoCtrl', + }) + .state('partners.detail.subpartners', { + url: '/sub_partners', + templateUrl: '/static/payment/partner/templates/sub_partners.html', + controller: 'partnerSubCtrl', + }) + .state('partners.detail.accounts', { + url: '/accounts', + templateUrl: '/static/payment/partner/templates/partner_accounts.html', + controller: 'partnerAccountsCtrl', + }) + .state('partners.detail.paylogs', { + url: '/pay_logs', + templateUrl: '/static/payment/partner/templates/partner_pay_logs.html', + controller: 'partnerPayLogCtrl', + }) + .state('partners.detail.rates', { + url: '/rates', + templateUrl: '/static/payment/partner/templates/partner_bankaccounts.html', + controller: 'partnerRatesCtrl', + }) + .state('partners.detail.plugins', { + url: '/plugins', + templateUrl: '/static/payment/partner/templates/partner_plugins.html', + controller: 'partnerPluginsCtrl', + }) + .state('partners.detail.devices', { + url: '/devices', + templateUrl: '/static/payment/partner/templates/partner_devices.html', + controller: 'partnerDeviceCtrl', + }) + .state('partners.detail.files', { + url: '/files', + params: {commitType: 'cross-border'}, + templateUrl: '/static/payment/partner/templates/partner_auth_files.html', + controller: 'partnerAuthFileCtrl', + }) + .state('partners.detail.files.CP_files', { + url: '/cp_files', + templateUrl: '/static/payment/partner/templates/partner_cp_auth_files.html', + controller: 'partnerCPAuthFileCtrl', + resolve: { + file: [ + '$http', + '$stateParams', + function ($http, $stateParams) { + return $http.get('/sys/partners/' + $stateParams.clientMoniker + '/file') + }, + ], + }, + }) + .state('partners.detail.files.MW_files', { + url: '/mw_files', + templateUrl: '/static/payment/partner/templates/partner_mw_auth_files.html', + controller: 'partnerMWAuthFileCtrl', + resolve: { + file: [ + '$http', + '$stateParams', + function ($http, $stateParams) { + return $http.get('/sys/partners/' + $stateParams.clientMoniker + '/mw_file') + }, + ], + }, + }) + .state('partners.detail.kyc_files', { + url: '/kyc_files', + templateUrl: '/static/payment/kyc/templates/partner_kyc_files.html', + controller: 'partnerKycFileCtrl', + resolve: { + file: [ + '$http', + '$stateParams', + function ($http, $stateParams) { + return $http.get('/sys/partners/' + $stateParams.clientMoniker + '/kycFile') + }, + ], + }, + }) + .state('partners.detail.settlement', { + url: '/settlement', + templateUrl: '/static/payment/partner/templates/partner_settlement.html', + controller: 'partnerSettlementCtrl', + resolve: { + clientMoniker: [ + '$stateParams', + function ($stateParams) { + return $stateParams.clientMoniker + }, + ], + }, + }) + .state('partners.detail.surcharge_account', { + url: '/surcharge_account', + templateUrl: '/static/payment/partner/templates/partner_surcharge_account.html', + controller: 'partnerSurchargeAccountCtrl', + resolve: { + clientMoniker: [ + '$stateParams', + function ($stateParams) { + return $stateParams.clientMoniker + }, + ], + }, + }) + .state('partners.detail.product', { + url: '/partner_product', + templateUrl: 'static/payment/product/templates/partner_product.html', + controller: 'productCtrl', + }) + .state('partners.detail.sub_merchant_applicaitons', { + url: '/sub_merchant_applicaitons', + templateUrl: 'static/payment/partner/templates/sub_merchant_id_apply.html', + controller: 'subMerchantIdApplicaitonsCtrl', + }) + .state('partners.detail.permission_client', { + url: '/permission_client', + templateUrl: 'static/payment/partner/templates/partner_permission.html', + controller: 'permissionClientCtrl', + }) + .state('partners.detail.incremental_service', { + url: '/incremental_service', + templateUrl: 'static/payment/partner/templates/incremental_service.html', + controller: 'incrementalServiceCtrl', + }) /*.state('partners.edit', { url: '/{clientMoniker}/edit', params: {"commitCardPayment": false, "commitCrossBorderPayment": false}, templateUrl: 'static/payment/partner/templates/partner_edit.html', @@ -465,4326 +465,4396 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }] } })*/ - }, - ]) - app.controller('partnerEditCtrl', [ - '$scope', - '$http', - '$state', - 'Upload', - 'commonDialog', - 'timezone', - 'partner', - 'upayIndustryMap', - function ($scope, $http, $state, Upload, commonDialog, timezone, partner, upayIndustryMap) { - $scope.upayIndustrys = upayIndustryMap.configs() - $scope.timezones = timezone.configs() - $scope.partner = partner.data - if (!$scope.partner.client_type) { - $scope.partner.client_type = 'cross-border' - } - if ($scope.partner.representativeInfo != null) { - $scope.partner.registered_address = $scope.partner.representativeInfo.address - $scope.partner.registered_suburb = $scope.partner.representativeInfo.suburb - $scope.partner.registered_postcode = $scope.partner.representativeInfo.postcode - $scope.partner.registered_state = $scope.partner.representativeInfo.state - $scope.partner.legal_representative_person = $scope.partner.representativeInfo.representative_person - $scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone - $scope.partner.legal_representative_email = $scope.partner.representativeInfo.email - $scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title - - $scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person - $scope.partner.marketing_phone = $scope.partner.representativeInfo.marketing_phone - $scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email - $scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title - - $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.legal_representative_wechatid - $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid - } - - $scope.enablePaymentType = function (type) { - $scope.partner[type] = !$scope.partner[type] - } - - if ($state.params.commitCardPayment) { - $scope.enablePaymentType('enable_card_payment') - } - - if ($state.params.commitCrossBorderPayment) { - $scope.enablePaymentType('enable_cross_payment') - } - - function hasRole() { - var rolenum - switch (sessionStorage.getItem('role')) { - case 'administrator': - rolenum = 1 - break - case 'bduser': - rolenum = 4 - break - case 'salesmanager': - rolenum = 8192 - break - case 'accountant': - rolenum = 8 - break - case 'sitemanager': - rolenum = 128 - break - case 'director': - rolenum = 64 - break - case 'developer': - rolenum = 256 - break - case 'compliance': - rolenum = 2 - break - case 'guest': - rolenum = 2048 - break - case 'orgmanager': - rolenum = 4096 - break - case 'riskmanager': - rolenum = 1024 - break - default: - break - } - if ((window.currentUser.role & rolenum) > 0) { - return true - } else { - sessionStorage.removeItem('role') - return false - } - } + }, + ]) + app.controller('partnerEditCtrl', [ + '$scope', + '$http', + '$state', + 'Upload', + 'commonDialog', + 'timezone', + 'partner', + 'upayIndustryMap', + function ($scope, $http, $state, Upload, commonDialog, timezone, partner, upayIndustryMap) { + $scope.upayIndustrys = upayIndustryMap.configs() + $scope.timezones = timezone.configs() + $scope.partner = partner.data + if (!$scope.partner.client_type) { + $scope.partner.client_type = 'cross-border' + } + if ($scope.partner.representativeInfo != null) { + $scope.partner.registered_address = $scope.partner.representativeInfo.address + $scope.partner.registered_suburb = $scope.partner.representativeInfo.suburb + $scope.partner.registered_postcode = $scope.partner.representativeInfo.postcode + $scope.partner.registered_state = $scope.partner.representativeInfo.state + $scope.partner.legal_representative_person = $scope.partner.representativeInfo.representative_person + $scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone + $scope.partner.legal_representative_email = $scope.partner.representativeInfo.email + $scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title + + $scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person + $scope.partner.marketing_phone = $scope.partner.representativeInfo.marketing_phone + $scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email + $scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title + + $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.legal_representative_wechatid + $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid + } - if (hasRole()) { - $scope.role = sessionStorage.getItem('role') - } + $scope.enablePaymentType = function (type) { + $scope.partner[type] = !$scope.partner[type] + } - var origin_referrer_id = angular.copy($scope.partner.referrer_id) - var resetClientPayDescByTpey = function (type) { - type = parseInt(type) - if (type == 1) { - removeClientPayDesc($scope.partner.client_pay_desc, '10') - } - if (type == 2) { - removeClientPayDesc($scope.partner.client_pay_desc, '20') - } - } - var compare = function (x, y) { - x = parseInt(x) - y = parseInt(y) - if (x < y) { - return -1 - } else if (x > y) { - return 1 - } else { - return 0 - } - } - $scope.toggleClientPayType = function (type) { - if (!$scope.partner.client_pay_type) { - $scope.partner.client_pay_type = [] - } - var $idx = $scope.partner.client_pay_type.indexOf(type) - if ($idx >= 0) { - $scope.partner.client_pay_type.splice($idx, 1) - resetClientPayDescByTpey(type) - } else { - $scope.partner.client_pay_type.push(type) - $scope.partner.client_pay_type.sort(compare) - } - } - $scope.toggleClientPayDesc = function (type) { - if (!$scope.partner.client_pay_desc) { - $scope.partner.client_pay_desc = [] - } - var $idx = $scope.partner.client_pay_desc.indexOf(type) - if ($idx >= 0) { - if (type == '203') { - removeClientPayDesc($scope.partner.client_pay_desc, '2030') - } - $scope.partner.client_pay_desc.splice($idx, 1) - } else { - $scope.partner.client_pay_desc.push(type) - $scope.partner.client_pay_desc.sort(compare) - } - } - - $scope.partner.sameAsContactPerson = false - $scope.checkboxOnclick = function () { - $scope.partner.sameAsContactPerson = !$scope.partner.sameAsContactPerson - if ($scope.partner.sameAsContactPerson) { - $scope.partner.legal_representative_person = $scope.partner.contact_person - $scope.partner.legal_representative_phone = $scope.partner.contact_phone - $scope.partner.legal_representative_email = $scope.partner.contact_email - $scope.partner.legal_representative_job = $scope.partner.contact_job - $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid - } - } - - $scope.partner.marketingSameAsContact = false - $scope.checkMarketingSameAsContact = function () { - $scope.partner.marketingSameAsContact = !$scope.partner.marketingSameAsContact - if ($scope.partner.marketingSameAsContact) { - $scope.partner.marketing_person = $scope.partner.contact_person - $scope.partner.marketing_phone = $scope.partner.contact_phone - $scope.partner.marketing_email = $scope.partner.contact_email - $scope.partner.marketing_job = $scope.partner.contact_job - $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid - } - } - - $scope.partner.sameAsAddress = false - $scope.sameAddress = function () { - $scope.partner.sameAsAddress = !$scope.partner.sameAsAddress - if ($scope.partner.sameAsAddress) { - // $scope.partner.registered_address = $scope.partner.address; - // $scope.partner.registered_suburb = $scope.partner.suburb; - // $scope.partner.registered_postcode = $scope.partner.postcode; - // $scope.partner.registered_state = $scope.partner.state; - $scope.partner.address = $scope.partner.registered_address - $scope.partner.suburb = $scope.partner.registered_suburb - $scope.partner.postcode = $scope.partner.registered_postcode - $scope.partner.state = $scope.partner.registered_state - } - } - - $scope.listReferrers = function () { - $http.get('/sys/orgs/referrer').then(function (resp) { - $scope.referrers = resp.data - }) - } - $scope.listReferrers() - - $scope.loadAlipayCategory = function () { - $http.get('/static/data/alipayMcc.json').then(function (resp) { - $scope.alipayMccCategory = resp.data - }) - } - $scope.loadAlipayCategory() - $scope.loadJDindustry = function () { - $http.get('/static/data/jdindustry.json').then(function (resp) { - $scope.jdindustry = resp.data - }) - } - $scope.loadJDindustry() - - $scope.loadLakalaPayindustry = function () { - $http.get('/static/data/lakalapayindustry.json').then(function (resp) { - $scope.lakalapayindustry = resp.data - }) - } - $scope.loadLakalaPayindustry() - - $scope.loadLakalaPaySettle = function () { - $http.get('/static/data/lakalapaysettle.json').then(function (resp) { - $scope.lakalapaysettle = resp.data - }) - } - $scope.loadLakalaPaySettle() - - $scope.loadLakalaPayGoods = function () { - $http.get('/static/data/lakalapaygoods.json').then(function (resp) { - $scope.lakalapaygoods = resp.data - }) - } - $scope.loadLakalaPayGoods() - - $scope.loadRoyalpayindustry = function () { - $http.get('/static/data/royalpayindustry.json').then(function (resp) { - $scope.royalpayindustry = resp.data - }) - } - $scope.loadRoyalpayindustry() - - $scope.loadHfindustry = function () { - $http.get('/static/data/hfindustry.json').then(function (resp) { - $scope.hfindustry = resp.data - }) - } - $scope.loadHfindustry() - - $scope.onAlipayMccSelect = function (selectedItem) { - $scope.partner.alipay_category = selectedItem.label - $scope.partner.alipayindustry = selectedItem.mccCode - } - $scope.onRoyalPayIndustrySelect = function (selectedItem) { - $scope.partner.royalpay_label = selectedItem.label - $scope.partner.royalpayindustry = selectedItem.mccCode - } - $scope.onHfIndustrySelect = function (selectedItem) { - $scope.partner.hf_label = selectedItem.label - $scope.partner.hfindustry = selectedItem.mccCode - } - - $scope.updatePartner = function (form) { - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } + if ($state.params.commitCardPayment) { + $scope.enablePaymentType('enable_card_payment') + } - if ($scope.partner.company_name.indexOf('Migration') != -1) { - alert('Company Name包含敏感词汇，请检查后重新提交！') - return - } - if ($scope.partner.company_phone.indexOf(' ') != -1) { - alert('Company Phone can not contain space character') - return - } - if ($scope.partner.contact_email.indexOf(' ') != -1) { - alert('Contact email Phone can not contain space character') - return - } - if ($scope.partner.suburb.indexOf(' ') != -1) { - alert('suburb can not contain two and more continuous space characters') - return - } - if ($scope.partner.client_pay_type.indexOf('2') >= 0) { - if (!$scope.partner.company_photo) { - alert('Shop Photo1 is necessary') - return - } - if (!$scope.partner.store_photo) { - alert('Shop Photo2 is necessary') - return - } - } + if ($state.params.commitCrossBorderPayment) { + $scope.enablePaymentType('enable_cross_payment') + } - if ($scope.partner.acn && $scope.partner.business_structure == 'Company') { - if ($scope.partner.acn.length != 9) { - alert('Acn is not valid') - } - } - if ($scope.partner.referrer_id) { - $scope.referrers.forEach(function (e) { - if ($scope.partner.referrer_id == e.org_id) { - $scope.partner.referrer_name = e.name - return + function hasRole() { + var rolenum + switch (sessionStorage.getItem('role')) { + case 'administrator': + rolenum = 1 + break + case 'bduser': + rolenum = 4 + break + case 'salesmanager': + rolenum = 8192 + break + case 'accountant': + rolenum = 8 + break + case 'sitemanager': + rolenum = 128 + break + case 'director': + rolenum = 64 + break + case 'developer': + rolenum = 256 + break + case 'compliance': + rolenum = 2 + break + case 'guest': + rolenum = 2048 + break + case 'orgmanager': + rolenum = 4096 + break + case 'riskmanager': + rolenum = 1024 + break + default: + break + } + if ((window.currentUser.role & rolenum) > 0) { + return true + } else { + sessionStorage.removeItem('role') + return false + } } - }) - } - var content = '' - if (!origin_referrer_id && $scope.partner.referrer_id) { - content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!' - } - if ($scope.partner.client_pay_type.length == 0) { - alert('请选择商户支付场景') - return - } - if ($scope.partner.client_pay_desc.length == 0) { - alert('请选择商户支付方式') - return - } - if ($scope.partner.client_pay_type.indexOf('1') >= 0) { - if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) { - alert('请检查线上支付场景是否已选择支付方式') - return - } - } - if ($scope.partner.client_pay_type.indexOf('2') >= 0) { - if ($scope.partner.client_pay_desc.join(',').indexOf('20') < 0) { - alert('请检查线下支付场景是否已选择支付方式') - return - } - } - if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) { - if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) { - alert('请检查线下支付是否已选择收银系统类型') - return - } - } - $scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',') - $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',') - $http.put('/sys/partners/' + $scope.partner.client_moniker, $scope.partner).then( - function () { - if (content != '') { - commonDialog.alert({ - title: 'Warning', - content: content, - type: 'error', - }) - } else { - commonDialog.alert({ - title: 'Success', - content: 'Update partner information successfully', - type: 'success', - }) - } - $scope.updateMerchantLocation() - $scope.loadPartners() - $state.go('^.detail', { clientMoniker: $scope.partner.client_moniker }, { reload: true }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.uploadLogo = function (file) { - if (file != null) { - if (file.size > 1 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error' }) - } else { - $scope.logoProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.logoProgress - $scope.partner.logo_id = resp.data.fileid - $scope.partner.logo_url = resp.data.url - }, - function (resp) { - delete $scope.logoProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.logoProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.uploadShopPhoto = function (file) { - if (file != null) { - if (file.size > 2 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error' }) - } else { - $scope.shopPhotoProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.shopPhotoProgress - $scope.partner.company_photo = resp.data.url - }, - function (resp) { - delete $scope.shopPhotoProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.shopPhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.uploadStorePhoto = function (file) { - if (file != null) { - if (file.size > 2 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error' }) - } else { - $scope.storePhotoProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.storePhotoProgress - $scope.partner.store_photo = resp.data.url - }, - function (resp) { - delete $scope.storePhotoProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.storePhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.getMerchantLocation = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) { - $scope.merchant_location = resp.data - }) - } - $scope.getMerchantLocation() - - $scope.updateMerchantLocation = function () { - var params = window.frames['merchant_detail'].merchant_location - if (params) { - $http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () {}) - } - } - }, - ]) - app.controller('partnerListCtrl', [ - '$scope', - '$sce', - '$http', - '$filter', - '$uibModal', - 'businessStructuresMap', - 'industryMap', - 'stateMap', - 'sectorMap', - 'countryMap', - function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { - $scope.analysisClients = function () { - $http.get('/sys/partners/analysis').then(function (resp) { - $scope.analysis = resp.data - }) - } - if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) { - $scope.analysisClients() - } - $scope.pagination = {} - $scope.industries = industryMap.configs() - $scope.states = stateMap.configs() - $scope.countries = countryMap.configs() - $scope.sectors = sectorMap.configs() - $scope.business_structures = businessStructuresMap.configs() - $scope.clean_days = angular.copy(clean_days_map) - $scope.bd_citys = angular.copy(bd_city_map) - $scope.params = { textType: 'all', org_name: 'ALL', industry: '0' } - $scope.loadRoyalpayindustry = function () { - $http.get('/static/data/royalpayindustry.json').then(function (resp) { - $scope.royalpayindustry = resp.data - var selectAll = { - label: 'All', - mccCode: '0', - children: {}, - } - $scope.royalpayindustry.unshift(selectAll) - }) - } - - $scope.loadRoyalpayindustry() - - $scope.onRoyalPayIndustrySelect = function (selectedItem) { - $scope.params.royalpay_label = selectedItem.label - $scope.params.industry = selectedItem.mccCode - $scope.loadPartners(1) - } - - $scope.loadPartners = function (page) { - var params = angular.copy($scope.params) - params.page = page || $scope.pagination.page || 1 - $http.get('/sys/partners', { params: params }).then(function (resp) { - $scope.partners = resp.data.data - $scope.pagination = resp.data.pagination - }) - } - - $scope.exportPartnersExcel = function () { - var params = angular.copy($scope.params) - var param_str = Object.keys(params) - .map(function (key) { - var value = params[key] - if (angular.isDate(value)) { - value = $filter('date')(value, 'yyyy-MM-ddTHH:mm:ssZ') - } - return key + '=' + encodeURIComponent(value) - }) - .join('&') - window.open('/sys/partners/exporting_excel?' + param_str) - } - - /*$scope.loadLocations = function () { - var params = angular.copy($scope.params); - $http.get('/sys/partners/merchant/list_locations', {params: params}).then(function (resp) { - $scope.locations = resp.data; - window.merchant_maps.initMap($scope.locations); - }); - };*/ - $scope.today = new Date() - - $scope.listBDUsers = function () { - $http.get('/sys/manager_accounts/roles/bd_user').then(function (resp) { - $scope.bdUserSource = resp.data - }) - } - $scope.listBDUsers() - - if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { - $scope.showOrg = 'Organization' - $http.get('/sys/orgs/list_all_Org', { params: {} }).then(function (resp) { - $scope.orgs = resp.data - }) - } - - $scope.loadOrgs = function () { - var params = angular.copy($scope.params) - $http.get('/sys/orgs/orgChild', { params: params }).then(function (resp) { - $scope.orgs_child = resp.data - }) - } - $scope.loadOrgs() - - /* $scope.onOrgsSelect = function (selectedItem) { - $scope.params.org_id = selectedItem.org_id; - $scope.params.org_name = selectedItem.label; - $scope.loadPartners(); - }; - */ - /* $scope.chooseOrg = function (org) { - if (org == 'all') { - delete $scope.params.org_id; - $scope.showOrg = 'All' - } else { - $scope.params.org_id = org.org_id; - $scope.showOrg = org.name; - } - $scope.loadPartners(1); - };*/ - $scope.loadPartners(1) - - $scope.openClientBoard = function (client) { - $uibModal.open({ - templateUrl: '/static/analysis/templates/partner_card.html', - controller: 'partnerCardCtrl', - resolve: { - clientMoniker: function () { - return client.client_moniker - }, - }, - size: 'lg', - }) - } - /*$scope.toogleMapSelect = function () { - $scope.mapFrame = 'all_locations.html'; - $scope.loadLocations(); + if (hasRole()) { + $scope.role = sessionStorage.getItem('role') } - $scope.toogleMerchantSelect = function () { - $scope.mapFrame = null; + + var origin_referrer_id = angular.copy($scope.partner.referrer_id) + var resetClientPayDescByTpey = function (type) { + type = parseInt(type) + if (type == 1) { + removeClientPayDesc($scope.partner.client_pay_desc, '10') + } + if (type == 2) { + removeClientPayDesc($scope.partner.client_pay_desc, '20') + } } - $scope.toogleMerchantSelect();*/ - }, - ]) - app.controller('compliancePartnerCtrl', [ - '$scope', - '$sce', - '$http', - '$filter', - '$uibModal', - 'businessStructuresMap', - 'industryMap', - 'stateMap', - 'sectorMap', - 'countryMap', - function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { - $scope.analysisClients = function () { - $http.get('/sys/partners/analysis').then(function (resp) { - $scope.analysis = resp.data - }) - } - if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) { - $scope.analysisClients() - } - $scope.pagination = {} - $scope.industries = industryMap.configs() - $scope.states = stateMap.configs() - $scope.countries = countryMap.configs() - $scope.sectors = sectorMap.configs() - $scope.business_structures = businessStructuresMap.configs() - $scope.clean_days = angular.copy(clean_days_map) - $scope.bd_citys = angular.copy(bd_city_map) - $scope.params = { textType: 'all', org_name: 'ALL', approving_flag: false, card_approving_flag: false } - - $scope.loadPartners = function (page) { - $scope.validAndCleanApproveStatus() - var params = angular.copy($scope.params) - params.page = page || $scope.pagination.page || 1 - $http.get('/sys/partners/compliance', { params: params }).then(function (resp) { - $scope.partners = resp.data.data - $scope.pagination = resp.data.pagination - }) - } - - $scope.validAndCleanApproveStatus = function () { - if (!$scope.params.cross_approving_flag && !$scope.params.card_approving_flag) { - $scope.params.approving = false - $scope.params.card_approving = false - $scope.params.waitingCompliance = false - $scope.params.tempMchId = false - $scope.params.bd_upload_material = false - $scope.params.quickPass = false - $scope.params.greenChannel = false - $scope.params.pass = false - $scope.params.completed_contract = false - $scope.params.apply_to_back = false - $scope.params.is_valid = false - } - if (!$scope.params.cross_approving_flag && $scope.params.card_approving_flag) { - $scope.params.tempMchId = false - $scope.params.quickPass = false - $scope.params.greenChannel = false - } - } - - $scope.today = new Date() - - $scope.listBDUsers = function () { - $http.get('/sys/manager_accounts/roles/bd_user').then(function (resp) { - $scope.bdUserSource = resp.data - }) - } - $scope.listBDUsers() - - if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { - $scope.showOrg = 'Organization' - $http.get('/sys/orgs/list_all_Org', { params: {} }).then(function (resp) { - $scope.orgs = resp.data - }) - } - - $scope.loadOrgs = function () { - var params = angular.copy($scope.params) - $http.get('/sys/orgs/orgChild', { params: params }).then(function (resp) { - $scope.orgs_child = resp.data - }) - } - $scope.loadOrgs() - - $scope.loadPartners(1) - - $scope.openClientBoard = function (client) { - $uibModal.open({ - templateUrl: '/static/analysis/templates/partner_card.html', - controller: 'partnerCardCtrl', - resolve: { - clientMoniker: function () { - return client.client_moniker - }, - }, - size: 'lg', - }) - } - }, - ]) - app.controller('partnerDetailCtrl', [ - '$scope', - '$http', - '$state', - '$uibModal', - '$rootScope', - 'Upload', - 'commonDialog', - 'partner', - '$sce', - function ($scope, $http, $state, $uibModal, $rootScope, Upload, commonDialog, partner, $sce) { - $scope.init = { wechat_compliance: false, local_merchant: false } - $scope.partner = partner.data - $scope.isComplianceOfCompanyName = false - $scope.isComplianceOfShortName = false - $scope.isComplianceOfBusinessStructure = false - $scope.cardPromotionaparams = {} - if ($scope.partner.mc_code) { - $scope.partner.mc_code = parseInt($scope.partner.mc_code) - } - var website = partner.data.company_website - if (website != null) { - if (website.indexOf('http') !== 0) { - $scope.partner.company_website = 'http://' + angular.copy(website) - } - } - $scope.decideCompliance = function (name) { - var keywords = ['education', 'financial', 'train', 'immigrant', 'invest', '律师咨询', '会计事务所', '移民', '留学', '娱乐', '金融', '地产', '投资'] - for (var i = 0; i < keywords.length; i++) { - if (name.indexOf(keywords[i]) !== -1) { - return true - } - } - return false - } - if (partner.data.company_name != null) { - $scope.isComplianceOfCompanyName = $scope.decideCompliance(partner.data.company_name) - } - if (partner.data.short_name != null) { - $scope.isComplianceOfShortName = $scope.decideCompliance(partner.data.short_name) - } - if (partner.data.business_structure != null) { - $scope.isComplianceOfBusinessStructure = $scope.decideCompliance(partner.data.business_structure) - } - $scope.showDBUsers = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bd_user').then(function (resp) { - $scope.partner.client_bds = resp.data - }) - } - $scope.showDBUsers() - $scope.showFile = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_agree_file').then(function (resp) { - $scope.fileManager = resp.data - }) - } - - $scope.showCardFile = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_card_agree_file?fileName=letter_of_offer_file').then(function (resp) { - $scope.letterOfOfferFileManager = resp.data - }) - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_card_agree_file?fileName=promotional_offer_file').then(function (resp) { - $scope.promotionalOfferFileManager = resp.data - }) - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_card_agree_file?fileName=terms_and_conditions_file').then(function (resp) { - $scope.termsAndConditionsFile = resp.data - }) - } - - $scope.showFile() - $scope.showCardFile() - $scope.passClient = function () { - if (!$rootScope.complianceCheck) { - alert('please check first') - return - } - if (!$rootScope.complianceCheck.authFile) { - alert('Compliance Files not checked') - return - } - if (!$rootScope.complianceCheck.clientInfo) { - alert('Partner Detail not checked') - return - } - if (!$rootScope.complianceCheck.bankAccount) { - alert('Bank Account not checked') - return - } - var title = 'Audit Partner' - var content = 'Are you sure to mark partner ' + $scope.partner.company_name + ' audited？' - var choises = '' - var contentHtml = '' - if ($scope.isComplianceOfCompanyName || $scope.isComplianceOfShortName || $scope.isComplianceOfBusinessStructure) { - var info = [] - if ($scope.isComplianceOfCompanyName) { - info.push('Company Name') - } - if ($scope.isComplianceOfShortName) { - info.push('Short Name') - } - if ($scope.isComplianceOfBusinessStructure) { - info.push('Business Structure') - } - title = 'Warning' - contentHtml = $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],' + info.toString() + '存在微信渠道不合规信息') - choises = [ - { label: '取消', className: 'btn-danger', key: '2', dismiss: true }, - { label: '确认提交', className: 'btn-success', key: '1' }, - ] - content = '' - } - commonDialog - .confirm({ - title: title, - content: content, - choises: choises, - contentHtml: contentHtml, - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit', { pass: 1 }).then( - function () { - if ($scope.partner.approve_result == 2 && ($scope.partner.source == 1 || $scope.partner.source == 2)) { - commonDialog.alert({ - title: 'Success', - content: 'Comply Passed!', - type: 'success', - }) + var compare = function (x, y) { + x = parseInt(x) + y = parseInt(y) + if (x < y) { + return -1 + } else if (x > y) { + return 1 } else { - commonDialog.alert({ - title: 'Success', - content: 'Comply Passed! Email will send to contact email address soon.', - type: 'success', - }) + return 0 } - delete $rootScope.complianceCheck - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.passCardClient = function () { - if (!$rootScope.complianceCheck) { - alert('please check first') - return - } - if (!$rootScope.complianceCheck.authFile) { - alert('Compliance Files not checked') - return - } - if (!$rootScope.complianceCheck.clientInfo) { - alert('Partner Detail not checked') - return - } - if (!$rootScope.complianceCheck.bankAccount) { - alert('Bank Account not checked') - return - } - var title = 'Audit Partner Card' - var content = 'Are you sure to mark partner ' + $scope.partner.company_name + ' audited？' - var choises = '' - var contentHtml = '' - if ($scope.isComplianceOfCompanyName || $scope.isComplianceOfShortName || $scope.isComplianceOfBusinessStructure) { - var info = [] - if ($scope.isComplianceOfCompanyName) { - info.push('Company Name') - } - if ($scope.isComplianceOfShortName) { - info.push('Short Name') - } - if ($scope.isComplianceOfBusinessStructure) { - info.push('Business Structure') - } - title = 'Warning' - contentHtml = $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],' + info.toString() + '存在微信渠道不合规信息') - choises = [ - { label: '取消', className: 'btn-danger', key: '2', dismiss: true }, - { label: '确认提交', className: 'btn-success', key: '1' }, - ] - content = '' - } - commonDialog - .confirm({ - title: title, - content: content, - choises: choises, - contentHtml: contentHtml, - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/card_audit', { pass: 1 }).then( - function () { - if ($scope.partner.approve_result == 2 && ($scope.partner.source == 1 || $scope.partner.source == 2)) { - commonDialog.alert({ - title: 'Success', - content: 'Comply Passed!', - type: 'success', - }) + } + $scope.toggleClientPayType = function (type) { + if (!$scope.partner.client_pay_type) { + $scope.partner.client_pay_type = [] + } + var $idx = $scope.partner.client_pay_type.indexOf(type) + if ($idx >= 0) { + $scope.partner.client_pay_type.splice($idx, 1) + resetClientPayDescByTpey(type) } else { - commonDialog.alert({ - title: 'Success', - content: 'Comply Passed! Email will send to contact email address soon.', - type: 'success', - }) + $scope.partner.client_pay_type.push(type) + $scope.partner.client_pay_type.sort(compare) } - delete $rootScope.complianceCheck - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.pass2GreenChannel = function () { - commonDialog - .confirm({ - title: 'Green Channel Audit Partner', - content: 'Are you sure to mark partner ' + $scope.partner.company_name + ' green channel audited ？', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/aduit/green_channel').then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Comply Passed! Email will send to contact email address soon.', - type: 'success', + } + $scope.toggleClientPayDesc = function (type) { + if (!$scope.partner.client_pay_desc) { + $scope.partner.client_pay_desc = [] + } + var $idx = $scope.partner.client_pay_desc.indexOf(type) + if ($idx >= 0) { + if (type == '203') { + removeClientPayDesc($scope.partner.client_pay_desc, '2030') + } + $scope.partner.client_pay_desc.splice($idx, 1) + } else { + $scope.partner.client_pay_desc.push(type) + $scope.partner.client_pay_desc.sort(compare) + } + } + + $scope.partner.sameAsContactPerson = false + $scope.checkboxOnclick = function () { + $scope.partner.sameAsContactPerson = !$scope.partner.sameAsContactPerson + if ($scope.partner.sameAsContactPerson) { + $scope.partner.legal_representative_person = $scope.partner.contact_person + $scope.partner.legal_representative_phone = $scope.partner.contact_phone + $scope.partner.legal_representative_email = $scope.partner.contact_email + $scope.partner.legal_representative_job = $scope.partner.contact_job + $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid + } + } + + $scope.partner.marketingSameAsContact = false + $scope.checkMarketingSameAsContact = function () { + $scope.partner.marketingSameAsContact = !$scope.partner.marketingSameAsContact + if ($scope.partner.marketingSameAsContact) { + $scope.partner.marketing_person = $scope.partner.contact_person + $scope.partner.marketing_phone = $scope.partner.contact_phone + $scope.partner.marketing_email = $scope.partner.contact_email + $scope.partner.marketing_job = $scope.partner.contact_job + $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid + } + } + + $scope.partner.sameAsAddress = false + $scope.sameAddress = function () { + $scope.partner.sameAsAddress = !$scope.partner.sameAsAddress + if ($scope.partner.sameAsAddress) { + // $scope.partner.registered_address = $scope.partner.address; + // $scope.partner.registered_suburb = $scope.partner.suburb; + // $scope.partner.registered_postcode = $scope.partner.postcode; + // $scope.partner.registered_state = $scope.partner.state; + $scope.partner.address = $scope.partner.registered_address + $scope.partner.suburb = $scope.partner.registered_suburb + $scope.partner.postcode = $scope.partner.registered_postcode + $scope.partner.state = $scope.partner.registered_state + } + } + + $scope.listReferrers = function () { + $http.get('/sys/orgs/referrer').then(function (resp) { + $scope.referrers = resp.data }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.showBg = false - $scope.exportPDF = function () { - $scope.showBg = true - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/agreepdf').then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Agreement File Generate Succeed! Please notify BD!', - type: 'success', - }) - $scope.showBg = false - $state.reload() - }, - function (resp) { - $scope.showBg = false - $state.reload() - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.exportAgreegatePDF = function () { - $scope.showBg = true - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/aggregate/agreepdf').then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Agreement File Generate Succeed! Please notify BD!', - type: 'success', - }) - $scope.showBg = false - $state.reload() - }, - function (resp) { - $scope.showBg = false - $state.reload() - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - //制作卡支付合同 - $scope.exportCardAgreegatePDF = function () { - $scope.showBg = true - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/aggregate/card_agree_pdf').then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Agreement File Generate Succeed! Please notify BD!', - type: 'success', - }) - $scope.showBg = false - $state.reload() - }, - function (resp) { - $scope.showBg = false - $state.reload() - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.Export = function () { - var url = '/dev/' + $scope.partner.client_moniker + '/export/aggregate/agreepdf' - return url - } - $scope.uploadAgreeFile = function (file) { - if (file != null) { - if (file.size > 2 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error' }) - } else { - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.agree_file_import = resp.data.url - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/import/agreepdf', { source_agree_file: $scope.agree_file_import }).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Succeed Imported! Please notify BD', - type: 'success', - }) + } + $scope.listReferrers() + + $scope.loadAlipayCategory = function () { + $http.get('/static/data/alipayMcc.json').then(function (resp) { + $scope.alipayMccCategory = resp.data + }) + } + $scope.loadAlipayCategory() + $scope.loadJDindustry = function () { + $http.get('/static/data/jdindustry.json').then(function (resp) { + $scope.jdindustry = resp.data + }) + } + $scope.loadJDindustry() + + $scope.loadLakalaPayindustry = function () { + $http.get('/static/data/lakalapayindustry.json').then(function (resp) { + $scope.lakalapayindustry = resp.data + }) + } + $scope.loadLakalaPayindustry() + + $scope.loadLakalaPaySettle = function () { + $http.get('/static/data/lakalapaysettle.json').then(function (resp) { + $scope.lakalapaysettle = resp.data + }) + } + $scope.loadLakalaPaySettle() + + $scope.loadLakalaPayGoods = function () { + $http.get('/static/data/lakalapaygoods.json').then(function (resp) { + $scope.lakalapaygoods = resp.data + }) + } + $scope.loadLakalaPayGoods() + + $scope.loadRoyalpayindustry = function () { + $http.get('/static/data/royalpayindustry.json').then(function (resp) { + $scope.royalpayindustry = resp.data + }) + } + $scope.loadRoyalpayindustry() + + $scope.loadHfindustry = function () { + $http.get('/static/data/hfindustry.json').then(function (resp) { + $scope.hfindustry = resp.data + }) + } + $scope.loadHfindustry() + + $scope.onAlipayMccSelect = function (selectedItem) { + $scope.partner.alipay_category = selectedItem.label + $scope.partner.alipayindustry = selectedItem.mccCode + } + $scope.onRoyalPayIndustrySelect = function (selectedItem) { + $scope.partner.royalpay_label = selectedItem.label + $scope.partner.royalpayindustry = selectedItem.mccCode + } + $scope.onHfIndustrySelect = function (selectedItem) { + $scope.partner.hf_label = selectedItem.label + $scope.partner.hfindustry = selectedItem.mccCode + } + + $scope.updatePartner = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + + if ($scope.partner.company_name.indexOf('Migration') != -1) { + alert('Company Name包含敏感词汇，请检查后重新提交！') + return + } + if ($scope.partner.company_phone.indexOf(' ') != -1) { + alert('Company Phone can not contain space character') + return + } + if ($scope.partner.contact_email.indexOf(' ') != -1) { + alert('Contact email Phone can not contain space character') + return + } + if ($scope.partner.suburb.indexOf(' ') != -1) { + alert('suburb can not contain two and more continuous space characters') + return + } + if ($scope.partner.client_pay_type.indexOf('2') >= 0) { + if (!$scope.partner.company_photo) { + alert('Shop Photo1 is necessary') + return + } + if (!$scope.partner.store_photo) { + alert('Shop Photo2 is necessary') + return + } + } + + if ($scope.partner.acn && $scope.partner.business_structure == 'Company') { + if ($scope.partner.acn.length != 9) { + alert('Acn is not valid') + } + } + if ($scope.partner.referrer_id) { + $scope.referrers.forEach(function (e) { + if ($scope.partner.referrer_id == e.org_id) { + $scope.partner.referrer_name = e.name + return + } + }) + } + var content = '' + if (!origin_referrer_id && $scope.partner.referrer_id) { + content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!' + } + if ($scope.partner.client_pay_type.length == 0) { + alert('请选择商户支付场景') + return + } + if ($scope.partner.client_pay_desc.length == 0) { + alert('请选择商户支付方式') + return + } + if ($scope.partner.client_pay_type.indexOf('1') >= 0) { + if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) { + alert('请检查线上支付场景是否已选择支付方式') + return + } + } + if ($scope.partner.client_pay_type.indexOf('2') >= 0) { + if ($scope.partner.client_pay_desc.join(',').indexOf('20') < 0) { + alert('请检查线下支付场景是否已选择支付方式') + return + } + } + if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) { + if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) { + alert('请检查线下支付是否已选择收银系统类型') + return + } + } + $scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',') + $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',') + $http.put('/sys/partners/' + $scope.partner.client_moniker, $scope.partner).then( + function () { + if (content != '') { + commonDialog.alert({ + title: 'Warning', + content: content, + type: 'error', + }) + } else { + commonDialog.alert({ + title: 'Success', + content: 'Update partner information successfully', + type: 'success', + }) + } + $scope.updateMerchantLocation() + $scope.loadPartners() + $state.go('^.detail', {clientMoniker: $scope.partner.client_moniker}, {reload: true}) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.uploadLogo = function (file) { + if (file != null) { + if (file.size > 1 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'}) + } else { + $scope.logoProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.logoProgress + $scope.partner.logo_id = resp.data.fileid + $scope.partner.logo_url = resp.data.url + }, + function (resp) { + delete $scope.logoProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.logoProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.uploadShopPhoto = function (file) { + if (file != null) { + if (file.size > 2 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'}) + } else { + $scope.shopPhotoProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.shopPhotoProgress + $scope.partner.company_photo = resp.data.url + }, + function (resp) { + delete $scope.shopPhotoProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.shopPhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.uploadStorePhoto = function (file) { + if (file != null) { + if (file.size > 2 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'}) + } else { + $scope.storePhotoProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.storePhotoProgress + $scope.partner.store_photo = resp.data.url + }, + function (resp) { + delete $scope.storePhotoProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.storePhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.getMerchantLocation = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) { + $scope.merchant_location = resp.data + }) + } + $scope.getMerchantLocation() + + $scope.updateMerchantLocation = function () { + var params = window.frames['merchant_detail'].merchant_location + if (params) { + $http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () { + }) + } + } + }, + ]) + app.controller('partnerListCtrl', [ + '$scope', + '$sce', + '$http', + '$filter', + '$uibModal', + 'businessStructuresMap', + 'industryMap', + 'stateMap', + 'sectorMap', + 'countryMap', + function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { + $scope.analysisClients = function () { + $http.get('/sys/partners/analysis').then(function (resp) { + $scope.analysis = resp.data + }) + } + if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) { + $scope.analysisClients() + } + $scope.pagination = {} + $scope.industries = industryMap.configs() + $scope.states = stateMap.configs() + $scope.countries = countryMap.configs() + $scope.sectors = sectorMap.configs() + $scope.business_structures = businessStructuresMap.configs() + $scope.clean_days = angular.copy(clean_days_map) + $scope.bd_citys = angular.copy(bd_city_map) + $scope.params = {textType: 'all', org_name: 'ALL', industry: '0'} + $scope.loadRoyalpayindustry = function () { + $http.get('/static/data/royalpayindustry.json').then(function (resp) { + $scope.royalpayindustry = resp.data + var selectAll = { + label: 'All', + mccCode: '0', + children: {}, + } + $scope.royalpayindustry.unshift(selectAll) + }) + } + + $scope.loadRoyalpayindustry() + + $scope.onRoyalPayIndustrySelect = function (selectedItem) { + $scope.params.royalpay_label = selectedItem.label + $scope.params.industry = selectedItem.mccCode + $scope.loadPartners(1) + } + + $scope.loadPartners = function (page) { + var params = angular.copy($scope.params) + params.page = page || $scope.pagination.page || 1 + $http.get('/sys/partners', {params: params}).then(function (resp) { + $scope.partners = resp.data.data + $scope.pagination = resp.data.pagination + }) + } + + $scope.exportPartnersExcel = function () { + var params = angular.copy($scope.params) + var param_str = Object.keys(params) + .map(function (key) { + var value = params[key] + if (angular.isDate(value)) { + value = $filter('date')(value, 'yyyy-MM-ddTHH:mm:ssZ') + } + return key + '=' + encodeURIComponent(value) + }) + .join('&') + window.open('/sys/partners/exporting_excel?' + param_str) + } + + /*$scope.loadLocations = function () { + var params = angular.copy($scope.params); + $http.get('/sys/partners/merchant/list_locations', {params: params}).then(function (resp) { + $scope.locations = resp.data; + window.merchant_maps.initMap($scope.locations); + }); + };*/ + $scope.today = new Date() + + $scope.listBDUsers = function () { + $http.get('/sys/manager_accounts/roles/bd_user').then(function (resp) { + $scope.bdUserSource = resp.data + }) + } + $scope.listBDUsers() + + if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { + $scope.showOrg = 'Organization' + $http.get('/sys/orgs/list_all_Org', {params: {}}).then(function (resp) { + $scope.orgs = resp.data + }) + } + + $scope.loadOrgs = function () { + var params = angular.copy($scope.params) + $http.get('/sys/orgs/orgChild', {params: params}).then(function (resp) { + $scope.orgs_child = resp.data + }) + } + $scope.loadOrgs() + + /* $scope.onOrgsSelect = function (selectedItem) { + $scope.params.org_id = selectedItem.org_id; + $scope.params.org_name = selectedItem.label; + $scope.loadPartners(); + }; + */ + /* $scope.chooseOrg = function (org) { + if (org == 'all') { + delete $scope.params.org_id; + $scope.showOrg = 'All' + } else { + $scope.params.org_id = org.org_id; + $scope.showOrg = org.name; + } + $scope.loadPartners(1); + };*/ + + $scope.loadPartners(1) + + $scope.openClientBoard = function (client) { + $uibModal.open({ + templateUrl: '/static/analysis/templates/partner_card.html', + controller: 'partnerCardCtrl', + resolve: { + clientMoniker: function () { + return client.client_moniker + }, + }, + size: 'lg', + }) + } + /*$scope.toogleMapSelect = function () { + $scope.mapFrame = 'all_locations.html'; + $scope.loadLocations(); + } + $scope.toogleMerchantSelect = function () { + $scope.mapFrame = null; + } + $scope.toogleMerchantSelect();*/ + }, + ]) + app.controller('compliancePartnerCtrl', [ + '$scope', + '$sce', + '$http', + '$filter', + '$uibModal', + 'businessStructuresMap', + 'industryMap', + 'stateMap', + 'sectorMap', + 'countryMap', + function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { + $scope.analysisClients = function () { + $http.get('/sys/partners/analysis').then(function (resp) { + $scope.analysis = resp.data + }) + } + if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) { + $scope.analysisClients() + } + $scope.pagination = {} + $scope.industries = industryMap.configs() + $scope.states = stateMap.configs() + $scope.countries = countryMap.configs() + $scope.sectors = sectorMap.configs() + $scope.business_structures = businessStructuresMap.configs() + $scope.clean_days = angular.copy(clean_days_map) + $scope.bd_citys = angular.copy(bd_city_map) + $scope.params = {textType: 'all', org_name: 'ALL', approving_flag: false, card_approving_flag: false} + + $scope.loadPartners = function (page) { + $scope.validAndCleanApproveStatus() + var params = angular.copy($scope.params) + params.page = page || $scope.pagination.page || 1 + $http.get('/sys/partners/compliance', {params: params}).then(function (resp) { + $scope.partners = resp.data.data + $scope.pagination = resp.data.pagination + }) + } + + $scope.validAndCleanApproveStatus = function () { + if (!$scope.params.cross_approving_flag && !$scope.params.card_approving_flag) { + $scope.params.approving = false + $scope.params.card_approving = false + $scope.params.waitingCompliance = false + $scope.params.tempMchId = false + $scope.params.bd_upload_material = false + $scope.params.quickPass = false + $scope.params.greenChannel = false + $scope.params.pass = false + $scope.params.completed_contract = false + $scope.params.apply_to_back = false + $scope.params.is_valid = false + } + if (!$scope.params.cross_approving_flag && $scope.params.card_approving_flag) { + $scope.params.tempMchId = false + $scope.params.quickPass = false + $scope.params.greenChannel = false + } + } + + $scope.today = new Date() + + $scope.listBDUsers = function () { + $http.get('/sys/manager_accounts/roles/bd_user').then(function (resp) { + $scope.bdUserSource = resp.data + }) + } + $scope.listBDUsers() + + if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { + $scope.showOrg = 'Organization' + $http.get('/sys/orgs/list_all_Org', {params: {}}).then(function (resp) { + $scope.orgs = resp.data + }) + } + + $scope.loadOrgs = function () { + var params = angular.copy($scope.params) + $http.get('/sys/orgs/orgChild', {params: params}).then(function (resp) { + $scope.orgs_child = resp.data + }) + } + $scope.loadOrgs() + + $scope.loadPartners(1) + + $scope.openClientBoard = function (client) { + $uibModal.open({ + templateUrl: '/static/analysis/templates/partner_card.html', + controller: 'partnerCardCtrl', + resolve: { + clientMoniker: function () { + return client.client_moniker + }, + }, + size: 'lg', + }) + } + }, + ]) + app.controller('partnerDetailCtrl', [ + '$scope', + '$http', + '$state', + '$uibModal', + '$rootScope', + 'Upload', + 'commonDialog', + 'partner', + '$sce', + function ($scope, $http, $state, $uibModal, $rootScope, Upload, commonDialog, partner, $sce) { + $scope.init = {wechat_compliance: false, local_merchant: false} + $scope.partner = partner.data + $scope.isComplianceOfCompanyName = false + $scope.isComplianceOfShortName = false + $scope.isComplianceOfBusinessStructure = false + $scope.cardPromotionaparams = {} + if ($scope.partner.mc_code) { + $scope.partner.mc_code = parseInt($scope.partner.mc_code) + } + var website = partner.data.company_website + if (website != null) { + if (website.indexOf('http') !== 0) { + $scope.partner.company_website = 'http://' + angular.copy(website) + } + } + $scope.decideCompliance = function (name) { + var keywords = ['education', 'financial', 'train', 'immigrant', 'invest', '律师咨询', '会计事务所', '移民', '留学', '娱乐', '金融', '地产', '投资'] + for (var i = 0; i < keywords.length; i++) { + if (name.indexOf(keywords[i]) !== -1) { + return true + } + } + return false + } + if (partner.data.company_name != null) { + $scope.isComplianceOfCompanyName = $scope.decideCompliance(partner.data.company_name) + } + if (partner.data.short_name != null) { + $scope.isComplianceOfShortName = $scope.decideCompliance(partner.data.short_name) + } + if (partner.data.business_structure != null) { + $scope.isComplianceOfBusinessStructure = $scope.decideCompliance(partner.data.business_structure) + } + $scope.showDBUsers = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bd_user').then(function (resp) { + $scope.partner.client_bds = resp.data + }) + } + $scope.showDBUsers() + $scope.showFile = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_agree_file').then(function (resp) { + $scope.fileManager = resp.data + }) + } + + $scope.showCardFile = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_card_agree_file?fileName=letter_of_offer_file').then(function (resp) { + $scope.letterOfOfferFileManager = resp.data + }) + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_card_agree_file?fileName=promotional_offer_file').then(function (resp) { + $scope.promotionalOfferFileManager = resp.data + }) + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_card_agree_file?fileName=terms_and_conditions_file').then(function (resp) { + $scope.termsAndConditionsFile = resp.data + }) + } + + $scope.showFile() + $scope.showCardFile() + $scope.passClient = function () { + if (!$rootScope.complianceCheck) { + alert('please check first') + return + } + if (!$rootScope.complianceCheck.authFile) { + alert('Compliance Files not checked') + return + } + if (!$rootScope.complianceCheck.clientInfo) { + alert('Partner Detail not checked') + return + } + if (!$rootScope.complianceCheck.bankAccount) { + alert('Bank Account not checked') + return + } + var title = 'Audit Partner' + var content = 'Are you sure to mark partner ' + $scope.partner.company_name + ' audited？' + var choises = '' + var contentHtml = '' + if ($scope.isComplianceOfCompanyName || $scope.isComplianceOfShortName || $scope.isComplianceOfBusinessStructure) { + var info = [] + if ($scope.isComplianceOfCompanyName) { + info.push('Company Name') + } + if ($scope.isComplianceOfShortName) { + info.push('Short Name') + } + if ($scope.isComplianceOfBusinessStructure) { + info.push('Business Structure') + } + title = 'Warning' + contentHtml = $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],' + info.toString() + '存在微信渠道不合规信息') + choises = [ + {label: '取消', className: 'btn-danger', key: '2', dismiss: true}, + {label: '确认提交', className: 'btn-success', key: '1'}, + ] + content = '' + } + commonDialog + .confirm({ + title: title, + content: content, + choises: choises, + contentHtml: contentHtml, + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit', {pass: 1}).then( + function () { + if ($scope.partner.approve_result == 2 && ($scope.partner.source == 1 || $scope.partner.source == 2)) { + commonDialog.alert({ + title: 'Success', + content: 'Comply Passed!', + type: 'success', + }) + } else { + commonDialog.alert({ + title: 'Success', + content: 'Comply Passed! Email will send to contact email address soon.', + type: 'success', + }) + } + delete $rootScope.complianceCheck + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + $scope.passCardClient = function () { + if (!$rootScope.complianceCheck) { + alert('please check first') + return + } + if (!$rootScope.complianceCheck.authFile) { + alert('Compliance Files not checked') + return + } + if (!$rootScope.complianceCheck.clientInfo) { + alert('Partner Detail not checked') + return + } + if (!$rootScope.complianceCheck.bankAccount) { + alert('Bank Account not checked') + return + } + var title = 'Audit Partner Card' + var content = 'Are you sure to mark partner ' + $scope.partner.company_name + ' audited？' + var choises = '' + var contentHtml = '' + if ($scope.isComplianceOfCompanyName || $scope.isComplianceOfShortName || $scope.isComplianceOfBusinessStructure) { + var info = [] + if ($scope.isComplianceOfCompanyName) { + info.push('Company Name') + } + if ($scope.isComplianceOfShortName) { + info.push('Short Name') + } + if ($scope.isComplianceOfBusinessStructure) { + info.push('Business Structure') + } + title = 'Warning' + contentHtml = $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],' + info.toString() + '存在微信渠道不合规信息') + choises = [ + {label: '取消', className: 'btn-danger', key: '2', dismiss: true}, + {label: '确认提交', className: 'btn-success', key: '1'}, + ] + content = '' + } + commonDialog + .confirm({ + title: title, + content: content, + choises: choises, + contentHtml: contentHtml, + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/card_audit', {pass: 1}).then( + function () { + if ($scope.partner.approve_result == 2 && ($scope.partner.source == 1 || $scope.partner.source == 2)) { + commonDialog.alert({ + title: 'Success', + content: 'Comply Passed!', + type: 'success', + }) + } else { + commonDialog.alert({ + title: 'Success', + content: 'Comply Passed! Email will send to contact email address soon.', + type: 'success', + }) + } + delete $rootScope.complianceCheck + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + $scope.pass2GreenChannel = function () { + commonDialog + .confirm({ + title: 'Green Channel Audit Partner', + content: 'Are you sure to mark partner ' + $scope.partner.company_name + ' green channel audited ？', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/aduit/green_channel').then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Comply Passed! Email will send to contact email address soon.', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + $scope.showBg = false + $scope.exportPDF = function () { + $scope.showBg = true + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/agreepdf').then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Agreement File Generate Succeed! Please notify BD!', + type: 'success', + }) + $scope.showBg = false + $state.reload() + }, + function (resp) { + $scope.showBg = false + $state.reload() + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.exportAgreegatePDF = function () { + $scope.showBg = true + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/aggregate/agreepdf').then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Agreement File Generate Succeed! Please notify BD!', + type: 'success', + }) + $scope.showBg = false + $state.reload() + }, + function (resp) { + $scope.showBg = false + $state.reload() + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + //制作卡支付合同 + $scope.exportCardAgreegatePDF = function () { + $scope.showBg = true + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/export/aggregate/card_agree_pdf').then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Agreement File Generate Succeed! Please notify BD!', + type: 'success', + }) + $scope.showBg = false + $state.reload() + }, + function (resp) { + $scope.showBg = false + $state.reload() + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.Export = function () { + var url = '/dev/' + $scope.partner.client_moniker + '/export/aggregate/agreepdf' + return url + } + $scope.uploadAgreeFile = function (file) { + if (file != null) { + if (file.size > 2 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'}) + } else { + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.agree_file_import = resp.data.url + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/import/agreepdf', {source_agree_file: $scope.agree_file_import}).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Succeed Imported! Please notify BD', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }, + function (resp) { + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + } + ) + } + } + } + + $scope.uploadCardAgreeFile = function (file) { + if (file != null) { + if (file.size > 2 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'}) + } else { + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.agree_file_import = resp.data.url + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/import/agreepdf', {source_agree_file: $scope.agree_file_import}).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Succeed Imported! Please notify BD', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }, + function (resp) { + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + } + ) + } + } + } + $scope.notifyBD = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/notify/completeAgree').then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Notify BD Successed!.', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.cardNotifyBD = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/notify/cardCompleteAgree').then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Notify BD Successed!.', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.downTempPdf = function () { + return '/sys/partners/' + $scope.partner.client_moniker + '/temp/export/pdf' + } + + $scope.refuse = function () { + commonDialog.inputText({title: 'refuse cause'}).then(function (text) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/refuse', {refuse_remark: text}).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Audit application has been refused.', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + + $scope.cardRefuse = function () { + commonDialog.inputText({title: 'refuse cause'}).then(function (text) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/card_audit/refuse', {refuse_remark: text}).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Card Audit application has been refused.', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + + $scope.deleteClient = function () { + commonDialog + .confirm({ + title: 'Delete Partner', + content: 'Are you sure to delete ' + $scope.partner.company_name + '?', + }) + .then(function () { + $http.delete('/sys/partners/' + $scope.partner.client_moniker).then( + function () { + $state.go('^') + commonDialog.alert({ + title: 'Delete', + content: 'Partner Already Disabled', + type: 'error' + }) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + $scope.revertClient = function () { + commonDialog + .confirm({ + title: 'Revert Partner', + content: 'Are you sure to Revert ' + $scope.partner.company_name + '?', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/revert').then( + function () { + $state.go('^') + commonDialog.alert({ + title: 'Revert', + content: 'Partner Already Revert', + type: 'success' + }) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + + $scope.commitToCompliance = function () { + commonDialog + .confirm({ + title: 'Commit to Compliance', + content: 'Are you sure to commit ' + $scope.partner.company_name + ' to compliance？', + choises: [ + {label: 'Submit', className: 'btn-success', key: 1}, + {label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true}, + ], + }) + .then(function (choice) { + if (choice == 1) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/to_compliance', {}).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Commit to Compliance successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }) + } + + $scope.commitToCardCompliance = function () { + commonDialog + .confirm({ + title: 'Commit to Compliance', + content: 'Are you sure to commit ' + $scope.partner.company_name + ' to compliance？', + choises: [ + {label: 'Submit', className: 'btn-success', key: 1}, + {label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true}, + ], + }) + .then(function (choice) { + if (choice == 1) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/to_card_compliance', {}).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Commit to Compliance successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }) + } + $scope.apply2makeAgreeFile = function () { + if (!$scope.partner.enable_cross_payment) { + commonDialog.alert({ + title: 'Error!', + content: '请完善商户跨境支付基本信息、签约费率、合规文件!', + type: 'error', + }) + $state.go('partners.edit', { + clientMoniker: $scope.partner.client_moniker, + commitCardPayment: false, + commitCrossBorderPayment: true, + }) + return + } + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/make_agree_file').then( + function () { + commonDialog.alert({ + title: 'Success!', + content: '已提交制作合同!', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.apply2makeCardAgreeFile = function () { + if (!$scope.partner.enable_card_payment) { + commonDialog.alert({ + title: 'Error!', + content: '请完善商户卡支付基本信息、签约费率、合规文件!', + type: 'error', + }) + $state.go('partners.edit', { + clientMoniker: $scope.partner.client_moniker, + commitCardPayment: true, + commitCrossBorderPayment: false, + }) + return + } + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/make_card_agree_file').then( + function () { + commonDialog.alert({ + title: 'Success!', + content: '已提交制作合同!', + type: 'success', + }) + $state.reload() + }, + function (resp) { + if (String(resp.data.message).match('No Rate Config')) { + commonDialog.alert({ + title: 'Error!', + content: '商户卡支付签约费率未配置，请添加商户卡支付签约费率!', + type: 'error', + }) + $state.go('partners.detail.rates', { + clientMoniker: $scope.partner.client_moniker, + }) + } else { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + } + ) + } + + $scope.commit2GreenChannel = function () { + commonDialog + .confirm({ + title: 'Audit Partner', + content: 'Are you sure to mark partner ' + $scope.partner.company_name + ' Green Channel？', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/compliance/green_channel').then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Commit to Green Channel successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + + $scope.markAuditEmail = function () { + commonDialog + .confirm({ + title: 'Warning', + content: 'Make sure you have send the email to client.', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/email_sending_status').then( + function () { + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + $scope.resendApproveEmail = function (type) { + commonDialog + .confirm({ + title: 'Warning', + content: 'This operation will reset the password of admin user. Are you sure this email is correct ? Or you may update this information first.', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/send_email?type=' + type).then( + function () { + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + $scope.editBDUser = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/bd_user_choose_dialog.html', + controller: 'partnerChooseBDUserDialogCtrl', + resolve: { + bdUsers: [ + '$http', + function ($http) { + return $http.get('/sys/manager_accounts/roles/bd_user') + }, + ], + partner: function () { + return $scope.partner + }, + type: function () { + return 'edit' + }, + }, + }) + .result.then(function () { + $state.reload() + }) + } + $scope.bindBDUser = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/bd_user_choose_dialog.html', + controller: 'partnerChooseBDUserDialogCtrl', + resolve: { + bdUsers: [ + '$http', + function ($http) { + return $http.get('/sys/manager_accounts/roles/bd_user') + }, + ], + partner: function () { + return $scope.partner + }, + type: function () { + return 'add' + }, + }, + }) + .result.then(function () { + $state.reload() + }) + } + + $scope.configMasterMerchant = function () { + commonDialog.inputText({title: 'Input Master Merchant Code'}).then(function (text) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/master_configuration', {master_merchant: text}).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Master Merchant Code:' + text, + type: 'success', + }) + }, + function (resp) { + commonDialog.alert({ + title: 'Config Master Merchant Failed', + content: resp.data.message, + type: 'error', + }) + } + ) + }) + } + $scope.getMerchantLocation = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) { + $scope.merchant_location = resp.data + }) + } + $scope.getMerchantLocation() + + $scope.complianceCheck = function () { + if (!$rootScope.complianceCheck) { + $rootScope.complianceCheck = {} + } + $rootScope.complianceCheck.client_id = $scope.partner.client_id + $rootScope.complianceCheck.clientInfo = true + } + $scope.complianceChangeCheck = function () { + if ($rootScope.complianceCheck) { + if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { + delete $rootScope.complianceCheck + } + } + } + $scope.complianceChangeCheck() + + $scope.changeWechatCompliance = function () { + if (!$scope.partner) { + return + } + if (!$state.is('partners.detail')) { + $scope.init.wechat_compliance = false + return + } + if (!$scope.init.wechat_compliance) { + $scope.init.wechat_compliance = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_compliance_permission', {allow: $scope.partner.wechat_compliance}).then( + function () { + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change wechat_compliance permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.changeLocalMerchant = function () { + if (!$scope.partner) { + return + } + if (!$state.is('partners.detail')) { + $scope.init.local_merchant = false + return + } + if (!$scope.init.local_merchant) { + $scope.init.local_merchant = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/local_merchant_permission', {allow: $scope.partner.local_merchant}).then( + function () { + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change local_merchant permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.removeSub = function () { + $http.delete('/sys/partners/unsub/' + $scope.partner.client_moniker).then(function (resp) { $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } + }) + } + $scope.addSub = function () { + $http.put('/sys/partners/unsub/' + $scope.partner.client_moniker).then(function (resp) { + $state.reload() + }) + } + }, + ]) + app.controller('partnerPaymentInfoCtrl', [ + '$scope', + '$http', + '$state', + 'commonDialog', + '$uibModal', + '$sce', + function ($scope, $http, $state, commonDialog, $uibModal, $sce) { + $scope.convertExtParams = [] + $scope.copyHfLink = function () { + var e = document.getElementById('cpbt') + e.select() + var successful = document.execCommand('Copy') + if (successful) { + commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'}) + } else { + commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'}) + } + } + $scope.copyYeepayLink = function () { + var e = document.getElementById('cpyeepay') + e.select() + var successful = document.execCommand('Copy') + if (successful) { + commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'}) + } else { + commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'}) + } + } + $scope.copyCBBankPayLink = function () { + var e = document.getElementById('cpcbbankpay') + e.select() + var successful = document.execCommand('Copy') + if (successful) { + commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'}) + } else { + commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'}) + } + } + $scope.loadPartnerPaymentInfo = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { + $scope.extParams = {} + $scope.paymentInfo = resp.data + $scope.extParams = $scope.paymentInfo.ext_params ? JSON.parse($scope.paymentInfo.ext_params) : null + $scope.convertExtParams = $scope.extParamsEditFlags() + $scope.ctrl.editSubMerchant = false + $scope.ctrl.editAliSubMerchant = false + $scope.ctrl.editMaxOrderAmount = false + $scope.ctrl.editOrderExpiryConfig = false + $scope.ctrl.editRefundPwd = false + $scope.ctrl.editRefundCreditLine = false + }) + } + $scope.extParamsEditFlags = function () { + var paramList = [] + if ($scope.extParams != null) { + for (var key in $scope.extParams) { + var obj = {} + if (typeof $scope.extParams[key] != 'boolean') { + obj.name = key + obj.value = $scope.extParams[key] + obj.type = 'string' + obj.flag = false + } else { + obj.name = key + obj.value = $scope.extParams[key] + obj.type = 'boolean' + } + paramList.push(obj) + } + } + return paramList + } + $scope.qrConfig = {currency: 'AUD'} + $scope.reloadQRCode = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/qrcode', {params: $scope.qrConfig}).then(function (resp) { + $scope.qrcode = resp.data + }) + } + $scope.reloadQRCode() + $scope.loadPartnerPaymentInfo() + + $scope.showSubMerchantLogs = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/client_sub_merchant_id_log.html', + controller: 'clientSubMerchantIdLogCtrl', + size: 'lg', + resolve: { + logs: [ + '$http', + function ($http) { + return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_sub_merchant_id_logs') + }, + ], + }, + }) + .result.then(function () { + $scope.loadSubClients() + }) + } + + $scope.saveMaxOrderAmount = function (limit) { + if (limit != null && isNaN(limit)) { + commonDialog.alert({title: 'Error', content: 'Your input is not a number!', type: 'error'}) + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/max_order_amount', {limit: limit}).then( + function (resp) { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.saveCustomerSurchargeRate = function (cofig) { + if (cofig != null && isNaN(cofig)) { + commonDialog.alert({title: 'Error', content: 'Your input is not a number!', type: 'error'}) + return + } + if (!$scope.paymentInfo.rate_value) { + commonDialog.alert({ + title: 'Error', + content: 'The merchant has not pass approval process', + type: 'error', + }) + return + } + if (cofig > 3 || cofig < parseFloat(Decimal.add($scope.paymentInfo.rate_value, 0.1).toFixed(2))) { + commonDialog.alert({title: 'Error', content: 'Not in the valid range', type: 'error'}) + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/customer_surcharge_rate', {customer_surcharge_rate: cofig}).then( + function (resp) { + $scope.loadPartnerPaymentInfo() + $scope.ctrl.editCustomerSurchargeRate = false + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.saveOrderExpiryConfig = function (config) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/order_expiry_config', {order_expiry_config: config}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.resetRefundPwd = function (config) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/reset/refund_pwd', {new_refund_password: config}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.setRefundCreditLine = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/refund_credit_line', {refund_credit_line: $scope.paymentInfo.refund_credit_line}).then( + function (resp) { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.updateClientQRCodePaySurCharge = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.qrcode_surcharge) { + $scope.init.qrcode_surcharge = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/qrcode_surcharge', {qrcode_surcharge: $scope.paymentInfo.qrcode_surcharge}).then( + function (resp) { + $scope.loadPartnerPaymentInfo() + }, + function () { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.updateClientCBBankPaySurCharge = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cbbank_surcharge', {cbbank_surcharge: $scope.paymentInfo.cbbank_surcharge}).then( + function () { + // $scope.loadPartnerPaymentInfo(); + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Customer Pay for Surcharge for Retail', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.updateClientApiSurCharge = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.api_surcharge) { + $scope.init.api_surcharge = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/api_surcharge', {api_surcharge: $scope.paymentInfo.api_surcharge}).then( + function (resp) { + $scope.loadPartnerPaymentInfo() + }, + function () { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.updateClientRetailPaySurCharge = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.retail_surcharge) { + $scope.init.retail_surcharge = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/retail_surcharge', {retail_surcharge: $scope.paymentInfo.retail_surcharge}).then( + function (resp) { + $scope.loadPartnerPaymentInfo() + }, + function () { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.ctrl = {} + $scope.saveSubMerchantId = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', {sub_merchant_id: $scope.paymentInfo.sub_merchant_id}).then( + function (resp) { + $scope.refreshWechatInstitutionMerchantId() + $scope.ctrl.editSubMerchant = false + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + $scope.refreshWechatInstitutionMerchantId = function () { + $http + .put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_institution_merchant_id', { + wechat_institution_merchant_id: $scope.paymentInfo.wechat_institution_merchant_id, + }) + .then( + function (resp) { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.saveAliSubMerchantId = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/ali_sub_merchant_id', {ali_sub_merchant_id: $scope.paymentInfo.ali_sub_merchant_id}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Ali Sub Merchant ID successfully', + type: 'success', + }) + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.submitAlipaySubId = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms_json').then(function (resp) { + $scope.alipay_gms_json = resp.data + commonDialog + .confirm({ + title: 'Warning', + content: '是否使用该商户的现有信息进件？', + json: $scope.alipay_gms_json, + }) + .then(function () { + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then( + function () { + commonDialog.alert({title: 'Success', content: 'Alipay进件成功', type: 'success'}) + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: '进件失败：' + resp.data.message, + type: 'error' + }) + } + ) + }) + }) + } + $scope.queryAlipayGms = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms').then( + function (resp) { + commonDialog.alert({title: 'Success', content: resp.data.result_status, type: 'success'}) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'}) + } + ) + } + $scope.submitAlipayOnlineSubId = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms_json').then(function (resp) { + $scope.alipayOnline_gms_json = resp.data + commonDialog + .confirm({ + title: 'Warning', + content: '是否使用该商户的现有信息进件？', + json: $scope.alipayOnline_gms_json, + }) + .then(function () { + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms').then( + function () { + commonDialog.alert({ + title: 'Success', + content: '提示：AlipayOnline进件成功', + type: 'success' + }) + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: '进件失败：' + resp.data.message, + type: 'error' + }) + } + ) + }) + }) + } + $scope.queryAlipayOnlineGms = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms').then( + function (resp) { + commonDialog.alert({title: 'Success', content: resp.data.result_status, type: 'success'}) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'}) + } + ) + } + $scope.refreshCredential = function () { + commonDialog + .confirm({ + title: 'Warning', + content: 'Refresh Credential will expire the current one, which will cause the current payment service disabled. Are you sure going on?', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/credential_code').then( + function () { + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + $scope.init = { + jsapi: false, + gateway: false, + offline: false, + refund: false, + common_sub_merchant_id: false, + channel: {}, + gateway_alipay_online: false, + hf_Link: false, + enable_hf_email_notice: false, + enable_yeepay_link: false, + enable_yeepay_email_notice: false, + } + $scope.switchCommonSubMerchantId = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.common_sub_merchant_id) { + $scope.init.common_sub_merchant_id = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/common_sub_merchant_id', {allow: $scope.paymentInfo.common_sub_merchant_id}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change common_sub_merchant_id permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.switchSubManage = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.sub_manage) { + $scope.init.sub_manage = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/sub_manage', {allow: $scope.paymentInfo.sub_manage}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change Sub Partners Manage status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + var info = [] + $scope.decideCompliance = function (name) { + var keywords = ['education', 'financial', 'train', 'immigrant', 'invest', '律师咨询', '会计事务所', '移民', '留学', '娱乐', '金融', '地产', '投资'] + for (var i = 0; i < keywords.length; i++) { + if (name.indexOf(keywords[i]) != -1) { + return true + } + } + return false + } + $scope.getComplianceInfo = function () { + if ($scope.paymentInfo.company_name != null) { + if ($scope.decideCompliance($scope.paymentInfo.company_name)) { + info.push('Company Name') + } + } + if ($scope.paymentInfo.short_name != null) { + if ($scope.decideCompliance($scope.paymentInfo.short_name)) { + info.push('Short Name') + } + } + if ($scope.paymentInfo.business_structure != null) { + if ($scope.decideCompliance($scope.paymentInfo.business_structure)) { + info.push('Business Structure') + } + } + } + $scope.switchAlipayCn = function (clientId, apsConfigId, alipayCn) { + if (!$scope.paymentInfo.enable_alipayaps) { + commonDialog.alert({ + title: 'ERROR', + content: "AlipayCN channel can be switched only after Alipay+(APS) is enabled", + type: 'error', + }) + $scope.loadPartnerPaymentInfo() + } else { + $http.put('/sys/partners/aps/' + clientId, {id: apsConfigId, alipayCnSwitch: alipayCn}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change alipayCN channel permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + } + $scope.toggleChannel = function (channel) { + if (!channel) { + return + } + if (!$scope.paymentInfo) { + return + } + // if (!$scope.init.channel[channel]) { + // $scope.init.channel[channel] = true + // return + // } + if($scope.paymentInfo.alipay_cn_switch){ + commonDialog.alert({ + title: 'ERROR', + content: "Please switch AlipayCN to Alipay channel, and then close Alipay+(APS) channel", + type: 'error', + }) + $scope.loadPartnerPaymentInfo() + return; + } + $scope.getComplianceInfo() + if ($scope.paymentInfo['enable_wechat'] && channel == 'wechat' && $scope.paymentInfo.open_status == 5 && info.length > 0) { + commonDialog + .confirm({ + title: 'Warning', + contentHtml: $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],' + info.toString() + '存在微信渠道不合规信息'), + }) + .then(function () { + $scope.saveChannel(channel) + }) + } else { + $scope.saveChannel(channel) + } + info = [] + } + $scope.saveChannel = function (channel) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/channels/' + channel + '/permission', {allow: $scope.paymentInfo['enable_' + channel]}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change ' + channel + ' channel permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.toggleHfLink = function (channel) { + if (!channel) { + return + } + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.hf_Link) { + $scope.init.hf_Link = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/hf', {allow: $scope.paymentInfo.enable_link}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change enable_link permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.toggleGatewayLink = function (channel) { + if (!channel) { + return + } + if (!$scope.paymentInfo) { + return + } + var channelLink = 'enable_' + channel + '_link' + if (!$scope.init[channelLink]) { + $scope.init[channelLink] = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/' + channel, {allow: $scope.paymentInfo[channelLink]}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change ' + channelLink + ' permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.toggleCBBankPayLink = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cb_bankpay', {allow: $scope.paymentInfo.enable_cb_bankpay_link}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change cb_bankpay permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.cb_bankpay = [] + $scope.cbChannelConfig = function () { + $http.get('/sysconfig/payment/config').then(function (resp) { + resp.data.forEach(function (channel) { + if (channel.type === 1) { + $scope.cb_bankpay.push(channel) + } + }) + }) + } + $scope.cbChannelConfig() + $scope.updateCBBankPayConfig = function (key, channel) { + var content = '' + if (channel == null) { + content = '你确定要将支付通道跟随系统' + } else { + content = '你确定要将支付通道更改为：' + channel + } + commonDialog + .confirm({ + title: 'Confirm', + content: content, + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cb_bankpay/' + key + '/channel_id', {channel_id: channel}).then( + function (resp) { + commonDialog.alert({type: 'success', title: 'Success', content: '修改成功'}) + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message}) + $scope.loadPartnerPaymentInfo() + } + ) + }) + } + $scope.toggleGatewayEmailNotice = function (channel) { + if (!$scope.paymentInfo) { + return + } + var channelNotice = 'enable_' + channel + '_email_notice' + if (!$scope.init[channelNotice]) { + $scope.init[channelNotice] = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/' + channel + '/email_notice', {allow: $scope.paymentInfo[channelNotice]}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change ' + channelNotice + ' permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.toggleHfEmailNotice = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.enable_hf_email_notice) { + $scope.init.enable_hf_email_notice = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/hf/email_notice', {allow: $scope.paymentInfo.enable_hf_email_notice}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change enable_hf_email_notice permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.toggleJsApi = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.jsapi) { + $scope.init.jsapi = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/jsapi_permission', {allow: $scope.paymentInfo.enable_jsapi}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change JSApi permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.toggleGateway = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.gateway) { + $scope.init.gateway = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/gateway_permission', {allow: $scope.paymentInfo.enable_gateway}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Gateway permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.toggleGatewayUpgrade = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.gateway_upgrade) { + $scope.init.gateway_upgrade = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/gateway_upgrade', {gateway_upgrade: $scope.paymentInfo.gateway_upgrade}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Gateway Upgrade status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.toggleGatewayAlipayOnline = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.gateway_alipay_online) { + $scope.init.gateway_alipay_online = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/gateway_alipay_online', {gateway_alipay_online: $scope.paymentInfo.gateway_alipay_online}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Gateway Alipay Online status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.toggleRefund = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.enable_refund) { + $scope.init.enable_refund = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/refund_permission', {allow: $scope.paymentInfo.enable_refund}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Refund permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.togglePreRefund = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.enable_pre_refund) { + $scope.init.enable_pre_refund = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/pre_refund_permission', {allow: $scope.paymentInfo.enable_pre_refund}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Refund permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + $scope.toggleOffline = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.offline) { + $scope.init.offline = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/offline_permission', {allow: $scope.paymentInfo.enable_retail}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Offline permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.switchInternationalCard = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.enable_International_card) { + $scope.init.enable_International_card = true + return + } + $http + .put('/sys/partners/' + $scope.partner.client_moniker + '/payment_card_permission', { + key: 'enable_international_card', + allow: $scope.paymentInfo.enable_international_card, + }) + .then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change international card permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.switchThreeDS = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.enable_threeds) { + $scope.init.enable_threeds = true + return + } + $http + .put('/sys/partners/' + $scope.partner.client_moniker + '/payment_card_permission', { + allow: $scope.paymentInfo.enable_threeds, + key: 'enable_threeds', + }) + .then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change international card permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.changePaymentPage = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_page_version', {paypad_version: $scope.paymentInfo.paypad_version}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Payment Page Version', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.changeCBBankPaymentPage = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cbbank_payment_page_version', {cbbank_paypad_version: $scope.paymentInfo.cbbank_paypad_version}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change CBBank Payment Page Version', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + // 更改支付成功页 + $scope.changePaySuccessPage = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/paysuccess_version', {paysuccess_version: $scope.paymentInfo.paysuccess_version}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change Payment Success Page Version', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.toggleRequireCustInfo = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.require_custinfo) { + $scope.init.require_custinfo = true + return + } + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/requireCustinfo', {allow: $scope.paymentInfo.require_custinfo}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change require customer Info permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.toggleRequireRemark = function () { + if (!$scope.paymentInfo) { + return + } + if (!$scope.init.require_remark) { + $scope.init.require_remark = true + return + } + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/requireRemark', {allow: $scope.paymentInfo.require_remark}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change require remark permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.changeBillCodeVersion = function () { + if (!$scope.paymentInfo) { + return + } + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/selectBillVersion', {version: $scope.paymentInfo.billcode_version}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'failed to change require bill version permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.extChangeParam = function (name, value) { + var flag = true + $scope.convertExtParams.forEach(function (params) { + if (params.name == name && value == '' && params.type == 'string') { + flag = false + } + }) + if (flag) { + $http + .put('/sys/partners/' + $scope.partner.client_moniker + '/ext_config', { + key: name, + value: value, + }) + .then(function () { + $scope.loadPartnerPaymentInfo() + }) + } + } + + $scope.queryWechatSubMerchantIdStatus = function () { + $scope.paymentInfo.sub_merchant_id + $http.get('/sys/partners/' + $scope.paymentInfo.client_moniker + '/get_merchant_ids/' + $scope.paymentInfo.sub_merchant_id + '/status').then(function (resp) { + commonDialog.alert({ + title: 'Wechat Apply Status(' + resp.data.apply_status + ')', + content: resp.data.response_str, + type: 'info', + }) + }) + } + // GatewayAlipay渠道 + $scope.setAlipayChannel = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/modifyAlipayPaymentChannels/' + $scope.partner.client_id + '/' + $scope.paymentInfo.alipay_payment_channels).then( + function (resp) { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'error', + }) + } + ) + } + }, + ]) + app.controller('clientSubMerchantIdLogCtrl', [ + '$scope', + '$http', + 'logs', + function ($scope, $http, logs) { + $scope.logs = logs.data + }, + ]) + app.controller('partnerSubCtrl', [ + '$scope', + '$http', + '$uibModal', + function ($scope, $http, $uibModal) { + $scope.toShow = false + $scope.init = { + child_each_refund: false, + sub_manage: false, + } + + $scope.newSubClient = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/add_sub_partner_dialog.html', + controller: 'partnerNewSubPartnerDialogCtrl', + size: 'lg', + resolve: { + clientMoniker: function () { + return $scope.partner.client_moniker + }, + }, + }) + .result.then(function () { + $scope.loadSubClients(1) + }) + } + + $scope.loadSubClients = function (page) { + var params = {} + params.page = page || $scope.pagination.page || 1 + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page', {params: params}).then(function (resp) { + $scope.subPartners = resp.data.data + $scope.pagination = resp.data.pagination + }) + } + + $scope.loadSubClients(1) + + $scope.loadPartnerPaymentInfo = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { + $scope.paymentInfo = resp.data + }) + } + $scope.loadPartnerPaymentInfo() + + $scope.switchSubManage = function () { + if (!$scope.paymentInfo) { + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/sub_manage', {allow: $scope.partner.sub_manage}).then( + function () { + //$scope.loadPartnerPaymentInfo(); + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change Sub Partners Manage status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.switchChildEachRefund = function () { + if (!$scope.partner) { + return + } + if (!$scope.init.child_each_refund) { + $scope.init.child_each_refund = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/child_each_refund', {allow: $scope.partner.child_each_refund}).then( + function () { + $scope.loadPartnerPaymentInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change Sub Partners Manage status', + content: resp.data.message, + type: 'error', + }) + } + ) + } + + $scope.showClient = function (sub_client) { + if ($scope.sub_client_id == sub_client.client_id) { + return + } + $scope.client_monikers = sub_client.level3Clients + $scope.sub_client_id = sub_client.client_id + } + }, + ]) + app.controller('partnerRatesCtrl', [ + '$scope', + '$rootScope', + '$http', + '$uibModal', + 'commonDialog', + '$sce', + '$state', + function ($scope, $rootScope, $http, $uibModal, commonDialog, $sce, $state) { + $scope.bankCtrl = {edit: true, rate_name: 'Wechat', modify_min_settle: false} + $scope.init = { + skip_clearing: false, + tax_in_surcharge: false, + customer_tax_free: false, + allow_surcharge_credit: false, + } + $scope.getBankAccount = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bank_account').then(function (resp) { + $scope.bankaccount = resp.data + $scope.bankCtrl.edit = false + }) + } + $scope.switchSurchargeMode = function () { + if ($scope.partner.surcharge_mode === 'balance') { + commonDialog + .confirm({ + title: 'Warning', + content: '启用收支分离模式清算将使消费者支付手续费模式失效，请确认是否切换？', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', {surcharge_mode: 'distributed'}).then( + function () { + commonDialog.alert({title: 'Success', content: '已切换为收支分离模式', type: 'success'}) + $scope.partner.surcharge_mode = 'distributed' + $scope.getBalance() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } else { + commonDialog + .confirm({ + title: 'Warning', + content: '请确认是否切换成净值清算模式？', + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', {surcharge_mode: 'balance'}).then( + function () { + commonDialog.alert({title: 'Success', content: '已切换为净值清算模式', type: 'success'}) + $scope.partner.surcharge_mode = 'balance' + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + } + $scope.modifyMinSettle = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/min_settle', {min_settle: $scope.partner.min_settle}).then( + function () { + commonDialog.alert({title: 'Success', content: '修改起结金额成功', type: 'success'}) + $scope.bankCtrl.modify_min_settle = false + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.getBalance = function () { + $scope.surcharge = {} + + if ($scope.partner.surcharge_mode != undefined && $scope.partner.surcharge_mode === 'distributed') { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_account').then(function (resp) { + $scope.surcharge = resp.data + }) + } + } + $scope.getBalance() + $scope.getBankAccount() + $scope.getRates = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/rates').then(function (resp) { + $scope.rates = resp.data + angular.forEach($scope.rates, function (rate) { + rate.active_time = new Date(rate.active_time.substr(0, 10).replace(/-/g, '/')) + rate.expiry_time = new Date(rate.expiry_time.substr(0, 10).replace(/-/g, '/')) + }) + }) + } + $scope.skipClearing = function (skipClearing) { + if (!$scope.init.skip_clearing) { + $scope.init.skip_clearing = true + return + } + if (skipClearing) { + commonDialog + .confirm({ + title: 'Warning', + content: 'This operation will switch skip clearing status. Are you sure?', + }) + .then(function () { + commonDialog.inputText({title: '请输入跳过清算的原因'}).then(function (text) { + $http + .put('/sys/partners/' + $scope.partner.client_moniker + '/skip_clearing', { + skip_clearing: skipClearing, + remark: text, + }) + .then(function (resp) { + $scope.getBankAccount() + }) + }) + }) + } else { + commonDialog + .confirm({ + title: 'Warning', + content: 'This operation will switch skip clearing status. Are you sure?', + // contentHtml: $sce.trustAsHtml('This operation will switch skip clearing status. Are you sure?') + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/skip_clearing', {skip_clearing: skipClearing}).then(function (resp) { + $scope.getBankAccount() + }) + }) + } + } + $scope.surchargeAccountDetail = function () { + $uibModal + .open({ + templateUrl: '/static/payment/surchargeaccount/templates/partner_surcharge_account_dialog.html', + controller: 'surchargeAccountDetailCtrl', + size: 'lg', + resolve: { + balance: function () { + return $scope.surcharge + }, + partner: function () { + return $scope.partner + }, + transactions: [ + '$http', + function ($http) { + return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/account/transactions') + }, + ], + }, + }) + .result.then( + function () { + $scope.getBalance() + }, + function () { + $scope.getBalance() + } + ) + } + $scope.allowSurchargeCredit = function (allowSurchargeCredit) { + if (!$scope.init.allow_surcharge_credit) { + $scope.init.allow_surcharge_credit = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/allow_surcharge_credit', {allow_surcharge_credit: allowSurchargeCredit}).then(function (resp) { + }) + } + $scope.taxInSurcharge = function (taxInSurcharge) { + if (!$scope.init.tax_in_surcharge) { + $scope.init.tax_in_surcharge = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/tax_in_surcharge', {tax_in_surcharge: taxInSurcharge}).then(function (resp) { + $scope.getBankAccount() + }) + } + $scope.switchPreSettle = function (presettle) { + if (!$scope.init.enable_presettle) { + $scope.init.enable_presettle = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/presettle', {enable_presettle: presettle}).then(function (resp) { + $scope.getBankAccount() + }) + } + $scope.customerTaxFree = function (customerTaxFree) { + if (!$scope.init.customer_tax_free) { + $scope.init.customer_tax_free = true + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/customer_tax_free', {customer_tax_free: customerTaxFree}).then(function (resp) { + $scope.getBankAccount() + }) + } + $scope.settleHours = [{value: undefined, label: 'Default(24:00, GMT+10)'}] + for (var h = 24; h > 0; h--) { + $scope.settleHours.push({value: h, label: ('00' + h).substr(-2) + ':00, ' + $scope.partner.timezone}) + } + $scope.settleHourConfig = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/settle_hour', {hour: $scope.partner.settle_hour || null}).then( + function () { + commonDialog.alert({type: 'success', title: 'OK', content: 'Settle Hour configured'}) + }, + function (resp) { + commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message}) + } + ) + } + $scope.getBankInfo = function (bsb_no) { + if (bsb_no != null && bsb_no !== '') { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bank_account/bank_info/' + bsb_no).then(function (resp) { + $scope.bankInfo = resp.data + $scope.bankaccount.bank = $scope.bankInfo.bank + $scope.bankaccount.city = $scope.bankInfo.city + $scope.bankaccount.address = $scope.bankInfo.address + $scope.bankaccount.system = $scope.bankInfo.system + $scope.bankaccount.postcode = $scope.bankInfo.postcode + $scope.bankaccount.state = $scope.bankInfo.state + $scope.bankaccount.branch = $scope.bankInfo.branch + }) + } else { + commonDialog.alert({title: 'Error', content: '请先填写BSB No', type: 'error'}) + } + } + $scope.getRates() + $scope.saveBankAccount = function () { + if (isNaN($scope.bankaccount.account_no)) { + alert('Account No应输入数字!') + return + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/bank_account', $scope.bankaccount).then( + function () { + $scope.getBankAccount() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.newCardPaymentRates = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/partner_new_card_payment_rate.html', + controller: 'newCardPaymentRateDialogCtrl', + resolve: { + sys_common_rate: function () { + return $http.get('/sys/partners/sys_card_rates') + }, + clientMoniker: function () { + return $scope.partner.client_moniker + }, + cost_rate_channel: function () { + return $scope.cost_rate_channel + }, + }, + }) + .result.then(function () { + $scope.getRates() + }) + } + $scope.newRate = function () { + var name = $scope.bankCtrl.rate_name + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/partner_new_rate.html', + controller: 'newRateDialogCtrl', + resolve: { + rate: function () { + return {rate_name: name, clean_days: 3} + }, + sys_common_rate: function () { + return $http.get('/sys/partners/sys_rates') + }, + clientMoniker: function () { + return $scope.partner.client_moniker + }, + }, + }) + .result.then(function () { + $scope.getRates() + }) + } + $scope.editRate = function (rate) { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/rate_config_dialog.html', + controller: 'rateConfigDialogCtrl', + resolve: { + rate: function () { + return rate + }, + clientMoniker: function () { + return $scope.partner.client_moniker + }, + }, + }) + .result.then(function () { + $scope.getRates() + }) + } + + $scope.complianceCheck = function () { + if (!$rootScope.complianceCheck) { + $rootScope.complianceCheck = {} + } + $rootScope.complianceCheck.client_id = $scope.partner.client_id + $rootScope.complianceCheck.bankAccount = true + } + $scope.complianceChangeCheck = function () { + if ($rootScope.complianceCheck) { + if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { + delete $rootScope.complianceCheck + } + } + } + $scope.complianceChangeCheck() + + // 是否为alipayplus + $scope.isAlipayCN = true + // 修改渠道 + $scope.changeAlipayPlusRateState = function (flag) { + $scope.isAlipayCN = flag + } + // 过滤渠道 + $scope.isAlipayPlus = function (item) { + if ($scope.isAlipayCN) { + return item.rate_name === 'AlipayPlus' && (item.pay_type === 'alipay_cn_retail' || item.pay_type === 'alipay_cn_online') + } else { + return item.rate_name === 'AlipayPlus' && item.pay_type === 'alipay_other' + } + } + // 新增alipay+费率 + $scope.newAlipayPlusRate = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/partner_new_alipayplus_rate.html', + resolve: { + rate: function () { + return { + rate_name: 'AlipayPlus', + clean_days: '3', + } + }, + sys_common_rate: function () { + return $http.get('/sys/partners/sys_rates') + }, + clientMoniker: function () { + return $scope.partner.client_moniker + }, + }, + controller: [ + '$scope', + '$http', + 'rate', + 'sys_common_rate', + 'clientMoniker', + function ($scope, $http, rate, sys_common_rate, clientMoniker) { + $scope.rate = angular.copy(rate) + $scope.sysRateConfig = angular.copy(sys_common_rate.data) + $scope.ctrl = {sending: false} + $scope.saveRate = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + $scope.errmsg = null + $scope.ctrl.sending = true + $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( + function () { + $scope.ctrl.sending = false + $scope.$close() + }, + function (resp) { + $scope.ctrl.sending = false + $scope.errmsg = resp.data.message + } + ) + } + $scope.changeDays = function () { + // if ($scope.rate.clean_days) { + // switch ($scope.rate.clean_days) { + // case '1': { + // $scope.rate.alipayplus = parseFloat($scope.sysRateConfig.t1.AlipayPlus) + // break + // } + // case '2': { + // $scope.rate.alipayplus = parseFloat($scope.sysRateConfig.t2.AlipayPlus) + // break + // } + // case '3': { + // $scope.rate.alipayplus = parseFloat($scope.sysRateConfig.t3.AlipayPlus) + // break + // } + // } + // } + } + }, + ], + }) + .result.then(function () { + $scope.getRates() + }) + } + }, + ]) + app.controller('surchargeAccountDetailCtrl', [ + '$scope', + '$http', + 'balance', + 'partner', + 'transactions', + 'commonDialog', + function ($scope, $http, balance, partner, transactions, commonDialog) { + $scope.surcharge = angular.copy(balance) + $scope.surchargeDetailData = angular.copy(transactions.data) + $scope.partner = angular.copy(partner) + $scope.canAddDetail = false + $scope.params = {} + + $scope.getBalance = function () { + if ($scope.partner.surcharge_mode != undefined && $scope.partner.surcharge_mode == 'distributed') { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_account').then(function (resp) { + $scope.surcharge = resp.data + }) + } + } + + $scope.getTransactions = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/account/transactions').then(function (resp) { + $scope.surchargeDetailData = resp.data + }) + } + + $scope.addDetail = function () { + $scope.canAddDetail = true + } + + $scope.cancel = function () { + $scope.canAddDetail = false + $scope.params = {} + } + $scope.save = function () { + $http + .post('/sys/partners/' + $scope.partner.client_moniker + '/account/save', { + amount: $scope.params.amount, + remark: $scope.params.remark, + }) + .then( + function (resp) { + $scope.getTransactions() + $scope.getBalance() + $scope.canAddDetail = false + $scope.params = {} + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }, + ]) + app.controller('newCardPaymentRateDialogCtrl', [ + '$scope', + '$http', + 'sys_common_rate', + 'clientMoniker', + function ($scope, $http, sys_common_rate, clientMoniker) { + $scope.rate = {} + $scope.card_payment_normal = true + $scope.card_payment_switch_title = 'Direct Debit' + $scope.card_payment = [ + { + type: 'rpaypmt_card', + title: 'Card Payment', + }, + { + type: 'rpaypmt_dd', + title: 'Direct Debit', + }, + ] + $scope.cardRateConfig = $scope.card_payment[0] + $scope.switchCardRateConfig = function () { + $scope.card_payment_normal = !$scope.card_payment_normal + $scope.rate = {} + if ($scope.card_payment_normal) { + $scope.cardRateConfig = $scope.card_payment[0] + $scope.card_payment_switch_title = 'Direct Debit' + } else { + $scope.cardRateConfig = $scope.card_payment[1] + $scope.card_payment_switch_title = 'Card Payment' + } + } + $scope.sysRateConfig = angular.copy(sys_common_rate.data) + $scope.ctrl = {sending: false} + $scope.saveRate = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + $scope.errmsg = null + $scope.ctrl.sending = true + $scope.rate.type = $scope.cardRateConfig.type + $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( + function () { + $scope.ctrl.sending = false + $scope.$close() + }, + function (resp) { + $scope.ctrl.sending = false + $scope.errmsg = resp.data.message + } + ) + } + $scope.changeDays = function () { + if ($scope.rate.clean_days && $scope.card_payment_normal) { + switch ($scope.rate.clean_days) { + case '1': { + $scope.rate.rate_value = parseFloat($scope.sysRateConfig.t1.domestic_rate) + $scope.rate.transaction_fee = parseFloat($scope.sysRateConfig.t1.transaction_fee) + break + } + case '2': { + $scope.rate.rate_value = parseFloat($scope.sysRateConfig.t2.domestic_rate) + $scope.rate.transaction_fee = parseFloat($scope.sysRateConfig.t2.transaction_fee) + break + } + case '3': { + $scope.rate.rate_value = parseFloat($scope.sysRateConfig.t3.domestic_rate) + $scope.rate.transaction_fee = parseFloat($scope.sysRateConfig.t3.transaction_fee) + break + } + } + } + } + }, + ]) + app.controller('newRateDialogCtrl', [ + '$scope', + '$http', + 'rate', + 'sys_common_rate', + 'clientMoniker', + function ($scope, $http, rate, sys_common_rate, clientMoniker) { + $scope.rate = angular.copy(rate) + $scope.sysRateConfig = angular.copy(sys_common_rate.data) + $scope.ctrl = {sending: false} + $scope.saveRate = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + $scope.errmsg = null + $scope.ctrl.sending = true + $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( + function () { + $scope.ctrl.sending = false + $scope.$close() + }, + function (resp) { + $scope.ctrl.sending = false + $scope.errmsg = resp.data.message + } + ) + } + $scope.changeDays = function () { + if ($scope.rate.clean_days) { + switch ($scope.rate.clean_days) { + case '1': { + $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t1.Wechat) + $scope.rate.alipay_rate_value = parseFloat($scope.sysRateConfig.t1.Alipay) + $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t1.AlipayOnline) + $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t1.Rpay) + $scope.rate.transaction_fee = 0 + break + } + case '2': { + $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t2.Wechat) + $scope.rate.alipay_rate_value = parseFloat($scope.sysRateConfig.t2.Alipay) + $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t2.AlipayOnline) + $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t2.Rpay) + $scope.rate.transaction_fee = 0 + break + } + case '3': { + $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t3.Wechat) + $scope.rate.alipay_rate_value = parseFloat($scope.sysRateConfig.t3.Alipay) + $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t3.AlipayOnline) + $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t3.Rpay) + $scope.rate.transaction_fee = 0 + break + } + } + } + } + }, + ]) + app.controller('partnerAccountsCtrl', [ + '$scope', + '$http', + '$uibModal', + 'commonDialog', + function ($scope, $http, $uibModal, commonDialog) { + $scope.partnerRoles = partnerRoles + $scope.loadPartnerAccounts = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/accounts').then(function (resp) { + $scope.accounts = resp.data + }) + } + $scope.loadPartnerAccounts() + $scope.addAccount = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/add_partner_account_dialog.html', + controller: 'partnerAddAccountDialogCtrl', + backdrop: false, + resolve: { + partner: function () { + return $scope.partner + }, + }, + }) + .result.then(function () { + $scope.loadPartnerAccounts() + }) + } + $scope.updateAccountRole = function (account) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/accounts/' + account.account_id + '/role', {role: account.role}).then( + function () { + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } ) - }, - function (resp) { - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - } - ) - } - } - } - - $scope.uploadCardAgreeFile = function (file) { - if (file != null) { - if (file.size > 2 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error' }) - } else { - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.agree_file_import = resp.data.url - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/import/agreepdf', { source_agree_file: $scope.agree_file_import }).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Succeed Imported! Please notify BD', - type: 'success', + } + $scope.resetPwd = function (account) { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/partner_account_reset_pwd_dialog.html', + controller: 'partnerResetPwdDialogCtrl', + backdrop: false, + size: 'sm', + resolve: { + partner: function () { + return $scope.partner + }, + account: function () { + return account + }, + }, }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } + .result.then(function () { + commonDialog.alert({title: 'Success!', content: 'Password Changed Successfully', type: 'success'}) + }) + } + $scope.disableAccount = function (account) { + commonDialog + .confirm({ + title: 'Confirm Operation', + content: 'Are you sure to disable account ' + account.display_name + ' ?', + }) + .then(function () { + $http.delete('/sys/partners/' + $scope.partner.client_moniker + '/accounts/' + account.account_id).then( + function () { + $scope.loadPartnerAccounts() + }, + function (resp) { + commonDialog.alert({title: 'Fail!', content: resp.data.message, type: 'error'}) + } + ) + }) + } + }, + ]) + app.controller('partnerAddAccountDialogCtrl', [ + '$scope', + '$http', + 'partner', + function ($scope, $http, partner) { + $scope.account = {role: 1} + $scope.partnerRoles = partnerRoles + $scope.account.nation_code = 61 + $scope.saveAccount = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + if ($scope.account.pwd && $scope.account.pwd.length < 8) { + $scope.errmsg = 'Password length must more than 8 !' + return + } + var regex = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/ + if ($scope.account.pwd && !regex.test($scope.account.pwd)) { + $scope.errmsg = 'The password needs to consist of 8-16 digits and letters !' + return + } + $scope.errmsg = null + $http.post('/sys/partners/' + partner.client_moniker + '/accounts', $scope.account).then( + function () { + $scope.$close() + }, + function (resp) { + $scope.errmsg = resp.data.message + } ) - }, - function (resp) { - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - } - ) - } - } - } - $scope.notifyBD = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/notify/completeAgree').then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Notify BD Successed!.', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.cardNotifyBD = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/notify/cardCompleteAgree').then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Notify BD Successed!.', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.downTempPdf = function () { - return '/sys/partners/' + $scope.partner.client_moniker + '/temp/export/pdf' - } - - $scope.refuse = function () { - commonDialog.inputText({ title: 'refuse cause' }).then(function (text) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/refuse', { refuse_remark: text }).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Audit application has been refused.', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - - $scope.cardRefuse = function () { - commonDialog.inputText({ title: 'refuse cause' }).then(function (text) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/card_audit/refuse', { refuse_remark: text }).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Card Audit application has been refused.', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - - $scope.deleteClient = function () { - commonDialog - .confirm({ - title: 'Delete Partner', - content: 'Are you sure to delete ' + $scope.partner.company_name + '?', - }) - .then(function () { - $http.delete('/sys/partners/' + $scope.partner.client_moniker).then( - function () { - $state.go('^') - commonDialog.alert({ title: 'Delete', content: 'Partner Already Disabled', type: 'error' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.revertClient = function () { - commonDialog - .confirm({ - title: 'Revert Partner', - content: 'Are you sure to Revert ' + $scope.partner.company_name + '?', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/revert').then( - function () { - $state.go('^') - commonDialog.alert({ title: 'Revert', content: 'Partner Already Revert', type: 'success' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - - $scope.commitToCompliance = function () { - commonDialog - .confirm({ - title: 'Commit to Compliance', - content: 'Are you sure to commit ' + $scope.partner.company_name + ' to compliance？', - choises: [ - { label: 'Submit', className: 'btn-success', key: 1 }, - { label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true }, - ], - }) - .then(function (choice) { - if (choice == 1) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/to_compliance', {}).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Commit to Compliance successfully', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }) - } - - $scope.commitToCardCompliance = function () { - commonDialog - .confirm({ - title: 'Commit to Compliance', - content: 'Are you sure to commit ' + $scope.partner.company_name + ' to compliance？', - choises: [ - { label: 'Submit', className: 'btn-success', key: 1 }, - { label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true }, - ], - }) - .then(function (choice) { - if (choice == 1) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/to_card_compliance', {}).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Commit to Compliance successfully', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }) - } - $scope.apply2makeAgreeFile = function () { - if (!$scope.partner.enable_cross_payment) { - commonDialog.alert({ - title: 'Error!', - content: '请完善商户跨境支付基本信息、签约费率、合规文件!', - type: 'error', - }) - $state.go('partners.edit', { - clientMoniker: $scope.partner.client_moniker, - commitCardPayment: false, - commitCrossBorderPayment: true, - }) - return - } - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/make_agree_file').then( - function () { - commonDialog.alert({ - title: 'Success!', - content: '已提交制作合同!', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.apply2makeCardAgreeFile = function () { - if (!$scope.partner.enable_card_payment) { - commonDialog.alert({ - title: 'Error!', - content: '请完善商户卡支付基本信息、签约费率、合规文件!', - type: 'error', - }) - $state.go('partners.edit', { - clientMoniker: $scope.partner.client_moniker, - commitCardPayment: true, - commitCrossBorderPayment: false, - }) - return - } - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/make_card_agree_file').then( - function () { - commonDialog.alert({ - title: 'Success!', - content: '已提交制作合同!', - type: 'success', - }) - $state.reload() - }, - function (resp) { - if (String(resp.data.message).match('No Rate Config')) { - commonDialog.alert({ - title: 'Error!', - content: '商户卡支付签约费率未配置，请添加商户卡支付签约费率!', - type: 'error', - }) - $state.go('partners.detail.rates', { - clientMoniker: $scope.partner.client_moniker, - }) + } + }, + ]) + app.controller('partnerResetPwdDialogCtrl', [ + '$scope', + '$http', + 'partner', + 'account', + function ($scope, $http, partner, account) { + $scope.updatePwd = function () { + $scope.errmsg = null + if ($scope.reset.pwd && $scope.reset.pwd.length < 8) { + $scope.errmsg = 'Password length must more than 8 !' + return + } + var regex = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/ + if ($scope.reset.pwd && !regex.test($scope.reset.pwd)) { + $scope.errmsg = 'The password needs to consist of 8-16 digits and letters !' + return + } + $http.put('/sys/partners/' + partner.client_moniker + '/accounts/' + account.account_id + '/pwd', {pwd: $scope.reset.pwd}).then( + function () { + $scope.$close() + }, + function (resp) { + $scope.errmsg = resp.data.message + } + ) + } + }, + ]) + app.controller('partnerNewSubPartnerDialogCtrl', [ + '$rootScope', + '$scope', + '$http', + '$state', + 'Upload', + 'commonDialog', + 'timezone', + 'clientMoniker', + 'industryMap', + 'businessStructuresMap', + 'stateMap', + 'countryMap', + 'wechatGoodMcc', + '$filter', + function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap, wechatGoodMcc, $filter) { + if ($scope.partner_application) { + $scope.partner = angular.copy($scope.partner_application) + delete $rootScope.partner_application } else { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - } - ) - } - - $scope.commit2GreenChannel = function () { - commonDialog - .confirm({ - title: 'Audit Partner', - content: 'Are you sure to mark partner ' + $scope.partner.company_name + ' Green Channel？', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/compliance/green_channel').then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Commit to Green Channel successfully', - type: 'success', + $scope.partner = {timezone: 'Australia/Melbourne'} + } + $scope.initMerchantCode = function () { + $http.get('/sys/partners/init/merchant_code').then(function (response) { + $scope.partner.client_moniker = response.data.partner_code + $scope.merchantCodeChecked = true + $scope.merchantIsValid = true }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - - $scope.markAuditEmail = function () { - commonDialog - .confirm({ - title: 'Warning', - content: 'Make sure you have send the email to client.', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/email_sending_status').then( - function () { - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.resendApproveEmail = function (type) { - commonDialog - .confirm({ - title: 'Warning', - content: 'This operation will reset the password of admin user. Are you sure this email is correct ? Or you may update this information first.', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit/send_email?type=' + type).then( - function () { - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.editBDUser = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/bd_user_choose_dialog.html', - controller: 'partnerChooseBDUserDialogCtrl', - resolve: { - bdUsers: [ - '$http', - function ($http) { - return $http.get('/sys/manager_accounts/roles/bd_user') - }, - ], - partner: function () { - return $scope.partner - }, - type: function () { - return 'edit' - }, - }, - }) - .result.then(function () { - $state.reload() - }) - } - $scope.bindBDUser = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/bd_user_choose_dialog.html', - controller: 'partnerChooseBDUserDialogCtrl', - resolve: { - bdUsers: [ - '$http', - function ($http) { - return $http.get('/sys/manager_accounts/roles/bd_user') - }, - ], - partner: function () { - return $scope.partner - }, - type: function () { - return 'add' - }, - }, - }) - .result.then(function () { - $state.reload() - }) - } - - $scope.configMasterMerchant = function () { - commonDialog.inputText({ title: 'Input Master Merchant Code' }).then(function (text) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/master_configuration', { master_merchant: text }).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Master Merchant Code:' + text, - type: 'success', - }) - }, - function (resp) { - commonDialog.alert({ - title: 'Config Master Merchant Failed', - content: resp.data.message, - type: 'error', - }) - } - ) - }) - } - $scope.getMerchantLocation = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) { - $scope.merchant_location = resp.data - }) - } - $scope.getMerchantLocation() - - $scope.complianceCheck = function () { - if (!$rootScope.complianceCheck) { - $rootScope.complianceCheck = {} - } - $rootScope.complianceCheck.client_id = $scope.partner.client_id - $rootScope.complianceCheck.clientInfo = true - } - $scope.complianceChangeCheck = function () { - if ($rootScope.complianceCheck) { - if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { - delete $rootScope.complianceCheck - } - } - } - $scope.complianceChangeCheck() - - $scope.changeWechatCompliance = function () { - if (!$scope.partner) { - return - } - if (!$state.is('partners.detail')) { - $scope.init.wechat_compliance = false - return - } - if (!$scope.init.wechat_compliance) { - $scope.init.wechat_compliance = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_compliance_permission', { allow: $scope.partner.wechat_compliance }).then( - function () {}, - function (resp) { - commonDialog.alert({ - title: 'failed to change wechat_compliance permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.changeLocalMerchant = function () { - if (!$scope.partner) { - return - } - if (!$state.is('partners.detail')) { - $scope.init.local_merchant = false - return - } - if (!$scope.init.local_merchant) { - $scope.init.local_merchant = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/local_merchant_permission', { allow: $scope.partner.local_merchant }).then( - function () {}, - function (resp) { - commonDialog.alert({ - title: 'failed to change local_merchant permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - - $scope.removeSub = function () { - $http.delete('/sys/partners/unsub/' + $scope.partner.client_moniker).then(function (resp) { - $state.reload() - }) - } - $scope.addSub = function () { - $http.put('/sys/partners/unsub/' + $scope.partner.client_moniker).then(function (resp) { - $state.reload() - }) - } - }, - ]) - app.controller('partnerPaymentInfoCtrl', [ - '$scope', - '$http', - '$state', - 'commonDialog', - '$uibModal', - '$sce', - function ($scope, $http, $state, commonDialog, $uibModal, $sce) { - $scope.convertExtParams = [] - $scope.copyHfLink = function () { - var e = document.getElementById('cpbt') - e.select() - var successful = document.execCommand('Copy') - if (successful) { - commonDialog.alert({ title: 'Success', content: '已复制到剪切板!', type: 'success' }) - } else { - commonDialog.alert({ title: 'Error', content: '您的浏览器不支持!', type: 'error' }) - } - } - $scope.copyYeepayLink = function () { - var e = document.getElementById('cpyeepay') - e.select() - var successful = document.execCommand('Copy') - if (successful) { - commonDialog.alert({ title: 'Success', content: '已复制到剪切板!', type: 'success' }) - } else { - commonDialog.alert({ title: 'Error', content: '您的浏览器不支持!', type: 'error' }) - } - } - $scope.copyCBBankPayLink = function () { - var e = document.getElementById('cpcbbankpay') - e.select() - var successful = document.execCommand('Copy') - if (successful) { - commonDialog.alert({ title: 'Success', content: '已复制到剪切板!', type: 'success' }) - } else { - commonDialog.alert({ title: 'Error', content: '您的浏览器不支持!', type: 'error' }) - } - } - $scope.loadPartnerPaymentInfo = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { - $scope.extParams = {} - $scope.paymentInfo = resp.data - $scope.extParams = $scope.paymentInfo.ext_params ? JSON.parse($scope.paymentInfo.ext_params) : null - $scope.convertExtParams = $scope.extParamsEditFlags() - $scope.ctrl.editSubMerchant = false - $scope.ctrl.editAliSubMerchant = false - $scope.ctrl.editMaxOrderAmount = false - $scope.ctrl.editOrderExpiryConfig = false - $scope.ctrl.editRefundPwd = false - $scope.ctrl.editRefundCreditLine = false - }) - } - $scope.extParamsEditFlags = function () { - var paramList = [] - if ($scope.extParams != null) { - for (var key in $scope.extParams) { - var obj = {} - if (typeof $scope.extParams[key] != 'boolean') { - obj.name = key - obj.value = $scope.extParams[key] - obj.type = 'string' - obj.flag = false - } else { - obj.name = key - obj.value = $scope.extParams[key] - obj.type = 'boolean' } - paramList.push(obj) - } - } - return paramList - } - $scope.qrConfig = { currency: 'AUD' } - $scope.reloadQRCode = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/qrcode', { params: $scope.qrConfig }).then(function (resp) { - $scope.qrcode = resp.data - }) - } - $scope.reloadQRCode() - $scope.loadPartnerPaymentInfo() - - $scope.showSubMerchantLogs = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/client_sub_merchant_id_log.html', - controller: 'clientSubMerchantIdLogCtrl', - size: 'lg', - resolve: { - logs: [ - '$http', - function ($http) { - return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_sub_merchant_id_logs') - }, - ], - }, - }) - .result.then(function () { - $scope.loadSubClients() - }) - } - - $scope.saveMaxOrderAmount = function (limit) { - if (limit != null && isNaN(limit)) { - commonDialog.alert({ title: 'Error', content: 'Your input is not a number!', type: 'error' }) - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/max_order_amount', { limit: limit }).then( - function (resp) { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.saveCustomerSurchargeRate = function (cofig) { - if (cofig != null && isNaN(cofig)) { - commonDialog.alert({ title: 'Error', content: 'Your input is not a number!', type: 'error' }) - return - } - if (!$scope.paymentInfo.rate_value) { - commonDialog.alert({ - title: 'Error', - content: 'The merchant has not pass approval process', - type: 'error', - }) - return - } - if (cofig > 3 || cofig < parseFloat(Decimal.add($scope.paymentInfo.rate_value, 0.1).toFixed(2))) { - commonDialog.alert({ title: 'Error', content: 'Not in the valid range', type: 'error' }) - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/customer_surcharge_rate', { customer_surcharge_rate: cofig }).then( - function (resp) { - $scope.loadPartnerPaymentInfo() - $scope.ctrl.editCustomerSurchargeRate = false - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.saveOrderExpiryConfig = function (config) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/order_expiry_config', { order_expiry_config: config }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.resetRefundPwd = function (config) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/reset/refund_pwd', { new_refund_password: config }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.setRefundCreditLine = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/refund_credit_line', { refund_credit_line: $scope.paymentInfo.refund_credit_line }).then( - function (resp) { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.updateClientQRCodePaySurCharge = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.qrcode_surcharge) { - $scope.init.qrcode_surcharge = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/qrcode_surcharge', { qrcode_surcharge: $scope.paymentInfo.qrcode_surcharge }).then( - function (resp) { - $scope.loadPartnerPaymentInfo() - }, - function () { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.updateClientCBBankPaySurCharge = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cbbank_surcharge', { cbbank_surcharge: $scope.paymentInfo.cbbank_surcharge }).then( - function () { - // $scope.loadPartnerPaymentInfo(); - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Customer Pay for Surcharge for Retail', - content: resp.data.message, - type: 'error', - }) - } - ) - } - - $scope.updateClientApiSurCharge = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.api_surcharge) { - $scope.init.api_surcharge = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/api_surcharge', { api_surcharge: $scope.paymentInfo.api_surcharge }).then( - function (resp) { - $scope.loadPartnerPaymentInfo() - }, - function () { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.updateClientRetailPaySurCharge = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.retail_surcharge) { - $scope.init.retail_surcharge = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/retail_surcharge', { retail_surcharge: $scope.paymentInfo.retail_surcharge }).then( - function (resp) { - $scope.loadPartnerPaymentInfo() - }, - function () { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.ctrl = {} - $scope.saveSubMerchantId = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', { sub_merchant_id: $scope.paymentInfo.sub_merchant_id }).then( - function (resp) { - $scope.refreshWechatInstitutionMerchantId() - $scope.ctrl.editSubMerchant = false - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.refreshWechatInstitutionMerchantId = function () { - $http - .put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_institution_merchant_id', { - wechat_institution_merchant_id: $scope.paymentInfo.wechat_institution_merchant_id, - }) - .then( - function (resp) { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.saveAliSubMerchantId = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.paymentInfo.ali_sub_merchant_id }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Modify Ali Sub Merchant ID successfully', - type: 'success', - }) - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.submitAlipaySubId = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms_json').then(function (resp) { - $scope.alipay_gms_json = resp.data - commonDialog - .confirm({ - title: 'Warning', - content: '是否使用该商户的现有信息进件？', - json: $scope.alipay_gms_json, - }) - .then(function () { - $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then( - function () { - commonDialog.alert({ title: 'Success', content: 'Alipay进件成功', type: 'success' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '进件失败：' + resp.data.message, type: 'error' }) + $scope.initMerchantCode() + $scope.partner.company_phone_c = 61 + $scope.partner.contact_phone_c = 61 + $scope.partner.client_pay_type = [] + $scope.partner.client_pay_desc = [] + $scope.merchantIsValid = false + $scope.merchantCodeChecked = false + $scope.wechatMccIndustries = wechatGoodMcc.configs() + $scope.checkExpriedate = function (value) { + if (value) { + $scope.partner.certificat_expire_date_premanent = false + $scope.partner.certificat_expire_date_NA = false } - ) - }) - }) - } - $scope.queryAlipayGms = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms').then( - function (resp) { - commonDialog.alert({ title: 'Success', content: resp.data.result_status, type: 'success' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) - } - ) - } - $scope.submitAlipayOnlineSubId = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms_json').then(function (resp) { - $scope.alipayOnline_gms_json = resp.data - commonDialog - .confirm({ - title: 'Warning', - content: '是否使用该商户的现有信息进件？', - json: $scope.alipayOnline_gms_json, - }) - .then(function () { - $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms').then( - function () { - commonDialog.alert({ title: 'Success', content: '提示：AlipayOnline进件成功', type: 'success' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '进件失败：' + resp.data.message, type: 'error' }) + } + $scope.checkExpriedateOther = function (value) { + if (value == 'PERMANENT') { + if ($scope.partner.certificat_expire_date_premanent) { + $scope.partner.certificat_expire_date_NA = false + $scope.partner.certificat_expire_date_d = null + } + } else if (value == 'N/A') { + if ($scope.partner.certificat_expire_date_NA) { + $scope.partner.certificat_expire_date_premanent = false + $scope.partner.certificat_expire_date_d = null + } } - ) - }) - }) - } - $scope.queryAlipayOnlineGms = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms').then( - function (resp) { - commonDialog.alert({ title: 'Success', content: resp.data.result_status, type: 'success' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) - } - ) - } - $scope.refreshCredential = function () { - commonDialog - .confirm({ - title: 'Warning', - content: 'Refresh Credential will expire the current one, which will cause the current payment service disabled. Are you sure going on?', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/credential_code').then( - function () { - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.init = { - jsapi: false, - gateway: false, - offline: false, - refund: false, - common_sub_merchant_id: false, - channel: {}, - gateway_alipay_online: false, - hf_Link: false, - enable_hf_email_notice: false, - enable_yeepay_link: false, - enable_yeepay_email_notice: false, - } - $scope.switchCommonSubMerchantId = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.common_sub_merchant_id) { - $scope.init.common_sub_merchant_id = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/common_sub_merchant_id', { allow: $scope.paymentInfo.common_sub_merchant_id }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change common_sub_merchant_id permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + } + var resetClientPayDescByTpey = function (type) { + type = parseInt(type) + if (type == 1) { + removeClientPayDesc($scope.partner.client_pay_desc, '10') + } + if (type == 2) { + removeClientPayDesc($scope.partner.client_pay_desc, '20') + } + } - $scope.switchSubManage = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.sub_manage) { - $scope.init.sub_manage = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/sub_manage', { allow: $scope.paymentInfo.sub_manage }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change Sub Partners Manage status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - - var info = [] - $scope.decideCompliance = function (name) { - var keywords = ['education', 'financial', 'train', 'immigrant', 'invest', '律师咨询', '会计事务所', '移民', '留学', '娱乐', '金融', '地产', '投资'] - for (var i = 0; i < keywords.length; i++) { - if (name.indexOf(keywords[i]) != -1) { - return true - } - } - return false - } - $scope.getComplianceInfo = function () { - if ($scope.paymentInfo.company_name != null) { - if ($scope.decideCompliance($scope.paymentInfo.company_name)) { - info.push('Company Name') - } - } - if ($scope.paymentInfo.short_name != null) { - if ($scope.decideCompliance($scope.paymentInfo.short_name)) { - info.push('Short Name') - } - } - if ($scope.paymentInfo.business_structure != null) { - if ($scope.decideCompliance($scope.paymentInfo.business_structure)) { - info.push('Business Structure') - } - } - } - $scope.toggleChannel = function (channel) { - if (!channel) { - return - } - if (!$scope.paymentInfo) { - return - } - // if (!$scope.init.channel[channel]) { - // $scope.init.channel[channel] = true - // return - // } - $scope.getComplianceInfo() - if ($scope.paymentInfo['enable_wechat'] && channel == 'wechat' && $scope.paymentInfo.open_status == 5 && info.length > 0) { - commonDialog - .confirm({ - title: 'Warning', - contentHtml: $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],' + info.toString() + '存在微信渠道不合规信息'), - }) - .then(function () { - $scope.saveChannel(channel) - }) - } else { - $scope.saveChannel(channel) - } - info = [] - } - $scope.saveChannel = function (channel) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/channels/' + channel + '/permission', { allow: $scope.paymentInfo['enable_' + channel] }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change ' + channel + ' channel permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.toggleHfLink = function (channel) { - if (!channel) { - return - } - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.hf_Link) { - $scope.init.hf_Link = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/hf', { allow: $scope.paymentInfo.enable_link }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change enable_link permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + var compare = function (x, y) { + x = parseInt(x) + y = parseInt(y) + if (x < y) { + return -1 + } else if (x > y) { + return 1 + } else { + return 0 + } + } + $scope.toggleClientPayType = function (type) { + var $idx = $scope.partner.client_pay_type.indexOf(type) + if ($idx >= 0) { + $scope.partner.client_pay_type.splice($idx, 1) + resetClientPayDescByTpey(type) + } else { + $scope.partner.client_pay_type.push(type) + $scope.partner.client_pay_type.sort(compare) + } + } + $scope.toggleClientPayDesc = function (type) { + var $idx = $scope.partner.client_pay_desc.indexOf(type) + if ($idx >= 0) { + if (type == '203') { + removeClientPayDesc($scope.partner.client_pay_desc, '2030') + } + $scope.partner.client_pay_desc.splice($idx, 1) + } else { + $scope.partner.client_pay_desc.push(type) + $scope.partner.client_pay_desc.sort(compare) + } + } + $scope.business_structures = businessStructuresMap.configs() + $scope.industries = industryMap.configs() - $scope.toggleGatewayLink = function (channel) { - if (!channel) { - return - } - if (!$scope.paymentInfo) { - return - } - var channelLink = 'enable_' + channel + '_link' - if (!$scope.init[channelLink]) { - $scope.init[channelLink] = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/' + channel, { allow: $scope.paymentInfo[channelLink] }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change ' + channelLink + ' permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.listReferrers = function () { + $http.get('/sys/orgs/referrer').then(function (resp) { + $scope.referrers = resp.data + }) + } + $scope.listReferrers() - $scope.toggleCBBankPayLink = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cb_bankpay', { allow: $scope.paymentInfo.enable_cb_bankpay_link }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change cb_bankpay permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.cb_bankpay = [] - $scope.cbChannelConfig = function () { - $http.get('/sysconfig/payment/config').then(function (resp) { - resp.data.forEach(function (channel) { - if (channel.type === 1) { - $scope.cb_bankpay.push(channel) - } - }) - }) - } - $scope.cbChannelConfig() - $scope.updateCBBankPayConfig = function (key, channel) { - var content = '' - if (channel == null) { - content = '你确定要将支付通道跟随系统' - } else { - content = '你确定要将支付通道更改为：' + channel - } - commonDialog - .confirm({ - title: 'Confirm', - content: content, - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cb_bankpay/' + key + '/channel_id', { channel_id: channel }).then( - function (resp) { - commonDialog.alert({ type: 'success', title: 'Success', content: '修改成功' }) - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ type: 'error', title: 'Error', content: resp.data.message }) - $scope.loadPartnerPaymentInfo() - } - ) - }) - } - $scope.toggleGatewayEmailNotice = function (channel) { - if (!$scope.paymentInfo) { - return - } - var channelNotice = 'enable_' + channel + '_email_notice' - if (!$scope.init[channelNotice]) { - $scope.init[channelNotice] = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/' + channel + '/email_notice', { allow: $scope.paymentInfo[channelNotice] }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change ' + channelNotice + ' permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.alipayMccCategory = {} + $scope.loadAlipayCategory = function () { + $http.get('/static/data/alipayMcc.json').then(function (resp) { + $scope.alipayMccCategory = resp.data + }) + } + $scope.loadAlipayCategory() - $scope.toggleHfEmailNotice = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.enable_hf_email_notice) { - $scope.init.enable_hf_email_notice = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/hf/email_notice', { allow: $scope.paymentInfo.enable_hf_email_notice }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change enable_hf_email_notice permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.loadJDindustry = function () { + $http.get('/static/data/jdindustry.json').then(function (resp) { + $scope.jdindustry = resp.data + }) + } + $scope.loadJDindustry() - $scope.toggleJsApi = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.jsapi) { - $scope.init.jsapi = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/jsapi_permission', { allow: $scope.paymentInfo.enable_jsapi }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change JSApi permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.toggleGateway = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.gateway) { - $scope.init.gateway = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/gateway_permission', { allow: $scope.paymentInfo.enable_gateway }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Gateway permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.toggleGatewayUpgrade = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.gateway_upgrade) { - $scope.init.gateway_upgrade = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/gateway_upgrade', { gateway_upgrade: $scope.paymentInfo.gateway_upgrade }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Gateway Upgrade status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.toggleGatewayAlipayOnline = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.gateway_alipay_online) { - $scope.init.gateway_alipay_online = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/gateway_alipay_online', { gateway_alipay_online: $scope.paymentInfo.gateway_alipay_online }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Gateway Alipay Online status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.toggleRefund = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.enable_refund) { - $scope.init.enable_refund = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/refund_permission', { allow: $scope.paymentInfo.enable_refund }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Refund permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.togglePreRefund = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.enable_pre_refund) { - $scope.init.enable_pre_refund = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/pre_refund_permission', { allow: $scope.paymentInfo.enable_pre_refund }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Refund permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - $scope.toggleOffline = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.offline) { - $scope.init.offline = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/offline_permission', { allow: $scope.paymentInfo.enable_retail }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Offline permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.loadLakalaPayindustry = function () { + $http.get('/static/data/lakalapayindustry.json').then(function (resp) { + $scope.lakalapayindustry = resp.data + }) + } + $scope.loadLakalaPayindustry() - $scope.switchInternationalCard = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.enable_International_card) { - $scope.init.enable_International_card = true - return - } - $http - .put('/sys/partners/' + $scope.partner.client_moniker + '/payment_card_permission', { - key: 'enable_international_card', - allow: $scope.paymentInfo.enable_international_card, - }) - .then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change international card permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - - $scope.switchThreeDS = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.enable_threeds) { - $scope.init.enable_threeds = true - return - } - $http - .put('/sys/partners/' + $scope.partner.client_moniker + '/payment_card_permission', { - allow: $scope.paymentInfo.enable_threeds, - key: 'enable_threeds', - }) - .then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change international card permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - - $scope.changePaymentPage = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_page_version', { paypad_version: $scope.paymentInfo.paypad_version }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Payment Page Version', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.loadLakalaPaySettle = function () { + $http.get('/static/data/lakalapaysettle.json').then(function (resp) { + $scope.lakalapaysettle = resp.data + }) + } + $scope.loadLakalaPaySettle() - $scope.changeCBBankPaymentPage = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cbbank_payment_page_version', { cbbank_paypad_version: $scope.paymentInfo.cbbank_paypad_version }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change CBBank Payment Page Version', - content: resp.data.message, - type: 'error', - }) - } - ) - } - - // 更改支付成功页 - $scope.changePaySuccessPage = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/paysuccess_version', { paysuccess_version: $scope.paymentInfo.paysuccess_version }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change Payment Success Page Version', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.loadLakalaPayGoods = function () { + $http.get('/static/data/lakalapaygoods.json').then(function (resp) { + $scope.lakalapaygoods = resp.data + }) + } + $scope.loadLakalaPayGoods() - $scope.toggleRequireCustInfo = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.require_custinfo) { - $scope.init.require_custinfo = true - return - } - $http.post('/sys/partners/' + $scope.partner.client_moniker + '/requireCustinfo', { allow: $scope.paymentInfo.require_custinfo }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change require customer Info permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.loadRoyalpayindustry = function () { + $http.get('/static/data/royalpayindustry.json').then(function (resp) { + $scope.royalpayindustry = resp.data + }) + } + $scope.loadRoyalpayindustry() - $scope.toggleRequireRemark = function () { - if (!$scope.paymentInfo) { - return - } - if (!$scope.init.require_remark) { - $scope.init.require_remark = true - return - } - $http.post('/sys/partners/' + $scope.partner.client_moniker + '/requireRemark', { allow: $scope.paymentInfo.require_remark }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change require remark permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.loadHfindustry = function () { + $http.get('/static/data/hfindustry.json').then(function (resp) { + $scope.hfindustry = resp.data + }) + } + $scope.loadHfindustry() - $scope.changeBillCodeVersion = function () { - if (!$scope.paymentInfo) { - return - } - $http.post('/sys/partners/' + $scope.partner.client_moniker + '/selectBillVersion', { version: $scope.paymentInfo.billcode_version }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'failed to change require bill version permission status', - content: resp.data.message, - type: 'error', - }) - } - ) - } - - $scope.extChangeParam = function (name, value) { - var flag = true - $scope.convertExtParams.forEach(function (params) { - if (params.name == name && value == '' && params.type == 'string') { - flag = false - } - }) - if (flag) { - $http - .put('/sys/partners/' + $scope.partner.client_moniker + '/ext_config', { - key: name, - value: value, - }) - .then(function () { - $scope.loadPartnerPaymentInfo() - }) - } - } - - $scope.queryWechatSubMerchantIdStatus = function () { - $scope.paymentInfo.sub_merchant_id - $http.get('/sys/partners/' + $scope.paymentInfo.client_moniker + '/get_merchant_ids/' + $scope.paymentInfo.sub_merchant_id + '/status').then(function (resp) { - commonDialog.alert({ - title: 'Wechat Apply Status(' + resp.data.apply_status + ')', - content: resp.data.response_str, - type: 'info', - }) - }) - } - // GatewayAlipay渠道 - $scope.setAlipayChannel = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/modifyAlipayPaymentChannels/' + $scope.partner.client_id + '/' + $scope.paymentInfo.alipay_payment_channels).then( - function (resp) { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Error', - content: resp.data.message, - type: 'error', - }) - } - ) - } - }, - ]) - app.controller('clientSubMerchantIdLogCtrl', [ - '$scope', - '$http', - 'logs', - function ($scope, $http, logs) { - $scope.logs = logs.data - }, - ]) - app.controller('partnerSubCtrl', [ - '$scope', - '$http', - '$uibModal', - function ($scope, $http, $uibModal) { - $scope.toShow = false - $scope.init = { - child_each_refund: false, - sub_manage: false, - } - - $scope.newSubClient = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/add_sub_partner_dialog.html', - controller: 'partnerNewSubPartnerDialogCtrl', - size: 'lg', - resolve: { - clientMoniker: function () { - return $scope.partner.client_moniker - }, - }, - }) - .result.then(function () { - $scope.loadSubClients(1) - }) - } - - $scope.loadSubClients = function (page) { - var params = {} - params.page = page || $scope.pagination.page || 1 - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page', { params: params }).then(function (resp) { - $scope.subPartners = resp.data.data - $scope.pagination = resp.data.pagination - }) - } - - $scope.loadSubClients(1) - - $scope.loadPartnerPaymentInfo = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { - $scope.paymentInfo = resp.data - }) - } - $scope.loadPartnerPaymentInfo() - - $scope.switchSubManage = function () { - if (!$scope.paymentInfo) { - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/sub_manage', { allow: $scope.partner.sub_manage }).then( - function () { - //$scope.loadPartnerPaymentInfo(); - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change Sub Partners Manage status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.onAlipayMccSelect = function (selectedItem) { + $scope.partner.alipay_category = selectedItem.label + $scope.partner.alipayindustry = selectedItem.mccCode + } + $scope.onRoyalPayIndustrySelect = function (selectedItem) { + $scope.partner.royalpay_label = selectedItem.label + $scope.partner.royalpayindustry = selectedItem.mccCode + } - $scope.switchChildEachRefund = function () { - if (!$scope.partner) { - return - } - if (!$scope.init.child_each_refund) { - $scope.init.child_each_refund = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/child_each_refund', { allow: $scope.partner.child_each_refund }).then( - function () { - $scope.loadPartnerPaymentInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change Sub Partners Manage status', - content: resp.data.message, - type: 'error', - }) - } - ) - } + $scope.onHfIndustrySelect = function (selectedItem) { + $scope.partner.hf_label = selectedItem.label + $scope.partner.hfindustry = selectedItem.mccCode + } - $scope.showClient = function (sub_client) { - if ($scope.sub_client_id == sub_client.client_id) { - return - } - $scope.client_monikers = sub_client.level3Clients - $scope.sub_client_id = sub_client.client_id - } - }, - ]) - app.controller('partnerRatesCtrl', [ - '$scope', - '$rootScope', - '$http', - '$uibModal', - 'commonDialog', - '$sce', - '$state', - function ($scope, $rootScope, $http, $uibModal, commonDialog, $sce, $state) { - $scope.bankCtrl = { edit: true, rate_name: 'Wechat', modify_min_settle: false } - $scope.init = { - skip_clearing: false, - tax_in_surcharge: false, - customer_tax_free: false, - allow_surcharge_credit: false, - } - $scope.getBankAccount = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bank_account').then(function (resp) { - $scope.bankaccount = resp.data - $scope.bankCtrl.edit = false - }) - } - $scope.switchSurchargeMode = function () { - if ($scope.partner.surcharge_mode === 'balance') { - commonDialog - .confirm({ - title: 'Warning', - content: '启用收支分离模式清算将使消费者支付手续费模式失效，请确认是否切换？', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', { surcharge_mode: 'distributed' }).then( - function () { - commonDialog.alert({ title: 'Success', content: '已切换为收支分离模式', type: 'success' }) - $scope.partner.surcharge_mode = 'distributed' - $scope.getBalance() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) + // $scope.t2city_map = angular.copy(t2city_map); + + $scope.partner.sameAsContactPerson = false + $scope.checkboxOnclick = function () { + $scope.partner.sameAsContactPerson = !$scope.partner.sameAsContactPerson + if ($scope.partner.sameAsContactPerson) { + $scope.partner.legal_representative_person = $scope.partner.contact_person + $scope.partner.legal_representative_phone_a = $scope.partner.contact_phone_a + $scope.partner.legal_representative_phone_c = $scope.partner.contact_phone_c + $scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p + $scope.partner.legal_representative_email = $scope.partner.contact_email + $scope.partner.legal_representative_job = $scope.partner.contact_job + $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid } - ) - }) - } else { - commonDialog - .confirm({ - title: 'Warning', - content: '请确认是否切换成净值清算模式？', - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', { surcharge_mode: 'balance' }).then( - function () { - commonDialog.alert({ title: 'Success', content: '已切换为净值清算模式', type: 'success' }) - $scope.partner.surcharge_mode = 'balance' - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) + } + + $scope.partner.marketingSameAsContact = false + $scope.checkMarketingSameAsContact = function () { + $scope.partner.marketingSameAsContact = !$scope.partner.marketingSameAsContact + if ($scope.partner.marketingSameAsContact) { + $scope.partner.marketing_person = $scope.partner.contact_person + $scope.partner.marketing_phone_a = $scope.partner.contact_phone_a + $scope.partner.marketing_phone_c = $scope.partner.contact_phone_c + $scope.partner.marketing_phone_p = $scope.partner.contact_phone_p + $scope.partner.marketing_email = $scope.partner.contact_email + $scope.partner.marketing_job = $scope.partner.contact_job + $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid } - ) - }) - } - } - $scope.modifyMinSettle = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/min_settle', { min_settle: $scope.partner.min_settle }).then( - function () { - commonDialog.alert({ title: 'Success', content: '修改起结金额成功', type: 'success' }) - $scope.bankCtrl.modify_min_settle = false - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.getBalance = function () { - $scope.surcharge = {} - - if ($scope.partner.surcharge_mode != undefined && $scope.partner.surcharge_mode === 'distributed') { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_account').then(function (resp) { - $scope.surcharge = resp.data - }) - } - } - $scope.getBalance() - $scope.getBankAccount() - $scope.getRates = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/rates').then(function (resp) { - $scope.rates = resp.data - angular.forEach($scope.rates, function (rate) { - rate.active_time = new Date(rate.active_time.substr(0, 10).replace(/-/g, '/')) - rate.expiry_time = new Date(rate.expiry_time.substr(0, 10).replace(/-/g, '/')) - }) - }) - } - $scope.skipClearing = function (skipClearing) { - if (!$scope.init.skip_clearing) { - $scope.init.skip_clearing = true - return - } - if (skipClearing) { - commonDialog - .confirm({ - title: 'Warning', - content: 'This operation will switch skip clearing status. Are you sure?', - }) - .then(function () { - commonDialog.inputText({ title: '请输入跳过清算的原因' }).then(function (text) { - $http - .put('/sys/partners/' + $scope.partner.client_moniker + '/skip_clearing', { - skip_clearing: skipClearing, - remark: text, - }) - .then(function (resp) { - $scope.getBankAccount() - }) - }) - }) - } else { - commonDialog - .confirm({ - title: 'Warning', - content: 'This operation will switch skip clearing status. Are you sure?', - // contentHtml: $sce.trustAsHtml('This operation will switch skip clearing status. Are you sure?') - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/skip_clearing', { skip_clearing: skipClearing }).then(function (resp) { - $scope.getBankAccount() - }) - }) - } - } - $scope.surchargeAccountDetail = function () { - $uibModal - .open({ - templateUrl: '/static/payment/surchargeaccount/templates/partner_surcharge_account_dialog.html', - controller: 'surchargeAccountDetailCtrl', - size: 'lg', - resolve: { - balance: function () { - return $scope.surcharge - }, - partner: function () { - return $scope.partner - }, - transactions: [ - '$http', - function ($http) { - return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/account/transactions') - }, - ], - }, - }) - .result.then( - function () { - $scope.getBalance() - }, - function () { - $scope.getBalance() - } - ) - } - $scope.allowSurchargeCredit = function (allowSurchargeCredit) { - if (!$scope.init.allow_surcharge_credit) { - $scope.init.allow_surcharge_credit = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/allow_surcharge_credit', { allow_surcharge_credit: allowSurchargeCredit }).then(function (resp) {}) - } - $scope.taxInSurcharge = function (taxInSurcharge) { - if (!$scope.init.tax_in_surcharge) { - $scope.init.tax_in_surcharge = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/tax_in_surcharge', { tax_in_surcharge: taxInSurcharge }).then(function (resp) { - $scope.getBankAccount() - }) - } - $scope.switchPreSettle = function (presettle) { - if (!$scope.init.enable_presettle) { - $scope.init.enable_presettle = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/presettle', { enable_presettle: presettle }).then(function (resp) { - $scope.getBankAccount() - }) - } - $scope.customerTaxFree = function (customerTaxFree) { - if (!$scope.init.customer_tax_free) { - $scope.init.customer_tax_free = true - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/customer_tax_free', { customer_tax_free: customerTaxFree }).then(function (resp) { - $scope.getBankAccount() - }) - } - $scope.settleHours = [{ value: undefined, label: 'Default(24:00, GMT+10)' }] - for (var h = 24; h > 0; h--) { - $scope.settleHours.push({ value: h, label: ('00' + h).substr(-2) + ':00, ' + $scope.partner.timezone }) - } - $scope.settleHourConfig = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/settle_hour', { hour: $scope.partner.settle_hour || null }).then( - function () { - commonDialog.alert({ type: 'success', title: 'OK', content: 'Settle Hour configured' }) - }, - function (resp) { - commonDialog.alert({ type: 'error', title: 'Error', content: resp.data.message }) - } - ) - } - $scope.getBankInfo = function (bsb_no) { - if (bsb_no != null && bsb_no !== '') { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bank_account/bank_info/' + bsb_no).then(function (resp) { - $scope.bankInfo = resp.data - $scope.bankaccount.bank = $scope.bankInfo.bank - $scope.bankaccount.city = $scope.bankInfo.city - $scope.bankaccount.address = $scope.bankInfo.address - $scope.bankaccount.system = $scope.bankInfo.system - $scope.bankaccount.postcode = $scope.bankInfo.postcode - $scope.bankaccount.state = $scope.bankInfo.state - $scope.bankaccount.branch = $scope.bankInfo.branch - }) - } else { - commonDialog.alert({ title: 'Error', content: '请先填写BSB No', type: 'error' }) - } - } - $scope.getRates() - $scope.saveBankAccount = function () { - if (isNaN($scope.bankaccount.account_no)) { - alert('Account No应输入数字!') - return - } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/bank_account', $scope.bankaccount).then( - function () { - $scope.getBankAccount() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.newCardPaymentRates = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/partner_new_card_payment_rate.html', - controller: 'newCardPaymentRateDialogCtrl', - resolve: { - sys_common_rate: function () { - return $http.get('/sys/partners/sys_card_rates') - }, - clientMoniker: function () { - return $scope.partner.client_moniker - }, - cost_rate_channel: function () { - return $scope.cost_rate_channel - }, - }, - }) - .result.then(function () { - $scope.getRates() - }) - } - $scope.newRate = function () { - var name = $scope.bankCtrl.rate_name - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/partner_new_rate.html', - controller: 'newRateDialogCtrl', - resolve: { - rate: function () { - return { rate_name: name, clean_days: 3 } - }, - sys_common_rate: function () { - return $http.get('/sys/partners/sys_rates') - }, - clientMoniker: function () { - return $scope.partner.client_moniker - }, - }, - }) - .result.then(function () { - $scope.getRates() - }) - } - $scope.editRate = function (rate) { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/rate_config_dialog.html', - controller: 'rateConfigDialogCtrl', - resolve: { - rate: function () { - return rate - }, - clientMoniker: function () { - return $scope.partner.client_moniker - }, - }, - }) - .result.then(function () { - $scope.getRates() - }) - } + } - $scope.complianceCheck = function () { - if (!$rootScope.complianceCheck) { - $rootScope.complianceCheck = {} - } - $rootScope.complianceCheck.client_id = $scope.partner.client_id - $rootScope.complianceCheck.bankAccount = true - } - $scope.complianceChangeCheck = function () { - if ($rootScope.complianceCheck) { - if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { - delete $rootScope.complianceCheck - } - } - } - $scope.complianceChangeCheck() - - // 是否为alipayplus - $scope.isAlipayCN = true - // 修改渠道 - $scope.changeAlipayPlusRateState = function (flag) { - $scope.isAlipayCN = flag - } - // 过滤渠道 - $scope.isAlipayPlus = function (item) { - if ($scope.isAlipayCN) { - return item.rate_name === 'AlipayPlus' && (item.pay_type === 'alipay_cn_retail' || item.pay_type === 'alipay_cn_online') - } else { - return item.rate_name === 'AlipayPlus' && item.pay_type === 'alipay_other' - } - } - // 新增alipay+费率 - $scope.newAlipayPlusRate = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/partner_new_alipayplus_rate.html', - resolve: { - rate: function () { - return { - rate_name: 'AlipayPlus', - clean_days: '3', - } - }, - sys_common_rate: function () { - return $http.get('/sys/partners/sys_rates') - }, - clientMoniker: function () { - return $scope.partner.client_moniker - }, - }, - controller: [ - '$scope', - '$http', - 'rate', - 'sys_common_rate', - 'clientMoniker', - function ($scope, $http, rate, sys_common_rate, clientMoniker) { - $scope.rate = angular.copy(rate) - $scope.sysRateConfig = angular.copy(sys_common_rate.data) - $scope.ctrl = { sending: false } - $scope.saveRate = function (form) { - if (form.$invalid) { + $scope.partner.sameAsAddress = false + $scope.sameAddress = function () { + $scope.partner.sameAsAddress = !$scope.partner.sameAsAddress + if ($scope.partner.sameAsAddress) { + $scope.partner.registered_address = $scope.partner.address + $scope.partner.registered_suburb = $scope.partner.suburb + $scope.partner.registered_postcode = $scope.partner.postcode + $scope.partner.registered_state = $scope.partner.state + } + } + + $scope.timezones = timezone.configs() + $scope.states = stateMap.configs() + $scope.countries = countryMap.configs() + $scope.checkMerchantCodeIsValid = function (code) { + if (code.length != 4) { + $scope.merchantCodeChecked = false + $scope.merchantIsValid = false + return + } + $http.get('/sys/partners/init/check_code_isvalid', {params: {clientMoniker: code}}).then(function (response) { + $scope.merchantIsValid = response.data + $scope.merchantCodeChecked = true + }) + } + $scope.saveSubPartner = function (form) { + if (form.$invalid) { angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } + if (key.indexOf('$') < 0) { + item.$dirty = true + } }) return - } - $scope.errmsg = null - $scope.ctrl.sending = true - $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( + } + $scope.errmsg = null + if (!$scope.partner.business_structure || $scope.partner.business_structure == '') { + alert('Please select the business structure') + return + } + if ($scope.partner.business_structure != 'Registered body(Sole Trader)') { + if ($scope.partner.certificat_expire_date_d) { + $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d) + } else if ($scope.partner.certificat_expire_date_premanent) { + $scope.partner.certificat_expire_date = 'PERMANENT' + } else if ($scope.partner.certificat_expire_date_NA) { + $scope.partner.certificat_expire_date = 'N/A' + } else { + alert('Certificate expiration time is required') + return + } + } + if ($scope.partner.company_name.indexOf('Migration') != -1) { + alert('Company Name包含敏感词汇，请检查后重新提交！') + return + } + + if ($scope.partner.company_phone_a && '' + $scope.partner.company_phone_a != '') { + if ($scope.partner.company_phone_a.indexOf('0') == 0) { + alert("Please remove the first character '0' of area code") + return + } + } + if ($scope.partner.contact_phone && '' + $scope.partner.contact_phone != '') { + if ($scope.partner.contact_phone.indexOf('0') == 0) { + alert("Please remove the first character '0' of area code") + return + } + } + $scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p + $scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p + $scope.partner.legal_representative_phone = + '+' + $scope.partner.legal_representative_phone_c + ($scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p + $scope.partner.marketing_phone = '+' + $scope.partner.marketing_phone_c + ($scope.partner.marketing_phone_a || '') + $scope.partner.marketing_phone_p + + if ($scope.partner.company_phone.indexOf(' ') != -1) { + alert('Company Phone can not contain space character') + return + } + if ($scope.partner.contact_phone.indexOf(' ') != -1) { + alert('Contact Phone can not contain space character') + return + } + if ($scope.partner.contact_email.indexOf(' ') != -1) { + alert('Contact email Phone can not contain space character') + return + } + if ($scope.partner.suburb.indexOf(' ') != -1) { + alert('suburb can not contain two and more continuous space characters') + return + } + if ($scope.partner.acn && $scope.partner.business_structure == 'Company') { + if ($scope.partner.acn.length != 9) { + alert('Acn is not valid') + return + } + } + // if (!$scope.partner.logo_url) { + // alert("Logo is necessary!"); + // return; + // } + if ($scope.partner.client_pay_type.indexOf('2') >= 0) { + if (!$scope.partner.company_photo) { + alert('Shop Photo1 is necessary') + return + } + if (!$scope.partner.store_photo) { + alert('Shop Photo2 is necessary') + return + } + } + // if(!window.frames['merchant_detail'].merchant_location){ + // alert("Please Locate Merchant Location!"); + // return; + // } + if ($scope.partner.client_pay_type.length == 0) { + alert('请选择商户支付场景') + return + } + if ($scope.partner.client_pay_desc.length == 0) { + alert('请选择商户支付方式') + return + } + if ($scope.partner.client_pay_type.indexOf('1') >= 0) { + if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) { + alert('请检查线上支付场景是否已选择支付方式') + return + } + } + if ($scope.partner.client_pay_type.indexOf('2') >= 0) { + if ($scope.partner.client_pay_desc.join(',').indexOf('20') < 0) { + alert('请检查线下支付场景是否已选择支付方式') + return + } + } + if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) { + if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) { + alert('请检查线下支付是否已选择收银系统类型') + return + } + } + $scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',') + $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',') + $http.post('/sys/partners/' + clientMoniker + '/sub_clients', $scope.partner).then( function () { - $scope.ctrl.sending = false - $scope.$close() + $scope.updateMerchantLocation() + $scope.$close() }, function (resp) { - $scope.ctrl.sending = false - $scope.errmsg = resp.data.message - } - ) - } - $scope.changeDays = function () { - // if ($scope.rate.clean_days) { - // switch ($scope.rate.clean_days) { - // case '1': { - // $scope.rate.alipayplus = parseFloat($scope.sysRateConfig.t1.AlipayPlus) - // break - // } - // case '2': { - // $scope.rate.alipayplus = parseFloat($scope.sysRateConfig.t2.AlipayPlus) - // break - // } - // case '3': { - // $scope.rate.alipayplus = parseFloat($scope.sysRateConfig.t3.AlipayPlus) - // break - // } - // } - // } - } - }, - ], - }) - .result.then(function () { - $scope.getRates() - }) - } - }, - ]) - app.controller('surchargeAccountDetailCtrl', [ - '$scope', - '$http', - 'balance', - 'partner', - 'transactions', - 'commonDialog', - function ($scope, $http, balance, partner, transactions, commonDialog) { - $scope.surcharge = angular.copy(balance) - $scope.surchargeDetailData = angular.copy(transactions.data) - $scope.partner = angular.copy(partner) - $scope.canAddDetail = false - $scope.params = {} - - $scope.getBalance = function () { - if ($scope.partner.surcharge_mode != undefined && $scope.partner.surcharge_mode == 'distributed') { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_account').then(function (resp) { - $scope.surcharge = resp.data - }) - } - } - - $scope.getTransactions = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/account/transactions').then(function (resp) { - $scope.surchargeDetailData = resp.data - }) - } - - $scope.addDetail = function () { - $scope.canAddDetail = true - } - - $scope.cancel = function () { - $scope.canAddDetail = false - $scope.params = {} - } - $scope.save = function () { - $http - .post('/sys/partners/' + $scope.partner.client_moniker + '/account/save', { - amount: $scope.params.amount, - remark: $scope.params.remark, - }) - .then( - function (resp) { - $scope.getTransactions() - $scope.getBalance() - $scope.canAddDetail = false - $scope.params = {} - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - ]) - app.controller('newCardPaymentRateDialogCtrl', [ - '$scope', - '$http', - 'sys_common_rate', - 'clientMoniker', - function ($scope, $http, sys_common_rate, clientMoniker) { - $scope.rate = {} - $scope.card_payment_normal = true - $scope.card_payment_switch_title = 'Direct Debit' - $scope.card_payment = [ - { - type: 'rpaypmt_card', - title: 'Card Payment', - }, - { - type: 'rpaypmt_dd', - title: 'Direct Debit', + $scope.errmsg = resp.data.message + $scope.partner.client_pay_type = $scope.partner.client_pay_type.split(',') + $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.split(',') + } + ) + } + $scope.uploadLogo = function (file) { + if (file != null) { + if (file.size > 1 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'}) + } else { + $scope.logoProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.logoProgress + $scope.partner.logo_id = resp.data.fileid + $scope.partner.logo_url = resp.data.url + }, + function (resp) { + delete $scope.logoProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.logoProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.uploadShopPhoto = function (file) { + if (file != null) { + if (file.size > 2 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'}) + } else { + $scope.shopPhotoProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.shopPhotoProgress + $scope.partner.company_photo = resp.data.url + }, + function (resp) { + delete $scope.shopPhotoProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.shopPhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.uploadStorePhoto = function (file) { + if (file != null) { + if (file.size > 2 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'}) + } else { + $scope.storePhotoProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.storePhotoProgress + $scope.partner.store_photo = resp.data.url + }, + function (resp) { + delete $scope.storePhotoProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.storePhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.updateMerchantLocation = function () { + var params = window.frames['merchant_detail'].merchant_location + if (params) { + $http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () { + }) + } + } }, - ] - $scope.cardRateConfig = $scope.card_payment[0] - $scope.switchCardRateConfig = function () { - $scope.card_payment_normal = !$scope.card_payment_normal - $scope.rate = {} - if ($scope.card_payment_normal) { - $scope.cardRateConfig = $scope.card_payment[0] - $scope.card_payment_switch_title = 'Direct Debit' - } else { - $scope.cardRateConfig = $scope.card_payment[1] - $scope.card_payment_switch_title = 'Card Payment' - } - } - $scope.sysRateConfig = angular.copy(sys_common_rate.data) - $scope.ctrl = { sending: false } - $scope.saveRate = function (form) { - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - $scope.errmsg = null - $scope.ctrl.sending = true - $scope.rate.type = $scope.cardRateConfig.type - $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( - function () { - $scope.ctrl.sending = false - $scope.$close() - }, - function (resp) { - $scope.ctrl.sending = false - $scope.errmsg = resp.data.message - } - ) - } - $scope.changeDays = function () { - if ($scope.rate.clean_days && $scope.card_payment_normal) { - switch ($scope.rate.clean_days) { - case '1': { - $scope.rate.rate_value = parseFloat($scope.sysRateConfig.t1.domestic_rate) - $scope.rate.transaction_fee = parseFloat($scope.sysRateConfig.t1.transaction_fee) - break - } - case '2': { - $scope.rate.rate_value = parseFloat($scope.sysRateConfig.t2.domestic_rate) - $scope.rate.transaction_fee = parseFloat($scope.sysRateConfig.t2.transaction_fee) - break - } - case '3': { - $scope.rate.rate_value = parseFloat($scope.sysRateConfig.t3.domestic_rate) - $scope.rate.transaction_fee = parseFloat($scope.sysRateConfig.t3.transaction_fee) - break - } - } - } - } - }, - ]) - app.controller('newRateDialogCtrl', [ - '$scope', - '$http', - 'rate', - 'sys_common_rate', - 'clientMoniker', - function ($scope, $http, rate, sys_common_rate, clientMoniker) { - $scope.rate = angular.copy(rate) - $scope.sysRateConfig = angular.copy(sys_common_rate.data) - $scope.ctrl = { sending: false } - $scope.saveRate = function (form) { - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - $scope.errmsg = null - $scope.ctrl.sending = true - $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( - function () { - $scope.ctrl.sending = false - $scope.$close() - }, - function (resp) { - $scope.ctrl.sending = false - $scope.errmsg = resp.data.message - } - ) - } - $scope.changeDays = function () { - if ($scope.rate.clean_days) { - switch ($scope.rate.clean_days) { - case '1': { - $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t1.Wechat) - $scope.rate.alipay_rate_value = parseFloat($scope.sysRateConfig.t1.Alipay) - $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t1.AlipayOnline) - $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t1.Rpay) - $scope.rate.transaction_fee = 0 - break - } - case '2': { - $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t2.Wechat) - $scope.rate.alipay_rate_value = parseFloat($scope.sysRateConfig.t2.Alipay) - $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t2.AlipayOnline) - $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t2.Rpay) - $scope.rate.transaction_fee = 0 - break - } - case '3': { - $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t3.Wechat) - $scope.rate.alipay_rate_value = parseFloat($scope.sysRateConfig.t3.Alipay) - $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t3.AlipayOnline) - $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t3.Rpay) - $scope.rate.transaction_fee = 0 - break - } - } - } - } - }, - ]) - app.controller('partnerAccountsCtrl', [ - '$scope', - '$http', - '$uibModal', - 'commonDialog', - function ($scope, $http, $uibModal, commonDialog) { - $scope.partnerRoles = partnerRoles - $scope.loadPartnerAccounts = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/accounts').then(function (resp) { - $scope.accounts = resp.data - }) - } - $scope.loadPartnerAccounts() - $scope.addAccount = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/add_partner_account_dialog.html', - controller: 'partnerAddAccountDialogCtrl', - backdrop: false, - resolve: { - partner: function () { - return $scope.partner - }, - }, - }) - .result.then(function () { - $scope.loadPartnerAccounts() - }) - } - $scope.updateAccountRole = function (account) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/accounts/' + account.account_id + '/role', { role: account.role }).then( - function () {}, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.resetPwd = function (account) { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/partner_account_reset_pwd_dialog.html', - controller: 'partnerResetPwdDialogCtrl', - backdrop: false, - size: 'sm', - resolve: { - partner: function () { - return $scope.partner - }, - account: function () { - return account - }, - }, - }) - .result.then(function () { - commonDialog.alert({ title: 'Success!', content: 'Password Changed Successfully', type: 'success' }) - }) - } - $scope.disableAccount = function (account) { - commonDialog - .confirm({ - title: 'Confirm Operation', - content: 'Are you sure to disable account ' + account.display_name + ' ?', - }) - .then(function () { - $http.delete('/sys/partners/' + $scope.partner.client_moniker + '/accounts/' + account.account_id).then( - function () { - $scope.loadPartnerAccounts() - }, - function (resp) { - commonDialog.alert({ title: 'Fail!', content: resp.data.message, type: 'error' }) - } - ) - }) - } - }, - ]) - app.controller('partnerAddAccountDialogCtrl', [ - '$scope', - '$http', - 'partner', - function ($scope, $http, partner) { - $scope.account = { role: 1 } - $scope.partnerRoles = partnerRoles - $scope.account.nation_code = 61 - $scope.saveAccount = function (form) { - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - if ($scope.account.pwd && $scope.account.pwd.length < 8) { - $scope.errmsg = 'Password length must more than 8 !' - return - } - var regex = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/ - if ($scope.account.pwd && !regex.test($scope.account.pwd)) { - $scope.errmsg = 'The password needs to consist of 8-16 digits and letters !' - return - } - $scope.errmsg = null - $http.post('/sys/partners/' + partner.client_moniker + '/accounts', $scope.account).then( - function () { - $scope.$close() - }, - function (resp) { - $scope.errmsg = resp.data.message - } - ) - } - }, - ]) - app.controller('partnerResetPwdDialogCtrl', [ - '$scope', - '$http', - 'partner', - 'account', - function ($scope, $http, partner, account) { - $scope.updatePwd = function () { - $scope.errmsg = null - if ($scope.reset.pwd && $scope.reset.pwd.length < 8) { - $scope.errmsg = 'Password length must more than 8 !' - return - } - var regex = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/ - if ($scope.reset.pwd && !regex.test($scope.reset.pwd)) { - $scope.errmsg = 'The password needs to consist of 8-16 digits and letters !' - return - } - $http.put('/sys/partners/' + partner.client_moniker + '/accounts/' + account.account_id + '/pwd', { pwd: $scope.reset.pwd }).then( - function () { - $scope.$close() - }, - function (resp) { - $scope.errmsg = resp.data.message - } - ) - } - }, - ]) - app.controller('partnerNewSubPartnerDialogCtrl', [ - '$rootScope', - '$scope', - '$http', - '$state', - 'Upload', - 'commonDialog', - 'timezone', - 'clientMoniker', - 'industryMap', - 'businessStructuresMap', - 'stateMap', - 'countryMap', - 'wechatGoodMcc', - '$filter', - function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, clientMoniker, industryMap, businessStructuresMap, stateMap, countryMap, wechatGoodMcc, $filter) { - if ($scope.partner_application) { - $scope.partner = angular.copy($scope.partner_application) - delete $rootScope.partner_application - } else { - $scope.partner = { timezone: 'Australia/Melbourne' } - } - $scope.initMerchantCode = function () { - $http.get('/sys/partners/init/merchant_code').then(function (response) { - $scope.partner.client_moniker = response.data.partner_code - $scope.merchantCodeChecked = true - $scope.merchantIsValid = true - }) - } - $scope.initMerchantCode() - $scope.partner.company_phone_c = 61 - $scope.partner.contact_phone_c = 61 - $scope.partner.client_pay_type = [] - $scope.partner.client_pay_desc = [] - $scope.merchantIsValid = false - $scope.merchantCodeChecked = false - $scope.wechatMccIndustries = wechatGoodMcc.configs() - $scope.checkExpriedate = function (value) { - if (value) { - $scope.partner.certificat_expire_date_premanent = false - $scope.partner.certificat_expire_date_NA = false - } - } - $scope.checkExpriedateOther = function (value) { - if (value == 'PERMANENT') { - if ($scope.partner.certificat_expire_date_premanent) { - $scope.partner.certificat_expire_date_NA = false - $scope.partner.certificat_expire_date_d = null - } - } else if (value == 'N/A') { - if ($scope.partner.certificat_expire_date_NA) { - $scope.partner.certificat_expire_date_premanent = false - $scope.partner.certificat_expire_date_d = null - } - } - } - var resetClientPayDescByTpey = function (type) { - type = parseInt(type) - if (type == 1) { - removeClientPayDesc($scope.partner.client_pay_desc, '10') - } - if (type == 2) { - removeClientPayDesc($scope.partner.client_pay_desc, '20') - } - } - - var compare = function (x, y) { - x = parseInt(x) - y = parseInt(y) - if (x < y) { - return -1 - } else if (x > y) { - return 1 - } else { - return 0 - } - } - $scope.toggleClientPayType = function (type) { - var $idx = $scope.partner.client_pay_type.indexOf(type) - if ($idx >= 0) { - $scope.partner.client_pay_type.splice($idx, 1) - resetClientPayDescByTpey(type) - } else { - $scope.partner.client_pay_type.push(type) - $scope.partner.client_pay_type.sort(compare) - } - } - $scope.toggleClientPayDesc = function (type) { - var $idx = $scope.partner.client_pay_desc.indexOf(type) - if ($idx >= 0) { - if (type == '203') { - removeClientPayDesc($scope.partner.client_pay_desc, '2030') - } - $scope.partner.client_pay_desc.splice($idx, 1) - } else { - $scope.partner.client_pay_desc.push(type) - $scope.partner.client_pay_desc.sort(compare) - } - } - $scope.business_structures = businessStructuresMap.configs() - $scope.industries = industryMap.configs() - - $scope.listReferrers = function () { - $http.get('/sys/orgs/referrer').then(function (resp) { - $scope.referrers = resp.data - }) - } - $scope.listReferrers() - - $scope.alipayMccCategory = {} - $scope.loadAlipayCategory = function () { - $http.get('/static/data/alipayMcc.json').then(function (resp) { - $scope.alipayMccCategory = resp.data - }) - } - $scope.loadAlipayCategory() - - $scope.loadJDindustry = function () { - $http.get('/static/data/jdindustry.json').then(function (resp) { - $scope.jdindustry = resp.data - }) - } - $scope.loadJDindustry() - - $scope.loadLakalaPayindustry = function () { - $http.get('/static/data/lakalapayindustry.json').then(function (resp) { - $scope.lakalapayindustry = resp.data - }) - } - $scope.loadLakalaPayindustry() - - $scope.loadLakalaPaySettle = function () { - $http.get('/static/data/lakalapaysettle.json').then(function (resp) { - $scope.lakalapaysettle = resp.data - }) - } - $scope.loadLakalaPaySettle() - - $scope.loadLakalaPayGoods = function () { - $http.get('/static/data/lakalapaygoods.json').then(function (resp) { - $scope.lakalapaygoods = resp.data - }) - } - $scope.loadLakalaPayGoods() - - $scope.loadRoyalpayindustry = function () { - $http.get('/static/data/royalpayindustry.json').then(function (resp) { - $scope.royalpayindustry = resp.data - }) - } - $scope.loadRoyalpayindustry() - - $scope.loadHfindustry = function () { - $http.get('/static/data/hfindustry.json').then(function (resp) { - $scope.hfindustry = resp.data - }) - } - $scope.loadHfindustry() - - $scope.onAlipayMccSelect = function (selectedItem) { - $scope.partner.alipay_category = selectedItem.label - $scope.partner.alipayindustry = selectedItem.mccCode - } - $scope.onRoyalPayIndustrySelect = function (selectedItem) { - $scope.partner.royalpay_label = selectedItem.label - $scope.partner.royalpayindustry = selectedItem.mccCode - } - - $scope.onHfIndustrySelect = function (selectedItem) { - $scope.partner.hf_label = selectedItem.label - $scope.partner.hfindustry = selectedItem.mccCode - } - - // $scope.t2city_map = angular.copy(t2city_map); - - $scope.partner.sameAsContactPerson = false - $scope.checkboxOnclick = function () { - $scope.partner.sameAsContactPerson = !$scope.partner.sameAsContactPerson - if ($scope.partner.sameAsContactPerson) { - $scope.partner.legal_representative_person = $scope.partner.contact_person - $scope.partner.legal_representative_phone_a = $scope.partner.contact_phone_a - $scope.partner.legal_representative_phone_c = $scope.partner.contact_phone_c - $scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p - $scope.partner.legal_representative_email = $scope.partner.contact_email - $scope.partner.legal_representative_job = $scope.partner.contact_job - $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid - } - } - - $scope.partner.marketingSameAsContact = false - $scope.checkMarketingSameAsContact = function () { - $scope.partner.marketingSameAsContact = !$scope.partner.marketingSameAsContact - if ($scope.partner.marketingSameAsContact) { - $scope.partner.marketing_person = $scope.partner.contact_person - $scope.partner.marketing_phone_a = $scope.partner.contact_phone_a - $scope.partner.marketing_phone_c = $scope.partner.contact_phone_c - $scope.partner.marketing_phone_p = $scope.partner.contact_phone_p - $scope.partner.marketing_email = $scope.partner.contact_email - $scope.partner.marketing_job = $scope.partner.contact_job - $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid - } - } - - $scope.partner.sameAsAddress = false - $scope.sameAddress = function () { - $scope.partner.sameAsAddress = !$scope.partner.sameAsAddress - if ($scope.partner.sameAsAddress) { - $scope.partner.registered_address = $scope.partner.address - $scope.partner.registered_suburb = $scope.partner.suburb - $scope.partner.registered_postcode = $scope.partner.postcode - $scope.partner.registered_state = $scope.partner.state - } - } - - $scope.timezones = timezone.configs() - $scope.states = stateMap.configs() - $scope.countries = countryMap.configs() - $scope.checkMerchantCodeIsValid = function (code) { - if (code.length != 4) { - $scope.merchantCodeChecked = false - $scope.merchantIsValid = false - return - } - $http.get('/sys/partners/init/check_code_isvalid', { params: { clientMoniker: code } }).then(function (response) { - $scope.merchantIsValid = response.data - $scope.merchantCodeChecked = true - }) - } - $scope.saveSubPartner = function (form) { - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - $scope.errmsg = null - if (!$scope.partner.business_structure || $scope.partner.business_structure == '') { - alert('Please select the business structure') - return - } - if ($scope.partner.business_structure != 'Registered body(Sole Trader)') { - if ($scope.partner.certificat_expire_date_d) { - $scope.partner.certificat_expire_date = $filter('dateConversionStr')($scope.partner.certificat_expire_date_d) - } else if ($scope.partner.certificat_expire_date_premanent) { - $scope.partner.certificat_expire_date = 'PERMANENT' - } else if ($scope.partner.certificat_expire_date_NA) { - $scope.partner.certificat_expire_date = 'N/A' - } else { - alert('Certificate expiration time is required') - return - } - } - if ($scope.partner.company_name.indexOf('Migration') != -1) { - alert('Company Name包含敏感词汇，请检查后重新提交！') - return - } + ]) + app.controller('partnerPayLogCtrl', [ + '$scope', + '$http', + '$filter', + 'refunder', + 'orderService', + function ($scope, $http, $filter, refunder, orderService) { + $scope.params = {status: 'PAID', channel: 'ALL', textType: 'all', datefrom: new Date(), dateto: new Date()} + $scope.pagination = {} + $scope.isAll = true + $scope.isLevel3All = true + $scope.clients = [$scope.partner] + $scope.showLevel3Clients = false + $scope.subClientTable1 = [$scope.partner] + $scope.subClientTable2 = [] + $scope.choseSubClientNow = 'More' + $scope.more20ChoseSubClient = false + $scope.subSearchText = '' + + $scope.today = new Date() + $scope.chooseToday = function () { + $scope.params.datefrom = $scope.params.dateto = new Date() + $scope.loadTradeLogs(1) + } + $scope.chooseYesterday = function () { + var yesterday = new Date() + yesterday.setDate(yesterday.getDate() - 1) + $scope.params.datefrom = $scope.params.dateto = yesterday + $scope.loadTradeLogs(1) + } + $scope.chooseLast7Days = function () { + $scope.params.dateto = new Date() + var day = new Date() + day.setDate(day.getDate() - 7) + $scope.params.datefrom = day + $scope.loadTradeLogs(1) + } + $scope.thisMonth = function () { + $scope.params.dateto = new Date() + var monthBegin = new Date() + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadTradeLogs(1) + } + $scope.lastMonth = function () { + var monthFinish = new Date() + monthFinish.setDate(0) + $scope.params.dateto = monthFinish + var monthBegin = new Date() + monthBegin.setDate(0) + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadTradeLogs(1) + } + $scope.loadTradeLogs = function (page) { + var params = angular.copy($scope.params) + if (params.datefrom) { + params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') + } + if (params.dateto) { + params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') + } + params.page = page || $scope.pagination.page || 1 + if (params.gateway) { + if (params.gateway.sort().toString() != [0, 1].toString() && params.gateway.sort().toString() != [5, 6].toString()) { + delete params.gatewayChilds + delete params.gatewayChild + } + if (params.gatewayChilds) { + var exist = false + params.gatewayChilds.forEach(function (child) { + if (child == params.gatewayChild) { + exist = true + } + }) + if (!exist) { + params.gatewayChild = null + } + } else { + delete params.gatewayChild + } + } else { + delete params.gatewayChilds + delete params.gatewayChild + } + if ($scope.isAll) { + delete params.client_ids + } + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/trade_logs', {params: params}).then(function (resp) { + $scope.tradeLogs = resp.data.data + $scope.pagination = resp.data.pagination + $scope.analysis = resp.data.analysis + }) + } - if ($scope.partner.company_phone_a && '' + $scope.partner.company_phone_a != '') { - if ($scope.partner.company_phone_a.indexOf('0') == 0) { - alert("Please remove the first character '0' of area code") - return - } - } - if ($scope.partner.contact_phone && '' + $scope.partner.contact_phone != '') { - if ($scope.partner.contact_phone.indexOf('0') == 0) { - alert("Please remove the first character '0' of area code") - return - } - } - $scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p - $scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p - $scope.partner.legal_representative_phone = - '+' + $scope.partner.legal_representative_phone_c + ($scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p - $scope.partner.marketing_phone = '+' + $scope.partner.marketing_phone_c + ($scope.partner.marketing_phone_a || '') + $scope.partner.marketing_phone_p - - if ($scope.partner.company_phone.indexOf(' ') != -1) { - alert('Company Phone can not contain space character') - return - } - if ($scope.partner.contact_phone.indexOf(' ') != -1) { - alert('Contact Phone can not contain space character') - return - } - if ($scope.partner.contact_email.indexOf(' ') != -1) { - alert('Contact email Phone can not contain space character') - return - } - if ($scope.partner.suburb.indexOf(' ') != -1) { - alert('suburb can not contain two and more continuous space characters') - return - } - if ($scope.partner.acn && $scope.partner.business_structure == 'Company') { - if ($scope.partner.acn.length != 9) { - alert('Acn is not valid') - return - } - } - // if (!$scope.partner.logo_url) { - // alert("Logo is necessary!"); - // return; - // } - if ($scope.partner.client_pay_type.indexOf('2') >= 0) { - if (!$scope.partner.company_photo) { - alert('Shop Photo1 is necessary') - return - } - if (!$scope.partner.store_photo) { - alert('Shop Photo2 is necessary') - return - } - } - // if(!window.frames['merchant_detail'].merchant_location){ - // alert("Please Locate Merchant Location!"); - // return; - // } - if ($scope.partner.client_pay_type.length == 0) { - alert('请选择商户支付场景') - return - } - if ($scope.partner.client_pay_desc.length == 0) { - alert('请选择商户支付方式') - return - } - if ($scope.partner.client_pay_type.indexOf('1') >= 0) { - if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) { - alert('请检查线上支付场景是否已选择支付方式') - return - } - } - if ($scope.partner.client_pay_type.indexOf('2') >= 0) { - if ($scope.partner.client_pay_desc.join(',').indexOf('20') < 0) { - alert('请检查线下支付场景是否已选择支付方式') - return - } - } - if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) { - if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) { - alert('请检查线下支付是否已选择收银系统类型') - return - } - } - $scope.partner.client_pay_type = $scope.partner.client_pay_type.join(',') - $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.join(',') - $http.post('/sys/partners/' + clientMoniker + '/sub_clients', $scope.partner).then( - function () { - $scope.updateMerchantLocation() - $scope.$close() - }, - function (resp) { - $scope.errmsg = resp.data.message - $scope.partner.client_pay_type = $scope.partner.client_pay_type.split(',') - $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.split(',') - } - ) - } - $scope.uploadLogo = function (file) { - if (file != null) { - if (file.size > 1 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error' }) - } else { - $scope.logoProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.logoProgress - $scope.partner.logo_id = resp.data.fileid - $scope.partner.logo_url = resp.data.url - }, - function (resp) { - delete $scope.logoProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.logoProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.uploadShopPhoto = function (file) { - if (file != null) { - if (file.size > 2 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error' }) - } else { - $scope.shopPhotoProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.shopPhotoProgress - $scope.partner.company_photo = resp.data.url - }, - function (resp) { - delete $scope.shopPhotoProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.shopPhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.uploadStorePhoto = function (file) { - if (file != null) { - if (file.size > 2 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error' }) - } else { - $scope.storePhotoProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.storePhotoProgress - $scope.partner.store_photo = resp.data.url - }, - function (resp) { - delete $scope.storePhotoProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.storePhotoProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.updateMerchantLocation = function () { - var params = window.frames['merchant_detail'].merchant_location - if (params) { - $http.put('/sys/partners/modify/' + $scope.partner.client_moniker + '/location', params).then(function () {}) - } - } - }, - ]) - app.controller('partnerPayLogCtrl', [ - '$scope', - '$http', - '$filter', - 'refunder', - 'orderService', - function ($scope, $http, $filter, refunder, orderService) { - $scope.params = { status: 'PAID', channel: 'ALL', textType: 'all', datefrom: new Date(), dateto: new Date() } - $scope.pagination = {} - $scope.isAll = true - $scope.isLevel3All = true - $scope.clients = [$scope.partner] - $scope.showLevel3Clients = false - $scope.subClientTable1 = [$scope.partner] - $scope.subClientTable2 = [] - $scope.choseSubClientNow = 'More' - $scope.more20ChoseSubClient = false - $scope.subSearchText = '' - - $scope.today = new Date() - $scope.chooseToday = function () { - $scope.params.datefrom = $scope.params.dateto = new Date() - $scope.loadTradeLogs(1) - } - $scope.chooseYesterday = function () { - var yesterday = new Date() - yesterday.setDate(yesterday.getDate() - 1) - $scope.params.datefrom = $scope.params.dateto = yesterday - $scope.loadTradeLogs(1) - } - $scope.chooseLast7Days = function () { - $scope.params.dateto = new Date() - var day = new Date() - day.setDate(day.getDate() - 7) - $scope.params.datefrom = day - $scope.loadTradeLogs(1) - } - $scope.thisMonth = function () { - $scope.params.dateto = new Date() - var monthBegin = new Date() - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadTradeLogs(1) - } - $scope.lastMonth = function () { - var monthFinish = new Date() - monthFinish.setDate(0) - $scope.params.dateto = monthFinish - var monthBegin = new Date() - monthBegin.setDate(0) - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadTradeLogs(1) - } - $scope.loadTradeLogs = function (page) { - var params = angular.copy($scope.params) - if (params.datefrom) { - params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') - } - if (params.dateto) { - params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') - } - params.page = page || $scope.pagination.page || 1 - if (params.gateway) { - if (params.gateway.sort().toString() != [0, 1].toString() && params.gateway.sort().toString() != [5, 6].toString()) { - delete params.gatewayChilds - delete params.gatewayChild - } - if (params.gatewayChilds) { - var exist = false - params.gatewayChilds.forEach(function (child) { - if (child == params.gatewayChild) { - exist = true - } + $scope.initGatewayChild = function () { + $scope.params.gatewayChilds = $scope.params.gateway + $scope.params.gatewayChild = null + $scope.loadTradeLogs(1) + } + $scope.gatewaySelected = function (arr) { + return ( + $scope.params.gateway != null && + $scope.params.gateway.filter(function (gateway) { + return arr.indexOf(gateway) >= 0 + }).length > 0 + ) + } + + $scope.showRefundLog = function (orderId) { + refunder.refunded(orderId) + } + $scope.newRefund = function (orderId) { + refunder.refund(orderId).then(function () { + $scope.loadTradeLogs() + }) + } + $scope.showTradeDetail = function (order) { + orderService.managerOrderDetail(order) + } + $scope.$on('order_refunded', function () { + $scope.loadTradeLogs() }) - if (!exist) { - params.gatewayChild = null - } - } else { - delete params.gatewayChild - } - } else { - delete params.gatewayChilds - delete params.gatewayChild - } - if ($scope.isAll) { - delete params.client_ids - } - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/trade_logs', { params: params }).then(function (resp) { - $scope.tradeLogs = resp.data.data - $scope.pagination = resp.data.pagination - $scope.analysis = resp.data.analysis - }) - } - - $scope.initGatewayChild = function () { - $scope.params.gatewayChilds = $scope.params.gateway - $scope.params.gatewayChild = null - $scope.loadTradeLogs(1) - } - $scope.gatewaySelected = function (arr) { - return ( - $scope.params.gateway != null && - $scope.params.gateway.filter(function (gateway) { - return arr.indexOf(gateway) >= 0 - }).length > 0 - ) - } - - $scope.showRefundLog = function (orderId) { - refunder.refunded(orderId) - } - $scope.newRefund = function (orderId) { - refunder.refund(orderId).then(function () { - $scope.loadTradeLogs() - }) - } - $scope.showTradeDetail = function (order) { - orderService.managerOrderDetail(order) - } - $scope.$on('order_refunded', function () { - $scope.loadTradeLogs() - }) - $scope.chooseClient = function (client) { - if (client == 'all') { - $scope.choseSubClientNow = 'More' - $scope.params.client_ids = angular.copy($scope.clientIds) - $scope.isAll = true - $scope.chooseClientId = '' - $scope.showLevel3Clients = false - } else if (client.level3Clients) { - $scope.chooseClientId = client.client_id - $scope.showLevel3Clients = true - $scope.level3Clients = client.level3Clients - $scope.isAll = false - $scope.level3ClientIds = [] - $scope.level3ClientIds.push(client.client_id) - client.level3Clients.forEach(function (client) { - $scope.level3ClientIds.push(client.client_id) - }) - $scope.chooseLevel3Client('all') - return - } else { - $scope.chooseClientId = client.client_id - $scope.params.client_ids = [client.client_id] - $scope.isAll = false - $scope.showLevel3Clients = false - } - $scope.loadTradeLogs() - } - $scope.chooseLevel3Client = function (client) { - if (client == 'all') { - $scope.params.client_ids = angular.copy($scope.level3ClientIds) - $scope.isLevel3All = true - $scope.chooseLevel3ClientId = '' - } else { - $scope.chooseLevel3ClientId = client.client_id - $scope.params.client_ids = [client.client_id] - $scope.isLevel3All = false - } - $scope.loadTradeLogs() - } - $scope.searchSubClients = function (subSearchText, page) { - $scope.subClientTable1 = [$scope.partner] - $scope.subClientTable2 = [] - var params = {} - params.page = page || $scope.subClientPagination.page || 1 - if (subSearchText != '') { - $scope.subSearchText = subSearchText - params.searchText = subSearchText - } - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page', { params: params }).then(function (resp) { - var clientList = resp.data.data - $scope.subClientPagination = resp.data.pagination - clientList.forEach(function (client) { - if ($scope.subClientTable1.length < 11) { - $scope.subClientTable1.push(client) + $scope.chooseClient = function (client) { + if (client == 'all') { + $scope.choseSubClientNow = 'More' + $scope.params.client_ids = angular.copy($scope.clientIds) + $scope.isAll = true + $scope.chooseClientId = '' + $scope.showLevel3Clients = false + } else if (client.level3Clients) { + $scope.chooseClientId = client.client_id + $scope.showLevel3Clients = true + $scope.level3Clients = client.level3Clients + $scope.isAll = false + $scope.level3ClientIds = [] + $scope.level3ClientIds.push(client.client_id) + client.level3Clients.forEach(function (client) { + $scope.level3ClientIds.push(client.client_id) + }) + $scope.chooseLevel3Client('all') + return + } else { + $scope.chooseClientId = client.client_id + $scope.params.client_ids = [client.client_id] + $scope.isAll = false + $scope.showLevel3Clients = false + } + $scope.loadTradeLogs() + } + $scope.chooseLevel3Client = function (client) { + if (client == 'all') { + $scope.params.client_ids = angular.copy($scope.level3ClientIds) + $scope.isLevel3All = true + $scope.chooseLevel3ClientId = '' + } else { + $scope.chooseLevel3ClientId = client.client_id + $scope.params.client_ids = [client.client_id] + $scope.isLevel3All = false + } + $scope.loadTradeLogs() + } + $scope.searchSubClients = function (subSearchText, page) { + $scope.subClientTable1 = [$scope.partner] + $scope.subClientTable2 = [] + var params = {} + params.page = page || $scope.subClientPagination.page || 1 + if (subSearchText != '') { + $scope.subSearchText = subSearchText + params.searchText = subSearchText + } + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page', {params: params}).then(function (resp) { + var clientList = resp.data.data + $scope.subClientPagination = resp.data.pagination + clientList.forEach(function (client) { + if ($scope.subClientTable1.length < 11) { + $scope.subClientTable1.push(client) + } else { + $scope.subClientTable2.push(client) + } + $scope.clients.push(client) + }) + }) + } + + if ($scope.partner.has_children && !$scope.partner.hide_sub_mch) { + $scope.searchSubClients('', 1) + $scope.loadTradeLogs(1) } else { - $scope.subClientTable2.push(client) - } - $scope.clients.push(client) - }) - }) - } - - if ($scope.partner.has_children && !$scope.partner.hide_sub_mch) { - $scope.searchSubClients('', 1) - $scope.loadTradeLogs(1) - } else { - $scope.loadTradeLogs(1) - } - $scope.checkSubClientChoseShow = function (client) { - $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient - if (client != '') { - $scope.choseSubClientNow = client.short_name - } - } - $scope.clickDisplayChoseDiv = function (event) { - $scope.more20ChoseSubClient = false - } - $scope.choseDivStopPropagation = function (event) { - event.stopPropagation() - } - }, - ]) - app.controller('partnerPluginsCtrl', [ - '$scope', - '$uibModal', - function ($scope, $uibModal) { - $scope.configRedpack = function () { - $uibModal.open({ - templateUrl: '/static/payment/partner/templates/redpack_config.html', - controller: 'partnerRedpackConfigDialogCtrl', - size: 'lg', - resolve: { - partner: function () { - return $scope.partner - }, - config: [ - '$http', - function ($http) { - return $http.get('/sys/redpack/partners/' + $scope.partner.client_moniker) - }, - ], - }, - }) - } - $scope.redpackLogs = function () { - $uibModal.open({ - templateUrl: '/static/payment/partner/templates/redpack_logs.html', - controller: 'partnerRedpackLogDialogCtrl', - size: 'lg', - resolve: { - partner: function () { - return $scope.partner - }, - }, - }) - } - }, - ]) - app.controller('partnerDeviceCtrl', [ - '$scope', - '$http', - 'orderService', - 'commonDialog', - 'refunder', - '$uibModal', - function ($scope, $http, orderService, commonDialog, refunder, $uibModal) { - $scope.pagination = {} - /** - * 查看设备 - * @param page - */ - $scope.listDevices = function (page) { - var params = angular.copy($scope.devsearch) || {} - params.page = page || $scope.pagination.page || 1 - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/devices', { params: params }).then(function (resp) { - $scope.pagination = resp.data.pagination - $scope.devices = resp.data.data - }) - } - $scope.listDevices(1) - - /** - * 添加设备 - */ - $scope.addDevice = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/add_device.html', - controller: 'newDeviceDialogCtrl', - resolve: { - clientMoniker: function () { - return $scope.partner.client_moniker - }, - }, - }) - .result.then(function () { + $scope.loadTradeLogs(1) + } + $scope.checkSubClientChoseShow = function (client) { + $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient + if (client != '') { + $scope.choseSubClientNow = client.short_name + } + } + $scope.clickDisplayChoseDiv = function (event) { + $scope.more20ChoseSubClient = false + } + $scope.choseDivStopPropagation = function (event) { + event.stopPropagation() + } + }, + ]) + app.controller('partnerPluginsCtrl', [ + '$scope', + '$uibModal', + function ($scope, $uibModal) { + $scope.configRedpack = function () { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/redpack_config.html', + controller: 'partnerRedpackConfigDialogCtrl', + size: 'lg', + resolve: { + partner: function () { + return $scope.partner + }, + config: [ + '$http', + function ($http) { + return $http.get('/sys/redpack/partners/' + $scope.partner.client_moniker) + }, + ], + }, + }) + } + $scope.redpackLogs = function () { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/redpack_logs.html', + controller: 'partnerRedpackLogDialogCtrl', + size: 'lg', + resolve: { + partner: function () { + return $scope.partner + }, + }, + }) + } + }, + ]) + app.controller('partnerDeviceCtrl', [ + '$scope', + '$http', + 'orderService', + 'commonDialog', + 'refunder', + '$uibModal', + function ($scope, $http, orderService, commonDialog, refunder, $uibModal) { + $scope.pagination = {} + /** + * 查看设备 + * @param page + */ + $scope.listDevices = function (page) { + var params = angular.copy($scope.devsearch) || {} + params.page = page || $scope.pagination.page || 1 + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/devices', {params: params}).then(function (resp) { + $scope.pagination = resp.data.pagination + $scope.devices = resp.data.data + }) + } $scope.listDevices(1) - }) - } - - $scope.showDeviceOrders = function (dev) { - $scope.params.dev_id = dev.dev_id - $scope.listOrders(1) - } - $scope.modifyRemark = function (dev) { - commonDialog.inputText({ title: 'Input New Remark of device' }).then(function (text) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/devices/' + dev.dev_id, { remark: text }).then( - function () { - $scope.listDevices() - }, - function (resp) { - commonDialog.alert({ title: 'Update remark failed', content: resp.data.message, type: 'error' }) - } - ) - }) - } - $scope.disableDevice = function (dev) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/devices/' + dev.dev_id + '/enable', { enable: false }).then( - function () { - $scope.listDevices() - }, - function (resp) { - commonDialog.alert({ title: 'Failed to disable device', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.enableDevice = function (dev) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/devices/' + dev.dev_id + '/enable', { enable: true }).then( - function () { - $scope.listDevices() - }, - function (resp) { - commonDialog.alert({ title: 'Failed to enable device', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.orderPagination = {} - $scope.today = new Date() - $scope.chooseToday = function () { - $scope.params.datefrom = $scope.params.dateto = new Date() - $scope.loadTradeLogs(1) - } - $scope.chooseYesterday = function () { - var yesterday = new Date() - yesterday.setDate(yesterday.getDate() - 1) - $scope.params.datefrom = $scope.params.dateto = yesterday - $scope.loadTradeLogs(1) - } - $scope.chooseLast7Days = function () { - $scope.params.dateto = new Date() - var day = new Date() - day.setDate(day.getDate() - 7) - $scope.params.datefrom = day - $scope.loadTradeLogs(1) - } - $scope.thisMonth = function () { - $scope.params.dateto = new Date() - var monthBegin = new Date() - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadTradeLogs(1) - } - $scope.lastMonth = function () { - var monthFinish = new Date() - monthFinish.setDate(0) - $scope.params.dateto = monthFinish - var monthBegin = new Date() - monthBegin.setDate(0) - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadTradeLogs(1) - } - $scope.listOrders = function (page) { - var params = angular.copy($scope.params) || {} - if (params.datefrom) { - params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') - } - if (params.dateto) { - params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') - } - params.gateway = [0, 1] - params.page = page || $scope.orderPagination.page || 1 - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/trade_logs', { params: params }).then(function (resp) { - $scope.orders = resp.data.data - $scope.orderPagination = resp.data.pagination - $scope.analysis = resp.data.analysis - }) - } - $scope.listOrders(1) - $scope.orderDetail = function (order) { - orderService.managerOrderDetail(order) - } - $scope.refundOrder = function (order) { - refunder.refunded(order.order_id) - } - }, - ]) - app.controller('partnerRedpackConfigDialogCtrl', [ - '$scope', - '$http', - 'partner', - 'config', - function ($scope, $http, partner, config) { - $scope.config = config.data - if (!Object.keys($scope.config).length) { - $scope.config = { min_payment: 0, min_amount: 1, max_amount: 1, daily_limit: 1, enabled: false } - } - $scope.saveRedpackConfig = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - var config = angular.copy($scope.config) - $http.put('/sys/redpack/partners/' + partner.client_moniker, config).then( - function () { - $scope.$close() - }, - function (resp) { - $scope.errmsg = resp.data.message - } - ) - } - }, - ]) - app.controller('rateConfigDialogCtrl', [ - '$scope', - '$http', - 'rate', - 'clientMoniker', - function ($scope, $http, rate, clientMoniker) { - $scope.rate = angular.copy(rate) - $scope.ctrl = { sending: false } - $scope.saveRate = function () { - $scope.errmsg = null - $scope.ctrl.sending = true - if ($scope.rate.client_rate_id) { - $http.put('/sys/partners/' + clientMoniker + '/rates/' + $scope.rate.client_rate_id, $scope.rate).then( - function () { - $scope.ctrl.sending = false - $scope.$close() - }, - function (resp) { - $scope.ctrl.sending = false - $scope.errmsg = resp.data.message - } - ) - } else { - $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( - function () { - $scope.ctrl.sending = false - $scope.$close() - }, - function (resp) { - $scope.ctrl.sending = false - $scope.errmsg = resp.data.message - } - ) - } - } - }, - ]) - app.controller('newDeviceDialogCtrl', [ - '$scope', - '$http', - 'clientMoniker', - function ($scope, $http, clientMoniker) { - $scope.save = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - $http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then( - function () { - $scope.$close() - }, - function (resp) { - $scope.errmsg = resp.data.message - } - ) - } - }, - ]) - app.controller('partnerChooseBDUserDialogCtrl', [ - '$scope', - '$http', - '$filter', - 'partner', - 'bdUsers', - 'type', - function ($scope, $http, $filter, partner, bdUsers, type) { - $scope.bdUsers = bdUsers.data - $scope.data = {} - $scope.params = {} - - $scope.chooseOrg = {} - $scope.chooseOrg.org_name = null - if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { - /* $scope.showOrg = 'Organization';*/ - $http.get('/sys/orgs', { params: {} }).then(function (resp) { - $scope.orgs = resp.data - }) - } - - $scope.loadOrgs = function () { - var params = angular.copy($scope.params) - $http.get('/sys/orgs/orgChild', { params: params }).then(function (resp) { - $scope.orgs_child = resp.data - }) - } - - /* $scope.chooseOrgFun = function (org) { + + /** + * 添加设备 + */ + $scope.addDevice = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/add_device.html', + controller: 'newDeviceDialogCtrl', + resolve: { + clientMoniker: function () { + return $scope.partner.client_moniker + }, + }, + }) + .result.then(function () { + $scope.listDevices(1) + }) + } + + $scope.showDeviceOrders = function (dev) { + $scope.params.dev_id = dev.dev_id + $scope.listOrders(1) + } + $scope.modifyRemark = function (dev) { + commonDialog.inputText({title: 'Input New Remark of device'}).then(function (text) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/devices/' + dev.dev_id, {remark: text}).then( + function () { + $scope.listDevices() + }, + function (resp) { + commonDialog.alert({ + title: 'Update remark failed', + content: resp.data.message, + type: 'error' + }) + } + ) + }) + } + $scope.disableDevice = function (dev) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/devices/' + dev.dev_id + '/enable', {enable: false}).then( + function () { + $scope.listDevices() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to disable device', + content: resp.data.message, + type: 'error' + }) + } + ) + } + $scope.enableDevice = function (dev) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/devices/' + dev.dev_id + '/enable', {enable: true}).then( + function () { + $scope.listDevices() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to enable device', + content: resp.data.message, + type: 'error' + }) + } + ) + } + $scope.orderPagination = {} + $scope.today = new Date() + $scope.chooseToday = function () { + $scope.params.datefrom = $scope.params.dateto = new Date() + $scope.loadTradeLogs(1) + } + $scope.chooseYesterday = function () { + var yesterday = new Date() + yesterday.setDate(yesterday.getDate() - 1) + $scope.params.datefrom = $scope.params.dateto = yesterday + $scope.loadTradeLogs(1) + } + $scope.chooseLast7Days = function () { + $scope.params.dateto = new Date() + var day = new Date() + day.setDate(day.getDate() - 7) + $scope.params.datefrom = day + $scope.loadTradeLogs(1) + } + $scope.thisMonth = function () { + $scope.params.dateto = new Date() + var monthBegin = new Date() + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadTradeLogs(1) + } + $scope.lastMonth = function () { + var monthFinish = new Date() + monthFinish.setDate(0) + $scope.params.dateto = monthFinish + var monthBegin = new Date() + monthBegin.setDate(0) + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadTradeLogs(1) + } + $scope.listOrders = function (page) { + var params = angular.copy($scope.params) || {} + if (params.datefrom) { + params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') + } + if (params.dateto) { + params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') + } + params.gateway = [0, 1] + params.page = page || $scope.orderPagination.page || 1 + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/trade_logs', {params: params}).then(function (resp) { + $scope.orders = resp.data.data + $scope.orderPagination = resp.data.pagination + $scope.analysis = resp.data.analysis + }) + } + $scope.listOrders(1) + $scope.orderDetail = function (order) { + orderService.managerOrderDetail(order) + } + $scope.refundOrder = function (order) { + refunder.refunded(order.order_id) + } + }, + ]) + app.controller('partnerRedpackConfigDialogCtrl', [ + '$scope', + '$http', + 'partner', + 'config', + function ($scope, $http, partner, config) { + $scope.config = config.data + if (!Object.keys($scope.config).length) { + $scope.config = {min_payment: 0, min_amount: 1, max_amount: 1, daily_limit: 1, enabled: false} + } + $scope.saveRedpackConfig = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + var config = angular.copy($scope.config) + $http.put('/sys/redpack/partners/' + partner.client_moniker, config).then( + function () { + $scope.$close() + }, + function (resp) { + $scope.errmsg = resp.data.message + } + ) + } + }, + ]) + app.controller('rateConfigDialogCtrl', [ + '$scope', + '$http', + 'rate', + 'clientMoniker', + function ($scope, $http, rate, clientMoniker) { + $scope.rate = angular.copy(rate) + $scope.ctrl = {sending: false} + $scope.saveRate = function () { + $scope.errmsg = null + $scope.ctrl.sending = true + if ($scope.rate.client_rate_id) { + $http.put('/sys/partners/' + clientMoniker + '/rates/' + $scope.rate.client_rate_id, $scope.rate).then( + function () { + $scope.ctrl.sending = false + $scope.$close() + }, + function (resp) { + $scope.ctrl.sending = false + $scope.errmsg = resp.data.message + } + ) + } else { + $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( + function () { + $scope.ctrl.sending = false + $scope.$close() + }, + function (resp) { + $scope.ctrl.sending = false + $scope.errmsg = resp.data.message + } + ) + } + } + }, + ]) + app.controller('newDeviceDialogCtrl', [ + '$scope', + '$http', + 'clientMoniker', + function ($scope, $http, clientMoniker) { + $scope.save = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + $http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then( + function () { + $scope.$close() + }, + function (resp) { + $scope.errmsg = resp.data.message + } + ) + } + }, + ]) + app.controller('partnerChooseBDUserDialogCtrl', [ + '$scope', + '$http', + '$filter', + 'partner', + 'bdUsers', + 'type', + function ($scope, $http, $filter, partner, bdUsers, type) { + $scope.bdUsers = bdUsers.data + $scope.data = {} + $scope.params = {} + + $scope.chooseOrg = {} + $scope.chooseOrg.org_name = null + if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { + /* $scope.showOrg = 'Organization';*/ + $http.get('/sys/orgs', {params: {}}).then(function (resp) { + $scope.orgs = resp.data + }) + } + + $scope.loadOrgs = function () { + var params = angular.copy($scope.params) + $http.get('/sys/orgs/orgChild', {params: params}).then(function (resp) { + $scope.orgs_child = resp.data + }) + } + + /* $scope.chooseOrgFun = function (org) { if (org == 'all') { $scope.chooseOrg.org_name = null; $scope.showOrg = 'All' @@ -4796,743 +4866,744 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } };*/ - function initBD() { - $http.get('/sys/partners/' + partner.client_moniker + '/bd_user/current').then(function (resp) { - var choooseBD = resp.data - choooseBD.forEach(function (e) { - $scope.bdUsers.forEach(function (m) { - if (m.manager_id == e.bd_id) { - m.choose = true - m.proportion = e.proportion - /* $scope.chooseOrgFun({org_id: m.org_id, name: m.org_name});*/ - if (($scope.currentUser.role & parseInt('1000000000000', 2)) > 0) { - $scope.params.org_ids = m.org_id - $scope.params.org_id = m.org_id - $scope.loadOrgs() + function initBD() { + $http.get('/sys/partners/' + partner.client_moniker + '/bd_user/current').then(function (resp) { + var choooseBD = resp.data + choooseBD.forEach(function (e) { + $scope.bdUsers.forEach(function (m) { + if (m.manager_id == e.bd_id) { + m.choose = true + m.proportion = e.proportion + /* $scope.chooseOrgFun({org_id: m.org_id, name: m.org_name});*/ + if (($scope.currentUser.role & parseInt('1000000000000', 2)) > 0) { + $scope.params.org_ids = m.org_id + $scope.params.org_id = m.org_id + $scope.loadOrgs() + } else { + $scope.params.org_id = m.org_id + $scope.loadOrgs() + } + } + }) + }) + $scope.data.start_date = new Date(choooseBD[0].start_date) + }) + } + + if (type == 'edit') { + initBD() + } + + $scope.saveBD = function () { + $scope.data.users = [] + $scope.bdUsers.forEach(function (e) { + if (e.choose) { + $scope.data.users.push(e) + } + }) + + if ($scope.data.users.length == 0) { + $scope.errmsg = '请选择至少一位BD' + } else if ($scope.data.start_date == undefined) { + $scope.errmsg = '执行开始日期不能为空' } else { - $scope.params.org_id = m.org_id - $scope.loadOrgs() + var isValid = true + var total = 0 + $scope.data.users.forEach(function (e) { + if (e.proportion == undefined) { + $scope.errmsg = '绩效比例不能为空' + isValid = false + return + } else if (e.proportion < 0.01 || e.proportion > 1) { + $scope.errmsg = '绩效比例无效' + isValid = false + return + } + total += e.proportion + if (total > 1) { + $scope.errmsg = '总比例不能超过1' + isValid = false + return + } + }) + // if (total != 1) { + // $scope.errmsg = "Total proportion must be 1"; + // isValid = false; + // return; + // } + if (isValid) { + $scope.errmsg = null + $scope.data.type = type + var chooseUsers = angular.copy($scope.data) + chooseUsers.start_date = $scope.data.start_date + if (chooseUsers.start_date) { + chooseUsers.start_date = $filter('date')(chooseUsers.start_date, 'yyyyMMdd') + } + $http.put('/sys/partners/' + partner.client_moniker + '/bd_user', $scope.data).then( + function () { + $scope.$close() + }, + function (resp) { + $scope.errmsg = resp.data.message + } + ) + } } - } - }) - }) - $scope.data.start_date = new Date(choooseBD[0].start_date) - }) - } - - if (type == 'edit') { - initBD() - } - - $scope.saveBD = function () { - $scope.data.users = [] - $scope.bdUsers.forEach(function (e) { - if (e.choose) { - $scope.data.users.push(e) - } - }) - - if ($scope.data.users.length == 0) { - $scope.errmsg = '请选择至少一位BD' - } else if ($scope.data.start_date == undefined) { - $scope.errmsg = '执行开始日期不能为空' - } else { - var isValid = true - var total = 0 - $scope.data.users.forEach(function (e) { - if (e.proportion == undefined) { - $scope.errmsg = '绩效比例不能为空' - isValid = false - return - } else if (e.proportion < 0.01 || e.proportion > 1) { - $scope.errmsg = '绩效比例无效' - isValid = false - return - } - total += e.proportion - if (total > 1) { - $scope.errmsg = '总比例不能超过1' - isValid = false - return - } - }) - // if (total != 1) { - // $scope.errmsg = "Total proportion must be 1"; - // isValid = false; - // return; - // } - if (isValid) { - $scope.errmsg = null - $scope.data.type = type - var chooseUsers = angular.copy($scope.data) - chooseUsers.start_date = $scope.data.start_date - if (chooseUsers.start_date) { - chooseUsers.start_date = $filter('date')(chooseUsers.start_date, 'yyyyMMdd') - } - $http.put('/sys/partners/' + partner.client_moniker + '/bd_user', $scope.data).then( - function () { - $scope.$close() - }, - function (resp) { - $scope.errmsg = resp.data.message - } - ) - } - } - } - }, - ]) - app.controller('partnerRedpackLogDialogCtrl', [ - '$scope', - '$http', - 'partner', - function ($scope, $http, partner) { - $scope.pagination = {} - $scope.queryParams = {} - $scope.listRedpackLogs = function (page) { - var params = angular.copy($scope.queryParams) - params.page = page || $scope.pagination.page || 1 - $http.get('/sys/redpack/partners/' + partner.client_moniker + '/logs', { params: params }).then(function (resp) { - $scope.logs = resp.data.data - $scope.pagination = resp.data.pagination - }) - } - $scope.listRedpackLogs(1) - }, - ]) - app.controller('partnerAuthFileCtrl', [ - '$scope', - '$http', - '$rootScope', - 'commonDialog', - '$state', - function ($scope, $http, $rootScope, commonDialog, $state) { - if ($state.params.commitType == 'card-payment') { - $state.go('partners.detail.files.MW_files') - } else { - $state.go('partners.detail.files.CP_files') - } - }, - ]) - app.controller('partnerCPAuthFileCtrl', [ - '$scope', - '$http', - '$rootScope', - 'commonDialog', - '$state', - 'Upload', - 'file', - function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { - $scope.id_info_form = { edit: false } - $scope.file = file.data || {} - //audit files - $scope.uploadBankFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.bankFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.bankFileProgress - $scope.file.file_bank_info = resp.data.url - $scope.updateFile() - if ($scope.file.file_bank_info.endsWith('pdf')) { - $scope.bankIsImage = false - } else { - $scope.bankIsImage = true - } - }, - function (resp) { - delete $scope.bankFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.bankFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.agreeIsImage = true - if ($scope.file.file_agreement_info && $scope.file.file_agreement_info.endsWith('pdf')) { - $scope.agreeIsImage = false - } - $scope.bankIsImage = true - if ($scope.file.file_bank_info && $scope.file.file_bank_info.endsWith('pdf')) { - $scope.bankIsImage = false - } - $scope.companyIsImage = true - if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { - $scope.companyIsImage = false - } - $scope.applyIsImage = true - if ($scope.file.file_apply_info && $scope.file.file_apply_info.endsWith('pdf')) { - $scope.applyIsImage = false - } - $scope.idIsImage = true - if ($scope.file.file_id_info && $scope.file.file_id_info.endsWith('pdf')) { - $scope.idIsImage = false - } - $scope.billIsImage = true - if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { - $scope.billIsImage = false - } - - //上传账单流水 - $scope.uploadBillFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.billFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.billFileProgress - $scope.file.utility_bill_info = resp.data.url - $scope.updateFile() - if ($scope.file.utility_bill_info.endsWith('pdf')) { - $scope.billIsImage = false - } else { - $scope.billIsImage = true - } - }, - function (resp) { - delete $scope.billFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.billFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.uploadCompanyFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.companyFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.companyFileProgress - $scope.file.file_company_info = resp.data.url - $scope.updateFile() - if ($scope.file.file_company_info.endsWith('pdf')) { - $scope.companyIsImage = false - } else { - $scope.companyIsImage = true - } - }, - function (resp) { - delete $scope.companyFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.companyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - //上传ID信息 - $scope.uploadIDFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.idFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.idFileProgress - $scope.file.file_id_info = resp.data.url - $scope.updateFile() - if ($scope.file.file_id_info.endsWith('pdf')) { - $scope.idIsImage = false - } else { - $scope.idIsImage = true - } - }, - function (resp) { - delete $scope.idFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.idFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - //上传协议文件 - $scope.uploadAgreementFile = function (file) { - if (file != null) { - if (file.size > 10 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过10MB，请压缩后重试', type: 'error' }) - } else { - $scope.agreementFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.agreementFileProgress - $scope.file.file_agreement_info = resp.data.url - $scope.updateFile() - if ($scope.file.file_agreement_info.endsWith('pdf')) { - $scope.agreeIsImage = false - } else { - $scope.agreeIsImage = true - } - }, - function (resp) { - delete $scope.agreementFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.agreementFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - //上传申请表 - $scope.uploadApplyFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.applyFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.applyFileProgress - $scope.file.file_apply_info = resp.data.url - $scope.updateFile() - if ($scope.file.file_apply_info.endsWith('pdf')) { - $scope.applyIsImage = false - } else { - $scope.applyIsImage = true - } - }, - function (resp) { - delete $scope.applyFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.applyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.toggleIdTitle = function (beneficiary_id_title) { - $scope.file.beneficiary_id_title = beneficiary_id_title - } - $scope.saveIdInfo = function () { - if (!$scope.file.id_type) { - commonDialog.alert({ title: 'Error', content: '请选择ID Type', type: 'error' }) - return - } - if ($scope.file.beneficiary_id_title != 'Ultimate beneficiary owner') { - if (!$scope.file.other_id_title_desc) { - commonDialog.alert({ title: 'Error', content: '请简要告知为何无法提供受益股东的资料', type: 'error' }) - return - } - } - var config = {} - config.id_type = $scope.file.id_type - config.beneficiary_id_title = $scope.file.beneficiary_id_title - config.other_id_title_desc = $scope.file.other_id_title_desc - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/id_info', config).then( - function (resp) { - commonDialog.alert({ title: 'Success', content: 'Id Info Updated', type: 'success' }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - $state.reload() - } - ) - } - - $scope.cancelIdInfo = function () { - $state.reload() - $scope.id_info_form.edit = false - } - - $scope.downloadAsZip = function () { - var url = '/sys/partners/' + $scope.partner.client_moniker + '/download/complianceAsZIP' - return url - } - - $scope.deleteComplianceFiles = function (file_id) { - commonDialog - .confirm({ - title: 'Warning', - content: 'This operation will delete the file, Are you sure?', - }) - .then(function () { - $http.put('/sys/partners/auth_file/' + file_id + '/delete').then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Delete Successful', - type: 'success', + } + }, + ]) + app.controller('partnerRedpackLogDialogCtrl', [ + '$scope', + '$http', + 'partner', + function ($scope, $http, partner) { + $scope.pagination = {} + $scope.queryParams = {} + $scope.listRedpackLogs = function (page) { + var params = angular.copy($scope.queryParams) + params.page = page || $scope.pagination.page || 1 + $http.get('/sys/redpack/partners/' + partner.client_moniker + '/logs', {params: params}).then(function (resp) { + $scope.logs = resp.data.data + $scope.pagination = resp.data.pagination }) + } + $scope.listRedpackLogs(1) + }, + ]) + app.controller('partnerAuthFileCtrl', [ + '$scope', + '$http', + '$rootScope', + 'commonDialog', + '$state', + function ($scope, $http, $rootScope, commonDialog, $state) { + if ($state.params.commitType == 'card-payment') { + $state.go('partners.detail.files.MW_files') + } else { + $state.go('partners.detail.files.CP_files') + } + }, + ]) + app.controller('partnerCPAuthFileCtrl', [ + '$scope', + '$http', + '$rootScope', + 'commonDialog', + '$state', + 'Upload', + 'file', + function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { + $scope.id_info_form = {edit: false} + $scope.file = file.data || {} + //audit files + $scope.uploadBankFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.bankFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.bankFileProgress + $scope.file.file_bank_info = resp.data.url + $scope.updateFile() + if ($scope.file.file_bank_info.endsWith('pdf')) { + $scope.bankIsImage = false + } else { + $scope.bankIsImage = true + } + }, + function (resp) { + delete $scope.bankFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.bankFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.agreeIsImage = true + if ($scope.file.file_agreement_info && $scope.file.file_agreement_info.endsWith('pdf')) { + $scope.agreeIsImage = false + } + $scope.bankIsImage = true + if ($scope.file.file_bank_info && $scope.file.file_bank_info.endsWith('pdf')) { + $scope.bankIsImage = false + } + $scope.companyIsImage = true + if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false + } + $scope.applyIsImage = true + if ($scope.file.file_apply_info && $scope.file.file_apply_info.endsWith('pdf')) { + $scope.applyIsImage = false + } + $scope.idIsImage = true + if ($scope.file.file_id_info && $scope.file.file_id_info.endsWith('pdf')) { + $scope.idIsImage = false + } + $scope.billIsImage = true + if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + $scope.billIsImage = false + } + + //上传账单流水 + $scope.uploadBillFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.billFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.billFileProgress + $scope.file.utility_bill_info = resp.data.url + $scope.updateFile() + if ($scope.file.utility_bill_info.endsWith('pdf')) { + $scope.billIsImage = false + } else { + $scope.billIsImage = true + } + }, + function (resp) { + delete $scope.billFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.billFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.uploadCompanyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.companyFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.companyFileProgress + $scope.file.file_company_info = resp.data.url + $scope.updateFile() + if ($scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false + } else { + $scope.companyIsImage = true + } + }, + function (resp) { + delete $scope.companyFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.companyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + //上传ID信息 + $scope.uploadIDFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.idFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.idFileProgress + $scope.file.file_id_info = resp.data.url + $scope.updateFile() + if ($scope.file.file_id_info.endsWith('pdf')) { + $scope.idIsImage = false + } else { + $scope.idIsImage = true + } + }, + function (resp) { + delete $scope.idFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.idFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + //上传协议文件 + $scope.uploadAgreementFile = function (file) { + if (file != null) { + if (file.size > 10 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过10MB，请压缩后重试', type: 'error'}) + } else { + $scope.agreementFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.agreementFileProgress + $scope.file.file_agreement_info = resp.data.url + $scope.updateFile() + if ($scope.file.file_agreement_info.endsWith('pdf')) { + $scope.agreeIsImage = false + } else { + $scope.agreeIsImage = true + } + }, + function (resp) { + delete $scope.agreementFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.agreementFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + //上传申请表 + $scope.uploadApplyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.applyFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.applyFileProgress + $scope.file.file_apply_info = resp.data.url + $scope.updateFile() + if ($scope.file.file_apply_info.endsWith('pdf')) { + $scope.applyIsImage = false + } else { + $scope.applyIsImage = true + } + }, + function (resp) { + delete $scope.applyFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.applyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.toggleIdTitle = function (beneficiary_id_title) { + $scope.file.beneficiary_id_title = beneficiary_id_title + } + $scope.saveIdInfo = function () { + if (!$scope.file.id_type) { + commonDialog.alert({title: 'Error', content: '请选择ID Type', type: 'error'}) + return + } + if ($scope.file.beneficiary_id_title != 'Ultimate beneficiary owner') { + if (!$scope.file.other_id_title_desc) { + commonDialog.alert({title: 'Error', content: '请简要告知为何无法提供受益股东的资料', type: 'error'}) + return + } + } + var config = {} + config.id_type = $scope.file.id_type + config.beneficiary_id_title = $scope.file.beneficiary_id_title + config.other_id_title_desc = $scope.file.other_id_title_desc + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/id_info', config).then( + function (resp) { + commonDialog.alert({title: 'Success', content: 'Id Info Updated', type: 'success'}) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + $state.reload() + } + ) + } + + $scope.cancelIdInfo = function () { $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - - $scope.updateFile = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/file', $scope.file).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Upload Successful', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - function commitError() { - commonDialog.alert({ - title: 'Error', - content: 'Missing file', - type: 'error', - }) - } - $scope.complianceCheck = function () { - if (!$rootScope.complianceCheck) { - $rootScope.complianceCheck = {} - } - $rootScope.complianceCheck.client_id = $scope.partner.client_id - $rootScope.complianceCheck.authFile = true - } - $scope.complianceChangeCheck = function () { - if ($rootScope.complianceCheck) { - if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { - delete $rootScope.complianceCheck - } - } - } - $scope.complianceChangeCheck() - }, - ]) - app.controller('partnerMWAuthFileCtrl', [ - '$scope', - '$http', - '$rootScope', - 'commonDialog', - '$state', - 'Upload', - 'file', - function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { - $scope.id_info_form = { edit: false } - $scope.file = file.data || {} - $scope.uploadFile = {} - $scope.file.upay_risk_level = $scope.partner.upay_risk_level - $scope.file.upay_risk_remark = $scope.partner.upay_risk_remark - - $scope.uploadApplicationFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.applicationFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.applicationFileProgress - $scope.uploadFile.upay_application_form = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.applicationFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.applicationFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadBankFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.bankFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.bankFileProgress - $scope.uploadFile.client_bank_file = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.bankFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.bankFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadASICFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.ASICProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.ASICProgress - $scope.uploadFile.client_company_file = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.ASICProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.ASICProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadIdFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.idProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.idProgress - $scope.uploadFile.upay_driver_license = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.idProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.idProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadResidenceFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.residenceFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.residenceFileProgress - $scope.uploadFile.kyc_utility_bill_file = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.residenceFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.residenceFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadRefundPolicyFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.refundPolicyFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.refundPolicyFileProgress - $scope.uploadFile.refund_exchange_policy = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.refundPolicyFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.refundPolicyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadPrivacyPolicyFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.privacyFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.privacyFileProgress - $scope.uploadFile.upay_privacy_policy = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.privacyFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.privacyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadCardPolicyFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.cardFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.cardFileProgress - $scope.uploadFile.card_security_policy = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.cardFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.cardFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadLetterOfOfferFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.letterFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.letterFileProgress - $scope.uploadFile.upay_offer_letter = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.letterFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.letterFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.uploadPromotionalFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.promotionalFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.promotionalFileProgress - $scope.uploadFile.upay_promotional_offer = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.promotionalFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.promotionalFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - /*$scope.uploadTermsFile = function (file) { + $scope.id_info_form.edit = false + } + + $scope.downloadAsZip = function () { + var url = '/sys/partners/' + $scope.partner.client_moniker + '/download/complianceAsZIP' + return url + } + + $scope.deleteComplianceFiles = function (file_id) { + commonDialog + .confirm({ + title: 'Warning', + content: 'This operation will delete the file, Are you sure?', + }) + .then(function () { + $http.put('/sys/partners/auth_file/' + file_id + '/delete').then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Delete Successful', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + + $scope.updateFile = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/file', $scope.file).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Upload Successful', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + function commitError() { + commonDialog.alert({ + title: 'Error', + content: 'Missing file', + type: 'error', + }) + } + + $scope.complianceCheck = function () { + if (!$rootScope.complianceCheck) { + $rootScope.complianceCheck = {} + } + $rootScope.complianceCheck.client_id = $scope.partner.client_id + $rootScope.complianceCheck.authFile = true + } + $scope.complianceChangeCheck = function () { + if ($rootScope.complianceCheck) { + if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { + delete $rootScope.complianceCheck + } + } + } + $scope.complianceChangeCheck() + }, + ]) + app.controller('partnerMWAuthFileCtrl', [ + '$scope', + '$http', + '$rootScope', + 'commonDialog', + '$state', + 'Upload', + 'file', + function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { + $scope.id_info_form = {edit: false} + $scope.file = file.data || {} + $scope.uploadFile = {} + $scope.file.upay_risk_level = $scope.partner.upay_risk_level + $scope.file.upay_risk_remark = $scope.partner.upay_risk_remark + + $scope.uploadApplicationFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.applicationFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.applicationFileProgress + $scope.uploadFile.upay_application_form = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.applicationFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.applicationFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadBankFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.bankFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.bankFileProgress + $scope.uploadFile.client_bank_file = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.bankFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.bankFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadASICFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.ASICProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.ASICProgress + $scope.uploadFile.client_company_file = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.ASICProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.ASICProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadIdFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.idProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.idProgress + $scope.uploadFile.upay_driver_license = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.idProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.idProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadResidenceFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.residenceFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.residenceFileProgress + $scope.uploadFile.kyc_utility_bill_file = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.residenceFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.residenceFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadRefundPolicyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.refundPolicyFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.refundPolicyFileProgress + $scope.uploadFile.refund_exchange_policy = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.refundPolicyFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.refundPolicyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadPrivacyPolicyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.privacyFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.privacyFileProgress + $scope.uploadFile.upay_privacy_policy = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.privacyFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.privacyFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadCardPolicyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.cardFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.cardFileProgress + $scope.uploadFile.card_security_policy = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.cardFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.cardFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadLetterOfOfferFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.letterFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.letterFileProgress + $scope.uploadFile.upay_offer_letter = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.letterFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.letterFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + $scope.uploadPromotionalFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.promotionalFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.promotionalFileProgress + $scope.uploadFile.upay_promotional_offer = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.promotionalFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.promotionalFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + /*$scope.uploadTermsFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) @@ -5552,704 +5623,706 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }, function (evt) { $scope.termsFileProgress.value = parseInt(100 * evt.loaded / evt.total); }) - } + } + } + };*/ + $scope.uploadDescFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.descFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + $scope.uploadFile = {} + delete $scope.descFileProgress + $scope.uploadFile.upay_desc_file = resp.data.url + $scope.updateFile() + }, + function (resp) { + delete $scope.descFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.descFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.saveIdInfo = function () { + if (!$scope.file.upay_risk_level) { + commonDialog.alert({title: 'Error', content: '请选择商户风险等级', type: 'error'}) + return + } + var config = {} + config.upay_risk_level = $scope.file.upay_risk_level + config.upay_risk_remark = $scope.file.upay_risk_remark + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/mw_risk_info', config).then( + function (resp) { + commonDialog.alert({title: 'Success', content: 'Risk Info Updated', type: 'success'}) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + $state.reload() + } + ) + } + + $scope.cancelIdInfo = function () { + $state.reload() + $scope.id_info_form.edit = false + } + + $scope.downloadAsZip = function () { + var url = '/sys/partners/' + $scope.partner.client_moniker + '/download/MWcomplianceAsZIP' + return url + } + + $scope.updateFile = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/mw_file', $scope.uploadFile).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Upload Successful', + type: 'success', + }) + $state.go( + 'partners.detail.files', + { + clientMoniker: $scope.partner.client_moniker, + commitType: 'card-payment', + }, + {reload: true} + ) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + function commitError() { + commonDialog.alert({ + title: 'Error', + content: 'Missing file', + type: 'error', + }) + } + + $scope.complianceCheck = function () { + if (!$rootScope.complianceCheck) { + $rootScope.complianceCheck = {} + } + $rootScope.complianceCheck.authFile = true + $rootScope.complianceCheck.client_id = $scope.partner.client_id + + if ($scope.file.upay_application_form == null || $scope.file.upay_application_form == '') { + commonDialog.alert({type: 'error', title: 'Error', content: '请补充商户申请表合规文件'}) + $rootScope.complianceCheck.authFile = false + } else if ($scope.file.client_bank_file == null || $scope.file.client_bank_file == '') { + commonDialog.alert({type: 'error', title: 'Error', content: '请补六个月银行对账单合规文件'}) + $rootScope.complianceCheck.authFile = false + } else if ($scope.file.client_company_file == null || $scope.file.client_company_file == '') { + commonDialog.alert({type: 'error', title: 'Error', content: '请补充当前公司信息摘录合规文件'}) + $rootScope.complianceCheck.authFile = false + } else if ($scope.file.upay_driver_license == null || $scope.file.upay_driver_license == '') { + commonDialog.alert({type: 'error', title: 'Error', content: '请补充法人身份证明合规文件'}) + $rootScope.complianceCheck.authFile = false + } else if ($scope.file.kyc_utility_bill_file == null || $scope.file.kyc_utility_bill_file == '') { + commonDialog.alert({type: 'error', title: 'Error', content: '请补充家庭住址证明 （一个水电煤网账单）合规文件'}) + $rootScope.complianceCheck.authFile = false + } + } + $scope.complianceChangeCheck = function () { + if ($rootScope.complianceCheck) { + if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { + delete $rootScope.complianceCheck + } + } + } + $scope.complianceChangeCheck() + + $scope.deleteMWComplianceFiles = function (file_id) { + commonDialog + .confirm({ + title: 'Warning', + content: 'This operation will delete the file, Are you sure?', + }) + .then(function () { + $http.put('/sys/partners/auth_file/' + file_id + '/mw_delete').then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Delete Successful', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + }, + ]) + + app.controller('partnerKycFileCtrl', [ + '$scope', + '$http', + '$rootScope', + 'commonDialog', + '$state', + 'Upload', + 'file', + function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { + $scope.file = file.data || {} + //kyc files + $scope.uploadCompanyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.bankFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.bankFileProgress + $scope.file.file_company_info = resp.data.url + $scope.updateFile() + if ($scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false + } else { + $scope.companyIsImage = true + } + }, + function (resp) { + delete $scope.bankFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.bankFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.companyIsImage = true + if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false + } + + $scope.idIsImage = true + if ($scope.file.file_id_info && $scope.file.file_id_info.endsWith('pdf')) { + $scope.idIsImage = false + } + $scope.billIsImage = true + if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + $scope.billIsImage = false + } + + //上传ID信息 + $scope.uploadIDFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.idFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.idFileProgress + $scope.file.file_id_info = resp.data.url + $scope.updateFile() + if ($scope.file.file_id_info.endsWith('pdf')) { + $scope.idIsImage = false + } else { + $scope.idIsImage = true + } + }, + function (resp) { + delete $scope.idFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.idFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + //上传账单流水 + $scope.uploadBillFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.billFileProgress = {value: 0} + Upload.upload({ + url: '/attachment/files', + data: {file: file}, + }).then( + function (resp) { + delete $scope.billFileProgress + $scope.file.utility_bill_info = resp.data.url + $scope.updateFile() + if ($scope.file.utility_bill_info.endsWith('pdf')) { + $scope.billIsImage = false + } else { + $scope.billIsImage = true + } + }, + function (resp) { + delete $scope.billFileProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.billFileProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + /* $scope.downloadAsZip = function () { + var url = '/sys/partners/' + $scope.partner.client_moniker + '/download/complianceAsZIP'; + return url; + };*/ + + $scope.deleteComplianceFiles = function (file_id) { + commonDialog + .confirm({ + title: 'Warning', + content: 'This operation will delete the file, Are you sure?', + }) + .then(function () { + $http.put('/sys/partners/auth_file/' + file_id + '/delete').then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Delete Successful', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) } - };*/ - $scope.uploadDescFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.descFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - $scope.uploadFile = {} - delete $scope.descFileProgress - $scope.uploadFile.upay_desc_file = resp.data.url - $scope.updateFile() - }, - function (resp) { - delete $scope.descFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.descFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - $scope.saveIdInfo = function () { - if (!$scope.file.upay_risk_level) { - commonDialog.alert({ title: 'Error', content: '请选择商户风险等级', type: 'error' }) - return - } - var config = {} - config.upay_risk_level = $scope.file.upay_risk_level - config.upay_risk_remark = $scope.file.upay_risk_remark - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/mw_risk_info', config).then( - function (resp) { - commonDialog.alert({ title: 'Success', content: 'Risk Info Updated', type: 'success' }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - $state.reload() - } - ) - } - - $scope.cancelIdInfo = function () { - $state.reload() - $scope.id_info_form.edit = false - } - - $scope.downloadAsZip = function () { - var url = '/sys/partners/' + $scope.partner.client_moniker + '/download/MWcomplianceAsZIP' - return url - } - - $scope.updateFile = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/mw_file', $scope.uploadFile).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Upload Successful', - type: 'success', - }) - $state.go( - 'partners.detail.files', - { - clientMoniker: $scope.partner.client_moniker, - commitType: 'card-payment', - }, - { reload: true } - ) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - function commitError() { - commonDialog.alert({ - title: 'Error', - content: 'Missing file', - type: 'error', - }) - } - $scope.complianceCheck = function () { - if (!$rootScope.complianceCheck) { - $rootScope.complianceCheck = {} - } - $rootScope.complianceCheck.authFile = true - $rootScope.complianceCheck.client_id = $scope.partner.client_id - - if ($scope.file.upay_application_form == null || $scope.file.upay_application_form == '') { - commonDialog.alert({ type: 'error', title: 'Error', content: '请补充商户申请表合规文件' }) - $rootScope.complianceCheck.authFile = false - } else if ($scope.file.client_bank_file == null || $scope.file.client_bank_file == '') { - commonDialog.alert({ type: 'error', title: 'Error', content: '请补六个月银行对账单合规文件' }) - $rootScope.complianceCheck.authFile = false - } else if ($scope.file.client_company_file == null || $scope.file.client_company_file == '') { - commonDialog.alert({ type: 'error', title: 'Error', content: '请补充当前公司信息摘录合规文件' }) - $rootScope.complianceCheck.authFile = false - } else if ($scope.file.upay_driver_license == null || $scope.file.upay_driver_license == '') { - commonDialog.alert({ type: 'error', title: 'Error', content: '请补充法人身份证明合规文件' }) - $rootScope.complianceCheck.authFile = false - } else if ($scope.file.kyc_utility_bill_file == null || $scope.file.kyc_utility_bill_file == '') { - commonDialog.alert({ type: 'error', title: 'Error', content: '请补充家庭住址证明 （一个水电煤网账单）合规文件' }) - $rootScope.complianceCheck.authFile = false - } - } - $scope.complianceChangeCheck = function () { - if ($rootScope.complianceCheck) { - if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { - delete $rootScope.complianceCheck - } - } - } - $scope.complianceChangeCheck() - - $scope.deleteMWComplianceFiles = function (file_id) { - commonDialog - .confirm({ - title: 'Warning', - content: 'This operation will delete the file, Are you sure?', - }) - .then(function () { - $http.put('/sys/partners/auth_file/' + file_id + '/mw_delete').then( - function (resp) { + $scope.updateFile = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/kycFile', $scope.file).then( + function () { + commonDialog.alert({ + title: 'Success', + content: 'Upload Successful', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + + function commitError() { commonDialog.alert({ - title: 'Success', - content: 'Delete Successful', - type: 'success', + title: 'Error', + content: 'Missing file', + type: 'error', }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - }, - ]) - - app.controller('partnerKycFileCtrl', [ - '$scope', - '$http', - '$rootScope', - 'commonDialog', - '$state', - 'Upload', - 'file', - function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { - $scope.file = file.data || {} - //kyc files - $scope.uploadCompanyFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.bankFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.bankFileProgress - $scope.file.file_company_info = resp.data.url - $scope.updateFile() - if ($scope.file.file_company_info.endsWith('pdf')) { - $scope.companyIsImage = false - } else { - $scope.companyIsImage = true - } - }, - function (resp) { - delete $scope.bankFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.bankFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.companyIsImage = true - if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { - $scope.companyIsImage = false - } - - $scope.idIsImage = true - if ($scope.file.file_id_info && $scope.file.file_id_info.endsWith('pdf')) { - $scope.idIsImage = false - } - $scope.billIsImage = true - if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { - $scope.billIsImage = false - } - - //上传ID信息 - $scope.uploadIDFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.idFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.idFileProgress - $scope.file.file_id_info = resp.data.url - $scope.updateFile() - if ($scope.file.file_id_info.endsWith('pdf')) { - $scope.idIsImage = false - } else { - $scope.idIsImage = true - } - }, - function (resp) { - delete $scope.idFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.idFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - //上传账单流水 - $scope.uploadBillFile = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.billFileProgress = { value: 0 } - Upload.upload({ - url: '/attachment/files', - data: { file: file }, - }).then( - function (resp) { - delete $scope.billFileProgress - $scope.file.utility_bill_info = resp.data.url - $scope.updateFile() - if ($scope.file.utility_bill_info.endsWith('pdf')) { - $scope.billIsImage = false + } + + $scope.complianceCheck = function () { + if (!$rootScope.complianceCheck) { + $rootScope.complianceCheck = {} + } + $rootScope.complianceCheck.client_id = $scope.partner.client_id + $rootScope.complianceCheck.authFile = true + } + $scope.complianceChangeCheck = function () { + if ($rootScope.complianceCheck) { + if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { + delete $rootScope.complianceCheck + } + } + } + $scope.complianceChangeCheck() + }, + ]) + + app.controller('partnerSettlementCtrl', [ + '$scope', + '$uibModal', + '$http', + 'clientMoniker', + '$filter', + function ($scope, $uibModal, $http, clientMoniker, $filter) { + $scope.params = {} + $scope.pagination = {} + $scope.clients = [] + $scope.showLevel3Clients = false + $scope.isLevel3All = true + $scope.clinet = {} + $scope.isAll = true + $scope.more20ChoseSubClient = false + $scope.choseSubClientNow = 'More' + $scope.searchSubClients = function (subSearchText, page) { + $scope.subClientTable1 = [$scope.partner] + $scope.subClientTable2 = [] + var params = {} + params.page = page || $scope.subClientPagination.page || 1 + if (subSearchText != '') { + $scope.subSearchText = subSearchText + params.searchText = subSearchText + } + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page', {params: params}).then(function (resp) { + var clientList = resp.data.data + $scope.subClientPagination = resp.data.pagination + clientList.forEach(function (client) { + if ($scope.subClientTable1.length < 11) { + $scope.subClientTable1.push(client) + } else { + $scope.subClientTable2.push(client) + } + $scope.clients.push(client) + }) + }) + } + $scope.initClientInfo = function () { + $http.get('/sys/partners/' + clientMoniker).then(function (resp) { + $scope.client = resp.data + $scope.clients = [$scope.client] + if ($scope.client.has_children && !$scope.client.hide_sub_mch) { + $scope.searchSubClients('', 1) + $scope.params.dateto = new Date() + var day = new Date() + day.setDate(day.getDate() - 7) + $scope.params.datefrom = day + $scope.chooseClient('all') + } else { + $scope.params.dateto = new Date() + var day = new Date() + day.setDate(day.getDate() - 7) + $scope.params.datefrom = day + $scope.chooseClient('all') + } + }) + } + $scope.initClientInfo() + + $scope.exportSettlementLogs = function () { + var params = angular.copy($scope.params) + var url = '/sys/partners/' + clientMoniker + '/lists_settlements/excel' + var connectSymbol = '?' + if (params.datefrom) { + params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') + url += connectSymbol + 'datefrom=' + params.datefrom + connectSymbol = '&' + } + if (params.dateto) { + params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') + url += connectSymbol + 'dateto=' + params.dateto + } + if (params.client_ids && !$scope.isAll) { + params.client_ids.forEach(function (i) { + url += connectSymbol + 'client_ids=' + i + connectSymbol = '&' + }) + } + return url + } + + $scope.chooseClient = function (client) { + if (client == 'all') { + $scope.choseSubClientNow = 'More' + $scope.params.client_ids = angular.copy($scope.clientIds) + $scope.isAll = true + $scope.chooseClientId = '' + $scope.showLevel3Clients = false + } else if (client.level3Clients) { + $scope.chooseClientId = client.client_id + $scope.showLevel3Clients = true + $scope.level3Clients = client.level3Clients + $scope.isAll = false + $scope.level3ClientIds = [] + $scope.level3ClientIds.push(client.client_id) + client.level3Clients.forEach(function (client) { + $scope.level3ClientIds.push(client.client_id) + }) + $scope.chooseLevel3Client('all') + return } else { - $scope.billIsImage = true - } - }, - function (resp) { - delete $scope.billFileProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.billFileProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } + $scope.chooseClientId = client.client_id + $scope.params.client_ids = [client.client_id] + $scope.isAll = false + $scope.showLevel3Clients = false + } + $scope.loadSettlementLogs() + } - /* $scope.downloadAsZip = function () { - var url = '/sys/partners/' + $scope.partner.client_moniker + '/download/complianceAsZIP'; - return url; - };*/ + $scope.today = new Date() + $scope.chooseToday = function () { + $scope.params.datefrom = $scope.params.dateto = new Date() + $scope.loadSettlementLogs(1) + } + $scope.chooseYesterday = function () { + var yesterday = new Date() + yesterday.setDate(yesterday.getDate() - 1) + $scope.params.datefrom = $scope.params.dateto = yesterday + $scope.loadSettlementLogs(1) + } + $scope.chooseLast7Days = function () { + $scope.params.dateto = new Date() + var day = new Date() + day.setDate(day.getDate() - 7) + $scope.params.datefrom = day + $scope.loadSettlementLogs(1) + } + $scope.thisMonth = function () { + $scope.params.dateto = new Date() + var monthBegin = new Date() + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadSettlementLogs(1) + } + $scope.lastMonth = function () { + var monthFinish = new Date() + monthFinish.setDate(0) + $scope.params.dateto = monthFinish + var monthBegin = new Date() + monthBegin.setDate(0) + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadSettlementLogs(1) + } + $scope.loadSettlementLogs = function (page) { + var params = angular.copy($scope.params) + if (params.datefrom) { + params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') + } + if (params.dateto) { + params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') + } + params.page = page || $scope.pagination.page || 1 + params.limit = 10 + if ($scope.isAll) { + delete params.client_ids + } + $http.get('/sys/partners/' + clientMoniker + '/lists_settlements', {params: params}).then(function (resp) { + $scope.settlementLogs = resp.data.data + $scope.padding = resp.data.padding + $scope.pagination = resp.data.pagination + }) + } + $scope.getClearingTransactions = function (client_id, detail_id) { + $uibModal.open({ + templateUrl: '/static/analysis/templates/settlement_transactions.html', + controller: 'managerSettlementDetailCtrl', + resolve: { + detail: [ + '$http', + '$stateParams', + function ($http) { + return $http.get('/analysis/partner_card/' + client_id + '/settlement_logs/' + detail_id) + }, + ], + detail_id: detail_id, + }, + size: 'lg', + }) + } - $scope.deleteComplianceFiles = function (file_id) { - commonDialog - .confirm({ - title: 'Warning', - content: 'This operation will delete the file, Are you sure?', - }) - .then(function () { - $http.put('/sys/partners/auth_file/' + file_id + '/delete').then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Delete Successful', - type: 'success', + $scope.getClearingTransactionsOfMergeSettle = function (reportDate) { + $uibModal.open({ + templateUrl: '/static/analysis/templates/settlement_transactions.html', + controller: 'managerSettlementDetailOfMergeSettleCtrl', + resolve: { + detail: [ + '$http', + '$stateParams', + function ($http) { + return $http.get('/analysis/partner_card/' + $scope.client.client_id + '/settlement_logs/report_date/' + reportDate) + }, + ], + client_id: $scope.client.client_id, + }, + size: 'lg', }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - - $scope.updateFile = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/kycFile', $scope.file).then( - function () { - commonDialog.alert({ - title: 'Success', - content: 'Upload Successful', - type: 'success', + } + + $scope.checkSubClientChoseShow = function (client) { + $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient + if (client != '') { + $scope.choseSubClientNow = client.short_name + } + } + $scope.clickDisplayChoseDiv = function (event) { + $scope.more20ChoseSubClient = false + } + $scope.choseDivStopPropagation = function (event) { + event.stopPropagation() + } + }, + ]) + app.controller('partnerSurchargeAccountCtrl', [ + '$scope', + '$uibModal', + '$http', + 'clientMoniker', + '$filter', + function ($scope, $uibModal, $http, clientMoniker, $filter) { + $scope.params = {} + $scope.pagination = {} + $scope.today = new Date() + + $scope.chooseToday = function () { + $scope.params.datefrom = $scope.params.dateto = new Date() + $scope.loadSettlementLogs(1) + } + $scope.chooseYesterday = function () { + var yesterday = new Date() + yesterday.setDate(yesterday.getDate() - 1) + $scope.params.datefrom = $scope.params.dateto = yesterday + $scope.loadSettlementLogs(1) + } + $scope.chooseLast7Days = function () { + $scope.params.dateto = new Date() + var day = new Date() + day.setDate(day.getDate() - 7) + $scope.params.datefrom = day + $scope.loadSettlementLogs(1) + } + $scope.thisMonth = function () { + $scope.params.dateto = new Date() + var monthBegin = new Date() + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadSettlementLogs(1) + } + $scope.lastMonth = function () { + var monthFinish = new Date() + monthFinish.setDate(0) + $scope.params.dateto = monthFinish + var monthBegin = new Date() + monthBegin.setDate(0) + monthBegin.setDate(1) + $scope.params.datefrom = monthBegin + $scope.loadSettlementLogs(1) + } + $scope.loadSettlementLogs = function (page) { + var params = angular.copy($scope.params) + if (params.datefrom) { + params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') + } + if (params.dateto) { + params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') + } + params.page = page || $scope.pagination.page || 1 + params.limit = 10 + $http.get('/sys/partners/' + clientMoniker + '/surcharge_account/month_detail').then(function (resp) { + $scope.details = resp.data + }) + } + $scope.getClearingTransactions = function (client_id, detail_id) { + $uibModal.open({ + templateUrl: '/static/analysis/templates/settlement_transactions.html', + controller: 'managerSettlementDetailCtrl', + resolve: { + detail: [ + '$http', + '$stateParams', + function ($http) { + return $http.get('/analysis/partner_card/' + client_id + '/settlement_logs/' + detail_id) + }, + ], + detail_id: detail_id, + }, + size: 'lg', + }) + } + $scope.chooseLast7Days() + }, + ]) + app.controller('managerSettlementDetailCtrl', [ + '$scope', + 'detail', + 'detail_id', + '$http', + function ($scope, detail, detail_id, $http) { + $scope.ctrl = {channel: null} + $scope.show = true + $scope.report = detail.data + $scope.report.total_charge = Decimal.add($scope.report.total_charge, $scope.report.tax_amount).toFixed(2) + angular.forEach($scope.report.channels, function (e) { + e.total_charge = Decimal.add(e.tax_amount, e.total_charge).toFixed(2) }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - function commitError() { - commonDialog.alert({ - title: 'Error', - content: 'Missing file', - type: 'error', - }) - } - $scope.complianceCheck = function () { - if (!$rootScope.complianceCheck) { - $rootScope.complianceCheck = {} - } - $rootScope.complianceCheck.client_id = $scope.partner.client_id - $rootScope.complianceCheck.authFile = true - } - $scope.complianceChangeCheck = function () { - if ($rootScope.complianceCheck) { - if ($scope.partner.client_id != $rootScope.complianceCheck.client_id) { - delete $rootScope.complianceCheck - } - } - } - $scope.complianceChangeCheck() - }, - ]) - - app.controller('partnerSettlementCtrl', [ - '$scope', - '$uibModal', - '$http', - 'clientMoniker', - '$filter', - function ($scope, $uibModal, $http, clientMoniker, $filter) { - $scope.params = {} - $scope.pagination = {} - $scope.clients = [] - $scope.showLevel3Clients = false - $scope.isLevel3All = true - $scope.clinet = {} - $scope.isAll = true - $scope.more20ChoseSubClient = false - $scope.choseSubClientNow = 'More' - $scope.searchSubClients = function (subSearchText, page) { - $scope.subClientTable1 = [$scope.partner] - $scope.subClientTable2 = [] - var params = {} - params.page = page || $scope.subClientPagination.page || 1 - if (subSearchText != '') { - $scope.subSearchText = subSearchText - params.searchText = subSearchText - } - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page', { params: params }).then(function (resp) { - var clientList = resp.data.data - $scope.subClientPagination = resp.data.pagination - clientList.forEach(function (client) { - if ($scope.subClientTable1.length < 11) { - $scope.subClientTable1.push(client) - } else { - $scope.subClientTable2.push(client) - } - $scope.clients.push(client) - }) - }) - } - $scope.initClientInfo = function () { - $http.get('/sys/partners/' + clientMoniker).then(function (resp) { - $scope.client = resp.data - $scope.clients = [$scope.client] - if ($scope.client.has_children && !$scope.client.hide_sub_mch) { - $scope.searchSubClients('', 1) - $scope.params.dateto = new Date() - var day = new Date() - day.setDate(day.getDate() - 7) - $scope.params.datefrom = day - $scope.chooseClient('all') - } else { - $scope.params.dateto = new Date() - var day = new Date() - day.setDate(day.getDate() - 7) - $scope.params.datefrom = day - $scope.chooseClient('all') - } - }) - } - $scope.initClientInfo() - - $scope.exportSettlementLogs = function () { - var params = angular.copy($scope.params) - var url = '/sys/partners/' + clientMoniker + '/lists_settlements/excel' - var connectSymbol = '?' - if (params.datefrom) { - params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') - url += connectSymbol + 'datefrom=' + params.datefrom - connectSymbol = '&' - } - if (params.dateto) { - params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') - url += connectSymbol + 'dateto=' + params.dateto - } - if (params.client_ids && !$scope.isAll) { - params.client_ids.forEach(function (i) { - url += connectSymbol + 'client_ids=' + i - connectSymbol = '&' - }) - } - return url - } - - $scope.chooseClient = function (client) { - if (client == 'all') { - $scope.choseSubClientNow = 'More' - $scope.params.client_ids = angular.copy($scope.clientIds) - $scope.isAll = true - $scope.chooseClientId = '' - $scope.showLevel3Clients = false - } else if (client.level3Clients) { - $scope.chooseClientId = client.client_id - $scope.showLevel3Clients = true - $scope.level3Clients = client.level3Clients - $scope.isAll = false - $scope.level3ClientIds = [] - $scope.level3ClientIds.push(client.client_id) - client.level3Clients.forEach(function (client) { - $scope.level3ClientIds.push(client.client_id) - }) - $scope.chooseLevel3Client('all') - return - } else { - $scope.chooseClientId = client.client_id - $scope.params.client_ids = [client.client_id] - $scope.isAll = false - $scope.showLevel3Clients = false - } - $scope.loadSettlementLogs() - } - - $scope.today = new Date() - $scope.chooseToday = function () { - $scope.params.datefrom = $scope.params.dateto = new Date() - $scope.loadSettlementLogs(1) - } - $scope.chooseYesterday = function () { - var yesterday = new Date() - yesterday.setDate(yesterday.getDate() - 1) - $scope.params.datefrom = $scope.params.dateto = yesterday - $scope.loadSettlementLogs(1) - } - $scope.chooseLast7Days = function () { - $scope.params.dateto = new Date() - var day = new Date() - day.setDate(day.getDate() - 7) - $scope.params.datefrom = day - $scope.loadSettlementLogs(1) - } - $scope.thisMonth = function () { - $scope.params.dateto = new Date() - var monthBegin = new Date() - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadSettlementLogs(1) - } - $scope.lastMonth = function () { - var monthFinish = new Date() - monthFinish.setDate(0) - $scope.params.dateto = monthFinish - var monthBegin = new Date() - monthBegin.setDate(0) - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadSettlementLogs(1) - } - $scope.loadSettlementLogs = function (page) { - var params = angular.copy($scope.params) - if (params.datefrom) { - params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') - } - if (params.dateto) { - params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') - } - params.page = page || $scope.pagination.page || 1 - params.limit = 10 - if ($scope.isAll) { - delete params.client_ids - } - $http.get('/sys/partners/' + clientMoniker + '/lists_settlements', { params: params }).then(function (resp) { - $scope.settlementLogs = resp.data.data - $scope.padding = resp.data.padding - $scope.pagination = resp.data.pagination - }) - } - $scope.getClearingTransactions = function (client_id, detail_id) { - $uibModal.open({ - templateUrl: '/static/analysis/templates/settlement_transactions.html', - controller: 'managerSettlementDetailCtrl', - resolve: { - detail: [ - '$http', - '$stateParams', - function ($http) { - return $http.get('/analysis/partner_card/' + client_id + '/settlement_logs/' + detail_id) - }, - ], - detail_id: detail_id, - }, - size: 'lg', - }) - } - - $scope.getClearingTransactionsOfMergeSettle = function (reportDate) { - $uibModal.open({ - templateUrl: '/static/analysis/templates/settlement_transactions.html', - controller: 'managerSettlementDetailOfMergeSettleCtrl', - resolve: { - detail: [ - '$http', - '$stateParams', - function ($http) { - return $http.get('/analysis/partner_card/' + $scope.client.client_id + '/settlement_logs/report_date/' + reportDate) - }, - ], - client_id: $scope.client.client_id, - }, - size: 'lg', - }) - } - - $scope.checkSubClientChoseShow = function (client) { - $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient - if (client != '') { - $scope.choseSubClientNow = client.short_name - } - } - $scope.clickDisplayChoseDiv = function (event) { - $scope.more20ChoseSubClient = false - } - $scope.choseDivStopPropagation = function (event) { - event.stopPropagation() - } - }, - ]) - app.controller('partnerSurchargeAccountCtrl', [ - '$scope', - '$uibModal', - '$http', - 'clientMoniker', - '$filter', - function ($scope, $uibModal, $http, clientMoniker, $filter) { - $scope.params = {} - $scope.pagination = {} - $scope.today = new Date() - - $scope.chooseToday = function () { - $scope.params.datefrom = $scope.params.dateto = new Date() - $scope.loadSettlementLogs(1) - } - $scope.chooseYesterday = function () { - var yesterday = new Date() - yesterday.setDate(yesterday.getDate() - 1) - $scope.params.datefrom = $scope.params.dateto = yesterday - $scope.loadSettlementLogs(1) - } - $scope.chooseLast7Days = function () { - $scope.params.dateto = new Date() - var day = new Date() - day.setDate(day.getDate() - 7) - $scope.params.datefrom = day - $scope.loadSettlementLogs(1) - } - $scope.thisMonth = function () { - $scope.params.dateto = new Date() - var monthBegin = new Date() - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadSettlementLogs(1) - } - $scope.lastMonth = function () { - var monthFinish = new Date() - monthFinish.setDate(0) - $scope.params.dateto = monthFinish - var monthBegin = new Date() - monthBegin.setDate(0) - monthBegin.setDate(1) - $scope.params.datefrom = monthBegin - $scope.loadSettlementLogs(1) - } - $scope.loadSettlementLogs = function (page) { - var params = angular.copy($scope.params) - if (params.datefrom) { - params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd') - } - if (params.dateto) { - params.dateto = $filter('date')(params.dateto, 'yyyyMMdd') - } - params.page = page || $scope.pagination.page || 1 - params.limit = 10 - $http.get('/sys/partners/' + clientMoniker + '/surcharge_account/month_detail').then(function (resp) { - $scope.details = resp.data - }) - } - $scope.getClearingTransactions = function (client_id, detail_id) { - $uibModal.open({ - templateUrl: '/static/analysis/templates/settlement_transactions.html', - controller: 'managerSettlementDetailCtrl', - resolve: { - detail: [ - '$http', - '$stateParams', - function ($http) { - return $http.get('/analysis/partner_card/' + client_id + '/settlement_logs/' + detail_id) - }, - ], - detail_id: detail_id, - }, - size: 'lg', - }) - } - $scope.chooseLast7Days() - }, - ]) - app.controller('managerSettlementDetailCtrl', [ - '$scope', - 'detail', - 'detail_id', - '$http', - function ($scope, detail, detail_id, $http) { - $scope.ctrl = { channel: null } - $scope.show = true - $scope.report = detail.data - $scope.report.total_charge = Decimal.add($scope.report.total_charge, $scope.report.tax_amount).toFixed(2) - angular.forEach($scope.report.channels, function (e) { - e.total_charge = Decimal.add(e.tax_amount, e.total_charge).toFixed(2) - }) - - $scope.channelAndDayOfAnalysis = function () { - $http.get('/analysis/partner_card/settlement_logs/' + detail_id + '/analysis/' + $scope.ctrl.channel).then(function (resp) { - $scope.channelAndDayMap = resp.data - $scope.index = 0 - }) - } - $scope.channelAndDayOfAnalysis(1) - }, - ]) - app.controller('managerSettlementDetailOfMergeSettleCtrl', [ - '$scope', - 'detail', - 'client_id', - '$http', - function ($scope, detail, client_id, $http) { - $scope.ctrl = { channel: null } - $scope.show = true - $scope.report = detail.data - $scope.report.total_charge = Decimal.add($scope.report.total_charge, $scope.report.tax_amount).toFixed(2) - angular.forEach($scope.report.channels, function (e) { - e.total_charge = Decimal.add(e.tax_amount, e.total_charge).toFixed(2) - }) - }, - ]) - app.controller('productCtrl', [ - '$scope', - '$http', - '$uibModal', - 'commonDialog', - '$state', - 'Upload', - 'wechatGoodMcc', - function ($scope, $http, $uibModal, commonDialog, $state, Upload, wechatGoodMcc) { - $scope.importShow = 0 - $scope.pagination = {} - $scope.params = { text_type: 'all', search_text: null } - $scope.wechatMccIndustries = wechatGoodMcc.configs() - $scope.loadProducts = function () { - $http.get('/sys/product/' + $scope.partner.client_moniker + '/list').then(function (resp) { - $scope.mcc_goods = resp.data - }) - } - $scope.updateMccInfo = function (mccInfo) { - mccInfo.client_moniker = $scope.partner.client_moniker - $http.put('/sys/product/update', mccInfo).then(function (resp) { - $state.reload() - }) - } - $scope.loadProducts() - /*$scope.importExcel = function (file) { + + $scope.channelAndDayOfAnalysis = function () { + $http.get('/analysis/partner_card/settlement_logs/' + detail_id + '/analysis/' + $scope.ctrl.channel).then(function (resp) { + $scope.channelAndDayMap = resp.data + $scope.index = 0 + }) + } + $scope.channelAndDayOfAnalysis(1) + }, + ]) + app.controller('managerSettlementDetailOfMergeSettleCtrl', [ + '$scope', + 'detail', + 'client_id', + '$http', + function ($scope, detail, client_id, $http) { + $scope.ctrl = {channel: null} + $scope.show = true + $scope.report = detail.data + $scope.report.total_charge = Decimal.add($scope.report.total_charge, $scope.report.tax_amount).toFixed(2) + angular.forEach($scope.report.channels, function (e) { + e.total_charge = Decimal.add(e.tax_amount, e.total_charge).toFixed(2) + }) + }, + ]) + app.controller('productCtrl', [ + '$scope', + '$http', + '$uibModal', + 'commonDialog', + '$state', + 'Upload', + 'wechatGoodMcc', + function ($scope, $http, $uibModal, commonDialog, $state, Upload, wechatGoodMcc) { + $scope.importShow = 0 + $scope.pagination = {} + $scope.params = {text_type: 'all', search_text: null} + $scope.wechatMccIndustries = wechatGoodMcc.configs() + $scope.loadProducts = function () { + $http.get('/sys/product/' + $scope.partner.client_moniker + '/list').then(function (resp) { + $scope.mcc_goods = resp.data + }) + } + $scope.updateMccInfo = function (mccInfo) { + mccInfo.client_moniker = $scope.partner.client_moniker + $http.put('/sys/product/update', mccInfo).then(function (resp) { + $state.reload() + }) + } + $scope.loadProducts() + /*$scope.importExcel = function (file) { if (file != null) { Upload.upload({ url: '/attachment/files', @@ -6271,2078 +6344,2116 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) } }*/ - }, - ]) - app.controller('AddProductDialogCtrl', [ - '$scope', - '$http', - '$uibModal', - 'product', - 'partner', - '$state', - 'industryMap', - function ($scope, $http, $uibModal, product, partner, $state, industryMap) { - $scope.product = angular.copy(product) - $scope.product.partner = true - $scope.partner = angular.copy(partner) - $scope.industries = industryMap.configs() - - if ($scope.product.commodity_id) { - $scope.edit_or_add = 'Edit' - } else { - $scope.edit_or_add = 'Add' - $scope.product.industry = $scope.partner.industry - } - $scope.save = function () { - if ($scope.product.commodity_id) { - $http.put('/client/product/', $scope.product).then(function (resp) { - alert('Success') - $scope.$close() - $state.reload() - }) - } else { - $http.post('/client/product/' + $scope.partner.client_moniker, $scope.product).then(function (resp) { - alert('Success') - $scope.$close() - $state.reload() - }) - } - } - }, - ]) - // MID Management - app.controller('subMerchantIdApplicaitonsCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'commonDialog', - '$sce', - function ($scope, $http, $uibModal, $state, commonDialog, $sce) { - // 初始化子商户 - $scope.loadSubMerchantInfos = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_sub_applices', { params: {} }).then(function (resp) { - $scope.subMerchantInfos = resp.data - }) - // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_rpay_sub_applices', {params: {}}).then(function (resp) { - // $scope.subRpayMerchantInfos = resp.data; - // }); - // - // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_yeepay_sub_applices', {params: {}}).then(function (resp) { - // $scope.subYeepayMerchantInfos = resp.data; - // }); - // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) { - // $scope.partner.cardInfo = resp.data; - // }); - } - $scope.loadSubMerchantInfos() - // 加载卡支付信息 - $scope.loadCardInfos = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) { - $scope.cardInfo = resp.data - }) - } - $scope.loadCardInfos() - // 初始化信息 - $scope.loadPartnerInfo = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { - $scope.partnerInfo = resp.data - $scope.doSwitchCommonSubMerchantId() - }) - } - $scope.loadPartnerInfo() - // 编辑Wechat Sub Merchant Id - $scope.saveSubMerchantId = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', { sub_merchant_id: $scope.partnerInfo.sub_merchant_id }).then( - function (resp) { - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - // Wechat-applay - $scope.applyWxSubMerchantId = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html', - controller: 'newApplyWxSubMerchantIdCtrl', - resolve: { - subMerchantInfo: function () { - return $scope.partner - }, - merchantIds: [ - '$http', - '$stateParams', - function ($http) { - return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids') - }, - ], - }, - }) - .result.then(function () { + }, + ]) + app.controller('AddProductDialogCtrl', [ + '$scope', + '$http', + '$uibModal', + 'product', + 'partner', + '$state', + 'industryMap', + function ($scope, $http, $uibModal, product, partner, $state, industryMap) { + $scope.product = angular.copy(product) + $scope.product.partner = true + $scope.partner = angular.copy(partner) + $scope.industries = industryMap.configs() + + if ($scope.product.commodity_id) { + $scope.edit_or_add = 'Edit' + } else { + $scope.edit_or_add = 'Add' + $scope.product.industry = $scope.partner.industry + } + $scope.save = function () { + if ($scope.product.commodity_id) { + $http.put('/client/product/', $scope.product).then(function (resp) { + alert('Success') + $scope.$close() + $state.reload() + }) + } else { + $http.post('/client/product/' + $scope.partner.client_moniker, $scope.product).then(function (resp) { + alert('Success') + $scope.$close() + $state.reload() + }) + } + } + }, + ]) + // MID Management + app.controller('subMerchantIdApplicaitonsCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'commonDialog', + '$sce', + function ($scope, $http, $uibModal, $state, commonDialog, $sce) { + // 初始化子商户 + $scope.loadSubMerchantInfos = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_sub_applices', {params: {}}).then(function (resp) { + $scope.subMerchantInfos = resp.data + }) + // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_rpay_sub_applices', {params: {}}).then(function (resp) { + // $scope.subRpayMerchantInfos = resp.data; + // }); + // + // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_yeepay_sub_applices', {params: {}}).then(function (resp) { + // $scope.subYeepayMerchantInfos = resp.data; + // }); + // $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) { + // $scope.partner.cardInfo = resp.data; + // }); + } $scope.loadSubMerchantInfos() - }) - } - // 刷新Wechat Sub Merchant Id - $scope.queryWechatSubMerchantIdStatus = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.partnerInfo.sub_merchant_id + '/status').then( - function (resp) { - commonDialog.alert({ - title: 'Wechat Apply Status(' + resp.data.apply_status + ')', - content: resp.data.response_str, - type: 'info', - }) - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - // history - $scope.showSubMerchantLogs = function () { - $uibModal.open({ - templateUrl: '/static/payment/partner/templates/client_sub_merchant_id_log.html', - controller: 'clientSubMerchantIdLogCtrl', - size: 'lg', - resolve: { - logs: [ - '$http', - function ($http) { - return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_sub_merchant_id_logs') - }, - ], - }, - }) - } - // 刷新Wechat Institution Merchant Id - $scope.refreshWechatInstitutionMerchantId = function () { - $http - .put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_institution_merchant_id', { - wechat_institution_merchant_id: $scope.partnerInfo.wechat_institution_merchant_id, - }) - .then( - function (resp) { - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - // switch开关 - $scope.doSwitchCommonSubMerchantId = function () { - $("input[name='switch']").bootstrapSwitch({ - onText: 'ON', - offText: 'OFF', - size: 'mini', - state: $scope.partnerInfo.common_sub_merchant_id, - onSwitchChange: function (event, state) { - //监听switch change事件，可以根据状态把相应的业务逻辑代码写在这里 - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/common_sub_merchant_id', { allow: state }).then( - function () { - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ - title: 'Failed to change common_sub_merchant_id permission status', - content: resp.data.message, - type: 'error', + // 加载卡支付信息 + $scope.loadCardInfos = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/queryMWMerchantIdStatus').then(function (resp) { + $scope.cardInfo = resp.data }) - } - ) - }, - }) - } - // Alipay保存名称修改 - $scope.saveAliSubMerchantId = function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.partnerInfo.ali_sub_merchant_id }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Modify Ali Sub Merchant ID successfully', - type: 'success', - }) + } + $scope.loadCardInfos() + // 初始化信息 + $scope.loadPartnerInfo = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { + $scope.partnerInfo = resp.data + $scope.doSwitchCommonSubMerchantId() + }) + } $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - // 刷新Alipay - $scope.queryAlipayGms = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms').then( - function (resp) { - commonDialog.alert({ title: 'Success', content: resp.data.result_status, type: 'success' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) - } - ) - } - // 刷新AlipayOnline - $scope.queryAlipayOnlineGms = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms').then( - function (resp) { - commonDialog.alert({ title: 'Success', content: resp.data.result_status, type: 'success' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) - } - ) - } - // Alipay进件 - $scope.submitAlipaySubId = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms_json').then(function (resp) { - $scope.alipay_gms_json = resp.data - commonDialog - .confirm({ - title: 'Warning', - content: '是否使用该商户的现有信息进件？', - json: $scope.alipay_gms_json, - }) - .then(function () { - $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then( - function () { - commonDialog.alert({ title: 'Success', content: 'Alipay进件成功', type: 'success' }) - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '进件失败：' + resp.data.message, type: 'error' }) + // 编辑Wechat Sub Merchant Id + $scope.saveSubMerchantId = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', {sub_merchant_id: $scope.partnerInfo.sub_merchant_id}).then( + function (resp) { + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + // Wechat-applay + $scope.applyWxSubMerchantId = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html', + controller: 'newApplyWxSubMerchantIdCtrl', + resolve: { + subMerchantInfo: function () { + return $scope.partner + }, + merchantIds: [ + '$http', + '$stateParams', + function ($http) { + return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids') + }, + ], + }, + }) + .result.then(function () { + $scope.loadSubMerchantInfos() + }) + } + // 刷新Wechat Sub Merchant Id + $scope.queryWechatSubMerchantIdStatus = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.partnerInfo.sub_merchant_id + '/status').then( + function (resp) { + commonDialog.alert({ + title: 'Wechat Apply Status(' + resp.data.apply_status + ')', + content: resp.data.response_str, + type: 'info', + }) + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + // history + $scope.showSubMerchantLogs = function () { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/client_sub_merchant_id_log.html', + controller: 'clientSubMerchantIdLogCtrl', + size: 'lg', + resolve: { + logs: [ + '$http', + function ($http) { + return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_sub_merchant_id_logs') + }, + ], + }, + }) + } + // 刷新Wechat Institution Merchant Id + $scope.refreshWechatInstitutionMerchantId = function () { + $http + .put('/sys/partners/' + $scope.partner.client_moniker + '/wechat_institution_merchant_id', { + wechat_institution_merchant_id: $scope.partnerInfo.wechat_institution_merchant_id, + }) + .then( + function (resp) { + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + // switch开关 + $scope.doSwitchCommonSubMerchantId = function () { + $("input[name='switch']").bootstrapSwitch({ + onText: 'ON', + offText: 'OFF', + size: 'mini', + state: $scope.partnerInfo.common_sub_merchant_id, + onSwitchChange: function (event, state) { + //监听switch change事件，可以根据状态把相应的业务逻辑代码写在这里 + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/common_sub_merchant_id', {allow: state}).then( + function () { + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Failed to change common_sub_merchant_id permission status', + content: resp.data.message, + type: 'error', + }) + } + ) + }, + }) + } + // Alipay保存名称修改 + $scope.saveAliSubMerchantId = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/ali_sub_merchant_id', {ali_sub_merchant_id: $scope.partnerInfo.ali_sub_merchant_id}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Ali Sub Merchant ID successfully', + type: 'success', + }) + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + // 刷新Alipay + $scope.queryAlipayGms = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms').then( + function (resp) { + commonDialog.alert({title: 'Success', content: resp.data.result_status, type: 'success'}) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'}) + } + ) + } + // 刷新AlipayOnline + $scope.queryAlipayOnlineGms = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms').then( + function (resp) { + commonDialog.alert({title: 'Success', content: resp.data.result_status, type: 'success'}) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'}) + } + ) + } + // Alipay进件 + $scope.submitAlipaySubId = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms_json').then(function (resp) { + $scope.alipay_gms_json = resp.data + commonDialog + .confirm({ + title: 'Warning', + content: '是否使用该商户的现有信息进件？', + json: $scope.alipay_gms_json, + }) + .then(function () { + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then( + function () { + commonDialog.alert({title: 'Success', content: 'Alipay进件成功', type: 'success'}) + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: '进件失败：' + resp.data.message, + type: 'error' + }) + } + ) + }) + }) + } + // AlipayOnline进件 + $scope.submitAlipayOnlineSubId = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms_json').then(function (resp) { + $scope.alipayOnline_gms_json = resp.data + commonDialog + .confirm({ + title: 'Warning', + content: '是否使用该商户的现有信息进件？', + json: $scope.alipayOnline_gms_json, + }) + .then(function () { + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms').then( + function () { + commonDialog.alert({ + title: 'Success', + content: '提示：AlipayOnline进件成功', + type: 'success' + }) + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: '进件失败：' + resp.data.message, + type: 'error' + }) + } + ) + }) + }) + } + // use sub_merchant_id + $scope.useSubMerchantId = function (sub_merchant_id) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', {sub_merchant_id: sub_merchant_id}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Wechat Sub Merchant ID successfully', + type: 'success', + }) + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + // 查看sub_merchant_id详情 + $scope.checkDetail = function (merchantInfo, channel) { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/sub_merchant_detail.html', + controller: 'subMerchantDetailCtrl', + resolve: { + subMerchantInfo: function () { + return merchantInfo + }, + channel: function () { + return channel + }, + }, + }) + } + // 修改sub_merchant_id + $scope.modifySubMerchantId = function (subMerchantId, channel) { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/md_sub_merchant_id.html', + controller: 'ModifysubMerchantIdCtrl', + resolve: { + clientMoniker: function () { + return $scope.partner.client_moniker + }, + merchantId: function () { + return subMerchantId + }, + channel: function () { + return channel + }, + }, + }) + .result.then(function () { + commonDialog.alert({ + title: 'Success', + content: 'Modify successfully', + type: 'success', + }) + $scope.loadPartnerInfo() + }) + } + // 卡支付apply + $scope.applyMWSubMerchantId = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/mw_info').then(function (resp) { + commonDialog + .confirm({ + title: 'Apply Merchant Warrior Sub Merchant Id', + contentHtml: $sce.trustAsHtml('Are you sure to apply merchant Warrior sub merchant id for [' + $scope.partner.company_name + ']?'), + json: resp.data, + }) + .then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/applyMWMerchantId').then( + function (res) { + commonDialog.alert({ + title: 'Success', + content: 'Apply Merchant Warrior Sub Merchant ID successfully', + type: 'success', + }) + $scope.cardInfo = res.data + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + }) + } + + $scope.copyMWProfile = function () { + commonDialog.inputText({title: '请输入复制来源商户编码'}).then(function (text) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/copy_mw_config', {client_moniker: text}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify successfully', + type: 'success', + }) + $scope.loadPartnerInfo() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } + + // $scope.showMoreMerchantInfo = false; + // $scope.hideMerchantInfo = function () { + // $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo; + // }; + $scope.updateSubMerchantId = function (sub_merchant_id) { + angular.forEach($scope.subMerchantInfos, function (each) { + if (sub_merchant_id == each.sub_merchant_id) { + $scope.merchant_app_id = each.merchant_app_id + } + }) + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html', + controller: 'updateApplyWxSubMerchantIdCtrl', + resolve: { + merchantInfo: $scope.partner, + merchantIds: [ + '$http', + '$stateParams', + function ($http) { + return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids') + }, + ], + subMerchantInfo: [ + '$http', + '$stateParams', + function ($http) { + return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.merchant_app_id) + }, + ], + }, + }) + .result.then(function () { + $scope.loadSubMerchantInfos() + }) + } + }, + ]) + app.controller('applyWxSubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + '$filter', + 'merchantIds', + 'commonDialog', + function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) { + $scope.wxIndustries = angular.copy(wxMerchantIndustries) + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + $scope.merchantIds = merchantIds.data + $scope.subMerchantInfo.industry = $filter('wxindustries')($scope.subMerchantInfo.industry) + $scope.saveAppliy = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/sub_apply', $scope.subMerchantInfo).then( + function (resp) { + $scope.apply_sub_merchant_id = resp.data + $scope.$close() + if (subMerchantInfo.sub_merchant_id != null) { + commonDialog.confirm({title: 'Confirm', content: '已申请成功，是否确认使用'}).then(function () { + $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Wechat Sub Merchant ID successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } else { + $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Apply Success And Modify Wechat Sub Merchant ID successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }, + ]) + // 展示信息 + app.controller('subMerchantDetailCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'commonDialog', + 'subMerchantInfo', + 'channel', + function ($scope, $http, $uibModal, $state, commonDialog, subMerchantInfo, channel) { + $scope.channel = channel + $scope.subMerchantInfo = subMerchantInfo + }, + ]) + // 修改sub_merchant_id + app.controller('ModifysubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'commonDialog', + 'clientMoniker', + 'merchantId', + 'channel', + function ($scope, $http, $uibModal, $state, commonDialog, clientMoniker, merchantId, channel) { + $scope.merchantId = merchantId + $scope.flag = false + $scope.confirm = function () { + $scope.flag = true + if (channel === 'Wechat') { + $http.put('/sys/partners/' + clientMoniker + '/payment_config', {sub_merchant_id: $scope.merchantId}).then( + function (resp) { + $scope.$close() + }, + function (resp) { + $scope.flag = false + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } else if (channel === 'Alipay' || channel === 'AlipayOnline') { + $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', {ali_sub_merchant_id: $scope.merchantId}).then( + function (resp) { + $scope.$close() + }, + function (resp) { + $scope.flag = false + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + } + }, + ]) + app.controller('newApplyWxSubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + '$filter', + 'merchantIds', + 'commonDialog', + 'wechatGoodMcc', + 'businessTypesMap', + function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, businessTypesMap) { + $scope.wxIndustries = angular.copy(wxMerchantIndustries) + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + $scope.subMerchantInfo.address = subMerchantInfo.address + "," + subMerchantInfo.suburb + + "," + subMerchantInfo.state + "," + subMerchantInfo.country; + $scope.subMerchantInfo.company_register_no = subMerchantInfo.abn ? subMerchantInfo.abn : subMerchantInfo.acn + $scope.wechatMccIndustries = wechatGoodMcc.configs() + $scope.merchantIds = merchantIds.data + $scope.businessTypesMap = businessTypesMap.configs() + if ($scope.subMerchantInfo.client_pay_type) { + if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { + $scope.subMerchantInfo.business_type = 'BOTH' + } else if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0) { + $scope.subMerchantInfo.business_type = 'ONLINE' + } else if ($scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { + $scope.subMerchantInfo.business_type = 'OFFLINE' + } + } else { + $scope.subMerchantInfo.business_type = 'BOTH' + } + + if ($scope.subMerchantInfo.industry) { + $scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.subMerchantInfo.industry) + } + if ($scope.subMerchantInfo.mc_code) { + $scope.subMerchantInfo.mcc_code = $scope.subMerchantInfo.mc_code + } + if (subMerchantInfo.certificat_expire_date) { + var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/') + $scope.subMerchantInfo.certificat_expire_date = new Date(datestr) + } + if ($scope.subMerchantInfo.business_structure) { + $scope.subMerchantInfo.merchant_type = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' + } + if (subMerchantInfo.certificat_expire_date) { + if (subMerchantInfo.certificat_expire_date == 'PERMANENT') { + $scope.subMerchantInfo.certificat_expire_date_premanent = true + } else if (subMerchantInfo.certificat_expire_date == 'N/A') { + $scope.subMerchantInfo.certificat_expire_date_NA = true + } else { + var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/') + $scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr) + } + } + + $scope.checkExpriedate = function (value) { + if (value) { + $scope.subMerchantInfo.certificat_expire_date_premanent = false + $scope.subMerchantInfo.certificat_expire_date_NA = false + } + } + $scope.checkExpriedateOther = function (value) { + if (value == 'PERMANENT') { + if ($scope.subMerchantInfo.certificat_expire_date_premanent) { + $scope.subMerchantInfo.certificat_expire_date_NA = false + $scope.subMerchantInfo.certificat_expire_date_d = null + } + } else if (value == 'N/A') { + if ($scope.subMerchantInfo.certificat_expire_date_NA) { + $scope.subMerchantInfo.certificat_expire_date_premanent = false + $scope.subMerchantInfo.certificat_expire_date_d = null + } + } + } + $scope.saveAppliy = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + // var merchant_type = $scope.subMerchantInfo.business_structure == 'Company'? 1:2; + var params = { + company_name: $scope.subMerchantInfo.company_name, + merchant_id: $scope.subMerchantInfo.merchant_id, + short_name: $scope.subMerchantInfo.short_name, + office_phone: $scope.subMerchantInfo.office_phone, + contact_person: $scope.subMerchantInfo.contact_person, + contact_phone: $scope.subMerchantInfo.contact_phone, + company_phone: $scope.subMerchantInfo.company_phone, + contact_email: $scope.subMerchantInfo.contact_email, + industry: $scope.subMerchantInfo.industry, + company_website: $scope.subMerchantInfo.company_website, + merchant_type: $scope.subMerchantInfo.merchant_type, + mcc_code: $scope.subMerchantInfo.mcc_code, + address: $scope.subMerchantInfo.address, + business_type: $scope.subMerchantInfo.business_type, + } + if (params.business_type == 'ONLINE') { + params.address = null + } else if (params.business_type == 'OFFLINE') { + params.company_website = null + } + + if (params.merchant_type == 'ENTERPRISE') { + params.director_name = $scope.subMerchantInfo.director_name + params.director_id_number = $scope.subMerchantInfo.director_id_number + params.company_register_no = $scope.subMerchantInfo.company_register_no + params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date + + if ($scope.subMerchantInfo.certificat_expire_date_d) { + params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date_d) + } else if ($scope.subMerchantInfo.certificat_expire_date_premanent) { + params.certificat_expire_date = 'PERMANENT' + } else if ($scope.subMerchantInfo.certificat_expire_date_NA) { + params.certificat_expire_date = 'N/A' + } else { + alert('Certificate expiration time is required') + return + } + } else { + params.principal_name = $scope.subMerchantInfo.principal_name + params.principal_id_number = $scope.subMerchantInfo.principal_id_number } - ) - }) - }) - } - // AlipayOnline进件 - $scope.submitAlipayOnlineSubId = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms_json').then(function (resp) { - $scope.alipayOnline_gms_json = resp.data - commonDialog - .confirm({ - title: 'Warning', - content: '是否使用该商户的现有信息进件？', - json: $scope.alipayOnline_gms_json, - }) - .then(function () { - $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms').then( - function () { - commonDialog.alert({ title: 'Success', content: '提示：AlipayOnline进件成功', type: 'success' }) - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: '进件失败：' + resp.data.message, type: 'error' }) + + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/new_sub_apply', params).then( + function (resp) { + $scope.apply_sub_merchant_id = resp.data + $scope.$close() + if (subMerchantInfo.sub_merchant_id != null) { + commonDialog.confirm({title: 'Confirm', content: '已申请成功，是否确认使用'}).then(function () { + $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Wechat Sub Merchant ID successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + }) + } else { + $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then( + function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Apply Success And Modify Wechat Sub Merchant ID successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }, + ]) + app.controller('updateApplyWxSubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + '$filter', + 'merchantIds', + 'commonDialog', + 'wechatGoodMcc', + 'merchantInfo', + 'businessTypesMap', + function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, merchantInfo, businessTypesMap) { + $scope.wxIndustries = angular.copy(wxMerchantIndustries) + $scope.subMerchantInfo = angular.copy(subMerchantInfo.data) + $scope.merchantInfo = angular.copy(merchantInfo) + $scope.wechatMccIndustries = wechatGoodMcc.configs() + $scope.merchantIds = merchantIds.data + $scope.businessTypesMap = businessTypesMap.configs() + $scope.subMerchantInfo.short_name = $scope.merchantInfo.short_name + $scope.subMerchantInfo.industry = $scope.merchantInfo.industry + $scope.subMerchantInfo.company_website = $scope.merchantInfo.company_website + $scope.subMerchantInfo.address = $scope.merchantInfo.address + "," + $scope.merchantInfo.suburb + + "," + $scope.merchantInfo.state + "," + $scope.merchantInfo.country; + $scope.subMerchantInfo.company_phone = $scope.merchantInfo.company_phone + $scope.subMerchantInfo.contact_person = $scope.merchantInfo.contact_person + $scope.subMerchantInfo.contact_phone = $scope.merchantInfo.contact_phone + $scope.subMerchantInfo.contact_email = $scope.merchantInfo.contact_email + $scope.subMerchantInfo.company_register_no = $scope.merchantInfo.abn ? $scope.merchantInfo.abn : $scope.merchantInfo.acn + + if ($scope.merchantInfo.client_pay_type) { + if ($scope.merchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.merchantInfo.client_pay_type.indexOf('2') >= 0) { + $scope.subMerchantInfo.business_type = 'BOTH' + } else if ($scope.merchantInfo.client_pay_type.indexOf('1') >= 0) { + $scope.subMerchantInfo.business_type = 'ONLINE' + } else if ($scope.merchantInfo.client_pay_type.indexOf('2') >= 0) { + $scope.subMerchantInfo.business_type = 'OFFLINE' } - ) - }) - }) - } - // use sub_merchant_id - $scope.useSubMerchantId = function (sub_merchant_id) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', { sub_merchant_id: sub_merchant_id }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Modify Wechat Sub Merchant ID successfully', - type: 'success', - }) - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - // 查看sub_merchant_id详情 - $scope.checkDetail = function (merchantInfo, channel) { - $uibModal.open({ - templateUrl: '/static/payment/partner/templates/sub_merchant_detail.html', - controller: 'subMerchantDetailCtrl', - resolve: { - subMerchantInfo: function () { - return merchantInfo - }, - channel: function () { - return channel - }, - }, - }) - } - // 修改sub_merchant_id - $scope.modifySubMerchantId = function (subMerchantId, channel) { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/md_sub_merchant_id.html', - controller: 'ModifysubMerchantIdCtrl', - resolve: { - clientMoniker: function () { - return $scope.partner.client_moniker - }, - merchantId: function () { - return subMerchantId - }, - channel: function () { - return channel - }, - }, - }) - .result.then(function () { - commonDialog.alert({ - title: 'Success', - content: 'Modify successfully', - type: 'success', - }) - $scope.loadPartnerInfo() - }) - } - // 卡支付apply - $scope.applyMWSubMerchantId = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/mw_info').then(function (resp) { - commonDialog - .confirm({ - title: 'Apply Merchant Warrior Sub Merchant Id', - contentHtml: $sce.trustAsHtml('Are you sure to apply merchant Warrior sub merchant id for [' + $scope.partner.company_name + ']?'), - json: resp.data, - }) - .then(function () { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/applyMWMerchantId').then( - function (res) { - commonDialog.alert({ - title: 'Success', - content: 'Apply Merchant Warrior Sub Merchant ID successfully', - type: 'success', - }) - $scope.cardInfo = res.data - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) + } else { + $scope.subMerchantInfo.business_type = 'BOTH' + } + + if ($scope.merchantInfo.industry) { + $scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.merchantInfo.industry) + } + if ($scope.merchantInfo.mc_code) { + $scope.subMerchantInfo.mcc_code = $scope.merchantInfo.mc_code + } + + if ($scope.merchantInfo.business_structure) { + $scope.subMerchantInfo.merchant_type = $scope.merchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' + } + if ($scope.merchantInfo.certificat_expire_date) { + if ($scope.merchantInfo.certificat_expire_date == 'PERMANENT') { + $scope.subMerchantInfo.certificat_expire_date_premanent = true + } else if ($scope.merchantInfo.certificat_expire_date == 'N/A') { + $scope.subMerchantInfo.certificat_expire_date_NA = true + } else { + var datestr = $scope.merchantInfo.certificat_expire_date.replace(/-/g, '/') + $scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr) } - ) - }) - }) - } - - $scope.copyMWProfile = function () { - commonDialog.inputText({ title: '请输入复制来源商户编码' }).then(function (text) { - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/copy_mw_config', { client_moniker: text }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Modify successfully', - type: 'success', - }) - $scope.loadPartnerInfo() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - }) - } - - // $scope.showMoreMerchantInfo = false; - // $scope.hideMerchantInfo = function () { - // $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo; - // }; - $scope.updateSubMerchantId = function (sub_merchant_id) { - angular.forEach($scope.subMerchantInfos, function (each) { - if (sub_merchant_id == each.sub_merchant_id) { - $scope.merchant_app_id = each.merchant_app_id - } - }) - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html', - controller: 'updateApplyWxSubMerchantIdCtrl', - resolve: { - merchantInfo: $scope.partner, - merchantIds: [ - '$http', - '$stateParams', - function ($http) { - return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids') - }, - ], - subMerchantInfo: [ - '$http', - '$stateParams', - function ($http) { - return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.merchant_app_id) - }, - ], - }, - }) - .result.then(function () { - $scope.loadSubMerchantInfos() - }) - } - }, - ]) - app.controller('applyWxSubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'subMerchantInfo', - '$filter', - 'merchantIds', - 'commonDialog', - function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) { - $scope.wxIndustries = angular.copy(wxMerchantIndustries) - $scope.subMerchantInfo = angular.copy(subMerchantInfo) - $scope.merchantIds = merchantIds.data - $scope.subMerchantInfo.industry = $filter('wxindustries')($scope.subMerchantInfo.industry) - $scope.saveAppliy = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/sub_apply', $scope.subMerchantInfo).then( - function (resp) { - $scope.apply_sub_merchant_id = resp.data - $scope.$close() - if (subMerchantInfo.sub_merchant_id != null) { - commonDialog.confirm({ title: 'Confirm', content: '已申请成功，是否确认使用' }).then(function () { - $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', { sub_merchant_id: $scope.apply_sub_merchant_id }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Modify Wechat Sub Merchant ID successfully', - type: 'success', + } + + $scope.checkExpriedate = function (value) { + if (value) { + $scope.subMerchantInfo.certificat_expire_date_premanent = false + $scope.subMerchantInfo.certificat_expire_date_NA = false + } + } + $scope.checkExpriedateOther = function (value) { + if (value == 'PERMANENT') { + if ($scope.subMerchantInfo.certificat_expire_date_premanent) { + $scope.subMerchantInfo.certificat_expire_date_NA = false + $scope.subMerchantInfo.certificat_expire_date_d = null + } + } else if (value == 'N/A') { + if ($scope.subMerchantInfo.certificat_expire_date_NA) { + $scope.subMerchantInfo.certificat_expire_date_premanent = false + $scope.subMerchantInfo.certificat_expire_date_d = null + } + } + } + $scope.updateApply = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } + return + } + var params = { + company_name: $scope.subMerchantInfo.company_name, + merchant_id: $scope.subMerchantInfo.merchant_id, + short_name: $scope.subMerchantInfo.short_name, + office_phone: $scope.subMerchantInfo.office_phone, + contact_person: $scope.subMerchantInfo.contact_person, + contact_phone: $scope.subMerchantInfo.contact_phone, + company_phone: $scope.subMerchantInfo.company_phone, + contact_email: $scope.subMerchantInfo.contact_email, + industry: $scope.subMerchantInfo.industry, + company_website: $scope.subMerchantInfo.company_website, + merchant_type: $scope.subMerchantInfo.merchant_type, + mcc_code: $scope.subMerchantInfo.mcc_code, + address: $scope.subMerchantInfo.address, + business_type: $scope.subMerchantInfo.business_type, + sub_mch_id: $scope.subMerchantInfo.sub_merchant_id, + merchant_remark: $scope.subMerchantInfo.merchant_remark, + } + if (params.business_type == 'ONLINE') { + params.address = null + } else if (params.business_type == 'OFFLINE') { + params.company_website = null + } + // if($scope.subMerchantInfo.merchant_type == 'ENTERPRISE'){ + // params.director_name = $scope.subMerchantInfo.director_name; + // params.director_id_number = $scope.subMerchantInfo.director_id_number; + // params.company_register_no = $scope.subMerchantInfo.company_register_no; + // params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date; + // if($scope.subMerchantInfo.certificat_expire_date) { + // params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date) + // } + // }else{ + // params.principal_name = $scope.subMerchantInfo.principal_name; + // params.principal_id_number = $scope.subMerchantInfo.principal_id_number; + // } + if (params.merchant_type == 'ENTERPRISE') { + params.company_register_no = $scope.subMerchantInfo.company_register_no + params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date + if ($scope.subMerchantInfo.certificat_expire_date_d) { + params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date_d) + } else if ($scope.subMerchantInfo.certificat_expire_date_premanent) { + params.certificat_expire_date = 'PERMANENT' + } else if ($scope.subMerchantInfo.certificat_expire_date_NA) { + params.certificat_expire_date = 'N/A' + } else { + alert('Certificate expiration time is required') + return + } + } + $http.put('/sys/partners/' + $scope.merchantInfo.client_moniker + '/get_merchant_ids/' + $scope.subMerchantInfo.merchant_app_id, params).then( + function (resp) { + $scope.apply_sub_merchant_id = resp.data + $scope.$close() + commonDialog.confirm({title: 'Confirm', content: 'Successfully modified！'}) + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } ) - }) - } else { - $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', { sub_merchant_id: $scope.apply_sub_merchant_id }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Apply Success And Modify Wechat Sub Merchant ID successfully', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - ]) - // 展示信息 - app.controller('subMerchantDetailCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'commonDialog', - 'subMerchantInfo', - 'channel', - function ($scope, $http, $uibModal, $state, commonDialog, subMerchantInfo, channel) { - $scope.channel = channel - $scope.subMerchantInfo = subMerchantInfo - }, - ]) - // 修改sub_merchant_id - app.controller('ModifysubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'commonDialog', - 'clientMoniker', - 'merchantId', - 'channel', - function ($scope, $http, $uibModal, $state, commonDialog, clientMoniker, merchantId, channel) { - $scope.merchantId = merchantId - $scope.flag = false - $scope.confirm = function () { - $scope.flag = true - if (channel === 'Wechat') { - $http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: $scope.merchantId }).then( - function (resp) { - $scope.$close() - }, - function (resp) { - $scope.flag = false - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } else if (channel === 'Alipay' || channel === 'AlipayOnline') { - $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then( - function (resp) { - $scope.$close() - }, - function (resp) { - $scope.flag = false - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - } - }, - ]) - app.controller('newApplyWxSubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'subMerchantInfo', - '$filter', - 'merchantIds', - 'commonDialog', - 'wechatGoodMcc', - 'businessTypesMap', - function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, businessTypesMap) { - $scope.wxIndustries = angular.copy(wxMerchantIndustries) - $scope.subMerchantInfo = angular.copy(subMerchantInfo) - $scope.subMerchantInfo.address= subMerchantInfo.address+","+subMerchantInfo.suburb - +","+subMerchantInfo.state+","+subMerchantInfo.country; - $scope.subMerchantInfo.company_register_no = subMerchantInfo.abn ? subMerchantInfo.abn : subMerchantInfo.acn - $scope.wechatMccIndustries = wechatGoodMcc.configs() - $scope.merchantIds = merchantIds.data - $scope.businessTypesMap = businessTypesMap.configs() - if ($scope.subMerchantInfo.client_pay_type) { - if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { - $scope.subMerchantInfo.business_type = 'BOTH' - } else if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0) { - $scope.subMerchantInfo.business_type = 'ONLINE' - } else if ($scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { - $scope.subMerchantInfo.business_type = 'OFFLINE' - } - } else { - $scope.subMerchantInfo.business_type = 'BOTH' - } - - if ($scope.subMerchantInfo.industry) { - $scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.subMerchantInfo.industry) - } - if ($scope.subMerchantInfo.mc_code) { - $scope.subMerchantInfo.mcc_code = $scope.subMerchantInfo.mc_code - } - if (subMerchantInfo.certificat_expire_date) { - var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/') - $scope.subMerchantInfo.certificat_expire_date = new Date(datestr) - } - if ($scope.subMerchantInfo.business_structure) { - $scope.subMerchantInfo.merchant_type = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' - } - if (subMerchantInfo.certificat_expire_date) { - if (subMerchantInfo.certificat_expire_date == 'PERMANENT') { - $scope.subMerchantInfo.certificat_expire_date_premanent = true - } else if (subMerchantInfo.certificat_expire_date == 'N/A') { - $scope.subMerchantInfo.certificat_expire_date_NA = true - } else { - var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/') - $scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr) - } - } + } + }, + ]) + + app.controller('applyRpaySubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + 'businessStructuresMap', + '$filter', + 'commonDialog', + 'timezone', + function ($scope, $http, $uibModal, $state, subMerchantInfo, businessStructuresMap, $filter, commonDialog, timezone) { + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + $scope.business_structures = businessStructuresMap.configs() + $scope.timezone = timezone.configs() + + $scope.saveRpayAppliy = function (form) { + var merchantInfo = {} + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + angular.forEach(form, function (item, key) { + if (item != null) { + if (item.$name != null) { + merchantInfo[key] = item.$modelValue + } + } + }) - $scope.checkExpriedate = function (value) { - if (value) { - $scope.subMerchantInfo.certificat_expire_date_premanent = false - $scope.subMerchantInfo.certificat_expire_date_NA = false - } - } - $scope.checkExpriedateOther = function (value) { - if (value == 'PERMANENT') { - if ($scope.subMerchantInfo.certificat_expire_date_premanent) { - $scope.subMerchantInfo.certificat_expire_date_NA = false - $scope.subMerchantInfo.certificat_expire_date_d = null - } - } else if (value == 'N/A') { - if ($scope.subMerchantInfo.certificat_expire_date_NA) { - $scope.subMerchantInfo.certificat_expire_date_premanent = false - $scope.subMerchantInfo.certificat_expire_date_d = null - } - } - } - $scope.saveAppliy = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - // var merchant_type = $scope.subMerchantInfo.business_structure == 'Company'? 1:2; - var params = { - company_name: $scope.subMerchantInfo.company_name, - merchant_id: $scope.subMerchantInfo.merchant_id, - short_name: $scope.subMerchantInfo.short_name, - office_phone: $scope.subMerchantInfo.office_phone, - contact_person: $scope.subMerchantInfo.contact_person, - contact_phone: $scope.subMerchantInfo.contact_phone, - company_phone: $scope.subMerchantInfo.company_phone, - contact_email: $scope.subMerchantInfo.contact_email, - industry: $scope.subMerchantInfo.industry, - company_website: $scope.subMerchantInfo.company_website, - merchant_type: $scope.subMerchantInfo.merchant_type, - mcc_code: $scope.subMerchantInfo.mcc_code, - address: $scope.subMerchantInfo.address, - business_type: $scope.subMerchantInfo.business_type, - } - if (params.business_type == 'ONLINE') { - params.address = null - } else if (params.business_type == 'OFFLINE') { - params.company_website = null - } + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then( + function (resp) { + $scope.apply_sub_merchant_id = resp.data + $scope.$close() + if (subMerchantInfo.sub_merchant_id != null) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Rpay+ Sub Merchant ID successfully', + type: 'success', + }) + $state.reload() + } + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'error', + }) + } + ) + } + }, + ]) + app.controller('applyYeepaySubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + 'yeepayIndustryMap', + 'yeepayBusinessContentMap', + '$filter', + 'commonDialog', + 'Upload', + function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload) { + $scope.yeepay_industries = yeepayIndustryMap.configs() + $scope.yeepay_business_contents = yeepayBusinessContentMap.configs() + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + if (!$scope.subMerchantInfo.abn) { + $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn + } + var vouchers = {} + + $scope.directors = {} + $scope.executives = {} + $scope.industry = '' + $scope.business_content = '' + var merchantInfo = {} + + var merchantId = '' + + // $scope.uploadLegalIDcardFront = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.legalIDcardFrontProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.legalIDcardFrontProgress; + // $scope.legalIDcardFront = resp.data.path; + // vouchers['legalIDcardFront'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.legalIDcardFrontProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.legalIDcardFrontProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + // + // $scope.uploadLegalIDcardBack = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.legalIDcardBackProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.legalIDcardBackProgress; + // $scope.legalIDcardBack = resp.data.path; + // vouchers['legalIDcardBack'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.legalIDcardBackProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.legalIDcardBackProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + $scope.uploadBusinessLicence = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.businessLicenceProgress = {value: 0} + Upload.upload({ + url: '/attachment/yeepayFiles', + data: {file: file}, + }).then( + function (resp) { + delete $scope.businessLicenceProgress + $scope.businessLicence = resp.data.path + merchantInfo['business_licence'] = resp.data.path + merchantId = resp.data.merchantId + commonDialog.alert({ + title: 'Upload Success', + content: 'Upload Success', + type: 'success' + }) + }, + function (resp) { + delete $scope.businessLicenceProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.businessLicenceProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } - if (params.merchant_type == 'ENTERPRISE') { - params.director_name = $scope.subMerchantInfo.director_name - params.director_id_number = $scope.subMerchantInfo.director_id_number - params.company_register_no = $scope.subMerchantInfo.company_register_no - params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date - - if ($scope.subMerchantInfo.certificat_expire_date_d) { - params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date_d) - } else if ($scope.subMerchantInfo.certificat_expire_date_premanent) { - params.certificat_expire_date = 'PERMANENT' - } else if ($scope.subMerchantInfo.certificat_expire_date_NA) { - params.certificat_expire_date = 'N/A' - } else { - alert('Certificate expiration time is required') - return - } - } else { - params.principal_name = $scope.subMerchantInfo.principal_name - params.principal_id_number = $scope.subMerchantInfo.principal_id_number - } + // $scope.uploadTaxLevel = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.taxLevelProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.taxLevelProgress; + // $scope.taxLevel = resp.data.path; + // vouchers['taxLevel'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.taxLevelProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.taxLevelProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + // $scope.uploadBankAccountOpen = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.bankAccountOpenProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.bankAccountOpenProgress; + // $scope.bankAccountOpen = resp.data.path; + // vouchers['bankAccountOpen'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.bankAccountOpenProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.bankAccountOpenProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + // $scope.uploadOrgCode = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.orgCodeProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.orgCodeProgress; + // $scope.orgCode = resp.data.path; + // vouchers['orgCode'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.orgCodeProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.orgCodeProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + // + // $scope.uploadNonStanProtocol = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.nonStanProtocolProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.nonStanProtocolProgress; + // $scope.nonStanProtocol = resp.data.path; + // vouchers['nonStanProtocol'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.nonStanProtocolProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.nonStanProtocolProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + // + // $scope.uploadZipPath = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.zipPathProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.zipPathProgress; + // $scope.zipPath = resp.data.path; + // vouchers['zipPath'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.zipPathProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.zipPathProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + $scope.uploadDirectorPassport = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.directorPassportProgress = {value: 0} + Upload.upload({ + url: '/attachment/yeepayFiles', + data: {file: file}, + }).then( + function (resp) { + delete $scope.directorPassportProgress + $scope.directorPassport = resp.data.path + $scope.directors.filePath = resp.data.path + merchantId = resp.data.merchantId + commonDialog.alert({ + title: 'Upload Success', + content: 'Upload Success', + type: 'success' + }) + }, + function (resp) { + delete $scope.directorPassportProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.directorPassportProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } - $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/new_sub_apply', params).then( - function (resp) { - $scope.apply_sub_merchant_id = resp.data - $scope.$close() - if (subMerchantInfo.sub_merchant_id != null) { - commonDialog.confirm({ title: 'Confirm', content: '已申请成功，是否确认使用' }).then(function () { - $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', { sub_merchant_id: $scope.apply_sub_merchant_id }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Modify Wechat Sub Merchant ID successfully', - type: 'success', + $scope.uploadExecutivePassport = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.executivePassportProgress = {value: 0} + Upload.upload({ + url: '/attachment/yeepayFiles', + data: {file: file}, + }).then( + function (resp) { + delete $scope.executivePassportProgress + $scope.executivePassport = resp.data.path + $scope.executives.filePath = resp.data.path + merchantId = resp.data.merchantId + commonDialog.alert({ + title: 'Upload Success', + content: 'Upload Success', + type: 'success' + }) + }, + function (resp) { + delete $scope.executivePassportProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.executivePassportProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } + + $scope.saveYeepayApply = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } + return + } + // angular.forEach(form, function (item, key) { + // if(item !=null) { + // if(item.$name !=null) { + // merchantInfo[key] = item.$modelValue; + // } + // } + // }); + merchantInfo['company_name'] = $scope.subMerchantInfo.company_name + merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person + merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone + merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email + merchantInfo['company_website'] = $scope.subMerchantInfo.company_website + merchantInfo['abn'] = $scope.subMerchantInfo.abn + merchantInfo['executives'] = $scope.executives + merchantInfo['directors'] = $scope.directors + merchantInfo['business_content'] = $scope.business_content + merchantInfo['industry'] = $scope.industry + merchantInfo['merchantId'] = merchantId + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registYeepaySubMerchantId', merchantInfo).then( + function (resp) { + $scope.apply_sub_merchant_id = resp.data + $scope.$close() + if (subMerchantInfo.yeepay_sub_merchant_id != null) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Yeepay Sub Merchant ID successfully', + type: 'success', + }) + $state.reload() + } + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'error', + }) + } ) - }) - } else { - $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', { sub_merchant_id: $scope.apply_sub_merchant_id }).then( - function (resp) { - commonDialog.alert({ - title: 'Success', - content: 'Apply Success And Modify Wechat Sub Merchant ID successfully', - type: 'success', - }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - ]) - app.controller('updateApplyWxSubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'subMerchantInfo', - '$filter', - 'merchantIds', - 'commonDialog', - 'wechatGoodMcc', - 'merchantInfo', - 'businessTypesMap', - function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog, wechatGoodMcc, merchantInfo, businessTypesMap) { - $scope.wxIndustries = angular.copy(wxMerchantIndustries) - $scope.subMerchantInfo = angular.copy(subMerchantInfo.data) - $scope.merchantInfo = angular.copy(merchantInfo) - $scope.wechatMccIndustries = wechatGoodMcc.configs() - $scope.merchantIds = merchantIds.data - $scope.businessTypesMap = businessTypesMap.configs() - $scope.subMerchantInfo.short_name = $scope.merchantInfo.short_name - $scope.subMerchantInfo.industry = $scope.merchantInfo.industry - $scope.subMerchantInfo.company_website = $scope.merchantInfo.company_website - $scope.subMerchantInfo.address = $scope.merchantInfo.address+","+$scope.merchantInfo.suburb - +","+$scope.merchantInfo.state+","+$scope.merchantInfo.country; - $scope.subMerchantInfo.company_phone = $scope.merchantInfo.company_phone - $scope.subMerchantInfo.contact_person = $scope.merchantInfo.contact_person - $scope.subMerchantInfo.contact_phone = $scope.merchantInfo.contact_phone - $scope.subMerchantInfo.contact_email = $scope.merchantInfo.contact_email - $scope.subMerchantInfo.company_register_no = $scope.merchantInfo.abn ? $scope.merchantInfo.abn : $scope.merchantInfo.acn - - if ($scope.merchantInfo.client_pay_type) { - if ($scope.merchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.merchantInfo.client_pay_type.indexOf('2') >= 0) { - $scope.subMerchantInfo.business_type = 'BOTH' - } else if ($scope.merchantInfo.client_pay_type.indexOf('1') >= 0) { - $scope.subMerchantInfo.business_type = 'ONLINE' - } else if ($scope.merchantInfo.client_pay_type.indexOf('2') >= 0) { - $scope.subMerchantInfo.business_type = 'OFFLINE' } - } else { - $scope.subMerchantInfo.business_type = 'BOTH' - } + }, + ]) + app.controller('addYeepaySubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + 'yeepayIndustryMap', + 'yeepayBusinessContentMap', + '$filter', + 'commonDialog', + 'Upload', + function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload) { + $scope.yeepay_industries = yeepayIndustryMap.configs() + $scope.yeepay_business_contents = yeepayBusinessContentMap.configs() + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + + var merchantInfo = {} + + $scope.saveYeepayAdd = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + // angular.forEach(form, function (item, key) { + // if(item !=null) { + // if(item.$name !=null) { + // merchantInfo[key] = item.$modelValue; + // } + // } + // }); + + merchantInfo['sub_merchant_id'] = $scope.sub_merchant_id + merchantInfo['business_content'] = $scope.business_content + merchantInfo['industry'] = $scope.industry + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/addYeepaySubMerchantId', merchantInfo).then( + function (resp) { + $scope.$close() + commonDialog.alert({ + title: 'Success', + content: 'Add Yeepay Sub Merchant ID successfully', + type: 'success', + }) + $state.reload() + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'error', + }) + } + ) + } + }, + ]) + app.controller('updateYeepaySubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + 'yeepayIndustryMap', + 'yeepayBusinessContentMap', + '$filter', + 'commonDialog', + 'Upload', + 'subMerchantId', + function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload, subMerchantId) { + $scope.yeepay_industries = yeepayIndustryMap.configs() + $scope.yeepay_business_contents = yeepayBusinessContentMap.configs() + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + if (!$scope.subMerchantInfo.abn) { + $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn + } + var vouchers = {} + + $scope.directors = {} + $scope.executives = {} + $scope.industry = '' + $scope.business_content = '' + var merchantInfo = {} + + var merchantId = '' + + // $scope.uploadLegalIDcardFront = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.legalIDcardFrontProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.legalIDcardFrontProgress; + // $scope.legalIDcardFront = resp.data.path; + // vouchers['legalIDcardFront'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.legalIDcardFrontProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.legalIDcardFrontProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + // + // $scope.uploadLegalIDcardBack = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.legalIDcardBackProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.legalIDcardBackProgress; + // $scope.legalIDcardBack = resp.data.path; + // vouchers['legalIDcardBack'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.legalIDcardBackProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.legalIDcardBackProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + $scope.uploadBusinessLicence = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.businessLicenceProgress = {value: 0} + Upload.upload({ + url: '/attachment/yeepayFiles', + data: {file: file}, + }).then( + function (resp) { + delete $scope.businessLicenceProgress + $scope.businessLicence = resp.data.path + merchantInfo['business_licence'] = resp.data.path + merchantId = resp.data.merchantId + commonDialog.alert({ + title: 'Upload Success', + content: 'Upload Success', + type: 'success' + }) + }, + function (resp) { + delete $scope.businessLicenceProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.businessLicenceProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } - if ($scope.merchantInfo.industry) { - $scope.subMerchantInfo.industry = $filter('newWxMerchantsFilter')($scope.merchantInfo.industry) - } - if ($scope.merchantInfo.mc_code) { - $scope.subMerchantInfo.mcc_code = $scope.merchantInfo.mc_code - } + // $scope.uploadTaxLevel = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.taxLevelProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.taxLevelProgress; + // $scope.taxLevel = resp.data.path; + // vouchers['taxLevel'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.taxLevelProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.taxLevelProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + // $scope.uploadBankAccountOpen = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.bankAccountOpenProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.bankAccountOpenProgress; + // $scope.bankAccountOpen = resp.data.path; + // vouchers['bankAccountOpen'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.bankAccountOpenProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.bankAccountOpenProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + // $scope.uploadOrgCode = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.orgCodeProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.orgCodeProgress; + // $scope.orgCode = resp.data.path; + // vouchers['orgCode'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.orgCodeProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.orgCodeProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + // + // $scope.uploadNonStanProtocol = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.nonStanProtocolProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.nonStanProtocolProgress; + // $scope.nonStanProtocol = resp.data.path; + // vouchers['nonStanProtocol'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.nonStanProtocolProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.nonStanProtocolProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + // + // $scope.uploadZipPath = function (file) { + // if (file != null) { + // if (file.size > 3 * 1024 * 1024) { + // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + // } else { + // $scope.zipPathProgress = {value: 0}; + // Upload.upload({ + // url: '/attachment/yeepayFiles', + // data: {file: file} + // }).then(function (resp) { + // delete $scope.zipPathProgress; + // $scope.zipPath = resp.data.path; + // vouchers['zipPath'] = resp.data.path; + // merchantId = resp.data.merchantId; + // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) + // }, function (resp) { + // delete $scope.zipPathProgress; + // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + // }, function (evt) { + // $scope.zipPathProgress.value = parseInt(100 * evt.loaded / evt.total); + // }) + // } + // } + // }; + + $scope.uploadDirectorPassport = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.directorPassportProgress = {value: 0} + Upload.upload({ + url: '/attachment/yeepayFiles', + data: {file: file}, + }).then( + function (resp) { + delete $scope.directorPassportProgress + $scope.directorPassport = resp.data.path + $scope.directors.filePath = resp.data.path + merchantId = resp.data.merchantId + commonDialog.alert({ + title: 'Upload Success', + content: 'Upload Success', + type: 'success' + }) + }, + function (resp) { + delete $scope.directorPassportProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.directorPassportProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } + } - if ($scope.merchantInfo.business_structure) { - $scope.subMerchantInfo.merchant_type = $scope.merchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' - } - if ($scope.merchantInfo.certificat_expire_date) { - if ($scope.merchantInfo.certificat_expire_date == 'PERMANENT') { - $scope.subMerchantInfo.certificat_expire_date_premanent = true - } else if ($scope.merchantInfo.certificat_expire_date == 'N/A') { - $scope.subMerchantInfo.certificat_expire_date_NA = true - } else { - var datestr = $scope.merchantInfo.certificat_expire_date.replace(/-/g, '/') - $scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr) + $scope.uploadExecutivePassport = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.executivePassportProgress = {value: 0} + Upload.upload({ + url: '/attachment/yeepayFiles', + data: {file: file}, + }).then( + function (resp) { + delete $scope.executivePassportProgress + $scope.executivePassport = resp.data.path + $scope.executives.filePath = resp.data.path + merchantId = resp.data.merchantId + commonDialog.alert({ + title: 'Upload Success', + content: 'Upload Success', + type: 'success' + }) + }, + function (resp) { + delete $scope.executivePassportProgress + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, + function (evt) { + $scope.executivePassportProgress.value = parseInt((100 * evt.loaded) / evt.total) + } + ) + } + } } - } - $scope.checkExpriedate = function (value) { - if (value) { - $scope.subMerchantInfo.certificat_expire_date_premanent = false - $scope.subMerchantInfo.certificat_expire_date_NA = false - } - } - $scope.checkExpriedateOther = function (value) { - if (value == 'PERMANENT') { - if ($scope.subMerchantInfo.certificat_expire_date_premanent) { - $scope.subMerchantInfo.certificat_expire_date_NA = false - $scope.subMerchantInfo.certificat_expire_date_d = null - } - } else if (value == 'N/A') { - if ($scope.subMerchantInfo.certificat_expire_date_NA) { - $scope.subMerchantInfo.certificat_expire_date_premanent = false - $scope.subMerchantInfo.certificat_expire_date_d = null - } - } - } - $scope.updateApply = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - var params = { - company_name: $scope.subMerchantInfo.company_name, - merchant_id: $scope.subMerchantInfo.merchant_id, - short_name: $scope.subMerchantInfo.short_name, - office_phone: $scope.subMerchantInfo.office_phone, - contact_person: $scope.subMerchantInfo.contact_person, - contact_phone: $scope.subMerchantInfo.contact_phone, - company_phone: $scope.subMerchantInfo.company_phone, - contact_email: $scope.subMerchantInfo.contact_email, - industry: $scope.subMerchantInfo.industry, - company_website: $scope.subMerchantInfo.company_website, - merchant_type: $scope.subMerchantInfo.merchant_type, - mcc_code: $scope.subMerchantInfo.mcc_code, - address: $scope.subMerchantInfo.address, - business_type: $scope.subMerchantInfo.business_type, - sub_mch_id: $scope.subMerchantInfo.sub_merchant_id, - merchant_remark: $scope.subMerchantInfo.merchant_remark, - } - if (params.business_type == 'ONLINE') { - params.address = null - } else if (params.business_type == 'OFFLINE') { - params.company_website = null - } - // if($scope.subMerchantInfo.merchant_type == 'ENTERPRISE'){ - // params.director_name = $scope.subMerchantInfo.director_name; - // params.director_id_number = $scope.subMerchantInfo.director_id_number; - // params.company_register_no = $scope.subMerchantInfo.company_register_no; - // params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date; - // if($scope.subMerchantInfo.certificat_expire_date) { - // params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date) - // } - // }else{ - // params.principal_name = $scope.subMerchantInfo.principal_name; - // params.principal_id_number = $scope.subMerchantInfo.principal_id_number; - // } - if (params.merchant_type == 'ENTERPRISE') { - params.company_register_no = $scope.subMerchantInfo.company_register_no - params.certificat_expire_date = $scope.subMerchantInfo.certificat_expire_date - if ($scope.subMerchantInfo.certificat_expire_date_d) { - params.certificat_expire_date = $filter('dateConversionStr')($scope.subMerchantInfo.certificat_expire_date_d) - } else if ($scope.subMerchantInfo.certificat_expire_date_premanent) { - params.certificat_expire_date = 'PERMANENT' - } else if ($scope.subMerchantInfo.certificat_expire_date_NA) { - params.certificat_expire_date = 'N/A' - } else { - alert('Certificate expiration time is required') - return - } - } - $http.put('/sys/partners/' + $scope.merchantInfo.client_moniker + '/get_merchant_ids/' + $scope.subMerchantInfo.merchant_app_id, params).then( - function (resp) { - $scope.apply_sub_merchant_id = resp.data - $scope.$close() - commonDialog.confirm({ title: 'Confirm', content: 'Successfully modified！' }) - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - ]) - - app.controller('applyRpaySubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'subMerchantInfo', - 'businessStructuresMap', - '$filter', - 'commonDialog', - 'timezone', - function ($scope, $http, $uibModal, $state, subMerchantInfo, businessStructuresMap, $filter, commonDialog, timezone) { - $scope.subMerchantInfo = angular.copy(subMerchantInfo) - $scope.business_structures = businessStructuresMap.configs() - $scope.timezone = timezone.configs() - - $scope.saveRpayAppliy = function (form) { - var merchantInfo = {} - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - angular.forEach(form, function (item, key) { - if (item != null) { - if (item.$name != null) { - merchantInfo[key] = item.$modelValue - } - } - }) - - $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then( - function (resp) { - $scope.apply_sub_merchant_id = resp.data - $scope.$close() - if (subMerchantInfo.sub_merchant_id != null) { - commonDialog.alert({ - title: 'Success', - content: 'Modify Rpay+ Sub Merchant ID successfully', - type: 'success', - }) - $state.reload() - } - }, - function (resp) { - commonDialog.alert({ - title: 'Error', - content: resp.data.message, - type: 'error', - }) - } - ) - } - }, - ]) - app.controller('applyYeepaySubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'subMerchantInfo', - 'yeepayIndustryMap', - 'yeepayBusinessContentMap', - '$filter', - 'commonDialog', - 'Upload', - function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload) { - $scope.yeepay_industries = yeepayIndustryMap.configs() - $scope.yeepay_business_contents = yeepayBusinessContentMap.configs() - $scope.subMerchantInfo = angular.copy(subMerchantInfo) - if (!$scope.subMerchantInfo.abn) { - $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn - } - var vouchers = {} - - $scope.directors = {} - $scope.executives = {} - $scope.industry = '' - $scope.business_content = '' - var merchantInfo = {} - - var merchantId = '' - - // $scope.uploadLegalIDcardFront = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.legalIDcardFrontProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.legalIDcardFrontProgress; - // $scope.legalIDcardFront = resp.data.path; - // vouchers['legalIDcardFront'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.legalIDcardFrontProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.legalIDcardFrontProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - // - // $scope.uploadLegalIDcardBack = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.legalIDcardBackProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.legalIDcardBackProgress; - // $scope.legalIDcardBack = resp.data.path; - // vouchers['legalIDcardBack'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.legalIDcardBackProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.legalIDcardBackProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - $scope.uploadBusinessLicence = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.businessLicenceProgress = { value: 0 } - Upload.upload({ - url: '/attachment/yeepayFiles', - data: { file: file }, - }).then( - function (resp) { - delete $scope.businessLicenceProgress - $scope.businessLicence = resp.data.path - merchantInfo['business_licence'] = resp.data.path - merchantId = resp.data.merchantId - commonDialog.alert({ title: 'Upload Success', content: 'Upload Success', type: 'success' }) - }, - function (resp) { - delete $scope.businessLicenceProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.businessLicenceProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - // $scope.uploadTaxLevel = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.taxLevelProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.taxLevelProgress; - // $scope.taxLevel = resp.data.path; - // vouchers['taxLevel'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.taxLevelProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.taxLevelProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - // $scope.uploadBankAccountOpen = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.bankAccountOpenProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.bankAccountOpenProgress; - // $scope.bankAccountOpen = resp.data.path; - // vouchers['bankAccountOpen'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.bankAccountOpenProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.bankAccountOpenProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - // $scope.uploadOrgCode = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.orgCodeProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.orgCodeProgress; - // $scope.orgCode = resp.data.path; - // vouchers['orgCode'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.orgCodeProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.orgCodeProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - // - // $scope.uploadNonStanProtocol = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.nonStanProtocolProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.nonStanProtocolProgress; - // $scope.nonStanProtocol = resp.data.path; - // vouchers['nonStanProtocol'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.nonStanProtocolProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.nonStanProtocolProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - // - // $scope.uploadZipPath = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.zipPathProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.zipPathProgress; - // $scope.zipPath = resp.data.path; - // vouchers['zipPath'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.zipPathProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.zipPathProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - $scope.uploadDirectorPassport = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.directorPassportProgress = { value: 0 } - Upload.upload({ - url: '/attachment/yeepayFiles', - data: { file: file }, - }).then( - function (resp) { - delete $scope.directorPassportProgress - $scope.directorPassport = resp.data.path - $scope.directors.filePath = resp.data.path - merchantId = resp.data.merchantId - commonDialog.alert({ title: 'Upload Success', content: 'Upload Success', type: 'success' }) - }, - function (resp) { - delete $scope.directorPassportProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.directorPassportProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } - - $scope.uploadExecutivePassport = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.executivePassportProgress = { value: 0 } - Upload.upload({ - url: '/attachment/yeepayFiles', - data: { file: file }, - }).then( - function (resp) { - delete $scope.executivePassportProgress - $scope.executivePassport = resp.data.path - $scope.executives.filePath = resp.data.path - merchantId = resp.data.merchantId - commonDialog.alert({ title: 'Upload Success', content: 'Upload Success', type: 'success' }) - }, - function (resp) { - delete $scope.executivePassportProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.executivePassportProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } - } - } + $scope.updateYeepayApply = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + // angular.forEach(form, function (item, key) { + // if(item !=null) { + // if(item.$name !=null) { + // merchantInfo[key] = item.$modelValue; + // } + // } + // }); + merchantInfo['company_name'] = $scope.subMerchantInfo.company_name + merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person + merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone + merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email + merchantInfo['company_website'] = $scope.subMerchantInfo.company_website + merchantInfo['abn'] = $scope.subMerchantInfo.abn + merchantInfo['executives'] = $scope.executives + merchantInfo['subMerchantId'] = angular.copy(subMerchantId) + merchantInfo['directors'] = $scope.directors + merchantInfo['business_content'] = $scope.business_content + merchantInfo['industry'] = $scope.industry + merchantInfo['merchantId'] = merchantId + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/updateYeepaySubMerchantId', merchantInfo).then( + function (resp) { + $scope.apply_sub_merchant_id = resp.data + $scope.$close() + if (subMerchantInfo.yeepay_sub_merchant_id != null) { + commonDialog.alert({ + title: 'Success', + content: 'Update Successfully,Please Wait For Review!', + type: 'success', + }) + $state.reload() + } + }, + function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'error', + }) + } + ) + } + }, + ]) + app.controller('permissionClientCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + '$filter', + 'commonDialog', + function ($scope, $http, $uibModal, $state, $filter, commonDialog) { + $scope.clientPermission = {client_moniker: $scope.partner.client_moniker} + $scope.loadPermissionList = function () { + var params = angular.copy($scope.clientPermission) + $http.get('/sys/permission/list', {params: params}).then( + function (resp) { + $scope.permissionList = resp.data + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + $scope.loadPermissionList(1) + $scope.switchValid = function (permission) { + $scope.clientPermission.isValid = permission.is_valid + var params = angular.copy($scope.clientPermission) + $http.post('/sys/permission/' + permission.id, params).then( + function (resp) { + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } - $scope.saveYeepayApply = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true + $scope.init = function () { + var params = {client_moniker: $scope.partner.client_moniker} + $http.post('/sys/permission/init', params).then( + function (resp) { + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) } - }) - return - } - // angular.forEach(form, function (item, key) { - // if(item !=null) { - // if(item.$name !=null) { - // merchantInfo[key] = item.$modelValue; - // } - // } - // }); - merchantInfo['company_name'] = $scope.subMerchantInfo.company_name - merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person - merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone - merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email - merchantInfo['company_website'] = $scope.subMerchantInfo.company_website - merchantInfo['abn'] = $scope.subMerchantInfo.abn - merchantInfo['executives'] = $scope.executives - merchantInfo['directors'] = $scope.directors - merchantInfo['business_content'] = $scope.business_content - merchantInfo['industry'] = $scope.industry - merchantInfo['merchantId'] = merchantId - $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registYeepaySubMerchantId', merchantInfo).then( - function (resp) { - $scope.apply_sub_merchant_id = resp.data - $scope.$close() - if (subMerchantInfo.yeepay_sub_merchant_id != null) { - commonDialog.alert({ - title: 'Success', - content: 'Modify Yeepay Sub Merchant ID successfully', - type: 'success', - }) - $state.reload() - } - }, - function (resp) { - commonDialog.alert({ - title: 'Error', - content: resp.data.message, - type: 'error', + }, + ]) + app.controller('incrementalServiceCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + '$filter', + 'commonDialog', + function ($scope, $http, $uibModal, $state, $filter, commonDialog) { + $scope.serviceAll = {} + $scope.channelOptions = [] + $scope.initData = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/incremental_service').then(function (res) { + $scope.serviceAll = res.data.all_service + $scope.serviceAll.forEach(function (service) { + service.logo_url = '/static/images/' + service.channel + '.jpg' + service.logo_url = $scope.CheckImgExists(service.logo_url) ? service.logo_url : '/static/images/royalpay_sign.png' + }) + $scope.channelOptions = res.data.incremental_channel + }) + } + $scope.CheckImgExists = function (url) { + var xmlHttp + if (window.ActiveXObject) { + xmlHttp = new ActiveXObject('Microsoft.XMLHTTP') + } else if (window.XMLHttpRequest) { + xmlHttp = new XMLHttpRequest() + } + xmlHttp.open('Get', url, false) + xmlHttp.send() + if (xmlHttp.status == 404) return false + else return true + } + $scope.initData() + $scope.newServiceChannelDialog = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/incremental_service_dialog.html', + controller: 'incrementalServiceDialogCtrl', + resolve: { + params: function () { + return { + isCreate: true, + clientMoniker: $scope.partner.client_moniker, + channelOptions: $scope.channelOptions, + serviceChannel: null, + } + }, + }, + }) + .result.then(function () { + $scope.initData() + }) + } + $scope.editServiceChannelDialog = function (serviceChannel) { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/incremental_service_dialog.html', + controller: 'incrementalServiceDialogCtrl', + resolve: { + params: function () { + return { + isCreate: false, + clientMoniker: $scope.partner.client_moniker, + channelOptions: $scope.channelOptions, + serviceChannel: serviceChannel, + } + }, + }, + }) + .result.then(function () { + $scope.initData() + }) + } + $scope.updateStatus = function (service) { + commonDialog + .confirm({ + title: 'Update ' + service.channel + ' Incremental Service Status', + content: 'Are you sure update ' + service.channel + ' status？', + choises: [ + {label: 'Submit', className: 'btn-success', key: 1}, + {label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true}, + ], + }) + .then(function (choice) { + if (choice == 1) { + service.is_valid = !service.is_valid + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/incremental_service/status', service).then( + function (res) { + commonDialog.alert({ + title: 'Success', + content: 'Update Service Successful!', + type: 'success', + }) + $scope.initData() + }, + function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + $scope.initData() + } + ) + } + }) + } + }, + ]) + app.controller('incrementalServiceDialogCtrl', [ + '$scope', + '$http', + 'params', + 'commonDialog', + function ($scope, $http, params, commonDialog) { + $scope.model = {} + $scope.ctrl = {sending: false} + $scope.isCreate = true + $scope.initData = function () { + $scope.isCreate = angular.copy(params.isCreate) + if ($scope.isCreate) { + $scope.model.channel = angular.copy(params.channelOptions[0]) + $scope.model.channelOptions = angular.copy(params.channelOptions) + } else { + $scope.model = angular.copy(params.serviceChannel) + } + } + $scope.initData() + $scope.save = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + $scope.ctrl.sending = true + $http.post('/sys/partners/' + params.clientMoniker + '/incremental_service', $scope.model).then( + function (res) { + commonDialog.alert({ + title: 'Success', + content: $scope.isCreate ? 'Create Service Successful!' : 'Update Service Successful!', + type: 'success', + }) + $scope.ctrl.sending = false + $scope.$close() + }, + function (resp) { + $scope.ctrl.sending = false + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + } + ) + } + }, + ]) + + app.filter('bdOrg', function () { + return function (bdUsers, org_id) { + if (org_id) { + var bdUserByOrg = {} + var count = 0 + angular.forEach(bdUsers, function (bdUser) { + if (bdUser.org_id == org_id) { + bdUserByOrg[count] = bdUser + count++ + } + }) + return bdUserByOrg + } + return bdUsers + } + }) + app.filter('wxMerchants', function () { + return function (values) { + var industry = '' + angular.forEach(wxMerchantIndustries, function (wxMerchant) { + if (wxMerchant.value == values) { + industry = wxMerchant.label + } }) - } - ) - } - }, - ]) - app.controller('addYeepaySubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'subMerchantInfo', - 'yeepayIndustryMap', - 'yeepayBusinessContentMap', - '$filter', - 'commonDialog', - 'Upload', - function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload) { - $scope.yeepay_industries = yeepayIndustryMap.configs() - $scope.yeepay_business_contents = yeepayBusinessContentMap.configs() - $scope.subMerchantInfo = angular.copy(subMerchantInfo) - - var merchantInfo = {} - - $scope.saveYeepayAdd = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - // angular.forEach(form, function (item, key) { - // if(item !=null) { - // if(item.$name !=null) { - // merchantInfo[key] = item.$modelValue; - // } - // } - // }); - - merchantInfo['sub_merchant_id'] = $scope.sub_merchant_id - merchantInfo['business_content'] = $scope.business_content - merchantInfo['industry'] = $scope.industry - $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/addYeepaySubMerchantId', merchantInfo).then( - function (resp) { - $scope.$close() - commonDialog.alert({ - title: 'Success', - content: 'Add Yeepay Sub Merchant ID successfully', - type: 'success', + return industry + } + }) + //将保存的industry 和最新的分类比较，若查不到，返回空 + app.filter('newWxMerchantsFilter', function () { + return function (values) { + var industry = null + angular.forEach(wxMerchantIndustries, function (wxMerchant) { + if (wxMerchant.value == values) { + industry = wxMerchant.value + } }) - $state.reload() - }, - function (resp) { - commonDialog.alert({ - title: 'Error', - content: resp.data.message, - type: 'error', + return industry + } + }) + app.filter('newWxMerchants', function () { + return function (values) { + var industry = '' + angular.forEach(wxMerchantIndustries, function (wxMerchant) { + if (wxMerchant.value == values) { + industry = wxMerchant.label + } }) - } - ) - } - }, - ]) - app.controller('updateYeepaySubMerchantIdCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - 'subMerchantInfo', - 'yeepayIndustryMap', - 'yeepayBusinessContentMap', - '$filter', - 'commonDialog', - 'Upload', - 'subMerchantId', - function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload, subMerchantId) { - $scope.yeepay_industries = yeepayIndustryMap.configs() - $scope.yeepay_business_contents = yeepayBusinessContentMap.configs() - $scope.subMerchantInfo = angular.copy(subMerchantInfo) - if (!$scope.subMerchantInfo.abn) { - $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn - } - var vouchers = {} - - $scope.directors = {} - $scope.executives = {} - $scope.industry = '' - $scope.business_content = '' - var merchantInfo = {} - - var merchantId = '' - - // $scope.uploadLegalIDcardFront = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.legalIDcardFrontProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.legalIDcardFrontProgress; - // $scope.legalIDcardFront = resp.data.path; - // vouchers['legalIDcardFront'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.legalIDcardFrontProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.legalIDcardFrontProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - // - // $scope.uploadLegalIDcardBack = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.legalIDcardBackProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.legalIDcardBackProgress; - // $scope.legalIDcardBack = resp.data.path; - // vouchers['legalIDcardBack'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.legalIDcardBackProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.legalIDcardBackProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - $scope.uploadBusinessLicence = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.businessLicenceProgress = { value: 0 } - Upload.upload({ - url: '/attachment/yeepayFiles', - data: { file: file }, - }).then( - function (resp) { - delete $scope.businessLicenceProgress - $scope.businessLicence = resp.data.path - merchantInfo['business_licence'] = resp.data.path - merchantId = resp.data.merchantId - commonDialog.alert({ title: 'Upload Success', content: 'Upload Success', type: 'success' }) - }, - function (resp) { - delete $scope.businessLicenceProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.businessLicenceProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } + return industry + } + }) + app.filter('yeepayIndustry', function () { + return function (value) { + switch (value + '') { + case 'ehk100000': + return '货物贸易' + case 'ehk200000': + return '旅游' + case 'ehk300000': + return '文化教育' + case 'ehk400000': + return '服务贸易' + case 'ehk500000': + return '物流' + case 'ehk600000': + return '数字娱乐' + case 'ehk700000': + return '金融保险' + case 'ehk999999': + return '其他' + } } - } - - // $scope.uploadTaxLevel = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.taxLevelProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.taxLevelProgress; - // $scope.taxLevel = resp.data.path; - // vouchers['taxLevel'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.taxLevelProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.taxLevelProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - // $scope.uploadBankAccountOpen = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.bankAccountOpenProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.bankAccountOpenProgress; - // $scope.bankAccountOpen = resp.data.path; - // vouchers['bankAccountOpen'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.bankAccountOpenProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.bankAccountOpenProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - // $scope.uploadOrgCode = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.orgCodeProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.orgCodeProgress; - // $scope.orgCode = resp.data.path; - // vouchers['orgCode'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.orgCodeProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.orgCodeProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - // - // $scope.uploadNonStanProtocol = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.nonStanProtocolProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.nonStanProtocolProgress; - // $scope.nonStanProtocol = resp.data.path; - // vouchers['nonStanProtocol'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.nonStanProtocolProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.nonStanProtocolProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - // - // $scope.uploadZipPath = function (file) { - // if (file != null) { - // if (file.size > 3 * 1024 * 1024) { - // commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) - // } else { - // $scope.zipPathProgress = {value: 0}; - // Upload.upload({ - // url: '/attachment/yeepayFiles', - // data: {file: file} - // }).then(function (resp) { - // delete $scope.zipPathProgress; - // $scope.zipPath = resp.data.path; - // vouchers['zipPath'] = resp.data.path; - // merchantId = resp.data.merchantId; - // commonDialog.alert({title: 'Upload Success', content: 'Upload Success', type: 'success'}) - // }, function (resp) { - // delete $scope.zipPathProgress; - // commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) - // }, function (evt) { - // $scope.zipPathProgress.value = parseInt(100 * evt.loaded / evt.total); - // }) - // } - // } - // }; - - $scope.uploadDirectorPassport = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.directorPassportProgress = { value: 0 } - Upload.upload({ - url: '/attachment/yeepayFiles', - data: { file: file }, - }).then( - function (resp) { - delete $scope.directorPassportProgress - $scope.directorPassport = resp.data.path - $scope.directors.filePath = resp.data.path - merchantId = resp.data.merchantId - commonDialog.alert({ title: 'Upload Success', content: 'Upload Success', type: 'success' }) - }, - function (resp) { - delete $scope.directorPassportProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.directorPassportProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } + }) + + app.filter('yeepayBusinessContent', function () { + return function (value) { + switch (value + '') { + case 'SERVICETRADE': + return '服务贸易' + case 'GOODSTRADE': + return '货物贸易' + case 'OVERSEASTUDY': + return '留学' + case 'HOTELTICKET': + return '酒店机票' + case 'INTTRANSPORT': + return '国际运输' + case 'TOURSERVICE': + return '旅游服务' + case 'INSURANCE': + return '保险' + } } - } - - $scope.uploadExecutivePassport = function (file) { - if (file != null) { - if (file.size > 3 * 1024 * 1024) { - commonDialog.alert({ title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error' }) - } else { - $scope.executivePassportProgress = { value: 0 } - Upload.upload({ - url: '/attachment/yeepayFiles', - data: { file: file }, - }).then( - function (resp) { - delete $scope.executivePassportProgress - $scope.executivePassport = resp.data.path - $scope.executives.filePath = resp.data.path - merchantId = resp.data.merchantId - commonDialog.alert({ title: 'Upload Success', content: 'Upload Success', type: 'success' }) - }, - function (resp) { - delete $scope.executivePassportProgress - commonDialog.alert({ title: 'Upload Failed', content: resp.data.message, type: 'error' }) - }, - function (evt) { - $scope.executivePassportProgress.value = parseInt((100 * evt.loaded) / evt.total) - } - ) - } + }) + + app.filter('bdOrgSelect', function () { + return function (bdUsers, params) { + var org_id + org_id = params.org_ids || params.org_id || currentUser.org_id + if (org_id) { + var bdUserByOrg = {} + var count = 0 + angular.forEach(bdUsers, function (bdUser) { + if (params.org_ids) { + if (bdUser.org_id == org_id) { + bdUserByOrg[count] = bdUser + count++ + } + } else { + if (bdUser.org_id == org_id || bdUser.parent_org_id == org_id) { + bdUserByOrg[count] = bdUser + count++ + } + } + }) + return bdUserByOrg + } + return bdUsers + } + }) + + app.filter('wxindustries', function () { + return function (value) { + switch (value + '') { + case '327': + return '343' + case '339': + return '493' + case '337': + return '492' + case '328': + return '491' + case '362': + case '361': + case '363': + case '329': + return '490' + case '330': + return '489' + case '332': + return '487' + case '334': + return '486' + case '335': + return '485' + case '336': + return '484' + case '338': + case '358': + return '494' + } } - } + }) - $scope.updateYeepayApply = function (form) { - $scope.errmsg = null - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true + app.filter('wechatMcc', [ + 'wechatGoodMcc', + function (wechatGoodMcc) { + return function (values) { + var industry = '' + angular.forEach(wechatGoodMcc.configs(), function (wxMerchant) { + if (wxMerchant.value == values) { + industry = wxMerchant.label + } + }) + return industry + } + }, + ]) + + app.filter('choose_merchant_id', function () { + return function (value) { + switch (value + '') { + case '1307485301': + return '1307485301(Tunnel Show1)' + case '1431999902': + return '1431999902(Tunnel Show2)' + case '1487387142': + return '1487387142(NAP)' + case '': + return '' } - }) - return - } - // angular.forEach(form, function (item, key) { - // if(item !=null) { - // if(item.$name !=null) { - // merchantInfo[key] = item.$modelValue; - // } - // } - // }); - merchantInfo['company_name'] = $scope.subMerchantInfo.company_name - merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person - merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone - merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email - merchantInfo['company_website'] = $scope.subMerchantInfo.company_website - merchantInfo['abn'] = $scope.subMerchantInfo.abn - merchantInfo['executives'] = $scope.executives - merchantInfo['subMerchantId'] = angular.copy(subMerchantId) - merchantInfo['directors'] = $scope.directors - merchantInfo['business_content'] = $scope.business_content - merchantInfo['industry'] = $scope.industry - merchantInfo['merchantId'] = merchantId - $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/updateYeepaySubMerchantId', merchantInfo).then( - function (resp) { - $scope.apply_sub_merchant_id = resp.data - $scope.$close() - if (subMerchantInfo.yeepay_sub_merchant_id != null) { - commonDialog.alert({ - title: 'Success', - content: 'Update Successfully,Please Wait For Review!', - type: 'success', - }) - $state.reload() - } - }, - function (resp) { - commonDialog.alert({ - title: 'Error', - content: resp.data.message, - type: 'error', - }) - } - ) - } - }, - ]) - app.controller('permissionClientCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - '$filter', - 'commonDialog', - function ($scope, $http, $uibModal, $state, $filter, commonDialog) { - $scope.clientPermission = { client_moniker: $scope.partner.client_moniker } - $scope.loadPermissionList = function () { - var params = angular.copy($scope.clientPermission) - $http.get('/sys/permission/list', { params: params }).then( - function (resp) { - $scope.permissionList = resp.data - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - $scope.loadPermissionList(1) - $scope.switchValid = function (permission) { - $scope.clientPermission.isValid = permission.is_valid - var params = angular.copy($scope.clientPermission) - $http.post('/sys/permission/' + permission.id, params).then( - function (resp) {}, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - - $scope.init = function () { - var params = { client_moniker: $scope.partner.client_moniker } - $http.post('/sys/permission/init', params).then( - function (resp) {}, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - ]) - app.controller('incrementalServiceCtrl', [ - '$scope', - '$http', - '$uibModal', - '$state', - '$filter', - 'commonDialog', - function ($scope, $http, $uibModal, $state, $filter, commonDialog) { - $scope.serviceAll = {} - $scope.channelOptions = [] - $scope.initData = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/incremental_service').then(function (res) { - $scope.serviceAll = res.data.all_service - $scope.serviceAll.forEach(function (service) { - service.logo_url = '/static/images/' + service.channel + '.jpg' - service.logo_url = $scope.CheckImgExists(service.logo_url) ? service.logo_url : '/static/images/royalpay_sign.png' - }) - $scope.channelOptions = res.data.incremental_channel - }) - } - $scope.CheckImgExists = function (url) { - var xmlHttp - if (window.ActiveXObject) { - xmlHttp = new ActiveXObject('Microsoft.XMLHTTP') - } else if (window.XMLHttpRequest) { - xmlHttp = new XMLHttpRequest() - } - xmlHttp.open('Get', url, false) - xmlHttp.send() - if (xmlHttp.status == 404) return false - else return true - } - $scope.initData() - $scope.newServiceChannelDialog = function () { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/incremental_service_dialog.html', - controller: 'incrementalServiceDialogCtrl', - resolve: { - params: function () { - return { - isCreate: true, - clientMoniker: $scope.partner.client_moniker, - channelOptions: $scope.channelOptions, - serviceChannel: null, - } - }, - }, - }) - .result.then(function () { - $scope.initData() - }) - } - $scope.editServiceChannelDialog = function (serviceChannel) { - $uibModal - .open({ - templateUrl: '/static/payment/partner/templates/incremental_service_dialog.html', - controller: 'incrementalServiceDialogCtrl', - resolve: { - params: function () { - return { - isCreate: false, - clientMoniker: $scope.partner.client_moniker, - channelOptions: $scope.channelOptions, - serviceChannel: serviceChannel, - } - }, - }, - }) - .result.then(function () { - $scope.initData() - }) - } - $scope.updateStatus = function (service) { - commonDialog - .confirm({ - title: 'Update ' + service.channel + ' Incremental Service Status', - content: 'Are you sure update ' + service.channel + ' status？', - choises: [ - { label: 'Submit', className: 'btn-success', key: 1 }, - { label: 'Cancel', className: 'btn-warning', key: 0, dismiss: true }, - ], - }) - .then(function (choice) { - if (choice == 1) { - service.is_valid = !service.is_valid - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/incremental_service/status', service).then( - function (res) { - commonDialog.alert({ - title: 'Success', - content: 'Update Service Successful!', - type: 'success', - }) - $scope.initData() - }, - function (resp) { - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - $scope.initData() - } - ) - } - }) - } - }, - ]) - app.controller('incrementalServiceDialogCtrl', [ - '$scope', - '$http', - 'params', - 'commonDialog', - function ($scope, $http, params, commonDialog) { - $scope.model = {} - $scope.ctrl = { sending: false } - $scope.isCreate = true - $scope.initData = function () { - $scope.isCreate = angular.copy(params.isCreate) - if ($scope.isCreate) { - $scope.model.channel = angular.copy(params.channelOptions[0]) - $scope.model.channelOptions = angular.copy(params.channelOptions) - } else { - $scope.model = angular.copy(params.serviceChannel) - } - } - $scope.initData() - $scope.save = function (form) { - if (form.$invalid) { - angular.forEach(form, function (item, key) { - if (key.indexOf('$') < 0) { - item.$dirty = true - } - }) - return - } - $scope.ctrl.sending = true - $http.post('/sys/partners/' + params.clientMoniker + '/incremental_service', $scope.model).then( - function (res) { - commonDialog.alert({ - title: 'Success', - content: $scope.isCreate ? 'Create Service Successful!' : 'Update Service Successful!', - type: 'success', - }) - $scope.ctrl.sending = false - $scope.$close() - }, - function (resp) { - $scope.ctrl.sending = false - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) - } - ) - } - }, - ]) - - app.filter('bdOrg', function () { - return function (bdUsers, org_id) { - if (org_id) { - var bdUserByOrg = {} - var count = 0 - angular.forEach(bdUsers, function (bdUser) { - if (bdUser.org_id == org_id) { - bdUserByOrg[count] = bdUser - count++ - } - }) - return bdUserByOrg - } - return bdUsers - } - }) - app.filter('wxMerchants', function () { - return function (values) { - var industry = '' - angular.forEach(wxMerchantIndustries, function (wxMerchant) { - if (wxMerchant.value == values) { - industry = wxMerchant.label - } - }) - return industry - } - }) - //将保存的industry 和最新的分类比较，若查不到，返回空 - app.filter('newWxMerchantsFilter', function () { - return function (values) { - var industry = null - angular.forEach(wxMerchantIndustries, function (wxMerchant) { - if (wxMerchant.value == values) { - industry = wxMerchant.value - } - }) - return industry - } - }) - app.filter('newWxMerchants', function () { - return function (values) { - var industry = '' - angular.forEach(wxMerchantIndustries, function (wxMerchant) { - if (wxMerchant.value == values) { - industry = wxMerchant.label } - }) - return industry - } - }) - app.filter('yeepayIndustry', function () { - return function (value) { - switch (value + '') { - case 'ehk100000': - return '货物贸易' - case 'ehk200000': - return '旅游' - case 'ehk300000': - return '文化教育' - case 'ehk400000': - return '服务贸易' - case 'ehk500000': - return '物流' - case 'ehk600000': - return '数字娱乐' - case 'ehk700000': - return '金融保险' - case 'ehk999999': - return '其他' - } - } - }) - - app.filter('yeepayBusinessContent', function () { - return function (value) { - switch (value + '') { - case 'SERVICETRADE': - return '服务贸易' - case 'GOODSTRADE': - return '货物贸易' - case 'OVERSEASTUDY': - return '留学' - case 'HOTELTICKET': - return '酒店机票' - case 'INTTRANSPORT': - return '国际运输' - case 'TOURSERVICE': - return '旅游服务' - case 'INSURANCE': - return '保险' - } - } - }) - - app.filter('bdOrgSelect', function () { - return function (bdUsers, params) { - var org_id - org_id = params.org_ids || params.org_id || currentUser.org_id - if (org_id) { - var bdUserByOrg = {} - var count = 0 - angular.forEach(bdUsers, function (bdUser) { - if (params.org_ids) { - if (bdUser.org_id == org_id) { - bdUserByOrg[count] = bdUser - count++ - } - } else { - if (bdUser.org_id == org_id || bdUser.parent_org_id == org_id) { - bdUserByOrg[count] = bdUser - count++ - } - } - }) - return bdUserByOrg - } - return bdUsers - } - }) - - app.filter('wxindustries', function () { - return function (value) { - switch (value + '') { - case '327': - return '343' - case '339': - return '493' - case '337': - return '492' - case '328': - return '491' - case '362': - case '361': - case '363': - case '329': - return '490' - case '330': - return '489' - case '332': - return '487' - case '334': - return '486' - case '335': - return '485' - case '336': - return '484' - case '338': - case '358': - return '494' - } - } - }) - - app.filter('wechatMcc', [ - 'wechatGoodMcc', - function (wechatGoodMcc) { - return function (values) { - var industry = '' - angular.forEach(wechatGoodMcc.configs(), function (wxMerchant) { - if (wxMerchant.value == values) { - industry = wxMerchant.label - } - }) - return industry - } - }, - ]) - - app.filter('choose_merchant_id', function () { - return function (value) { - switch (value + '') { - case '1307485301': - return '1307485301(Tunnel Show1)' - case '1431999902': - return '1431999902(Tunnel Show2)' - case '1487387142': - return '1487387142(NAP)' - case '': - return '' - } - } - }) + }) - app.filter('cut', function () { - return function (value, wordwise, max, tail) { - if (!value) return '' + app.filter('cut', function () { + return function (value, wordwise, max, tail) { + if (!value) return '' - max = parseInt(max, 10) - if (!max) return value - if (value.length <= max) return value + max = parseInt(max, 10) + if (!max) return value + if (value.length <= max) return value - value = value.substr(0, max) - if (wordwise) { - var lastspace = value.lastIndexOf(' ') - if (lastspace != -1) { - value = value.substr(0, lastspace) + value = value.substr(0, max) + if (wordwise) { + var lastspace = value.lastIndexOf(' ') + if (lastspace != -1) { + value = value.substr(0, lastspace) + } + } + return value + (tail || ' …') + } + }) + app.filter('dateConversionStr', function () { + return function (date) { + var year = date.getFullYear() //获取完整的年份(4位,1970-????) + var month = date.getMonth() + 1 //获取当前月份(0-11,0代表1月) + var day = date.getDate() //获取当前日(1-31) + if (month < 10) { + month = '0' + month + } + if (day < 10) { + day = '0' + day + } + var dateString = year + '-' + month + '-' + day + return dateString } - } - return value + (tail || ' …') - } - }) - app.filter('dateConversionStr', function () { - return function (date) { - var year = date.getFullYear() //获取完整的年份(4位,1970-????) - var month = date.getMonth() + 1 //获取当前月份(0-11,0代表1月) - var day = date.getDate() //获取当前日(1-31) - if (month < 10) { - month = '0' + month - } - if (day < 10) { - day = '0' + day - } - var dateString = year + '-' + month + '-' + day - return dateString - } - }) - return app + }) + return app }) diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index 79245604a..13627efc0 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -108,28 +108,28 @@

- {{(paymentInfo.max_order_amount|currency:'AUD ')||'Not Configure'}} + {{(paymentInfo.max_order_amount | currency:'AUD ') || 'Not Configure'}}

AUD
+ title="Max Order Amount">
@@ -140,19 +140,19 @@

- {{paymentInfo.customer_surcharge_rate||'Not Configure'}} + {{paymentInfo.customer_surcharge_rate || 'Not Configure'}}

+ title="Customer Surcharge Rate" max="{{paymentInfo.max_customer_surcharge_rate}}" + min="{{paymentInfo.min_customer_surcharge_rate}}" name="customer_surcharge_rate">
%
@@ -163,7 +163,7 @@
@@ -178,16 +178,16 @@

- {{paymentInfo.order_expiry_config||'Not Configure'}} + {{paymentInfo.order_expiry_config || 'Not Configure'}}

+ title="Prevent not enough refund">
@@ -218,21 +218,21 @@
+ ng-change="toggleChannel('alipay')">
+ ng-change="toggleChannel('wechat')">
+ ng-change="toggleChannel('cb_bankpay')">
@@ -240,21 +240,28 @@
+ ng-change="toggleChannel('rpaypmt_card')">
+ ng-change="toggleChannel('rpaypmt_dd')">
+ ng-change="toggleChannel('alipayplus')"> +
+
+
+ +
+
@@ -274,7 +281,7 @@
+ switch-change="updateClientQRCodePaySurCharge()">
@@ -290,13 +297,13 @@ Pre Authorization + uib-tooltip="Pre Authorize means this bill will not be settled until completion">

@@ -327,7 +334,7 @@

Download Aggregate QR Board Image + download> Download Aggregate QR Board Image (聚合支付水晶立牌:支持支付宝、微信、翼支付)

@@ -344,28 +351,28 @@
+ switch-change="toggleGateway()">
+ switch-change="toggleGatewayUpgrade()">
+ switch-change="toggleGatewayAlipayOnline()">
+ switch-change="updateClientApiSurCharge()">

If client have already attached surcharge in their own system, ignore this choice.
@@ -380,8 +387,8 @@

+ data-on-text="Alipay+" data-off-text="Alipay" data-off-color="primary" + ng-change="setAlipayChannel()">
@@ -453,29 +460,29 @@
+ ng-change="toggleCBBankPayLink()">   {{paymentInfo.cb_bankpay_url}} + ng-if="paymentInfo.enable_cb_bankpay_link">{{paymentInfo.cb_bankpay_url}} + style="cursor: pointer" ng-click="copyCBBankPayLink()"> + value={{paymentInfo.cb_bankpay_url}} readonly>
+ ng-change="updateClientCBBankPaySurCharge()">
@@ -483,7 +490,7 @@
- +
  仅支持微信客户端扫描
@@ -498,7 +505,7 @@
@@ -507,9 +514,9 @@
+ src="/static/images/cbbank_payment_page_v1.jpg"> + src="/static/images/cbbank_payment_page_v2.jpg">
@@ -527,14 +534,31 @@
+ switch-change="switchInternationalCard()">
+ switch-change="switchThreeDS()"> +
+
+
+
+ + + +
+
AlipayCN channel replace
+
+
+
+ +
+
@@ -550,14 +574,14 @@
+ switch-change="toggleOffline()">
+ switch-change="updateClientRetailPaySurCharge()">
@@ -565,14 +589,14 @@
-
Refund
+
Refund
+ switch-change="toggleRefund()">
@@ -580,7 +604,7 @@
+ switch-change="togglePreRefund()">
@@ -589,13 +613,13 @@

- {{paymentInfo.refund_credit_line||'Not Configure'}} + {{paymentInfo.refund_credit_line || 'Not Configure'}}

+ ng-model="paymentInfo.refund_credit_line">
+ switch-change="toggleRequireRemark()">
@@ -668,7 +692,7 @@
+ ng-change="extChangeParam(param.name,param.value)">
@@ -679,7 +703,7 @@

+ title="Prevent not enough refund">
+ +
+
+

AlipayPlus Logs

+
+
+

No Data

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Date StartDate EndSettle DatePay FeeRefund FeeNet FeePoundageSettlement FeeUnsettledValidation
{{log.net_fee}} +   (System:{{log.sys_net_fee}}) +   (System:{{log.sys_net_fee}}) + {{log.surcharge}} +   (System:{{log.sys_surcharge}}) +   (System:{{log.sys_surcharge}}) + {{log.settlement_fee}} +   (System:{{log.sys_settlement_fee}}) +   (System:{{log.sys_settlement_fee}}) +
+
+
+ +
Total Records:{{wechatPagination.totalCount}};Total + Pages:{{wechatPagination.totalPages}} +
+
+
+
+
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 4e63e0fb4..2f6369ab1 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -6385,6 +6385,67 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.loadSubMerchantInfos() }) } + + $scope.applyAlipayPlusRetailMerchantId = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html', + controller: 'applyAlipayPlusSubMerchantIdCtrl', + resolve: { + subMerchantInfo: function () { + return $scope.partner + }, + online: false, + }, + }) + .result.then(function () { + $scope.loadSubMerchantInfos() + }) + } + $scope.applyAlipayPlusOnlineMerchantId = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html', + controller: 'applyAlipayPlusSubMerchantIdCtrl', + resolve: { + subMerchantInfo: function () { + return $scope.partner + }, + online: true, + }, + }) + .result.then(function () { + $scope.loadSubMerchantInfos() + }) + } + $scope.queryAlipayPlusApsOnline = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_aps_online').then( + function (resp) { + commonDialog.alert({ + title: 'AlipayPlus Online Apply Status', + content: resp.data.response_str, + type: 'info', + }) + }, + function (resp) { + commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) + } + ) + }; + $scope.queryAlipayPlusApsRetail = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_aps_retail').then( + function (resp) { + commonDialog.alert({ + title: 'AlipayPlus Retail Apply Status', + content: resp.data.response_str, + type: 'info', + }) + }, + function (resp) { + commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) + } + ) + }; // 刷新Wechat Sub Merchant Id $scope.queryWechatSubMerchantIdStatus = function () { $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.partnerInfo.sub_merchant_id + '/status').then( @@ -6973,7 +7034,134 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }, ]) - app.controller('updateApplyWxSubMerchantIdCtrl', [ + /** + * 申请alipayplus + */ + app.controller('applyAlipayPlusSubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + '$filter', + 'commonDialog', + 'online', + function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, commonDialog,online) { + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + $scope.subMerchantInfo.online=online; + $scope.subMerchantInfo.merchantDisplayName = $scope.subMerchantInfo.short_name; + $scope.subMerchantInfo.registrationAddress= $scope.subMerchantInfo.address; + + // if ($scope.subMerchantInfo.client_pay_type) { + // if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { + // $scope.subMerchantInfo.payment_type_online = true; + // $scope.subMerchantInfo.business_type_offline = true; + // } else if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0) { + // $scope.subMerchantInfo.business_type_offline = true + // } else if ($scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { + // $scope.subMerchantInfo.business_type_agreement = true + // } + // } else { + // $scope.subMerchantInfo.payment_type_online = true; + // $scope.subMerchantInfo.business_type_offline = true; + // } + if($scope.subMerchantInfo.online) { + $scope.title = "AlipayPlus-aps(Online)Registration"; + }else{ + $scope.title = "AlipayPlus-aps(Retail)Registration"; + } + $scope.subMerchantInfo.websiteType = 'WEB'; + $scope.subMerchantInfo.website= $scope.subMerchantInfo.company_website; + $scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name; + $scope.subMerchantInfo.registrationType='OTHER_IDENTIFICATION_NO' + if ($scope.subMerchantInfo.business_structure) { + $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' + } + $scope.subMerchantInfo.shareholderName= $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.representativeName= $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.storeAddress= $scope.subMerchantInfo.address; + $scope.subMerchantInfo.registrationNo= $scope. subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn; + $scope.subMerchantInfo.storeMCC=$scope.subMerchantInfo.alipayindustry; + $scope.subMerchantInfo.storeName=$scope.subMerchantInfo.store_name; + + $scope.alipayMccCategory = {} + $scope.loadAlipayCategory = function () { + $http.get('/static/data/alipayMcc.json').then(function (resp) { + $scope.alipayMccCategory = resp.data + }) + } + $scope.loadAlipayCategory() + + $scope.onAlipayMccSelect = function (selectedItem) { + $scope.subMerchantInfo.alipay_category = selectedItem.label + $scope.subMerchantInfo.alipayindustry = selectedItem.mccCode + } + $scope.onAlipayStoreMccSelect = function (selectedItem) { + $scope.subMerchantInfo.storeMCC_category = selectedItem.label + $scope.subMerchantInfo.storeMCC = selectedItem.mccCode + } + $scope.saveAlipayApply = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return; + } + var params = { + websiteType: $scope.subMerchantInfo.websiteType, + merchantDisplayName: $scope.subMerchantInfo.merchantDisplayName, + merchantMCC: $scope.subMerchantInfo.alipayindustry, + legalName: $scope.subMerchantInfo.legalName, + registrationType: $scope.subMerchantInfo.registrationType, + registrationNo: $scope.subMerchantInfo.registrationNo, + businessType: $scope.subMerchantInfo.businessType, + shareholderName: $scope.subMerchantInfo.shareholderName, + shareholderId: $scope.subMerchantInfo.shareholderId, + representativeName: $scope.subMerchantInfo.representativeName, + representativeId: $scope.subMerchantInfo.representativeId, + storeName: $scope.subMerchantInfo.storeName, + storeMCC: $scope.subMerchantInfo.storeMCC, + storeAddress: $scope.subMerchantInfo.storeAddress, + registrationAddress: $scope.subMerchantInfo.registrationAddress, + } + params.productCodes=[]; + if($scope.subMerchantInfo.online){ + params.productCodes.push('CASHIER_PAYMENT'); + }else{ + params.productCodes.push('IN_STORE_PAYMENT'); + } + params.websites=[] + if($scope.subMerchantInfo.online){ + params.websites.push($scope.subMerchantInfo.website); + } + + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/apply_alipayplus', params).then( + function (resp) { + if(resp.data.success) { + commonDialog.alert({ title: 'Success', content: "注册成功!", type: 'success' }) + }else{ + commonDialog.alert({title: 'Error', content: "注册失败！", type: 'error'}) + } + + $scope.$close() + }, + function (resp) { + $scope.flag = false + commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) + } + ) + + }; + + + }, + ]) + + + app.controller('updateApplyWxSubMerchantIdCtrl', [ '$scope', '$http', '$uibModal', diff --git a/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html new file mode 100644 index 000000000..41b8a3cfa --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html @@ -0,0 +1,284 @@ +
+
+
+
+
+
{{title}}
+
+
+ +
+ +
+ +
+

Required Field

+

Length is more than 50

+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+

Required + Field

+
+
+ +
+ + +
+ +
+ +
+

Required Field

+

Length is more than 1000

+
+
+
+ +
+ +
+
+ + +
+
+ + +
+
+
+ +
+ +
+ +
+

Required Field

+

Length is more than 256

+
+
+
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+ +
+ +
+

Required Field

+

Length is more than 64

+
+
+
+
+ +
+ +
+

Required Field

+

Length is more than 64

+
+
+
+ +
+ +
+ +
+

Required Field

+
+
+
+ +
+ +
+ +
+

Required Field

+

Length is more than 128

+
+
+
+
+ +
+ +
+

Required Field

+

Length is more than 128

+
+
+
+
+ +
+ +
+

Required Field

+

Length is more than 128

+
+
+
+
+ +
+ +
+

Required Field

+

Length is more than 128

+
+
+
+ + + + +
+ +
+ +
+

Required Field

+

Length is more than 256

+
+
+
+ +
+ +
+ +
+

Required + Field

+
+
+ +
+ + +
+ +
+ +
+

Required Field

+

Length is more than 256

+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html index 439260e97..02bc04812 100644 --- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -232,6 +232,89 @@
+ +
+
+
+
+
+
+ +
+
+ +
+ AlipayPlus(Retail) : + none +
+ +
+
+ + + +
+
+
+
+
+ No Data +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+ AlipayPlus(Online) : + none +
+ +
+
+ + + +
+
+
+
+
+ No Data +
+
+
+
+
+
+
From 4cb08e0cb6a98743ce887d72de89d8461c2e6789 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Mon, 13 Sep 2021 15:22:47 +0800 Subject: [PATCH 04/50] =?UTF-8?q?alipayplus=20aps=20=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/payment/partner/partner-manage.js | 186 ++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index d3b0b07e2..65722c901 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -6435,6 +6435,67 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } ) } + //alipayplus aps 注册 + $scope.applyAlipayPlusRetailMerchantId = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html', + controller: 'applyAlipayPlusSubMerchantIdCtrl', + resolve: { + subMerchantInfo: function () { + return $scope.partner + }, + online: false, + }, + }) + .result.then(function () { + $scope.loadSubMerchantInfos() + }) + } + $scope.applyAlipayPlusOnlineMerchantId = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html', + controller: 'applyAlipayPlusSubMerchantIdCtrl', + resolve: { + subMerchantInfo: function () { + return $scope.partner + }, + online: true, + }, + }) + .result.then(function () { + $scope.loadSubMerchantInfos() + }) + } + $scope.queryAlipayPlusApsOnline = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_aps_online').then( + function (resp) { + commonDialog.alert({ + title: 'AlipayPlus Online Apply Status', + content: resp.data.response_str, + type: 'info', + }) + }, + function (resp) { + commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) + } + ) + }; + $scope.queryAlipayPlusApsRetail = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_aps_retail').then( + function (resp) { + commonDialog.alert({ + title: 'AlipayPlus Retail Apply Status', + content: resp.data.response_str, + type: 'info', + }) + }, + function (resp) { + commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) + } + ) + }; // Wechat-applay $scope.applyWxSubMerchantId = function () { $uibModal @@ -7212,6 +7273,131 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }, ]) + /** + * 申请alipayplus + */ + app.controller('applyAlipayPlusSubMerchantIdCtrl', [ + '$scope', + '$http', + '$uibModal', + '$state', + 'subMerchantInfo', + '$filter', + 'commonDialog', + 'online', + function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, commonDialog,online) { + $scope.subMerchantInfo = angular.copy(subMerchantInfo) + $scope.subMerchantInfo.online=online; + $scope.subMerchantInfo.merchantDisplayName = $scope.subMerchantInfo.short_name; + $scope.subMerchantInfo.registrationAddress= $scope.subMerchantInfo.address; + + // if ($scope.subMerchantInfo.client_pay_type) { + // if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { + // $scope.subMerchantInfo.payment_type_online = true; + // $scope.subMerchantInfo.business_type_offline = true; + // } else if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0) { + // $scope.subMerchantInfo.business_type_offline = true + // } else if ($scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { + // $scope.subMerchantInfo.business_type_agreement = true + // } + // } else { + // $scope.subMerchantInfo.payment_type_online = true; + // $scope.subMerchantInfo.business_type_offline = true; + // } + if($scope.subMerchantInfo.online) { + $scope.title = "AlipayPlus-aps(Online)Registration"; + }else{ + $scope.title = "AlipayPlus-aps(Retail)Registration"; + } + $scope.subMerchantInfo.websiteType = 'WEB'; + $scope.subMerchantInfo.website= $scope.subMerchantInfo.company_website; + $scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name; + $scope.subMerchantInfo.registrationType='OTHER_IDENTIFICATION_NO' + if ($scope.subMerchantInfo.business_structure) { + $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' + } + $scope.subMerchantInfo.shareholderName= $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.representativeName= $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.storeAddress= $scope.subMerchantInfo.address; + $scope.subMerchantInfo.registrationNo= $scope. subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn; + $scope.subMerchantInfo.storeMCC=$scope.subMerchantInfo.alipayindustry; + $scope.subMerchantInfo.storeName=$scope.subMerchantInfo.store_name; + + $scope.alipayMccCategory = {} + $scope.loadAlipayCategory = function () { + $http.get('/static/data/alipayMcc.json').then(function (resp) { + $scope.alipayMccCategory = resp.data + }) + } + $scope.loadAlipayCategory() + + $scope.onAlipayMccSelect = function (selectedItem) { + $scope.subMerchantInfo.alipay_category = selectedItem.label + $scope.subMerchantInfo.alipayindustry = selectedItem.mccCode + } + $scope.onAlipayStoreMccSelect = function (selectedItem) { + $scope.subMerchantInfo.storeMCC_category = selectedItem.label + $scope.subMerchantInfo.storeMCC = selectedItem.mccCode + } + $scope.saveAlipayApply = function (form) { + $scope.errmsg = null + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return; + } + var params = { + websiteType: $scope.subMerchantInfo.websiteType, + merchantDisplayName: $scope.subMerchantInfo.merchantDisplayName, + merchantMCC: $scope.subMerchantInfo.alipayindustry, + legalName: $scope.subMerchantInfo.legalName, + registrationType: $scope.subMerchantInfo.registrationType, + registrationNo: $scope.subMerchantInfo.registrationNo, + businessType: $scope.subMerchantInfo.businessType, + shareholderName: $scope.subMerchantInfo.shareholderName, + shareholderId: $scope.subMerchantInfo.shareholderId, + representativeName: $scope.subMerchantInfo.representativeName, + representativeId: $scope.subMerchantInfo.representativeId, + storeName: $scope.subMerchantInfo.storeName, + storeMCC: $scope.subMerchantInfo.storeMCC, + storeAddress: $scope.subMerchantInfo.storeAddress, + registrationAddress: $scope.subMerchantInfo.registrationAddress, + } + params.productCodes=[]; + if($scope.subMerchantInfo.online){ + params.productCodes.push('CASHIER_PAYMENT'); + }else{ + params.productCodes.push('IN_STORE_PAYMENT'); + } + params.websites=[] + if($scope.subMerchantInfo.online){ + params.websites.push($scope.subMerchantInfo.website); + } + + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/apply_alipayplus', params).then( + function (resp) { + if(resp.data.success) { + commonDialog.alert({ title: 'Success', content: "注册成功!", type: 'success' }) + }else{ + commonDialog.alert({title: 'Error', content: "注册失败！", type: 'error'}) + } + + $scope.$close() + }, + function (resp) { + $scope.flag = false + commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) + } + ) + + }; + + + }, + ]) app.controller('applyRpaySubMerchantIdCtrl', [ '$scope', From a0d059ee9d7763b946d5d6a7d15cbe603f22bf35 Mon Sep 17 00:00:00 2001 From: Todking Date: Tue, 14 Sep 2021 11:00:46 +0800 Subject: [PATCH 05/50] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9Eaps=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E8=B4=B9=E7=8E=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/ClientManagerImpl.java | 6 + .../static/payment/partner/partner-manage.js | 78 ++++++++++- .../templates/partner_bankaccounts.html | 28 +++- .../partner_new_alipay_aps_rate.html | 126 ++++++++++++++++++ .../partner/templates/rate_config_dialog.html | 16 ++- 5 files changed, 245 insertions(+), 9 deletions(-) create mode 100644 src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html diff --git 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 index 959efeeb8..af0999d69 100644 --- 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 @@ -2021,12 +2021,15 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid checkAddRate(config, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate"); checkAddRate(config, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate"); checkAddRate(config, "CB_BankPay", "min_cb_bankpay_value", org, "min_cb_bankpay_rate"); + checkAddRate(config, "AlipayAps Interchange Fee", "interchange_fee_value", org, "min_interchange_fee_rate"); + checkAddRate(config, "AlipayAps Serivce Fee", "service_fee_value", org, "min_service_fee_rate"); configNewClientRate(config, clientId, "Wechat", "wechat_rate_value", org, "min_wechat_rate"); configNewClientRate(config, clientId, "Alipay", "alipay_rate_value", org, "min_alipay_rate"); configNewClientRate(config, clientId, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate"); configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate"); configNewClientRate(config, clientId, "CB_BankPay", "cb_bankpay_rate_value", org, "min_cb_bankpay_rate"); + configNewClientRate(config, clientId, "AlipayAps", "interchange_fee_value", null, ""); addAlipayPlusRateConfig(config, clientId, PayChannel.ALIPAY_PLUS.getChannelCode()); } @@ -2082,6 +2085,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (newConfig.getBigDecimal("cb_bankpay_rate_value") != null) { clientRateMapper.saveRate(newConfig); } + } else if("AlipayAps".equalsIgnoreCase(channel)){ + newConfig.put("transaction_fee",newConfig.getFloatValue("service_fee_value")); + clientRateMapper.saveRate(newConfig); } else { clientRateMapper.saveRate(newConfig); } diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 65722c901..16dc34ae9 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -2487,7 +2487,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter // $scope.init.channel[channel] = true // return // } - if($scope.paymentInfo.alipay_cn_switch){ + if ($scope.paymentInfo.alipay_cn_switch) { commonDialog.alert({ title: 'ERROR', content: "Please switch AlipayCN to Alipay channel, and then close Alipay+(APS) channel", @@ -3383,6 +3383,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } ) } + $scope.newAlipayApsRate = function () { + $uibModal + .open({ + templateUrl: '/static/payment/partner/templates/partner_new_alipay_aps_rate.html', + controller: 'newAlipayApsRateDialogCtrl', + resolve: { + rate: function () { + return {rate_name: "AlipayAps", clean_days: 3} + }, + sys_common_rate: function () { + return $http.get('/sys/partners/sys_rates') + }, + clientMoniker: function () { + return $scope.partner.client_moniker + }, + }, + }) + .result.then(function () { + $scope.getRates() + }) + } $scope.newCardPaymentRates = function () { $uibModal .open({ @@ -3688,6 +3709,61 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }, ]) + app.controller('newAlipayApsRateDialogCtrl', [ + '$scope', + '$http', + 'rate', + 'sys_common_rate', + 'clientMoniker', + function ($scope, $http, rate, sys_common_rate, clientMoniker) { + $scope.rate = angular.copy(rate) + $scope.sysRateConfig = angular.copy(sys_common_rate.data) + $scope.ctrl = {sending: false} + $scope.saveRate = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true + } + }) + return + } + $scope.errmsg = null + $scope.ctrl.sending = true + $http.post('/sys/partners/' + clientMoniker + '/rates', $scope.rate).then( + function () { + $scope.ctrl.sending = false + $scope.$close() + }, + function (resp) { + $scope.ctrl.sending = false + $scope.errmsg = resp.data.message + } + ) + // $scope.changeDays = function () { + // if ($scope.rate.clean_days) { + // switch ($scope.rate.clean_days) { + // case '1': { + // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t1.Wechat) + // $scope.rate.transaction_fee = 0 + // break + // } + // case '2': { + // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t2.Wechat) + // $scope.rate.transaction_fee = 0 + // break + // } + // case '3': { + // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t3.Wechat) + // $scope.rate.transaction_fee = 0 + // break + // } + // } + // } + // } + } + } + ]) app.controller('newRateDialogCtrl', [ '$scope', '$http', diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index ab0ad5e8a..7ffca8d19 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -255,6 +255,9 @@
  • Alipay(Online)
    • +
  • A+(APS) +
    • -
    +

    AlipayPlus Rates +

    New Alipay APS Rate

    +

    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    {{rateConfig}}
    +
    +
    +
    + + +
    + +
    +
    + +
    %
    +
    +
    +
    + No more than 10.0% +
    +
    + No less than 0.6% +
    +
    + Required Field +
    +
    + +
    +
    + +
    + +
    +
    + +
    %
    +
    +
    +
    + No more than 10.0% +
    +
    + No less than 0.6% +
    +
    + Required Field +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + + +
    diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html index a065193cc..5bb048de0 100644 --- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html +++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html @@ -14,9 +14,11 @@
    -
    - +
    %
    -
    +
    No more than 5.0%
    @@ -61,10 +65,12 @@
    - + +
    -
    $
    From d68c51437646cf594983c99ada1ec955ecb694b3 Mon Sep 17 00:00:00 2001 From: Todking Date: Tue, 14 Sep 2021 16:57:27 +0800 Subject: [PATCH 06/50] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9Eaps=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=9A=84=E8=B4=B9=E7=8E=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merchants/core/ApsConfigService.java | 2 +- .../core/impls/ApsConfigServiceImpl.java | 2 +- .../core/impls/ClientManagerImpl.java | 66 +- .../ApsConfigDescriptor.java | 4 +- .../merchants/entity/ApsConfigData.java | 4 +- .../merchants/web/ApsConfigController.java | 10 +- .../manage/organizations/beans/OrgInfo.java | 32 + .../organizations/templates/org_detail.html | 1954 +++++++++-------- .../templates/org_detail_parent.html | 34 + .../templates/partner_bankaccounts.html | 261 +-- 10 files changed, 1276 insertions(+), 1093 deletions(-) rename src/main/java/au/com/royalpay/payment/manage/merchants/{core/descriptor => deacriptor}/ApsConfigDescriptor.java (71%) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java index 6fa193b6d..3441146e0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ApsConfigService.java @@ -1,6 +1,6 @@ package au.com.royalpay.payment.manage.merchants.core; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java index 6444876b4..d06b65bb6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ApsConfigServiceImpl.java @@ -2,7 +2,7 @@ package au.com.royalpay.payment.manage.merchants.core.impls; import au.com.royalpay.payment.manage.mappers.system.aps.ApsConfigMapper; import au.com.royalpay.payment.manage.merchants.core.ApsConfigService; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; diff --git 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 index af0999d69..7626d6460 100644 --- 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 @@ -62,7 +62,7 @@ import au.com.royalpay.payment.manage.merchants.core.*; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBank; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankClientNullException; import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankInfo; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import au.com.royalpay.payment.manage.merchants.entity.impls.*; import au.com.royalpay.payment.manage.merchants.enums.UPayAuthFileEnum; @@ -564,7 +564,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid apsConfig = apsConfigService.saveApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), new ApsConfigDescriptor()); } client.put("aps_config_id", apsConfig.getId()); - client.put("enable_alipayaps", apsConfig.getEnableAlipayAps()); client.put("alipay_cn_switch", apsConfig.getAlipayCnSwitch()); return client; } @@ -1594,17 +1593,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new NotFoundException("Client Not Exists"); } - if (channelApi.channel().equalsIgnoreCase("alipayaps")) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("enableAlipayAps", allow); - apsConfigService.updateApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), jsonObject); - } else { - merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow); - try { - clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow)); - } catch (Exception e) { - logger.error("Failed to change channel switch:{}", channel); - } + merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow); + try { + clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow)); + } catch (Exception e) { + logger.error("Failed to change channel switch:{}", channel); } logger.info("{}({}) switched client {} channel {} to {}", manager.getString("display_name"), manager.getString("manager_id"), clientMoniker, channel, allow); if (allow && (StringUtils.equalsAnyIgnoreCase("Wechat", channel) || StringUtils.equalsAnyIgnoreCase("Alipay", channel))) { @@ -2085,8 +2078,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (newConfig.getBigDecimal("cb_bankpay_rate_value") != null) { clientRateMapper.saveRate(newConfig); } - } else if("AlipayAps".equalsIgnoreCase(channel)){ - newConfig.put("transaction_fee",newConfig.getFloatValue("service_fee_value")); + } else if ("AlipayAps".equalsIgnoreCase(channel)) { + newConfig.put("transaction_fee", newConfig.getFloatValue("service_fee_value")); clientRateMapper.saveRate(newConfig); } else { clientRateMapper.saveRate(newConfig); @@ -7091,6 +7084,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid /** * alipayplus(aps) 注册商户 + * * @param clientMoniker * @param apsMerchantApplication * @param manager @@ -7098,40 +7092,40 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid */ @Override public MerchantApplicationResult alipayPlusRegisterMerchant(String clientMoniker, ApsMerchantApplication apsMerchantApplication, JSONObject manager) { - logger.info("====>getWebsiteType:"+apsMerchantApplication.getWebsiteType()); - logger.info("====>getProductCodes:"+apsMerchantApplication.getProductCodes().toString()); - boolean offline = apsMerchantApplication.getProductCodes().stream().allMatch(s->s.equalsIgnoreCase(ProductCodeType.IN_STORE_PAYMENT.toString())); - logger.info("====>offline:"+offline); - if(offline){ + logger.info("====>getWebsiteType:" + apsMerchantApplication.getWebsiteType()); + logger.info("====>getProductCodes:" + apsMerchantApplication.getProductCodes().toString()); + boolean offline = apsMerchantApplication.getProductCodes().stream().allMatch(s -> s.equalsIgnoreCase(ProductCodeType.IN_STORE_PAYMENT.toString())); + logger.info("====>offline:" + offline); + if (offline) { //todo 测试需要 先都改成线上,上线此处需要改成线下 - apsMerchantApplication.setPid( AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid()); - }else{ - apsMerchantApplication.setPid( AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid()); - } + apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid()); + } else { + apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid()); + } apsMerchantApplication.setRegion("AU"); - JSONObject client= sysClientMapper.findClientByMoniker(clientMoniker); + JSONObject client = sysClientMapper.findClientByMoniker(clientMoniker); AlipayApsMerchantRegister alipayApsMerchantRegister = Optional.ofNullable(merchantChannelApplicationManager.getRegister(AlipayApsMerchantRegister.class)).orElseThrow(() -> new ServerErrorException("No AlipayAps registry found")); - MerchantApplicationResult result=alipayApsMerchantRegister.apply(client,apsMerchantApplication,manager); + MerchantApplicationResult result = alipayApsMerchantRegister.apply(client, apsMerchantApplication, manager); return result; } @Override - public String queryAlipayPlusOnlineStatus(boolean isRetail,String clientMoniker, JSONObject manager) { - JSONObject client= sysClientMapper.findClientByMoniker(clientMoniker); - client.put("isRetail",isRetail); - String pid=""; - if(isRetail){ + public String queryAlipayPlusOnlineStatus(boolean isRetail, String clientMoniker, JSONObject manager) { + JSONObject client = sysClientMapper.findClientByMoniker(clientMoniker); + client.put("isRetail", isRetail); + String pid = ""; + if (isRetail) { //todo 测试需要 先都改成线上,上线此处需要改成线下 - pid= AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid(); - }else{ - pid= AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid(); + pid = AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid(); + } else { + pid = AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid(); } - client.put("pid",pid); + client.put("pid", pid); AlipayApsMerchantRegister alipayApsMerchantRegister = Optional.ofNullable(merchantChannelApplicationManager.getRegister(AlipayApsMerchantRegister.class)).orElseThrow(() -> new ServerErrorException("No AlipayAps registry found")); - AlipayPlusRegisterResult alipayPlusRegisterResult= alipayApsMerchantRegister.findMerchant(client); + AlipayPlusRegisterResult alipayPlusRegisterResult = alipayApsMerchantRegister.findMerchant(client); return alipayPlusRegisterResult.getRawResponse(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java b/src/main/java/au/com/royalpay/payment/manage/merchants/deacriptor/ApsConfigDescriptor.java similarity index 71% rename from src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java rename to src/main/java/au/com/royalpay/payment/manage/merchants/deacriptor/ApsConfigDescriptor.java index 9274fc04c..cd63687e2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/deacriptor/ApsConfigDescriptor.java @@ -1,4 +1,4 @@ -package au.com.royalpay.payment.manage.merchants.core.descriptor; +package au.com.royalpay.payment.manage.merchants.deacriptor; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,5 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class ApsConfigDescriptor { - private Boolean enableAlipayAps = false; - private Boolean alipayCnSwitch = false; } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java index 5a945f842..aca1c3bf3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java @@ -1,8 +1,7 @@ package au.com.royalpay.payment.manage.merchants.entity; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; -import com.alibaba.fastjson.JSONObject; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -39,7 +38,6 @@ public class ApsConfigData implements Serializable { .setClientId(clientId) .setId(UUID.randomUUID().toString().replace("-", "")) .setAlipayCnSwitch(apsConfigDescriptor.getAlipayCnSwitch()) - .setEnableAlipayAps(apsConfigDescriptor.getEnableAlipayAps()) .setCreator(managerId) .setCreateTime(new Date()); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java index 5b64f54bc..a67e25f67 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java @@ -1,7 +1,7 @@ package au.com.royalpay.payment.manage.merchants.web; import au.com.royalpay.payment.manage.merchants.core.ApsConfigService; -import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor; +import au.com.royalpay.payment.manage.merchants.deacriptor.ApsConfigDescriptor; import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.CommonConsts; @@ -36,7 +36,7 @@ public class ApsConfigController { * @param apsConfigDescriptor * @return */ - @ManagerMapping(value = "/{clientId}", method = RequestMethod.POST, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER }) + @ManagerMapping(value = "/{clientId}", method = RequestMethod.POST, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.SITE_MANAGER}) public ApsConfigData saveApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable("clientId") String clientId, @RequestBody ApsConfigDescriptor apsConfigDescriptor) { return apsConfigService.saveApsConfigClientId(manager.getString("managerId"), clientId, apsConfigDescriptor); } @@ -48,8 +48,8 @@ public class ApsConfigController { * @param apsConfig * @return */ - @ManagerMapping(value = "/{clientId}", method = RequestMethod.PUT, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER }) - public ApsConfigData updateApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable("clientId") String clientId, @RequestBody JSONObject apsConfig) { - return apsConfigService.updateApsConfigClientId(manager.getString("managerId"),clientId, apsConfig); + @ManagerMapping(value = "/{clientId}", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.SITE_MANAGER}) + public ApsConfigData updateApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable("clientId") String clientId, @RequestBody JSONObject apsConfig) { + return apsConfigService.updateApsConfigClientId(manager.getString("managerId"), clientId, apsConfig); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java index 6664a2dda..17c02586c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java @@ -57,6 +57,11 @@ public class OrgInfo { private Double min_rpaypmt_dd_rate; private String state; private String senior_parent_org_id; + private Double interchange_fee_value; + private Double min_interchange_fee_value; + private Double service_fee_value; + private Double min_service_fee_value; + public JSONObject toJsonParam() { @@ -417,4 +422,31 @@ public class OrgInfo { this.min_rpaypmt_overseas_card_rate = min_rpaypmt_overseas_card_rate; } + public Double getInterchange_fee_value(){ return interchange_fee_value; } + + public void setInterchange_fee_value(Double interchange_fee_value){ this.interchange_fee_value = interchange_fee_value; } + + public Double getMin_interchange_fee_value() { + return min_interchange_fee_value; + } + + public void setMin_interchange_fee_value(Double min_interchange_fee_value) { + this.min_interchange_fee_value = min_interchange_fee_value; + } + + public Double getService_fee_value() { + return service_fee_value; + } + + public void setService_fee_value(Double service_fee_value) { + this.service_fee_value = service_fee_value; + } + + public Double getMin_service_fee_value() { + return min_service_fee_value; + } + + public void setMin_service_fee_value(Double min_service_fee_value) { + this.min_service_fee_value = min_service_fee_value; + } } diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html index 269bd4953..ffffa5ad3 100644 --- a/src/main/ui/static/config/organizations/templates/org_detail.html +++ b/src/main/ui/static/config/organizations/templates/org_detail.html @@ -1,951 +1,1077 @@
    -

    -
      -
    1. Framework
      2. -
    2. - Organizations -
      3. -
    3. -
    +

    +
      +
    1. Framework
      2. +
    2. + Organizations +
      3. +
    3. +
    -
    -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    -

    - - - -

    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - - - - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    - - % -
    -
    -
    -
    -
    -
    - -
    - - % -
    -
    -
    -
    -
    - -
    - - % -
    -
    +
    +
    + + + +
    +
    + +
    + +
    +
    +
    + +
    +

    + + + +

    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + + % +
    +
    +
    +
    +
    +
    + +
    + + % +
    +
    +
    +
    +
    + +
    + + % +
    +
    -
    - -
    - - % -
    -
    +
    + +
    + + % +
    +
    -
    - -
    - - % -
    -
    + +
    + +
    +
    + +
    + + % +
    +
    +
    + +
    + + % +
    +
    +
    + +
    + + % +
    +
    -
    - -
    - - % -
    -
    +
    + +
    + + % +
    +
    + -
    - -
    - - % -
    -
    -
    - -
    - - % -
    -
    - - - -
    - -
    - - % -
    -
    - - -
    - -
    - - % -
    -
    +
    +
    + +
    + + % +
    +
    + -
    - -
    - - % -
    -
    -
    + +
    + +
    + + % +
    +
    -
    -
    - -
    - - % -
    -
    -
    - -
    - - % -
    -
    + +
    + +
    + + % +
    +
    -
    - -
    - - % -
    -
    +
    + +
    + + % +
    +
    +
    -
    - -
    - - % -
    -
    +
    +
    + +
    + + % +
    +
    +
    + +
    + + % +
    +
    -
    - -
    - - % -
    -
    -
    - -
    - - % -
    -
    - +
    + - -
    - -
    - - % -
    -
    + +
    + +
    + + % +
    +
    - -
    - -
    - - % -
    -
    + +
    + +
    + + % +
    +
    -
    - -
    - - % -
    -
    -
    -
    +
    + +
    + + % +
    +
    +
    +
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - Back -
    - - -
    -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    UsernameDisplay NameWechatCreate TimeEmailRolesOperation
    - {{manager.nickname}} - - - - - - - - - - - - - Modify - | - Disable -
    -
    -
    -
    -
    Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}
    +
    +
    +
    交易额趋势
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    - - -
    -
    - -
    -

    - {{org.gateway_short_id||'初始化'}} - -

    -
    -
    -
    - -
    - View -
    -
    -
    - -
    - Upload -
    -
    -
    -     - -
    -
    - -
    - -
    -
    -
    -     - -
    -
    -
    - 禁用 -   超期提醒   -   等待合规   -   绿色通道   -   通过   -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    Partner CodePartner NameSub Mch IDRegister TimeCompliance StatusOrganizationBDOperation
    - - - - (已禁用) - - - - - 通过({{partner.approve_time}}) - 资料完善中 - (自助开通)资料完善中 - 自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}}) - 不通过({{partner.approve_time}}) - 申请打回({{partner.refuse_remark|limitTo:15}}) - 等待合规 - 自助开通（等待合规） - 合同制作完成 - 等待BD上传材料审核 - 绿色通道申请中 - 等待合规 - - - Detail - -
    -
    -
    - -
    -
    Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
    -
    -
    -
    -     - -
    -
    -
    -
    商户新增趋势
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    交易额趋势
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    - ~ -
    - -
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    + +
    + ~ +
    + +
    -
    - Today -
    -
    - Yesterday -
    -
    - Last 7 Days -
    -
    - This Month -
    -
    - Last Month -
    -
    - This Year -
    - +
    + Today +
    +
    + Yesterday +
    +
    + Last 7 Days +
    +
    + This Month +
    +
    + Last Month +
    +
    + This Year +
    + +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    交易分布
    -
    -
    -
    -

    组织总交易额

    -
    - - - - - - - - - - - - - -
    OrganizationAmount ($)
    - -
    +
    +
    +
    + +
    交易分布
    +
    +
    +
    +

    组织总交易额

    +
    + + + + + + + + + + + + + +
    OrganizationAmount ($)
    + +
    +
    +
    +

    {{chooseOrg}} 合伙人商户交易量排名

    +
    + + + + + + + + + + + + + + + + + + + + + +
    RankingPartnerAUD AmountRankingPartnerAmount
    + + {{sale[0].client_moniker}} + + + + {{sale[1].client_moniker}} + +
    + +
    +
    +
    +
    +
    +
    +
    -
    -

    {{chooseOrg}} 合伙人商户交易量排名

    -
    - - - - - - - - - - - - - - - - - - - - - -
    RankingPartnerAUD AmountRankingPartnerAmount
    - - {{sale[0].client_moniker}} - - - - {{sale[1].client_moniker}} - -
    - -
    + + +
    +
    合伙人提成
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    名称时间交易金额商户总手续费Royalpay手续费合伙人提成提成分润支付渠道
    {{clientExtracts.year | limitTo:10}} - {{clientExtracts.month | limitTo:10}} + + + + + {{clientExtracts.channel}} +
    +
    +
    + +
    +
    Total Records:{{paginationc.totalCount}};Total + Pages:{{paginationc.totalPages}} +
    +
    +
    -
    -
    -
    -
    -
    -
    - - -
    -
    合伙人提成
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    名称时间交易金额商户总手续费Royalpay手续费合伙人提成提成分润支付渠道
    {{clientExtracts.year|limitTo:10}} - {{clientExtracts.month|limitTo:10}} - - - - {{clientExtracts.channel}} -
    -
    -
    - -
    -
    Total Records:{{paginationc.totalCount}};Total Pages:{{paginationc.totalPages}}
    -
    -
    -
    -     - -
    -
    - -
    - -

    -
    -
    -
    - - -     - + + +
    +
    + +
    + +

    +
    +
    +
    + + +     + +
    -
    diff --git a/src/main/ui/static/config/organizations/templates/org_detail_parent.html b/src/main/ui/static/config/organizations/templates/org_detail_parent.html index 2da1eb371..f56b0ca33 100644 --- a/src/main/ui/static/config/organizations/templates/org_detail_parent.html +++ b/src/main/ui/static/config/organizations/templates/org_detail_parent.html @@ -121,6 +121,40 @@
    + +
    + +
    +
    + +
    + + % +
    +
    +
    + +
    + + % +
    +
    +
    + +
    + + % +
    +
    +
    + +
    + + % +
    +
    + +
    diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index 7ffca8d19..674177b2b 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -8,7 +8,7 @@

    Bank Account + ng-if="!bankCtrl.edit && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))">

    @@ -17,16 +17,16 @@
    -

    {{surcharge.balance|currency:'AUD'}}

    +

    {{surcharge.balance | currency:'AUD'}}

    + switch-change="allowSurchargeCredit(partner.allow_surcharge_credit)">
    @@ -35,11 +35,11 @@

    balance + ng-click="switchSurchargeMode()"> distributed + ng-click="switchSurchargeMode()">

    启用到收支分离(distributed)模式，将使消费者支付手续费模式失效
    @@ -52,41 +52,41 @@

    + switch-change="taxInSurcharge(partner.tax_in_surcharge)">
    + switch-change="customerTaxFree(partner.customer_tax_free)">
    + switch-change="skipClearing(partner.skip_clearing)">
    + switch-change="switchPreSettle(partner.enable_presettle)">

    - AU${{partner.min_settle||'Not Configure'}} + AU${{partner.min_settle || 'Not Configure'}}

    AU$
    + min="0">
    + ng-if="$root.complianceCheck.bankAccount"> + required ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    Bank
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + required ng-readonly="!bankCtrl.edit">
    + ng-if="$root.complianceCheck.bankAccount"> + id="account_name_input" required ng-readonly="!bankCtrl.edit">
    @@ -237,9 +237,9 @@

    Rates - + ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))" + ng-click="newRate()"> +

    @@ -247,16 +247,16 @@
    @@ -364,58 +364,59 @@

    AlipayPlus Rates - + ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4||(partner.approve_result==4&&partner.open_status==3)) && ('111'|withRole)))" + ng-click="newAlipayPlusRate()"> +

    • AlipayCN + ng-click="changeAlipayPlusRateState(true)" + ng-if="sysconfig.active_channels.indexOf('AlipayPlus')!=-1">AlipayCN
    • Other Wallets + ng-click="changeAlipayPlusRateState(false)">Other + Wallets
    - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - + +
    Rate NameRate ValueTransaction FeeActive TimeExpire TimeClean DaysUpdate TimeOperatorRemarkOperation
    Rate NameRate ValueTransaction FeeActive TimeExpire TimeClean DaysUpdate TimeOperatorRemarkOperation
    T+{{rate.clean_days}} - - + T+{{rate.clean_days}} + + (Promotional Offer) + ng-href="/sys/partners/{{partner.client_moniker}}/export/aggregate/card_promotion_agree_pdf?rateid={{rate.client_rate_id}}"> -
    From 5e4ce5d1ef390fe7dead1f35aac6fbd47fd3117d Mon Sep 17 00:00:00 2001 From: Todking Date: Tue, 14 Sep 2021 18:44:22 +0800 Subject: [PATCH 07/50] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9Eaps=E5=95=86?= =?UTF-8?q?=E6=88=B7=E8=B4=B9=E7=8E=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/payment/partner/partner-manage.js | 90 +++++++++---------- .../partner_new_alipay_aps_rate.html | 23 ----- 2 files changed, 45 insertions(+), 68 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 16dc34ae9..820f6b441 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -3740,27 +3740,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.errmsg = resp.data.message } ) - // $scope.changeDays = function () { - // if ($scope.rate.clean_days) { - // switch ($scope.rate.clean_days) { - // case '1': { - // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t1.Wechat) - // $scope.rate.transaction_fee = 0 - // break - // } - // case '2': { - // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t2.Wechat) - // $scope.rate.transaction_fee = 0 - // break - // } - // case '3': { - // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t3.Wechat) - // $scope.rate.transaction_fee = 0 - // break - // } - // } - // } - // } + } + $scope.changeDays = function () { + if ($scope.rate.clean_days) { + switch ($scope.rate.clean_days) { + case '1': { + $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t1.InterchangeFee) + $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t1.ServiceFee) + break + } + case '2': { + $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t2.InterchangeFee) + $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t2.ServiceFee) + break + } + case '3': { + $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t3.InterchangeFee) + $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t3.ServiceFee) + break + } + } + } } } ]) @@ -6554,7 +6554,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) }, function (resp) { - commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) + commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'}) } ) }; @@ -6568,7 +6568,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) }, function (resp) { - commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) + commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'}) } ) }; @@ -7361,11 +7361,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter '$filter', 'commonDialog', 'online', - function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, commonDialog,online) { + function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, commonDialog, online) { $scope.subMerchantInfo = angular.copy(subMerchantInfo) - $scope.subMerchantInfo.online=online; + $scope.subMerchantInfo.online = online; $scope.subMerchantInfo.merchantDisplayName = $scope.subMerchantInfo.short_name; - $scope.subMerchantInfo.registrationAddress= $scope.subMerchantInfo.address; + $scope.subMerchantInfo.registrationAddress = $scope.subMerchantInfo.address; // if ($scope.subMerchantInfo.client_pay_type) { // if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { @@ -7380,24 +7380,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter // $scope.subMerchantInfo.payment_type_online = true; // $scope.subMerchantInfo.business_type_offline = true; // } - if($scope.subMerchantInfo.online) { + if ($scope.subMerchantInfo.online) { $scope.title = "AlipayPlus-aps(Online)Registration"; - }else{ + } else { $scope.title = "AlipayPlus-aps(Retail)Registration"; } $scope.subMerchantInfo.websiteType = 'WEB'; - $scope.subMerchantInfo.website= $scope.subMerchantInfo.company_website; + $scope.subMerchantInfo.website = $scope.subMerchantInfo.company_website; $scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name; - $scope.subMerchantInfo.registrationType='OTHER_IDENTIFICATION_NO' + $scope.subMerchantInfo.registrationType = 'OTHER_IDENTIFICATION_NO' if ($scope.subMerchantInfo.business_structure) { $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' } - $scope.subMerchantInfo.shareholderName= $scope.subMerchantInfo.representativeInfo.representative_person; - $scope.subMerchantInfo.representativeName= $scope.subMerchantInfo.representativeInfo.representative_person; - $scope.subMerchantInfo.storeAddress= $scope.subMerchantInfo.address; - $scope.subMerchantInfo.registrationNo= $scope. subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn; - $scope.subMerchantInfo.storeMCC=$scope.subMerchantInfo.alipayindustry; - $scope.subMerchantInfo.storeName=$scope.subMerchantInfo.store_name; + $scope.subMerchantInfo.shareholderName = $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.representativeName = $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.storeAddress = $scope.subMerchantInfo.address; + $scope.subMerchantInfo.registrationNo = $scope.subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn; + $scope.subMerchantInfo.storeMCC = $scope.subMerchantInfo.alipayindustry; + $scope.subMerchantInfo.storeName = $scope.subMerchantInfo.store_name; $scope.alipayMccCategory = {} $scope.loadAlipayCategory = function () { @@ -7442,22 +7442,22 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter storeAddress: $scope.subMerchantInfo.storeAddress, registrationAddress: $scope.subMerchantInfo.registrationAddress, } - params.productCodes=[]; - if($scope.subMerchantInfo.online){ + params.productCodes = []; + if ($scope.subMerchantInfo.online) { params.productCodes.push('CASHIER_PAYMENT'); - }else{ + } else { params.productCodes.push('IN_STORE_PAYMENT'); } - params.websites=[] - if($scope.subMerchantInfo.online){ + params.websites = [] + if ($scope.subMerchantInfo.online) { params.websites.push($scope.subMerchantInfo.website); } $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/apply_alipayplus', params).then( function (resp) { - if(resp.data.success) { - commonDialog.alert({ title: 'Success', content: "注册成功!", type: 'success' }) - }else{ + if (resp.data.success) { + commonDialog.alert({title: 'Success', content: "注册成功!", type: 'success'}) + } else { commonDialog.alert({title: 'Error', content: "注册失败！", type: 'error'}) } @@ -7465,7 +7465,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }, function (resp) { $scope.flag = false - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) } ) diff --git a/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html index f8526d2cf..7842aaecd 100644 --- a/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html +++ b/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html @@ -69,29 +69,6 @@
    - - - - - - - - - - - - - - - - - - - - - - -
    From e1ba3b4eaa3377304a4ce6833c8be0973519e634 Mon Sep 17 00:00:00 2001 From: Todking Date: Wed, 15 Sep 2021 16:54:25 +0800 Subject: [PATCH 08/50] =?UTF-8?q?add=20aps=E9=9D=99=E6=80=81=E7=A0=81css?= =?UTF-8?q?=EF=BC=8Cjs=EF=BC=8Cimage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/images/APS.png | Bin 0 -> 55782 bytes .../static/templates/alipayaps/v1/payment.js | 444 ++++++++++++++++ .../static/templates/alipayaps/v4/payment.js | 488 ++++++++++++++++++ .../static/templates/alipayaps/v5/payment.js | 452 ++++++++++++++++ 4 files changed, 1384 insertions(+) create mode 100644 src/main/ui/static/images/APS.png create mode 100644 src/main/ui/static/templates/alipayaps/v1/payment.js create mode 100644 src/main/ui/static/templates/alipayaps/v4/payment.js create mode 100644 src/main/ui/static/templates/alipayaps/v5/payment.js diff --git a/src/main/ui/static/images/APS.png b/src/main/ui/static/images/APS.png new file mode 100644 index 0000000000000000000000000000000000000000..8317f251ea864bd042e9bd60c7f1e95fe179174a GIT binary patch literal 55782 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 z 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�TU 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 literal 0 HcmV?d00001 diff --git a/src/main/ui/static/templates/alipayaps/v1/payment.js b/src/main/ui/static/templates/alipayaps/v1/payment.js new file mode 100644 index 000000000..9f846d9df --- /dev/null +++ b/src/main/ui/static/templates/alipayaps/v1/payment.js @@ -0,0 +1,444 @@ +/** + * Created by yixian on 2017-05-08 + */ +$(function () { + 'use strict'; + // document.querySelector('body').addEventListener('touchmove', function (e) { + // if (!document.querySelector('.coupons').contains(e.target)) { + // e.preventDefault(); + // } + // }) + var dataCache = {price: '0', coupons: [], coupon_groups: {}}; + var exchangeRate = parseFloat(window.exchange_rate); + + if (window.AlipayJSBridge) { + AlipayJSBridge.call('hideOptionMenu'); + } else { + document.addEventListener('AlipayJSBridgeReady', function () { + AlipayJSBridge.call('hideOptionMenu'); + }, false); + } + dataCache.paying = false; + var ctrl = {}; + + $('.ff.key').bind('touchstart', function () { + if (dataCache.paying) { + return; + } + var char = $(this).attr('data-char'); + appendChar(char); + }); + + $('.coupons .use-check').click(function () { + if ($(this).hasClass('disabled')) { + return; + } + var couponId = $(this).attr('data-coupon-id'); + var couponGroup = $(this).attr('data-coupon-group'); + if (couponGroup) { + var prevCouponId = dataCache.coupon_groups[couponGroup]; + if (prevCouponId) { + var prevIdx = dataCache.coupons.indexOf(prevCouponId); + if (prevIdx >= 0) { + dataCache.coupons.splice(prevIdx, 1); + } + if (prevCouponId != couponId) { + $('.coupons .use-check[data-coupon-id="' + prevCouponId + '"]').removeClass('checked').addClass('unchecked'); + dataCache.coupon_groups[couponGroup] = couponId; + } else { + dataCache.coupon_groups[couponGroup] = null; + } + } else { + dataCache.coupon_groups[couponGroup] = couponId; + } + + } + + if ($(this).is('.checked')) { + $(this).removeClass('checked').addClass('unchecked'); + } else { + $(this).removeClass('unchecked').addClass('checked'); + } + var checked = $(this).is('.checked'); + if (checked) { + dataCache.coupons.push(couponId); + updatePrice(); + } else { + var idx = dataCache.coupons.indexOf(couponId); + dataCache.coupons.splice(idx, 1); + updatePrice(); + } + }); + + $('#key_B').bind('touchstart', function () { + backspace(); + }); + + function updatePoundage(price) { + if (window.extensions.indexOf('customerrate') >= 0 && window.rateValue != null) { + if (window.use_customised_rate) { + var rate = new Decimal(100).plus(window.rateValue).div(100); + var poundageValue = new Decimal(dataCache.price).mul(rate).sub(dataCache.price); + } else { + var rateRemain = new Decimal(100).sub(window.rateValue).div(100); + poundageValue = new Decimal(dataCache.price).div(rateRemain).sub(dataCache.price); + } + dataCache.poundageValue = poundageValue.toFixed(2, Decimal.ROUND_HALF_UP); + return poundageValue.plus(price).toFixed(2, Decimal.ROUND_HALF_UP); + } + return price; + } + + function updatePrice() { + $('#audVal').html(dataCache.price); + var realPrice = dataCache.price; + $('#audValReal').html(realPrice); + var surchargeData = calculateSurcharge(realPrice); + + var price = surchargeData.newPrice || realPrice; + var priceBeforeDiscount = price; + dataCache.discounts = []; + dataCache.tax = surchargeData.tax; + dataCache.surcharge = surchargeData.surcharge; + + $(window.coupons).each(function () { + price = this.handleDiscount(price, dataCache.price, dataCache.discounts, dataCache.coupons); + }); + dataCache.customSurcharge = new Decimal(price).sub(realPrice).toFixed(2, Decimal.ROUND_HALF_UP); + dataCache.finalPrice = new Decimal(price).toFixed(2, Decimal.ROUND_FLOOR); + var rate = 'CNY' == window.currency ? 1 : exchangeRate; + var cnyVal = Decimal.mul(price, rate).toFixed(2, Decimal.ROUND_HALF_UP); + $('#cnyVal').html(cnyVal); + dataCache.currencyPrice = 'CNY' == window.currency ? Decimal.div(priceBeforeDiscount, exchangeRate).toFixed(2, Decimal.ROUND_FLOOR) : priceBeforeDiscount; + } + + function updatePoundageStatus() { + $(window.coupons).each(function () { + var coupon = this; + var couponId = coupon.couponId(); + if (coupon.isEnable(dataCache.currencyPrice || 0)) { + $('.coupons .use-check[data-coupon-id=' + couponId + ']').removeClass('disabled'); + } else { + var dom = $('.coupons .use-check[data-coupon-id=' + couponId + ']').addClass('disabled'); + var couponGroup = dom.attr('data-coupon-group'); + if (couponGroup) { + if (dataCache.coupon_groups[couponGroup] == couponId) { + dataCache.coupon_groups[couponGroup] = null; + } + } + var idx = dataCache.coupons.indexOf(couponId); + if (idx >= 0) { + dataCache.coupons.splice(idx, 1); + } + dom.removeClass('checked').addClass('unchecked'); + } + }) + } + + updatePoundageStatus(); + + function backspace() { + dataCache.price = dataCache.price.substring(0, dataCache.price.length - 1); + if (dataCache.price.length == 0) { + dataCache.price = '0'; + } + updatePrice(); + updatePoundageStatus(); + } + + function appendChar(char) { + var pointLocation = dataCache.price.indexOf('.'); + if (pointLocation >= 0 || char == '.' || dataCache.price.length < 5) { + if (pointLocation >= 0 && char == '.') { + return; + } + if (pointLocation >= 0 && pointLocation <= dataCache.price.length - 3) { + return; + } + if (dataCache.price == '0' && char != '.') { + dataCache.price = ''; + } + dataCache.price += char; + updatePrice(); + updatePoundageStatus(); + } + } + + $('#coupon-box-toggle').click(function () { + $('.coupons-container').addClass('show'); + }); + $('.coupons-container>.coupons-mask,.coupons-container #close-coupon-box').click(function () { + $(this).parents('.coupons-container').removeClass('show'); + }); + + + $('.remark-btn').click(function () { + var cfg = { + title: '备注 Remark', + template: '', + initialize: function (dialog) { + $('').addClass('remark-input').attr('name', 'remark').val(dataCache.remark || '').appendTo($('.weui_dialog_bd', dialog)); + }, + confirm: function (dialog, chosen) { + if (chosen) { + var remark = $('textarea[name="remark"]', dialog).val(); + if (remark) { + $('#remark-box').text('备注：' + remark).show() + } else { + $('#remark-box').text('').hide(); + } + dataCache.remark = remark; + } + + } + }; + showWeuiDialog(cfg); + }); + + $('.paydetail').click(function () { + var config = { + title: 'Payment Detail', + template: '', + initialize: function (dialog) { + var bd = $('.weui_dialog_bd', dialog); + var currencySymbol = window.currency == 'AUD' ? '$' : '¥'; + $('

    ').html('Input Price 输入金额:' + currencySymbol + dataCache.price).appendTo(bd); + if (parseFloat(dataCache.customSurcharge) > 0) { + $('

    ').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.customSurcharge).appendTo(bd); + $('

    ').addClass('warning-sm').html('温馨提示：商户将向您收取本次消费手续费' + window.rateValue + '%').appendTo(bd); + } + $(dataCache.discounts).each(function () { + $('

    ').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd); + }); + $('

    ').addClass('final').html('Final 支付金额:' + currencySymbol + (dataCache.finalPrice || 0)).appendTo(bd); + } + }; + showWeuiDialog(config); + }); + + $('#key_P').click(function () { + if (window.requireRemark) { + if (!dataCache.remark) { + var config = { + title: '请先输入备注', + template: '' + }; + showWeuiDialog(config); + } + + } + }); + + $('#key_P').bind('touchstart', function () { + if (window.requireRemark) { + if (!dataCache.remark) { + return; + } + } + $('#key_P').addClass('hidden'); + $('#key_Loading').removeClass('hidden'); + if (dataCache.paying) { + return; + } + dataCache.paying = true; + var data = {price: dataCache.price + '', original_number: true, currency: window.currency}; + if (dataCache.remark) { + data.description = dataCache.remark; + } + if (window.extensions.indexOf('preauthorize') >= 0) { + data.preauthorize = true; + } + if (window.extensions.indexOf('qrcodemode') >= 0) { + data.qrmode = true; + } + if (window.extensions.indexOf('customerrate') >= 0) { + data.customerrate = true; + } + data.coupons = dataCache.coupons; + data.qrcodeVersion = window.qrcodeVersion; + + $.ajax({ + url: '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders', + method: 'POST', + data: JSON.stringify(data), + contentType: 'application/json', + dataType: 'json', + success: function (pay) { + if (pay.direct_paid) { + location.href = '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; + return; + } + if (pay.mweb_url){ + location.href = pay.mweb_url; + return; + } + if (window.AlipayJSBridge) { + callPayment(); + } else { + // 如果没有注入则监听注入的事件 + document.addEventListener('AlipayJSBridgeReady', callPayment, false); + } + + function callPayment() { + try { + AlipayJSBridge.call('tradePay', { + tradeNO: pay.trade_no + }, function (res) { + dataCache.paying = false; + if (res.resultCode == '9000') { + AlipayJSBridge.call('startApp', { + appId: '20000056', + param: { + actionType: 'showSuccPage', + payResult: res.result + }, + closeCurrentApp: false + }); + startCheckOrder(pay.order_id, '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); + } else if (res.resultCode == '6001') { + //do nothing + } else { + if (res.memo) { + weuiAlert(res.memo); + } + } + $('#key_P').removeClass('hidden'); + $('#key_Loading').addClass('hidden'); + }) + } catch (err) { + weuiAlert(err) + } + } + }, + error: function (jqXhr) { + weuiAlert(jqXhr.responseJSON.message); + $('#key_P').removeClass('hidden'); + $('#key_Loading').addClass('hidden'); + dataCache.paying = false; + } + }) + }); + + function startCheckOrder(orderId, url) { + function checkOrderStd() { + $.ajax({ + url: '/api/v1.0/payment/orders/' + orderId + '/status', + method: 'GET', + dataType: 'json', + success: function (res) { + if (res.paid) { + location.href = url; + } else { + setTimeout(checkOrderStd, 500); + } + } + }) + } + + checkOrderStd(); + } + + function weuiAlert(msg) { + var config = { + template: msg + }; + showWeuiDialog(config); + } + + function showWeuiDialog(config) { + if (config.templateUrl) { + $.ajax({ + url: config.templateUrl, + dataType: 'html', + success: function (template) { + buildDialog(template); + } + }); + } else { + buildDialog(config.template); + } + + + function buildDialog(template) { + var defaultConfig = {backdrop: true}; + config = $.extend({}, defaultConfig, config); + var dialog = $("
    ", {class: 'weui_dialog_confirm'}); + var mask = $('
    ', {class: 'weui_mask'}).appendTo(dialog); + if (config.backdrop) { + mask.click(function () { + dialog.remove(); + if ($.isFunction(config.dismiss)) { + config.dismiss(); + } + }) + } + var dialogBox = $("
    ", {class: 'weui_dialog'}).appendTo(dialog); + if (config.title) { + $('
    ', {class: 'weui_dialog_hd'}).append($('', {class: 'weui_dialog_title'}).html(config.title)).appendTo(dialogBox); + } + var dialogBody = $("
    ", {class: 'weui_dialog_bd'}).appendTo(dialogBox); + if (template) { + dialogBody.append(template); + } + if ($.isFunction(config.initialize)) { + config.initialize(dialog); + } + var ft = $('
    ').appendTo(dialogBox); + if(window.paypad_version !== 'v3'){ + if ($.isFunction(config.confirm)) { + var yes = $('    ', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #108ee9;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #108ee9;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } + }else{ + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } + } + dialog.appendTo($('body')); + } + + } +}); diff --git a/src/main/ui/static/templates/alipayaps/v4/payment.js b/src/main/ui/static/templates/alipayaps/v4/payment.js new file mode 100644 index 000000000..43c4c0012 --- /dev/null +++ b/src/main/ui/static/templates/alipayaps/v4/payment.js @@ -0,0 +1,488 @@ +/** + * Created by yixian on 2017-05-08 + */ +var num = function(obj){ + obj.value = obj.value.replace(/[^\d.]/g,""); //清除"数字"和"."以外的字符 + obj.value = obj.value.replace(/^\./g,""); //验证第一个字符是数字 + obj.value = obj.value.replace(/\.{2,}/g,"."); //只保留第一个, 清除多余的 + obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$","."); + obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数 +}; + +$(function () { + 'use strict'; + // document.querySelector('body').addEventListener('touchmove', function(e) { + // if (!document.querySelector('.coupons').contains(e.target)) { + // e.preventDefault(); + // } + // }); + var dataCache = {price: '0', coupons: [], coupon_groups: {}}; + var exchangeRate = parseFloat(window.exchange_rate); + + if (window.AlipayJSBridge) { + AlipayJSBridge.call('hideOptionMenu'); + } else { + document.addEventListener('AlipayJSBridgeReady', function () { + AlipayJSBridge.call('hideOptionMenu'); + }, false); + } + dataCache.paying = false; + var ctrl = {}; + + $('.ff.key').bind('touchstart', function () { + if (dataCache.paying) { + return; + } + var char = $(this).attr('data-char'); + appendChar(char); + }); + + $('#audVal').bind('input porpertychange', function () { + if (dataCache.paying) { + return; + } + var char = $(this).val(); + if (parseFloat(char) >= 100000) { + char = char.slice(0, char.length - 1); + $(this).val(char); + return; + } + appendChar(char); + }); + + $('.coupons .use-check').click(function () { + if ($(this).hasClass('disabled')) { + return; + } + var couponId = $(this).attr('data-coupon-id'); + var couponGroup = $(this).attr('data-coupon-group'); + if (couponGroup) { + var prevCouponId = dataCache.coupon_groups[couponGroup]; + if (prevCouponId) { + var prevIdx = dataCache.coupons.indexOf(prevCouponId); + if (prevIdx >= 0) { + dataCache.coupons.splice(prevIdx, 1); + } + if (prevCouponId != couponId) { + $('.coupons .use-check[data-coupon-id="' + prevCouponId + '"]').removeClass('checked').addClass('unchecked'); + dataCache.coupon_groups[couponGroup] = couponId; + } else { + dataCache.coupon_groups[couponGroup] = null; + } + } else { + dataCache.coupon_groups[couponGroup] = couponId; + } + + } + + if ($(this).is('.checked')) { + $(this).removeClass('checked').addClass('unchecked'); + } else { + $(this).removeClass('unchecked').addClass('checked'); + } + var checked = $(this).is('.checked'); + if (checked) { + dataCache.coupons.push(couponId); + updatePrice(); + } else { + var idx = dataCache.coupons.indexOf(couponId); + dataCache.coupons.splice(idx, 1); + updatePrice(); + } + }); + $('.cb_bankpay').click(function () { + $.ajax({ + url: '/sys/partners/' + window.client_moniker + '/jump/link', + method: 'GET', + success: function (res) { + location.href = res; + }, + error: function (resp) { + var config = { + template: resp + }; + showWeuiDialog(config); + } + }) + }); + $('#key_B').bind('touchstart', function () { + backspace(); + }); + + function updatePoundage(price) { + if (window.extensions.indexOf('customerrate') >= 0 && window.rateValue != null) { + if (window.use_customised_rate) { + var rate = new Decimal(100).plus(window.rateValue).div(100); + var poundageValue = new Decimal(dataCache.price).mul(rate).sub(dataCache.price); + } else { + var rateRemain = new Decimal(100).sub(window.rateValue).div(100); + poundageValue = new Decimal(dataCache.price).div(rateRemain).sub(dataCache.price); + } + dataCache.poundageValue = poundageValue.toFixed(2, Decimal.ROUND_HALF_UP); + return poundageValue.plus(price).toFixed(2, Decimal.ROUND_HALF_UP); + } + return price; + } + + function updatePrice() { + $('#audVal').html(dataCache.price); + var realPrice = dataCache.price; + $('#audValReal').html(realPrice); + var surchargeData = calculateSurcharge(realPrice); + + var price = surchargeData.newPrice || realPrice; + var priceBeforeDiscount = price; + dataCache.discounts = []; + dataCache.tax = surchargeData.tax; + dataCache.surcharge = surchargeData.surcharge; + $(window.coupons).each(function () { + price = this.handleDiscount(price, dataCache.price, dataCache.discounts, dataCache.coupons); + }); + dataCache.finalPrice = new Decimal(price).toFixed(2, Decimal.ROUND_FLOOR); + var rate = 'CNY' == window.currency ? 1 : exchangeRate; + var cnyVal = Decimal.mul(price, rate).toFixed(2, Decimal.ROUND_FLOOR); + dataCache.currencyPrice = 'CNY' == window.currency ? Decimal.div(priceBeforeDiscount, exchangeRate).toFixed(2, Decimal.ROUND_FLOOR) : priceBeforeDiscount; + $('#cnyVal').html(cnyVal) + } + + function backspace() { + dataCache.price = dataCache.price.substring(0, dataCache.price.length - 1); + if (dataCache.price.length == 0) { + dataCache.price = '0'; + } + updatePrice(); + updatePoundageStatus(); + } + + function appendChar(char) { + if (char == "") { + char = '0'; + } + var check = /[^\d.]/g; + if (check.test(char)) { + return; + } + var tmpChar = (char.split('.')).length-1; + if (tmpChar > 1) { + return; + } + var pointLocation = dataCache.price.indexOf('.'); + if (char == '.' || char.length > 8) { + return; + } + if (pointLocation >= 0 && pointLocation <= char.length - 4) { + return; + } + if (dataCache.price == '0' && char != '.') { + dataCache.price = ''; + } + dataCache.price = char; + updatePrice(); + updatePoundageStatus(); + } + + function updatePoundageStatus() { + $(window.coupons).each(function () { + var coupon = this; + var couponId = coupon.couponId(); + if (coupon.isEnable(dataCache.currencyPrice || 0)) { + $('.coupons .use-check[data-coupon-id=' + couponId + ']').removeClass('disabled'); + } else { + var dom = $('.coupons .use-check[data-coupon-id=' + couponId + ']').addClass('disabled'); + var couponGroup = dom.attr('data-coupon-group'); + if (couponGroup) { + if (dataCache.coupon_groups[couponGroup] == couponId) { + dataCache.coupon_groups[couponGroup] = null; + } + } + var idx = dataCache.coupons.indexOf(couponId); + if (idx >= 0) { + dataCache.coupons.splice(idx, 1); + } + dom.removeClass('checked').addClass('unchecked'); + } + }) + } + + updatePoundageStatus(); + + $('#coupon-box-toggle').click(function () { + $('.coupons-container').addClass('show'); + }); + $('.coupons-container>.coupons-mask,.coupons-container #close-coupon-box').click(function () { + $(this).parents('.coupons-container').removeClass('show'); + }); + + + $('.remark-btn').click(function () { + var cfg = { + title: '备注 Remark', + template: '', + initialize: function (dialog) { + $('').addClass('remark-input').attr('name', 'remark').val(dataCache.remark || '').appendTo($('.weui_dialog_bd', dialog)); + }, + confirm: function (dialog, chosen) { + if (chosen) { + var remark = $('textarea[name="remark"]', dialog).val(); + if (remark) { + $('#remark-box').text('备注：' + remark).show() + } else { + $('#remark-box').text('').hide(); + } + dataCache.remark = remark; + } + + } + }; + showWeuiDialog(cfg); + }); + + $('.paydetail').click(function () { + var config = { + title: 'Payment Detail', + template: '', + initialize: function (dialog) { + var bd = $('.weui_dialog_bd', dialog); + var currencySymbol = window.currency == 'CNY' ? '¥' : '$'; + $('

    ').html('Input Price 输入金额:' + currencySymbol + dataCache.price).appendTo(bd); + if (parseFloat(dataCache.surcharge) > 0) { + $('

    ').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.surcharge).appendTo(bd); + } + if (parseFloat(dataCache.tax) > 0) { + $('

    ').html('GST(10%):' + currencySymbol + dataCache.tax).appendTo(bd); + } + $(dataCache.discounts).each(function () { + $('

    ').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd); + }); + $('

    ').addClass('final').html('Final 支付金额:' + currencySymbol + (dataCache.finalPrice || 0)).appendTo(bd); + } + }; + showWeuiDialog(config); + }); + + $('#key_P').click(function () { + dataCache.remark = $('.remark-textarea-new').val(); + if (window.requireRemark) { + if (!dataCache.remark) { + var config = { + title: '请先输入备注', + template: '' + }; + showWeuiDialog(config); + } + + } + }); + + $('#key_P').bind('touchstart', function () { + dataCache.remark = $('.remark-textarea-new').val(); + if (window.requireRemark) { + if (!dataCache.remark) { + return; + } + } + $('#key_P_div').addClass('hidden'); + $('#key_Loading_div').removeClass('hidden'); + if (dataCache.paying) { + return; + } + dataCache.paying = true; + var data = {price: dataCache.price + '', currency: window.currency}; + if (dataCache.remark) { + data.description = dataCache.remark; + } + if (window.extensions.indexOf('preauthorize') >= 0) { + data.preauthorize = true; + } + if (window.extensions.indexOf('qrcodemode') >= 0) { + data.qrmode = true; + } + if (window.extensions.indexOf('customerrate') >= 0) { + data.customerrate = true; + } + data.coupons = dataCache.coupons; + data.qrcodeVersion = window.qrcodeVersion; + $.ajax({ + url: '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders', + method: 'POST', + data: JSON.stringify(data), + contentType: 'application/json', + dataType: 'json', + success: function (pay) { + if (pay.direct_paid) { + location.href = '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; + return; + } + if (pay.mweb_url){ + location.href = pay.mweb_url; + return; + } + if (window.AlipayJSBridge) { + callPayment(); + } else { + // 如果没有注入则监听注入的事件 + document.addEventListener('AlipayJSBridgeReady', callPayment, false); + } + + function callPayment() { + try { + AlipayJSBridge.call('tradePay', { + tradeNO: pay.trade_no + }, function (res) { + dataCache.paying = false; + if (res.resultCode == '9000') { + AlipayJSBridge.call('startApp', { + appId: '20000056', + param: { + actionType: 'showSuccPage', + payResult: res.result + }, + closeCurrentApp: false + }); + startCheckOrder(pay.order_id, '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); + } else if (res.resultCode == '6001') { + //do nothing + } else { + if (res.memo) { + weuiAlert(res.memo); + } + } + $('#key_P_div').removeClass('hidden'); + $('#key_Loading_div').addClass('hidden'); + }) + } catch (err) { + weuiAlert(err) + } + } + }, + error: function (jqXhr) { + weuiAlert(jqXhr.responseJSON.message); + $('#key_P_div').removeClass('hidden'); + $('#key_Loading_div').addClass('hidden'); + dataCache.paying = false; + } + }) + }); + + function startCheckOrder(orderId, url) { + function checkOrderStd() { + $.ajax({ + url: '/api/v1.0/payment/orders/' + orderId + '/status', + method: 'GET', + dataType: 'json', + success: function (res) { + if (res.paid) { + location.href = url; + } else { + setTimeout(checkOrderStd, 500); + } + } + }) + } + + checkOrderStd(); + } + + function weuiAlert(msg) { + var config = { + template: msg + }; + showWeuiDialog(config); + } + + function showWeuiDialog(config) { + if (config.templateUrl) { + $.ajax({ + url: config.templateUrl, + dataType: 'html', + success: function (template) { + buildDialog(template); + } + }); + } else { + buildDialog(config.template); + } + + function buildDialog(template) { + var defaultConfig = {backdrop: true}; + config = $.extend({}, defaultConfig, config); + var dialog = $("
    ", {class: 'weui_dialog_confirm'}); + var mask = $('
    ', {class: 'weui_mask'}).appendTo(dialog); + if (config.backdrop) { + mask.click(function () { + dialog.remove(); + if ($.isFunction(config.dismiss)) { + config.dismiss(); + } + }) + } + var dialogBox = $("
    ", {class: 'weui_dialog'}).appendTo(dialog); + if (config.title) { + $('
    ', {class: 'weui_dialog_hd'}).append($('', {class: 'weui_dialog_title'}).html(config.title)).appendTo(dialogBox); + } + var dialogBody = $("
    ", {class: 'weui_dialog_bd'}).appendTo(dialogBox); + if (template) { + dialogBody.append(template); + } + if ($.isFunction(config.initialize)) { + config.initialize(dialog); + } + var ft = $('
    ').appendTo(dialogBox); + if(window.paypad_version !== 'v3'){ + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #0bb20c;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #0bb20c;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } + } else { + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } + } + dialog.appendTo($('body')); + } + + } +}); diff --git a/src/main/ui/static/templates/alipayaps/v5/payment.js b/src/main/ui/static/templates/alipayaps/v5/payment.js new file mode 100644 index 000000000..5c1498ad3 --- /dev/null +++ b/src/main/ui/static/templates/alipayaps/v5/payment.js @@ -0,0 +1,452 @@ +/** + * Created by yixian on 2017-05-08 + */ + +$(function () { + 'use strict'; + // document.querySelector('body').addEventListener('touchmove', function(e) { + // if (!document.querySelector('.coupons').contains(e.target)) { + // e.preventDefault(); + // } + // }); + var dataCache = {price: '0', coupons: [], coupon_groups: {}}; + var exchangeRate = 'CNY' == window.currency ? 1 : parseFloat(window.exchange_rate); + dataCache.paying = false; + var ctrl = {}; + + if (window.AlipayJSBridge) { + AlipayJSBridge.call('hideOptionMenu'); + } else { + document.addEventListener('AlipayJSBridgeReady', function () { + AlipayJSBridge.call('hideOptionMenu'); + }, false); + } + dataCache.paying = false; + var ctrl = {}; + + $('.ff.key').bind('touchstart', function () { + if (dataCache.paying) { + return; + } + var char = $(this).attr('data-char'); + appendChar(char); + }); + + $('.coupons .use-check').click(function () { + if ($(this).hasClass('disabled')) { + return; + } + var couponId = $(this).attr('data-coupon-id'); + var couponGroup = $(this).attr('data-coupon-group'); + if (couponGroup) { + var prevCouponId = dataCache.coupon_groups[couponGroup]; + if (prevCouponId) { + var prevIdx = dataCache.coupons.indexOf(prevCouponId); + if (prevIdx >= 0) { + dataCache.coupons.splice(prevIdx, 1); + } + if (prevCouponId != couponId) { + $('.coupons .use-check[data-coupon-id="' + prevCouponId + '"]').removeClass('checked').addClass('unchecked'); + dataCache.coupon_groups[couponGroup] = couponId; + } else { + dataCache.coupon_groups[couponGroup] = null; + } + } else { + dataCache.coupon_groups[couponGroup] = couponId; + } + + } + + if ($(this).is('.checked')) { + $(this).removeClass('checked').addClass('unchecked'); + } else { + $(this).removeClass('unchecked').addClass('checked'); + } + var checked = $(this).is('.checked'); + if (checked) { + dataCache.coupons.push(couponId); + updatePrice(); + } else { + var idx = dataCache.coupons.indexOf(couponId); + dataCache.coupons.splice(idx, 1); + updatePrice(); + } + }); + $('.cb_bankpay').click(function () { + $.ajax({ + url: '/sys/partners/' + window.client_moniker + '/jump/link', + method: 'GET', + success: function (res) { + location.href = res; + }, + error: function (resp) { + var config = { + template: resp + }; + showWeuiDialog(config); + } + }) + }); + $('#key_B').bind('touchstart', function () { + backspace(); + }); + + function updatePoundage(price) { + if (window.extensions.indexOf('customerrate') >= 0 && window.rateValue != null) { + if (window.use_customised_rate) { + var rate = new Decimal(100).plus(window.rateValue).div(100); + var poundageValue = new Decimal(dataCache.price).mul(rate).sub(dataCache.price); + } else { + var rateRemain = new Decimal(100).sub(window.rateValue).div(100); + poundageValue = new Decimal(dataCache.price).div(rateRemain).sub(dataCache.price); + } + dataCache.poundageValue = poundageValue.toFixed(2, Decimal.ROUND_HALF_UP); + return poundageValue.plus(price).toFixed(2, Decimal.ROUND_HALF_UP); + } + return price; + } + + function updatePrice() { + $('#audVal').html(dataCache.price); + var realPrice = dataCache.price; + $('#audValReal').html(realPrice); + var surchargeData = calculateSurcharge(realPrice); + + var price = surchargeData.newPrice || realPrice; + var priceBeforeDiscount = price; + dataCache.discounts = []; + dataCache.tax = surchargeData.tax; + dataCache.surcharge = surchargeData.surcharge; + $(window.coupons).each(function () { + price = this.handleDiscount(price, dataCache.price, dataCache.discounts, dataCache.coupons); + }); + dataCache.finalPrice = new Decimal(price).toFixed(2, Decimal.ROUND_FLOOR); + var rate = 'CNY' == window.currency ? 1 : exchangeRate; + var cnyVal = Decimal.mul(price, rate).toFixed(2, Decimal.ROUND_FLOOR); + dataCache.currencyPrice = 'CNY' == window.currency ? Decimal.div(priceBeforeDiscount, exchangeRate).toFixed(2, Decimal.ROUND_FLOOR) : priceBeforeDiscount; + $('#cnyVal').html(cnyVal) + } + + function backspace() { + dataCache.price = dataCache.price.substring(0, dataCache.price.length - 1); + if (dataCache.price.length == 0) { + dataCache.price = '0'; + } + updatePrice(); + updatePoundageStatus(); + } + + function appendChar(char) { + var pointLocation = dataCache.price.indexOf('.'); + if (pointLocation >= 0 || char == '.' || dataCache.price.length < 5) { + if (pointLocation >= 0 && char == '.') { + return; + } + if (pointLocation >= 0 && pointLocation <= dataCache.price.length - 3) { + return; + } + if (dataCache.price == '0' && char != '.') { + dataCache.price = ''; + } + dataCache.price += char; + updatePrice(); + updatePoundageStatus(); + } + } + + function updatePoundageStatus() { + $(window.coupons).each(function () { + var coupon = this; + var couponId = coupon.couponId(); + if (coupon.isEnable(dataCache.currencyPrice || 0)) { + $('.coupons .use-check[data-coupon-id=' + couponId + ']').removeClass('disabled'); + } else { + var dom = $('.coupons .use-check[data-coupon-id=' + couponId + ']').addClass('disabled'); + var couponGroup = dom.attr('data-coupon-group'); + if (couponGroup) { + if (dataCache.coupon_groups[couponGroup] == couponId) { + dataCache.coupon_groups[couponGroup] = null; + } + } + var idx = dataCache.coupons.indexOf(couponId); + if (idx >= 0) { + dataCache.coupons.splice(idx, 1); + } + dom.removeClass('checked').addClass('unchecked'); + } + }) + } + + updatePoundageStatus(); + + $('#coupon-box-toggle').click(function () { + $('.coupons-container').addClass('show'); + }); + $('.coupons-container>.coupons-mask,.coupons-container #close-coupon-box').click(function () { + $(this).parents('.coupons-container').removeClass('show'); + }); + + $('.paydetail').click(function () { + var config = { + title: 'Payment Detail', + template: '', + initialize: function (dialog) { + var bd = $('.weui_dialog_bd', dialog); + var currencySymbol = window.currency == 'CNY' ? '¥' : '$'; + $('

    ').html('Input Price 输入金额:' + currencySymbol + dataCache.price).appendTo(bd); + if (parseFloat(dataCache.surcharge) > 0) { + $('

    ').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.surcharge).appendTo(bd); + } + if (parseFloat(dataCache.tax) > 0) { + $('

    ').html('GST(10%):' + currencySymbol + dataCache.tax).appendTo(bd); + } + $(dataCache.discounts).each(function () { + $('

    ').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd); + }); + $('

    ').addClass('final').html('Final 支付金额:' + currencySymbol + (dataCache.finalPrice || 0)).appendTo(bd); + } + }; + showWeuiDialog(config); + }); + + $('#key_P').click(function () { + if (window.requireRemark) { + if (!dataCache.remark) { + var config = { + title: '请先输入备注', + template: '' + }; + showWeuiDialog(config); + } + + } + }); + + function addBlurListen() { + $('.remark-input').on('blur', function (event) { + dataCache.remark = $('textarea[name="remark"]').val(); + }); + } + addBlurListen(); + + $('#audVal').bind('DOMNodeInserted', function(e) { + if(dataCache.price==0){ + $('.pay_button').css({"background-color":"#eee",}).attr('disabled',true); + $('.bank_button').css({"background-color":"#eee",}).attr('disabled',true); + }else{ + $('.pay_button').css({"background-color":"#108ee9",}).attr('disabled',false); + $('.bank_button').css({"background-color":"#FF6600",}).attr('disabled',false); + } + }); + $('#key_P').bind('touchstart', function () { + if (window.requireRemark) { + if ($('textarea[name="remark"]').val()=="") { + return; + } + } + $('#key_P').addClass('hidden'); + $('#key_Loading').removeClass('hidden'); + if (dataCache.paying) { + return; + } + dataCache.paying = true; + var data = {price: dataCache.price + '', currency: window.currency}; + if (dataCache.remark) { + data.description = dataCache.remark; + } + if (window.extensions.indexOf('preauthorize') >= 0) { + data.preauthorize = true; + } + if (window.extensions.indexOf('qrcodemode') >= 0) { + data.qrmode = true; + } + if (window.extensions.indexOf('customerrate') >= 0) { + data.customerrate = true; + } + data.coupons = dataCache.coupons; + data.qrcodeVersion = window.qrcodeVersion; + $.ajax({ + url: '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders', + method: 'POST', + data: JSON.stringify(data), + contentType: 'application/json', + dataType: 'json', + success: function (pay) { + if (pay.direct_paid) { + location.href = '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; + return; + } + if (pay.mweb_url){ + location.href = pay.mweb_url; + return; + } + if (window.AlipayJSBridge) { + callPayment(); + } else { + // 如果没有注入则监听注入的事件 + document.addEventListener('AlipayJSBridgeReady', callPayment, false); + } + + function callPayment() { + try { + AlipayJSBridge.call('tradePay', { + tradeNO: pay.trade_no + }, function (res) { + dataCache.paying = false; + if (res.resultCode == '9000') { + AlipayJSBridge.call('startApp', { + appId: '20000056', + param: { + actionType: 'showSuccPage', + payResult: res.result + }, + closeCurrentApp: false + }); + startCheckOrder(pay.order_id, '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); + } else if (res.resultCode == '6001') { + //do nothing + } else { + if (res.memo) { + weuiAlert(res.memo); + } + } + $('#key_P_div').removeClass('hidden'); + $('#key_Loading_div').addClass('hidden'); + }) + } catch (err) { + weuiAlert(err) + } + } + }, + error: function (jqXhr) { + weuiAlert(jqXhr.responseJSON.message); + $('#key_P_div').removeClass('hidden'); + $('#key_Loading_div').addClass('hidden'); + dataCache.paying = false; + } + }) + }); + + function startCheckOrder(orderId, url) { + function checkOrderStd() { + $.ajax({ + url: '/api/v1.0/payment/orders/' + orderId + '/status', + method: 'GET', + dataType: 'json', + success: function (res) { + if (res.paid) { + location.href = url; + } else { + setTimeout(checkOrderStd, 500); + } + } + }) + } + + checkOrderStd(); + } + + function weuiAlert(msg) { + var config = { + template: msg + }; + showWeuiDialog(config); + } + + function showWeuiDialog(config) { + if (config.templateUrl) { + $.ajax({ + url: config.templateUrl, + dataType: 'html', + success: function (template) { + buildDialog(template); + } + }); + } else { + buildDialog(config.template); + } + + function buildDialog(template) { + var defaultConfig = {backdrop: true}; + config = $.extend({}, defaultConfig, config); + var dialog = $("
    ", {class: 'weui_dialog_confirm'}); + var mask = $('
    ', {class: 'weui_mask'}).appendTo(dialog); + if (config.backdrop) { + mask.click(function () { + dialog.remove(); + if ($.isFunction(config.dismiss)) { + config.dismiss(); + } + }) + } + var dialogBox = $("
    ", {class: 'weui_dialog'}).appendTo(dialog); + if (config.title) { + $('
    ', {class: 'weui_dialog_hd'}).append($('', {class: 'weui_dialog_title'}).html(config.title)).appendTo(dialogBox); + } + var dialogBody = $("
    ", {class: 'weui_dialog_bd'}).appendTo(dialogBox); + if (template) { + dialogBody.append(template); + } + if ($.isFunction(config.initialize)) { + config.initialize(dialog); + } + var ft = $('
    ').appendTo(dialogBox); + if(window.paypad_version !== 'v3'){ + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #0bb20c;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #0bb20c;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } + } else { + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } + } + dialog.appendTo($('body')); + addBlurListen(); + } + + } +}); From e0f564a19db1b545e291922f9126f128b56e3830 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 15 Sep 2021 18:11:38 +0800 Subject: [PATCH 09/50] channel permission --- .../core/impls/ClientManagerImpl.java | 9 +---- .../impls/SwitchChannelPermissionModify.java | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SwitchChannelPermissionModify.java diff --git 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 index 7626d6460..7f1e41efd 100644 --- 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 @@ -283,10 +283,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Resource private MailGunService mailGunService; @Resource - private ClearingDetailMapper clearingDetailMapper; - @Resource - private ClearingLogMapper clearingLogMapper; - @Resource private ClientConfigMapper clientConfigMapper; @Resource private PermissionPartnerManagerImpl permissionPartnerManagerImpl; @@ -331,8 +327,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Resource private PaymentApi paymentApi; @Resource - private MerchantChannelPermissionManager merchantChannelPermissionManager; - @Resource private ApsConfigService apsConfigService; DateTimeFormatter formatter = DateTimeFormat.forPattern("dd MMM yyyy"); @@ -1593,9 +1587,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new NotFoundException("Client Not Exists"); } - merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow); try { - clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow)); + clientModifySupport.processModify(new SwitchChannelPermissionModify(manager, clientMoniker, merchantInfoProvider, paymentApi.channelApi(channel).getChannelPermissionResolver(), allow)); } catch (Exception e) { logger.error("Failed to change channel switch:{}", channel); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SwitchChannelPermissionModify.java b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SwitchChannelPermissionModify.java new file mode 100644 index 000000000..5328c3074 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SwitchChannelPermissionModify.java @@ -0,0 +1,37 @@ +package au.com.royalpay.payment.manage.merchants.entity.impls; + +import au.com.royalpay.payment.manage.merchants.entity.ClientModifyOperation; +import au.com.royalpay.payment.tools.merchants.core.MerchantChannelPermissionResolver; +import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider; +import au.com.royalpay.payment.tools.utils.JsonUtils; +import com.alibaba.fastjson.JSONObject; + +import java.util.function.Consumer; + +public class SwitchChannelPermissionModify extends ClientModifyOperation { + private final MerchantInfoProvider mchInfoProvider; + private final MerchantChannelPermissionResolver channelResolver; + private final boolean enableFlag; + + public SwitchChannelPermissionModify(JSONObject account, String clientMoniker, MerchantInfoProvider mchInfoProvider, MerchantChannelPermissionResolver channelResolver, boolean enableFlag) { + super(account, clientMoniker); + this.mchInfoProvider = mchInfoProvider; + this.channelResolver = channelResolver; + this.enableFlag = enableFlag; + } + + @Override + protected String business() { + return (enableFlag ? "开启 " : "关闭 ") + "渠道[" + channelResolver.payChannel().getChannelCode() + "]"; + } + + @Override + protected JSONObject getModifyResult() { + return JsonUtils.newJson(json -> json.put("enable_" + channelResolver.payChannel().getChannelCode(), enableFlag + "")); + } + + @Override + protected Consumer getModifyProcess() { + return client -> channelResolver.switchPermission(mchInfoProvider, client.getIntValue("client_id"), enableFlag); + } +} From e2a3e4d213fce369791bf345309fd5a825d78845 Mon Sep 17 00:00:00 2001 From: Todking Date: Thu, 16 Sep 2021 14:10:29 +0800 Subject: [PATCH 10/50] fix alipay.yml --- src/main/resources/application-alipay.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/resources/application-alipay.yml b/src/main/resources/application-alipay.yml index 254bb4235..4c268e41f 100644 --- a/src/main/resources/application-alipay.yml +++ b/src/main/resources/application-alipay.yml @@ -26,21 +26,12 @@ app: public-key-string: |- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqME6KAPZcMlFuy19J+RAj34PaS6iuyjINzQvdjR808IeVQAcLdUULMEgCTSQLshC606GFoGkN5nOouoMCZQmPv9hbZSWcDHMrPNNVYuAqwk0N80FSnASNPtlucoqzVjAaqgXD88hqjODCIS/b9LWrprCA3q3aAfVQu3eQLoFM1nn9EdznCp0uVClHgLtwj1rMRkjN+4CSwOW66/RNzsgnDJMkrTlRDeJCrbdXAs0Q3MWQEQv2z1fd34U1yyY2StkHbfKAVp2cCzhSl26K3LcCooDv9VDSv3BDH58sBQ8TIprIW0EsDA4jbLXEDEKXIjqIOaC/+x8jXyRpci17ZvRowIDAQAB pid-host: https://open-sea.alipay.com - - pid: SANDBOX_5Y2Z6G2Y6CD006410 - bill-pid: '' - pid-type: APS - biz-type: RETAIL - api-prefix: /aps - private-key-string: |- - MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7Q56Mi0ESd7lIImLl/qvoHry8M1pg6qMyzzsMsHe6kMMculI7B7G2/fGpSS2JC46jZrVRb/fYf1NLehhAh1MK51md/7dEgqjkowtXIjhEQTPXwTWWkxtnb/l+KoqWtBrkOfMIef+O6QbqvveneLlCq9wMnvKNsj0p9GtUKxYUyxY8Nwuc2tf2wG2zKuh0JoRMLMRMayr7WdhAy4jatJS5pDjJqoIxyhD6X7fPleoeJgzyYSZAPgnH01TSO5ePFQZ/7SxDRC8+D5rAnefsridaabmeBQG2QWf4Gz7qPuavnZfwKzkjptj390+D0PAR3f3JCvYXTrRRUGKdVpiuuFAbAgMBAAECggEBAJrmxUjWi9494Kq1nv9HGWYpvs8i33jZvmNyHhNSCcfupSanTQv9QljvWK5ClQMO509sz0FtECQqtnjxpwwBpISZeH0EoNFwD0sJP4E1EjwLf1nSPYSvbPS0IDnn8LnWg4QUF2AEoovRYGJf0zXZ2801ohFijZr+PC/vObTm6x4IsVasse+urTpAKb1XBnkOF2eKFTM4JdRHFSl4Uk0npdPtULUEvACpsORrBVjJz1dWjIkvHeOrqv5rKR1bxuRlhiDcVoDb7oDD3KIqR93YljOI0mdXLm2DuboGEpj0yKZYU+RaPWxMOErRT99UIAAVpPDVjGKZdt95K6BrWoqxq7kCgYEA5bzUMCM6/0jLt/kmuwkOF+zckz4DLtWFlosGrf658of9PQIvjkZbun3TcpJ2aQ8g7k2qFAUvwc5Uy5G0lW+uCIRA7zcKd2Rz4Rb4Q8qgI+9bIOuDjmvg36zOvqg3xuepoYq/2jcFGR+cBFGpbEu0VWESW3vytDsMosDp4xYkvt0CgYEA0KvSnx9ZqNHINQJCTgLd+mWbEv4lTSDXwi/OBtS8O7tTQRw73OkpOXobXv/vhTV4KimPOWTFFSEZcY7Rl0eyFV7rQD+gIioTCpt4m/ez/zImCv11tQWBqa/GoqZ0d0P9HPgmVjMh8Be0CVTEzGgXeOD2mcP+0WJCns/Js2s2j1cCgYEAk6EOMYjSJq4eyzA+JT6iYdmBvNTCstvfJmhceH8R+rpMj2HSMXkhBOxKbnuTv9tK7BfYTVkv4Ti34MDW7JiBm1NxbsdN4H8av/BExTt2QOFVDAiL13+XV+TyTi5G+Xhw1zAULSPiEMzxMw1O9BqJ3butUkCKLCst6YBSS+0027kCgYEAn+BFiyzV4QZ5wkNs0aBYupRGcBLQOXvEUz+VNp6faZRogSZEp0jtEOCBQBQPS5xf6M3Wsj6G0V1+xQaLhsCjrMQAskUNR5+83w+nJLhv7EJb62euW3dQlNXb9ppZ+VbaAuwNU1Xx1qYShmOwNHw8H50c00rbXUlPiaXh/9lRABkCgYBC9cIcIEutg3hmOlGrRVSSNnuYVO2MuLAIK1KnQftpZHZ+euuCnhPaoC3ZOtenWoBwgS6qV4Mpxq30qcc/mUouErpqUcrNxawlVgWjTSwNd6rT2MBg1lcOxpqsR9ZWolBp4nHvnbLxhI+2KiXpRV9Y8Gbkw1jI8/tMYcSEJsOfEA== - public-key-string: |- - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqME6KAPZcMlFuy19J+RAj34PaS6iuyjINzQvdjR808IeVQAcLdUULMEgCTSQLshC606GFoGkN5nOouoMCZQmPv9hbZSWcDHMrPNNVYuAqwk0N80FSnASNPtlucoqzVjAaqgXD88hqjODCIS/b9LWrprCA3q3aAfVQu3eQLoFM1nn9EdznCp0uVClHgLtwj1rMRkjN+4CSwOW66/RNzsgnDJMkrTlRDeJCrbdXAs0Q3MWQEQv2z1fd34U1yyY2StkHbfKAVp2cCzhSl26K3LcCooDv9VDSv3BDH58sBQ8TIprIW0EsDA4jbLXEDEKXIjqIOaC/+x8jXyRpci17ZvRowIDAQAB - pid-host: https://open-sea.alipay.com - enabled: true - pid: SANDBOX_5Y372Y2YBKQN02382 bill-pid: '' pid-type: APS - biz-type: ONLINE + biz-types: + - ONLINE + - RETAIL api-prefix: /aps private-key-string: |- MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDWXsXs+dZPb/cd From 185ecdecc3de98134b0dae86b2d37215bad4a058 Mon Sep 17 00:00:00 2001 From: Todking Date: Thu, 16 Sep 2021 14:25:41 +0800 Subject: [PATCH 11/50] =?UTF-8?q?fix=20alipay+(aps)=E6=94=AF=E4=BB=98js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/merchants/core/impls/ClientManagerImpl.java | 10 ++++++++-- src/main/ui/static/templates/alipayaps/v1/payment.js | 6 +++--- src/main/ui/static/templates/alipayaps/v4/payment.js | 6 +++--- src/main/ui/static/templates/alipayaps/v5/payment.js | 6 +++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git 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 index 7f1e41efd..0c275a206 100644 --- 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 @@ -553,6 +553,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid resolver.newOrderEnabled(client, null, PlatformEnvironment.getEnv().getForeignCurrency())) { client.put("enable_alipayplus", true); } + client.put("enable_alipayaps", false); + MerchantChannelPermissionResolver resolverAps = this.paymentApi.channelApi(PayChannel.ALIPAY_APS.getChannelCode()).getChannelPermissionResolver(); + if (!Objects.isNull(resolver) && + resolverAps.newOrderEnabled(client, null, PlatformEnvironment.getEnv().getForeignCurrency())) { + client.put("enable_alipayaps", true); + } ApsConfigData apsConfig = apsConfigService.getApsConfigByClientId(client.getString("client_id")); if (apsConfig == null) { apsConfig = apsConfigService.saveApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), new ApsConfigDescriptor()); @@ -1588,9 +1594,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new NotFoundException("Client Not Exists"); } try { - clientModifySupport.processModify(new SwitchChannelPermissionModify(manager, clientMoniker, merchantInfoProvider, paymentApi.channelApi(channel).getChannelPermissionResolver(), allow)); + clientModifySupport.processModify(new SwitchChannelPermissionModify(manager, clientMoniker, merchantInfoProvider, channelApi.getChannelPermissionResolver(), allow)); } catch (Exception e) { - logger.error("Failed to change channel switch:{}", channel); + logger.error("Failed to change channel switch:{}", channel,e); } logger.info("{}({}) switched client {} channel {} to {}", manager.getString("display_name"), manager.getString("manager_id"), clientMoniker, channel, allow); if (allow && (StringUtils.equalsAnyIgnoreCase("Wechat", channel) || StringUtils.equalsAnyIgnoreCase("Alipay", channel))) { diff --git a/src/main/ui/static/templates/alipayaps/v1/payment.js b/src/main/ui/static/templates/alipayaps/v1/payment.js index 9f846d9df..0a49f9143 100644 --- a/src/main/ui/static/templates/alipayaps/v1/payment.js +++ b/src/main/ui/static/templates/alipayaps/v1/payment.js @@ -258,14 +258,14 @@ $(function () { data.qrcodeVersion = window.qrcodeVersion; $.ajax({ - url: '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders', + url: '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders', method: 'POST', data: JSON.stringify(data), contentType: 'application/json', dataType: 'json', success: function (pay) { if (pay.direct_paid) { - location.href = '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; + location.href = '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; return; } if (pay.mweb_url){ @@ -294,7 +294,7 @@ $(function () { }, closeCurrentApp: false }); - startCheckOrder(pay.order_id, '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); + startCheckOrder(pay.order_id, '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); } else if (res.resultCode == '6001') { //do nothing } else { diff --git a/src/main/ui/static/templates/alipayaps/v4/payment.js b/src/main/ui/static/templates/alipayaps/v4/payment.js index 43c4c0012..be2d64c9a 100644 --- a/src/main/ui/static/templates/alipayaps/v4/payment.js +++ b/src/main/ui/static/templates/alipayaps/v4/payment.js @@ -303,14 +303,14 @@ $(function () { data.coupons = dataCache.coupons; data.qrcodeVersion = window.qrcodeVersion; $.ajax({ - url: '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders', + url: '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders', method: 'POST', data: JSON.stringify(data), contentType: 'application/json', dataType: 'json', success: function (pay) { if (pay.direct_paid) { - location.href = '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; + location.href = '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; return; } if (pay.mweb_url){ @@ -339,7 +339,7 @@ $(function () { }, closeCurrentApp: false }); - startCheckOrder(pay.order_id, '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); + startCheckOrder(pay.order_id, '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); } else if (res.resultCode == '6001') { //do nothing } else { diff --git a/src/main/ui/static/templates/alipayaps/v5/payment.js b/src/main/ui/static/templates/alipayaps/v5/payment.js index 5c1498ad3..759356aff 100644 --- a/src/main/ui/static/templates/alipayaps/v5/payment.js +++ b/src/main/ui/static/templates/alipayaps/v5/payment.js @@ -266,14 +266,14 @@ $(function () { data.coupons = dataCache.coupons; data.qrcodeVersion = window.qrcodeVersion; $.ajax({ - url: '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders', + url: '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders', method: 'POST', data: JSON.stringify(data), contentType: 'application/json', dataType: 'json', success: function (pay) { if (pay.direct_paid) { - location.href = '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; + location.href = '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; return; } if (pay.mweb_url){ @@ -302,7 +302,7 @@ $(function () { }, closeCurrentApp: false }); - startCheckOrder(pay.order_id, '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); + startCheckOrder(pay.order_id, '/api/v1.0/alipay_aps/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'); } else if (res.resultCode == '6001') { //do nothing } else { From 756b4bbca3913f86685b87a82a5fcf982567cb70 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Thu, 16 Sep 2021 17:27:40 +0800 Subject: [PATCH 12/50] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impls/ChannelsAnalysisServiceImpl.java | 13 +++++- .../web/PartnerManageController.java | 11 ++++- .../CustomerAndOrdersStatisticsMapper.xml | 3 ++ .../ui/static/analysis/channels_analysis.js | 45 ++++++++++++++++--- .../analysis/templates/channels_analysis.html | 10 +++-- .../templates/manage_customers_orders.html | 2 + .../templates/partner_customers_orders.html | 2 + .../templates/partner_trans_analysis.html | 2 + .../analysis/templates/trans_analysis.html | 13 ++++++ .../transaction_amount_Analysis.html | 2 + .../static/payment/partner/partner-manage.js | 6 +-- .../apply_alipayplus_sub_merchant_id.html | 2 +- .../partner/templates/partner_pay_logs.html | 4 +- .../templates/sub_merchant_id_apply.html | 16 +++---- .../tradelog/templates/balance_report.html | 4 ++ .../templates/incremental_trade_logs.html | 4 ++ .../partner_incremental_trade_logs.html | 2 + .../templates/partner_trade_logs.html | 4 +- .../tradelog/templates/trade_logs.html | 4 +- .../templates/payment/gateway_jsapi.css | 15 +++++++ 20 files changed, 130 insertions(+), 34 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java index 9878e525f..830e1aa01 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java @@ -1,5 +1,6 @@ package au.com.royalpay.payment.manage.analysis.core.impls; +import au.com.royalpay.payment.core.mappers.MchChannelContractMapper; import au.com.royalpay.payment.manage.analysis.core.ChannelsAnalysisService; import au.com.royalpay.payment.manage.analysis.mappers.CustomerAndOrdersStatisticsMapper; import com.alibaba.fastjson.JSONObject; @@ -28,6 +29,9 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { @Resource private CustomerAndOrdersStatisticsMapper customerAndOrdersStatisticsMapper; + @Resource + private MchChannelContractMapper mchChannelContractMapper; + @Override public List getChannelMount(JSONObject params) { /*if (!params.containsKey("client_ids") && !params.containsKey("org_id")){ @@ -37,6 +41,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { listChannel.add(putParam(params,"Wechat")); listChannel.add(putParam(params,"Alipay")); listChannel.add(putParam(params,"AlipayOnline")); + listChannel.add(putParam(params,"AlipayAps")); listChannel.add(putParam(params,"Rpay")); listChannel.add(putParam(params,"rpaypmt_card")); listChannel.add(putParam(params,"rpaypmt_dd")); @@ -50,7 +55,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { } List list = new ArrayList<>(); Map analysisMap = new TreeMap<>(); - String[] channels = {"Wechat","Alipay","AlipayOnline","Rpay","rpaypmt_card","rpaypmt_dd"}; + String[] channels = {"Wechat","Alipay","AlipayOnline","Rpay","rpaypmt_card","rpaypmt_dd","AlipayAps"}; for (String channel:channels){ analysisChannelCustomers(params, analysisMap, channel); } @@ -136,7 +141,11 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { params.put("gateway_alipay_online", 1); enablePartners = customerAndOrdersStatisticsMapper.countEnableChannel(params); params.remove("gateway_alipay_online"); - } else { + } + else if("AlipayAps".equals(name)){ + enablePartners=mchChannelContractMapper.sumEnablePartners(name); + } + else { params.put("enable_" + name.toLowerCase(), 1); enablePartners = customerAndOrdersStatisticsMapper.countEnableChannel(params); params.remove("enable_" + name.toLowerCase()); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java index a299e427d..fffa36212 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java @@ -1066,8 +1066,15 @@ public class PartnerManageController { * @return */ @ManagerMapping(value = "/{clientMoniker}/apply_alipayplus", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN}) - public MerchantApplicationResult applyAlipayPlusMerchant(@PathVariable String clientMoniker, @RequestBody ApsMerchantApplication apsMerchantApplication, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - return clientManager.alipayPlusRegisterMerchant(clientMoniker,apsMerchantApplication,manager); + public JSONObject applyAlipayPlusMerchant(@PathVariable String clientMoniker, @RequestBody ApsMerchantApplication apsMerchantApplication, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + MerchantApplicationResult result= clientManager.alipayPlusRegisterMerchant(clientMoniker,apsMerchantApplication,manager); + JSONObject jsonObject=new JSONObject(); + if(result.isSuccess()){ + jsonObject.put("result",true); + }else{ + jsonObject.put("result",false); + } + return jsonObject; } @ManagerMapping(value = "/{clientMoniker}/query/alipay_aps_online", method = RequestMethod.GET, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN}) diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml index 24eea92c2..c7c28353b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml @@ -344,6 +344,9 @@ ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.total ELSE 0 END),0) alipayonlineamount, ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders ELSE 0 END),0) alipayonline_order_count, ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'AlipayOnline',TRUE,NULL)),0) alipayonline_client_count, + ifnull(sum(CASE WHEN s.channel = 'AlipayAps' THEN s.total ELSE 0 END),0) alipayapsamount, + ifnull(sum(CASE WHEN s.channel = 'AlipayAps' THEN s.orders ELSE 0 END),0) alipayaps_order_count, + ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'AlipayAps',TRUE,NULL)),0) alipayaps_client_count, ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.total ELSE 0 END),0) hfamount, ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count, ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'hf',TRUE,NULL)),0) hf_client_count, diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js index 3a14cdab3..e2f138993 100644 --- a/src/main/ui/static/analysis/channels_analysis.js +++ b/src/main/ui/static/analysis/channels_analysis.js @@ -173,7 +173,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' trigger: 'axis' }, legend: { - data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额","HF Pay交易金额","Yeepay交易金额","LakalaPay交易金额","Card Payment交易金额","Direct Debit交易金额"], + data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额","HF Pay交易金额","Yeepay交易金额","LakalaPay交易金额","Card Payment交易金额","Direct Debit交易金额","Alipay+交易金额"], bottom: 0, height: '15%', width: '80%', @@ -185,7 +185,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' type: 'value' } ], - color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33","#66ff00","#00b0ec"] + color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33","#66ff00","#00b0ec","#8f4b2e","#87843b","#f8aba6"] }, xAxis: { basic: {type: 'category', boundaryGap: false}, @@ -301,6 +301,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' yAxisIndex: 0 }, column: {key: 'rpaypmt_dd.total'} + }, + { + basic: { + name: 'Alipay+交易金额', + type: 'line', + label: {normal: {show: true}}, + showAllSymbols: true, + showSymbol: true, + yAxisIndex: 0 + }, + column: {key: 'AlipayAps.total'} } ] }; @@ -311,7 +322,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' trigger: 'axis' }, legend: { - data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单","HF Pay交易订单","Yeepay交易订单","LakalaPay交易订单","Card Payment交易订单","Direct Debit交易订单"], + data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单","HF Pay交易订单","Yeepay交易订单","LakalaPay交易订单","Card Payment交易订单","Direct Debit交易订单","Alipay+交易订单"], bottom: 0, height: '15%', width: '80%', @@ -323,7 +334,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' type: 'value' } ], - color: ['#00a0e9','00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33","#66ff00","#00b0ec"] + color: ['#00a0e9','00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33","#66ff00","#00b0ec","#8f4b2e","#87843b","#f8aba6"] }, xAxis: { basic: {type: 'category', boundaryGap: false}, @@ -439,6 +450,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' yAxisIndex: 0 }, column: {key: 'rpaypmt_dd.orders'} + }, + { + basic: { + name: 'Alipay+交易订单', + type: 'line', + label: {normal: {show: true}}, + showAllSymbols: true, + showSymbol: true, + yAxisIndex: 0 + }, + column: {key: 'AlipayAps.orders'} } ] }; @@ -448,7 +470,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' trigger: 'axis' }, legend: { - data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价","HF Pay交易客单价","Yeepay交易客单价","LakalaPay交易客单价","Card Payment交易客单价","Direct Debit交易客单价"], + data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价","HF Pay交易客单价","Yeepay交易客单价","LakalaPay交易客单价","Card Payment交易客单价","Direct Debit交易客单价","Alipay+交易客单价"], bottom: 0, }, yAxis: [ @@ -457,7 +479,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' type: 'value' } ], - color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33","#66ff00","#00b0ec"] + color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33","#66ff00","#00b0ec","#8f4b2e","#87843b","#f8aba6"] }, xAxis: { basic: {type: 'category', boundaryGap: false}, @@ -573,6 +595,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' yAxisIndex: 0 }, column: {key: 'rpaypmt_dd.single_amount'} + }, + { + basic: { + name: 'Alipay+交易客单价', + type: 'line', + label: {normal: {show: true}}, + showAllSymbols: true, + showSymbol: true, + yAxisIndex: 0 + }, + column: {key: 'AlipayAps.single_amount'} } ] }; diff --git a/src/main/ui/static/analysis/templates/channels_analysis.html b/src/main/ui/static/analysis/templates/channels_analysis.html index d709513bc..3303d188d 100644 --- a/src/main/ui/static/analysis/templates/channels_analysis.html +++ b/src/main/ui/static/analysis/templates/channels_analysis.html @@ -140,8 +140,10 @@ - + Alipay+ @@ -159,21 +161,21 @@
    交易总金额变化趋势
    -
    订单数变化趋势
    -
    客单价变化趋势
    -
    diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html index 3b58fe431..f7477b847 100644 --- a/src/main/ui/static/analysis/templates/manage_customers_orders.html +++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html @@ -85,6 +85,8 @@ Ye