Rodney Figaro
81d4be3108
fixes and cleanup
2016-09-12 11:59:22 +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
a7198f0fea
Merge branch 'ticket-philea'
2016-09-07 12:29:37 +02:00
Marion Muszynski
0c118717af
small addition
2016-09-07 12:03:31 +02:00
Marion Muszynski
f790336c29
big modif
2016-09-07 11:42:38 +02:00
Marion Muszynski
266e966b2f
Merge branch 'ticket-10296'
2016-09-07 09:03:09 +02:00
Marion Muszynski
b093c60edb
small fix to cast id_lang
2016-09-07 08:57:28 +02:00
Marion Muszynski
3caeacffae
modif send_article according bbb account
2016-09-06 18:05:54 +02:00
Marion Muszynski
01c77b3901
modif send_commande according bbb settings
2016-09-06 16:48:13 +02:00
Marion Muszynski
36180ad403
add remote address and http host in send_article
2016-09-06 15:41:34 +02:00
Marion Muszynski
1df6036d99
addition of philea module and helper class for admin
2016-09-06 15:32:52 +02:00
Marion Muszynski
2d10e1b167
Merge branch 'ticket-9260'
2016-09-05 16:52:19 +02:00
Marion Muszynski
50e0bc4c79
modification to find the right category thumb in productController
2016-09-05 16:22:28 +02:00
Marion Muszynski
b6dc54c290
addition html2text for emarsys and vp description
2016-09-05 15:45:05 +02:00
Marion Muszynski
17eda01760
modif for children cat
2016-09-05 11:57:43 +02:00
Marion Muszynski
13e85738e6
Merge branch 'ticket-9260'
2016-09-05 10:37:24 +02:00
Marion Muszynski
3d685e10b4
fix addition
2016-09-05 10:24:21 +02:00
Marion Muszynski
84c83241a8
Merge branch 'fix-10796'
2016-09-02 11:29:50 +02:00
Rodney Figaro
d06391d181
fix bug when submitting a product form with no new image added (BO)
2016-09-02 10:49:34 +02:00
Marion Muszynski
b9ff92a5d2
Merge branch 'fix-ticket-10169'
2016-09-01 11:18:36 +02:00
Marion Muszynski
31bb7e145b
fix form reprint
2016-09-01 11:17:43 +02:00
Marion Muszynski
8e309f060f
Merge branch 'ticket-10169'
2016-08-31 16:26:35 +02:00
Marion Muszynski
ad26e64ad0
fix weight
2016-08-31 16:25:49 +02:00
Marion Muszynski
639b7111e6
Merge branch 'ticket-10169'
2016-08-31 15:58:44 +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
144733299c
up reassurance sentence at first place
2016-08-31 15:17:21 +02:00
Marion Muszynski
bf0681a105
Merge branch 'fix-9890'
2016-08-31 15:05:20 +02:00
Marion Muszynski
6ff4e35f7b
fix css
2016-08-31 15:03:11 +02:00
Marion Muszynski
143e2faa72
Merge branch 'ticket-10527'
2016-08-31 14:58:30 +02:00
Marion Muszynski
5c35c6431b
fix
2016-08-31 14:56:59 +02:00
Marion Muszynski
abdbb008b5
adding reassurance sentences in payment step
2016-08-31 14:54:30 +02:00
Marion Muszynski
2dd1baef49
adding reassurance sentences for es
2016-08-31 13:32:59 +02:00
Marion Muszynski
0c7aefe613
fix to get sub cat thumb
2016-08-31 12:41:07 +02:00
Marion Muszynski
afde5b69a7
Merge branch 'ticket_9890'
2016-08-31 12:19:57 +02:00
Marion Muszynski
40c9fb6bff
fix
2016-08-31 12:18:17 +02:00
root
857c4a6f78
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
2016-08-31 11:56:52 +02:00
Marion Muszynski
11df31d8bd
Merge branch 'ticket_9890'
2016-08-31 11:56:22 +02:00
Marion Muszynski
ff0d7651bf
fix total product attribute quantities
2016-08-31 11:55:14 +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
Marion Muszynski
8db5762b5b
modif css mobile
2016-08-31 10:35:33 +02:00
Marion Muszynski
719f438b41
fix
2016-08-30 14:03:19 +02:00
Marion Muszynski
0dde6b5611
fix for old sales
2016-08-30 13:55:47 +02:00
Marion Muszynski
a96b0018c0
upload vp miniature in adminCategory
2016-08-30 13:47:42 +02:00
Marion Muszynski
0fa7a8b036
Merge branch 'ticket-10758'
2016-08-30 10:54:58 +02:00
Marion Muszynski
ba0ad41bd5
ini set memory limit to 1G
2016-08-30 10:54:07 +02:00
Marion Muszynski
0f85417eaf
modif css
2016-08-26 17:16:18 +02:00
