[IMP] website_sale*: move stock check at checkout #192183

lipiraux · 2025-01-02T13:00:57Z

The stock check during the checkout process is currently performed at the payment step once the origin of the goods is known. However, it would be more beneficial to execute this check further down the process if we are certain that the products are not available in any warehouse. This way, we can prevent the user from proceeding if the setup is not valid.

Before introducing new changes, this PR first introduces a refactor of the checking process during the checkout flow to allow for the improvement that follows. Consequently:

The checks are now split at each step: cart overview, delivery, payment.
To go to the next step, the current and previous steps must be valid.
The warnings have been reworked.

Following the revamp of the checking process:

On the cart overview step, the customer is now only allowed to proceed to checkout if there is at least one warehouse on the website that can fulfill the order.
When click and collect is installed, the stock is checked again on the delivery step using the selected delivery method as they may not share the same stock source.
Furthermore, to help customers better understand that in-store delivery methods and any other "standard" delivery methods (i.e. not in-store) may use different stock sources, a new badge is added on the delivery selection step indicating if the delivery method is available or not for the order.

task-4328322

See also:

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

robodoo · 2025-01-02T13:01:00Z

lipiraux · 2025-07-18T09:38:17Z

Hello @vchu-odoo , sorry for all the late changes 🫣

I noticed yesterday that I had committed a formatted version of the website_sale/**/templates.xml file which added a bunch of diff for no reason. While fixing this, I also took a bit of time to rework this file, it should be the same but cleaner IMO 😄.

vchu-odoo

Thank you for the great work!

here are some questions/suggestions.
Btw, really appreciate good test coverage for website_sale!

addons/website_sale/controllers/cart.py

addons/website_sale/controllers/main.py

addons/website_sale/models/website_checkout_step.py

addons/website_sale/controllers/main.py

addons/website_sale_collect/models/sale_order.py

vchu-odoo

Small comments left.
Could you please rebase since there are conflicts and squash as there are too many commits? :)

Thank you for your work!

addons/website_event_sale/models/sale_order.py

addons/website_sale/controllers/main.py

vchu-odoo · 2025-07-28T11:43:39Z

addons/website_sale/models/sale_order.py

-        if clear:
-            self.shop_warning = ''
-        return warn
+    def _pop_shop_warnings(self):


you always call it only for one order, why do you need to support multiple?

vchu-odoo · 2025-07-28T12:46:02Z

addons/website_sale_stock/models/sale_order.py

+        """Whether all the order lines are available on the current website."""
+        self.ensure_one()
+        # Uses list comprehension to ensure all the shop warnings are updated.
+        return all([sol._check_availability() for sol in self.order_line])  # noqa: C419


why?

Suggested change

return all([sol._check_availability() for sol in self.order_line]) # noqa: C419

return all([sol._check_availability() for sol in self.order_line])

addons/website_sale_collect/models/sale_order.py

Feyensv · 2025-09-22T08:56:41Z

Seems like a big rebase is needed here 👀

*: payment_stripe, website_event_sale, website_sale_collect, website_sale_loyalty, website_sale_mondialrelay, website_sale_stock Before this commit, it was challenging to add logic to the checkout flow's checking process as all major checks were performed at the payment step using the same method. This commit lays the foundation for future improvements by revamping the checking process during the checkout flow. Consequently: - The checks are now split at each step: cart overview, delivery, payment. - To proceed to the next step, the previous steps must be valid. - The warnings have been reworked. The primary motivation and initial benefit of this refactor is to improve stock validation. Consequently: - The stock check is now performed earlier in the checkout process: - On the cart overview step, the customer can only proceed if at least one warehouse on the website can fulfill the order. - When click and collect is installed, the stock is checked again on the delivery step using the selected delivery method, as they may not share the same stock source. - A new badge is added on the delivery selection step to indicate whether the delivery method is available for the order, helping customers understand the differences between in-store and standard delivery methods. See also: - odoo/enterprise#77155 task-4328322

lipiraux · 2025-10-03T19:03:52Z

@Feyensv its time 😱

(When you can don't worry😅)

Feyensv

Not going too deep for this first review, mostly wanted to highlight some things in the current approach that seem potentially wrong or could be improved 👀

sometimes the super call comes first, sometimes it comes last (did you have a specific logic/order for that?)
the current logic is kinda flawed if there are multiple kind of warnings on the cart, you'll only see the last one returned by the method, not the others.
You consider shop warnings as 'blocking', but warnings weren't blocking before. Some warnings put on the order/lines are only informative (and added by the add to cart call) but now if you get those, you won't be able to continue your checkout if you have any 👀

Feyensv · 2025-10-06T09:57:40Z

addons/website_sale/controllers/cart.py

+        values.update(self._get_cart_update_values(order_sudo))
+        return values
+
+    def _get_cart_update_values(self, order_sudo):


Method name seems kinda confusing to me, sounds like the values you provide to a method call, not the values you get as feedback from the request.

C3POdoo added the RD research & development, internal work label Jan 2, 2025

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch 8 times, most recently from 09f80cc to ce3d2ec Compare January 9, 2025 14:26

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch 5 times, most recently from f5afd28 to 6634cb2 Compare January 15, 2025 09:59

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch from 11c7a04 to a46c5ab Compare January 17, 2025 18:18

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch 4 times, most recently from 36b5b0e to 0028ce6 Compare January 28, 2025 13:19

This comment was marked as outdated.

Sign in to view

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch from 0028ce6 to a83a0d8 Compare February 20, 2025 15:32

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch 8 times, most recently from ab2ff81 to 85020da Compare March 6, 2025 16:45

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch 2 times, most recently from c76d884 to 68b8824 Compare July 18, 2025 09:28

vchu-odoo reviewed Jul 18, 2025

View reviewed changes

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch from af44c27 to 1329062 Compare July 22, 2025 17:43

vchu-odoo approved these changes Jul 28, 2025

View reviewed changes

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch from 1329062 to 0a18827 Compare August 26, 2025 08:21

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch 7 times, most recently from e40e986 to d9cc402 Compare September 26, 2025 15:01

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch from d9cc402 to 71bcfa1 Compare October 3, 2025 08:15

lipiraux force-pushed the master-stock-check-at-checkout-lipi branch from 71bcfa1 to dccc001 Compare October 3, 2025 11:53

lipiraux marked this pull request as ready for review October 3, 2025 19:02

C3POdoo requested review from a team and Julien00859 and removed request for a team October 3, 2025 19:03

Feyensv reviewed Oct 6, 2025

View reviewed changes

fixup! [IMP] website_sale, *: split checkout checks

9a855dc

Julien00859 removed request for a team and Julien00859 October 17, 2025 08:02

	return all([sol._check_availability() for sol in self.order_line]) # noqa: C419
	return all([sol._check_availability() for sol in self.order_line])

[IMP] website_sale*: move stock check at checkout #192183

Are you sure you want to change the base?

[IMP] website_sale*: move stock check at checkout #192183

Uh oh!

Conversation

lipiraux commented Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

robodoo commented Jan 2, 2025

Uh oh!

This comment was marked as outdated.

lipiraux commented Jul 18, 2025

Uh oh!

vchu-odoo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vchu-odoo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vchu-odoo Jul 28, 2025

Choose a reason for hiding this comment

Uh oh!

vchu-odoo Jul 28, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Feyensv commented Sep 22, 2025

Uh oh!

lipiraux commented Oct 3, 2025

Uh oh!

Feyensv left a comment

Choose a reason for hiding this comment

Uh oh!

Feyensv Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lipiraux commented Jan 2, 2025 •

edited

Loading