Commit Graph

152 Commits

Author SHA1 Message Date
Marion Muszynski
8204486942 update cron and mail conf_order 2017-01-26 15:32:22 +01:00
Marion Muszynski
c75ac311d8 fix paymentModule 2017-01-12 14:31:57 +01:00
Marion Muszynski
9b2f18c2ef fix wsu laposte, addition in adminLogistics and ajax for MR 2017-01-12 13:03:48 +01:00
Marion Muszynski
4716b247d9 fix 2017-01-11 18:26:36 +01:00
Marion Muszynski
092a1b169b fix 2017-01-11 18:11:29 +01:00
Marion Muszynski
262cac694a change message in mail order_conf 2017-01-11 18:02:31 +01:00
Marion Muszynski
80e0bffe4f fix for dev 2017-01-11 16:58:05 +01:00
Marion Muszynski
c4cbe24bb5 addition of crons and admin_order tpl for Mondial Relay 2017-01-11 15:53:24 +01:00
Marion Muszynski
5192561bac update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay 2017-01-11 15:33:44 +01:00
Marion Muszynski
22b9815c1c changement ant_configuration to store carrier conf in db Configuration 2017-01-09 15:02:14 +01:00
Marion Muszynski
228798b4e1 upgrade limit max char for order messages 2017-01-09 10:16:10 +01:00
Marion Muszynski
46e655751d fix value for prod 2017-01-06 16:47:55 +01:00
Marion Muszynski
cd4aa777d5 value for dev 2017-01-06 16:32:55 +01:00
Marion Muszynski
6cc03d0287 restriction with carrier priority 2017-01-06 16:25:08 +01:00
Marion Muszynski
d148fffa70 Merge branch 'ticket-11201-SlowCategoryCreation' 2016-12-26 11:43:23 +01:00
Marion Muszynski
a965103db4 continuing changement 2016-12-23 13:04:16 +01:00
Marion Muszynski
d329b24250 fix trad 2 2016-12-21 12:53:59 +01:00
Marion Muszynski
2b30de1cce changement, deletion of pdf overrided 2016-12-21 12:24:31 +01:00
Marion Muszynski
a13396baa8 restriction for delivery to ceuta and melina 2016-12-15 12:02:32 +01:00
Marion Muszynski
9500f86e9d changement 2016-12-15 11:47:40 +01:00
Marion Muszynski
3756a2d4b7 modification regenerateTree to limit to active categories 2016-12-14 18:12:08 +01:00
Marion Muszynski
715db47da4 add manually generation of ntree 2016-12-14 10:28:03 +01:00
Marion Muszynski
f4e2256c65 fix conflicts 2016-12-08 15:46:19 +01:00
Marion Muszynski
192cd79a6b continuing packs 2016-12-02 15:34:57 +01:00
Marion Muszynski
6964d4fb69 fix 2016-12-02 12:06:52 +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
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
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
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
8ec2a6ba21 Merge branch 'ticket-10657-PhileaMulti' 2016-11-21 10:18:38 +01:00
Marion Muszynski
f5a841a2f1 adjust for exp Noel 2016-11-18 17:26:53 +01:00
Marion Muszynski
d9fbfc438a small fix 2016-11-18 12:24:37 +01:00
Marion Muszynski
4ac4753900 begining of updatings 2016-11-18 09:50:04 +01:00
Marion Muszynski
31ea35e160 selection only a specific category_family 2016-11-16 15:50:39 +01:00
Marion Muszynski
5b95689b06 small updating 2016-11-02 17:03:58 +01:00
Marion Muszynski
31bea61242 fix conflict 2016-10-06 15:29:09 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +02:00
Rodney Figaro
155bd6a231 fix when no accessories and no family product 2016-09-23 14:51:52 +02:00
Rodney Figaro
c9ad2799d0 move the similar products block into one tab in product details
- fix the number of products displayed in the 'best sales for family' case
    - replace the slider by an adapted block with visuals differents from the best sales slider.
    - adapt the show cart javascript in order to get the correct height of product blocks on which
      the user click
    - fix selection between accessories and best sales for family in hooks
    - add a hook in order to display the correct label in the new tab
    - restore olds methods for best sales product. Routines related to the best sales family products have their own methods.
    - fix cache generation
2016-09-22 15:14:39 +02:00
Marion Muszynski
7a8d2c9339 move of comment block 2016-09-22 11:12:49 +02:00
Marion Muszynski
c049980a9a up lenght reference of product 2016-09-22 11:02:55 +02:00
Marion Muszynski
58d2b92b0c continuing braderie upgrade 2016-09-20 14:49:02 +02:00
Marion Muszynski
ed769a1749 start of ticket GA Enhanced Ecommerce 2016-09-19 18:47:37 +02:00
Marion Muszynski
cf18d95f8b moving of sale export block to privatesale logisitique 2016-09-14 17:42:08 +02:00
Marion Muszynski
2e7ff69817 addition of date to find the good ps in bulkupdate export part 2016-09-14 17:00:01 +02:00
Marion Muszynski
cf3b0cca11 addition of category thumb checking 2016-09-14 11:03:36 +02:00