Marion Muszynski
|
6ab7e66316
|
Merge branch 'ticket-14735-NewExpe'
|
2017-11-15 10:29:48 +01:00 |
|
Marion Muszynski
|
d6d2cc5298
|
Merge branch 'ticket-14735-NewExpe' into develop
|
2017-11-15 10:29:15 +01:00 |
|
Marion Muszynski
|
05e4f94e48
|
add flag in product tpl
|
2017-11-15 10:29:07 +01:00 |
|
Marion Muszynski
|
a9fa8826a5
|
Merge branch 'ticket-14735-NewExpe' into develop
|
2017-11-15 10:23:37 +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
|
2571a14fec
|
Merge branch 'ticket-14735-NewExpe'
|
2017-11-14 17:29:30 +01:00 |
|
Marion Muszynski
|
4d1435ade8
|
add new delay flag
|
2017-11-14 17:29:16 +01:00 |
|
Marion Muszynski
|
394f1a1fef
|
Merge branch 'ticket-14735-NewExpe'
|
2017-11-14 17:17:57 +01:00 |
|
Marion Muszynski
|
fe0c0ad177
|
Merge branch 'ticket-14735-NewExpe' into develop
|
2017-11-14 17:09:37 +01:00 |
|
Marion Muszynski
|
83171ab6c2
|
add a new delay
|
2017-11-14 17:09:17 +01:00 |
|
Michael RICOIS
|
f4a99c98b7
|
Merge branch 'ticket-14273-voucher' into develop
Conflicts:
mails/es/account.html
|
2017-11-14 12:18:35 +01:00 |
|
Michael RICOIS
|
455cfeff90
|
Translate
|
2017-11-14 12:15:48 +01:00 |
|
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
|
c555236e2f
|
Merge branch 'refonte-adminOrderTpl' into develop
|
2017-11-13 17:13:23 +01:00 |
|
Marion Muszynski
|
3a9f7ef77c
|
part 2 of inte
|
2017-11-13 17:13:07 +01:00 |
|
Marion Muszynski
|
0ea19438a0
|
Merge branch 'fix-SaleClass' into develop
|
2017-11-13 15:29:01 +01:00 |
|
Marion Muszynski
|
7bafa646e4
|
getting categories by cache in getProducts
|
2017-11-13 15:28:46 +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
|
ae6cec83f0
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 13:00:42 +01:00 |
|
Marion Muszynski
|
edb20ca02e
|
fix ajax adminlogistics
|
2017-11-13 13:00:29 +01:00 |
|
Marion Muszynski
|
a55c33204d
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-11-13 12:22:45 +01:00 |
|
Marion Muszynski
|
691b1043e0
|
fix query for philea log
|
2017-11-13 12:22:29 +01:00 |
|
Marion Muszynski
|
cb5e77ad86
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 12:21:12 +01:00 |
|
Marion Muszynski
|
0ab3785715
|
fix log in adminLogistics
|
2017-11-13 12:20:58 +01:00 |
|
Marion Muszynski
|
410e281451
|
Merge branch 'ticket-14485-philea_2' into develop
|
2017-11-13 12:12:55 +01:00 |
|
Marion Muszynski
|
82902b1fba
|
add philea tracking
|
2017-11-13 12:12:39 +01:00 |
|
Marion Muszynski
|
b22ccef249
|
fix conflict
|
2017-11-13 12:07:59 +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
|
dd3b834e44
|
Merge branch 'ticket-14666-appli-discount' into develop
|
2017-11-13 11:14:30 +01:00 |
|