Marion Muszynski
870331cd10
modification to send checkout process to GA
2016-09-20 18:00:18 +02:00
Marion Muszynski
cbcf90c0ec
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:50:04 +02:00
Marion Muszynski
65f7b71332
fix
2016-09-20 16:49:41 +02:00
Marion Muszynski
385af21769
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:47:32 +02:00
Marion Muszynski
5cf235d874
addition of code ecommerce
2016-09-20 16:47:05 +02:00
Marion Muszynski
a8086dcfdc
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 14:55:24 +02:00
Marion Muszynski
85cc7b57dc
showing of comments for braderie on product page
2016-09-20 14:55:03 +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
322e3d2729
Merge branch 'ticket-payboxAgreement' into develop
2016-09-15 13:12:56 +02:00
Marion Muszynski
95e044a365
adjusting css
2016-09-15 13:12:38 +02:00
Marion Muszynski
5a9c94e694
Merge branch 'ticket-payboxAgreement' into develop
2016-09-15 13:02:36 +02:00
Marion Muszynski
b83d7b994c
modification in paymentinfo tpl
2016-09-15 13:01:20 +02:00
Marion Muszynski
3e16557de0
Merge branch 'ticket-10883' into develop
2016-09-14 11:04:01 +02:00
Marion Muszynski
cf3b0cca11
addition of category thumb checking
2016-09-14 11:03:36 +02:00
Marion Muszynski
e05ee41c73
Merge branch 'fix-css' into develop
2016-09-12 15:40:41 +02:00
Marion Muszynski
4581e8d20e
fix width of ps description
2016-09-12 15:40:23 +02:00
Marion Muszynski
eb5495cf15
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 14:37:52 +02:00
Marion Muszynski
fca308f3ae
modif css
2016-09-09 14:37:32 +02:00
Marion Muszynski
9e8c06d808
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:14:15 +02:00
Marion Muszynski
1b444a773f
css modif
2016-09-09 13:13:57 +02:00
Marion Muszynski
410ddb43b1
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:10:00 +02:00
Marion Muszynski
3d325dbc7c
small modif
2016-09-09 13:09:43 +02:00
Marion Muszynski
3c7e15e2c3
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:07:18 +02:00
Marion Muszynski
8074d6f063
modif css manage payments
2016-09-09 13:07:01 +02:00
Marion Muszynski
cb3b1de22c
fix to not escape html on vp description
2016-09-09 11:35:36 +02:00
Rodney Figaro
4ac6c52ec4
fix accessories missing after uninstalling the module
2016-09-08 13:24:49 +02:00
Rodney Figaro
9ecf2491c6
add module 'privatesales_similarproduct'
...
In product detail page :
- show slider with product associated accessories if any, above the best selling products slider
- show product's family best selling instead of the accessories, if any
- show no slider if no accessories nor family best selling present
Cache slider templates for :
- associated accessories for each product for every language, if any
- family best selling for each family of the product for every language, if any
Fixes in javascript :
- missing globals variables in module expresscart would the express cart fail when out of stock
- change the express cart displaying when clicking on the cart icon in any footer sliders.
Css :
duplicate all css styles 'best-sellers_block_product' in 'privatesales_similarproduct' so that the latter slider can be adapted if required.
2016-09-08 13:04:14 +02:00
Marion Muszynski
40457d1935
Merge branch 'ticket-10296' into develop
2016-09-07 08:58:24 +02:00
Marion Muszynski
b6dc54c290
addition html2text for emarsys and vp description
2016-09-05 15:45:05 +02:00
Marion Muszynski
13e85738e6
Merge branch 'ticket-9260'
2016-09-05 10:37:24 +02:00
Marion Muszynski
c9bdecd1d4
Merge branch 'ticket-9260' into develop
2016-08-31 15:35:29 +02:00
Marion Muszynski
5a8d3eb781
small fix
2016-08-31 15:35:09 +02:00
Marion Muszynski
b677946ca7
Merge branch 'ticket-10527'
2016-08-31 15:18:42 +02:00
Marion Muszynski
0221ccb2e7
Merge branch 'ticket-10527' into develop
2016-08-31 15:17:41 +02:00
Marion Muszynski
144733299c
up reassurance sentence at first place
2016-08-31 15:17:21 +02:00
Marion Muszynski
b809ee0c26
Merge branch 'fix-9890' into develop
2016-08-31 15:03:31 +02:00
Marion Muszynski
6ff4e35f7b
fix css
2016-08-31 15:03:11 +02:00
Marion Muszynski
72a0d2d3d7
Merge branch 'ticket-10527' into develop
2016-08-31 14:57:19 +02:00
Marion Muszynski
5c35c6431b
fix
2016-08-31 14:56:59 +02:00
Marion Muszynski
e0c4e0dfe6
Merge branch 'ticket-10527' into develop
2016-08-31 14:55:15 +02:00
Marion Muszynski
abdbb008b5
adding reassurance sentences in payment step
2016-08-31 14:54:30 +02:00
Marion Muszynski
742a8d1ca9
fix conflicts
2016-08-31 13:36:10 +02:00
Marion Muszynski
2dd1baef49
adding reassurance sentences for es
2016-08-31 13:32:59 +02:00
Marion Muszynski
afde5b69a7
Merge branch 'ticket_9890'
2016-08-31 12:19:57 +02:00
Marion Muszynski
1046fd27f2
Merge branch 'ticket_9890' into develop
2016-08-31 12:18:37 +02:00
Marion Muszynski
40c9fb6bff
fix
2016-08-31 12:18:17 +02:00
root
a2d5ed0a14
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
2016-08-31 11:09:42 +02:00
root
163411b776
modif trad
2016-08-31 11:08:56 +02:00
Marion Muszynski
bb5ff6ba97
fix conflicts
2016-08-31 11:04:16 +02:00
