', { + text: $productDescription.text() + })); + $.each(this.rootProduct.product_custom_attribute_values, function () { + if (this.custom_value) { + const $customInput = $modalContent + .find(".main_product [data-is_custom='True']") + .closest(`[data-value_id='${this.custom_product_template_attribute_value_id.res_id}']`); + $customInput.attr('previous_custom_value', this.custom_value); + VariantMixin.handleCustomValues($customInput); + } + }); + + $.each(this.rootProduct.no_variant_attribute_values, function () { + if (this.is_custom !== 'True') { + var $currentDescription = $updatedDescription.find(`div[name=ptal-${this.id}]`); + if ($currentDescription?.length > 0) { // one row per multicheckbox + $currentDescription.text($currentDescription.text() + ', ' + this.attribute_value_name); + } else { + $updatedDescription.append($('
', {
+ text: this.attribute_name + ': ' + this.attribute_value_name,
+ name: `ptal-${this.id}`,
+ }));
+ }
+ }
+ });
+
+ $productDescription.replaceWith($updatedDescription);
+ }
+
+ return $modalContent;
+ },
+
+ /**
+ * @private
+ */
+ _onConfirmButtonClick: function () {
+ this.trigger('confirm');
+ this.close();
+ },
+
+ /**
+ * @private
+ */
+ _onCancelButtonClick: function () {
+ this.trigger('back');
+ this.close();
+ },
+
+ /**
+ * Will add/remove the option, that includes:
+ * - Moving it to the correct DOM section
+ * and possibly under its parent product
+ * - Hiding attribute values selection and showing the quantity
+ * - Creating the product if it's in "dynamic" mode (see product_attribute.create_variant)
+ * - Updating the description based on custom/no_create attribute values
+ * - Removing optional products if parent product is removed
+ * - Computing the total price
+ *
+ * @private
+ * @param {MouseEvent} ev
+ */
+ _onAddOrRemoveOption: function (ev) {
+ ev.preventDefault();
+ var self = this;
+ var $target = $(ev.currentTarget);
+ var $modal = $target.parents('.oe_advanced_configurator_modal');
+ var $parent = $target.parents('.js_product:first');
+ $parent.find("a.js_add, span.js_remove").toggleClass('d-none');
+ $parent.find(".js_remove");
+
+ var productTemplateId = $parent.find(".product_template_id").val();
+ if ($target.hasClass('js_add')) {
+ self._onAddOption($modal, $parent, productTemplateId);
+ } else {
+ self._onRemoveOption($modal, $parent);
+ }
+
+ self._computePriceTotal();
+ },
+
+ /**
+ * @private
+ * @see _onAddOrRemoveOption
+ * @param {$.Element} $modal
+ * @param {$.Element} $parent
+ * @param {integer} productTemplateId
+ */
+ _onAddOption: function ($modal, $parent, productTemplateId) {
+ var self = this;
+ var $selectOptionsText = $modal.find('.o_select_options');
+
+ var parentUniqueId = $parent[0].dataset.parentUniqueId;
+ var $optionParent = $modal.find('tr.js_product[data-unique-id="' + parentUniqueId + '"]');
+
+ // remove attribute values selection and update + show quantity input
+ $parent.find('.td-product_name').removeAttr("colspan");
+ $parent.find('.td-qty').removeClass('d-none');
+
+ var productCustomVariantValues = self.getCustomVariantValues($parent);
+ var noVariantAttributeValues = self.getNoVariantAttributeValues($parent);
+ if (productCustomVariantValues || noVariantAttributeValues) {
+ var $productDescription = $parent
+ .find('td.td-product_name div.float-start');
+
+ var $customAttributeValuesDescription = $('
', {
+ class: 'custom_attribute_values_description text-muted small'
+ });
+ if (productCustomVariantValues.length !== 0 || noVariantAttributeValues.length !== 0) {
+ $customAttributeValuesDescription.append($('
')); + } + + $.each(productCustomVariantValues, function (){ + $customAttributeValuesDescription.append($('
')); + } + + $.each(productCustomVariantValues, function (){ + $customAttributeValuesDescription.append($('
', {
+ text: this.attribute_value_name + ': ' + this.custom_value
+ }));
+ });
+
+ $.each(noVariantAttributeValues, function (){
+ if (this.is_custom !== 'True'){
+ var $currentDescription = $customAttributeValuesDescription.find(`div[name=ptal-${this.id}]`);
+ if ($currentDescription?.length > 0) { // one row per multicheckbox
+ $currentDescription.text($currentDescription.text() + ', ' + this.attribute_value_name);
+ } else {
+ $customAttributeValuesDescription.append($('
', {
+ text: this.attribute_name + ': ' + this.attribute_value_name,
+ name: `ptal-${this.id}`,
+ }));
+ }
+ }
+ });
+
+ $productDescription.append($customAttributeValuesDescription);
+ }
+
+ // place it after its parent and its parent options
+ var $tmpOptionParent = $optionParent;
+ while ($tmpOptionParent.length) {
+ $optionParent = $tmpOptionParent;
+ $tmpOptionParent = $modal.find('tr.js_product.in_cart[data-parent-unique-id="' + $optionParent[0].dataset.uniqueId + '"]').last();
+ }
+ $optionParent.after($parent);
+ $parent.addClass('in_cart');
+
+ this.selectOrCreateProduct(
+ $parent,
+ $parent.find('.product_id').val(),
+ productTemplateId,
+ true
+ ).then(function (productId) {
+ $parent.find('.product_id').val(productId);
+
+ jsonrpc("/sale_product_configurator/optional_product_items", {
+ 'product_id': productId,
+ 'pricelist_id': self.pricelistId || false,
+ }).then(function (addedItem) {
+ var $addedItem = $(addedItem);
+ $modal.find('tr:last').after($addedItem);
+
+ self.$el.find('input[name="add_qty"]').trigger('change');
+ self.triggerVariantChange($addedItem);
+
+ // add a unique id to the new products
+ var parentUniqueId = $parent[0].dataset.uniqueId;
+ var parentQty = $parent.find('input[name="add_qty"]').val();
+ $addedItem.filter('.js_product').each(function () {
+ var $el = $(this);
+ var uniqueId = self._getUniqueId(this);
+ this.dataset.uniqueId = uniqueId;
+ this.dataset.parentUniqueId = parentUniqueId;
+ $el.find('input[name="add_qty"]').val(parentQty);
+ });
+
+ if ($selectOptionsText.nextAll('.js_product').length === 0) {
+ // no more optional products to select -> hide the header
+ $selectOptionsText.hide();
+ }
+ });
+ });
+ },
+
+ /**
+ * @private
+ * @see _onAddOrRemoveOption
+ * @param {$.Element} $modal
+ * @param {$.Element} $parent
+ */
+ _onRemoveOption: function ($modal, $parent) {
+ // restore attribute values selection
+ var uniqueId = $parent[0].dataset.parentUniqueId;
+ var qty = $modal.find('tr.js_product.in_cart[data-unique-id="' + uniqueId + '"]').find('input[name="add_qty"]').val();
+ $parent.removeClass('in_cart');
+ $parent.find('.td-product_name').attr("colspan", 2);
+ $parent.find('.td-qty').addClass('d-none');
+ $parent.find('input[name="add_qty"]').val(qty);
+ $parent.find('.custom_attribute_values_description').remove();
+
+ $modal.find('.o_select_options').show();
+
+ var productUniqueId = $parent[0].dataset.uniqueId;
+ this._removeOptionOption($modal, productUniqueId);
+
+ $modal.find('tr:last').after($parent);
+ },
+
+ /**
+ * If the removed product had optional products, remove them as well
+ *
+ * @private
+ * @param {$.Element} $modal
+ * @param {integer} optionUniqueId The removed optional product id
+ */
+ _removeOptionOption: function ($modal, optionUniqueId) {
+ var self = this;
+ $modal.find('tr.js_product[data-parent-unique-id="' + optionUniqueId + '"]').each(function () {
+ var uniqueId = this.dataset.uniqueId;
+ $(this).remove();
+ self._removeOptionOption($modal, uniqueId);
+ });
+ },
+ /**
+ * @override
+ */
+ _onChangeCombination: function (ev, $parent, combination) {
+ $parent
+ .find('.td-product_name .product-name')
+ .first()
+ .text(combination.display_name);
+
+ VariantMixin._onChangeCombination.apply(this, arguments);
+
+ this._computePriceTotal();
+ },
+ /**
+ * Update price total when the quantity of a product is changed
+ *
+ * @private
+ * @param {MouseEvent} ev
+ */
+ _onChangeQuantity: function (ev) {
+ var $product = $(ev.target.closest('tr.js_product'));
+ var qty = parseFloat($(ev.currentTarget).val());
+
+ var uniqueId = $product[0].dataset.uniqueId;
+ this.$el.find('tr.js_product:not(.in_cart)[data-parent-unique-id="' + uniqueId + '"] input[name="add_qty"]').each(function () {
+ $(this).val(qty);
+ });
+
+ if (this._triggerPriceUpdateOnChangeQuantity()) {
+ this.onChangeAddQuantity(ev);
+ }
+ if ($product.hasClass('main_product')) {
+ this.rootProduct.quantity = qty;
+ }
+ this.trigger('update_quantity', this.rootProduct.quantity);
+ this._computePriceTotal();
+ },
+
+ /**
+ * When a product is added or when the quantity is changed,
+ * we need to refresh the total price row
+ */
+ _computePriceTotal: function () {
+ if (this.$modal.find('.js_price_total').length) {
+ var price = 0;
+ this.$modal.find('.js_product.in_cart').each(function () {
+ var quantity = parseFloat($(this).find('input[name="add_qty"]').first().val().replace(',', '.') || 1);
+ price += parseFloat($(this).find('.js_raw_price').html()) * quantity;
+ });
+
+ this.$modal.find('.js_price_total .oe_currency_value').text(
+ this._priceToStr(parseFloat(price))
+ );
+ }
+ },
+
+ /**
+ * Extension point for website_sale
+ *
+ * @private
+ */
+ _triggerPriceUpdateOnChangeQuantity: function () {
+ return !this.isWebsite;
+ },
+ /**
+ * Returns a unique id for `$el`.
+ *
+ * @private
+ * @param {Element} el
+ * @returns {integer}
+ */
+ _getUniqueId: function (el) {
+ if (!el.dataset.uniqueId) {
+ el.dataset.uniqueId = parseInt(uniqueId(), 10);
+ }
+ return el.dataset.uniqueId;
+ },
+});
diff --git a/static/src/js/website_sale_options.js b/static/src/js/website_sale_options.js
new file mode 100644
index 0000000..f347732
--- /dev/null
+++ b/static/src/js/website_sale_options.js
@@ -0,0 +1,124 @@
+/** @odoo-module **/
+
+import publicWidget from "@web/legacy/js/public/public_widget";
+import wSaleUtils from "@website_sale/js/website_sale_utils";
+import { OptionalProductsModal } from "@website_sale_product_configurator/js/sale_product_configurator_modal";
+import "@website_sale/js/website_sale";
+import { _t } from "@web/core/l10n/translation";
+
+publicWidget.registry.WebsiteSale.include({
+
+ //--------------------------------------------------------------------------
+ // Private
+ //--------------------------------------------------------------------------
+
+ _onProductReady: function () {
+ if (this.isBuyNow) {
+ return this._submitForm();
+ }
+ this.optionalProductsModal = new OptionalProductsModal(this.$form, {
+ rootProduct: this.rootProduct,
+ isWebsite: true,
+ okButtonText: _t('Proceed to Checkout'),
+ cancelButtonText: _t('Continue Shopping'),
+ title: _t('Add to cart'),
+ context: this._getContext(),
+ forceDialog: this.forceDialog,
+ }).open();
+
+ this.optionalProductsModal.on('options_empty', null, this._submitForm.bind(this));
+ this.optionalProductsModal.on('update_quantity', null, this._onOptionsUpdateQuantity.bind(this));
+ this.optionalProductsModal.on('confirm', null, this._onModalSubmit.bind(this, true));
+ this.optionalProductsModal.on('back', null, this._onModalSubmit.bind(this, false));
+
+ return this.optionalProductsModal.opened();
+ },
+ /**
+ * Overridden to resolve _opened promise on modal
+ * when stayOnPageOption is activated.
+ *
+ * @override
+ */
+ _submitForm() {
+ var ret = this._super(...arguments);
+ if (this.optionalProductsModal && this.stayOnPageOption) {
+ ret.then(()=>{
+ this.optionalProductsModal._openedResolver()
+ });
+ }
+ return ret;
+ },
+ /**
+ * Update web shop base form quantity
+ * when quantity is updated in the optional products window
+ *
+ * @private
+ * @param {integer} quantity
+ */
+ _onOptionsUpdateQuantity: function (quantity) {
+ var $qtyInput = this.$form
+ .find('.js_main_product input[name="add_qty"]')
+ .first();
+
+ if ($qtyInput.length) {
+ $qtyInput.val(quantity).trigger('change');
+ } else {
+ // This handles the case when the "Select Quantity" customize show
+ // is disabled, and therefore the above selector does not find an
+ // element.
+ // To avoid duplicating all RPC, only trigger the variant change if
+ // it is not already done from the above trigger.
+ this.optionalProductsModal.triggerVariantChange(this.optionalProductsModal.$el);
+ }
+ },
+
+ /**
+ * Submits the form with additional parameters
+ * - lang
+ * - product_custom_attribute_values: The products custom variant values
+ *
+ * @private
+ * @param {Boolean} goToShop Triggers a page refresh to the url "shop/cart"
+ */
+ _onModalSubmit: function (goToShop) {
+ const mainProduct = this.$('.js_product.in_cart.main_product').children('.product_id');
+ const productTrackingInfo = mainProduct.data('product-tracking-info');
+ if (productTrackingInfo) {
+ const currency = productTrackingInfo['currency'];
+ const productsTrackingInfo = [];
+ this.$('.js_product.in_cart').each((i, el) => {
+ productsTrackingInfo.push({
+ 'item_id': el.getElementsByClassName('product_id')[0].value,
+ 'item_name': el.getElementsByClassName('product_display_name')[0].textContent,
+ 'quantity': el.getElementsByClassName('js_quantity')[0].value,
+ 'currency': currency,
+ 'price': el.getElementsByClassName('oe_price')[0].getElementsByClassName('oe_currency_value')[0].textContent,
+ });
+ });
+ if (productsTrackingInfo) {
+ this.$el.trigger('add_to_cart_event', productsTrackingInfo);
+ }
+ }
+
+ const callService = this.call.bind(this)
+ this.optionalProductsModal.getAndCreateSelectedProducts()
+ .then((products) => {
+ const productAndOptions = JSON.stringify(products);
+ this.rpc('/shop/cart/update_option', {
+ product_and_options: productAndOptions,
+ ...this._getOptionalCombinationInfoParam(),
+ }).then(function (values) {
+ if (goToShop) {
+ window.location.pathname = "/shop/cart";
+ } else {
+ wSaleUtils.updateCartNavBar(values);
+ wSaleUtils.showCartNotification(callService, values.notification_info);
+ }
+ }).then(() => {
+ this._getCombinationInfo($.Event('click', {target: $("#add_to_cart")}));
+ });
+ });
+ },
+});
+
+export default publicWidget.registry.WebsiteSaleOptions;
diff --git a/static/src/scss/website_sale_options.scss b/static/src/scss/website_sale_options.scss
new file mode 100644
index 0000000..bc88ece
--- /dev/null
+++ b/static/src/scss/website_sale_options.scss
@@ -0,0 +1,15 @@
+.css_not_available.js_product {
+ .product_price {
+ display: none !important;
+ }
+}
+
+div#modal_optional_products table tr td {
+ border: 0;
+}
+
+@include media-breakpoint-down(md) {
+ div#modal_optional_products .td-qty {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/static/tests/tours/website_sale_buy.js b/static/tests/tours/website_sale_buy.js
new file mode 100644
index 0000000..f1aedd5
--- /dev/null
+++ b/static/tests/tours/website_sale_buy.js
@@ -0,0 +1,20 @@
+/** @odoo-module **/
+/**
+ * Add custom steps to handle the optional products modal introduced
+ * by the product configurator module.
+ */
+import { registry } from "@web/core/registry";
+import { patch } from "@web/core/utils/patch";
+import "@website_sale/../tests/tours/website_sale_buy";
+
+patch(registry.category("web_tour.tours").get("shop_buy_product"), {
+ steps() {
+ const originalSteps = super.steps();
+ const addCartStepIndex = originalSteps.findIndex((step) => step.id === "add_cart_step");
+ originalSteps.splice(addCartStepIndex + 1, 1, {
+ content: "click in modal on 'Proceed to checkout' button",
+ trigger: 'button:contains("Proceed to Checkout")',
+ });
+ return originalSteps;
+ },
+});
diff --git a/static/tests/tours/website_sale_preconfigured_variant_price.js b/static/tests/tours/website_sale_preconfigured_variant_price.js
new file mode 100644
index 0000000..136666d
--- /dev/null
+++ b/static/tests/tours/website_sale_preconfigured_variant_price.js
@@ -0,0 +1,19 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add('website_sale_product_configurator_optional_products_tour', {
+ test: true,
+ steps: () => [{
+ name: 'Click Aluminium Option',
+ trigger: 'ul.js_add_cart_variants span:contains("Aluminium")',
+ extra_trigger: 'ul.js_add_cart_variants span:contains("Aluminium") ~ span.badge:contains("50.40")',
+}, {
+ name: 'Add to cart',
+ trigger: '#add_to_cart',
+}, {
+ name: 'Check that modal was opened with the correct variant price',
+ trigger: 'main.oe_advanced_configurator_modal',
+ extra_trigger: 'main.oe_advanced_configurator_modal span:contains("800.40")',
+ run: () => {},
+}]});
diff --git a/static/tests/tours/website_sale_shop_custom_attributes_value.js b/static/tests/tours/website_sale_shop_custom_attributes_value.js
new file mode 100644
index 0000000..eb90d90
--- /dev/null
+++ b/static/tests/tours/website_sale_shop_custom_attributes_value.js
@@ -0,0 +1,57 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+var optionVariantImage;
+
+registry.category("web_tour.tours").add("a_shop_custom_attribute_value", {
+ url: "/shop?search=Customizable Desk",
+ test: true,
+ steps: () => [{
+ content: "click on Customizable Desk",
+ trigger: '.oe_product_cart a:contains("Customizable Desk (TEST)")',
+}, {
+ trigger: 'a.js_add_cart_json:has(i.fa-plus)',
+ run: 'click',
+}, {
+ trigger: 'span.oe_currency_value:contains(750)',
+ run: function (){}, // check
+}, {
+ id: 'add_cart_step',
+ trigger: 'a:contains(Add to cart)',
+ run: 'click',
+}, {
+ trigger: '.oe_advanced_configurator_modal .js_product:eq(1) div:contains("Conference Chair (TEST) (Steel)")',
+ run: function () {
+ optionVariantImage = $('.oe_advanced_configurator_modal .js_product:eq(1) img.variant_image').attr('src');
+ }
+}, {
+ trigger: '.oe_advanced_configurator_modal .js_product:eq(1) input[data-value_name="Aluminium"]',
+}, {
+ trigger: '.oe_advanced_configurator_modal .js_product:eq(1) div:contains("Conference Chair (TEST) (Aluminium)")',
+ run: function () {
+ var newVariantImage = $('.oe_advanced_configurator_modal .js_product:eq(1) img.variant_image').attr('src');
+ if (newVariantImage !== optionVariantImage) {
+ $('
').text('image variant option src changed').insertAfter('.oe_advanced_configurator_modal .js_product:eq(1) .product-name');
+ }
+ }
+}, {
+ extra_trigger: '.oe_advanced_configurator_modal .js_product:eq(1) div:contains("image variant option src changed")',
+ trigger: '.oe_advanced_configurator_modal .js_product:eq(1) input[data-value_name="Steel"]',
+}, {
+ trigger: '.oe_price span:contains(22.90)',
+ run: function (){}, // check
+}, {
+ trigger: '.oe_advanced_configurator_modal .js_product:has(strong:contains(Conference Chair)) .js_add',
+ extra_trigger: '.oe_advanced_configurator_modal .js_product:has(strong:contains(Conference Chair))',
+ run: 'click'
+}, {
+ trigger: '.oe_advanced_configurator_modal .js_product:has(strong:contains(Chair floor protection)) .js_add',
+ extra_trigger: '.oe_advanced_configurator_modal .js_product:has(strong:contains(Chair floor protection))',
+ run: 'click'
+}, {
+ trigger: 'span:contains(1,557.00)',
+ run: function (){}, // check
+}, {
+ trigger: 'button:has(span:contains(Proceed to Checkout))',
+ run: 'click',
+}]});
diff --git a/static/tests/tours/website_sale_variants_modal_window.js b/static/tests/tours/website_sale_variants_modal_window.js
new file mode 100644
index 0000000..2e0ab10
--- /dev/null
+++ b/static/tests/tours/website_sale_variants_modal_window.js
@@ -0,0 +1,65 @@
+/** @odoo-module **/
+
+ import { registry } from "@web/core/registry";
+
+ // This tour relies on a data created from the python test.
+ registry.category("web_tour.tours").add('tour_variants_modal_window', {
+ test: true,
+ url: '/shop?search=Short (TEST)',
+ steps: () => [
+ {
+ content: "Select the Short (TEST) product",
+ trigger: '.oe_product_cart a:containsExact("Short (TEST)")',
+ },
+ {
+ content: "Click on the always variant",
+ trigger: 'input[data-attribute_name="Always attribute size"][data-value_name="M always"]',
+ },
+ {
+ content: "Click on the dynamic variant",
+ trigger: 'input[data-attribute_name="Dynamic attribute size"][data-value_name="M dynamic"]',
+ },
+ {
+ content: "Click on the never variant",
+ trigger: 'input[data-attribute_name="Never attribute size"][data-value_name="M never"]',
+ },
+ {
+ content: "Click on the never custom variant",
+ trigger: 'input[data-attribute_name="Never attribute size custom"][data-value_name="Yes never custom"]',
+ },
+ {
+ trigger: 'input.variant_custom_value',
+ run: 'text TEST',
+ },
+ {
+ content: "Click add to cart",
+ trigger: '#add_to_cart',
+ },
+ {
+ content: "Go through the modal window of the product configurator",
+ extra_trigger: '.oe_advanced_configurator_modal',
+ trigger: 'button span:contains(Proceed to Checkout)',
+ run: 'click'
+ },
+ {
+ content: "Check the product is in the cart",
+ trigger: 'div>a>h6:contains(Short (TEST))',
+ },
+ {
+ content: "Check always variant",
+ trigger: 'div>a>h6:contains(M always)',
+ },
+ {
+ content: "Check dynamic variant",
+ trigger: 'div>a>h6:contains(M dynamic)',
+ },
+ {
+ content: "Check never variant",
+ trigger: 'div.text-muted>span:contains(Never attribute size: M never)',
+ },
+ {
+ content: "Check never custom variant",
+ trigger: 'div.text-muted>span:contains(Never attribute size custom: Yes never custom: TEST)',
+ isCheck: true,
+ }
+ ]});
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..a89d4e7
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_customize
+from . import test_website_sale_configurator
diff --git a/tests/test_customize.py b/tests/test_customize.py
new file mode 100644
index 0000000..b97b078
--- /dev/null
+++ b/tests/test_customize.py
@@ -0,0 +1,15 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests.common import HttpCase
+from odoo.addons.sale_product_configurator.tests.common import TestProductConfiguratorCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestUi(HttpCase, TestProductConfiguratorCommon):
+
+ def test_01_admin_shop_custom_attribute_value_tour(self):
+ # Ensure that no pricelist is available during the test.
+ # This ensures that tours which triggers on the amounts will run properly.
+ self.env['product.pricelist'].search([]).action_archive()
+ self.start_tour("/", 'a_shop_custom_attribute_value', login="admin")
diff --git a/tests/test_website_sale_configurator.py b/tests/test_website_sale_configurator.py
new file mode 100644
index 0000000..65666e4
--- /dev/null
+++ b/tests/test_website_sale_configurator.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests import tagged
+from odoo.addons.sale_product_configurator.tests.common import TestProductConfiguratorCommon
+from odoo.addons.base.tests.common import HttpCaseWithUserPortal, HttpCaseWithUserDemo
+
+
+@tagged('post_install', '-at_install')
+class TestWebsiteSaleProductConfigurator(TestProductConfiguratorCommon, HttpCaseWithUserPortal, HttpCaseWithUserDemo):
+ @classmethod
+ def setUpClass(cls):
+ super().setUpClass()
+ cls.product_product_custo_desk.write({
+ 'optional_product_ids': [(4, cls.product_product_conf_chair.id)],
+ 'website_published': True,
+ })
+ cls.product_product_conf_chair.website_published = True
+
+ ptav_ids = cls.product_product_custo_desk.attribute_line_ids.product_template_value_ids
+ ptav_ids.filtered(lambda ptav: ptav.name == 'Aluminium').price_extra = 50.4
+
+ def test_01_product_configurator_variant_price(self):
+ product = self.product_product_conf_chair.with_user(self.user_portal)
+ ptav_ids = self.product_product_custo_desk.attribute_line_ids.product_template_value_ids
+ parent_combination = ptav_ids.filtered(lambda ptav: ptav.name in ('Aluminium', 'White'))
+ self.assertEqual(product._is_add_to_cart_possible(parent_combination), True)
+ # This is a regression test. The product configurator menu is proposed
+ # whenever a product has optional products. However, as the end user
+ # already picked a variant, the variant configuration menu is omitted
+ # in this case. However, we still want to make sure that the correct
+ # variant attributes are taken into account when calculating the price.
+ url = self.product_product_custo_desk.website_url
+ # Ensure that no pricelist is available during the test.
+ # This ensures that tours with triggers on the amounts will run properly.
+ self.env['product.pricelist'].search([]).action_archive()
+ self.start_tour(url, 'website_sale_product_configurator_optional_products_tour', login='portal')
+
+ def test_02_variants_modal_window(self):
+ """
+ The objective is to verify that the data concerning the variants are well transmitted
+ even when passing through a modal window (product configurator).
+
+ We create a product with the different attributes and we will modify them.
+ If the information is not correctly transmitted,
+ the default values of the variants will be used (the first one).
+ """
+
+ always_attribute, dynamic_attribute, never_attribute, never_attribute_custom = self.env['product.attribute'].create([
+ {
+ 'name': 'Always attribute size',
+ 'display_type': 'radio',
+ 'create_variant': 'always'
+ },
+ {
+ 'name': 'Dynamic attribute size',
+ 'display_type': 'radio',
+ 'create_variant': 'dynamic'
+ },
+ {
+ 'name': 'Never attribute size',
+ 'display_type': 'radio',
+ 'create_variant': 'no_variant'
+ },
+ {
+ 'name': 'Never attribute size custom',
+ 'display_type': 'radio',
+ 'create_variant': 'no_variant'
+ }
+ ])
+ always_S, always_M, dynamic_S, dynamic_M, never_S, never_M, never_custom_no, never_custom_yes = self.env['product.attribute.value'].create([
+ {
+ 'name': 'S always',
+ 'attribute_id': always_attribute.id,
+ },
+ {
+ 'name': 'M always',
+ 'attribute_id': always_attribute.id,
+ },
+ {
+ 'name': 'S dynamic',
+ 'attribute_id': dynamic_attribute.id,
+ },
+ {
+ 'name': 'M dynamic',
+ 'attribute_id': dynamic_attribute.id,
+ },
+ {
+ 'name': 'S never',
+ 'attribute_id': never_attribute.id,
+ },
+ {
+ 'name': 'M never',
+ 'attribute_id': never_attribute.id,
+ },
+ {
+ 'name': 'No never custom',
+ 'attribute_id': never_attribute_custom.id,
+ },
+ {
+ 'name': 'Yes never custom',
+ 'attribute_id': never_attribute_custom.id,
+ 'is_custom': True,
+ }
+ ])
+
+ product_short = self.env['product.template'].create({
+ 'name': 'Short (TEST)',
+ 'website_published': True,
+ })
+
+ self.env['product.template.attribute.line'].create([
+ {
+ 'product_tmpl_id': product_short.id,
+ 'attribute_id': always_attribute.id,
+ 'value_ids': [(4, always_S.id), (4, always_M.id)],
+ },
+ {
+ 'product_tmpl_id': product_short.id,
+ 'attribute_id': dynamic_attribute.id,
+ 'value_ids': [(4, dynamic_S.id), (4, dynamic_M.id)],
+ },
+ {
+ 'product_tmpl_id': product_short.id,
+ 'attribute_id': never_attribute.id,
+ 'value_ids': [(4, never_S.id), (4, never_M.id)],
+ },
+ {
+ 'product_tmpl_id': product_short.id,
+ 'attribute_id': never_attribute_custom.id,
+ 'value_ids': [(4, never_custom_no.id), (4, never_custom_yes.id)],
+ },
+ ])
+
+ # Add an optional product to trigger the modal window
+ optional_product = self.env['product.template'].create({
+ 'name': 'Optional product (TEST)',
+ 'website_published': True,
+ })
+ product_short.optional_product_ids = [(4, optional_product.id)]
+
+ old_sale_order = self.env['sale.order'].search([])
+ self.start_tour("/", 'tour_variants_modal_window', login="demo")
+
+ # Check the name of the created sale order line
+ new_sale_order = self.env['sale.order'].search([]) - old_sale_order
+ new_order_line = new_sale_order.order_line
+ self.assertEqual(new_order_line.name, 'Short (TEST) (M always, M dynamic)\n\nNever attribute size: M never\nNever attribute size custom: Yes never custom: TEST')
diff --git a/views/templates.xml b/views/templates.xml
new file mode 100644
index 0000000..775ed93
--- /dev/null
+++ b/views/templates.xml
@@ -0,0 +1,172 @@
+
+ Option not available Option not available
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Product
+
+
+
+
+
+
+ Quantity
+
+
+
+ Price
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Total:
+
+
+ Available Options:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+