Marion Muszynski
d7e65fa383
Merge branch 'fix-htmlHomeVp'
2016-09-09 11:36:06 +02:00
Marion Muszynski
cb3b1de22c
fix to not escape html on vp description
2016-09-09 11:35:36 +02:00
Marion Muszynski
a5a5278eb8
fix request
2016-09-08 17:51:04 +02:00
Marion Muszynski
9ed80d89ab
addition of delivery address checking
2016-09-08 17:48:51 +02:00
Marion Muszynski
c004322a41
addition of url redirect
2016-09-08 17:07:17 +02:00
Marion Muszynski
89b3fc48bb
small fix
2016-09-08 16:47:36 +02:00
Marion Muszynski
3ad121eedb
process success addition
2016-09-08 16:32:14 +02:00
Marion Muszynski
564c008cf6
more mailing addition
2016-09-08 14:51:03 +02:00
Marion Muszynski
251b0eac53
addition of mailing for test
2016-09-08 14:36:31 +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
5c755acd4b
Merge branch 'ticket-philea'
2016-09-08 12:41:24 +02:00
Marion Muszynski
50cc5511ac
fix about phone number
2016-09-08 12:40:32 +02:00
Marion Muszynski
86bb7a1413
Merge branch 'evo-DBorderCurrentState'
2016-09-08 11:58:45 +02:00
Marion Muszynski
c63eb836ad
table addition to load current order state
2016-09-08 11:52:44 +02:00
Marion Muszynski
1edec769dd
Merge branch 'ticket-philea'
2016-09-07 17:42:43 +02:00
Marion Muszynski
d839706175
modif code article
2016-09-07 17:42:06 +02:00
Marion Muszynski
7c3fbc75dd
Merge branch 'ticket-philea'
2016-09-07 16:17:36 +02:00
Marion Muszynski
a6fc45e479
adjust send_commande
2016-09-07 16:17:03 +02:00
Marion Muszynski
68fe001982
Merge branch 'ticket-philea'
2016-09-07 15:11:01 +02:00
Marion Muszynski
df7b6dbc05
small fix
2016-09-07 15:10:28 +02:00
Marion Muszynski
f8da29a7e2
fix conflict about vi editor
2016-09-07 15:06:41 +02:00
Marion Muszynski
88b3c10898
fix
2016-09-07 15:03:58 +02:00
Marion Muszynski
66544cc598
Merge branch 'ticket-10296'
2016-09-07 14:45:15 +02:00
Marion Muszynski
b376875be8
modif wordwrap
2016-09-07 14:44:40 +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
