Marion Muszynski
|
a3f697a0be
|
fix conflict
|
2016-11-30 12:42:16 +01:00 |
|
Marion Muszynski
|
2ac3271169
|
ajusting autocomplete ajax_product search
|
2016-11-30 12:40:27 +01:00 |
|
Marion Muszynski
|
a8045cfefa
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-30 11:38:34 +01:00 |
|
Marion Muszynski
|
807bd6d30e
|
add log mail
|
2016-11-30 11:38:16 +01:00 |
|
Marion Muszynski
|
5f30b92b59
|
send all the products of multi order in one time
|
2016-11-30 11:35:55 +01:00 |
|
Marion Muszynski
|
80e4f47026
|
Merge branch 'ticket-10657-PhileaFixStatusCMD'
|
2016-11-30 10:55:13 +01:00 |
|
Marion Muszynski
|
56ee44f425
|
fix selected orders according status
|
2016-11-30 10:55:00 +01:00 |
|
Marion Muszynski
|
a7ef41d688
|
Merge branch 'fix-fatal-braderie'
|
2016-11-29 16:25:28 +01:00 |
|
Marion Muszynski
|
8427307701
|
fix fatal toold for tools
|
2016-11-29 16:25:14 +01:00 |
|
Marion Muszynski
|
7571bc08f6
|
Merge branch 'ticket-10657-PhileaPacks' into develop
|
2016-11-28 17:08:04 +01:00 |
|
Marion Muszynski
|
0dc8db8d58
|
addition of packs
|
2016-11-28 17:07:43 +01:00 |
|
Marion Muszynski
|
5e4b33c56d
|
Merge branch 'ticket-11199-RebuildNewsletter' into develop
|
2016-11-28 15:24:43 +01:00 |
|
Marion Muszynski
|
71532fef30
|
adjusting img
|
2016-11-28 15:24:27 +01:00 |
|
Marion Muszynski
|
c8464f4ec1
|
Merge branch 'ticket-11210-update' into develop
|
2016-11-28 14:36:03 +01:00 |
|
Marion Muszynski
|
e8df7cedba
|
update to load es img with fr img
|
2016-11-28 14:34:52 +01:00 |
|
Marion Muszynski
|
47b4df918f
|
modif xml for rss changement
|
2016-11-28 14:10:04 +01:00 |
|
Marion Muszynski
|
6cadb48ed7
|
Merge branch 'ticket-11784-QtyInShoppingCart'
|
2016-11-28 12:04:17 +01:00 |
|
Marion Muszynski
|
b8e6780110
|
Merge branch 'ticket-11784-QtyInShoppingCart' into develop
|
2016-11-28 12:02:59 +01:00 |
|
Marion Muszynski
|
51e0ed8589
|
fix bug update product quantity in cart
|
2016-11-28 12:02:39 +01:00 |
|
Marion Muszynski
|
8c087ed509
|
Merge branch 'ticket-10657-PhileaPacks' into develop
|
2016-11-28 11:02:22 +01:00 |
|
Marion Muszynski
|
f773e845aa
|
addition of pack id in cart quantities to check pack availability
|
2016-11-28 11:01:38 +01:00 |
|
Marion Muszynski
|
2c3293199c
|
Merge branch 'fix-fatal-mobile' into develop
|
2016-11-28 10:05:59 +01:00 |
|
Marion Muszynski
|
e29e97e7bd
|
Merge branch 'fix-tpl-delivery_date' into develop
|
2016-11-28 10:05:26 +01:00 |
|
Marion Muszynski
|
8e5a4202f3
|
Merge branch 'fix-fatal-mobile'
|
2016-11-25 18:50:53 +01:00 |
|
Marion Muszynski
|
cfdab3cc09
|
error cause of id_product for product_id
|
2016-11-25 18:50:38 +01:00 |
|
Marion Muszynski
|
a5b9a2cc9a
|
Merge branch 'fix-fatal-mobile'
|
2016-11-25 18:45:25 +01:00 |
|
Marion Muszynski
|
ddad6db847
|
fix tpl order-detail
|
2016-11-25 18:45:07 +01:00 |
|
Marion Muszynski
|
7e7072c600
|
Merge branch 'fix-tpl-delivery_date'
|
2016-11-25 16:30:42 +01:00 |
|
Marion Muszynski
|
ebdc095cec
|
fix smarty
|
2016-11-25 16:30:18 +01:00 |
|
Marion Muszynski
|
d743c38f62
|
Merge branch 'ticket-7768-UpdateSAV'
|
2016-11-25 11:56:20 +01:00 |
|
Marion Muszynski
|
fc38b7d684
|
fix pre selection
|
2016-11-25 11:56:05 +01:00 |
|
Marion Muszynski
|
b9231ae7ec
|
Merge branch 'ticket-7768-UpdateSAV'
|
2016-11-25 11:51:09 +01:00 |
|
Marion Muszynski
|
cc725c4d89
|
fix changement delivery address
|
2016-11-25 11:50:52 +01:00 |
|
Marion Muszynski
|
2e1329ec87
|
Merge branch 'ticket-7768-UpdateSAV'
|
2016-11-25 11:42:25 +01:00 |
|
Marion Muszynski
|
10f30ee3e7
|
fix conflicts
|
2016-11-25 11:41:38 +01:00 |
|
Marion Muszynski
|
afa5bc8d65
|
fix update shipping address
|
2016-11-25 11:39:44 +01:00 |
|
Marion Muszynski
|
8e1ecc46d4
|
Merge branch 'ticket-11756-DelayInConfirmationMail'
|
2016-11-25 11:20:52 +01:00 |
|
Marion Muszynski
|
c0f59bc7d4
|
fix
|
2016-11-25 11:18:54 +01:00 |
|
Marion Muszynski
|
e6ece21cf5
|
Merge branch 'ticket-7768-UpdateSAV'
|
2016-11-25 10:59:36 +01:00 |
|
Marion Muszynski
|
19b28d1e13
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:56:48 +01:00 |
|
Marion Muszynski
|
420f2d870c
|
fix trad
|
2016-11-25 10:56:23 +01:00 |
|
Marion Muszynski
|
fb7a9616ff
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:53:08 +01:00 |
|
Marion Muszynski
|
5d963638fa
|
fix
|
2016-11-25 10:52:50 +01:00 |
|
Marion Muszynski
|
3a630a0d93
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:49:27 +01:00 |
|
Marion Muszynski
|
0e6992f29b
|
changement delivery date estimation
|
2016-11-25 10:49:10 +01:00 |
|
Marion Muszynski
|
d8df8aa34b
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-24 16:34:33 +01:00 |
|
Marion Muszynski
|
f10191c8f3
|
addition of payment method
|
2016-11-24 16:34:12 +01:00 |
|
Marion Muszynski
|
d1874af03f
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-24 16:23:55 +01:00 |
|
Marion Muszynski
|
74f0ab876e
|
fix
|
2016-11-24 16:23:28 +01:00 |
|
Marion Muszynski
|
3ecf54cfcc
|
fix conflicts
|
2016-11-24 16:05:44 +01:00 |
|