diff --git a/l10n_es_edi_tbai_reagyp_recibidas/static/description/icon.png b/l10n_es_edi_tbai_reagyp_recibidas/static/description/icon.png deleted file mode 100644 index d4a79d1..0000000 Binary files a/l10n_es_edi_tbai_reagyp_recibidas/static/description/icon.png and /dev/null differ diff --git a/website_sale_aplicoop/controllers/website_sale.py b/website_sale_aplicoop/controllers/website_sale.py index a9d6894..aab682f 100644 --- a/website_sale_aplicoop/controllers/website_sale.py +++ b/website_sale_aplicoop/controllers/website_sale.py @@ -1558,11 +1558,7 @@ class AplicoopWebsiteSale(WebsiteSale): status=400, ) - cutoff_passed = bool( - group_order.cutoff_date - and group_order.cutoff_date < fields.Date.today() - ) - if group_order.state != "open" or cutoff_passed: + if group_order.state != "open": return self._build_group_order_unavailable_response(group_order) current_user = request.env.user diff --git a/website_sale_aplicoop/i18n/es.po b/website_sale_aplicoop/i18n/es.po index c2f590b..7739497 100644 --- a/website_sale_aplicoop/i18n/es.po +++ b/website_sale_aplicoop/i18n/es.po @@ -1885,7 +1885,7 @@ msgstr "Guardar Carrito" #. odoo-python #: code:addons/website_sale_aplicoop/models/js_translations.py:0 msgid "Save as Draft" -msgstr "Guardar Carrito" +msgstr "Grabar pedido" #. module: website_sale_aplicoop #. odoo-python diff --git a/website_sale_aplicoop/i18n/eu.po b/website_sale_aplicoop/i18n/eu.po index def924e..67d21dc 100644 --- a/website_sale_aplicoop/i18n/eu.po +++ b/website_sale_aplicoop/i18n/eu.po @@ -1882,7 +1882,7 @@ msgstr "Saskia Gorde" #. odoo-python #: code:addons/website_sale_aplicoop/models/js_translations.py:0 msgid "Save as Draft" -msgstr "Sakia gorde" +msgstr "Eskaera gorde" #. module: website_sale_aplicoop #. odoo-python diff --git a/website_sale_aplicoop/static/src/js/website_sale.js b/website_sale_aplicoop/static/src/js/website_sale.js index bae18ef..a47217b 100644 --- a/website_sale_aplicoop/static/src/js/website_sale.js +++ b/website_sale_aplicoop/static/src/js/website_sale.js @@ -117,11 +117,6 @@ console.log("Attempting to auto-load draft order..."); var self = this; - if (this._skipDraftAutoLoad) { - console.log("Auto-load draft skipped (order closed or cutoff passed)"); - return; - } - // Only auto-load if cart is empty var cartItemsCount = Object.keys(this.cart).length; if (cartItemsCount > 0) { @@ -511,7 +506,6 @@ shouldClear = true; } } - self._skipDraftAutoLoad = shouldClear; if (shouldClear) { console.log( "[groupOrderShop] check-status: clearing cart (reason:", diff --git a/website_sale_aplicoop/tests/test_group_order_status_endpoint.py b/website_sale_aplicoop/tests/test_group_order_status_endpoint.py index 082ba01..f97111f 100644 --- a/website_sale_aplicoop/tests/test_group_order_status_endpoint.py +++ b/website_sale_aplicoop/tests/test_group_order_status_endpoint.py @@ -102,38 +102,6 @@ class TestGroupOrderStatusEndpoint(TransactionCase): self.assertEqual(data["state"], "closed") self.assertEqual(data["action"], "clear_cart") - def test_load_draft_endpoint_rejects_when_cutoff_passed(self): - """/eskaera/load-draft must refuse to load drafts when cutoff_date is in - the past, even if the group.order is still in 'open' state. - - Regression: previously the endpoint only checked group_order.state, so - when cutoff had passed the previous cycle's draft was returned and - repopulated the cart on the next page load. - """ - # Force cutoff_date into the past. The @api.depends compute always - # rolls forward to the next occurrence, so we have to write directly - # to the stored field to simulate a stale cycle. - past = fields.Date.today() - timedelta(days=1) - self.group_order.sudo().write({"cutoff_date": past}) - # Sanity: state remains open; only cutoff is stale. - self.assertEqual(self.group_order.state, "open") - self.assertLess(self.group_order.cutoff_date, fields.Date.today()) - - payload = {"order_id": self.group_order.id} - request_mock = self._build_request_mock(payload) - - with patch( - "odoo.addons.website_sale_aplicoop.controllers.website_sale.request", - request_mock, - ): - response = self.controller.load_draft_cart.__wrapped__(self.controller) - - data = json.loads(response.data.decode("utf-8")) - self.assertEqual(response.status, 403) - self.assertEqual(data.get("code"), "group_order_not_open") - self.assertEqual(data.get("action"), "clear_cart") - self.assertNotIn("items", data) - def test_save_order_endpoint_rejects_closed_group_order(self): """/eskaera/save-order must reject closed group order with clear_cart action.""" self.group_order.action_close()