lyt
|
862c859af1
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
81fb2dbcba
|
fix
|
6 years ago |
cyc
|
ffd18182c6
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
cyc
|
73a554defa
|
修改接收回调
|
6 years ago |
|
lyt
|
024e3cf4f1
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
d6b07cd425
|
feat: Trippest支持酒店
|
6 years ago |
|
lyt
|
228ee42ef4
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
215575ad59
|
feat: 预审核增加更新数据
|
6 years ago |
|
lyt
|
16ab3a122d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
80a397afcb
|
fix: Trippest 同步订单的状态更新
|
6 years ago |
|
cyc
|
d2497d51e3
|
添加回调
|
6 years ago |
|
lyt
|
22e8d6fe4e
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
de9ec9ee90
|
fix: PayPal set invoice
|
6 years ago |
|
lyt
|
6b9c8f1324
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
0e86157c80
|
feat: PayPal APP组的IPN通知转发
|
6 years ago |
|
lyt
|
244488db18
|
feat: PayPal APP组的IPN通知转发
|
6 years ago |
|
lyt
|
d712319653
|
fix: report tour: tourProvider
|
6 years ago |
|
lyt
|
79de9c2fc2
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
9b48d400af
|
fix: 修改同步订单取消的状态
|
6 years ago |
|
lyt
|
bfe01dbf36
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
e572952107
|
fix: Trippest团的报价币种
|
6 years ago |
|
lyt
|
6f6552666d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
0f88a69652
|
feat: 列出未更新的数据
|
6 years ago |
|
lyt
|
75eb7e5990
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
636dd4bed8
|
fix: 海纳report_tour tour_cost sum by vendor
|
6 years ago |
|
lyt
|
a79cfc7109
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
2d10c6aafd
|
fix: 财务表成本和实际成本,排除设为无效的团
|
6 years ago |
|
lyt
|
07091fe3f5
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
0166e701fc
|
feat: PayPal增加显示留言,备注
|
6 years ago |
|
lyt
|
2cdd2da50d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
45958aa271
|
feat: 预审核提示
|
6 years ago |
|
lyt
|
4c86c71d73
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
6704ea9dfd
|
feat: 预审核提示
|
6 years ago |
|
lyt
|
de2031e472
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
5bc0c6525a
|
feat: 自动更新成本总额和账单不一致的团成本
|
6 years ago |
|
lyt
|
bd9bdba994
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
996f76f6de
|
feat: 自动更新成本排除已审核的团
|
6 years ago |
|
lyt
|
ec1abbac48
|
feat: Trippest账单,自动更新
|
6 years ago |
|
lyt
|
3face9b8e4
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
7f690b7dfe
|
删除report_tour相同的cold_sn
|
6 years ago |
|
lyt
|
73357c9065
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
a5841a4854
|
财务表成本数据注释
|
6 years ago |
|
lyt
|
15f24f9862
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
e7668536c1
|
feat: 构建同步数据的汇总表, 和图兰朵财务完全一致
|
6 years ago |
|
lyt
|
43a810d143
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
6d38dd790e
|
fix: APP 组PayPal
|
6 years ago |
|
lyt
|
14c1417038
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
9824d959ea
|
fix: APP组PayPal收款
|
6 years ago |
|
lyt
|
6ddeca772b
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
35a828d42b
|
feat: 日语商务订单未分配的收款通知发日语客服邮箱
|
6 years ago |
|
lyt
|
61614f25d8
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
773bf0a244
|
fix: 生成单团财务表
|
6 years ago |
|
lyt
|
34cdc00125
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
e8ec226c34
|
feat: 审核长账单提示
|
6 years ago |
|
lyt
|
cc74b5bacf
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
02b128ca2c
|
feat: 汇总表计算
|
6 years ago |
|
cyc
|
d1a089c6be
|
修改值班表
|
6 years ago |
|
lyt
|
3fe50fcefd
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
9aac977ad9
|
fix: 组团社团号被修改;多地订单未过滤已删除
|
6 years ago |
|
lyt
|
63cbaa21b7
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
ebac9054dc
|
..
|
6 years ago |
|
lyt
|
74449d8639
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
b8b3d129ac
|
fix: 删除重复无效的拼团号
|
6 years ago |
|
lyt
|
ef6b918f13
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
7d5d3c62d2
|
fix: 产品没有默认供应商
|
6 years ago |
|
cyc
|
9a81241ce3
|
修改模板
|
6 years ago |
|
lyt
|
3df0db106e
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
b8dee45108
|
fix: 桂林地接同步订单的客人类别默认成人
|
6 years ago |
|
lyt
|
9751e4de9d
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
61ed0768b8
|
fix: wxpay notice
|
6 years ago |
|
cyc
|
55a9a3666d
|
部署钉钉提交审批
|
6 years ago |
|
lyt
|
32ad56c451
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
a851b6def6
|
fix: 去除重复拼团号的空值
|
6 years ago |
|
lyt
|
5a96b07c04
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
463ba24da8
|
fix: 查到多个订单号时按照是否有效订单排序
|
6 years ago |
|
lyt
|
659f92d6c2
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
9045f8d89f
|
fix: APP订单号错误, 含HTML
|
6 years ago |
|
lyt
|
eae987674e
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
528bba3c48
|
fix: 退款未导入修正传统团的查询
|
6 years ago |
|
lyt
|
c2d62595b2
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
7aac50850d
|
feat:wxpay send
|
6 years ago |
|
lyt
|
fe46f903f0
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
eb25db079a
|
feat:Trippest自动核查成本:不排除TA奖励团
|
6 years ago |
|
lyt
|
da7e8443b1
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
c9a8049fbc
|
feat: Trippest预审核:数据正常的提示
|
6 years ago |
|
lyt
|
dce8e008ba
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
e5550c4702
|
feat: Trippest预审核:数据正常的提示
|
6 years ago |
|
lyt
|
a84b86851d
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
6939c7cb6f
|
feat: 收款后标记订单成行
|
6 years ago |
|
lyt
|
ad3b5ae5dc
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
ecaa281214
|
feat: PayPal处理webhook推送, IPN未收到结果
|
6 years ago |
|
lyt
|
09facead1b
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
2f112ac48b
|
fix: 不排除无效订单
|
6 years ago |
|
lyt
|
3f121d0d7d
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
4b9bc60606
|
feat: Trippest计划:区分是否按综费结算
|
6 years ago |
|
lyt
|
565d354045
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
d746fab3a9
|
fix: 排除无效订单
|
6 years ago |
|
lyt
|
4af14f4b92
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
5cd5555c7e
|
fix: 排除无效订单
|
6 years ago |
|
lyt
|
2a0b1bba79
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
43f0fae7b7
|
Trippest账单:拼团订单包含取消团
|
6 years ago |
|
lyt
|
3f29751074
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
206e00279d
|
Trippest账单:查询订单的条件调整
|
6 years ago |
|
lyt
|
6e40036573
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
d1a853b81a
|
Trippest账单: 缺少产品信息的团
|
6 years ago |
|
lyt
|
3e8d1d8e83
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
b665c5679d
|
fix: 匹配传统订单时,原订单含有空格
|
6 years ago |
|
lyt
|
5d6815aab2
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
4bb504224e
|
feat: PayPal获取记录信息
|
6 years ago |
|
lyt
|
3ce1f53948
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
eb3d97d6b8
|
移动端样式
|
6 years ago |
|
cyc
|
b4e418d83a
|
修改错误
|
6 years ago |
|
cyc
|
6dffc9da13
|
添加短信记录到瀚特
|
6 years ago |
|
cyc
|
cd31e6f814
|
部署短信发送
|
6 years ago |
|
lyt
|
875e8cf6cb
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
a751733e6c
|
fix: iPaylinks邮件语种
|
6 years ago |
|
lyt
|
951d6604e5
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
19a42d10d3
|
fix: iPaylinks邮件语种
|
6 years ago |
|
lyt
|
63e6fe3881
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
d0bfe5876b
|
fix: iPaylinks邮件语种
|
6 years ago |
|
lyt
|
364c9ca89a
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
c39b322136
|
feat: 未确认的不同步但是更新时间
|
6 years ago |
|
lyt
|
7030ed4fb4
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
59ee9d682e
|
fixed: Trippest同步: 解决团号相同但地接订单号不同
|
6 years ago |
|
lyt
|
8aca2e9d02
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
a25a468b31
|
feat: 财务导出的明细: 修正重复团号的总成本
|
6 years ago |
|
lyt
|
546776496c
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
76a427d38c
|
feat: PayPal导出收款记录: 先指定币种
|
6 years ago |
|
lyt
|
cbee255f1c
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
1cb0b7152d
|
fix: Trippest: 未确认的同步订单不更新
|
6 years ago |
|
lyt
|
7a3dc6e706
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
ebfbc0ff3b
|
fix: js jq v1.9+ mise error
|
6 years ago |
|
lyt
|
7ca9c3ddca
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
71622c87b3
|
fix: WeChatPay 页面bug
|
6 years ago |
|
lyt
|
b79ed067ec
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
2ba826c8af
|
feat: Trippest账单: 财务表的拼团总成本对比实际拼团总成本
|
6 years ago |
|
lyt
|
726b7d0ae9
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
eb7e1b35ab
|
fix: 同个产品拼多次
|
6 years ago |
|
lyt
|
6b7dc66dd4
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
734a6b9c7f
|
fix: PayPal状态=completed的所有退款行为
|
6 years ago |
|
lyt
|
ff30c959da
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
98ef4396de
|
feat: Trippest账单解决不同地接社拼团号相同等问题
|
6 years ago |
|
lyt
|
bae5ac730a
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
aaff926ab0
|
fix: PayPal:APP组没有交易号的情况处理
|
6 years ago |
|
lyt
|
364223f229
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
a93abccc03
|
fix: PayPal:APP组没有交易号的情况处理
|
6 years ago |
|
lyt
|
5e8bae61db
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
cbbf93c03a
|
feat: iPaylinks refund APP组
|
6 years ago |
|
lyt
|
f841d333f6
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
16bdae5534
|
修复表格
|
6 years ago |