lyt
|
6cc206dd50
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
c1243a793c
|
触发财务的退款通知
|
6 years ago |
cyc
|
83e4c35d50
|
修改value系统
|
6 years ago |
syh101
|
9c25284b04
|
确认信链接指向本地:
|
6 years ago |
|
syh101
|
5baea42a5a
|
修改地址
|
6 years ago |
|
syh101
|
09cb6df129
|
将确认信链接指向本地:
|
6 years ago |
|
lyt
|
290b4d4a04
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
236758c0db
|
地接计划:今天发的急单
|
6 years ago |
|
lyt
|
24e39c7e3b
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
d9a0818137
|
地接计划:相同日期不同行程类型的拆分
|
6 years ago |
|
lyt
|
e070c0d781
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
9ac653dccd
|
APP组的后缀A, 支持查询录入状态和转移记录
|
6 years ago |
|
lyt
|
339e9851fd
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
e886059f98
|
地接计划:分销预订Trippest产品问题
|
6 years ago |
|
lyt
|
dc8b3b4f89
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
057cb6ec09
|
Trippest同步订单:更新启程和结束日期
|
6 years ago |
|
lyt
|
82ddd2b24e
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
42d881a2b2
|
bug
|
6 years ago |
|
lyt
|
ecda33efa9
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
cd7d16197c
|
Alipay账单的APP退款,更新发送状态
|
6 years ago |
|
lyt
|
ecfbc1c0cf
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
445676d267
|
Alipay账单的处理,不发送以前的邮件
|
6 years ago |
|
lyt
|
706809d978
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
a1af22ee13
|
Alipay下载账单不重复写入note
|
6 years ago |
|
lyt
|
1f0148634e
|
Alipay APP退款处理
|
6 years ago |
|
lyt
|
1f7e9e20bf
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
4c8f3fb867
|
Alipay 账单中的APP交易
|
6 years ago |
|
lyt
|
aa6dec8709
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
ad583f130e
|
Alipay下载对账单
|
6 years ago |
|
lyt
|
c95f3a1c18
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
1b5433e16f
|
curl日志
|
6 years ago |
|
lyt
|
469f11c082
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
47b7f20573
|
地接计划:增加客人年龄计算
|
6 years ago |
|
lyt
|
c594b96b6b
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
f2b9dae2cb
|
地接计划: 商务组的tour设为团队
|
6 years ago |
|
lyt
|
b4d3c9f628
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
4e2ece1a67
|
退款:出团时间在上月底之前的需要发送财务
|
6 years ago |
|
lyt
|
8f84fd36fb
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
21a481dc82
|
Trippest财务表:fixed团名长度
|
6 years ago |
|
lyt
|
d6f38f4547
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
c07aa33676
|
地接计划:fixed客人年龄计算
|
6 years ago |
|
lyt
|
606f8fce0f
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
a55af92516
|
通知处理的url在配置文件
|
6 years ago |
|
lyt
|
263c4e97ba
|
wxpay:下载账单之后即调用通知处理
|
6 years ago |
|
lyt
|
943dca639d
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
c991d022a6
|
地接计划:客人生日信息仅日期
|
6 years ago |
|
lyt
|
001958356c
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
6c9e9af87c
|
地接计划:每个客人的国籍;酒店预订和日期填入用房标准;线路信息中的酒店只取名称
|
6 years ago |
|
lyt
|
391dc435fe
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
3072931a46
|
地接计划:客人信息只留一个人的电话;增加性别补充在其他信息中
|
6 years ago |
|
lyt
|
d963ef7eb3
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
638946cb85
|
地接计划:fixed客人信息姓名字段bug
|
6 years ago |
|
lyt
|
312d4c4704
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
c458e0e5b5
|
删除覆盖
|
6 years ago |
|
lyt
|
6a79badf2f
|
地接计划:增加生日,国籍, 护照有效期
|
6 years ago |
|
lyt
|
88ab354418
|
地接计划: 传统团:发送导游备注.
|
6 years ago |
|
lyt
|
6639ba83e9
|
Merge branch 'feature/plan-auto-send-release' into feature/plan-auto-send
|
6 years ago |
|
lyt
|
524f2d3753
|
地接计划:订票业务名称修改;传统团导游备注生成
|
6 years ago |
|
lyt
|
ca18b92155
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
4baf1b8808
|
增加客源地;增加客人手机号
|
6 years ago |
|
lyt
|
57d23be77d
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
a54d4370bf
|
地接计划:fixed 首站城市在通宵火车或接机时为空问题
|
6 years ago |
|
lyt
|
4bd5ee8d5a
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
11da5662e6
|
不发邮件的更新关闭状态
|
6 years ago |
|
lyt
|
a3bf74621f
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
c8afb70029
|
去掉默认的订单类型后缀
|
6 years ago |
|
lyt
|
9234b75c33
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
492438c8d2
|
地接计划:发送在等待第一次发送时就有变更的
|
6 years ago |
|
lyt
|
7b9de7c068
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
55d57090de
|
Trippest生成财务表:数据库插入错误
|
6 years ago |
|
lyt
|
c9ba7e356f
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
3257e3b905
|
Trippest生成财务表:数据库插入错误
|
6 years ago |
|
lyt
|
07f28fa89e
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
0a9bd19874
|
Trippest生成财务表:数据库插入错误
|
6 years ago |
|
lyt
|
f1db10cbe2
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
82e46d30c4
|
发送状态显示
|
6 years ago |
|
lyt
|
13cbdb81b5
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
c4d75daeea
|
增加是否发送邮件;记录列表的发送状态
|
6 years ago |
|
lyt
|
b51e380297
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
b40e1022b3
|
PayPal 先用着http
|
6 years ago |
|
lyt
|
df3dfdbab6
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
0236bd9cf2
|
汇总记录链接
|
6 years ago |
|
lyt
|
7ea294e0da
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
984673bf2f
|
设置timeout
|
6 years ago |
|
lyt
|
ba28c405e7
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
32a865b1e8
|
curl error
|
6 years ago |
|
lyt
|
1d4c03539c
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
37bfed48ef
|
wxpay 下载账单; 不发送邮件
|
6 years ago |
|
lyt
|
0881313005
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
77cf193cb8
|
地接计划:待发送:所有未发团的
|
6 years ago |
|
lyt
|
154d893048
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
cce44f594b
|
微信账单:修改资金账户字段; PayPal:修改pn_sn
|
6 years ago |
|
lyt
|
67b67e0cad
|
wxpay 下载账单存入note
|
6 years ago |
|
lyt
|
f3b08ea123
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
403e626b20
|
地接计划:Trippest计划预订了多地项目导致重复发送问题
|
6 years ago |
|
lyt
|
4fe31d65c6
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
5e0d9dab8f
|
地接计划:商务订单计划更新发送状态
|
6 years ago |
|
lyt
|
f5c05858f7
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
daee15dc6a
|
地接计划:排除已发送的
|
6 years ago |
|
lyt
|
87ea52513d
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
ad8c957db9
|
计划发送:fixed火车票订单没有离团日期
|
6 years ago |
|
lyt
|
322a5815ef
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
84ee424dd3
|
fixed无行程的日期导致数据不全
|
6 years ago |
|
lyt
|
e4dd87d92d
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
cd4a253551
|
允许发送指定团指定地接社的计划
|
6 years ago |
|
lyt
|
0b1cdb6c9f
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
30f57c8942
|
fixed Notice
|
6 years ago |
|
lyt
|
a60e02b4f0
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
176d1313fd
|
设置已发送的指定sn
|
6 years ago |
|
lyt
|
11056aa03b
|
merge conflict
|
6 years ago |
|
lyt
|
a3f6c368d4
|
从未录入的开始
|
6 years ago |
|
lyt
|
c9b121618c
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
lyt
|
6d1aab2736
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
959c3bf25f
|
修复获取的客人信息:邮箱为空
|
6 years ago |
|
cyc
|
84ef311c4a
|
修改名字调用
|
6 years ago |
|
cyc
|
6c55628650
|
修改语法错误
|
6 years ago |
|
cyc
|
2175cf42da
|
同上错误
|
6 years ago |
|
cyc
|
a6c03cbc1f
|
多了一个分号
|
6 years ago |
|
cyc
|
3d9c91624d
|
修改视图层调用cookie
|
6 years ago |
|
cyc
|
cba5bd1c61
|
删除验证
|
6 years ago |
|
cyc
|
c01d2464d0
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
cyc
|
2ff2ace2c7
|
修改别更session名后出现的bug
|
6 years ago |
|
lyt
|
c985263813
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
2e0a3cac9a
|
修复distinct重复问题
|
6 years ago |
|
cyc
|
4fd416bd2a
|
修改错误
|
6 years ago |
|
cyc
|
fafedc0004
|
更换一个session的名字，强制所有用户重新登录一次，排除昨天出现的邮件发送出错
|
6 years ago |
|
cyc
|
9477e31853
|
修改value系统验证失败后跳转的地址
|
6 years ago |
|
cyc
|
2152cc838c
|
删除错误的记录
|
6 years ago |
|
lyt
|
5fcf2aa43f
|
merge from master
|
6 years ago |
|
lyt
|
260efab852
|
Merge branch 'feature/plan-auto-send-Trippest'
|
6 years ago |
|
lyt
|
3c1f127bab
|
团名修改;用房标准,订单备注修改;操作部门指定
|
6 years ago |
|
lyt
|
2a825354eb
|
测试
|
6 years ago |
|
lyt
|
4f01fdcccf
|
released 1.0
|
6 years ago |
|
lyt
|
e34abd70d6
|
团名修改;修复多日行程和连续日期的补充日期冲突问题
|
6 years ago |
|
lyt
|
949d641f38
|
删除测试代收/付的备注
|
6 years ago |
|
lyt
|
67c7ca982b
|
merge from master
|
6 years ago |
|
lyt
|
16b638e2a3
|
PayPal的撤销付款,须手动触发通知(按退款流程处理)
|
6 years ago |
|
lyt
|
a63efa6aaa
|
BIZ备注;操作部门完整名称;[测试代收备注,待删除]
|
6 years ago |
|
lyt
|
3c6d0920f1
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
lyt
|
a1d2964946
|
paypal退款的外联名字
|
6 years ago |
|
lyt
|
fcda1aa567
|
获取BIZ计划发送
|
6 years ago |
|
cyc
|
32621386ab
|
修改点赞后出现cookie记录错误
|
6 years ago |
|
cyc
|
657f8d2e57
|
错误删掉一行代码
|
6 years ago |
|
cyc
|
cb05e2ae76
|
修改value系统bug
|
6 years ago |
|
cyc
|
18d6e5e789
|
修改cookie错误
|
6 years ago |
|
cyc
|
6e273afa34
|
修改ajax传参
|
6 years ago |
|
cyc
|
3ff9bca3b8
|
添加汇率
|
6 years ago |
|
lyt
|
f0b7765b47
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
lyt
|
50867b9dea
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
b9929d7651
|
设置时间,获取3月份Trippest团成本
|
6 years ago |