diff --git a/setup/website_sale_address_format/odoo/addons/website_sale_address_format b/setup/website_sale_address_format/odoo/addons/website_sale_address_format new file mode 120000 index 0000000000..046ffa8c1a --- /dev/null +++ b/setup/website_sale_address_format/odoo/addons/website_sale_address_format @@ -0,0 +1 @@ +../../../../website_sale_address_format \ No newline at end of file diff --git a/setup/website_sale_address_format/setup.py b/setup/website_sale_address_format/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/website_sale_address_format/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/website_sale_address_format/README.rst b/website_sale_address_format/README.rst new file mode 100644 index 0000000000..17a70aef86 --- /dev/null +++ b/website_sale_address_format/README.rst @@ -0,0 +1,99 @@ +=========================== +Website Sale Address Format +=========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github + :target: https://github.com/OCA/e-commerce/tree/15.0/website_sale_address_format + :alt: OCA/e-commerce +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_address_format + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/113/15.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +The eCommerce address presentation (in /shop/address) of vanilla Odoo does not cover +the format of some countries. + +This module adds the capability to change the address field sequence in the eCommerce +address page. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +Go to Contacts > Configuration > Localization > Countries, and open the country for +which the address field sequence should be adjusted in the eCommerce address page. + +Update 'Layout in eCommerce Address Forms' field with something like the below (an +example for Japan): + +.. code-block:: + + %(country_name)s + %(zip)s + %(state_code)s + %(city)s + %(street)s + %(street2)s + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Quartile Limited + +Contributors +~~~~~~~~~~~~ + +* `Quartile `_: + + * Yoshi Tashiro + * Tim Lai + * Aung Ko Ko Lin + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/e-commerce `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_sale_address_format/__init__.py b/website_sale_address_format/__init__.py new file mode 100644 index 0000000000..91c5580fed --- /dev/null +++ b/website_sale_address_format/__init__.py @@ -0,0 +1,2 @@ +from . import controllers +from . import models diff --git a/website_sale_address_format/__manifest__.py b/website_sale_address_format/__manifest__.py new file mode 100644 index 0000000000..566ef23f43 --- /dev/null +++ b/website_sale_address_format/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2020-2022 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Website Sale Address Format", + "version": "15.0.1.0.0", + "author": "Quartile Limited, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/e-commerce", + "category": "Website/Website", + "license": "AGPL-3", + "depends": ["website_sale"], + "data": ["views/res_country_views.xml"], + "assets": { + "web.assets_frontend": [ + "website_sale_address_format/static/src/js/website_sale_address_format.js", + ], + }, + "installable": True, +} diff --git a/website_sale_address_format/controllers/__init__.py b/website_sale_address_format/controllers/__init__.py new file mode 100644 index 0000000000..12a7e529b6 --- /dev/null +++ b/website_sale_address_format/controllers/__init__.py @@ -0,0 +1 @@ +from . import main diff --git a/website_sale_address_format/controllers/main.py b/website_sale_address_format/controllers/main.py new file mode 100644 index 0000000000..94db4b11ba --- /dev/null +++ b/website_sale_address_format/controllers/main.py @@ -0,0 +1,15 @@ +# Copyright 2020 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import http + +from odoo.addons.website_sale.controllers.main import WebsiteSale + + +class WebsiteSale(WebsiteSale): + @http.route() + def country_infos(self, country, mode, **kw): + res = super(WebsiteSale, self).country_infos(country, mode, **kw) + if country.online_address_format: + res["fields"] = country.get_online_address_fields() + return res diff --git a/website_sale_address_format/models/__init__.py b/website_sale_address_format/models/__init__.py new file mode 100644 index 0000000000..11573766f2 --- /dev/null +++ b/website_sale_address_format/models/__init__.py @@ -0,0 +1 @@ +from . import res_country diff --git a/website_sale_address_format/models/res_country.py b/website_sale_address_format/models/res_country.py new file mode 100644 index 0000000000..7bd68d5905 --- /dev/null +++ b/website_sale_address_format/models/res_country.py @@ -0,0 +1,26 @@ +# Copyright 2022-2022 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +import re + +from odoo import fields, models + + +class ResCountry(models.Model): + _inherit = "res.country" + + online_address_format = fields.Text( + string="Layout in eCommerce Address Forms", + help="Display format to use for addresses belonging to this country in " + "eCommerce address forms.\n\n" + "You can use python-style string pattern with all the fields of the address " + "(for example, use '%(street)s' to display the field 'street') plus" + "\n%(state_name)s: the name of the state" + "\n%(state_code)s: the code of the state" + "\n%(country_name)s: the name of the country" + "\n%(country_code)s: the code of the country", + ) + + def get_online_address_fields(self): + self.ensure_one() + return re.findall(r"\((.+?)\)", self.online_address_format) diff --git a/website_sale_address_format/readme/CONFIGURE.rst b/website_sale_address_format/readme/CONFIGURE.rst new file mode 100644 index 0000000000..1f3f8b71aa --- /dev/null +++ b/website_sale_address_format/readme/CONFIGURE.rst @@ -0,0 +1,14 @@ +Go to Contacts > Configuration > Localization > Countries, and open the country for +which the address field sequence should be adjusted in the eCommerce address page. + +Update 'Layout in eCommerce Address Forms' field with something like the below (an +example for Japan): + +.. code-block:: + + %(country_name)s + %(zip)s + %(state_code)s + %(city)s + %(street)s + %(street2)s diff --git a/website_sale_address_format/readme/CONTRIBUTORS.rst b/website_sale_address_format/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..cb7fe0e429 --- /dev/null +++ b/website_sale_address_format/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* `Quartile `_: + + * Yoshi Tashiro + * Tim Lai + * Aung Ko Ko Lin diff --git a/website_sale_address_format/readme/DESCRIPTION.rst b/website_sale_address_format/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..75323738c0 --- /dev/null +++ b/website_sale_address_format/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +The eCommerce address presentation (in /shop/address) of vanilla Odoo does not cover +the format of some countries. + +This module adds the capability to change the address field sequence in the eCommerce +address page. diff --git a/website_sale_address_format/static/description/index.html b/website_sale_address_format/static/description/index.html new file mode 100644 index 0000000000..833edec36c --- /dev/null +++ b/website_sale_address_format/static/description/index.html @@ -0,0 +1,443 @@ + + + + + + +Website Sale Address Format + + + +
+

Website Sale Address Format

+ + +

Beta License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

+

The eCommerce address presentation (in /shop/address) of vanilla Odoo does not cover +the format of some countries.

+

This module adds the capability to change the address field sequence in the eCommerce +address page.

+

Table of contents

+ +
+

Configuration

+

Go to Contacts > Configuration > Localization > Countries, and open the country for +which the address field sequence should be adjusted in the eCommerce address page.

+

Update ‘Layout in eCommerce Address Forms’ field with something like the below (an +example for Japan):

+
+%(country_name)s
+%(zip)s
+%(state_code)s
+%(city)s
+%(street)s
+%(street2)s
+
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Quartile Limited
    • +
+
+
+

Contributors

+
    +
  • Quartile:
      +
    • Yoshi Tashiro
      • +
    • Tim Lai
      • +
    • Aung Ko Ko Lin
      • +
    +
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/e-commerce project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/website_sale_address_format/static/src/js/website_sale_address_format.js b/website_sale_address_format/static/src/js/website_sale_address_format.js new file mode 100644 index 0000000000..19ad43bf40 --- /dev/null +++ b/website_sale_address_format/static/src/js/website_sale_address_format.js @@ -0,0 +1,112 @@ +odoo.define( + "website_sale_online_address_format.website_sale_address_format", + function (require) { + "use strict"; + + var publicWidget = require("web.public.widget"); + + require("website_sale.website_sale"); + + publicWidget.registry.WebsiteSale.include({ + /** + * @private + */ + // [CUSTOM] Overriding the standard function _changeCountry from website_sale + _changeCountry: function () { + if (!$("#country_id").val()) { + return; + } + this._rpc({ + route: "/shop/country_infos/" + $("#country_id").val(), + params: { + mode: $("#country_id").attr("mode"), + }, + }).then(function (data) { + // Placeholder phone_code + $("input[name='phone']").attr( + "placeholder", + // eslint-disable-next-line + data.phone_code !== 0 ? "+" + data.phone_code : "" + ); + + // Populate states and display + var selectStates = $("select[name='state_id']"); + // Dont reload state at first loading (done in qweb) + if ( + selectStates.data("init") === 0 || + selectStates.find("option").length === 1 + ) { + if (data.states.length || data.state_required) { + selectStates.html(""); + _.each(data.states, function (x) { + var opt = $("