Commit Graph

1181 Commits

Author SHA1 Message Date
Goffin Simon e27d854801 [FIX] website_sale: delete console.log
Delete console.log introduced by 4d7671a4c3
2015-07-08 10:37:33 +02:00
Goffin Simon 669948569b [FIX] website_sale: alternative products
Display correctly the alternative products

opw:643934
2015-07-08 09:11:01 +02:00
Odoo Translation Bot fe3835faff [I18N] Update translation terms from Transifex 2015-07-05 01:52:32 +02:00
Jeremy Kersten 02d3e703a2 [FIX] website_sale: fix ga Ecommerce statistics
Name from product was missing / confusing with category name
https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce
2015-06-30 09:44:01 +02:00
Odoo Translation Bot acc1b525fa [I18N] Update translation terms from Transifex 2015-06-29 08:42:08 +02:00
Goffin Simon d3711f2cab [FIX] website_sale: existing transaction
If the transaction already exists, the amount total of the transaction must
be updated.
The case occured when:
[1] you put a product A in the cart
[2] click on "Process Checkout" and click "Confirm"
[3] select Adyen or Paypal as payment method
[4] click on "Pay Now"
[5] return in the cart instead of paying your order
[6] add a product B in the cart
[7] click on "Process Checkout" and click "Confirm"
[8] select Adyen or Paypal as payment method
[9] click on "Pay Now"
Now check the transaction payment linked to the order in backend, the total amount of the order is equal
to price A + price B and the total amount of the transaction payment is equal to price A.
This commit solves this problem.
opw:634119
2015-06-18 16:24:14 +02:00
Nicolas Lempereur 3f1e99c4b9 [FIX] web, website_form_website_sale: form and login
Partial backport of commit 093e39bd.

When a flow is stopped by a login redirection, some data (e.g: a product
comment being posted) could be lost. This commit in this case convert
POST request data to GET data (so it is possible to add a GET controller
which after login will terminate the action).

closes #7100
opw-642350
2015-06-17 11:33:20 +02:00
Goffin Simon, Nicolas Lempereur 98a72a2604 [FIX] website_sale_delivery: update shopping cart
The delivery must be updated when the cart is updated.
The method "_check_carrier_quotation" called by "_cart_update" deletes sale order line related to delivery.
Then each line passed to "_cart_update" must be checked with "exists" to be sure that the record is not
missing.
Related to the task : 12239
opw:641913
2015-06-16 13:56:43 +02:00
nafex f5585731f4 [FIX] website_sale: allow to reset field
When filling the form (for invoice or delivery details), once a field has been
filled, it's no longer possible to remove the value of this field.
e.g. set a company, not possible to remove it when modifies the address

This is due to the `get(key)` call that is considered as False with empty
strings. Instead, check the existance of the key.
Still not accepting mandatory in the form (not checked in this method).

Fixes #7017
2015-06-12 09:37:45 +02:00
Goffin Simon 4d7671a4c3 [IMP] website_sale: Skip overload with requests
Until the request to get the unit price is not finished, no request is sent to the server.

issue #4298
2015-06-09 12:06:18 +02:00
Jeremy Kersten 31301bb31a [FIX] website_sale: reset sale order from session if status is no more in draft
When a sale order has in state != draft, we raise a error message since commit
f6c65a3d9e.

But if we don't reset the sale order id from the session, the user cannot
continue to navigate on website because the user will have the error each time.
2015-06-09 11:13:20 +02:00
Odoo Translation Bot e2c9699cfc [I18N] Update translation terms from Transifex 2015-06-08 14:03:50 +02:00
Martin Trigaux 4528ccf148 [I18N] First sync of translations from Transifex
Translation is that which transforms everything so that nothing changes.
 -- Grass Günter
2015-05-29 21:58:20 +02:00
Olivier Dony 1cea0dc4e9 [I18N] Final sync + cleanup of Launchpad Translations, moving to Transifex
See https://github.com/odoo/odoo/wiki/Translations
2015-05-29 10:55:06 +02:00
oalca db4056026e [I18N] website_sale: Translation to es_PA Spanish (Panama)
Closes #6732
2015-05-29 00:12:38 +02:00
Goffin Simon 0ff26cf7cd [FIX] website_sale: quick add in the cart
If the product to quick add in the cart has several variants, the button cart
redirects the user to the page of this product. If "attribute_value_ids" is not
in the DOM when clicking on the button cart, the product is immediately added in
the cart.

Closes #6714

opw:639897
2015-05-26 13:33:04 +02:00
Olivier Dony ebb5ddcd65 [I18N] Sync latest translations from Launchpad (not the final one) 2015-05-21 14:42:20 +02:00
Nicolas Martinelli f6c65a3d9e [FIX] website_sale: prevents the modification of a SO line if SO is not 'draft'
opw-634681
2015-05-18 13:08:01 +02:00
Goffin Simon bff6dffbb4 [FIX] website_sale: Coupon Code
The pricelist linked to the coupon code is just applied in the cart.
In the shop, the pricelist of the user is applied.

opw:634639
2015-05-11 14:25:11 +02:00
Olivier Dony 622e00baa5 [I18N] Sync 8.0 translations from Launchpad 2015-04-28 09:45:53 +02:00
David Monjoie e66efbd9f6 [FIX] website_sale: search button didn't work on product page
You can't move elements which needs website_sale js outside of the element with class oe_website_sale
2015-04-24 09:54:42 +02:00
Goffin Simon 67530c7b1d [FIX] website_sale: checkout problem
When the user is not logged, there is no branding for the options.
This is why, the product_id of the option must be written in the
template "optional product".

opw:633093
2015-04-24 09:00:39 +02:00
Damien Bouvy e4d8246c81 [FIX] website_sale: fix unnecessary permanent update of pricelist on checkout 2015-04-22 16:47:47 +02:00
David Monjoie 9fdf06a0f6 [FIX] website_sale: fixed display of variant informations in cart
Prior to this, even if your suggested or optional products were variants,
only the name of the template was shown.
Fixed GitHub issue 2746 and opw 614776
2015-04-20 12:31:52 +02:00
Goffin Simon 08d69774b0 [FIX] website_sale: Pricelist witn min qty
Each time a product is added in the cart, the qty of this product must be checked to
adjust the price if there is a rule (with min qty) in the partner's pricelist.

opw:630049
2015-04-10 10:57:37 +02:00
Nicolas Martinelli 64ab5638fc [FIX] website_sale: currency of the coupon taken into account to display the amount
1) Activate pricelist + multi currency - Main currency is EUR
2) Create a pricelist in USD (named "test"), no specific rule is applied.
3) Go to website < shop < select a product < buy it.
4) On the page /shop/cart go to customize and make sure "coupon code" is ticked
5) Enter "test" in the coupon code field

--> The prices are changed according to the exchange rate of the currency of the pricelist.

This is not correct: the coupon should only affect the amount according to the discount,
not convert the amount in the currency of the pricelist. In the specific example, the price
displayed should not be affected.

opw: 630670
2015-04-02 15:13:29 +02:00
Anton Chepurov a70ea6d03b [FIX][#5182] speed up product form loading
removes obsolete (and faulty) check
2015-03-24 12:58:25 +02:00
Christophe Matthieu 74497a667f [FIX] website_sale: If there is no description_sale for the product set the cart display the product name and 'False' 2015-03-09 20:34:01 +01:00
Goffin Simon 092c64b76f [FIX] website: translations for qweb templates not applied.
-Website.tours must be loaded after the translation data:
"website.ready" before the tour ensure that the translations are loaded.

-Translations for qweb templates not applied:
Translate all text nodes in qweb templates when translation data
are loaded.

-Add some translations in website tours.

opw:619786
2015-03-03 16:05:34 +01:00
Denis Ledoux c3f4ec856c [FIX] website_sale: keep attributes filter in pager
While having a product list with 20+ products,
If more than two attributes were set in the shop filter,
going to the next page kept only the first filter.

opw-629188
2015-03-02 16:44:24 +01:00
Olivier Dony 91d4b947f6 [I18N] Update translations from Launchpad 8.0 branches 2015-02-18 11:51:07 +01:00
Christophe Matthieu f9d8493ee9 [FIX] website_sale: In the shopping cart + in the shopping summary (order in front end), the internal reference should not be displayed 2015-02-16 16:59:52 +01:00
Christophe Matthieu 414175cb30 [FIX] website_sale: the cart and modal in ecomerce are not responsive for phone 2015-02-16 16:33:01 +01:00
Christophe Matthieu 72c418e6dd [FIX] website_sale: wrong line details in pdf invoice, the invoice line name does not contains the product name 2015-02-16 10:32:39 +01:00
Denis Ledoux c62be6167a [FIX] website_sale: price overlapping product name
In ecommerce products list view, if the product name was
shorter than the product price, than,
the product price overlapped the product description

Besides, this display: inline-block; has no useful utility
(at least not known), and it should be set in a CSS property
anyway
2015-02-12 16:40:14 +01:00
David Monjoie 9bae596693 [FIX] website_sale: shop tutorial doesn't explicitly look for an ipad picture anymore
Previously, if you registered enough images to push the ipad one on page two, the test would fail to find it. Now it chooses the image with index 4, whatever it is.
2015-02-06 09:43:56 +01:00
Denis Ledoux e1a1b56205 [FIX] website_sale: handle partner_ids for order email confirmation
This rev. is related to b36908b6f8

partner_ids is another *2many fields of email.template
spotted thanks to ba9bc1e86d
2015-02-05 14:14:30 +01:00
Denis Ledoux b36908b6f8 [FIX] websiste_sale: order confirmation email with attachment
This rev. is related to 67443b5b17

onchange_template_id returns the attachment_ids as a id list,
not as a *2many command list
The conversion from id list to command list has to be done manually.

At the moment, attachment_ids is the only 2many fields of email.template
2015-02-04 17:08:58 +01:00
Olivier Dony c18a7eb82a [FIX] website_sale: visible attributes wrongly computed for some variants
On one hand, when a product attribute is shared by several
products, some may use different subsets of its possible values.

On the other hand, when less than 2 values are enabled for
a given attribute on a product, no choice is displayed for
that attribute on the shop page, as there is none to be made.

The way those "visible attributes" were computed in
get_attribute_values() was wrong: when counting the
number of values it used the whole range of possible
values for this attribute (cross-product), not just
those enabled for that product.

This lead to inconsistencies vs the website_sale.variants
template, and products using a single value out of a larger
range of values were constantly marked as "Not available"
in the shop.
2015-01-30 19:45:14 +01:00
Denis Ledoux 67443b5b17 [FIX] website_sale: use email template email from for confirmation email
The email_from for the order confirmation email in the ecommerce
was forced to the company email,
preventing any customisation concerning the from email address
in the sale order mail template.
2015-01-30 13:11:15 +01:00
Olivier Dony 8e03852fd4 [I18N] Update translations from Launchpad 8.0 branches 2015-01-26 16:36:51 +01:00
Olivier Dony 495ec92251 [I18N] Update translations from Launchpad 8.0 branches 2015-01-21 15:36:54 +01:00
Olivier Dony 39f00b3637 [I18N] Update translation templates with latest terms
Total new terms: 270
Total deleted terms: 82
Total identical terms: 19653
Old total number of terms: 19735
New total number of terms: 19923
2015-01-21 15:31:22 +01:00
Denis Ledoux c73be555bf [FIX] website_sale: product attribute, value, price ACLs
When a model is regarded as public readable, no group should be set on the ACL,
to allow ANYONE to read the model, not just the users within the public group.
2015-01-20 16:55:52 +01:00
Fabrice Henrion 319e99f82c [FIX] Terminology consistency 2015-01-12 14:58:55 +01:00
Christophe Matthieu 010dd5a603 [FIX] website_sale: very slow name_get for product public categories 2015-01-09 14:22:54 +01:00
Denis Ledoux 8d9cfd7321 [FIX] website_sale: retrocompatible patch for a6379e2e67
The view *_acquirer_button being  being in noupdate mode, this is possible that the view isn't updated during the migration
2015-01-09 14:02:17 +01:00
Nicolas Seinlet 1eb2507034 [IMP] improve search in webshop using a split on white spaces 2015-01-07 15:43:03 +01:00
Christophe Matthieu 6471fa6ddb [FIX] website_sale: Discussion not working on product and gives '500: Internal Server Error' if public user try to comment on product (without login). Need to redirect to the login page (all user who want to write a comment have already buy the product and can use the portal login) 2015-01-05 13:30:36 +01:00
Christophe Matthieu d9e0997ffd [FIX] website_sale: the price per line display a wrong reduction if the tax is include 2014-12-22 15:16:36 +01:00
FalcoBolger c0dce6ac1e [FIX] website_sale perfomance on public categories
Use a domain instead of python filtering when loading root categories.

Closes #4324
2014-12-19 17:48:50 +01:00
Christophe Matthieu b0ae5eac57 [FIX] website_sale: compute base price from default company currency to user currency to display the good lst_price or price extra 2014-12-19 11:59:45 +01:00
Denis Ledoux cf4c826aa7 [FIX] website_sale: set partner lang according to website lang
On ecommerce checkout, the language of the partner wasn't set according to the language in which he is visiting the website.
Therefore, its partner was set with the default language (English in most cases), and any emails sent to him were not translated in his own language (in the email templates, such as the quotation email he received on order confirmation)
2014-12-08 17:50:34 +01:00
Christophe Matthieu d3c562d4e8 [FIX] product: keep attribute on a variant with only one attribute
When adding informational attribute, with only one possible value, it used to be skipped.
Instead keep it and add it on every variant.

To avoid dropping and recreating product (and lose eventual customisations), the attributes with only one possible value are set on every product.
This makes sure that in following test, these are not considered in variants_inactive variable.

Fixes #3204
2014-11-26 14:35:08 +01:00
Tymoteusz Motylewski 856eba1de0 [IMP] website_sale: performance on category page
public_categ_ids field was moved to product.template object
2014-11-26 12:09:37 +01:00
Christophe Matthieu 76080efdbc [FIX] website_sale: Discussion not working on product; issue: #3495 2014-11-26 10:38:38 +01:00
Denis Ledoux 7a2ba5ca47 [FIX] website_sale: apply reduction code
The line being deleted in this revision looks to have been useful when it was introduced in this commit:
36fc910

As the sale order was updated right away through the update_pricelist method
But since this rev. 22f4c31, the sale order is updated later, and reset the sale_order_code_pricelist_id value in the session right after setting it prevent to apply the pricelist of the promotional code...
2014-11-21 15:56:37 +01:00
Olivier Dony a6d24db305 [I18N] Update translations from Launchpad 8.0 branches 2014-11-19 17:49:12 +01:00
Julien Legros aecb24ad6b [FIX] website_sale: don't carry over tx details on SO duplication
opw-617319
2014-11-19 11:43:02 +01:00
Denis Ledoux 1561a528a5 [FIX] website_sale: product website description must be translatable 2014-11-18 11:41:27 +01:00
Jeremy Kersten d978c78246 [FIX] website_sale: browse category to slugify. Because slug of an id will generate a tb 'need more than 1 value to unpack' 2014-11-13 14:48:30 +01:00
Christophe Simonis c825d0552d [MERGE] forward port of branch saas-3 up to ec27773 2014-11-05 21:46:42 +01:00
Christophe Simonis ec277732fe [MERGE] forward port of branch 7.0 up to 3e3e35e 2014-11-05 21:10:15 +01:00
Will Stott 9bc156a32c [FIX] website_sale: typo in help string. 2014-11-04 13:57:52 +01:00
Jorge 93e4e7da6e [FIX] website_sale: don't display twice some products
In list view, the 10 last products of a page were the 10 first products of the next page.
Fixes #3373
2014-10-30 12:04:42 +01:00
Simon Lejeune a03e5c42ec [FIX] website_sale: usability fixes in the checkout/address form
* `disabled` on the country select tag instead of `readonly`
* `create a new address` selected when the user set an invalid shipping
address and must correct it. Else the user was correcting the shipping
address but the option "ship to the same address" was selected.
2014-10-29 16:06:10 +01:00
Simon Lejeune a644bbaec8 [FIX] website_sale: don't apply the company name as street logic in shipping address 2014-10-29 16:06:03 +01:00
Simon Lejeune ced8c3cf3f [FIX] website_sale: remove spurious print 2014-10-29 16:05:50 +01:00
Christophe Matthieu 59cda06b00 [FIX] website.sale: Double / triple digits do not get displayed correctly on ecommerce quantity selector 2014-10-27 10:24:13 +01:00
Christophe Matthieu d8e67d647f [FIX] website_sale_options: only one optional product is added to the cart and the quantity of the optional product don't change in the cart when we click on more or less. Fix the number of items displayed in the modal options. 2014-10-27 10:24:13 +01:00
Christophe Matthieu 4a46fce95a [FIX] website_sale: Postal Code is required during checkout for countries without postal codes; Zip must be not required. 2014-10-27 10:24:13 +01:00
Christophe Matthieu 23f9736372 [FIX] website_event_sale: display the discounted price in website.
Add price_reduce compute method on ticket and sale order line
2014-10-24 14:16:16 +02:00
David Monjoie 76824b4248 [FIX] website_sale: check the first product variant radio button in variants list by default to avoid users to click on Add to Cart without choosing any variant 2014-10-23 15:20:51 +02:00
Denis Ledoux 8521e701fa [FIX] website_sale: right number of products in the page
The goal is to fill the page with at least 20 products and to fill all grid lines
Thus, the page should be filled with products until there are 20 products and all lines of the grid are full.
2014-10-23 14:14:50 +02:00
Denis Ledoux bfb61cd5e9 [FIX] website_sale: image doesn't change when the user select a product (for product variant list). website_sale_options: image dones't change in modal with the selection 2014-10-20 18:40:06 +02:00
Simon Lejeune 258a4cac82 [FIX] website_sale: trigger the change event on the right node 2014-10-20 10:44:24 +02:00
Denis Ledoux ba272ad69a [FIX] website_sale: no need to specific to a selection field that it is of type char
Besides, if set, the field will appear as a simple char field in the form view & editable lists
+ADD the type in the editable view
2014-10-17 14:48:45 +02:00
Olivier Dony 9b67a483df [FIX] website_sale: better fiscal position detection + support update during checkout
The customer can change the country and tax
number in the billing information during
checkout, and the taxes should be properly
updated according to the re-detected fiscal
position.

The fiscal position detection also depends
on the `vat_subjected` flag, which we now assume
to be implicit as soon as the customer filled
in a valid Tax Identification Number.
2014-10-10 21:02:33 +02:00
Olivier Dony 7439421ad2 [I18N] Update translations from Launchpad 8.0 branches 2014-10-08 17:52:25 +02:00
Denis Ledoux 38668fd404 [FIX] website_sale*: handle no delivery methods in website
Display a user friendly message instead of crashing when there is not delivery method available for a specific order
2014-10-08 15:38:16 +02:00
Jeremy Kersten 8ff6299d9d [FIX] website_sale: save the company in street and the street in street2.
The old behaviour was not better, because when we print the invoice, the order was ugly:
    Name
    Street
    Company name
    Country

Now we will have:
    Name
    Company name
    Street
    Country

This patch is not retro-compatible:
   Old partners will see the address in company name and vice-versa.
   Need to update view and switch street field and street2 field
2014-10-07 19:00:45 +02:00
Denis Ledoux 6d509c0c6b [REF] website*: set spinner style in class, instead of inline
This fix is related to:
8298cf6510
51e399d9ac
9056c58cb8
2014-10-02 20:33:53 +02:00
Wolfgang Taferner 51e399d9ac [FIX] website_sale: shopping cart quantity width (qty > 9) 2014-10-02 18:45:14 +02:00
Denis Ledoux 8298cf6510 [FIX] website_sale: too tiny quantity input (if qty > 9) 2014-10-02 10:58:14 +02:00
Olivier Dony 59f77103cc [FIX] website_sale: checkout: do not reset address country every time
Once the value is set it can be modified by the user
(e.g. if geoip detection was wrong), so should not be reset.
2014-10-01 15:16:00 +02:00
Denis Ledoux eaa0f29094 [FIX] website*sale: product_id_change qty is 0 by default
Thus, need to pass the actual quantity to product_id_change in order to set values correctly
2014-09-30 17:20:28 +02:00
Thibault Delavallée dce983dea0 [IMP] website_sale: confirm quotation only when the payment is done, not directly when hitting 'pay now'. 2014-09-29 11:12:37 +02:00
Olivier Dony dd2f229153 [FIX] website_sale: avoid subscribing the website user (Public) to all shop orders
Especially as this user does not have a valid email, which
could prevent notifications to reach other followers.
2014-09-26 16:13:56 +02:00
Olivier Dony b2b3d629f9 [FIX] website_sale: auto-confirm free orders upon cart validation
Orders are normally confirmed when the payment transaction
is processed, but there is no transaction for free orders.
This caused them to stay in draft until manually cancelled.
2014-09-26 14:36:59 +02:00
Denis Ledoux c8f1bebcc5 [FIX] website_sale: free carts were not confirmed 2014-09-25 16:25:43 +02:00
Jamin Shah ff5e7a749c [IMP] website_sale : avoid duplicated order lines
Add line id to while calling _cart_update() from sale_get_order()
The missing line_id parametre was making the _cart_find_product_line() call to fail as it was linked to an option while searching for lines without options (making the method recreate new lines).
Fixes #2573
2014-09-25 11:31:49 +02:00
Olivier Dony b74d830eb2 [I18N] Update translation templates with latest term changes 2014-09-23 19:13:50 +02:00
Olivier Dony 1c5b5e4290 [I18N] Update translations from Launchpad 8.0 branches
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
Christophe Matthieu 8afa1b6062 [FIX] website_sale: displayed price doesn't change for 'List View of Variants' customize template 2014-09-19 11:07:33 +02:00
Olivier Dony 53aa92d3c9 [I18N] Update translations from Launchpad branches 2014-09-18 11:47:16 +02:00
Denis Ledoux 8d773dcd23 [FIX] website_sale: only display payment method from the same company as the order 2014-09-18 10:51:57 +02:00
Fabien Meghazi 51477fb4f6 [IMP] Brought back /website/image route w/filename hinted in headers
Also added support for this route in widget Image#from_html()
2014-09-17 16:54:08 +02:00
Olivier Dony e5bff82aff [MERGE] Forward-port saas-5 up to f9bcd67 2014-09-17 16:39:06 +02:00
Fabien Meghazi 8d08e06758 [FIX] Bundlification remains (Fixes #2463) 2014-09-17 14:50:12 +02:00
Martin Trigaux e04a87e11f [IMP] website_sale: do not show transaction on sale order
This object is quite technical and has not purpose to be displayed on a sale order.
2014-09-17 12:59:06 +02:00