[IMP] billing_address_in_website_sale: apply changes to match latest odoo 18.0

Author: mpkh-odoo

Diff for: billing_address_in_website_sale/__manifest__.py

@@ -2,7 +2,6 @@
     "name": "Billing Address In Website",
     "depends": [
         "website_sale",
-        "l10n_in",
     ],
     "data": [
         "views/templates.xml",

Diff for: billing_address_in_website_sale/controllers/main.py

@@ -7,61 +7,37 @@ class WebsiteSaleInherit(WebsiteSale):
     def get_address(self, vat=None):
         if not vat:
             return {"error": "Please enter VAT number"}
-        address_values = request.env["res.partner"].sudo()._l10n_in_get_partner_vals_by_vat(vat)
+        address_values = request.env["res.partner"].sudo().enrich_by_gst(vat)
         if not address_values:
             return {"error": "Please enter valid VAT number"}
-        address_values["country"] = request.env["res.country"].browse(address_values["country_id"]).name
         return address_values
 
-    @route(
-        "/shop/checkout",
-        type="http",
-        methods=["GET"],
-        auth="public",
-        website=True,
-        sitemap=False,
-    )
-    def shop_checkout(self, try_skip_step=None, **query_params):
-        response = super().shop_checkout(try_skip_step=try_skip_step, **query_params)
-        if response.qcontext.get("order"):
-            if response.qcontext.get(
-                "order"
-            ).partner_invoice_id != response.qcontext.get("delivery_addresses"):
-                response.qcontext["want_tax_credit"] = True
-                response.qcontext["partner"] = response.qcontext.get(
-                    "order"
-                ).partner_invoice_id
-        return response
-
     @route(
         "/shop/billing_address/submit",
         type="json",
         auth="public",
         website=True,
     )
-    def shop_billing_address_submit(self, vat=None, name=None, partner_id=None):
+    def shop_billing_address_submit(self, address=None, name=None, partner_id=None):
         order_sudo = request.website.sale_get_order()
         if partner_id:
-            partner_sudo, _ = self._prepare_address_update(order_sudo, partner_id=int(partner_id))
+            partner_sudo = request.env["res.partner"].browse(int(partner_id))
             partner_sudo.write({"name": name})
-            return {"partner_id": partner_id}
-        address_values = (
-            request.env["res.partner"].sudo()._l10n_in_get_partner_vals_by_vat(vat)
-        )
-        if not address_values:
-            return {"error": "Please enter valid VAT number"}
-        address_values.update(
-            {
-                "type": "invoice",
-                "name": name,
-                "phone": order_sudo.partner_id.phone,
-                "email": order_sudo.partner_id.email,
-            }
-        )
-        partner_sudo = request.env["res.partner"].sudo().create(address_values)
+            return True
+        partner_sudo = request.env["res.partner"].sudo().create({
+            'name': name,
+            'company_type': 'company',
+            'parent_id': False,
+            'street': address.get('street'),
+            'street2': address.get('street2'),
+            'city': address.get('city'),
+            'state_id': address.get('state_id', {}).get('id', False),
+            'country_id': address.get('country_id', {}).get('id', False),
+            'zip': address.get('zip'),
+            'vat': address.get('vat'),
+            'email': address.get("email") or order_sudo.partner_id.email,
+            'phone': address.get("phone") or order_sudo.partner_id.phone,
+        })
         order_sudo._update_address(partner_sudo.id, {"partner_invoice_id"})
-        order_sudo.partner_id.write(
-            {"type": "delivery", "parent_id": partner_sudo}
-        )
-        return {"partner_sudo": partner_sudo}
-    
+        order_sudo.partner_id.write({"type": "delivery", "parent_id": partner_sudo})
+        return True

Diff for: billing_address_in_website_sale/static/src/checkout.js

@@ -9,9 +9,10 @@ WebsiteSaleCheckout.include({
     }, WebsiteSaleCheckout.prototype.events),
 
     async start() {
-        this._onTaxCreditToggle({
-            currentTarget: this.el.querySelector('#want_tax_credit_checkbox'),
-        });
+        this.vatLable = this.el.querySelector('#vat_label');
+        this.companyName = this.el.querySelector('#company_name');
+        this.address = this.el.querySelector('#address');
+        this.partnerId = this.el.querySelector('#partner_id');
         return this._super(...arguments);
     },
 
@@ -27,18 +28,11 @@ WebsiteSaleCheckout.include({
 
     async _onChangeVat(ev) {
         const vat = ev.currentTarget.value.trim();
-        const address_values = await rpc('/shop/vat/address', { vat: vat });
-        if (address_values.error) {
-            this.el.querySelector('#vat_warning').textContent = address_values.error;
-            this.el.querySelector('#vat_label').textContent = "Vat Number";
-            this.el.querySelector('#company_name').value = "";
-        }
-        else {
-            this.el.querySelector('#vat_warning').textContent = "";
-            this.el.querySelector('#vat_label').textContent = address_values.country;
-            this.el.querySelector('#company_name').value = address_values.name;
-        }
-        this.el.querySelector('#partner_id').value = "";
+        const addressValues = await rpc('/shop/vat/address', { vat });
+        this.vatLable.textContent = addressValues.country_id ? addressValues.country_id.display_name : "Vat Number";
+        this.companyName.value = addressValues.name || "";
+        this.address.value = JSON.stringify(addressValues);
+        this.partnerId.value = "";
     },
 
 });

Diff for: billing_address_in_website_sale/static/src/website_sale_tracking.js

@@ -2,29 +2,36 @@ import websiteSaleTracking from '@website_sale/js/website_sale_tracking'
 import { rpc } from "@web/core/network/rpc";
 
 websiteSaleTracking.include({
+
     events: Object.assign({
         'click #confirm_btn': '_onConfirmClick',
     }, websiteSaleTracking.prototype.events),
 
-    async _onConfirmClick() {
+    async _onConfirmClick(ev) {
+        ev.preventDefault();
         const checkbox = this.el.querySelector("#want_tax_credit_checkbox");
-        if (checkbox.checked) {
-            const vat = this.el.querySelector("#vat_number").value.trim();
-            const companyName = this.el.querySelector("#company_name").value.trim();
-            const warning = document.querySelector('#vat_warning');
-            const partnerId = this.el.querySelector('input[name="partner_id"]').value;
-            if (!vat) {
-                warning.textContent = "VAT number is required.";
+        if (checkbox && checkbox.checked) {
+            const name = this.el.querySelector("#company_name").value.trim();
+            const partner_id = this.el.querySelector('input[name="partner_id"]').value;
+            const address = JSON.parse(this.el.querySelector("#address").value || '{"error": "Please enter VAT number"}');
+            if (address.error) {
+                this._displayError(address.error);
                 return;
             }
-            const data = { vat, name: companyName };
-            if (partnerId) data.partner_id = partnerId;
-            const response = await rpc('/shop/billing_address/submit', data);
-            if (response.error) {
-                warning.textContent = response.error;
+            if (!name) {
+                this._displayError("Company name is required.");
                 return;
             }
+            await rpc('/shop/billing_address/submit', { name, partner_id, address, });
         }
         window.location.href = "/shop/confirm_order";
-    }
+    },
+
+    _displayError(msg) {
+        const errorsDiv = this.el.querySelector("#errors");
+        const errorHeader = document.createElement('h5');
+        errorHeader.classList.add('text-danger', 'alert', 'alert-danger');
+        errorHeader.textContent = msg;
+        errorsDiv.replaceChildren(errorHeader);
+    },
 })

Diff for: billing_address_in_website_sale/static/tests/tours/test_tax_credit_checkbox.js

@@ -8,11 +8,6 @@ registry.category("web_tour.tours").add("tax_credit_checkbox_test", {
         ...tourUtils.addToCart({ productName: "Office Chair Black TEST" }),
         tourUtils.goToCart({ quantity: 1 }),
         tourUtils.goToCheckout(),
-        {
-            content: "Click Edit button",
-            trigger: 'a[href="/shop/checkout"].float-end.no-decoration',
-            run: 'click'
-        },
         {
             content: "Click 'Want Tax Credit' checkbox",
             trigger: "input#want_tax_credit_checkbox",
@@ -22,5 +17,48 @@ registry.category("web_tour.tours").add("tax_credit_checkbox_test", {
             content: "Check VAT and Company fields are visible",
             trigger: '#vat_number:visible, #company_name:visible',
         },
+        {
+            content: "Click Confirm button",
+            trigger: "#confirm_btn",
+            run: "click",
+        },
+        {
+            content: "Error should show: please enter correct Vat Number",
+            trigger: "#errors:contains('Please enter VAT number')",
+        },
+        {
+            content: "Uncheck 'Want Tax Credit' checkbox",
+            trigger: "input#want_tax_credit_checkbox:checked",
+            run: "click",
+        },
+        {
+            content: "Click Confirm button",
+            trigger: "#confirm_btn",
+            run: "click",
+        },
+        {
+            content: "Check delivery and billing are same",
+            trigger: "#delivery_and_billing",
+            run: () => {
+                const address_card = document.querySelector("#delivery_and_billing");
+                const address_text = address_card.innerText;
+                if (!address_text.includes("Delivery & Billing")) {
+                    throw new Error("addresses are not the same");
+                }
+            }
+        },
+        {
+            content: "Click Edit button on payment page",
+            trigger: "#delivery_and_billing a[href='/shop/checkout']",
+            run: "click"
+        },
+        {
+            content: "Verify Want Tax Credit checkbox is unchecked",
+            trigger: "#want_tax_credit_checkbox:not(:checked)",
+        },
+        {
+            content: "Verify tax credit container is hidden",
+            trigger: "#tax_credit_container:not(:visible)",
+        },
     ],
 });

Diff for: billing_address_in_website_sale/tests/test_tax_credit_checkbox.py

@@ -1,7 +1,6 @@
 import odoo.tests
 
 
-@odoo.tests.tagged("post_install", "-at_install")
 class TestTaxCreditCheckbox(odoo.tests.HttpCase):
     def test_tax_credit_checkbox_flow(self):
         self.env["product.product"].create(

Diff for: billing_address_in_website_sale/views/templates.xml

@@ -18,73 +18,69 @@
 
     <template id="tax_credit_row">
         <div id="tax_credit_row">
+            <h4 class="fs-6 fw-bold">BILLING ADDRESS</h4>
             <t t-set="has_delivery" t-value="order._has_deliverable_products()" />
-            <div t-if="has_delivery" class="form-check form-switch mt-2 mb-3">
-                <label id="want_tax_credit_label">
+            <div t-if="has_delivery">
+                <label id="want_tax_credit_label" class="form-switch mt-3 mb-3">
                     <input
                         type="checkbox"
                         id="want_tax_credit_checkbox"
                         class="form-check-input"
                         name="want_tax_credit"
-                        t-att-checked="want_tax_credit"
-                    /> Want tax-credit </label>
-            </div>
-            <div id="tax_credit_container" class="row">
-
-                <input type="hidden" id="partner_id" name="partner_id"
-                    t-att-value="partner.id if partner else '' " />
-                <div id="vat_field" class="col-md-6">
-                    <label id="vat_label" class="form-label"
-                        t-esc="partner.country_id.name if partner else 'Vat Number'">
-                    </label>
-                    <input
-                        type="text"
-                        id="vat_number"
-                        name="vat"
-                        class="form-control"
-                        t-att-value="partner.vat if partner else ''"
-                    />
+                        t-att-checked="'checked' if not use_delivery_as_billing else None"
+                    /> Want
+                    tax-credit </label>
+                <div id="tax_credit_container"
+                    t-attf-class="row {{'d-none' if use_delivery_as_billing else ''}}">
+                    <input type="hidden" id="partner_id" name="partner_id"
+                        t-att-value="order.partner_invoice_id.id if not use_delivery_as_billing else '' " />
+                    <input type="hidden" id="address" name="address" />
+                    <div id="vat_field" class="col-md-6">
+                        <label id="vat_label" class="form-label"
+                            t-esc="order.partner_invoice_id.country_id.name if not use_delivery_as_billing else 'Vat Number'">
+                        </label>
+                        <input
+                            type="text"
+                            id="vat_number"
+                            name="vat"
+                            class="form-control"
+                            t-att-value="order.partner_invoice_id.vat if not use_delivery_as_billing else ''"
+                        />
+                    </div>
+                    <div id="company_name_field" class="col-md-6">
+                        <label class="form-label">Company Name</label>
+                        <input
+                            type="text"
+                            id="company_name"
+                            name="company_name"
+                            class="form-control"
+                            t-att-value="order.partner_invoice_id.name if not use_delivery_as_billing else ''"
+                        />
+                    </div>
                 </div>
-                <div id="company_name_field" class="col-md-6">
-                    <label class="form-label">Company Name</label>
-                    <input
-                        type="text"
-                        id="company_name"
-                        name="company_name"
-                        class="form-control"
-                        t-att-value="partner.name if partner else ''"
-                    />
-                </div>
-
-                <div id="vat_warning" class="col-md-6 mt-2 text-danger"></div>
             </div>
+            <t t-else="">
+                <t t-call="website_sale.address_row">
+                    <t t-set="is_invoice" t-value="True"/>
+                    <t t-set="addresses" t-value="billing_addresses"/>
+                    <t t-set="selected_address" t-value="order.partner_invoice_id"/>
+                </t>
+            </t>
         </div>
     </template>
 
     <template id="checkout_inherit_add_tax_credit_row" inherit_id="website_sale.checkout">
+        <xpath expr="//div[@id='shop_checkout']" position="before">
+            <div id="errors" />
+        </xpath>
         <xpath expr="//t[@t-call='website_sale.billing_address_row']" position="before">
             <t t-call="billing_address_in_website_sale.tax_credit_row" />
         </xpath>
     </template>
 
     <template id="checkout_confirm_override" inherit_id="website_sale.navigation_buttons">
-        <xpath expr="//a[@name='website_sale_main_button']" position="replace">
-            <t t-if="xmlid in ['website_sale.checkout']">
-                <button type="submit"
-                    name="website_sale_main_button"
-                    id="confirm_btn"
-                    class="btn btn-primary w-100"> Confirm <i
-                        class="fa fa-angle-right ms-2 fw-light" />
-                </button>
-            </t>
-            <t t-else="">
-                <a role="button" name="website_sale_main_button"
-                    t-attf-class="#{_cta_classes} btn btn-primary #{not website_sale_order._is_cart_ready() and 'disabled'} #{_form_send_navigation and 'order-lg-3 w-100 w-lg-auto ms-lg-auto' or 'w-100'}"
-                    t-att-href="step_specific_values['main_button_href']">
-                    <t t-out="step_specific_values['main_button']" />
-                    <i class="fa fa-angle-right ms-2 fw-light" />
-                </a>
-            </t>
+        <xpath expr="//a[@name='website_sale_main_button']" position="attributes">
+            <attribute name="t-att-id">"confirm_btn" if xmlid == 'website_sale.checkout' else None</attribute>
         </xpath>
     </template>
 

Diff for: distribute_cost_task/model/sale_order.py

@@ -26,7 +26,7 @@ def _compute_divide_column(self):
                 order.divide_column = has_zero_divide_cost
 
     def _get_order_lines_to_report(self):
-        order_lines = super(SaleOrder, self)._get_order_lines_to_report()
+        order_lines = super()._get_order_lines_to_report()
         return order_lines.filtered(
             lambda line: not line.divide_from_order_lines or line.divide_cost > 0
         )