diff --git a/pos_partner_firstname/__manifest__.py b/pos_partner_firstname/__manifest__.py index b6c32410d4..b9b89c2eb3 100644 --- a/pos_partner_firstname/__manifest__.py +++ b/pos_partner_firstname/__manifest__.py @@ -18,10 +18,8 @@ "point_of_sale", "partner_firstname", ], - 'qweb': [ - 'static/src/xml/pos.xml' - ], - 'data': [ - 'views/assets.xml', + "qweb": ["static/src/xml/pos.xml"], + "data": [ + "views/assets.xml", ], } diff --git a/pos_partner_firstname/models/res_partner.py b/pos_partner_firstname/models/res_partner.py index 40435ee2ec..e21f9e43f7 100644 --- a/pos_partner_firstname/models/res_partner.py +++ b/pos_partner_firstname/models/res_partner.py @@ -5,12 +5,12 @@ class ResPartner(models.Model): - _inherit = 'res.partner' + _inherit = "res.partner" @api.model def create_from_ui(self, partner): - if 'is_company' in partner: - partner['is_company'] = partner['is_company'] == 'true' + if "is_company" in partner: + partner["is_company"] = partner["is_company"] == "true" return super(ResPartner, self).create_from_ui(partner) @api.model diff --git a/pos_partner_firstname/static/src/js/models.js b/pos_partner_firstname/static/src/js/models.js index 4d5051ca23..486770792f 100644 --- a/pos_partner_firstname/static/src/js/models.js +++ b/pos_partner_firstname/static/src/js/models.js @@ -1,8 +1,7 @@ -odoo.define('pos_partner_firstname.models', function (require) { +odoo.define("pos_partner_firstname.models", function (require) { "use strict"; - var models = require('point_of_sale.models'); - - models.load_fields("res.partner", ["is_company", "firstname", "lastname"]); + var models = require("point_of_sale.models"); + models.load_fields("res.partner", ["is_company", "firstname", "lastname"]); }); diff --git a/pos_partner_firstname/static/src/js/screens.js b/pos_partner_firstname/static/src/js/screens.js index 720a130d43..577c046c47 100644 --- a/pos_partner_firstname/static/src/js/screens.js +++ b/pos_partner_firstname/static/src/js/screens.js @@ -1,79 +1,79 @@ -odoo.define('pos_partner_firstname.screens', function (require) { +odoo.define("pos_partner_firstname.screens", function (require) { "use strict"; - var Screens = require('point_of_sale.screens'); + var Screens = require("point_of_sale.screens"); Screens.ClientListScreenWidget.include({ + partner_names_order: "last_first", - partner_names_order: 'last_first', - - init: function(parent, options){ + init: function (parent, options) { var self = this; this._super(parent, options); this._rpc({ - model: 'res.partner', - method: 'get_names_order', + model: "res.partner", + method: "get_names_order", args: [], - }).then(function(partner_names_order) { + }).then(function (partner_names_order) { if (partner_names_order != false) { self.partner_names_order = partner_names_order; } }); }, - _update_client_name: function(checked){ + _update_client_name: function (checked) { if (!checked) { - var lastname = $('.lastname').val() || ''; - var firstname = $('.firstname').val() || ''; + var lastname = $(".lastname").val() || ""; + var firstname = $(".firstname").val() || ""; var name = null; - if (this.partner_names_order === 'last_first_comma') { - name = lastname + ', ' + firstname; - } - else if (this.partner_names_order === 'first_last') { - name = firstname + ' ' + lastname; - } - else - { - name = lastname + ' ' + firstname; + if (this.partner_names_order === "last_first_comma") { + name = lastname + ", " + firstname; + } else if (this.partner_names_order === "first_last") { + name = firstname + " " + lastname; + } else { + name = lastname + " " + firstname; } - $('.client-name').val(name); + $(".client-name").val(name); } }, - display_client_details: function(visibility,partner,clickpos){ + display_client_details: function (visibility, partner, clickpos) { var self = this; this._super.apply(self, arguments); - if (visibility === 'edit') { - if (!$('.is_company').is(':checked')) { - $('.client-name').attr('readonly', true); + if (visibility === "edit") { + if (!$(".is_company").is(":checked")) { + $(".client-name").attr("readonly", true); } - this.$('.person').off('keyup').on('keyup', function(event) { - var checked = $('.is_company').is(':checked'); - $('.client-name').attr('readonly', !checked); - if (!checked) { - self._update_client_name(checked); - } - }); - this.$('.checkbox').off('change').on('change', function(event) { - this.value = this.checked; - if (this.name === 'is_company') { - var checked = this.checked; - $('.is_person').toArray().forEach(function(el) { - $(el).css('display', !checked ? 'block' : 'none'); - }); - var clientname = $('.client-name'); - clientname.attr('readonly', !checked); + this.$(".person") + .off("keyup") + .on("keyup", function (event) { + var checked = $(".is_company").is(":checked"); + $(".client-name").attr("readonly", !checked); if (!checked) { self._update_client_name(checked); } - else - { - $('.lastname').val(clientname.val()); - $('.firstname').val(''); + }); + this.$(".checkbox") + .off("change") + .on("change", function (event) { + this.value = this.checked; + if (this.name === "is_company") { + var checked = this.checked; + $(".is_person") + .toArray() + .forEach(function (el) { + $(el).css("display", !checked ? "block" : "none"); + }); + var clientname = $(".client-name"); + clientname.attr("readonly", !checked); + if (!checked) { + self._update_client_name(checked); + } else { + $(".lastname").val(clientname.val()); + $(".firstname").val(""); + } } - }; - }); + }); } }, - }); + }); }); diff --git a/pos_partner_firstname/static/src/xml/pos.xml b/pos_partner_firstname/static/src/xml/pos.xml index b5adc3e12a..efc0cd6556 100644 --- a/pos_partner_firstname/static/src/xml/pos.xml +++ b/pos_partner_firstname/static/src/xml/pos.xml @@ -1,4 +1,4 @@ - + @@ -6,9 +6,14 @@
Company - +
@@ -17,13 +22,17 @@
Name - +
Surname - +
@@ -35,23 +44,41 @@
Company - +
-
+
Name - +
-
+
Surname - +
diff --git a/pos_partner_firstname/views/assets.xml b/pos_partner_firstname/views/assets.xml index 9b9d6b1658..a150f7e008 100644 --- a/pos_partner_firstname/views/assets.xml +++ b/pos_partner_firstname/views/assets.xml @@ -1,10 +1,16 @@ - +