Marion Muszynski
a4752145fa
fix conflicts
2016-12-07 14:36:59 +01:00
Marion Muszynski
24a06175ba
Merge branch 'ticket-11935-SuiviConversation' into develop
2016-12-02 16:00:29 +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
8c087ed509
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-28 11:02:22 +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
73f0233a89
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-23 13:05:14 +01:00
Marion Muszynski
bed6cbcd76
fix missing var
2016-11-23 13:04:37 +01:00
Marion Muszynski
6f2b7f8732
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-23 12:57:51 +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
1d6e27dd40
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-21 15:27:04 +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
63fcc839e3
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-21 12:56:37 +01:00
Marion Muszynski
c2b5077efe
fix
2016-11-21 12:56:12 +01:00
Marion Muszynski
894de500bc
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-21 12:45:36 +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
a10aceb571
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-18 17:27:12 +01:00
Marion Muszynski
f5a841a2f1
adjust for exp Noel
2016-11-18 17:26:53 +01:00
Marion Muszynski
218aac655a
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-18 12:24:54 +01:00
Marion Muszynski
d9fbfc438a
small fix
2016-11-18 12:24:37 +01:00
Marion Muszynski
3f7d969371
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-18 12:09:17 +01:00
Marion Muszynski
4ac4753900
begining of updatings
2016-11-18 09:50:04 +01:00
Marion Muszynski
fce88331a3
fix conflict
2016-11-16 15:55:07 +01:00
Marion Muszynski
31ea35e160
selection only a specific category_family
2016-11-16 15:50:39 +01:00
Marion Muszynski
b915ed8649
Merge branch 'ticket-AideContact-SAV' into develop
2016-11-02 17:04:16 +01:00
Marion Muszynski
5b95689b06
small updating
2016-11-02 17:03:58 +01:00
Marion Muszynski
699ceebbf3
Merge branch 'ticket-AssociateProducts' into develop
2016-10-14 16:31:24 +02:00
Marion Muszynski
a80ce2855a
fix when sale is in multi families
2016-10-14 16:31:09 +02:00
Marion Muszynski
31bea61242
fix conflict
2016-10-06 15:29:09 +02:00
Marion Muszynski
6e515c5207
Merge branch 'ticket-AssociateProducts' into develop
2016-10-05 17:51:08 +02:00
Marion Muszynski
6a415ac50f
modif css
2016-10-05 17:50:45 +02:00
Marion Muszynski
e6fdac5dbe
Merge branch 'ticket-8048'
2016-09-28 16:57:04 +02:00
Marion Muszynski
62c434fd57
Merge branch 'ticket-8048' into develop
2016-09-23 14:56:53 +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
73a3127d3e
Merge branch 'ticket-eanUpgrade' into develop
2016-09-22 11:13:52 +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
385af21769
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:47:32 +02:00
Marion Muszynski
430cabc449
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 14:49:30 +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
5aac7f617b
Merge branch 'ticket-8048' into develop
2016-09-19 12:42:21 +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
Rodney Figaro
5baa5eaf9a
fix : get best sale of the same sale family with label in front
2016-09-13 10:48:36 +02:00
