diff --git a/stock_picking_batch_custom/static/src/css/stock_picking_batch.css b/stock_picking_batch_custom/static/src/css/stock_picking_batch.css index dc6667a..52f70bb 100644 --- a/stock_picking_batch_custom/static/src/css/stock_picking_batch.css +++ b/stock_picking_batch_custom/static/src/css/stock_picking_batch.css @@ -1,15 +1,18 @@ -/* zebra striping for list views in this module (Odoo 18 selectors) */ +/* zebra striping for list views in this module */ -table.o_list_table tbody tr.o_data_row:nth-child(even) td { +/* Target Odoo list/tree view tables. Use a specific, but broad selector to + avoid interfering globally with other modules. */ +.o_list_view .o_list_view_table tbody tr:nth-child(even) td { background-color: rgba(0, 0, 0, 0.03); } -table.o_list_table tbody tr.o_data_row:hover td { +/* Slight hover contrast to improve row focus */ +.o_list_view .o_list_view_table tbody tr:hover td { background-color: rgba(0, 0, 0, 0.045); } -/* Ensure field widgets inside striped rows stay transparent */ -table.o_list_table tbody tr.o_data_row:nth-child(even) td .o_field_widget, -table.o_list_table tbody tr.o_data_row:nth-child(even) td .o_field_widget * { +/* Ensure checkboxes / toggle columns maintain contrast */ +.o_list_view .o_list_view_table tbody tr:nth-child(even) td .o_field_widget, +.o_list_view .o_list_view_table tbody tr:nth-child(even) td .o_field_widget * { background: transparent; } diff --git a/website_sale_aplicoop/controllers/website_sale_pricing.py b/website_sale_aplicoop/controllers/website_sale_pricing.py index caeae9c..a4d7f7a 100644 --- a/website_sale_aplicoop/controllers/website_sale_pricing.py +++ b/website_sale_aplicoop/controllers/website_sale_pricing.py @@ -140,7 +140,7 @@ def _get_pricing_info( product=product, quantity=quantity, target_currency=currency ) price_before_discount = price - pricelist_item = env["product.pricelist.item"].sudo().browse(rule_id) + pricelist_item = env["product.pricelist.item"].browse(rule_id) if pricelist_item and pricelist_item._show_discount_on_shop(): price_before_discount = pricelist_item._compute_price_before_discount( product=product, @@ -155,7 +155,7 @@ def _get_pricing_info( fiscal_position = ( website.fiscal_position_id.sudo() if website and getattr(website, "fiscal_position_id", False) - else env["account.fiscal.position"].sudo() + else env["account.fiscal.position"] ) product_taxes = product.sudo().taxes_id._filter_taxes_by_company(company) taxes = fiscal_position.map_tax(product_taxes) if product_taxes else product_taxes diff --git a/website_sale_aplicoop/static/src/js/website_sale.js b/website_sale_aplicoop/static/src/js/website_sale.js index d79d3b7..5326427 100644 --- a/website_sale_aplicoop/static/src/js/website_sale.js +++ b/website_sale_aplicoop/static/src/js/website_sale.js @@ -854,6 +854,28 @@ }); } + // Home-delivery toggle button (shop sidebar) + var homeDeliveryBtn = document.getElementById("home-delivery-btn"); + if (homeDeliveryBtn) { + // Restore persisted preference on page load + var storedDelivery = sessionStorage.getItem( + "eskaera_is_delivery_" + self.orderId + ); + if (storedDelivery === "true") { + homeDeliveryBtn.classList.add("active"); + } + homeDeliveryBtn.addEventListener("click", function (e) { + e.preventDefault(); + var isNowActive = !homeDeliveryBtn.classList.contains("active"); + homeDeliveryBtn.classList.toggle("active", isNowActive); + sessionStorage.setItem( + "eskaera_is_delivery_" + self.orderId, + isNowActive ? "true" : "false" + ); + console.log("[HOME_DELIVERY_BTN] toggled to:", isNowActive); + }); + } + // Buttons to clear cart (header + footer) var clearCartBtns = [ document.getElementById("clear-cart-btn"),