Commit Graph

385 Commits

Author SHA1 Message Date
Denis Ledoux 4adb4b8d15 [FIX] sale, website_sale: Send email on sale order confirmation
Not just when coming back from the payment provider to the
payment validation route `/shop/payment/validate`.

Otherwise, if you do not come back from the payment provider
page, that you quit just after having paid but just before
being redirected to Odoo, you do not receive the email.

The change within the `sale` module, while this issue concerns
`website_sale` only, has been accepted because this is a mechanism
that could be used by other modules.

opw-644348
2015-07-09 15:51:50 +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
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
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
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
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
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
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
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
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
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
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
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 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 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
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
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
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
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
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
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
Olivier Dony e5bff82aff [MERGE] Forward-port saas-5 up to f9bcd67 2014-09-17 16:39:06 +02:00
Martin Trigaux 46efc164d6 Forward port of branch saas-3 up to rev 2ee1843 2014-09-17 12:58:08 +02:00
Martin Trigaux 2ee1843757 [FIX] website_sale: retrieve transactions as superuser
Due to additional security rules, the transactions made as public user will have a new partner_id. The transaction needs to be retrieved as admin to be set in the context.
The operations in payment_get_status are made as superuser but the session_id is checked in the assert above to avoid url manipulation.
2014-09-17 12:52:28 +02:00
Christophe Matthieu b2f3de6da7 [FIX] website_sale: Price of accessory product are all time null. Need to use new api to send the context. 2014-09-10 11:22:04 +02:00
Christophe Matthieu c9a134b541 [FIX] website_sale: customer write on public user and the sale order is apply to public user if the public user is active=True; the checkout layout display state_id field twice 2014-09-04 13:31:44 +02:00
Thibault Delavallée 2ad607feec [FIX] website_sale: pay now button should be translatable 2014-09-02 11:31:03 +02:00
Christophe Simonis 8046b7367d [MERGE] forward port of branch saas-5 up to 7e117b1 2014-08-28 16:51:11 +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
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
Denis Ledoux 0023955074 [FIX] website_sale: confirm sale order on payment_confirmation
Same behavior than in saas-5
2014-08-01 14:48:16 +02:00
Martin Trigaux 6dc94f0c4e Forward port of branch saas-5 up to eda2f06 2014-07-28 16:37:56 +02:00
Jeremy Kersten 451d2de355 [FIX] website_sale: fix error in tracking_last_order which was using the field is_delivery from module delivery 2014-07-24 11:07:46 +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