Michael RICOIS
|
e246151eed
|
Merge branch 'master' into ticket-14273-voucher
|
2017-11-14 12:00:45 +01:00 |
|
Michael RICOIS
|
f26fe921ce
|
Fix mails not get from server
|
2017-11-14 11:48:12 +01:00 |
|
Michael RICOIS
|
613ac1b436
|
Merge branch 'ticket-14273-voucher' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket-14273-voucher
|
2017-11-14 11:39:54 +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
|
88fbc72f99
|
FR lang
|
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
|
f1922ec71c
|
Add mail template
|
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 |
|
Michael RICOIS
|
c261d04612
|
Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git
|
2017-11-14 11:36:16 +01:00 |
|
Michael RICOIS
|
c6ecfaa219
|
Add mail ES
|
2017-11-14 11:29:09 +01:00 |
|
Marion Muszynski
|
8639431591
|
Merge branch 'ticket-14760-BugNewsletter'
|
2017-11-14 10:28:59 +01:00 |
|
Marion Muszynski
|
fe13931fbc
|
flush sale cache before loading sales
|
2017-11-14 10:28:45 +01:00 |
|
Marion Muszynski
|
3a9f7ef77c
|
part 2 of inte
|
2017-11-13 17:13:07 +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
|
13769180b5
|
Merge branch 'ticket-14485-philea_2'
|
2017-11-13 13:01:50 +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 |
|
Michael RICOIS
|
82d2f15095
|
Change on mail
|
2017-11-13 12:07:43 +01:00 |
|
Marion Muszynski
|
8bf78bf282
|
fix script philea
|
2017-11-13 12:05:56 +01:00 |
|
Michael RICOIS
|
53f23fd5e5
|
Merge branch 'ticket-14666-appli-discount'
|
2017-11-13 11:25:33 +01:00 |
|
Michael RICOIS
|
339e5b4b18
|
Add function to detect request from api
|
2017-11-13 11:13:45 +01:00 |
|
Marion Muszynski
|
c208067f4e
|
Merge branch 'ticket-14436-WP'
|
2017-11-09 14:52:52 +01:00 |
|
Marion Muszynski
|
6330105f81
|
big inte of adminOrder view
|
2017-11-09 14:51:48 +01:00 |
|
Michael RICOIS
|
ccd3ebb1df
|
Merge branch 'ticket-14666-appli-discount'
|
2017-11-08 10:35:44 +01:00 |
|
Michael RICOIS
|
d9bd62dba7
|
Merge branch 'ticket-14525-parrain'
|
2017-11-08 09:52:16 +01:00 |
|
Michael RICOIS
|
60e3da5380
|
Traduction
|
2017-11-07 12:33:03 +01:00 |
|
Michael RICOIS
|
7dfa4d7cbe
|
Remove replacement
|
2017-11-07 12:17:20 +01:00 |
|
Marion Muszynski
|
b67c3f7300
|
fixe comma
|
2017-11-06 17:44:02 +01:00 |
|
Marion Muszynski
|
62485e0888
|
fix date format
|
2017-11-06 17:41:05 +01:00 |
|
Marion Muszynski
|
d782b3e157
|
fix format and more
|
2017-11-06 17:36:53 +01:00 |
|
Marion Muszynski
|
6a95069481
|
search in attributes
|
2017-11-06 16:51:48 +01:00 |
|
Michael RICOIS
|
7c2864d4a1
|
Fix forget check
|
2017-11-06 12:25:16 +01:00 |
|
Marion Muszynski
|
4e84124e85
|
Merge branch 'inte-white-fix'
|
2017-11-06 12:23:49 +01:00 |
|
Marion Muszynski
|
d2614d471f
|
fix
|
2017-11-06 12:14:54 +01:00 |
|
Marion Muszynski
|
6036bfd280
|
fix css carrier table
|
2017-11-06 12:06:14 +01:00 |
|
Michael RICOIS
|
2fb0bd187d
|
Discount only for applications
|
2017-11-06 12:00:30 +01:00 |
|
Marion Muszynski
|
f31e4d5fd6
|
fix style order conf detail tpl
|
2017-11-06 11:45:20 +01:00 |
|
root
|
cd73ae71a8
|
change bg and mtn img
|
2017-11-03 16:22:44 +01:00 |
|
root
|
ca67d6026a
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-11-03 16:21:03 +01:00 |
|
root
|
90cccba602
|
fix header swift from prod
|
2017-11-03 16:20:41 +01:00 |
|
Michael RICOIS
|
b2f2a0309e
|
Merge branch 'ticket-14139-delivery-poste'
|
2017-11-03 10:16:19 +01:00 |
|