-
-
Notifications
You must be signed in to change notification settings - Fork 493
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MIG] website_sale_product_assortment: Migration to 17.0
- Loading branch information
1 parent
3c62c27
commit c8d915d
Showing
10 changed files
with
129 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 44 additions & 43 deletions
87
website_sale_product_assortment/static/src/js/assortment_list_preview.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,49 @@ | ||
| odoo.define("website_sale_product_assortment.assortment_preview", function (require) { | ||
| "use strict"; | ||
| /** @odoo-module **/ | ||
| // Copyright 2021 Tecnativa - Carlos Roca | ||
| // License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). | ||
|
|
||
| const publicWidget = require("web.public.widget"); | ||
| const core = require("web.core"); | ||
| import {jsonrpc} from "@web/core/network/rpc_service"; | ||
| import publicWidget from "@web/legacy/js/public/public_widget"; | ||
| import {renderToFragment} from "@web/core/utils/render"; | ||
|
|
||
| publicWidget.registry.WebsiteSaleProductAssortment = publicWidget.Widget.extend({ | ||
| selector: "#products_grid", | ||
| export const WebsiteSaleProductAssortment = publicWidget.Widget.extend({ | ||
| selector: "#products_grid", | ||
|
|
||
| start: function () { | ||
| this._super.apply(this, arguments); | ||
| this.render_assortments(); | ||
| }, | ||
| render_assortments: function () { | ||
| const $products = $(".o_wsale_product_grid_wrapper"); | ||
| const product_dic = {}; | ||
| $products.each(function () { | ||
| product_dic[this.querySelector("a img").src.split("/")[6]] = this; | ||
| }); | ||
| const product_ids = Object.keys(product_dic).map(Number); | ||
| return this._rpc({ | ||
| route: "/sale/get_info_assortment_preview", | ||
| params: {product_template_ids: product_ids}, | ||
| }).then((product_values) => { | ||
| for (const product of product_values) { | ||
| this.render_product_assortment(product_dic[product.id], product); | ||
| } | ||
| }); | ||
| }, | ||
| render_product_assortment: function (product_info, product) { | ||
| $(product_info) | ||
| .find(".product_price") | ||
| .append( | ||
| $( | ||
| core.qweb.render( | ||
| "website_sale_product_assortment.product_availability", | ||
| { | ||
| message_unavailable: product.message_unavailable, | ||
| product_template_id: product.id, | ||
| } | ||
| ) | ||
| ).get(0) | ||
| ); | ||
| start: function () { | ||
| this._super.apply(this, arguments); | ||
| this.render_assortments(); | ||
| }, | ||
|
|
||
| $(product_info).find(".fa-shopping-cart").parent().addClass("disabled"); | ||
| }, | ||
| }); | ||
| render_assortments: function () { | ||
| const $products = $(".o_wsale_product_grid_wrapper"); | ||
| const product_dic = {}; | ||
| $products.each(function () { | ||
| product_dic[this.querySelector("a img").src.split("/")[6]] = this; | ||
| }); | ||
| const product_ids = Object.keys(product_dic).map(Number); | ||
| return jsonrpc("/sale/get_info_assortment_preview", { | ||
| product_template_ids: product_ids, | ||
| }).then((product_values) => { | ||
| for (const product of product_values) { | ||
| this.render_product_assortment(product_dic[product.id], product); | ||
| } | ||
| }); | ||
| }, | ||
|
|
||
| render_product_assortment: function (product_info, product) { | ||
| $(product_info) | ||
| .find(".product_price") | ||
| .append( | ||
| renderToFragment( | ||
| "website_sale_product_assortment.product_availability", | ||
| { | ||
| message_unavailable: product.message_unavailable, | ||
| product_template_id: product.id, | ||
| } | ||
| ) | ||
| ); | ||
| $(product_info).find(".fa-shopping-cart").parent().addClass("disabled"); | ||
| }, | ||
| }); | ||
|
|
||
| publicWidget.registry.WebsiteSaleProductAssortment = WebsiteSaleProductAssortment; |
2 changes: 0 additions & 2 deletions
2
website_sale_product_assortment/static/src/js/no_purchase_tour.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
website_sale_product_assortment/static/src/js/no_restriction_tour.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
website_sale_product_assortment/static/src/js/no_show_tour.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 47 additions & 60 deletions
107
website_sale_product_assortment/static/src/js/variant_mixin.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,52 @@ | ||
| /** @odoo-module **/ | ||
| // Copyright 2021 Tecnativa - Carlos Roca | ||
| // License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). | ||
| odoo.define("website_sale_product_assortment.VariantMixin", function (require) { | ||
| "use strict"; | ||
|
|
||
| var VariantMixin = require("sale.VariantMixin"); | ||
| var publicWidget = require("web.public.widget"); | ||
| var core = require("web.core"); | ||
| var QWeb = core.qweb; | ||
| import VariantMixin from "@website_sale/js/sale_variant_mixin"; | ||
| import {renderToFragment} from "@web/core/utils/render"; | ||
|
|
||
| require("website_sale.website_sale"); | ||
| VariantMixin._onChangeCombinationAssortment = function (ev, $parent, combination) { | ||
| let product_id = 0; | ||
| if ($parent.find("input.product_id:checked").length) { | ||
| product_id = $parent.find("input.product_id:checked").val(); | ||
| } else { | ||
| product_id = $parent.find(".product_id").val(); | ||
| } | ||
| const isMainProduct = | ||
| combination.product_id && | ||
| ($parent.is(".js_main_product") || $parent.is(".main_product")) && | ||
| combination.product_id === parseInt(product_id, 10); | ||
| if (!this.isWebsite || !isMainProduct) { | ||
| return; | ||
| } | ||
| $(".oe_website_sale") | ||
| .find("#message_unavailable_" + combination.product_template_id) | ||
| .remove(); | ||
| $("#product_full_assortment_description").remove(); | ||
| if (!combination.product_avoid_purchase) { | ||
| return; | ||
| } | ||
| $parent.find("#add_to_cart").addClass("disabled"); | ||
| $parent.find("#buy_now").addClass("disabled"); | ||
| $(".oe_website_sale") | ||
| .find("#product_option_block") | ||
| .prepend( | ||
| renderToFragment( | ||
| "website_sale_product_assortment.product_availability", | ||
| combination | ||
| ) | ||
| ); | ||
| if (combination.assortment_information) { | ||
| $("#product_detail").after( | ||
| "<div id='product_full_assortment_description'>" + | ||
| combination.assortment_information + | ||
| "</div>" | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| VariantMixin._onChangeCombinationAssortment = function (ev, $parent, combination) { | ||
| let product_id = 0; | ||
| if ($parent.find("input.product_id:checked").length) { | ||
| product_id = $parent.find("input.product_id:checked").val(); | ||
| } else { | ||
| product_id = $parent.find(".product_id").val(); | ||
| } | ||
| const isMainProduct = | ||
| combination.product_id && | ||
| ($parent.is(".js_main_product") || $parent.is(".main_product")) && | ||
| combination.product_id === parseInt(product_id, 10); | ||
| if (!this.isWebsite || !isMainProduct) { | ||
| return; | ||
| } | ||
| $(".oe_website_sale") | ||
| .find("#message_unavailable_" + combination.product_template_id) | ||
| .remove(); | ||
| $("#product_full_assortment_description").remove(); | ||
| if (!combination.product_avoid_purchase) { | ||
| return; | ||
| } | ||
| $parent.find("#add_to_cart").addClass("disabled"); | ||
| $parent.find("#buy_now").addClass("disabled"); | ||
| $(".oe_website_sale") | ||
| .find("#product_option_block") | ||
| .prepend( | ||
| QWeb.render( | ||
| "website_sale_product_assortment.product_availability", | ||
| combination | ||
| ) | ||
| ); | ||
| if (combination.assortment_information) { | ||
| $("#product_detail").after( | ||
| "<div id='product_full_assortment_description'>" + | ||
| combination.assortment_information + | ||
| "</div>" | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| publicWidget.registry.WebsiteSale.include({ | ||
| /** | ||
| * Adds the stock checking to the regular _onChangeCombination method | ||
| * @override | ||
| */ | ||
| _onChangeCombination: function () { | ||
| this._super.apply(this, arguments); | ||
| VariantMixin._onChangeCombinationAssortment.apply(this, arguments); | ||
| }, | ||
| }); | ||
|
|
||
| return VariantMixin; | ||
| }); | ||
| const originalOnChangeCombination = VariantMixin._onChangeCombination; | ||
| VariantMixin._onChangeCombination = function (ev, $parent, combination) { | ||
| originalOnChangeCombination.apply(this, arguments); | ||
| VariantMixin._onChangeCombinationAssortment.apply(this, ev, $parent, combination); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters