[16.0] mig delivery pickup (TODO) #5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d add the name of the recipient
…elivery_pickup In the same time, when setting the pickup site, the the set_delivry method is not set on the sale order
This service can be used to search for pickup sites available for the site
Co-Authored-By: Laurent Mignon (ACSONE) <[email protected]>
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
3 times, most recently
from
98c42b6 to
8705c0a
Compare
|
@sebastienbeau ,can you do a review. |
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
3 times, most recently
from
6182121 to
6170e7f
Compare
sebastienbeau
commented
May 17, 2024
Comment on lines
49
to
51
| pickup_site_id = data.pickup_site_id | ||
| pickup_site_obj = self.env["dropoff.site"] | ||
| pickup_site = pickup_site_obj.search([("id", "=", pickup_site_id.id)]) |
There was a problem hiding this comment.
Suggested change
| pickup_site_id = data.pickup_site_id | |
| pickup_site_obj = self.env["dropoff.site"] | |
| pickup_site = pickup_site_obj.search([("id", "=", pickup_site_id.id)]) | |
| picking_site = self.env["dropoff.site"].search([("id", "=", data.pickup_site_id)]) |
sebastienbeau
commented
May 17, 2024
| pickup_site = pickup_site_obj.search([("id", "=", pickup_site_id.id)]) | ||
| if not pickup_site: | ||
| raise UserError(_("Invalid code for pickup site")) | ||
| self._set_carrier(cart, pickup_site) |
There was a problem hiding this comment.
Suggested change
| self._set_carrier(cart, pickup_site) | |
| if pickup_site.carrier_id not in cart.shopinvader_available_carrier_ids: | |
| raise UserError(_("This delivery method is not available for your order")) | |
| self._set_carrier_and_price(cart, pickup_site.carrier_id.id) |
sebastienbeau
commented
May 17, 2024
| @@ -0,0 +1,13 @@ | |||
| # Copyright 2019 ACSONE SA/NV | |||
There was a problem hiding this comment.
not needed, file can be removed
sebastienbeau
commented
May 17, 2024
Comment on lines
62
to
74
| if cart and cart.shopinvader_available_carrier_ids: | ||
| available_carriers = cart.shopinvader_available_carrier_ids | ||
| domain = self._get_domain_dropoff_site(params, available_carriers) | ||
| return self.env["dropoff.site"].search(domain) | ||
| return self.env["dropoff.site"].search([]) | ||
|
|
||
| def _get_domain_dropoff_site(self, params, available_carriers): | ||
| carrier_id = params.carrier_id | ||
| if carrier_id: | ||
| if carrier_id not in available_carriers.ids: | ||
| return FALSE_DOMAIN | ||
| return [("carrier_id", "=", carrier_id)] | ||
| return [("carrier_id", "in", available_carriers.ids)] |
There was a problem hiding this comment.
Suggested change
| if cart and cart.shopinvader_available_carrier_ids: | |
| available_carriers = cart.shopinvader_available_carrier_ids | |
| domain = self._get_domain_dropoff_site(params, available_carriers) | |
| return self.env["dropoff.site"].search(domain) | |
| return self.env["dropoff.site"].search([]) | |
| def _get_domain_dropoff_site(self, params, available_carriers): | |
| carrier_id = params.carrier_id | |
| if carrier_id: | |
| if carrier_id not in available_carriers.ids: | |
| return FALSE_DOMAIN | |
| return [("carrier_id", "=", carrier_id)] | |
| return [("carrier_id", "in", available_carriers.ids)] | |
| domain = data.to_odoo_domain() | |
| if cart: | |
| domain = expression.AND([domain, [("carrier_id", "in", cart.shopinvader_available_carrier_ids.ids)]) | |
| return self.env["dropoff.site"].search(domain) |
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
2 times, most recently
from
3082d19 to
ddc0dfc
Compare
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
from
ddc0dfc to
046785c
Compare
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
from
046785c to
75fff45
Compare
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
from
75fff45 to
9073abf
Compare
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
from
9073abf to
0ca4616
Compare
sebastienbeau
force-pushed
the
16.0-mig-delivery-pickup
branch
from
14fdb58 to
d87684c
Compare
chafique-delli
force-pushed
the
16.0-mig-delivery-pickup
branch
4 times, most recently
from
3b4f49d to
c4065c2
Compare
sebastienbeau
force-pushed
the
16.0-mig-delivery-pickup
branch
from
c4065c2 to
6b93a80
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.