From c8b486a7381012c223fbdb296db90770db8ab5d0 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 10 Dec 2014 00:22:36 +0100 Subject: [PATCH 01/27] [ADD] 'pos_product_template' --- pos_product_template/__init__.py | 21 + pos_product_template/__openerp__.py | 67 +++ pos_product_template/demo/product_product.yml | 36 ++ pos_product_template/demo/res_groups.yml | 25 + pos_product_template/static/src/css/ppt.css | 166 +++++ pos_product_template/static/src/img/icon.png | Bin 0 -> 4290 bytes pos_product_template/static/src/js/ppt.js | 565 ++++++++++++++++++ pos_product_template/static/src/xml/ppt.xml | 130 ++++ pos_product_template/view/view.xml | 37 ++ 9 files changed, 1047 insertions(+) create mode 100644 pos_product_template/__init__.py create mode 100644 pos_product_template/__openerp__.py create mode 100644 pos_product_template/demo/product_product.yml create mode 100644 pos_product_template/demo/res_groups.yml create mode 100644 pos_product_template/static/src/css/ppt.css create mode 100644 pos_product_template/static/src/img/icon.png create mode 100644 pos_product_template/static/src/js/ppt.js create mode 100644 pos_product_template/static/src/xml/ppt.xml create mode 100644 pos_product_template/view/view.xml diff --git a/pos_product_template/__init__.py b/pos_product_template/__init__.py new file mode 100644 index 00000000..6624b810 --- /dev/null +++ b/pos_product_template/__init__.py @@ -0,0 +1,21 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Point Of Sale - Product Template module for Odoo +# Copyright (C) 2014-Today Akretion (http://www.akretion.com) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__openerp__.py new file mode 100644 index 00000000..b35eaf1b --- /dev/null +++ b/pos_product_template/__openerp__.py @@ -0,0 +1,67 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Point Of Sale - Product Template module for Odoo +# Copyright (C) 2014-Today Akretion (http://www.akretion.com) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + 'name': 'Point Of Sale - Product Template', + 'summary': 'Manage Product Template in Front End Point Of Sale', + 'version': '0.1', + 'category': 'Point Of Sale', + 'description': """ +Manage Product Template in Front End Point Of Sale +================================================== + +Functionality: +-------------- + * + +Possible improvements and fix: +------------------------------ + * Display product template name in ProductList; + * Display attributes; + * Improve Template display; + +NON Covered features: +--------------------- + * + +Copyright, Authors and Licence: +------------------------------- + * Copyright: 2014-Today, Akretion; + * Author: + * Sylvain LE GAL (https://twitter.com/legalsylvain); + * Licence: AGPL-3 (http://www.gnu.org/licenses/);""", + 'author': 'Akretion', + 'website': 'http://www.akretion.com', + 'license': 'AGPL-3', + 'depends': [ + 'point_of_sale', + ], + 'data': [ + 'view/view.xml', + ], + 'qweb': [ + 'static/src/xml/ppt.xml', + ], + 'demo': [ + 'demo/product_product.yml', + 'demo/res_groups.yml', + ], +} diff --git a/pos_product_template/demo/product_product.yml b/pos_product_template/demo/product_product.yml new file mode 100644 index 00000000..3c2e97b8 --- /dev/null +++ b/pos_product_template/demo/product_product.yml @@ -0,0 +1,36 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Point Of Sale - Product Template module for Odoo +# Copyright (C) 2014-Today Akretion (http://www.akretion.com) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +- !record {model: product.product, id: product.product_product_4}: + available_in_pos: True + +- !record {model: product.product, id: product.product_product_4b}: + available_in_pos: True + +- !record {model: product.product, id: product.product_product_4c}: + available_in_pos: True + +- !record {model: product.product, id: product.product_product_11}: + available_in_pos: True + +- !record {model: product.product, id: product.product_product_11b}: + available_in_pos: True diff --git a/pos_product_template/demo/res_groups.yml b/pos_product_template/demo/res_groups.yml new file mode 100644 index 00000000..972797a8 --- /dev/null +++ b/pos_product_template/demo/res_groups.yml @@ -0,0 +1,25 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Point Of Sale - Product Template module for Odoo +# Copyright (C) 2014-Today Akretion (http://www.akretion.com) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +- !record {model: res.groups, id: base.group_no_one}: + users: + - base.user_root diff --git a/pos_product_template/static/src/css/ppt.css b/pos_product_template/static/src/css/ppt.css new file mode 100644 index 00000000..fcea88dd --- /dev/null +++ b/pos_product_template/static/src/css/ppt.css @@ -0,0 +1,166 @@ +/****************************************************************************** + Point Of Sale - Product Template module for Odoo + Copyright (C) 2014-Today Akretion (http://www.akretion.com) + @author Sylvain LE GAL (https://twitter.com/legalsylvain) + + Some part of code from Odoo Project, + Copyright (C) 2004-Today Odoo SA. (). + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +******************************************************************************/ + +/* ********* Variant Selector PopUp ************************************** */ +.pos .modal-dialog .popup-select-variant{ + margin-left:0; + margin-top:0; + left:5%; + width: 90%; + top:5%; + height:85%; +} + +.pos .modal-dialog .popup-select-variant .variant-title{ + height: 8%; +} + +.pos .modal-dialog .popup-select-variant .variant-title #variant-popup-cancel{ + margin: -10px 3px 3px 3px; +} + +.pos .modal-dialog .popup-select-variant .container-attribute-list{ + width:100%; + height:30%; /*FIXME */ + overflow: hidden; + overflow-y: auto; + border-bottom: 1px dashed #444; + -webkit-overflow-scrolling: touch; +} + +.pos .modal-dialog .popup-select-variant .container-variant-list{ + width:100%; + height:60%; /*FIXME */ + overflow: hidden; + overflow-y: auto; + -webkit-overflow-scrolling: touch; +} + +.pos .variant-list { + padding: 10px; + text-align: left; + -webkit-transform: translate3d(0,0,0); +} + +/* ********* Attribut Display ******************************************** */ +.pos .attribute { + position:relative; + width: 100%; + height:50px; + vertical-align: top; + display: inline-block; +} + +.pos .attribute .attribute-name{ + float: left; + width: 20%; +} + +.pos .attribute .value-list-container{ + width:78%; + float: left; +} +.pos .attribute .selected{ + background-color: white; +} + +.pos .attribute .attribute-value { + float: left; + width: 150px; +} + +/* ********* Variant Display ********************************************* */ +/* This part is a copy past from Odoo Project, with some values changed */ +.pos .variant { + position:relative; + vertical-align: top; + display: inline-block; + line-height: 100px; + font-size: 11px; + margin: 5px !important; + width: 240px; + height:60px; + background:#fff; + border: 1px solid #e2e2e2; + border-radius: 3px; + border-bottom-width: 3px; + overflow: hidden; + cursor: pointer; +} + +.pos .variant .variant-header { + position: relative; + width: 240px; + height: 30px; + background: white; + text-align: center; +} + +.pos .variant .price-tag { + position: absolute; + top: 2px; + right: 2px; + vertical-align: top; + color: white; + line-height: 13px; + background: #7f82ac; + padding: 2px 5px; + border-radius: 2px; +} + +.pos .variant .variant-name { + font-weight: normal; + position: absolute; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + bottom:0; + top:auto; + line-height: 14px; + width:100%; + overflow: hidden; + text-overflow: ellipsis; + background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1)); + background: -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1)); + background: -ms-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1)); + /* troublesome in latest webkit + background: linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1)); + */ + /*background:#FFF;*/ + padding: 3px; + padding-top:15px; +} + +/*.pos .variant-list-scroller{*/ +/* -webkit-box-sizing: border-box;*/ +/* -moz-box-sizing: border-box;*/ +/* -ms-box-sizing: border-box;*/ +/* box-sizing: border-box;*/ +/* width:50%;*/ +/* height:50%;*/ +/* overflow: hidden;*/ +/* overflow-y: auto;*/ +/* -webkit-overflow-scrolling: touch;*/ +/* -webkit-transform: translate3d(0,0,0);*/ + +/*}*/ diff --git a/pos_product_template/static/src/img/icon.png b/pos_product_template/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4e54d92ab092f28d564edf3e8a8da4f9a5f3aee6 GIT binary patch literal 4290 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 literal 0 HcmV?d00001 diff --git a/pos_product_template/static/src/js/ppt.js b/pos_product_template/static/src/js/ppt.js new file mode 100644 index 00000000..5780c86b --- /dev/null +++ b/pos_product_template/static/src/js/ppt.js @@ -0,0 +1,565 @@ +/****************************************************************************** + Point Of Sale - Product Template module for Odoo + Copyright (C) 2014-Today Akretion (http://www.akretion.com) + @author Sylvain LE GAL (https://twitter.com/legalsylvain) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +******************************************************************************/ + +openerp.pos_product_template = function (instance) { + module = instance.point_of_sale; + var QWeb = instance.web.qweb; + var _t = instance.web._t; + +/* ******************************************************** +Overload: point_of_sale.ProductListWidget + +- The overload will: + - display only product template; + - Add an extra behaviour on click on a template, if template has many + variant, displaying an extra scren to select the variant; +*********************************************************** */ + module.ProductListWidget = module.ProductListWidget.extend({ + + init: function(parent, options) { + this._super(parent,options); + var self = this; + // OVERWRITE 'click_product_handler' function to do + // a different behaviour if template with one or many variants + // are selected. + this.click_product_handler = function(event){ + var product = self.pos.db.get_product_by_id(this.dataset['productId']); + + if (product.product_variant_count == 1) { + // Normal behaviour, The template has only one variant + options.click_product_action(product); + } + else{ + // Display for selection all the variants of a template + self.pos.pos_widget.screen_selector.show_popup('select-variant-popup', product.product_tmpl_id); + } + }; + }, + + /* ************************************************ + Overload: 'set_product_list' + + 'set_product_list' is a function called before displaying Products. + (at the beginning, after a category selection, after a research, etc. + we just splice all products that are not the 'primary variant' + */ + set_product_list: function(product_list){ + for (var i = product_list.length - 1; i >= 0; i--){ + if (!product_list[i].is_primary_variant){ + product_list.splice(i, 1); + } + } + this._super(product_list); + }, + }); + + var _render_product_ = module.ProductListWidget.prototype.render_product; + module.ProductListWidget.prototype.render_product = function(product){ + self = this; + + if (product.product_variant_count == 1){ + // Normal Display + return _render_product_.call(this, product); + } + else{ + var cached = this.product_cache.get_node(product.id); + if(!cached){ + var image_url = this.get_product_image_url(product); + var product_html = QWeb.render('Template',{ + widget: this, + product: product, + image_url: this.get_product_image_url(product), + }); + var product_node = document.createElement('div'); + product_node.innerHTML = product_html; + product_node = product_node.childNodes[1]; + this.product_cache.cache_node(product.id,product_node); + return product_node; + } + return cached; + } + }; + + +/* ******************************************************** +Overload: point_of_sale.PosWidget + +- Add a new PopUp 'SelectVariantPopupWidget'; +*********************************************************** */ + module.PosWidget = module.PosWidget.extend({ + + /* Overload Section */ + build_widgets: function(){ + this._super(); + this.select_variant_popup = new module.SelectVariantPopupWidget(this, {}); + this.select_variant_popup.appendTo($(this.$el)); + this.screen_selector.popup_set['select-variant-popup'] = this.select_variant_popup; + // Hide the popup because all pop up are displayed at the + // beginning by default + this.select_variant_popup.hide(); + }, + }); + +/* ******************************************************** +Define : pos_product_template.SelectVariantPopupWidget + +- This widget that display a pop up to select a variant of a Template; +*********************************************************** */ + module.SelectVariantPopupWidget = module.PopUpWidget.extend({ + template:'SelectVariantPopupWidget', + + init: function(parent, options) { + this._super(parent,options); + this.template_name = ''; + }, + + start: function(){ + var self = this; + // Define Variant Widget + this.variant_list_widget = new module.VariantListWidget(this,{}); + this.variant_list_widget.replace(this.$('.placeholder-VariantListWidget')); + + // Define Attribute Widget + this.attribute_list_widget = new module.AttributeListWidget(this,{}); + this.attribute_list_widget.replace(this.$('.placeholder-AttributeListWidget')); + + // Add behaviour on Cancel Button + this.$('#variant-popup-cancel').off('click').click(function(){ + self.hide(); + }); + }, + + show: function(product_tmpl_id){ + var self = this; + var template = this.pos.db.template_by_id[product_tmpl_id]; + + // Display Name of Template + this.template_name = template.name; + this.$('#variant-title-name').html(template.name); + + // Render Variants + var variant_ids = this.pos.db.template_by_id[product_tmpl_id].product_variant_ids; + var variant_list = []; + for (var i = 0, len = variant_ids.length; i < len; i++) { + variant_list.push(this.pos.db.get_product_by_id(variant_ids[i])); + } + this.variant_list_widget.filters = {} + this.variant_list_widget.set_variant_list(variant_list); + + // Render Attributes + var attribute_ids = this.pos.db.attribute_by_template_id(template.id); + var attribute_list = []; + for (var i = 0, len = attribute_ids.length; i < len; i++) { + attribute_list.push(this.pos.db.get_product_attribute_by_id(attribute_ids[i])); + } + this.attribute_list_widget.set_attribute_list(attribute_list, template); + this._super(); + }, + }); + +/* ******************************************************** +Define: pos_product_template.VariantListWidget + +- This widget will display a list of Variants; +- This widget has some part of code that come from point_of_sale.ProductListWidget; +*********************************************************** */ + module.VariantListWidget = module.PosBaseWidget.extend({ + template:'VariantListWidget', + + init: function(parent, options) { + var self = this; + this._super(parent, options); + this.variant_list = []; + this.filter_variant_list = []; + this.filters = {}; + this.click_variant_handler = function(event){ + var variant = self.pos.db.get_product_by_id(this.dataset['variantId']); + if(variant.to_weight && self.pos.config.iface_electronic_scale){ + self.__parentedParent.hide(); + self.pos_widget.screen_selector.set_current_screen('scale',{product: variant}); + }else{ + self.__parentedParent.hide(); + self.pos.get('selectedOrder').addProduct(variant); + } + }; + }, + + replace: function($target){ + this.renderElement(); + var target = $target[0]; + target.parentNode.replaceChild(this.el,target); + }, + + set_filter: function(attribute_id, value_id){ + this.filters[attribute_id] = value_id; + this.filter_variant(); + }, + + reset_filter: function(attribute_id){ + if (attribute_id in this.filters){ + delete this.filters[attribute_id]; + } + this.filter_variant(); + }, + + filter_variant: function(){ + value_list = [] + for (var item in this.filters){ + value_list.push(parseInt(this.filters[item])); + } + this.filter_variant_list = []; + for (index in this.variant_list){ + variant = this.variant_list[index]; + found = true; + for (var i = 0; i < value_list.length; i++){ + found = found && (variant.attribute_value_ids.indexOf(value_list[i]) != -1); + } + if (found){ + this.filter_variant_list.push(variant); + } + } + this.renderElement(); + }, + + set_variant_list: function(variant_list){ + this.variant_list = variant_list; + this.filter_variant_list = variant_list; + this.renderElement(); + }, + + render_variant: function(variant){ + var variant_html = QWeb.render('VariantWidget', { + widget: this, + variant: variant, + }); + var variant_node = document.createElement('div'); + variant_node.innerHTML = variant_html; + variant_node = variant_node.childNodes[1]; + return variant_node; + }, + + renderElement: function() { + var self = this; + var el_html = openerp.qweb.render(this.template, {widget: this}); + var el_node = document.createElement('div'); + el_node.innerHTML = el_html; + el_node = el_node.childNodes[1]; + if(this.el && this.el.parentNode){ + this.el.parentNode.replaceChild(el_node,this.el); + } + this.el = el_node; + var list_container = el_node.querySelector('.variant-list'); + for(var i = 0, len = this.filter_variant_list.length; i < len; i++){ + var variant_node = this.render_variant(this.filter_variant_list[i]); + variant_node.addEventListener('click',this.click_variant_handler); + list_container.appendChild(variant_node); + } + }, + + }); + +/* ******************************************************** +Define: pos_product_template.AttributeListWidget + + - This widget will display a list of Attribute; +*********************************************************** */ + module.AttributeListWidget = module.PosBaseWidget.extend({ + template:'AttributeListWidget', + + init: function(parent, options) { + var self = this; + this.attribute_list = []; + this.product_template = null; + this.click_set_attribute_handler = function(event){ + /*TODO: Refactor this function with elegant DOM manipulation */ + // remove selected item + parent = this.parentElement.parentElement.parentElement; + parent.children[0].classList.remove('selected'); + for (var i = 0 ; i < parent.children[1].children[0].children.length; i ++){ + elem = parent.children[1].children[0].children[i]; + elem.children[0].classList.remove('selected'); + } + // add selected item + this.children[0].classList.add('selected'); + self.__parentedParent.variant_list_widget.set_filter(this.dataset['attributeId'], this.dataset['attributeValueId']); + }; + this.click_reset_attribute_handler = function(event){ + /*TODO: Refactor this function with elegant DOM manipulation */ + // remove selected item + parent = this.parentElement; + parent.children[0].classList.remove('selected'); + for (var i = 0 ; i < parent.children[1].children[0].children.length; i ++){ + elem = parent.children[1].children[0].children[i]; + elem.children[0].classList.remove('selected'); + } + // add selected item + this.classList.add('selected'); + self.__parentedParent.variant_list_widget.reset_filter(this.dataset['attributeId']); + }; + this._super(parent, options); + }, + + replace: function($target){ + this.renderElement(); + var target = $target[0]; + target.parentNode.replaceChild(this.el,target); + }, + + set_attribute_list: function(attribute_list, product_template){ + this.attribute_list = attribute_list; + this.product_template = product_template; + this.renderElement(); + }, + + render_attribute: function(attribute){ + var attribute_html = QWeb.render('AttributeWidget',{ + widget: this, + attribute: attribute, + }); + var attribute_node = document.createElement('div'); + attribute_node.innerHTML = attribute_html; + attribute_node = attribute_node.childNodes[1]; + + var list_container = attribute_node.querySelector('.value-list'); + for(var i = 0, len = attribute.value_ids.length; i < len; i++){ + var value = this.pos.db.get_product_attribute_value_by_id(attribute.value_ids[i]); + var value_node = this.render_value(attribute, value); + value_node.addEventListener('click', this.click_set_attribute_handler); + list_container.appendChild(value_node); + }; + return attribute_node; + }, + + render_value: function(attribute, value){ + product_list = this.pos.db.get_product_by_ids(this.product_template.product_variant_ids); + subproduct_list = this.pos.db.get_product_by_value_and_products(value.id, product_list); + variant_qty = subproduct_list.length; + var value_html = QWeb.render('AttributeValueWidget',{ + widget: this, + value: value, + variant_qty: variant_qty, + }); + var value_node = document.createElement('div'); + value_node.innerHTML = value_html; + value_node = value_node.childNodes[1]; + return value_node; + }, + + + renderElement: function() { + var self = this; + var el_html = openerp.qweb.render(this.template, {widget: this}); + var el_node = document.createElement('div'); + el_node.innerHTML = el_html; + el_node = el_node.childNodes[1]; + if(this.el && this.el.parentNode){ + this.el.parentNode.replaceChild(el_node,this.el); + } + this.el = el_node; + + var list_container = el_node.querySelector('.attribute-list'); + for(var i = 0, len = this.attribute_list.length; i < len; i++){ + var attribute_node = this.render_attribute(this.attribute_list[i]); + attribute_node.querySelector('.attribute-name').addEventListener('click', this.click_reset_attribute_handler); +// attribute_node.addEventListener('click', this.click_reset_attribute_handler); + list_container.appendChild(attribute_node); + }; + }, + + }); + + +/* ******************************************************** +Overload: point_of_sale.PosDB + +- Add to local storage Product Templates Data. +- Link Product Variants to Product Templates. +- Add an extra field 'is_primary_variant' on product object. the product + will be display on product list, only if it is the primary variant; + Otherwise, the product will be displayed only on Template Screen. +- Add an extra field 'product_variant_count' on product object that + indicates the number of variant of the template of the product. +*********************************************************** */ + module.PosDB = module.PosDB.extend({ + init: function(options){ + this.template_by_id = {}; + this.product_attribute_by_id = {}; + this.product_attribute_value_by_id = {}; + this._super(options); + }, + + get_product_by_value_and_products: function(value_id, products){ + var list = []; + for (var i = 0, len = products.length; i < len; i++) { + if (products[i].attribute_value_ids.indexOf(value_id) != -1){ + list.push(products[i]); + } + } + return list; + }, + + get_product_attribute_by_id: function(attribute_id){ + return this.product_attribute_by_id[attribute_id]; + }, + + get_product_attribute_value_by_id: function(attribute_value_id){ + return this.product_attribute_value_by_id[attribute_value_id]; + }, + + get_product_by_ids: function(product_ids){ + var list = []; + for (var i = 0, len = product_ids.length; i < len; i++) { + list.push(this.product_by_id[product_ids[i]]); + } + return list; + }, + + + attribute_by_template_id: function(template_id){ + template = this.template_by_id[template_id]; + return this.attribute_by_attribute_value_ids(template.attribute_value_ids); + }, + + attribute_by_attribute_value_ids: function(value_ids){ + attribute_ids = []; + for (var i = 0; i < value_ids.length; i++){ + var value = this.product_attribute_value_by_id[value_ids[i]]; + if (attribute_ids.indexOf(value.attribute_id[0])==-1){ + attribute_ids.push(value.attribute_id[0]); + } + } + return attribute_ids; + }, + + add_templates: function(templates){ + for(var i=0 ; i < templates.length; i++){ + var attribute_value_ids = []; + // store Templates + this.template_by_id[templates[i].id] = templates[i]; + + // Update Product information + for (var j = 0; j + + + + + + + + + + + + + + + + + + + + + + diff --git a/pos_product_template/view/view.xml b/pos_product_template/view/view.xml new file mode 100644 index 00000000..169b3db8 --- /dev/null +++ b/pos_product_template/view/view.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 54d6065986612ddbe1e3faf205ee247980c133f8 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Thu, 18 Dec 2014 13:10:18 +0100 Subject: [PATCH 02/27] [IMP] better display of attributes values; [FIX] overflow bug; --- pos_product_template/static/src/css/ppt.css | 46 +++++++++++++++++++-- pos_product_template/static/src/xml/ppt.xml | 13 ++++-- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/pos_product_template/static/src/css/ppt.css b/pos_product_template/static/src/css/ppt.css index fcea88dd..638e52c2 100644 --- a/pos_product_template/static/src/css/ppt.css +++ b/pos_product_template/static/src/css/ppt.css @@ -40,7 +40,7 @@ .pos .modal-dialog .popup-select-variant .container-attribute-list{ width:100%; - height:30%; /*FIXME */ + height:40%; overflow: hidden; overflow-y: auto; border-bottom: 1px dashed #444; @@ -49,9 +49,10 @@ .pos .modal-dialog .popup-select-variant .container-variant-list{ width:100%; - height:60%; /*FIXME */ + height:50%; overflow: hidden; overflow-y: auto; + -webkit-overflow-scrolling: touch; } @@ -65,20 +66,22 @@ .pos .attribute { position:relative; width: 100%; - height:50px; vertical-align: top; display: inline-block; } .pos .attribute .attribute-name{ float: left; + font-size: 13px; width: 20%; + overflow:hidden; } .pos .attribute .value-list-container{ width:78%; float: left; } + .pos .attribute .selected{ background-color: white; } @@ -86,7 +89,44 @@ .pos .attribute .attribute-value { float: left; width: 150px; + padding-left: 15px; +} + +.pos .attribute .attribute-value .button{ + width: 100%; +} + +.pos .attribute .attribute-value .attribute-value-header{ + width: 100%; + height: 15px; + text-align: right; + } +.pos .attribute .attribute-value .attribute-value-name{ + width: 100%; + height: 25px; + line-height:25px; + overflow: hidden; + font-size: 10px; + text-align: left; + font-weight: normal; + padding: 2px; +} + +.pos .attribute .attribute-value .variant-quantity{ + position: relative; + top: 2px; + right: 0px; + vertical-align: top; + color: #FFF; + line-height: 13px; + background: none repeat scroll 0% 0% #7F82AC; + padding: 2px 5px; + border-radius: 2px; + font-size: 9px; + margin-right:3px; +} + /* ********* Variant Display ********************************************* */ /* This part is a copy past from Odoo Project, with some values changed */ diff --git a/pos_product_template/static/src/xml/ppt.xml b/pos_product_template/static/src/xml/ppt.xml index 2c217fc6..03a2ad7e 100644 --- a/pos_product_template/static/src/xml/ppt.xml +++ b/pos_product_template/static/src/xml/ppt.xml @@ -27,7 +27,7 @@
- Variants Selection of + Variant Selection of Cancel @@ -89,8 +89,15 @@ -
- () +
+
+ + Variants + +
+
+ +
From 58ff028ba268ef0c1a537996cd64343021da0d78 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Thu, 18 Dec 2014 13:10:24 +0100 Subject: [PATCH 03/27] [ADD] fr translation; --- pos_product_template/i18n/fr.po | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pos_product_template/i18n/fr.po diff --git a/pos_product_template/i18n/fr.po b/pos_product_template/i18n/fr.po new file mode 100644 index 00000000..0f73f7e9 --- /dev/null +++ b/pos_product_template/i18n/fr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_product_template +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-12-18 11:57+0000\n" +"PO-Revision-Date: 2014-12-18 11:57+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: pos_product_template +#. openerp-web +#: code:addons/pos_product_template/static/src/xml/ppt.xml:31 +#, python-format +msgid "Cancel" +msgstr "Annuler" + +#. module: pos_product_template +#. openerp-web +#: code:addons/pos_product_template/static/src/xml/ppt.xml:57 +#: code:addons/pos_product_template/static/src/xml/ppt.xml:95 +#, python-format +msgid "Variants" +msgstr "Variantes" + +#. module: pos_product_template +#. openerp-web +#: code:addons/pos_product_template/static/src/xml/ppt.xml:29 +#, python-format +msgid "Variant Selection of" +msgstr "Sélection d'une variante de" + From 89e2c0c88cdf4f5a2e455e8e541620d0988c98ad Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Sun, 25 Jan 2015 16:57:56 +0100 Subject: [PATCH 04/27] [REF] remove useless variable, courtesy to Sylvain C; --- pos_product_template/static/src/js/ppt.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pos_product_template/static/src/js/ppt.js b/pos_product_template/static/src/js/ppt.js index 5780c86b..5eb0438b 100644 --- a/pos_product_template/static/src/js/ppt.js +++ b/pos_product_template/static/src/js/ppt.js @@ -124,11 +124,6 @@ Define : pos_product_template.SelectVariantPopupWidget module.SelectVariantPopupWidget = module.PopUpWidget.extend({ template:'SelectVariantPopupWidget', - init: function(parent, options) { - this._super(parent,options); - this.template_name = ''; - }, - start: function(){ var self = this; // Define Variant Widget @@ -150,7 +145,6 @@ Define : pos_product_template.SelectVariantPopupWidget var template = this.pos.db.template_by_id[product_tmpl_id]; // Display Name of Template - this.template_name = template.name; this.$('#variant-title-name').html(template.name); // Render Variants From 8c25673b94c383ed717a95cf19f6dc991523643c Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Sun, 25 Jan 2015 16:59:35 +0100 Subject: [PATCH 05/27] [FIX] Typo --- pos_product_template/static/src/css/ppt.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_product_template/static/src/css/ppt.css b/pos_product_template/static/src/css/ppt.css index 638e52c2..aab59559 100644 --- a/pos_product_template/static/src/css/ppt.css +++ b/pos_product_template/static/src/css/ppt.css @@ -129,7 +129,7 @@ /* ********* Variant Display ********************************************* */ -/* This part is a copy past from Odoo Project, with some values changed */ +/* This part is a copy paste from Odoo Project, with some values changed */ .pos .variant { position:relative; vertical-align: top; From 7d22b2944c90aaff0e136beea213e64528c4d431 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Sun, 25 Jan 2015 17:14:52 +0100 Subject: [PATCH 06/27] [ADD] 'pos_product_template' pot file --- .../i18n/pos_product_template.pot | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pos_product_template/i18n/pos_product_template.pot diff --git a/pos_product_template/i18n/pos_product_template.pot b/pos_product_template/i18n/pos_product_template.pot new file mode 100644 index 00000000..cf41f0ab --- /dev/null +++ b/pos_product_template/i18n/pos_product_template.pot @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_product_template +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-12-18 12:01+0000\n" +"PO-Revision-Date: 2014-12-18 12:01+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: pos_product_template +#. openerp-web +#: code:addons/pos_product_template/static/src/xml/ppt.xml:31 +#, python-format +msgid "Cancel" +msgstr "" + +#. module: pos_product_template +#. openerp-web +#: code:addons/pos_product_template/static/src/xml/ppt.xml:29 +#, python-format +msgid "Variant Selection of" +msgstr "" + +#. module: pos_product_template +#. openerp-web +#: code:addons/pos_product_template/static/src/xml/ppt.xml:57 +#: code:addons/pos_product_template/static/src/xml/ppt.xml:95 +#, python-format +msgid "Variants" +msgstr "" + From cc8bef69b404ac4280e5b70dc1b38898bdb06608 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 28 Jan 2015 09:58:00 +0100 Subject: [PATCH 07/27] [ADD] Add extra demo data that generate display bug --- pos_product_template/__openerp__.py | 1 + .../demo/product_attribute_value.yml | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pos_product_template/demo/product_attribute_value.yml diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__openerp__.py index b35eaf1b..2839605c 100644 --- a/pos_product_template/__openerp__.py +++ b/pos_product_template/__openerp__.py @@ -61,6 +61,7 @@ Copyright, Authors and Licence: 'static/src/xml/ppt.xml', ], 'demo': [ + 'demo/product_attribute_value.yml', 'demo/product_product.yml', 'demo/res_groups.yml', ], diff --git a/pos_product_template/demo/product_attribute_value.yml b/pos_product_template/demo/product_attribute_value.yml new file mode 100644 index 00000000..84548c32 --- /dev/null +++ b/pos_product_template/demo/product_attribute_value.yml @@ -0,0 +1,25 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Point Of Sale - Product Template module for Odoo +# Copyright (C) 2014-Today Akretion (http://www.akretion.com) +# @author Sylvain LE GAL (https://twitter.com/legalsylvain) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +- !record {model: product.attribute.value, id: attribute_wifi_extra}: + attribute_id: product.product_attribute_3 + name: 2.399GHz From 737fe497d53fe87d131b92b40397b13a29f46991 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 28 Jan 2015 10:06:35 +0100 Subject: [PATCH 08/27] [FIX] hide product attribute value in POS if value has no product associated to it --- pos_product_template/static/src/js/ppt.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pos_product_template/static/src/js/ppt.js b/pos_product_template/static/src/js/ppt.js index 5eb0438b..e46875dc 100644 --- a/pos_product_template/static/src/js/ppt.js +++ b/pos_product_template/static/src/js/ppt.js @@ -333,17 +333,20 @@ Define: pos_product_template.AttributeListWidget var list_container = attribute_node.querySelector('.value-list'); for(var i = 0, len = attribute.value_ids.length; i < len; i++){ var value = this.pos.db.get_product_attribute_value_by_id(attribute.value_ids[i]); - var value_node = this.render_value(attribute, value); - value_node.addEventListener('click', this.click_set_attribute_handler); - list_container.appendChild(value_node); + var product_list = this.pos.db.get_product_by_ids(this.product_template.product_variant_ids); + var subproduct_list = this.pos.db.get_product_by_value_and_products(value.id, product_list); + var variant_qty = subproduct_list.length; + // Hide product attribute value if there is no product associated to it + if (variant_qty != 0) { + var value_node = this.render_value(value, variant_qty); + value_node.addEventListener('click', this.click_set_attribute_handler); + list_container.appendChild(value_node); + } }; return attribute_node; }, - render_value: function(attribute, value){ - product_list = this.pos.db.get_product_by_ids(this.product_template.product_variant_ids); - subproduct_list = this.pos.db.get_product_by_value_and_products(value.id, product_list); - variant_qty = subproduct_list.length; + render_value: function(value, variant_qty){ var value_html = QWeb.render('AttributeValueWidget',{ widget: this, value: value, From 858f43bb0ae3c1c40f111ee40920e46f660878af Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 28 Jan 2015 10:22:44 +0100 Subject: [PATCH 09/27] [IMP] description of the module in openerp.py file; --- pos_product_template/__openerp__.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__openerp__.py index 2839605c..a39b1c2d 100644 --- a/pos_product_template/__openerp__.py +++ b/pos_product_template/__openerp__.py @@ -30,17 +30,24 @@ Manage Product Template in Front End Point Of Sale Functionality: -------------- - * + * In Point Of Sale Front End - Products list: + * Display only one product per template; + * Display template name instead of product name; + * Display products quantity instead of price; + * Click on template displays an extra screen to select Variant; -Possible improvements and fix: ------------------------------- - * Display product template name in ProductList; - * Display attributes; - * Improve Template display; + * In Point Of Sale Front End - Variants list: + * Display all the products of the selected variant; + * Click on a attribute value filters products; + * Click on a product adds it to the current Order or display normal + extra screen if it is a weightable product; -NON Covered features: ---------------------- - * +Technical Information: +---------------------- + * Load extra model in Point Of Sale Front End: + * product.template; + * product.attribute; + * product.attribute.value; Copyright, Authors and Licence: ------------------------------- From 1aa4673998970307ba3963e23b3d14ee2f43899e Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 28 Jan 2015 10:22:56 +0100 Subject: [PATCH 10/27] [REF] --- pos_product_template/static/src/js/ppt.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pos_product_template/static/src/js/ppt.js b/pos_product_template/static/src/js/ppt.js index e46875dc..b5318ce0 100644 --- a/pos_product_template/static/src/js/ppt.js +++ b/pos_product_template/static/src/js/ppt.js @@ -347,8 +347,8 @@ Define: pos_product_template.AttributeListWidget }, render_value: function(value, variant_qty){ - var value_html = QWeb.render('AttributeValueWidget',{ - widget: this, + var value_html = QWeb.render('AttributeValueWidget',{ + widget: this, value: value, variant_qty: variant_qty, }); @@ -511,7 +511,6 @@ Overload: point_of_sale.PosModel fields: [ 'name', 'display_name', - 'list_price', //? 'product_variant_ids', 'product_variant_count', ], From 38b3a2a8d3d5d3d40048182dfe082ac61bbfe868 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 28 Jan 2015 10:23:45 +0100 Subject: [PATCH 11/27] [IMP] Add screenshot descrption; --- pos_product_template/__openerp__.py | 5 ++++- .../img/screenshots/pos_product_template.png | Bin 0 -> 21421 bytes 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 pos_product_template/static/src/img/screenshots/pos_product_template.png diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__openerp__.py index a39b1c2d..f67f44a9 100644 --- a/pos_product_template/__openerp__.py +++ b/pos_product_template/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Point Of Sale - Product Template', 'summary': 'Manage Product Template in Front End Point Of Sale', - 'version': '0.1', + 'version': '0.2', 'category': 'Point Of Sale', 'description': """ Manage Product Template in Front End Point Of Sale @@ -72,4 +72,7 @@ Copyright, Authors and Licence: 'demo/product_product.yml', 'demo/res_groups.yml', ], + 'images': [ + 'static/src/img/screenshots/pos_product_template.png', + ], } diff --git a/pos_product_template/static/src/img/screenshots/pos_product_template.png b/pos_product_template/static/src/img/screenshots/pos_product_template.png new file mode 100644 index 0000000000000000000000000000000000000000..288053e0b4d652afb34718e56b08928d9895ed46 GIT binary patch literal 21421 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 literal 0 HcmV?d00001 From e0062cc31cd819fe886e0c88db9bde795163061d Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Mon, 2 Mar 2015 15:37:13 +0100 Subject: [PATCH 12/27] Add OCA as author of OCA addons In order to get visibility on https://www.odoo.com/apps the OCA board has decided to add the OCA as author of all the addons maintained as part of the association. --- pos_product_template/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__openerp__.py index f67f44a9..58fbbdcf 100644 --- a/pos_product_template/__openerp__.py +++ b/pos_product_template/__openerp__.py @@ -55,7 +55,7 @@ Copyright, Authors and Licence: * Author: * Sylvain LE GAL (https://twitter.com/legalsylvain); * Licence: AGPL-3 (http://www.gnu.org/licenses/);""", - 'author': 'Akretion', + 'author': "Akretion,Odoo Community Association (OCA)", 'website': 'http://www.akretion.com', 'license': 'AGPL-3', 'depends': [ From b5237fbe99d55cc4b5aeccf2ad194fce009f0de6 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 3 Mar 2015 13:25:02 +0100 Subject: [PATCH 13/27] Move module icon in static/description --- .../static/{src/img => description}/icon.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename pos_product_template/static/{src/img => description}/icon.png (100%) diff --git a/pos_product_template/static/src/img/icon.png b/pos_product_template/static/description/icon.png similarity index 100% rename from pos_product_template/static/src/img/icon.png rename to pos_product_template/static/description/icon.png From 9979f1cbd9bdc788c180d24aa18285e8f1020a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 9 Oct 2015 10:01:54 +0200 Subject: [PATCH 14/27] [UPD] prefix versions with 8.0 --- pos_product_template/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__openerp__.py index 58fbbdcf..fcd76cc1 100644 --- a/pos_product_template/__openerp__.py +++ b/pos_product_template/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Point Of Sale - Product Template', 'summary': 'Manage Product Template in Front End Point Of Sale', - 'version': '0.2', + 'version': '8.0.0.2.0', 'category': 'Point Of Sale', 'description': """ Manage Product Template in Front End Point Of Sale From 65b2727b181fc351e68613a225798dd4680ab78e Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 14 Oct 2015 02:32:34 +0200 Subject: [PATCH 15/27] [MIG] Make modules uninstallable --- pos_product_template/__openerp__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__openerp__.py index fcd76cc1..b9cb2b26 100644 --- a/pos_product_template/__openerp__.py +++ b/pos_product_template/__openerp__.py @@ -75,4 +75,5 @@ Copyright, Authors and Licence: 'images': [ 'static/src/img/screenshots/pos_product_template.png', ], + 'installable': False, } From 2f78ac383ce36dddd14c2127edcdff88ebf7f975 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 16:04:41 +0200 Subject: [PATCH 16/27] [MIG] Rename manifest files --- pos_product_template/{__openerp__.py => __manifest__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pos_product_template/{__openerp__.py => __manifest__.py} (100%) diff --git a/pos_product_template/__openerp__.py b/pos_product_template/__manifest__.py similarity index 100% rename from pos_product_template/__openerp__.py rename to pos_product_template/__manifest__.py From 34ade5e6e52fd28c7d57de687de8440bc66c3654 Mon Sep 17 00:00:00 2001 From: mikelote Date: Tue, 12 Apr 2016 23:29:46 +0200 Subject: [PATCH 17/27] Updated pos_product_template addon to Odoo 9 --- pos_product_template/static/src/js/ppt.js | 232 ++++++++++++---------- pos_product_template/view/view.xml | 2 +- 2 files changed, 123 insertions(+), 111 deletions(-) diff --git a/pos_product_template/static/src/js/ppt.js b/pos_product_template/static/src/js/ppt.js index b5318ce0..218673ef 100644 --- a/pos_product_template/static/src/js/ppt.js +++ b/pos_product_template/static/src/js/ppt.js @@ -16,21 +16,33 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . ******************************************************************************/ - -openerp.pos_product_template = function (instance) { - module = instance.point_of_sale; - var QWeb = instance.web.qweb; - var _t = instance.web._t; - -/* ******************************************************** -Overload: point_of_sale.ProductListWidget - -- The overload will: - - display only product template; - - Add an extra behaviour on click on a template, if template has many - variant, displaying an extra scren to select the variant; -*********************************************************** */ - module.ProductListWidget = module.ProductListWidget.extend({ +odoo.define("pos_product_template.pos_product_template", function(require){ + "use strict"; + + var screens = require("point_of_sale.screens"); + var popups = require("point_of_sale.popups"); + var models = require('point_of_sale.models'); + var chrome = require('point_of_sale.chrome'); + var gui = require('point_of_sale.gui'); + var PosDB = require("point_of_sale.DB"); + var PosBaseWidget = require('point_of_sale.BaseWidget'); + + var core = require('web.core'); + var utils = require('web.utils'); + + var QWeb = core.qweb; + var _t = core._t; + + /* ******************************************************** + Overload: point_of_sale.ProductListWidget + + - The overload will: + - display only product template; + - Add an extra behaviour on click on a template, if template has many + variant, displaying an extra scren to select the variant; + *********************************************************** */ + var _render_product_ = screens.ProductListWidget.prototype.render_product; + screens.ProductListWidget.include({ init: function(parent, options) { this._super(parent,options); @@ -47,7 +59,8 @@ Overload: point_of_sale.ProductListWidget } else{ // Display for selection all the variants of a template - self.pos.pos_widget.screen_selector.show_popup('select-variant-popup', product.product_tmpl_id); + //self.pos.pos_widget.screen_selector.show_popup('select-variant-popup', product.product_tmpl_id); + self.gui.show_popup('select-variant-popup', product.product_tmpl_id); } }; }, @@ -67,71 +80,68 @@ Overload: point_of_sale.ProductListWidget } this._super(product_list); }, - }); - - var _render_product_ = module.ProductListWidget.prototype.render_product; - module.ProductListWidget.prototype.render_product = function(product){ - self = this; - - if (product.product_variant_count == 1){ - // Normal Display - return _render_product_.call(this, product); - } - else{ - var cached = this.product_cache.get_node(product.id); - if(!cached){ - var image_url = this.get_product_image_url(product); - var product_html = QWeb.render('Template',{ - widget: this, - product: product, - image_url: this.get_product_image_url(product), - }); - var product_node = document.createElement('div'); - product_node.innerHTML = product_html; - product_node = product_node.childNodes[1]; - this.product_cache.cache_node(product.id,product_node); - return product_node; + + render_product: function(product){ + self = this; + + if (product.product_variant_count == 1){ + // Normal Display + return _render_product_.call(this, product); } - return cached; - } - }; - - -/* ******************************************************** -Overload: point_of_sale.PosWidget - -- Add a new PopUp 'SelectVariantPopupWidget'; -*********************************************************** */ - module.PosWidget = module.PosWidget.extend({ - + else{ + var cached = this.product_cache.get_node(product.id); + if(!cached){ + var image_url = this.get_product_image_url(product); + var product_html = QWeb.render('Template',{ + widget: this, + product: product, + image_url: this.get_product_image_url(product), + }); + var product_node = document.createElement('div'); + product_node.innerHTML = product_html; + product_node = product_node.childNodes[1]; + this.product_cache.cache_node(product.id,product_node); + return product_node; + } + return cached; + } + }, + }); + + /* ******************************************************** + Overload: point_of_sale.PosWidget + + - Add a new PopUp 'SelectVariantPopupWidget'; + ************************************************************/ + chrome.Chrome.include({ /* Overload Section */ build_widgets: function(){ this._super(); - this.select_variant_popup = new module.SelectVariantPopupWidget(this, {}); + this.select_variant_popup = new SelectVariantPopupWidget(this, {}); this.select_variant_popup.appendTo($(this.$el)); - this.screen_selector.popup_set['select-variant-popup'] = this.select_variant_popup; + // Hide the popup because all pop up are displayed at the // beginning by default this.select_variant_popup.hide(); }, }); - -/* ******************************************************** -Define : pos_product_template.SelectVariantPopupWidget -- This widget that display a pop up to select a variant of a Template; -*********************************************************** */ - module.SelectVariantPopupWidget = module.PopUpWidget.extend({ + /* ******************************************************** + Define : pos_product_template.SelectVariantPopupWidget + + - This widget that display a pop up to select a variant of a Template; + ***********************************************************/ + var SelectVariantPopupWidget = popups.extend({ template:'SelectVariantPopupWidget', start: function(){ var self = this; // Define Variant Widget - this.variant_list_widget = new module.VariantListWidget(this,{}); + this.variant_list_widget = new VariantListWidget(this,{}); this.variant_list_widget.replace(this.$('.placeholder-VariantListWidget')); // Define Attribute Widget - this.attribute_list_widget = new module.AttributeListWidget(this,{}); + this.attribute_list_widget = new AttributeListWidget(this,{}); this.attribute_list_widget.replace(this.$('.placeholder-AttributeListWidget')); // Add behaviour on Cancel Button @@ -163,17 +173,21 @@ Define : pos_product_template.SelectVariantPopupWidget attribute_list.push(this.pos.db.get_product_attribute_by_id(attribute_ids[i])); } this.attribute_list_widget.set_attribute_list(attribute_list, template); - this._super(); + + if(this.$el){ + this.$el.removeClass('oe_hidden'); + } }, }); + gui.define_popup({name:'select-variant-popup', widget: SelectVariantPopupWidget}); -/* ******************************************************** -Define: pos_product_template.VariantListWidget - -- This widget will display a list of Variants; -- This widget has some part of code that come from point_of_sale.ProductListWidget; -*********************************************************** */ - module.VariantListWidget = module.PosBaseWidget.extend({ + /* ******************************************************** + Define: pos_product_template.VariantListWidget + + - This widget will display a list of Variants; + - This widget has some part of code that come from point_of_sale.ProductListWidget; + ***********************************************************/ + var VariantListWidget = PosBaseWidget.extend({ template:'VariantListWidget', init: function(parent, options) { @@ -189,7 +203,7 @@ Define: pos_product_template.VariantListWidget self.pos_widget.screen_selector.set_current_screen('scale',{product: variant}); }else{ self.__parentedParent.hide(); - self.pos.get('selectedOrder').addProduct(variant); + self.pos.get('selectedOrder').add_product(variant); } }; }, @@ -213,14 +227,14 @@ Define: pos_product_template.VariantListWidget }, filter_variant: function(){ - value_list = [] + var value_list = [] for (var item in this.filters){ value_list.push(parseInt(this.filters[item])); } this.filter_variant_list = []; - for (index in this.variant_list){ - variant = this.variant_list[index]; - found = true; + for (var index in this.variant_list){ + var variant = this.variant_list[index]; + var found = true; for (var i = 0; i < value_list.length; i++){ found = found && (variant.attribute_value_ids.indexOf(value_list[i]) != -1); } @@ -267,13 +281,14 @@ Define: pos_product_template.VariantListWidget }, }); - -/* ******************************************************** -Define: pos_product_template.AttributeListWidget - - - This widget will display a list of Attribute; -*********************************************************** */ - module.AttributeListWidget = module.PosBaseWidget.extend({ + + + /* ******************************************************** + Define: pos_product_template.AttributeListWidget + + - This widget will display a list of Attribute; + ***********************************************************/ + var AttributeListWidget = PosBaseWidget.extend({ template:'AttributeListWidget', init: function(parent, options) { @@ -281,12 +296,12 @@ Define: pos_product_template.AttributeListWidget this.attribute_list = []; this.product_template = null; this.click_set_attribute_handler = function(event){ - /*TODO: Refactor this function with elegant DOM manipulation */ + //TODO: Refactor this function with elegant DOM manipulation // remove selected item parent = this.parentElement.parentElement.parentElement; parent.children[0].classList.remove('selected'); for (var i = 0 ; i < parent.children[1].children[0].children.length; i ++){ - elem = parent.children[1].children[0].children[i]; + var elem = parent.children[1].children[0].children[i]; elem.children[0].classList.remove('selected'); } // add selected item @@ -294,12 +309,12 @@ Define: pos_product_template.AttributeListWidget self.__parentedParent.variant_list_widget.set_filter(this.dataset['attributeId'], this.dataset['attributeValueId']); }; this.click_reset_attribute_handler = function(event){ - /*TODO: Refactor this function with elegant DOM manipulation */ + //TODO: Refactor this function with elegant DOM manipulation // remove selected item parent = this.parentElement; parent.children[0].classList.remove('selected'); for (var i = 0 ; i < parent.children[1].children[0].children.length; i ++){ - elem = parent.children[1].children[0].children[i]; + var elem = parent.children[1].children[0].children[i]; elem.children[0].classList.remove('selected'); } // add selected item @@ -357,8 +372,7 @@ Define: pos_product_template.AttributeListWidget value_node = value_node.childNodes[1]; return value_node; }, - - + renderElement: function() { var self = this; var el_html = openerp.qweb.render(this.template, {widget: this}); @@ -374,26 +388,24 @@ Define: pos_product_template.AttributeListWidget for(var i = 0, len = this.attribute_list.length; i < len; i++){ var attribute_node = this.render_attribute(this.attribute_list[i]); attribute_node.querySelector('.attribute-name').addEventListener('click', this.click_reset_attribute_handler); -// attribute_node.addEventListener('click', this.click_reset_attribute_handler); list_container.appendChild(attribute_node); }; }, }); - - -/* ******************************************************** -Overload: point_of_sale.PosDB - -- Add to local storage Product Templates Data. -- Link Product Variants to Product Templates. -- Add an extra field 'is_primary_variant' on product object. the product - will be display on product list, only if it is the primary variant; - Otherwise, the product will be displayed only on Template Screen. -- Add an extra field 'product_variant_count' on product object that - indicates the number of variant of the template of the product. -*********************************************************** */ - module.PosDB = module.PosDB.extend({ + + /* ******************************************************** + Overload: point_of_sale.PosDB + + - Add to local storage Product Templates Data. + - Link Product Variants to Product Templates. + - Add an extra field 'is_primary_variant' on product object. the product + will be display on product list, only if it is the primary variant; + Otherwise, the product will be displayed only on Template Screen. + - Add an extra field 'product_variant_count' on product object that + indicates the number of variant of the template of the product. + ********************************************************** */ + PosDB.include({ init: function(options){ this.template_by_id = {}; this.product_attribute_by_id = {}; @@ -429,12 +441,12 @@ Overload: point_of_sale.PosDB attribute_by_template_id: function(template_id){ - template = this.template_by_id[template_id]; + var template = this.template_by_id[template_id]; return this.attribute_by_attribute_value_ids(template.attribute_value_ids); }, attribute_by_attribute_value_ids: function(value_ids){ - attribute_ids = []; + var attribute_ids = []; for (var i = 0; i < value_ids.length; i++){ var value = this.product_attribute_value_by_id[value_ids[i]]; if (attribute_ids.indexOf(value.attribute_id[0])==-1){ @@ -480,7 +492,6 @@ Overload: point_of_sale.PosDB }, }); - /* ******************************************************** Overload: point_of_sale.PosModel @@ -488,8 +499,8 @@ Overload: point_of_sale.PosModel - Load 'name' field of model product.product; - Load product.template model; *********************************************************** */ - var _initialize_ = module.PosModel.prototype.initialize; - module.PosModel.prototype.initialize = function(session, attributes){ + var _initialize_ = models.PosModel.prototype.initialize; + models.PosModel.prototype.initialize = function(session, attributes){ self = this; // Add the load of the field product_product.name // that is the name of the template @@ -506,7 +517,7 @@ Overload: point_of_sale.PosModel } // Load Product Template - model = { + var model = { model: 'product.template', fields: [ 'name', @@ -558,4 +569,5 @@ Overload: point_of_sale.PosModel return _initialize_.call(this, session, attributes); }; -}; + +}); diff --git a/pos_product_template/view/view.xml b/pos_product_template/view/view.xml index 169b3db8..3ac23345 100644 --- a/pos_product_template/view/view.xml +++ b/pos_product_template/view/view.xml @@ -27,7 +27,7 @@ -