Marion Muszynski
|
f773e845aa
|
addition of pack id in cart quantities to check pack availability
|
2016-11-28 11:01:38 +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
|
bed6cbcd76
|
fix missing var
|
2016-11-23 13:04:37 +01:00 |
|
Marion Muszynski
|
5578bac1ae
|
addition for packs management
|
2016-11-23 12:57:33 +01:00 |
|
Marion Muszynski
|
c1fcfb5f85
|
Merge branch 'ticket-11756-DelayInConfirmationMail'
|
2016-11-22 11:58:38 +01:00 |
|
Marion Muszynski
|
8b7875fdb0
|
adaptation of delivery message in confirmation mail
|
2016-11-22 11:51:16 +01:00 |
|
Marion Muszynski
|
05fe2fe40b
|
Merge branch 'ticket-11557-FixLinkSaleCategory'
|
2016-11-21 17:57:20 +01:00 |
|
Marion Muszynski
|
5c5ea81e90
|
comment of insert in ps_product_ps_cache in livestats cron
|
2016-11-21 17:56:57 +01:00 |
|
Marion Muszynski
|
66f778116a
|
Merge branch 'add-css-privatesales'
|
2016-11-21 16:30:44 +01:00 |
|
Marion Muszynski
|
1e6dd3ddda
|
css modification and addition of shipping column
|
2016-11-21 16:29:22 +01:00 |
|
Marion Muszynski
|
ec7d73696b
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 15:34:34 +01:00 |
|
Marion Muszynski
|
2dceab8015
|
fix for classic sale
|
2016-11-21 15:26:46 +01:00 |
|
Marion Muszynski
|
ee2c243bc8
|
Merge branch 'ticket-11210-imageVP'
|
2016-11-21 15:06:58 +01:00 |
|
Marion Muszynski
|
a224bfd940
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 13:01:13 +01:00 |
|
Marion Muszynski
|
c2b5077efe
|
fix
|
2016-11-21 12:56:12 +01:00 |
|
Marion Muszynski
|
66bdae1aef
|
prevent combination of sale exp classic and sale exp before noel
|
2016-11-21 12:45:20 +01:00 |
|
Marion Muszynski
|
2ee444b269
|
Merge branch 'ticket-11211-MultiDeleteImg'
|
2016-11-21 10:36:20 +01:00 |
|
Marion Muszynski
|
8ec2a6ba21
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 10:18:38 +01:00 |
|
Marion Muszynski
|
2057327981
|
Merge branch 'add-module-privatesales_shipping'
|
2016-11-21 10:11:54 +01:00 |
|
Marion Muszynski
|
83d3523000
|
addition of module for privatesales shipping
|
2016-11-21 10:11:27 +01:00 |
|
Marion Muszynski
|
603045e422
|
Merge branch 'ticket-11247-MailParrainageFix'
|
2016-11-21 10:07:44 +01:00 |
|
Marion Muszynski
|
a8cb07e932
|
remove mail sending for log
|
2016-11-21 10:07:20 +01:00 |
|