4179 Commits (e5eb03cc2e9b1b93ed9a99fd1fb44f4ca0c0fb1e)

Author SHA1 Message Date
yixian 45fd54ee6f fix(settle ui): checkbox error
5 years ago
yixian 0639015bbf fix(settle ui): checkbox error
5 years ago
yixian 18bfcd4ca3 feat(settle ui): ui update
5 years ago
yixian 160003e4d3 feat(settle ui): ui update
5 years ago
yixian 15e0d5262b feat(settle ui): ui update
5 years ago
yixian ec2fff9cb4 feat(settle ui): 测试环境清算邮件增加TEST标记
5 years ago
yixian 33bb32c8e9 feat(settle ui): 清算发送UI修改
5 years ago
yixian 1df9609149 feat(settle ui): 清算发送勾选发送是否标记已发送
5 years ago
yixian 381e68467d feat(settle ui): 清算发送勾选发送是否标记已发送
5 years ago
yixian 61bd70e283 feat(settle ui): ui dockerfile
5 years ago
yixian 132b7e15ca feat(settle ui): ui dockerfile
5 years ago
yixian dc9b211ae3 feat(settle ui): 清算发送勾选发送批次,取消每日一次发送邮件限制,取消验证码
5 years ago
yixian 7ee7ababe1 feat(settle ui): 清算发送勾选发送批次,取消每日一次发送邮件限制,取消验证码
5 years ago
dulingling 2b921b92c3 Upd:添加指定商户消费者数据重生接口
5 years ago
dulingling b19d14ab7a Upd:添加指定商户消费者数据重生接口
5 years ago
dulingling 482bb9721d Upd:修改计算新老消费者人头数,每日数据生成逻辑
5 years ago
luoyang 5fb3e409da add shortname rsvc
5 years ago
luoyang 1e28b924ec fix 跨境商城app 测试
5 years ago
luoyang 381e26453c fix 跨境商城优化、gateway进件优化
5 years ago
luoyang 8bec790b96 add rsvc返回CompanyName
5 years ago
luoyang 30669c7413 add rsvc增加abn\acn字段
5 years ago
luoyang 1837cf3e80 add rsvc增加abn\acn字段
5 years ago
luoyang 497303cbfe fix gateway merchant transaction fee
5 years ago
luoyang 1df4b4b0a9 fix 优化商户增加营销联系人
5 years ago
luoyang 3f123eee41 add App 弹窗黑名单功能
5 years ago
luoyang 7575fb56b9 delete app not found test
5 years ago
liuxinxin f663749d51 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 7afb445dde 【R】 商户详情新增对接人信息
5 years ago
luoyang e4a0a4ebfa fix app boolean int
5 years ago
luoyang 85e0ae4a50 fix app boolean int
5 years ago
luoyang 370ea700ea fix app boolean int
5 years ago
luoyang 1088e2bbdc fix app 弹窗次数
5 years ago
luoyang 90aeded68c fix 跨境商城修改
5 years ago
luoyang 3cc9623569 fix 跨境商城修改
5 years ago
luoyang e32493f654 add 跨境商城RP付费扣款 增加扣款订单
5 years ago
luoyang 1433b9960f add popup增加显示次数控制
5 years ago
luoyang ccfabff97d add popup增加显示次数控制
5 years ago
luoyang 40cd2efb7b fix geek prod url
5 years ago
luoyang 140fe334ee fix geek act
5 years ago
liuxinxin 1193f70c05 【R】商户Invoice接口
5 years ago
luoyang 74d0ca7365 fix pom.xml
5 years ago
luoyang e26490808b fix 模糊查询
5 years ago
luoyang 72ff8eb390 add 弹窗+banner增加版本检测、商户端增加商户订单id、平台订单模糊查询、交易流水增加search框
5 years ago
luoyang e69c031067 fix 活动页新增枚举popup
5 years ago
luoyang 42e03548dd fix 活动页新增枚举popup
5 years ago
luoyang f4201385da fix 跨境商城使用详情页面
5 years ago
luoyang c735bc500f fix 跨境商城使用详情页面
5 years ago
luoyang 963dbc7040 add 开店状态通知、app扫码接口增加source参数
5 years ago
luoyang 20200198c8 add app弹窗运营修改
5 years ago
luoyang a31f127c26 add App扫码同时单点登录跨境商城
5 years ago
luoyang ff5a3cbc46 fix 商服弹窗只针对pine开放
5 years ago
taylor.dang 1155160248 AP进件
5 years ago
luoyang fb436d375a fix transflow pdf clientIds
5 years ago
luoyang 0c7afb545c fix transflow clientIds
5 years ago
luoyang b53dbf98dc add 单点登录、app通用弹窗接口
5 years ago
dulingling 4b3a940c18 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
5 years ago
dulingling 365516cb03 Upd:运营端消费者排名排序
5 years ago
luoyang 4da54d7219 fix 跨境商城扣款接口
5 years ago
dulingling 96b5139d97 Upd:运营端用户数据分析增加金额于订单量删选排序
5 years ago
luoyang 2d8fdaece4 fix maven cache
5 years ago
luoyang 3342b331e5 fix rServer listen
5 years ago
luoyang 4fabe349cd fix summary下载20条问题
5 years ago
luoyang 4bb094afa0 fix summary下载20条问题
5 years ago
luoyang 0b0161f7a3 fix 进件api删除多余行业,增加RsvcServer接口
5 years ago
taylor.dang 332bb249aa fix
5 years ago
taylor.dang 0af4bac9ee ignore
5 years ago
taylor.dang 94073272f1 ignore
5 years ago
taylor.dang 68c4af820b [Y] 商户新增禁止显示子商户选项开关
5 years ago
luoyang d12af68c4a fix gateway error message
5 years ago
luoyang cdc151b7ee add 子商户分页
5 years ago
liuxinxin 31cdea2303 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 7d7c3d53c4 [Rp] 子商户分页
5 years ago
luoyang 1f607ffa4b fix url pom.xml
5 years ago
luoyang 33723c228c fix controller org
5 years ago
luoyang ac20d64c6a fix dev controller class
5 years ago
luoyang 934ae97579 fix revert api doc文档
5 years ago
luoyang 44e44af0bb add gateway 商户进件相关功能
5 years ago
yixian 922d9c3d9c Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 1f20c0f34e 清算文件合并
5 years ago
taylor.dang 5b1bb5d48c remove redpack mp
5 years ago
luoyang 246ef08ab8 1.3.24 增加surcharge_rate 字段,后续未调整
5 years ago
taylor.dang 0582321556 [Y] 新增禁止查询level3商户开关
5 years ago
yixian d19bc70a16 presettle undo processing
5 years ago
dulingling 073df7b0ee Upd:客户订单交易数据修改为无交易也显示日期
5 years ago
taylor.dang 86a754451c remove alipay loginid
5 years ago
taylor.dang 05e57f0592 update
5 years ago
liuxinxin 21d7513222 [R] fix
5 years ago
liuxinxin 947609278d [R] 开发工具 查询报关情况
5 years ago
luoyang 2d47d888b3 fix order source
5 years ago
luoyang 1fe36f7429 fix order source
5 years ago
luoyang 4ac279ebac fix divers修复
5 years ago
luoyang ee1e41f66b add kyc update
5 years ago
luoyang 9da043de5c add 清算表格增加dev remark
5 years ago
liuxinxin bc49f7667d [R] fix
5 years ago
yixian e5b2015fef Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 36bb909d06 update apns certificate
5 years ago
taylor.dang b2e5392b69 fix BD prize bug
5 years ago
liuxinxin 83f089979c [R] fix
5 years ago
luoyang 6d36bd329c fix 第一次kyc材料商户过滤
5 years ago
yixian c0004b6f82 apn message cert
5 years ago
yixian d7cae44e8a app message sending api update
5 years ago
yixian 233701e450 app message sending api update
5 years ago
yixian c1ee861a7a Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 473b965151 app message sending api update
5 years ago
liuxinxin cc383d474b [R] APP端接口调整
5 years ago
dulingling 0404b35b1f Add:添加支付宝支付页面
5 years ago
yixian 5ea3a11d87 app message sending api update
5 years ago
liuxinxin d8424f736f [R] 接口调整
5 years ago
liuxinxin c34427c24e [R] APP端接口调整
5 years ago
liuxinxin 073fa81ccd Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 8af398e674 [R] 接口调整
5 years ago
taylor.dang 633736fadc [Y] 报关
5 years ago
liuxinxin 1fac5ac08c Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 7b0e172c50 [R] APP端接口调整
5 years ago
yixian 4c975e8485 csv charset fix
5 years ago
yixian 3b6db8dff5 ui update
5 years ago
yixian 50f92d69cb export csv
5 years ago
liuxinxin b35e33fc0a [R] APP端接口调整
5 years ago
luoyang 87e686c1b5 fix kyc notify
5 years ago
luoyang fa7e289d51 fix wx notify
5 years ago
luoyang 8b02624f62 Merge branch 'develop_T1249' into develop
5 years ago
luoyang 362c081020 add 内部测试
5 years ago
duLingLing c71b44eef4 Add:新增微信支付页面
5 years ago
luoyang 71b80bae57 fix wx notify
5 years ago
luoyang 5dbfe62631 fix rservice apply notify i18n
5 years ago
luoyang 81ef18360a fix rservice apply
5 years ago
luoyang 2691047d15 add 合规审核R-services扣款申请,接收来自Rservices的扣款申请推送
5 years ago
liuxinxin b2e548c672 [R] APP端接口
5 years ago
liuxinxin 9c46e24f90 [R] 优化
5 years ago
liuxinxin 6513f627f8 [R] 细节优化
5 years ago
liuxinxin 514cfa899f [R]fix
5 years ago
liuxinxin db1f6275e5 [R] fix
5 years ago
liuxinxin 2f9a2b46ef [R] 弹窗优化
5 years ago
luoyang 073bba4e5a fix 优化前端代码
5 years ago
luoyang 8e8781c7e2 fix 优化获取原合同接口
5 years ago
liuxinxin 14d0ec1b5f [R] PASS
5 years ago
luoyang 2d3e1709a1 fix 优化获取文件接口
5 years ago
liuxinxin bbcdf0f0ac [R]只能提交一张
5 years ago
liuxinxin fe20ca1f1c [R]合规审核页面三级路由
5 years ago
liuxinxin 3c093c8857 [R]KCY认证Web端开发
5 years ago
liuxinxin 4fff0e0de6 [R]KCY认证Web端开发
5 years ago
luoyang ffc7c56810 add 优化前端代码,增加三级路由
5 years ago
luoyang 9a44943177 fix ui
5 years ago
liuxinxin edca1fef29 [R]商户信息添加KYC文件展示
5 years ago
duLingLing f906f0d9c8 Upd:修复提供接口错误字段
5 years ago
luoyang 0d5c44d26f add 增加按钮跳转、bd上传文件修复
5 years ago
liuxinxin 79193155b2 [R]fix
5 years ago
luoyang 801aab3d83 fix 优化前端代码
5 years ago
luoyang eca84799a1 fix 优化前端代码
5 years ago
luoyang 05b882b5f1 fix 位置迁移,优化合规审核页面
5 years ago
taylor.dang eea73c3b20 [Y] R service新增参数 & 修改清算文件
5 years ago
luoyang 8457814c0d add 增加bd handle textarea 完善bd帮助流程
5 years ago
luoyang adc653509b add 优化代码、增加BD端handle操作(无法提供文件原因未完善、提交操作未核验)
5 years ago
liuxinxin d466f2fc0f [R]KCY认证Web端开发
5 years ago
luoyang 9eeb3070f0 fix 进度条初始位置
5 years ago
luoyang 40b36c432a add 商户KYC认证进度百分比
5 years ago
liuxinxin e2d411b60f [R]KCY认证Web端开发
5 years ago
luoyang 97effc720b add 商户申请BD帮助后,邮件推送、微信推送
5 years ago
luoyang 6daa0cf640 add 商户kyc进度
5 years ago
duLingLing bcafcdcb29 Upd:服务提供spms读取数据结构查询条件
5 years ago
liuxinxin 0b7616f212 [R]KCY认证Web端开发
5 years ago
liuxinxin 024d2ae611 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin c71203450d [R] Merchant Id Applicaitons fix
5 years ago
yixian e2ba914c1c Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 24f3a628cd documents update
5 years ago
duLingLing ddb9f1a8d2 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
5 years ago
duLingLing 98309e68b1 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 87b472f489 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 28e6bcc2f1 [R] R Services fix
5 years ago
duLingLing 5ad67054eb Upd:商户交易流水,订单列表增加第三方设备筛选条件
5 years ago
taylor.dang a4e001c3ec [Y] R service 加密参数
5 years ago
liuxinxin 7e613dffde [R] R Services fix
5 years ago
taylor.dang e173e25dcf [Y] R service 加密参数格式
5 years ago
taylor.dang 9ac244038a [Y] R service 加密参数
5 years ago
duLingLing 3b46cf5926 Upd:商户端清算文件,交易流水清算文件,变更显示数据类型样式
5 years ago
duLingLing 5c6e1c1b9c Upd:还原代码
5 years ago
duLingLing 8eacb056dc Upd:修复App用户退出后依然会接收推送消息问题
5 years ago
duLingLing 136ff975a6 Upd:修改提供Geekpayment-API返回字段名称
5 years ago
duLingLing 5a6d97e0af Add:对极客商服提供查询商户详情API
5 years ago
duLingLing f5b6fe34ff Add:对极客商服提供查询商户详情API
5 years ago
duLingLing ca6b6dbe24 Upd:修復交易排名數據五刷新
5 years ago
duLingLing 178532831d Upd:日报表KPI修改BD团队数量统计,由统计原领队商户量,更改为统计团队商户量
5 years ago
duLingLing a50dbd66a9 Upd:修改RService未开通渠道显示判断
5 years ago
duLingLing 9dd67049ee Upd:注释易宝相关代码
5 years ago
duLingLing c3b505e8f9 Upd:修改RService无图片替换图片
5 years ago
duLingLing 7bae858219 Upd:完善清算导出清算汇总Excel
5 years ago
duLingLing 5cf5935f06 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
5 years ago
duLingLing cb9be3d7ef Add:清算增加导出信息,父商户包含子商户时,导出多张sheet
5 years ago
liuxinxin d772ce912f 【R】R Service fix
5 years ago
luoyang 36c6d99d84 Merge branch 'devlop-T1125-R-Rervice' into develop
5 years ago
luoyang 81f7c0d10c fix incremental rate
5 years ago
duLingLing bf4b32545b Upd:添加缺损注释
5 years ago
duLingLing 7a124c015c Upd:修改排版
5 years ago
duLingLing 9372017ff8 Upd:RService-LOGO修改布局
5 years ago
liuxinxin 210d064495 [R] R Services fix
5 years ago
liuxinxin b51a9760ef [R] R Services fix
5 years ago
luoyang 642adc007f fix ui
5 years ago
duLingLing dd4635e55d Upd:修復RService详情页刷新丢失数据问题
5 years ago
duLingLing e997842879 Upd:修復RService详情页刷新丢失数据问题
5 years ago
liuxinxin caeae03bbf 【R】商户端&运营端订单source处理 fix
5 years ago
luoyang 0f35761f6b fix ui
5 years ago
duLingLing f72ab6e8d5 Upd:交易流水查看timezone空指针异常处理
5 years ago
luoyang 9476f376a1 fix ui
5 years ago
liuxinxin dee6c95a51 Merge remote-tracking branch 'origin/devlop-T1125-R-Rervice' into devlop-T1125-R-Rervice
5 years ago
liuxinxin a1da428d56 【R】商户端&运营端订单source处理 fix
5 years ago
duLingLing e5950e81e2 Upd:调整R Service 管理页面样式
5 years ago
liuxinxin 8c70b3fc87 【R】商户端&运营端订单source处理 fix
5 years ago
duLingLing 63f12caff6 Upd:商户端WEB,APP查询数据异常
5 years ago
duLingLing 451310fc22 Upd:商户端WEB,APP查询数据异常修复
5 years ago
liuxinxin 1054f018b0 【R】商户端&运营端订单source处理
5 years ago
duLingLing a8f659549c Upd:交易流水查看条件-日期无进行时区转换问题
5 years ago
duLingLing f7c049a2d6 Upd:App查看交易流水汇总异常处理
5 years ago
duLingLing 29873c5006 修改商户端增值服务列表样式
5 years ago
duLingLing 4da2eb338a Upd:添加显示条件,根据条件显示不同布局
5 years ago
duLingLing 0e4901bfb3 Upd:商户端增值渠道信息查看
5 years ago
duLingLing 3b8cfdbea5 Merge branch 'develop_T1140' of https://pms.globalfreepay.com/source/royalpay.manage into devlop-T1125-R-Rervice
5 years ago
liuxinxin fbf83fcb35 【R】商户端&运营端订单source处理
5 years ago
duLingLing efc63cc373 R-service
5 years ago
luoyang d6074bc055 fix source_agree_file 排序问题
5 years ago
duLingLing f4834125cc Upd:添加Gateway子分类
5 years ago
yixian f85e3e5334 documents update
5 years ago
yixian fccea0db9c export excel columns add settle date, settle amount, total surcharge, GST
5 years ago
luoyang 3a50fc9dee fix 客户支付手续费导致提成组织成本手续费高
5 years ago
duLingLing d40b65ba6f Upd:登录识别字段由OpenId变更为unionId,微信不同平台相同识别字段为unionid
5 years ago
liuxinxin 87324141db 【R】自定义费率fix
5 years ago
duLingLing 7f871d1aa4 Upd:添加新闻增加标题字段,该字段只针对news创建使用
5 years ago
duLingLing 214195b24d UPD:修复商户-用户账号绑定异常问题
5 years ago
duLingLing f31d50c1e6 UPD:修复商户-用户账号绑定异常问题
5 years ago
duLingLing 5ba4873bfa Upd:修复管理端微信绑定查询已绑定用户报错问题
5 years ago
liuxinxin ded82ea5d9 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 8a363e3ed6 【R】签订合同弹窗fix
5 years ago
luoyang 2212a02829 fix 商户手机号 size>0
5 years ago
liuxinxin 78ddd81bbc 【R】广告位屏蔽同行业商户 fix
5 years ago
liuxinxin a7463fa4cc Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 64ea8a5d62 【R】广告位屏蔽同行业商户
5 years ago
luoyang 794e637559 fix customer_surcharge_rate 未通过也可以设置
5 years ago
luoyang e3211c89fa fix findAccountByPhone
5 years ago
luoyang 3363146993 fix findAccountByPhone查到多条记录
5 years ago
luoyang bdba35af67 fix 恢复注释
5 years ago
duLingLing 1a304a9fd5 UPD:修改微信确定绑定,优先校验用户名密码
5 years ago
duLingLing ac6f9877e1 刪除ip限定
5 years ago
luoyang 0db2b3a576 add 自助进件调整
5 years ago
duLingLing 4fd9de60e8 个人设置新增接收解绑发送验证码接口
5 years ago
duLingLing 5a1dec2a47 个人设置新增接收解绑发送验证码接口
5 years ago
duLingLing 5315d8ddbc Upd:修改个人设置短信验证码发送接口
5 years ago
duLingLing 13df0df1c1 Upd:修改错误名称
5 years ago
luoyang 6260572efc fix 微信子商户号申请
5 years ago
yixian 4df8c788c3 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 05c485b4d5 serverless trigger, add loggers
5 years ago
luoyang 209fc9454c fix merchant_application.js
5 years ago
luoyang bfeeb11ad9 fix merchant_application.js
5 years ago
yixian 9f389e322e serverless trigger
5 years ago
luoyang 082a9d2d31 add 自助进件调整
5 years ago
luoyang 38d959e20c Merge branch 'develop_T1068_client_apply' into develop
5 years ago
luoyang 306c4b0ecc fix 自助优化
5 years ago
liuxinxin 8e12972f89 【R】自助进件业务接口开发
5 years ago
luoyang d47d99fccc fix sms手机短信开通后实现位置
5 years ago
liuxinxin b980d5f3f5 【R】自助进件业务接口开发
5 years ago
liuxinxin 32c0d229cd 【R】自助进件业务接口开发
5 years ago
luoyang 8ed8bef8f6 Merge remote-tracking branch 'origin/develop_T1068_client_apply' into develop_T1068_client_apply
5 years ago
luoyang cde203a969 fix 自助进件优化
5 years ago
liuxinxin b6cff2105c 【R】自助进件业务接口开发
5 years ago
luoyang 3546e8e3b7 fix 自助进件优化
5 years ago
luoyang bd6e58ee3b add app自助进件优化
5 years ago
luoyang 231e19ea2f fix pom
5 years ago
luoyang 515fc8ca91 add 自助进件优化
5 years ago
duLingLing bce2dae124 TradeLogs 添加商户数统计修改显示图标
5 years ago
duLingLing 7501bbbd2c TradeLogs 添加商户数统计修改显示图标
5 years ago
duLingLing 5c7d632ffb TradeLogs 添加商户数统计
5 years ago
liuxinxin e27155f776 【R】自助进件业务接口开发
5 years ago
luoyang 29283b0066 fix App时区
5 years ago
luoyang 4b1939fb9f fix App时区
5 years ago
liuxinxin 6876bf752b 【R】自助进件业务接口开发
5 years ago
liuxinxin 9cb5da5816 【R】自助进件业务接口开发
5 years ago
luoyang c839f31b97 fix app夏令时
5 years ago
luoyang ef764cc2f8 add 广告位屏蔽同行业 1.2.47
5 years ago
liuxinxin f228d3acc3 【R】广告位屏蔽同行业商户
5 years ago
luoyang 9e11d4d2d8 fix app时区
5 years ago
yixian f544aba171 cache details
5 years ago
duLingLing 79d207bbdd Upd删除多余代码
5 years ago
yixian 850090b0be add logger for RetailAppMessage sender api
5 years ago
duLingLing 60e59c538f Upd:App微信绑定字段增加union_id
5 years ago
duLingLing c4ac20095e Upd:新增查询微信绑定获取微信详情名称
5 years ago
luoyang 9c68bd9f8f fix same info只对合规和风控开放
5 years ago
duLingLing a6845d6c3c Upd:App用户个人设置绑定手机发送短信,手机国家编码字段处理
5 years ago
luoyang 6c0cd35c52 fix 自助进件提交合规
5 years ago
duLingLing 028d764b5a Merge branch 'develop_T1068_client_apply' of https://pms.globalfreepay.com/source/royalpay.manage into develop_T1068_client_apply
5 years ago
duLingLing 13d1d8faa9 Upd:还原配置信息
5 years ago
duLingLing d05bde6eb8 Upd:APP用户设置绑定解绑手机、微信
5 years ago
duLingLing b315f23776 Upd:APP用户设置绑定解绑手机、微信
5 years ago
luoyang 19079ef390 fix notify bd 对自助申请显示
5 years ago
luoyang 685a6df62b add 邮件密码 sysconfig表
5 years ago
liuxinxin 9c395906c8 【R】自助进件业务接口开发
5 years ago
yixian 56f15a2244 api for sending message to royalpay apps
5 years ago
duLingLing c19ecc816f Upd:app设置微信手机,绑定、解绑功能
5 years ago
liuxinxin b254d278cc 【R】自助进件业务接口开发
5 years ago
luoyang f9feb9dbca update 合同联系方式字段
5 years ago
duLingLing 19229e1da4 Merge branch 'develop' into develop_T1068_client_apply
5 years ago
duLingLing ed2acd46a8 Add:手机、微信登录
5 years ago
liuxinxin 4ba5ca0fe3 【R】自助进件业务接口开发
5 years ago