Skip to content

[FIX] pos: WIP #5245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kcv-odoo wants to merge 1 commit into
base: master-portal-address-2.0-kcv
Choose a base branch
from
Draft

[FIX] pos: WIP #5245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions addons/account/models/account_move.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7898,18 +7898,6 @@ def _set_reversed_entry(self, credit_note):
if len(original_invoice) == 1 and original_invoice._refunds_origin_required():
credit_note.reversed_entry_id = original_invoice.id

@api.model
def get_invoice_localisation_fields_required_to_invoice(self, country_id):
""" Returns the list of fields that needs to be filled when creating an invoice for the selected country.
This is required for some flows that would allow a user to request an invoice from the portal.
Using these, we can get their information and dynamically create form inputs based for the fields required legally for the company country_id.
The returned fields must be of type ir.model.fields in order to handle translations

:param country_id: The country for which we want the fields.
:return: an array of ir.model.fields for which the user should provide values.
"""
return []

def get_extra_print_items(self):
""" Helper to dynamically add items in the 'Print' menu of list and form of account.move.
"""
Expand Down
14 changes: 0 additions & 14 deletions addons/account/models/partner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,20 +869,6 @@ def _get_vat_required_valid(self, company=None):
self.ensure_one()
return bool(self.vat and self.vat != '/')

# TODO accounting/JCO, seems strange that this address validation logic is only there for pos, and
# not for standard address management on portal/ecommerce
@api.model
def get_partner_localisation_fields_required_to_invoice(self, country_id):
""" Returns the list of fields that needs to be filled when creating an invoice for the selected country.
This is required for some flows that would allow a user to request an invoice from the portal.
Using these, we can get their information and dynamically create form inputs based for the fields required legally for the company country_id.
The returned fields must be of type ir.model.fields in order to handle translations

:param country_id: The country for which we want the fields.
:return: an array of ir.model.fields for which the user should provide values.
"""
return []

# -------------------------------------------------------------------------
# EDI
# -------------------------------------------------------------------------
Expand Down
20 changes: 0 additions & 20 deletions addons/account/views/account_portal_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,26 +230,6 @@
</div>
</template>

<!-- Get the fields set in required_fields and display them as form elements. Doesn't create the form itself. -->
<template id="portal_invoice_required_fields_form">
<t t-foreach="required_fields" t-as="required_field">
<div t-attf-class="mb-3 col-xl-6">
<!-- select by default the value passed in the data or corresponding to the "default" attribute on the field -->
<t t-set="field_info" t-value="env[required_field.model]._fields[required_field.name]"/>
<t t-set="default_value" t-value="extra_field_values.get(field_prefix + required_field.name) or field_info.default and field_info.default(required_field.model)"/>
<t t-if="required_field.ttype == 'selection'">
<label class="col-form-label" t-att-for="field_prefix + required_field.name"><t t-out="required_field.field_description"/></label>
<select class="form-select" t-att-name="field_prefix + required_field.name" required="required">
<option t-att-selected="not default_value" disabled="disabled" value=""><t t-out="'Select the %s ...' % required_field.field_description.lower()"/></option>
<t t-foreach="required_field.selection_ids" t-as="selection">
<option t-att-selected="default_value and default_value == selection.value" t-att-value="selection.value"><t t-out="selection.name"/></option>
</t>
</select>
</t>
</div>
</t>
</template>

<template id="portal_my_details" inherit_id="portal.portal_my_details">
<div name="address_details" position="inside">
<t t-if="len(invoice_sending_methods) > 1 and invoice_edi_formats">
Expand Down
17 changes: 0 additions & 17 deletions addons/l10n_pe_pos/views/templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,6 @@
</h4>
</xpath>

<!-- Show PE fields preview info, and show warning is a required field need to be completed -->
<xpath expr="//t[@id='partner_vat']" position="before">
<t t-if="pos_order.company_id.country_code == 'PE'">
<t t-if="partner.l10n_latam_identification_type_id">
<t t-out="partner.l10n_latam_identification_type_id.name" /> -
</t>
<t t-else="">
<span class="text-danger">* Please configure your Identification Type</span><br />
</t>
</t>
</xpath>
<xpath expr="//t[@id='partner_vat']" position="after">
<t t-else="">
<span class="text-danger">* Please configure your Identification Number</span><br />
</t>
</xpath>

</template>

</odoo>
128 changes: 41 additions & 87 deletions addons/point_of_sale/controllers/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@

from odoo import http, _
from odoo.fields import Domain
from odoo.http import request
from odoo.http import request, route
from odoo.tools import format_amount, file_open
from odoo.addons.account.controllers.portal import PortalAccount
from odoo.exceptions import UserError
from datetime import timedelta, datetime

_logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -172,19 +171,6 @@ def invoice_request_screen(self, **kwargs):

@http.route(['/pos/ticket/validate'], type='http', auth="public", website=True, sitemap=False)
def show_ticket_validation_screen(self, access_token='', **kwargs):
def _parse_additional_values(fields, prefix, kwargs):
""" Parse the values in the kwargs by extracting the ones matching the given fields name.
:return a dict with the parsed value and the field name as key, and another on with the prefix to
re-render the form with previous values if needed.
"""
res, res_prefixed = {}, {}
for field in fields:
key = prefix + field.name
if key in kwargs:
val = kwargs.pop(key)
res[field.name] = val
res_prefixed[key] = val
return res, res_prefixed

# If the route is called directly, return a 404
if not access_token:
Expand All @@ -205,57 +191,13 @@ def _parse_additional_values(fields, prefix, kwargs):
if not request.env['res.company']._with_locked_records(pos_order, allow_raising=False):
return

# Get the optional extra fields that could be required for a localisation.
pos_order_country = pos_order.company_id.account_fiscal_country_id
additional_partner_fields = request.env['res.partner'].get_partner_localisation_fields_required_to_invoice(pos_order_country)
additional_invoice_fields = request.env['account.move'].get_invoice_localisation_fields_required_to_invoice(pos_order_country)

user_is_connected = not request.env.user._is_public()

# Validate the form by ensuring required fields are filled and the VAT is correct.
form_values = {'extra_field_values': {}}
partner = (user_is_connected and request.env.user.partner_id) or pos_order.partner_id
if kwargs and request.httprequest.method == 'POST':
form_values.update(kwargs)
# Extract the additional fields values from the kwargs now as they can't be there when validating the 'regular' partner form.
partner_values, prefixed_partner_values = _parse_additional_values(additional_partner_fields, 'partner_', kwargs)
form_values['extra_field_values'].update(prefixed_partner_values)
# Do the same for invoice values, separately as they are only needed for the invoice creation.
invoice_values, prefixed_invoice_values = _parse_additional_values(additional_invoice_fields, 'invoice_', kwargs)
form_values['extra_field_values'].update(prefixed_invoice_values)
# Check the basic form fields if the user is not connected as we will need these information to create the new user.
partner, feedback_dict = self._create_or_update_address(partner, **(kwargs | partner_values))
form_values.update(feedback_dict)
missing_fields, error_messages = self._validate_extra_form_details(
partner_values | invoice_values,
additional_partner_fields + additional_invoice_fields
)
form_values.update({
'invalid_field': form_values.get('invalid_fields', []) + list(missing_fields),
'messages': form_values.get('messages', []) + error_messages
})
if not form_values.get('invalid_fields'):
return self._get_invoice(partner, invoice_values, pos_order, additional_invoice_fields, kwargs)
raise UserError(_(
"Message: %(messages)s\nPlease update the %(invalid_fields)s",
messages=form_values.get('messages'),
invalid_fields=form_values.get('invalid_fields'),
))

elif user_is_connected:
return self._get_invoice(partner, {}, pos_order, additional_invoice_fields, kwargs)

# Prefill the customer extra values if there is any and an user is connected
if partner:
if additional_partner_fields:
form_values['extra_field_values'] = {'partner_' + field.name: partner[field.name] for field in additional_partner_fields if field.name not in form_values['extra_field_values']}

# This is just to ensure that the user went and filled its information at least once.
# Another more thorough check is done upon posting the form.
if not partner.country_id or not partner.street:
form_values['partner_address'] = False
else:
form_values['partner_address'] = partner.contact_address
# This is just to ensure that the user went and filled its information at least once.
# Another more thorough check is done upon posting the form.
partner_address = False
if partner and partner.country_id and partner.street:
partner_address = partner.contact_address

return request.render("point_of_sale.ticket_validation_screen", {
**self._prepare_address_form_values(partner, pos_order=pos_order, **kwargs),
Expand All @@ -265,11 +207,9 @@ def _parse_additional_values(fields, prefix, kwargs):
'format_amount': format_amount,
'env': request.env,
'pos_order': pos_order,
'invoice_required_fields': additional_invoice_fields,
'partner_required_fields': additional_partner_fields,
'access_token': access_token,
'invoice_sending_methods': {'email': _("by Email")},
**form_values,
'partner_address': partner_address,
})

def _get_default_country(self, pos_order=False, **kwargs):
Expand All @@ -279,23 +219,37 @@ def _get_default_country(self, pos_order=False, **kwargs):
return pos_order.company_id.account_fiscal_country_id
return super()._get_default_country(pos_order=pos_order, **kwargs)

def _validate_extra_form_details(self, addtional_form_values, additional_required_fields):
""" Ensure that all additional required fields have a value in the data. """
missing_fields = set()
error_messages = []
for field in additional_required_fields:
if field.name not in addtional_form_values or not addtional_form_values[field.name]:
missing_fields.add(field.name)
error_messages.append(_("The field %s must be filled.", field.field_description.lower()))
return missing_fields, error_messages

def _get_invoice(self, partner, invoice_values, pos_order, additional_invoice_fields, kwargs):

pos_order.partner_id = partner
# Get the required fields for the invoice and add them to the context as default values.
with_context = {}
for field in additional_invoice_fields:
with_context.update({f'default_{field.name}': invoice_values.get(field.name)})
# Allowing default values for moves is important for some localizations that would need specific fields to be set on the invoice, such as Mexico.
pos_order.with_context(with_context).action_pos_order_invoice()
return request.redirect('/my/invoices/%s?access_token=%s' % (pos_order.account_move.id, pos_order.account_move._portal_ensure_token()))
@route(
"/pos/ticket/get_invoice",
type="http",
methods=["POST"],
auth="public",
website=True,
sitemap=False,
)
def pos_ticket_get_invoice(
self, partner_sudo=None, access_token=None, **form_data
):
if not access_token:
return request.not_found()
pos_order = request.env['pos.order'].sudo().search([('access_token', '=', access_token)])
if not pos_order.exists():
return request.not_found()

partner_sudo, feedback_dict = self._create_or_update_address(
partner_sudo, access_token=access_token, **form_data,
)
if feedback_dict.get("invalid_fields"):
# Return if error when creating/updating partner.
return request.make_json_response(feedback_dict)
# Only update customer if order's partner is a public user's partner.
if pos_order.partner_id.is_public:
pos_order.partner_id = partner_sudo
pos_order.action_pos_order_invoice()

return request.make_json_response({
"redirect_url": "/my/invoices/%s?access_token=%s" % (
pos_order.account_move.id,
pos_order.account_move._portal_ensure_token()
)
})
Loading