780 Commits

Author SHA1 Message Date
Marion Muszynski
8df93121a8 continuing pack management 2016-12-05 10:13:27 +01:00
Marion Muszynski
192cd79a6b continuing packs 2016-12-02 15:34:57 +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
ed6002b84b gift management 2016-12-02 10:15:51 +01:00
Marion Muszynski
49801ef6e5 turn 500 code to 404 2016-11-30 17:57:00 +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
56ee44f425 fix selected orders according status 2016-11-30 10:55:00 +01:00
Marion Muszynski
8427307701 fix fatal toold for tools 2016-11-29 16:25:14 +01:00
Marion Muszynski
0dc8db8d58 addition of packs 2016-11-28 17:07:43 +01:00
Marion Muszynski
e8df7cedba update to load es img with fr img 2016-11-28 14:34:52 +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
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
ef27ddd7af changement sentences according delivery delay 2016-11-24 11:59:20 +01:00
Marion Muszynski
d9feec4ffe addition of db to log action from employee 2016-11-23 16:33:55 +01:00
Marion Muszynski
ae340630cc fix send command 2016-11-23 15:55:51 +01:00
Marion Muszynski
31d77b1d60 fix cron to send articles to philea 2016-11-23 15:19:50 +01:00
Marion Muszynski
5578bac1ae addition for packs management 2016-11-23 12:57:33 +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
1e6dd3ddda css modification and addition of shipping column 2016-11-21 16:29:22 +01:00
Marion Muszynski
ee2c243bc8 Merge branch 'ticket-11210-imageVP' 2016-11-21 15:06:58 +01:00
Marion Muszynski
8ec2a6ba21 Merge branch 'ticket-10657-PhileaMulti' 2016-11-21 10:18:38 +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
Marion Muszynski
9836172e29 addition of privatesales_shipping module 2016-11-18 12:11:41 +01:00
Marion Muszynski
58dbc97845 adjusting in adminPhilea 2016-11-18 12:09:00 +01:00
Marion Muszynski
8d414f71fd Merge branch 'ticket-11123-FixSimilarProducts' 2016-11-18 11:13:28 +01:00
Marion Muszynski
d91720a2d4 adapt the modif to thumb img 2016-11-18 10:54:38 +01:00
Marion Muszynski
78737caa39 fix to prevent email sending to bebeboutik.com 2016-11-18 10:04:06 +01:00
Marion Muszynski
4ac4753900 begining of updatings 2016-11-18 09:50:04 +01:00
Marion Muszynski
99a30df8b2 remove mail sending 2016-11-17 10:27:53 +01:00
Marion Muszynski
4abd6f0d5c fix id_lang 2016-11-16 17:39:18 +01:00
Marion Muszynski
3a0ba4c19e addition of email checking 2016-11-16 16:33:07 +01:00
Marion Muszynski
31ea35e160 selection only a specific category_family 2016-11-16 15:50:39 +01:00
Marion Muszynski
4f9add049e addition redirect to all forms 2016-11-15 11:48:52 +01:00