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 |
|
cyc
|
9601bc543d
|
修改登录的调整地址
|
6 years ago |
|
cyc
|
136681861a
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
cyc
|
5a6fdc71b7
|
修改value系统调用登录验证的方式
|
6 years ago |
|
lyt
|
e742f17f74
|
Merge branch 'feature/plan-auto-send-Trippest'
|
6 years ago |
|
lyt
|
070869a620
|
去掉走团日期的查询条件,供应商平台默认是不勾选走团日期的
|
6 years ago |
|
lyt
|
cd627869be
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
lyt
|
aec661af43
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
f2f81d8ffa
|
同步订单不指定供应商id;原因:发送到图兰朵的计划,返回时操作部门没有正确设置,会导致重复
|
6 years ago |
|
cyc
|
172dcfc57c
|
修改cookie调用
|
6 years ago |
|
cyc
|
1a6a670c7f
|
修改遗漏cookie
|
6 years ago |
|
cyc
|
24f345b3c8
|
修改语法错误
|
6 years ago |
|
cyc
|
4b19c7194d
|
修改语法错误
|
6 years ago |
|
cyc
|
83ad7134c2
|
修改页面中调用cookie的地方
|
6 years ago |
|
cyc
|
5eed08993e
|
修改回调地址
|
6 years ago |
|
cyc
|
1d46973548
|
value 系统部署新的登录验证
|
6 years ago |
|
lyt
|
ef4404723c
|
Merge branch 'feature/plan-auto-send-Trippest'
|
6 years ago |
|
lyt
|
f7d5582c2d
|
返回成功给回执
|
6 years ago |
|
lyt
|
4bba9f3a00
|
Merge branch 'feature/plan-auto-send-Trippest'
|
6 years ago |
|
lyt
|
a19c382735
|
删除调试的日志输出
|
6 years ago |
|
lyt
|
b0ace1a79a
|
准备发送的计划:仅查询Trippest的团计划[未接收,未确认,未取消,未删除,未变更,已发送到供应商平台]
|
6 years ago |
|
lyt
|
b1ad61d8c6
|
更新仅Trippest计划发送
|
6 years ago |
|
lyt
|
81e2232698
|
删除原写入订单的代码;
|
6 years ago |
|
lyt
|
2925a16d08
|
代收团款填入: 结算团款,代收团款
|
6 years ago |
|
lyt
|
2d29fde054
|
用房标准填:入住人,入住日期;抵达/返程航车: 酒店(上/下车地点)中英文名称
|
6 years ago |
|
lyt
|
a74faf9e34
|
客人查询订单信息, 字符串编码修正
|
6 years ago |
|
lyt
|
2cd1e4d442
|
修改读取存储过程结果
|
6 years ago |
|
lyt
|
a95c277411
|
发送线路订单计划, 含测试输出
|
6 years ago |
|
lyt
|
00e75cee39
|
Merge branch 'feature/plan-auto-send-Trippest'
|
6 years ago |
|
lyt
|
fdde102b12
|
仅Trippest计划发送
|
6 years ago |
|
lyt
|
c34a4083e6
|
Trippest计划根据产品判断是否PVT
|
6 years ago |
|
lyt
|
10c54e3e04
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
736b5b6b04
|
Trippest同步:自营订单收款方不一致提示
|
6 years ago |
|
lyt
|
64b15017de
|
PayPal收款记录的客人名字字段
|
6 years ago |
|
lyt
|
1435e9f97e
|
PayPal detail优先IPN的结果>WH
|
6 years ago |
|
lyt
|
c8aac323fc
|
push tour 增加客人手机号
|
6 years ago |
|
lyt
|
35694a51af
|
测试push tour
|
6 years ago |
|
lyt
|
2fa7a57834
|
Merge branch 'feature/plan-auto-send-Trippest'
|
6 years ago |
|
lyt
|
e1113c1a0e
|
仅Trippest计划发送
|
6 years ago |
|
lyt
|
094424d6bc
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
lyt
|
5e2177f14b
|
修改ipaylinks通知记录的查询
|
6 years ago |
|
lyt
|
646578dc50
|
[测试]线路订单:不发送团款对象;不发送变更;
|
6 years ago |
尹诚诚
|
e8a6594d76
|
修复在线开机
|
6 years ago |
|
尹诚诚
|
9322a9fdb1
|
修复在线开机
|
6 years ago |
|
尹诚诚
|
046634e0aa
|
mycht搜索修复
|
6 years ago |
|
lyt
|
e065c87dcb
|
PayPal导出不含WH记录
|
6 years ago |
|
lyt
|
8f9888e609
|
修改ipaylinks通知记录的查询
|
6 years ago |
|
lyt
|
677fd65730
|
iPaylinks的APP组退款订单号处理
|
6 years ago |
|
lyt
|
a73ca7f7e2
|
修改信息上报调用供应商方法
|
6 years ago |
|
lyt
|
203a3842ec
|
全局变量:收款方:桂林海纳国旅
|
6 years ago |
|
lyt
|
bd5bbdf1ed
|
供应商方法移到libraries;团款和代收分别合并的修正;日志记录已发送的产品编号;
|
6 years ago |
|
lyt
|
322a2f0c3e
|
PayPal webhook没有付款人信息,先跳过
|
6 years ago |
|
lyt
|
689f6aa3b2
|
PayPal webhook没有付款人信息,先跳过
|
6 years ago |
|
lyt
|
ba3fe2686f
|
PayPal 修正退款变更发送状态后的查询条件
|
6 years ago |
|
lyt
|
6bac4d5e13
|
paypal note sort
|
6 years ago |
|
lyt
|
ef10c8c0e6
|
PayPal webhook录入但不重复发邮件
|
6 years ago |
|
lyt
|
ec5d45c245
|
PayPal webhook缺少付款人字段
|
6 years ago |