Commit Graph

1358 Commits

Author SHA1 Message Date
Michael RICOIS
580621fc43 cli to send reminder mail 2017-11-29 11:12:32 +01:00
Michael RICOIS
81ed63f2fb Prepare script 2017-11-28 17:14:35 +01:00
Michael RICOIS
39d6b1659e Merge branch 'ticket-14525-parrain' 2017-11-28 11:50:53 +01:00
Michael RICOIS
c6b1e3b1e3 Update if customer email is already sponsor before he's registring 2017-11-28 11:48:14 +01:00
Michael RICOIS
6c0ce3ca13 Merge branch 'ticket-14525-parrain' 2017-11-28 10:16:55 +01:00
Michael RICOIS
d4485178f0 Add error message 2017-11-28 10:11:34 +01:00
Marion Muszynski
74ef1e3173 Merge branch 'ticket-14829-FixEmails' 2017-11-27 10:45:22 +01:00
root
59f0826643 fixes for philea from prod 2017-11-23 15:06:35 +01:00
root
78bd7eb479 fixes from prod 2017-11-23 15:05:07 +01:00
Marion Muszynski
4044bc329c add email fixes 2017-11-23 11:10:24 +01:00
Marion Muszynski
3f9a62487a Merge branch 'ticket-14436-WP' 2017-11-22 16:33:45 +01:00
Marion Muszynski
8ae9fb7dd2 fix 2017-11-22 16:31:51 +01:00
Marion Muszynski
f567423f9b Merge branch 'fix-cache-privatesale_family_menu' 2017-11-21 14:14:42 +01:00
Marion Muszynski
da6a162fe6 fix 2017-11-21 14:12:21 +01:00
Marion Muszynski
15108dcd34 add cache for bestsellers 2017-11-21 14:10:00 +01:00
Michael RICOIS
3a058c3096 Merge branch 'ticket-14525-parrain' 2017-11-21 10:37:22 +01:00
Michael RICOIS
e580048c80 Fix condition to update properly sponsor with order or not 2017-11-21 10:35:23 +01:00
Marion Muszynski
acbc72a32c fix name of key 2017-11-21 10:21:19 +01:00
Marion Muszynski
b6283cf4ae fix futur sale query 2017-11-20 17:21:20 +01:00
Marion Muszynski
446308d40c cache privatesale menu 2017-11-20 17:12:58 +01:00
Marion Muszynski
5a9d780365 add 2 columns to excel 2017-11-17 11:16:30 +01:00
Michael RICOIS
150d86bc96 Merge branch 'ticket-14698-sensefuel' 2017-11-16 10:50:19 +01:00
Michael RICOIS
731857719b Temporary disable sensefuel display 2017-11-16 10:32:18 +01:00
Michael RICOIS
7ef207a6e3 Add README 2017-11-15 17:32:14 +01:00
Michael RICOIS
98f7319989 Intégration sensefuel 2017-11-15 17:31:44 +01:00
Michael RICOIS
5e678c403a Remove xml 2017-11-15 16:36:16 +01:00
Marion Muszynski
9bf6364b8a add supplier ref for sale stats BDC part 2017-11-15 13:01:03 +01:00
Michael RICOIS
71899c1dfb Original SenseFuel module 2017-11-15 12:47:01 +01:00
Marion Muszynski
1aaea6641b fix for ed from es version 2017-11-15 12:41:02 +01:00
Marion Muszynski
9b9b88610c Merge branch 'feature/api_return_url_paypal' into 'master'
Adding param to return paypal url instead of redirecting user

See merge request dev-antadis/bebeboutik!5
2017-11-15 11:48:10 +01:00
root
43a085d4ec push from prod 2017-11-15 10:34:51 +01:00
Christophe LATOUR
83daadd46b Adding param to return paypal url instead of redirecting user 2017-11-14 19:50:57 +01:00
Marion Muszynski
83171ab6c2 add a new delay 2017-11-14 17:09:17 +01:00
Michael RICOIS
6485f72d50 Change on mail 2017-11-14 11:37:30 +01:00
Michael RICOIS
b31f7276a3 Email translation 2017-11-14 11:37:29 +01:00
Michael RICOIS
9bd77a8b05 Date 2017-11-14 11:37:29 +01:00
Michael RICOIS
0fa2474ca5 Change date calc 2017-11-14 11:37:28 +01:00
Michael RICOIS
a606071d81 Add shippinBack info 2017-11-14 11:37:27 +01:00
Michael RICOIS
a6942a1356 Add a var when shipping is refund 2017-11-14 11:37:27 +01:00
Michael RICOIS
e6d8f9a70d Add new value to detect full refund 2017-11-14 11:37:26 +01:00
Michael RICOIS
facd10a417 New voucher after refund 2017-11-14 11:37:26 +01:00
Marion Muszynski
fe13931fbc flush sale cache before loading sales 2017-11-14 10:28:45 +01:00
Marion Muszynski
1fcc90846e Merge branch 'ticket-14485-UpdatePhilea' 2017-11-13 13:10:54 +01:00
Marion Muszynski
527b648246 add dropshipping parcel checking 2017-11-13 13:10:38 +01:00
Marion Muszynski
282a64d6d7 fix conflicts 2017-11-13 13:03:56 +01:00
Marion Muszynski
edb20ca02e fix ajax adminlogistics 2017-11-13 13:00:29 +01:00
Marion Muszynski
691b1043e0 fix query for philea log 2017-11-13 12:22:29 +01:00
Marion Muszynski
0ab3785715 fix log in adminLogistics 2017-11-13 12:20:58 +01:00
Marion Muszynski
82902b1fba add philea tracking 2017-11-13 12:12:39 +01:00
Marion Muszynski
8bf78bf282 fix script philea 2017-11-13 12:05:56 +01:00