Antony Lesuisse
2d296cb779
[MERGE] ir-ui-view split active and show_customize
...
Split the ternary field application in active and show_customize, all four
possible value are now needed for the customize theme popup.
2014-08-31 16:56:44 +02:00
Christophe Simonis
8046b7367d
[MERGE] forward port of branch saas-5 up to 7e117b1
2014-08-28 16:51:11 +02:00
Fabien Meghazi
5e6e1303e3
[IMP] pretty urls for /website/image
2014-08-28 16:37:38 +02:00
Martin Trigaux
231a478ca9
[FIX] website_sale: pager in product list
...
Keep the reference to category and search view in pager.
Update the search template to include form and keep correct reference to the category (as a slug and not a parameter).
Fixes #688
2014-08-25 17:43:03 +02:00
Fabien Pinckaers
1e4501076d
[FIX] bad link
2014-08-20 10:31:25 +02:00
Fabien Pinckaers
f43e349d85
[IMP] Footer message according to installed apps
2014-08-12 13:06:08 +02:00
Denis Ledoux
1bb219907f
[MERGE] forward port of branch saas-5 up to 655a5b9
2014-08-04 16:56:10 +02:00
Christophe Matthieu
ce7212d5d7
[FIX] website_sale: everytime you want to change both billing & delivery address, any change creates duplicates in the backend
2014-08-01 17:11:20 +02:00
Christophe Matthieu
87a20d1cc3
[FIX] website_sale: can't click on confirm order in mobile view
2014-07-31 15:22:51 +02:00
Olivier Dony
ef53a831c6
[MERGE] Forward-port saas-5 up to a5f7891
2014-07-23 16:58:00 +02:00
Denis Ledoux
a5f7891b68
[MERGE] forward port of branch saas-4 up to 5739aebfb1
2014-07-23 13:18:30 +02:00
Denis Ledoux
49c203d6b9
[FIX] website_sale: do not set t-field in option
...
t-field in option input (select > option) is not supported
2014-07-17 17:22:43 +02:00
Christophe Simonis
f654a7719b
[MERGE] forward port of branch saas-5 up to 73d39a0
2014-07-10 22:49:53 +02:00
Jeremy Kersten
8eb97cc082
[IMP] website_sale: Add google analytics on checkout process
2014-07-09 17:45:40 +02:00
Christophe Matthieu
928f4fbf76
merge from 8.0
2014-07-09 16:10:08 +02:00
Fabien Pinckaers
5cc81dd64f
Fixes
2014-07-02 18:18:29 +02:00
Christophe Matthieu
162ee61d4f
[FIX] website_sale: discount price is never hide
2014-06-30 13:53:25 +02:00
Antony Lesuisse
25d0a3ecb1
[FIX] phantomjs test remove injection
...
It's now deprecated, assets bundles should be used instead.
2014-06-28 19:59:59 +02:00
Simon Lejeune
195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Christophe Matthieu
a7816a827f
[FIX] website_sale: assets xml id and jquery selector (unbind click for login page)
2014-06-25 15:05:48 +02:00
Christophe Matthieu
77a07670cf
[IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view
2014-06-25 14:03:23 +02:00
Christophe Matthieu
412a7593be
[IMP] website_sale_options
2014-06-25 11:31:39 +02:00
Christophe Matthieu
7505cce2e9
[WIP]
2014-06-24 17:37:13 +02:00
Christophe Matthieu
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +02:00
Christophe Matthieu
34815021b8
merge upstream
2014-06-24 10:13:11 +02:00
Christophe Matthieu
1d1b6e79b5
[FIX] website_sale: user can't edit the price.
2014-06-23 16:38:04 +02:00
Christophe Matthieu
e75d9525bb
merge upstream
2014-06-20 10:09:16 +02:00
Christophe Simonis
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
Christophe Simonis
5206eb16d5
merge upstream
2014-06-19 13:13:27 +02:00
Christophe Matthieu
22d528c7a7
[IMP] website_sale: display the discount in the product template when the user select a variant
2014-06-19 13:12:08 +02:00
Christophe Matthieu
43ca22d10c
[FIX] website_sale: access right for currency for public user
2014-06-19 13:12:07 +02:00
Christophe Matthieu
a6185caa18
[FIX] website_sale: display in currency of the user
2014-06-19 13:12:06 +02:00
Christophe Matthieu
7295a07c4a
[FIX] website_sale: display price with user curencie.
2014-06-19 13:12:06 +02:00
Christophe Matthieu
087bf22fb5
[IMP] website_sale: add GeoIP localisation for default value in checkout; display vat number if vat module is installed; fix labels
2014-06-19 13:12:05 +02:00
Christophe Matthieu
c3c922f84e
[IMP] website_sale: convert comma to dashed for url attrib
2014-06-19 13:12:05 +02:00
Christophe Matthieu
86c6cf7a68
[FIX] website_sale: display discount only if the price is lower than the standard price
2014-06-19 13:12:04 +02:00
Christophe Matthieu
7ae7a5315f
[FIX] website_sale: modal layout
2014-06-17 15:58:13 +02:00
Christophe Matthieu
0d9f3af113
[IMP] website_sale: optional product + fix forgotten line_id in website_event_sale
2014-06-17 15:49:48 +02:00
Christophe Matthieu
9f77cb9d1f
[IMP] website_sale: optional product have all time the same quantity of the liked product.
2014-06-17 14:23:15 +02:00
Christophe Matthieu
9867d63b5d
[IMP] website_sale: add demo data for optional products
2014-06-17 12:01:36 +02:00
Christophe Matthieu
0ac338ea0a
[IMP] website_sale: display state function of selected country
2014-06-17 11:33:28 +02:00
Christophe Matthieu
dcce993958
[FIX] website_sale: typo and preview display all time in modal
2014-06-17 10:54:47 +02:00
Christophe Matthieu
474d63d6b9
[FIX] website_sale: fix keep query and clean code
2014-06-17 09:44:32 +02:00
Dharmraj Jhala
a8497e07c9
[ADD] added instantclick library to load data faster in anonymous mode
2014-06-16 16:00:06 +05:30
Christophe Matthieu
0492e59314
[FIX] website_sale: rounding price; typo and search sequence of membership
2014-06-16 10:53:34 +02:00
Christophe Matthieu
98d9901c17
[FIX] website_sale: retur the browse record of category insead of int
2014-06-13 16:17:51 +02:00
Christophe Matthieu
8fdfc68074
[IMP] website_sale: display variants choice in confirm dialog box
2014-06-13 13:59:28 +02:00
Christophe Matthieu
d8516bcfd8
[IMP] website_sale: optional quantity in product form
2014-06-13 12:47:54 +02:00
Christophe Matthieu
57c59ddfac
[IMP] website_sale: confirm/options dialog box have same layout of my cart
2014-06-13 12:31:41 +02:00
Christophe Matthieu
8a24171996
[IMP] website_sale: display 'Product not available' message in product selector
2014-06-13 09:32:28 +02:00