708 Commits

Author SHA1 Message Date
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
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
Marion Muszynski
a5629eb2c7 adjusting mobile version 2016-11-14 14:19:28 +01:00
Marion Muszynski
492740d02d fix the name of forms 2016-11-14 10:58:28 +01:00
Marion Muszynski
7cee5d97c4 Merge branch 'ticket-11557-FixLinkSaleCategory' 2016-11-10 16:26:13 +01:00
Marion Muszynski
a13a8813ea comment sending mail 2016-11-10 16:25:56 +01:00
Marion Muszynski
e34bef4bd2 small fix 2016-11-10 16:09:09 +01:00
Marion Muszynski
ca38824e83 restriction on liston and listoff 2016-11-10 10:36:14 +01:00
Marion Muszynski
9a9a222552 simplification of img uploaded in privatesale 2016-11-09 17:50:41 +01:00
Marion Muszynski
e71c932a21 Merge branch 'ticket-11557-FixLinkSaleCategory' 2016-11-09 11:22:11 +01:00
Marion Muszynski
a1f1eca990 addition of mail sending to check bad behaviours 2016-11-09 11:19:05 +01:00
Marion Muszynski
669067bc5c Merge branch 'ticket-ChangeDeliveryAddress' 2016-11-08 16:11:24 +01:00
Marion Muszynski
ec2694f052 addition of country restriction 2016-11-08 16:09:41 +01:00
Marion Muszynski
e88cab6df2 addition of module for many config 2016-11-08 14:58:29 +01:00
Marion Muszynski
54427ea473 new delay added in choice in ps management 2016-11-07 15:35:15 +01:00
Marion Muszynski
10c666cc1b Merge branch 'ticket-ChangeDeliveryAddress' 2016-11-07 10:59:02 +01:00
Marion Muszynski
c8c40f93dd Merge branch 'ticket-AideContact-SAV' 2016-11-04 13:08:16 +01:00
Marion Muszynski
537eb9f490 other fix 2016-11-04 13:08:00 +01:00
Marion Muszynski
8836f67ef6 Merge branch 'ticket-AideContact-SAV' 2016-11-04 13:05:40 +01:00
Marion Muszynski
576e99292e good fix this time 2016-11-04 13:05:25 +01:00
Marion Muszynski
9ec6071f71 Merge branch 'ticket-AideContact-SAV' 2016-11-04 13:03:46 +01:00
Marion Muszynski
21b2da29d6 fix for front 2016-11-04 13:03:15 +01:00
Marion Muszynski
2d7ce553b1 Merge branch 'ticket-AideContact-SAV' 2016-11-04 12:55:18 +01:00
Marion Muszynski
306111c390 addition of address changement 2016-11-04 12:54:57 +01:00