Marion Muszynski
|
54fbe60f8e
|
Merge branch 'fix-updateStateWhenOrderManuallyValidation'
|
2016-12-02 10:49:16 +01:00 |
|
Marion Muszynski
|
3393afc1a9
|
fix to update current state when an order is manually validated
|
2016-12-02 10:37:09 +01:00 |
|
Marion Muszynski
|
2cc1997ce1
|
Merge branch 'fix-fatal-braderieCode'
|
2016-11-30 17:57:13 +01:00 |
|
Marion Muszynski
|
49801ef6e5
|
turn 500 code to 404
|
2016-11-30 17:57:00 +01:00 |
|
Marion Muszynski
|
b249fc5905
|
Merge branch 'ticket-11902-AddTagManager'
|
2016-11-30 14:48:05 +01:00 |
|
Marion Muszynski
|
d3564a0a5e
|
addition of goggle tag manager code
|
2016-11-30 14:15:48 +01:00 |
|
Marion Muszynski
|
5da84d6aa3
|
Merge branch 'fix-fatal-ajax_product_list'
|
2016-11-30 12:58:42 +01:00 |
|
Marion Muszynski
|
98a00dc459
|
fix on deletion
|
2016-11-30 12:58:26 +01:00 |
|
Marion Muszynski
|
770c917cb5
|
Merge branch 'fix-fatal-ajax_product_list'
|
2016-11-30 12:55:07 +01:00 |
|
Marion Muszynski
|
284aeb5903
|
fix img
|
2016-11-30 12:53:19 +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
|
6cadb48ed7
|
Merge branch 'ticket-11784-QtyInShoppingCart'
|
2016-11-28 12:04:17 +01:00 |
|
Marion Muszynski
|
51e0ed8589
|
fix bug update product quantity in cart
|
2016-11-28 12:02:39 +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
|
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
|
420f2d870c
|
fix trad
|
2016-11-25 10:56:23 +01:00 |
|
Marion Muszynski
|
5d963638fa
|
fix
|
2016-11-25 10:52:50 +01:00 |
|
Marion Muszynski
|
0e6992f29b
|
changement delivery date estimation
|
2016-11-25 10:49:10 +01:00 |
|
Marion Muszynski
|
f10191c8f3
|
addition of payment method
|
2016-11-24 16:34:12 +01:00 |
|
Marion Muszynski
|
74f0ab876e
|
fix
|
2016-11-24 16:23:28 +01:00 |
|
Marion Muszynski
|
c17fb91c63
|
addition of orders selection and css modif
|
2016-11-24 16:04:13 +01:00 |
|
Marion Muszynski
|
f7bc910547
|
Merge branch 'ticket-10657-SentenceBoxAddToCart'
|
2016-11-24 11:59:45 +01:00 |
|
Marion Muszynski
|
ef27ddd7af
|
changement sentences according delivery delay
|
2016-11-24 11:59:20 +01:00 |
|
Marion Muszynski
|
8cbb4d3f2e
|
Merge branch 'add-tableToLogAction'
|
2016-11-23 16:37:03 +01:00 |
|
Marion Muszynski
|
d9feec4ffe
|
addition of db to log action from employee
|
2016-11-23 16:33:55 +01:00 |
|
Marion Muszynski
|
6446727818
|
Merge branch 'ticket-10657-PhileaFixCron'
|
2016-11-23 15:56:09 +01:00 |
|
Marion Muszynski
|
ae340630cc
|
fix send command
|
2016-11-23 15:55:51 +01:00 |
|
Marion Muszynski
|
9597c70898
|
Merge branch 'ticket-10657-PhileaFixCron'
|
2016-11-23 15:20:07 +01:00 |
|
Marion Muszynski
|
31d77b1d60
|
fix cron to send articles to philea
|
2016-11-23 15:19:50 +01:00 |
|
Marion Muszynski
|
c1fcfb5f85
|
Merge branch 'ticket-11756-DelayInConfirmationMail'
|
2016-11-22 11:58:38 +01:00 |
|