-
-
Optional Products:
+
+
+
Optional Products:
diff --git a/addons/pos_self_order/__manifest__.py b/addons/pos_self_order/__manifest__.py
index ad3eaa4707c..08fc8a2436b 100644
--- a/addons/pos_self_order/__manifest__.py
+++ b/addons/pos_self_order/__manifest__.py
@@ -18,6 +18,7 @@
"views/pos_config_view.xml",
"views/pos_session_view.xml",
"views/custom_link_views.xml",
+ "views/product_views.xml",
"data/init_access.xml",
"views/res_config_settings_views.xml",
"views/point_of_sale_dashboard.xml",
@@ -25,6 +26,9 @@
],
"assets": {
# Assets
+ 'point_of_sale._assets_pos': [
+ 'pos_self_order/static/src/overrides/**/*',
+ ],
'web.assets_backend': [
"pos_self_order/static/src/upgrade_selection_field.js",
],
diff --git a/addons/pos_self_order/models/pos_config.py b/addons/pos_self_order/models/pos_config.py
index 94ffa3b7c64..3557271be10 100644
--- a/addons/pos_self_order/models/pos_config.py
+++ b/addons/pos_self_order/models/pos_config.py
@@ -261,6 +261,7 @@ class PosConfig(models.Model):
[
("id", "not in", product_ids.ids),
("available_in_pos", "=", True),
+ ("self_order_available", "=", True),
*(
self.limit_categories
and self.iface_available_categ_ids
diff --git a/addons/pos_self_order/models/pos_session.py b/addons/pos_self_order/models/pos_session.py
index f62d72baf88..6c61fa0a373 100644
--- a/addons/pos_self_order/models/pos_session.py
+++ b/addons/pos_self_order/models/pos_session.py
@@ -40,3 +40,8 @@ class PosSession(models.Model):
})
return sessions
+
+ def _loader_params_product_product(self):
+ res = super()._loader_params_product_product()
+ res['search_params']['fields'].append('self_order_available')
+ return res
diff --git a/addons/pos_self_order/models/product_product.py b/addons/pos_self_order/models/product_product.py
index 5cf496ce303..7bdd490a7a1 100644
--- a/addons/pos_self_order/models/product_product.py
+++ b/addons/pos_self_order/models/product_product.py
@@ -2,11 +2,33 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from typing import List, Dict, Optional
-from odoo import models
+from odoo import api, models, fields
from odoo.addons.point_of_sale.models.pos_config import PosConfig
+class ProductTemplate(models.Model):
+ _inherit = 'product.template'
+
+ self_order_available = fields.Boolean(
+ string="Available in Self Order",
+ help="If this product is available in the Self Order screens",
+ default=True,
+ )
+
+ @api.constrains('available_in_pos')
+ def _check_combo_inclusions(self):
+ super()._check_combo_inclusions()
+ self.self_order_available = False
+
+ def write(self, vals_list):
+ res = super().write(vals_list)
+ if 'self_order_available' in vals_list:
+ for record in self:
+ for product in record.product_variant_ids:
+ product._send_availability_status()
+ return res
+
class ProductProduct(models.Model):
_inherit = "product.product"
@@ -100,6 +122,7 @@ class ProductProduct(models.Model):
"pos_combo_ids": self.combo_ids.mapped("id") or False,
"is_pos_groupable": self.uom_id.is_pos_groupable,
"write_date": self.write_date.timestamp(),
+ "self_order_available": self.self_order_available,
}
def _get_self_order_data(self, pos_config: PosConfig) -> List[Dict]:
@@ -107,3 +130,18 @@ class ProductProduct(models.Model):
product._get_product_for_ui(pos_config)
for product in self
]
+
+ def write(self, vals_list):
+ res = super().write(vals_list)
+ if 'self_order_available' in vals_list:
+ for record in self:
+ record._send_availability_status()
+ return res
+
+ def _send_availability_status(self):
+ config_self = self.env['pos.config'].sudo().search([('self_ordering_mode', '!=', 'nothing')])
+ for config in config_self:
+ if config.current_session_id and config.access_token:
+ self.env['bus.bus']._sendone(f'pos_config-{config.access_token}', 'PRODUCT_CHANGED', {
+ 'product': self._get_product_for_ui(config)
+ })
diff --git a/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.js b/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.js
index e8c235cd09c..51d445b3bf5 100644
--- a/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.js
+++ b/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.js
@@ -16,6 +16,9 @@ export class ComboSelection extends Component {
productClicked(lineId) {
const comboLine = this.props.combo.combo_line_ids.find((line) => line.id == lineId);
const productSelected = this.selfOrder.productByIds[comboLine.product_id[0]];
+ if (!productSelected.self_order_available) {
+ return;
+ }
this.props.comboState.selectedProduct = productSelected;
if (productSelected.attributes.length === 0) {
this.props.next();
diff --git a/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.xml b/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.xml
index bd504c6e48e..adf88c4aa94 100644
--- a/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.xml
+++ b/addons/pos_self_order/static/src/app/components/combo_selection/combo_selection.xml
@@ -26,6 +26,9 @@
+
+
-
diff --git a/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.js b/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.js
index 21bc260f948..72909bd0342 100644
--- a/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.js
+++ b/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.js
@@ -173,4 +173,8 @@ export class ComboPage extends Component {
this.state.editMode = true;
this.state.showQtyButtons = false;
}
+
+ get showQtyButtons() {
+ return this.state.showQtyButtons && this.props.product.self_order_available;
+ }
}
diff --git a/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.xml b/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.xml
index cd4e9e0d4bd..e4fab85d78f 100644
--- a/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.xml
+++ b/addons/pos_self_order/static/src/app/pages/combo_page/combo_page.xml
@@ -80,7 +80,7 @@
-
+