diff --git a/.flake8 b/.flake8 index d5708c3..cb28e98 100644 --- a/.flake8 +++ b/.flake8 @@ -4,7 +4,7 @@ [flake8] max-line-length = 88 -max-complexity = 30 +max-complexity = 16 # B = bugbear # B9 = bugbear opinionated (incl line length) select = C,E,F,W,B,B9 diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index a62dd49..b1da0c3 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -49,39 +49,39 @@ Este repositorio contiene addons personalizados y modificados de Odoo 18.0. El p 1. **Estructura de carpeta i18n/**: - ``` - addon_name/ - ├── i18n/ - │ ├── es.po # Español (obligatorio) - │ ├── eu.po # Euskera (obligatorio) - │ └── addon_name.pot # Template (generado) - ``` + ``` + addon_name/ + ├── i18n/ + │ ├── es.po # Español (obligatorio) + │ ├── eu.po # Euskera (obligatorio) + │ └── addon_name.pot # Template (generado) + ``` 2. **NO usar `_()` en definiciones de campos a nivel de módulo**: - ```python - # ❌ INCORRECTO - causa warnings - from odoo import _ - name = fields.Char(string=_("Name")) + ```python + # ❌ INCORRECTO - causa warnings + from odoo import _ + name = fields.Char(string=_("Name")) - # ✅ CORRECTO - traducción se maneja por .po files - name = fields.Char(string="Name") - ``` + # ✅ CORRECTO - traducción se maneja por .po files + name = fields.Char(string="Name") + ``` 3. **Usar `_()` solo en métodos y código ejecutable**: - ```python - def action_confirm(self): - message = _("Confirmed successfully") - return {'warning': {'message': message}} - ``` + ```python + def action_confirm(self): + message = _("Confirmed successfully") + return {'warning': {'message': message}} + ``` 4. **Generar/actualizar traducciones**: - ```bash - # Exportar términos a traducir - Pedir al usuario generar a través de UI, no sabemos el método correcto para exportar SÓLO las cadenas del addon sin incluir todo el sistema. - ``` + ```bash + # Exportar términos a traducir + Pedir al usuario generar a través de UI, no sabemos el método correcto para exportar SÓLO las cadenas del addon sin incluir todo el sistema. + ``` Usar sólo polib y apend cadenas en los archivos .po, msmerge corrompe los archivos. @@ -147,7 +147,7 @@ addons-cm/ ### Local Development ```bash -# Iniciar entorno (puertos: 8070=web, 8073=longpolling) +# Iniciar entorno docker-compose up -d # Actualizar addon @@ -158,37 +158,20 @@ docker-compose logs -f odoo # Ejecutar tests docker-compose exec odoo odoo -d odoo --test-enable --stop-after-init -u addon_name - -# Acceder a shell de Odoo -docker-compose exec odoo bash - -# Acceder a PostgreSQL -docker-compose exec db psql -U odoo -d odoo ```` ### Quality Checks ```bash -# Ejecutar todos los checks (usa .pre-commit-config.yaml) +# Ejecutar todos los checks pre-commit run --all-files -# O usar Makefile (ver `make help` para todos los comandos) -make lint # Solo linting (pre-commit) -make format # Formatear código (black + isort) -make check-format # Verificar formateo sin modificar -make flake8 # Ejecutar flake8 -make pylint # Ejecutar pylint (todos) -make pylint-required # Solo verificaciones mandatorias -make clean # Limpiar archivos temporales +# O usar Makefile +make lint # Solo linting +make format # Formatear código +make check-addon # Verificar addon específico ``` -### Tools Configuration - -- **black**: Line length 88, target Python 3.10+ (ver `pyproject.toml`) -- **isort**: Profile black, sections: STDLIB > THIRDPARTY > ODOO > ODOO_ADDONS > FIRSTPARTY > LOCALFOLDER -- **flake8**: Ver `.flake8` para reglas específicas -- **pylint**: Configurado para Odoo con `pylint-odoo` plugin - ### Testing - Tests en `tests/` de cada addon @@ -196,61 +179,6 @@ make clean # Limpiar archivos temporales - Herencia: `odoo.tests.common.TransactionCase` - Ejecutar: `--test-enable` flag -## Critical Architecture Patterns - -### Product Variants Architecture - -**IMPORTANTE**: Los campos de lógica de negocio SIEMPRE van en `product.product` (variantes), no en `product.template`: - -```python -# ✅ CORRECTO - Lógica en product.product -class ProductProduct(models.Model): - _inherit = 'product.product' - - last_purchase_price_updated = fields.Boolean(default=False) - list_price_theoritical = fields.Float(default=0.0) - - def _compute_theoritical_price(self): - for product in self: - # Cálculo real por variante - pass - -# ✅ CORRECTO - Template solo tiene campos related -class ProductTemplate(models.Model): - _inherit = 'product.template' - - last_purchase_price_updated = fields.Boolean( - related='product_variant_ids.last_purchase_price_updated', - readonly=False - ) -``` - -**Por qué**: Evita problemas con pricelists y reportes que operan a nivel de variante. Ver `product_sale_price_from_pricelist` como ejemplo. - -### QWeb Template Best Practices - -**CRÍTICO**: QWeb tiene limitaciones estrictas con lógica compleja. **Siempre mover lógica al controller**: - -```python -# ❌ MAL - QWeb no puede parsear esto -# - -# ✅ CORRECTO - Preparar datos en controller -class WebsiteController: - def _prepare_product_display_info(self, product, price_info): - """Pre-procesar todos los valores para QWeb.""" - price = price_info.get(product.id, {}).get('price') or product.list_price or 0.0 - return { - 'display_price': float(price), - 'safe_uom_category': product.uom_id.category_id.name or '', - } - -# En template: acceso simple, sin lógica -# -``` - -Ver [docs/QWEB_BEST_PRACTICES.md](../docs/QWEB_BEST_PRACTICES.md) para más detalles. - ## Common Patterns ### Extending Models @@ -305,35 +233,6 @@ return { } ``` -### Logging Pattern - -```python -import logging - -_logger = logging.getLogger(__name__) - -# En métodos de cálculo de precios, usar logging detallado: -_logger.info( - "[PRICE DEBUG] Product %s [%s]: base_price=%.2f, tax_amount=%.2f", - product.default_code or product.name, - product.id, - base_price, - tax_amount, -) -``` - -### Price Calculation Pattern - -```python -# Usar product_get_price_helper para cálculos consistentes -partial_price = product._get_price(qty=1, pricelist=pricelist) -base_price = partial_price.get('value', 0.0) or 0.0 - -# Siempre validar taxes -if not product.taxes_id: - raise UserError(_("No taxes defined for product %s") % product.name) -``` - ## Dependencies Management ### OCA Dependencies (`oca_dependencies.txt`) @@ -388,46 +287,7 @@ access_model_user,model.name.user,model_model_name,base.group_user,1,1,1,0 ### Price Calculation **Problem**: Prices not updating from pricelist -**Solution**: - -1. Use `product_sale_price_from_pricelist` with proper configuration -2. Set pricelist in Settings > Sales > Automatic Price Configuration -3. Ensure `last_purchase_price_compute_type` is NOT set to `manual_update` -4. Verify product has taxes configured (required for price calculation) - -### Product Variant Issues - -**Problem**: Computed fields not working in pricelists/reports -**Solution**: Move business logic from `product.template` to `product.product` and use `related` fields in template - -### Manifest Dependencies - -**Problem**: Module not loading, dependency errors -**Solution**: Check both `__manifest__.py` depends AND `oca_dependencies.txt` for OCA repos - -### QWeb Template Errors - -**Problem**: `TypeError: 'NoneType' object is not callable` in templates -**Solution**: - -1. Move complex logic from template to controller -2. Use simple attribute access in templates (no conditionals) -3. Pre-process all display values in Python -4. See [docs/QWEB_BEST_PRACTICES.md](../docs/QWEB_BEST_PRACTICES.md) for patterns - -**Example Pattern**: - -```python -# Controller: prepare clean data -def _prepare_display_info(self, product): - return { - 'price': product.price or 0.0, - 'uom': product.uom_id.name or '', - } - -# Template: use simple access - -``` +**Solution**: Use `product_sale_price_from_pricelist` with proper configuration ## Testing Guidelines @@ -447,18 +307,18 @@ def _prepare_display_info(self, product): ```javascript odoo.define("module.tour", function (require) { - "use strict"; - var tour = require("web_tour.tour"); - tour.register( - "tour_name", - { - test: true, - url: "/web", - }, - [ - // Tour steps - ], - ); + "use strict"; + var tour = require("web_tour.tour"); + tour.register( + "tour_name", + { + test: true, + url: "/web", + }, + [ + // Tour steps + ], + ); }); ``` @@ -504,41 +364,11 @@ Cada addon debe tener un README.md con: 7. **Technical Details**: Modelos, campos, métodos 8. **Translations**: Estado de traducciones (si aplica) -### **manifest**.py Structure - -Todos los addons custom deben seguir esta estructura: - -```python -# Copyright YEAR - Today AUTHOR -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -{ # noqa: B018 - "name": "Addon Name", - "version": "18.0.X.Y.Z", # X=major, Y=minor, Z=patch - "category": "category_name", - "summary": "Short description", - "author": "Odoo Community Association (OCA), Your Company", - "maintainers": ["maintainer_github"], - "website": "https://github.com/OCA/repo", - "license": "AGPL-3", - "depends": [ - "base", - # Lista ordenada alfabéticamente - ], - "data": [ - "security/ir.model.access.csv", - "views/actions.xml", - "views/menu.xml", - "views/model_views.xml", - ], -} -``` - ### Code Comments - Docstrings en clases y métodos públicos - Comentarios inline para lógica compleja - TODOs con contexto completo -- Logging detallado en operaciones de precios/descuentos ## Version Control @@ -567,76 +397,6 @@ Tags: `[ADD]`, `[FIX]`, `[IMP]`, `[REF]`, `[REM]`, `[I18N]`, `[DOC]` - Indexes en campos frecuentemente buscados - Avoid N+1 queries con `prefetch` -## Key Business Features - -### Eskaera System (website_sale_aplicoop) - -Sistema completo de compras colaborativas para cooperativas de consumo: - -- **Group Orders**: Pedidos grupales con estados (draft → confirmed → collected → completed) -- **Separate Carts**: Carrito independiente por miembro y por grupo -- **Cutoff Dates**: Validación de fechas límite para pedidos -- **Pickup Management**: Gestión de días de recogida -- **Lazy Loading**: Carga configurable de productos (v18.0.1.3.0+) -- **Multi-language**: ES, EU, CA, GL, PT, FR, IT -- **Member Tracking**: Gestión de miembros activos/inactivos por grupo - -**Flujo típico**: - -1. Administrador crea grupo order con fechas (collection, cutoff, pickup) -2. Miembros añaden productos a su carrito individual -3. Sistema valida cutoff date antes de confirmar -4. Notificaciones automáticas al cambiar estados -5. Tracking de fulfillment por miembro - -**Configuración Lazy Loading** (v18.0.1.3.0+): - -``` -Settings > Website > Shop Performance - [✓] Enable Lazy Loading - [20] Products Per Page -``` - -**Mejoras Recientes**: - -- v18.0.1.3.1: Fixes críticos de cálculo de fechas -- v18.0.1.3.0: Lazy loading, mejora de rendimiento de 10-20s → 500-800ms -- Refactor de template rendering: Mover lógica QWeb al controller - -Ver [website_sale_aplicoop/README.md](../website_sale_aplicoop/README.md) y [docs/LAZY_LOADING.md](../docs/LAZY_LOADING.md) para detalles. - -### Triple Discount System - -Todos los documentos de compra/venta soportan 3 descuentos consecutivos: - -```python -# Ejemplo: Precio = 600.00 -# Desc. 1 = 50% → 300.00 -# Desc. 2 = 50% → 150.00 -# Desc. 3 = 50% → 75.00 -``` - -**IMPORTANTE**: Usar `account_invoice_triple_discount_readonly` para evitar bug de acumulación de descuentos. - -### Automatic Pricing System - -`product_sale_price_from_pricelist` calcula automáticamente precio de venta basado en: - -- Último precio de compra (`last_purchase_price_received`) -- Tipo de cálculo de descuentos (`last_purchase_price_compute_type`) -- Pricelist configurado en Settings -- Impuestos del producto - -**Configuración crítica**: - -```python -# En Settings > Sales > Automatic Price Configuration -product_pricelist_automatic = [ID_pricelist] - -# En producto -last_purchase_price_compute_type != "manual_update" # Para auto-cálculo -``` - ## Resources - **OCA Guidelines**: https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst @@ -646,13 +406,6 @@ last_purchase_price_compute_type != "manual_update" # Para auto-cálculo --- -**Last Updated**: 2026-02-18 +**Last Updated**: 2026-02-12 **Odoo Version**: 18.0 **Python Version**: 3.10+ - -## Recent Changes Summary - -- **2026-02-18**: Refactor `product_main_seller` - Remover alias innecesario `default_supplier_id` -- **2026-02-16**: v18.0.1.3.1 fixes críticos de cálculo de fechas en Eskaera -- **2026-02-12**: v18.0.1.3.0 Lazy loading y fixes de template rendering QWeb -- **2026-02-02**: UI improvements y date calculation fixes diff --git a/.gitignore b/.gitignore index a3957ae..e03074a 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,4 @@ dmypy.json # Pyre type checker .pyre/ + diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3e97523..beb2928 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,142 +1,142 @@ # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks exclude: | - (?x) - # NOT INSTALLABLE ADDONS - # END NOT INSTALLABLE ADDONS - # Files and folders generated by bots, to avoid loops - /setup/|/README\.rst$|/static/description/index\.html$| - # Maybe reactivate this when all README files include prettier ignore tags? - ^README\.md$| - # Library files can have extraneous formatting (even minimized) - /static/(src/)?lib/| - # Repos using Sphinx to generate docs don't need prettying - ^docs/_templates/.*\.html$| - # You don't usually want a bot to modify your legal texts - (LICENSE.*|COPYING.*) + (?x) + # NOT INSTALLABLE ADDONS + # END NOT INSTALLABLE ADDONS + # Files and folders generated by bots, to avoid loops + /setup/|/README\.rst$|/static/description/index\.html$| + # Maybe reactivate this when all README files include prettier ignore tags? + ^README\.md$| + # Library files can have extraneous formatting (even minimized) + /static/(src/)?lib/| + # Repos using Sphinx to generate docs don't need prettying + ^docs/_templates/.*\.html$| + # You don't usually want a bot to modify your legal texts + (LICENSE.*|COPYING.*) default_language_version: - python: python3 - node: "16.17.0" + python: python3 + node: "16.17.0" repos: - - repo: local - hooks: - # These files are most likely copier diff rejection junks; if found, - # review them manually, fix the problem (if needed) and remove them - - id: forbidden-files - name: forbidden files - entry: found forbidden files; remove them - language: fail - files: "\\.rej$" - - repo: https://github.com/oca/maintainer-tools - rev: 71aa4caec15e8c1456b4da19e9f39aa0aa7377a9 - hooks: - # update the NOT INSTALLABLE ADDONS section above - - id: oca-update-pre-commit-excluded-addons - - repo: https://github.com/myint/autoflake - rev: v2.3.1 - hooks: - - id: autoflake - args: ["-i", "--ignore-init-module-imports"] - - repo: https://github.com/psf/black - rev: 26.1.0 - hooks: - - id: black - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v4.0.0-alpha.8 - hooks: - - id: prettier - name: prettier + plugin-xml - additional_dependencies: - - "prettier@2.7.1" - - "@prettier/plugin-xml@2.2.0" - args: - - --plugin=@prettier/plugin-xml - files: \.(css|htm|html|js|json|json5|scss|toml|xml|yaml|yml)$ - - repo: https://github.com/pre-commit/mirrors-eslint - rev: v10.0.0 - hooks: - - id: eslint - verbose: true - args: - - --color - - --fix - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v6.0.0 - hooks: - - id: trailing-whitespace - # exclude autogenerated files - exclude: /README\.rst$|\.pot?$ - - id: end-of-file-fixer - # exclude autogenerated files - exclude: /README\.rst$|\.pot?$ - - id: debug-statements - - id: check-case-conflict - - id: check-docstring-first - - id: check-executables-have-shebangs - - id: check-merge-conflict - # exclude files where underlines are not distinguishable from merge conflicts - exclude: /README\.rst$|^docs/.*\.rst$ - - id: check-symlinks - - id: check-xml - - id: mixed-line-ending - args: ["--fix=lf"] - - repo: https://github.com/asottile/pyupgrade - rev: v3.21.2 - hooks: - - id: pyupgrade - args: ["--py38-plus"] - - repo: https://github.com/PyCQA/isort - rev: 7.0.0 - hooks: - - id: isort - name: isort except __init__.py - args: - - --settings=. - exclude: /__init__\.py$ - # setuptools-odoo deshabilitado temporalmente (no soporta Odoo 18.0) - # - repo: https://github.com/acsone/setuptools-odoo - # rev: 3.3.2 - # hooks: - # - id: setuptools-odoo-make-default - # - id: setuptools-odoo-get-requirements - # args: - # - --output - # - requirements.txt - # - --header - # - "# generated from manifests external_dependencies" - - repo: https://github.com/PyCQA/flake8 - rev: 7.3.0 - hooks: - - id: flake8 - name: flake8 - additional_dependencies: ["flake8-bugbear==23.12.2"] - - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.19.1 - hooks: - - id: mypy - # do not run on test files or __init__ files (mypy does not support - # namespace packages) - exclude: (/tests/|/__init__\.py$) - additional_dependencies: - - "lxml" - - "odoo-stubs" - - "types-python-dateutil" - - "types-pytz" - - "types-requests" - - "types-setuptools" - - repo: https://github.com/PyCQA/pylint - rev: v4.0.4 - hooks: - - id: pylint - name: pylint with optional checks - args: - - --rcfile=.pylintrc - - --exit-zero - verbose: true - additional_dependencies: &pylint_deps - - pylint-odoo==10.0.0 - - id: pylint - name: pylint with mandatory checks - args: - - --rcfile=.pylintrc-mandatory - additional_dependencies: *pylint_deps + - repo: local + hooks: + # These files are most likely copier diff rejection junks; if found, + # review them manually, fix the problem (if needed) and remove them + - id: forbidden-files + name: forbidden files + entry: found forbidden files; remove them + language: fail + files: "\\.rej$" + - repo: https://github.com/oca/maintainer-tools + rev: 71aa4caec15e8c1456b4da19e9f39aa0aa7377a9 + hooks: + # update the NOT INSTALLABLE ADDONS section above + - id: oca-update-pre-commit-excluded-addons + - repo: https://github.com/myint/autoflake + rev: v2.3.1 + hooks: + - id: autoflake + args: ["-i", "--ignore-init-module-imports"] + - repo: https://github.com/psf/black + rev: 26.1.0 + hooks: + - id: black + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v4.0.0-alpha.8 + hooks: + - id: prettier + name: prettier + plugin-xml + additional_dependencies: + - "prettier@2.7.1" + - "@prettier/plugin-xml@2.2.0" + args: + - --plugin=@prettier/plugin-xml + files: \.(css|htm|html|js|json|json5|scss|toml|xml|yaml|yml)$ + - repo: https://github.com/pre-commit/mirrors-eslint + rev: v10.0.0 + hooks: + - id: eslint + verbose: true + args: + - --color + - --fix + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v6.0.0 + hooks: + - id: trailing-whitespace + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ + - id: end-of-file-fixer + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ + - id: debug-statements + - id: check-case-conflict + - id: check-docstring-first + - id: check-executables-have-shebangs + - id: check-merge-conflict + # exclude files where underlines are not distinguishable from merge conflicts + exclude: /README\.rst$|^docs/.*\.rst$ + - id: check-symlinks + - id: check-xml + - id: mixed-line-ending + args: ["--fix=lf"] + - repo: https://github.com/asottile/pyupgrade + rev: v3.21.2 + hooks: + - id: pyupgrade + args: ["--py38-plus"] + - repo: https://github.com/PyCQA/isort + rev: 7.0.0 + hooks: + - id: isort + name: isort except __init__.py + args: + - --settings=. + exclude: /__init__\.py$ + # setuptools-odoo deshabilitado temporalmente (no soporta Odoo 18.0) + # - repo: https://github.com/acsone/setuptools-odoo + # rev: 3.3.2 + # hooks: + # - id: setuptools-odoo-make-default + # - id: setuptools-odoo-get-requirements + # args: + # - --output + # - requirements.txt + # - --header + # - "# generated from manifests external_dependencies" + - repo: https://github.com/PyCQA/flake8 + rev: 7.3.0 + hooks: + - id: flake8 + name: flake8 + additional_dependencies: ["flake8-bugbear==23.12.2"] + - repo: https://github.com/pre-commit/mirrors-mypy + rev: v1.19.1 + hooks: + - id: mypy + # do not run on test files or __init__ files (mypy does not support + # namespace packages) + exclude: (/tests/|/__init__\.py$) + additional_dependencies: + - "lxml" + - "odoo-stubs" + - "types-python-dateutil" + - "types-pytz" + - "types-requests" + - "types-setuptools" + - repo: https://github.com/PyCQA/pylint + rev: v4.0.4 + hooks: + - id: pylint + name: pylint with optional checks + args: + - --rcfile=.pylintrc + - --exit-zero + verbose: true + additional_dependencies: &pylint_deps + - pylint-odoo==10.0.0 + - id: pylint + name: pylint with mandatory checks + args: + - --rcfile=.pylintrc-mandatory + additional_dependencies: *pylint_deps diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md deleted file mode 100644 index ad46d50..0000000 --- a/DOCUMENTATION.md +++ /dev/null @@ -1,225 +0,0 @@ -# 📚 Documentación del Proyecto - Índice - -## 🚀 Lazy Loading v18.0.1.3.0 - Documentación Rápida - -¿Buscas información sobre la nueva feature de lazy loading? Empieza aquí: - -### ⚡ Solo tengo 5 minutos -👉 **[docs/LAZY_LOADING_QUICK_START.md](docs/LAZY_LOADING_QUICK_START.md)** - TL;DR y setup rápido - -### 🔧 Necesito instalar / actualizar -👉 **[docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md)** - Paso a paso con validación y troubleshooting - -### 🎓 Quiero entender la arquitectura -👉 **[docs/LAZY_LOADING.md](docs/LAZY_LOADING.md)** - Detalles técnicos completos - -### 📍 No sé dónde empezar -👉 **[docs/LAZY_LOADING_DOCS_INDEX.md](docs/LAZY_LOADING_DOCS_INDEX.md)** - Índice con guía de selección por rol - ---- - -## 📖 Documentación General del Proyecto - -### Quick Links -| Categoría | Documento | Propósito | -|-----------|-----------|----------| -| **Start** | [README.md](README.md) | Descripción general del proyecto | -| **Development** | [.github/copilot-instructions.md](.github/copilot-instructions.md) | Guía para desarrollo con IA | -| **All Docs** | [docs/README.md](docs/README.md) | Índice completo de documentación técnica | - ---- - -## 📂 Estructura de Documentación - -``` -addons-cm/ -├── README.md # Descripción general del proyecto -│ -├── docs/ # 📚 Documentación técnica -│ ├── README.md # Índice de todos los docs técnicos -│ │ -│ ├── 🚀 LAZY LOADING (v18.0.1.3.0) -│ ├── LAZY_LOADING_QUICK_START.md # ⚡ 5 min - Lo esencial -│ ├── LAZY_LOADING_DOCS_INDEX.md # 📍 Índice con guía por rol -│ ├── LAZY_LOADING.md # 🎓 Detalles técnicos -│ ├── UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md # 🔧 Instalación -│ │ -│ ├── 📋 OTROS DOCS -│ ├── LINTERS_README.md # Herramientas de código -│ ├── TRANSLATIONS.md # Sistema de traducciones -│ ├── INSTALACION_COMPLETA.md # Instalación del proyecto -│ ├── RESUMEN_INSTALACION.md # Resumen de instalación -│ ├── CORRECCION_PRECIOS_IVA.md # Precios e impuestos -│ └── TEST_MANUAL.md # Testing manual -│ -├── website_sale_aplicoop/ # 📦 Addon principal -│ ├── README.md # Features y configuración -│ └── CHANGELOG.md # Historial de versiones -│ -└── DOCUMENTATION_UPDATE_SUMMARY.md # 📋 Resumen de cambios (Este proyecto) -``` - ---- - -## 🎯 Guía Rápida por Tipo de Usuario - -### 👤 Administrador del Sistema -1. **Instalación**: [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) -2. **Configuración**: Settings → Website → Shop Settings -3. **Troubleshooting**: Sección de troubleshooting en UPGRADE_INSTRUCTIONS -4. **Performance**: Sección "Verificación de Rendimiento" - -### 👨‍💻 Desarrollador -1. **Arquitectura**: [docs/LAZY_LOADING.md](docs/LAZY_LOADING.md) -2. **Código**: Sección "Code Changes" en LAZY_LOADING.md -3. **Testing**: Sección "Debugging & Testing" -4. **Mejoras**: "Future Improvements" al final - -### 🎓 Alguien Nuevo en el Proyecto -1. **Start**: [README.md](README.md) -2. **Features**: [website_sale_aplicoop/README.md](website_sale_aplicoop/README.md) -3. **Lazy Loading**: [docs/LAZY_LOADING_DOCS_INDEX.md](docs/LAZY_LOADING_DOCS_INDEX.md) -4. **Detalles Técnicos**: [.github/copilot-instructions.md](.github/copilot-instructions.md) - -### 🚀 Alguien que Solo Quiere Setup Rápido -1. [docs/LAZY_LOADING_QUICK_START.md](docs/LAZY_LOADING_QUICK_START.md) (5 min) -2. Done! ✅ - ---- - -## 📊 Resumen de Documentación - -### Lazy Loading Feature (v18.0.1.3.0) - -**Problema Solucionado**: -- ❌ Antes: Página tarda 10-20 segundos en cargar todos los productos y calcular precios - -**Solución**: -- ✅ Después: Página carga en 500-800ms (20x más rápido) -- ✅ Productos se cargan bajo demanda con botón "Load More" -- ✅ Configurable: Activable/desactivable, items por página ajustable - -**Documentación Incluida**: -- ✅ Quick Start (5 min) -- ✅ Upgrade Instructions (paso a paso) -- ✅ Technical Documentation (detalles completos) -- ✅ Troubleshooting (4 escenarios comunes) -- ✅ Performance Metrics (verificación) - ---- - -## 🔗 Enlaces Directos - -### Lazy Loading -- [⚡ Quick Start](docs/LAZY_LOADING_QUICK_START.md) - Start here (5 min) -- [🔧 Upgrade Instructions](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) - Installation & Config -- [🎓 Technical Docs](docs/LAZY_LOADING.md) - Deep dive -- [📍 Documentation Index](docs/LAZY_LOADING_DOCS_INDEX.md) - Navigation guide - -### Proyecto General -- [📋 Project README](README.md) - Descripción general -- [📚 Technical Docs](docs/README.md) - Índice de todos los docs -- [🤖 Copilot Guide](.github/copilot-instructions.md) - Desarrollo con IA -- [🧪 Testing](docs/TEST_MANUAL.md) - Manual testing - -### Addons Específicos -- [🛍️ website_sale_aplicoop](website_sale_aplicoop/README.md) - Sistema eskaera -- [💰 product_sale_price_from_pricelist](product_sale_price_from_pricelist/README.md) - Auto-pricing -- [📦 product_price_category_supplier](product_price_category_supplier/README.md) - Categorías por proveedor -- [🐛 account_invoice_triple_discount_readonly](account_invoice_triple_discount_readonly/README.md) - Fix de descuentos - ---- - -## 📞 ¿Necesitas Ayuda? - -### Selecciona tu situación: - -| Situación | Qué leer | -|-----------|----------| -| "¿Qué es lazy loading?" | [LAZY_LOADING_QUICK_START.md](docs/LAZY_LOADING_QUICK_START.md) | -| "¿Cómo instalo?" | [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) | -| "¿Cómo configuro?" | UPGRADE_INSTRUCTIONS → Configuration | -| "¿Cómo verifico que funciona?" | UPGRADE_INSTRUCTIONS → Performance Verification | -| "Algo no funciona" | UPGRADE_INSTRUCTIONS → Troubleshooting | -| "¿Cómo hago rollback?" | UPGRADE_INSTRUCTIONS → Rollback Instructions | -| "Detalles técnicos completos" | [LAZY_LOADING.md](docs/LAZY_LOADING.md) | -| "¿Qué archivos fueron modificados?" | LAZY_LOADING.md → Code Changes | -| "¿Cómo hago testing?" | LAZY_LOADING.md → Debugging & Testing | - ---- - -## ✅ Estado de Documentación - -- ✅ **Implementación**: Completada (v18.0.1.3.0) -- ✅ **Quick Start**: Disponible (5 min) -- ✅ **Upgrade Guide**: Disponible (paso a paso) -- ✅ **Technical Docs**: Disponible (600+ líneas) -- ✅ **Troubleshooting**: Disponible (4+ escenarios) -- ✅ **Performance Metrics**: Documentadas (20x mejora) -- ✅ **Backward Compatibility**: Confirmada (desactivable) - ---- - -## 🎓 Aprendizaje Rápido - -Para entender rápidamente cómo funciona: - -1. **El Problema** (2 min): Lee intro de [LAZY_LOADING_QUICK_START.md](docs/LAZY_LOADING_QUICK_START.md) -2. **La Solución** (2 min): Lee "Installation" en QUICK_START -3. **Verificación** (1 min): Sigue "Verificación Rápida" en QUICK_START -4. **Listo** ✅ - -Para profundizar → [LAZY_LOADING.md](docs/LAZY_LOADING.md) - ---- - -## 📈 Impacto de Performance - -| Métrica | Antes | Después | Mejora | -|---------|-------|---------|--------| -| Carga inicial | 10-20s | 500-800ms | **20x** 🚀 | -| Carga página 2 | — | 200-400ms | — | -| DOM size | 1000+ elementos | 20 elementos | **50x** | -| Rendimiento | Lento | Rápido | ✅ | - ---- - -## 📝 Cambios Principales - -### Archivos Modificados (5) -1. `/models/res_config_settings.py` - Configuración -2. `/models/group_order.py` - Paginación backend -3. `/controllers/website_sale.py` - Endpoints HTTP -4. `/views/website_templates.xml` - Templates QWeb -5. `/static/src/js/website_sale.js` - AJAX JavaScript - -### Documentación Creada (4) -1. LAZY_LOADING_QUICK_START.md -2. LAZY_LOADING_DOCS_INDEX.md -3. LAZY_LOADING.md -4. UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md - ---- - -## 🚀 Siguientes Pasos - -### Inmediato -- [ ] Lee [LAZY_LOADING_QUICK_START.md](docs/LAZY_LOADING_QUICK_START.md) -- [ ] Actualiza a v18.0.1.3.0 si no lo has hecho - -### Corto Plazo -- [ ] Configura en Settings (si es necesario) -- [ ] Verifica performance (sección "Verificación" en docs) - -### Largo Plazo -- [ ] Monitorea performance en producción -- [ ] Considera mejoras futuras (ver LAZY_LOADING.md) - ---- - -**Última Actualización**: 2026-02-16 -**Versión de Documentación**: 1.0 -**Odoo Version**: 18.0+ -**Lazy Loading Version**: 18.0.1.3.0+ - -Para comenzar, selecciona la sección que más te interese arriba ☝️ diff --git a/DOCUMENTATION_UPDATE_SUMMARY.md b/DOCUMENTATION_UPDATE_SUMMARY.md deleted file mode 100644 index b48219d..0000000 --- a/DOCUMENTATION_UPDATE_SUMMARY.md +++ /dev/null @@ -1,273 +0,0 @@ -# 📋 Resumen de Documentación Creada - Lazy Loading v18.0.1.3.0 - -## ✅ Actualización Completa - -Se ha completado la actualización de toda la documentación del proyecto para reflejar la nueva feature de lazy loading implementada en `website_sale_aplicoop`. - ---- - -## 📄 Archivos Creados y Actualizados - -### 🆕 Nuevos Archivos Creados - -#### 1. [docs/LAZY_LOADING_QUICK_START.md](../docs/LAZY_LOADING_QUICK_START.md) -**Tipo**: Guía Rápida (~100 líneas) -**Contenido**: -- ✅ TL;DR - Lo más importante -- ✅ Qué necesitas hacer (actualizar y listo) -- ✅ Métricas de mejora de performance (20x más rápido) -- ✅ Configuración opcional (enable/disable, items per page) -- ✅ Troubleshooting rápido (5 problemas comunes) -- ✅ Verificación rápida (cómo comprobar que funciona) -- ✅ Rollback instructions -- ✅ Enlaces a documentación completa - -**Audiencia**: Usuarios que quieren "instalar y olvidar" - ---- - -#### 2. [docs/LAZY_LOADING.md](../docs/LAZY_LOADING.md) -**Tipo**: Documentación Técnica Completa (~600 líneas) -**Contenido**: -- ✅ Descripción detallada del problema (carga 10-20s) -- ✅ Solución implementada (lazy loading + configuración) -- ✅ Arquitectura y diseño del sistema -- ✅ Cambios de código por archivo (5 archivos modificados) -- ✅ Configuración en res_config_settings -- ✅ Endpoints HTTP (eskaera_shop, load_eskaera_page) -- ✅ Métricas de rendimiento (20x más rápido) -- ✅ Guía de testing y debugging -- ✅ Troubleshooting avanzado -- ✅ Roadmap de mejoras futuras - -**Audiencia**: Desarrolladores, Administradores Técnicos - ---- - -#### 3. [docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](../docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) -**Tipo**: Guía de Actualización e Instalación (~180 líneas) -**Contenido**: -- ✅ Resumen de cambios en v18.0.1.3.0 -- ✅ Pasos de actualización paso a paso -- ✅ Configuración de settings (3 opciones) -- ✅ Valores recomendados y explicaciones -- ✅ Checklist de validación post-instalación (4 pasos) -- ✅ Troubleshooting de problemas comunes (4 escenarios): - - "Load More" button not appearing - - Products not loading on button click - - Spinner never disappears - - Page crashes after loading products -- ✅ Método de verificación de rendimiento -- ✅ Instrucciones de rollback -- ✅ Notas importantes sobre comportamiento - -**Audiencia**: Administradores de Sistema, DevOps - ---- - -#### 3. [docs/LAZY_LOADING_DOCS_INDEX.md](../docs/LAZY_LOADING_DOCS_INDEX.md) -**Tipo**: Índice Centralizado de Documentación -**Contenido**: -- ✅ Overview de la feature -- ✅ Índice de los 4 documentos relacionados -- ✅ Guía de selección (qué leer según tu rol) -- ✅ Resumen de cambios de código -- ✅ Checklist de implementación -- ✅ Notas importantes y limitaciones -- ✅ Enlaces rápidos a todos los docs -- ✅ Información de impacto y performance - -**Audiencia**: Todos (punto de partida recomendado) - ---- - -#### 4. [website_sale_aplicoop/CHANGELOG.md](../website_sale_aplicoop/CHANGELOG.md) -**Tipo**: Registro de Cambios -**Contenido**: -- ✅ v18.0.1.3.0: Lazy loading feature (2 puntos) -- ✅ v18.0.1.2.0: UI improvements (3 puntos) -- ✅ v18.0.1.0.0: Initial release - -**Audiencia**: Todos - ---- - -### 🔄 Archivos Actualizados - -#### 5. [README.md](../README.md) - Proyecto Principal -**Cambios realizados**: -- ✅ Añadido emoji 🚀 a website_sale_aplicoop en tabla de componentes -- ✅ Añadida nota sobre lazy loading en v18.0.1.3.0 con referencia a docs -- ✅ Añadidos dos enlaces nuevos en sección "Documentos Principales": - - 🚀 [Lazy Loading Documentation](docs/LAZY_LOADING.md) - - 📦 [Upgrade Instructions v18.0.1.3.0](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) - ---- - -#### 6. [docs/README.md](../docs/README.md) - Índice de Documentación Técnica -**Cambios realizados**: -- ✅ Añadida nueva sección "Performance & Features (Nuevas)" -- ✅ Tres nuevos enlaces: - - [LAZY_LOADING_DOCS_INDEX.md](LAZY_LOADING_DOCS_INDEX.md) - - [LAZY_LOADING.md](LAZY_LOADING.md) - - [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) - ---- - -#### 7. [website_sale_aplicoop/README.md](../website_sale_aplicoop/README.md) - Addon Específico -**Cambios realizados** (realizados en fase anterior): -- ✅ Añadida feature de lazy loading en lista de features -- ✅ Actualizado changelog con v18.0.1.3.0 -- ✅ Descripción detallada de lazy loading en changelog - ---- - -## 🎯 Estructura de Documentación Recomendada - -### Para Administradores/Usuarios: -``` -1. Lee: docs/LAZY_LOADING_DOCS_INDEX.md (orientación) -2. Luego: docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md (instalación) -3. Si hay dudas: Consulta sección de configuración en website_sale_aplicoop/README.md -4. Si hay problemas: Troubleshooting en UPGRADE_INSTRUCTIONS -``` - -### Para Desarrolladores: -``` -1. Lee: docs/LAZY_LOADING_DOCS_INDEX.md (visión general) -2. Luego: docs/LAZY_LOADING.md (arquitectura técnica) -3. Revisa: Cambios de código en LAZY_LOADING.md (sección "Code Changes") -4. Debugging: Sección "Debugging & Testing" en LAZY_LOADING.md -5. Mejoras: "Future Improvements" al final de LAZY_LOADING.md -``` - -### Para Troubleshooting: -``` -1. Primero: docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md (Troubleshooting section) -2. Si persiste: docs/LAZY_LOADING.md (Debugging & Testing) -3. Para rollback: UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md (Rollback Instructions) -``` - ---- - -## 📊 Cobertura de Documentación - -| Tema | Covered | Donde | -|------|---------|-------| -| **Problem Statement** | ✅ | LAZY_LOADING.md, UPGRADE_INSTRUCTIONS | -| **Solution Overview** | ✅ | LAZY_LOADING_DOCS_INDEX.md, LAZY_LOADING.md | -| **Architecture** | ✅ | LAZY_LOADING.md | -| **Code Changes** | ✅ | LAZY_LOADING.md (por archivo) | -| **Configuration** | ✅ | UPGRADE_INSTRUCTIONS, website_sale_aplicoop/README.md | -| **Installation** | ✅ | UPGRADE_INSTRUCTIONS | -| **Testing** | ✅ | LAZY_LOADING.md | -| **Troubleshooting** | ✅ | UPGRADE_INSTRUCTIONS, LAZY_LOADING.md | -| **Performance Metrics** | ✅ | Todos los docs | -| **Rollback** | ✅ | UPGRADE_INSTRUCTIONS | -| **Future Improvements** | ✅ | LAZY_LOADING.md | - ---- - -## 🔗 Matriz de Enlaces - -Todos los documentos están interconectados para facilitar la navegación: - -``` -README.md (principal) -├── docs/LAZY_LOADING_DOCS_INDEX.md (índice) -│ ├── docs/LAZY_LOADING.md (técnico) -│ ├── docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md (instalación) -│ ├── website_sale_aplicoop/README.md (addon) -│ └── website_sale_aplicoop/CHANGELOG.md (historial) -├── docs/README.md (índice de docs) -└── website_sale_aplicoop/README.md (addon directo) -``` - ---- - -## 📈 Métricas de la Documentación - -| Métrica | Valor | -|---------|-------| -| **Archivos nuevos creados** | 4 | -| **Archivos actualizados** | 4 | -| **Líneas de documentación** | ~1,400+ | -| **Secciones documentadas** | 20+ | -| **Ejemplos incluidos** | 15+ | -| **Problemas cubiertos en troubleshooting** | 4 | -| **Mejoras futuras documentadas** | 4 | - ---- - -## ✨ Highlights de la Documentación - -### 📌 Punto de Entrada Único -- **[docs/LAZY_LOADING_DOCS_INDEX.md](../docs/LAZY_LOADING_DOCS_INDEX.md)** - Índice con guía de selección según rol - -### 📌 Documentación Técnica Completa -- **[docs/LAZY_LOADING.md](../docs/LAZY_LOADING.md)** - 600+ líneas de detalles técnicos, cambios de código, testing, debugging - -### 📌 Guía Práctica de Instalación -- **[docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](../docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md)** - Paso a paso con checklist de validación y troubleshooting - -### 📌 Changelog Detallado -- **[website_sale_aplicoop/CHANGELOG.md](../website_sale_aplicoop/CHANGELOG.md)** - Historial completo de versiones - -### 📌 README Actualizado -- **[README.md](../README.md)** - Referencia al nuevo feature con enlaces - ---- - -## 🚀 Próximos Pasos - -La documentación está completa y lista para: - -1. ✅ **Publicación**: Todos los archivos están listos para ser compartidos -2. ✅ **Integración**: Enlaces cruzados correctamente configurados -3. ✅ **Accesibilidad**: Índice centralizado para encontrar información fácilmente -4. ✅ **Mantenibilidad**: Estructura clara para futuras actualizaciones - -### Sugerencias Futuras: -- Crear video tutorial (5-10 min) demostrando lazy loading en acción -- Agregar métricas en vivo de performance en Settings UI -- Crear tests automatizados para validar configuración - ---- - -## 📞 Preguntas Frecuentes Documentadas - -| Pregunta | Respuesta en | -|----------|-------------| -| ¿Qué es lazy loading? | LAZY_LOADING.md intro | -| ¿Cómo instalo? | UPGRADE_INSTRUCTIONS | -| ¿Cómo configuro? | UPGRADE_INSTRUCTIONS + website_sale_aplicoop/README.md | -| ¿Cómo veo mejora de performance? | UPGRADE_INSTRUCTIONS (Performance Verification) | -| ¿Qué pasa si falla? | UPGRADE_INSTRUCTIONS (Troubleshooting) | -| ¿Puedo deshabilitarlo? | Sí, UPGRADE_INSTRUCTIONS sección Configuration | -| ¿Cómo hago rollback? | UPGRADE_INSTRUCTIONS (Rollback Instructions) | -| ¿Detalles técnicos? | LAZY_LOADING.md | - ---- - -## 🎓 Aprendizaje de Documentación - -Esta documentación demuestra: -- ✅ Documentación técnica completa y detallada -- ✅ Guías prácticas paso a paso -- ✅ Índices centralizados para fácil navegación -- ✅ Troubleshooting proactivo -- ✅ Interconexión de documentos -- ✅ Diferentes niveles de profundidad (overview → técnico) -- ✅ Cobertura completa de usuario y desarrollador - ---- - -**Estado**: ✅ COMPLETADO -**Documentación Creada**: 3 archivos nuevos, 4 actualizados -**Líneas Totales**: 1,200+ -**Fecha**: 2026-02-16 -**Versión Aplicable**: 18.0.1.3.0+ - ---- - -¿Necesitas que ajuste algo en la documentación o que cree documentos adicionales? diff --git a/README.md b/README.md index dd547b3..4ce28ad 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,7 @@ Este repositorio contiene los addons personalizados para Kidekoop, un sistema co | [account_invoice_triple_discount_readonly](account_invoice_triple_discount_readonly/) | Fix para bug de descuentos acumulados | ✅ Estable | | [product_price_category_supplier](product_price_category_supplier/) | Gestión de categorías por proveedor | ✅ Estable | | [product_sale_price_from_pricelist](product_sale_price_from_pricelist/) | Auto-cálculo precio venta desde compra | ✅ Estable | -| [website_sale_aplicoop](website_sale_aplicoop/) | Sistema completo de eskaera web | ✅ **v18.0.1.3.1** - Estable | - -**✨ Feature v18.0.1.3.0**: `website_sale_aplicoop` incluye **lazy loading configurable** para mejorar el rendimiento de carga de productos (10-20s → 500-800ms). - -**🔧 Fixes v18.0.1.3.1**: Correcciones críticas en cálculo de fechas y refactor de template rendering para evitar errores QWeb. - -Ver [docs/LAZY_LOADING.md](docs/LAZY_LOADING.md) y [docs/FINAL_SOLUTION_SUMMARY.md](docs/FINAL_SOLUTION_SUMMARY.md) para detalles. +| [website_sale_aplicoop](website_sale_aplicoop/) | Sistema completo de eskaera web | ✅ Estable | ## 🚀 Quick Start @@ -163,8 +157,6 @@ Cada addon incluye su propio README.md con: - [GitHub Copilot Instructions](.github/copilot-instructions.md) - Guía para desarrollo con AI - [Documentación Técnica](docs/) - Guías de instalación, linters, y troubleshooting -- **[🚀 Lazy Loading Documentation](docs/LAZY_LOADING.md)** - Guía técnica completa sobre la nueva feature de carga lazy -- **[📦 Upgrade Instructions v18.0.1.3.0](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md)** - Guía de actualización e instalación de lazy loading - [Makefile](Makefile) - Comandos disponibles - [requirements.txt](requirements.txt) - Dependencias Python - [oca_dependencies.txt](oca_dependencies.txt) - Repositorios OCA necesarios diff --git a/account_invoice_triple_discount_readonly/tests/test_account_move.py b/account_invoice_triple_discount_readonly/tests/test_account_move.py index a84ff41..4b86fa5 100644 --- a/account_invoice_triple_discount_readonly/tests/test_account_move.py +++ b/account_invoice_triple_discount_readonly/tests/test_account_move.py @@ -10,88 +10,72 @@ class TestAccountMove(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() - + # Create a partner - cls.partner = cls.env["res.partner"].create( - { - "name": "Test Customer", - "email": "customer@test.com", - } - ) - + cls.partner = cls.env["res.partner"].create({ + "name": "Test Customer", + "email": "customer@test.com", + }) + # Create a product - cls.product = cls.env["product.product"].create( - { - "name": "Test Product Invoice", - "type": "consu", - "list_price": 200.0, - "standard_price": 100.0, - } - ) - + cls.product = cls.env["product.product"].create({ + "name": "Test Product Invoice", + "type": "consu", + "list_price": 200.0, + "standard_price": 100.0, + }) + # Create tax - cls.tax = cls.env["account.tax"].create( - { - "name": "Test Tax 10%", - "amount": 10.0, - "amount_type": "percent", - "type_tax_use": "sale", - } - ) - + cls.tax = cls.env["account.tax"].create({ + "name": "Test Tax 10%", + "amount": 10.0, + "amount_type": "percent", + "type_tax_use": "sale", + }) + # Create an invoice - cls.invoice = cls.env["account.move"].create( - { - "move_type": "out_invoice", - "partner_id": cls.partner.id, - "invoice_date": "2026-01-01", - } - ) - + cls.invoice = cls.env["account.move"].create({ + "move_type": "out_invoice", + "partner_id": cls.partner.id, + "invoice_date": "2026-01-01", + }) + # Create invoice line - cls.invoice_line = cls.env["account.move.line"].create( - { - "move_id": cls.invoice.id, - "product_id": cls.product.id, - "quantity": 5, - "price_unit": 200.0, - "discount1": 10.0, - "discount2": 5.0, - "discount3": 2.0, - "tax_ids": [(6, 0, [cls.tax.id])], - } - ) + cls.invoice_line = cls.env["account.move.line"].create({ + "move_id": cls.invoice.id, + "product_id": cls.product.id, + "quantity": 5, + "price_unit": 200.0, + "discount1": 10.0, + "discount2": 5.0, + "discount3": 2.0, + "tax_ids": [(6, 0, [cls.tax.id])], + }) def test_invoice_line_discount_readonly(self): """Test that discount field is readonly in invoice lines""" field = self.invoice_line._fields["discount"] - self.assertTrue( - field.readonly, "Discount field should be readonly in invoice lines" - ) + self.assertTrue(field.readonly, "Discount field should be readonly in invoice lines") def test_invoice_line_write_with_explicit_discounts(self): """Test writing invoice line with explicit discounts""" - self.invoice_line.write( - { - "discount": 30.0, # Should be ignored - "discount1": 15.0, - "discount2": 10.0, - "discount3": 5.0, - } - ) - + self.invoice_line.write({ + "discount": 30.0, # Should be ignored + "discount1": 15.0, + "discount2": 10.0, + "discount3": 5.0, + }) + self.assertEqual(self.invoice_line.discount1, 15.0) self.assertEqual(self.invoice_line.discount2, 10.0) self.assertEqual(self.invoice_line.discount3, 5.0) def test_invoice_line_legacy_discount(self): """Test legacy discount behavior in invoice lines""" - self.invoice_line.write( - { - "discount": 20.0, - } - ) - + self.invoice_line.write({ + "discount": 20.0, + }) + # Should map to discount1 and reset others self.assertEqual(self.invoice_line.discount1, 20.0) self.assertEqual(self.invoice_line.discount2, 0.0) @@ -99,14 +83,12 @@ class TestAccountMove(TransactionCase): def test_invoice_line_price_calculation(self): """Test that price subtotal is calculated correctly with triple discount""" - self.invoice_line.write( - { - "discount1": 10.0, - "discount2": 5.0, - "discount3": 0.0, - } - ) - + self.invoice_line.write({ + "discount1": 10.0, + "discount2": 5.0, + "discount3": 0.0, + }) + # Base: 5 * 200 = 1000 # After 10% discount: 900 # After 5% discount: 855 @@ -117,19 +99,17 @@ class TestAccountMove(TransactionCase): def test_multiple_invoice_lines(self): """Test multiple invoice lines with different discounts""" - line2 = self.env["account.move.line"].create( - { - "move_id": self.invoice.id, - "product_id": self.product.id, - "quantity": 3, - "price_unit": 150.0, - "discount1": 20.0, - "discount2": 10.0, - "discount3": 5.0, - "tax_ids": [(6, 0, [self.tax.id])], - } - ) - + line2 = self.env["account.move.line"].create({ + "move_id": self.invoice.id, + "product_id": self.product.id, + "quantity": 3, + "price_unit": 150.0, + "discount1": 20.0, + "discount2": 10.0, + "discount3": 5.0, + "tax_ids": [(6, 0, [self.tax.id])], + }) + # Verify both lines have correct discounts self.assertEqual(self.invoice_line.discount1, 10.0) self.assertEqual(line2.discount1, 20.0) @@ -140,13 +120,11 @@ class TestAccountMove(TransactionCase): """Test updating quantity doesn't affect discounts""" initial_discount1 = self.invoice_line.discount1 initial_discount2 = self.invoice_line.discount2 - - self.invoice_line.write( - { - "quantity": 10, - } - ) - + + self.invoice_line.write({ + "quantity": 10, + }) + # Discounts should remain unchanged self.assertEqual(self.invoice_line.discount1, initial_discount1) self.assertEqual(self.invoice_line.discount2, initial_discount2) @@ -156,13 +134,11 @@ class TestAccountMove(TransactionCase): def test_invoice_line_update_price(self): """Test updating price doesn't affect discounts""" initial_discount1 = self.invoice_line.discount1 - - self.invoice_line.write( - { - "price_unit": 250.0, - } - ) - + + self.invoice_line.write({ + "price_unit": 250.0, + }) + # Discount should remain unchanged self.assertEqual(self.invoice_line.discount1, initial_discount1) # Price should be updated @@ -170,20 +146,18 @@ class TestAccountMove(TransactionCase): def test_invoice_with_zero_discounts(self): """Test invoice line with all zero discounts""" - self.invoice_line.write( - { - "discount1": 0.0, - "discount2": 0.0, - "discount3": 0.0, - } - ) - + self.invoice_line.write({ + "discount1": 0.0, + "discount2": 0.0, + "discount3": 0.0, + }) + # All discounts should be zero self.assertEqual(self.invoice_line.discount, 0.0) self.assertEqual(self.invoice_line.discount1, 0.0) self.assertEqual(self.invoice_line.discount2, 0.0) self.assertEqual(self.invoice_line.discount3, 0.0) - + # Subtotal should be quantity * price expected = 5 * 200 self.assertEqual(self.invoice_line.price_subtotal, expected) @@ -191,23 +165,23 @@ class TestAccountMove(TransactionCase): def test_invoice_line_combined_operations(self): """Test combined operations on invoice line""" # Update multiple fields at once - self.invoice_line.write( - { - "quantity": 8, - "price_unit": 180.0, - "discount1": 12.0, - "discount2": 6.0, - "discount3": 0.0, # Reset discount3 explicitly - } - ) - + self.invoice_line.write({ + "quantity": 8, + "price_unit": 180.0, + "discount1": 12.0, + "discount2": 6.0, + "discount3": 0.0, # Reset discount3 explicitly + }) + # All fields should be updated correctly self.assertEqual(self.invoice_line.quantity, 8) self.assertEqual(self.invoice_line.price_unit, 180.0) self.assertEqual(self.invoice_line.discount1, 12.0) self.assertEqual(self.invoice_line.discount2, 6.0) self.assertEqual(self.invoice_line.discount3, 0.0) - + # Calculate expected subtotal: 8 * 180 * (1-0.12) * (1-0.06) expected = 8 * 180 * 0.88 * 0.94 - self.assertAlmostEqual(self.invoice_line.price_subtotal, expected, places=2) + self.assertAlmostEqual( + self.invoice_line.price_subtotal, expected, places=2 + ) diff --git a/account_invoice_triple_discount_readonly/tests/test_purchase_order.py b/account_invoice_triple_discount_readonly/tests/test_purchase_order.py index cd12fe5..fc22dd0 100644 --- a/account_invoice_triple_discount_readonly/tests/test_purchase_order.py +++ b/account_invoice_triple_discount_readonly/tests/test_purchase_order.py @@ -10,47 +10,37 @@ class TestPurchaseOrder(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() - + # Create a supplier - cls.supplier = cls.env["res.partner"].create( - { - "name": "Test Supplier", - "email": "supplier@test.com", - "supplier_rank": 1, - } - ) - - # Create a product template first, then get the variant - cls.product_template = cls.env["product.template"].create( - { - "name": "Test Product PO", - "type": "consu", - "list_price": 150.0, - "standard_price": 80.0, - } - ) - # Get the auto-created product variant - cls.product = cls.product_template.product_variant_ids[0] - + cls.supplier = cls.env["res.partner"].create({ + "name": "Test Supplier", + "email": "supplier@test.com", + "supplier_rank": 1, + }) + + # Create a product + cls.product = cls.env["product.product"].create({ + "name": "Test Product PO", + "type": "product", + "list_price": 150.0, + "standard_price": 80.0, + }) + # Create a purchase order - cls.purchase_order = cls.env["purchase.order"].create( - { - "partner_id": cls.supplier.id, - } - ) - + cls.purchase_order = cls.env["purchase.order"].create({ + "partner_id": cls.supplier.id, + }) + # Create purchase order line - cls.po_line = cls.env["purchase.order.line"].create( - { - "order_id": cls.purchase_order.id, - "product_id": cls.product.id, - "product_qty": 10, - "price_unit": 150.0, - "discount1": 10.0, - "discount2": 5.0, - "discount3": 2.0, - } - ) + cls.po_line = cls.env["purchase.order.line"].create({ + "order_id": cls.purchase_order.id, + "product_id": cls.product.id, + "product_qty": 10, + "price_unit": 150.0, + "discount1": 10.0, + "discount2": 5.0, + "discount3": 2.0, + }) def test_po_line_discount_readonly(self): """Test that discount field is readonly in PO lines""" @@ -59,27 +49,23 @@ class TestPurchaseOrder(TransactionCase): def test_po_line_write_with_explicit_discounts(self): """Test writing PO line with explicit discounts""" - self.po_line.write( - { - "discount": 25.0, # Should be ignored - "discount1": 12.0, - "discount2": 8.0, - "discount3": 4.0, - } - ) - + self.po_line.write({ + "discount": 25.0, # Should be ignored + "discount1": 12.0, + "discount2": 8.0, + "discount3": 4.0, + }) + self.assertEqual(self.po_line.discount1, 12.0) self.assertEqual(self.po_line.discount2, 8.0) self.assertEqual(self.po_line.discount3, 4.0) def test_po_line_legacy_discount(self): """Test legacy discount behavior in PO lines""" - self.po_line.write( - { - "discount": 18.0, - } - ) - + self.po_line.write({ + "discount": 18.0, + }) + # Should map to discount1 and reset others self.assertEqual(self.po_line.discount1, 18.0) self.assertEqual(self.po_line.discount2, 0.0) @@ -87,35 +73,33 @@ class TestPurchaseOrder(TransactionCase): def test_po_line_price_calculation(self): """Test that price subtotal is calculated correctly with triple discount""" - self.po_line.write( - { - "discount1": 15.0, - "discount2": 10.0, - "discount3": 5.0, - } - ) - + self.po_line.write({ + "discount1": 15.0, + "discount2": 10.0, + "discount3": 5.0, + }) + # Base: 10 * 150 = 1500 # After 15% discount: 1275 # After 10% discount: 1147.5 # After 5% discount: 1090.125 expected_subtotal = 10 * 150 * 0.85 * 0.90 * 0.95 - self.assertAlmostEqual(self.po_line.price_subtotal, expected_subtotal, places=2) + self.assertAlmostEqual( + self.po_line.price_subtotal, expected_subtotal, places=2 + ) def test_multiple_po_lines(self): """Test multiple PO lines with different discounts""" - line2 = self.env["purchase.order.line"].create( - { - "order_id": self.purchase_order.id, - "product_id": self.product.id, - "product_qty": 5, - "price_unit": 120.0, - "discount1": 20.0, - "discount2": 15.0, - "discount3": 10.0, - } - ) - + line2 = self.env["purchase.order.line"].create({ + "order_id": self.purchase_order.id, + "product_id": self.product.id, + "product_qty": 5, + "price_unit": 120.0, + "discount1": 20.0, + "discount2": 15.0, + "discount3": 10.0, + }) + # Verify both lines have correct discounts self.assertEqual(self.po_line.discount1, 15.0) self.assertEqual(line2.discount1, 20.0) @@ -126,13 +110,11 @@ class TestPurchaseOrder(TransactionCase): """Test updating quantity doesn't affect discounts""" initial_discount1 = self.po_line.discount1 initial_discount2 = self.po_line.discount2 - - self.po_line.write( - { - "product_qty": 20, - } - ) - + + self.po_line.write({ + "product_qty": 20, + }) + # Discounts should remain unchanged self.assertEqual(self.po_line.discount1, initial_discount1) self.assertEqual(self.po_line.discount2, initial_discount2) @@ -142,13 +124,11 @@ class TestPurchaseOrder(TransactionCase): def test_po_line_update_price(self): """Test updating price doesn't affect discounts""" initial_discount1 = self.po_line.discount1 - - self.po_line.write( - { - "price_unit": 200.0, - } - ) - + + self.po_line.write({ + "price_unit": 200.0, + }) + # Discount should remain unchanged self.assertEqual(self.po_line.discount1, initial_discount1) # Price should be updated @@ -156,20 +136,18 @@ class TestPurchaseOrder(TransactionCase): def test_po_with_zero_discounts(self): """Test PO line with all zero discounts""" - self.po_line.write( - { - "discount1": 0.0, - "discount2": 0.0, - "discount3": 0.0, - } - ) - + self.po_line.write({ + "discount1": 0.0, + "discount2": 0.0, + "discount3": 0.0, + }) + # All discounts should be zero self.assertEqual(self.po_line.discount, 0.0) self.assertEqual(self.po_line.discount1, 0.0) self.assertEqual(self.po_line.discount2, 0.0) self.assertEqual(self.po_line.discount3, 0.0) - + # Subtotal should be quantity * price expected = 10 * 150 self.assertEqual(self.po_line.price_subtotal, expected) @@ -177,40 +155,38 @@ class TestPurchaseOrder(TransactionCase): def test_po_line_combined_operations(self): """Test combined operations on PO line""" # Update multiple fields at once - self.po_line.write( - { - "product_qty": 15, - "price_unit": 175.0, - "discount1": 18.0, - "discount2": 12.0, - "discount3": 6.0, - } - ) - + self.po_line.write({ + "product_qty": 15, + "price_unit": 175.0, + "discount1": 18.0, + "discount2": 12.0, + "discount3": 6.0, + }) + # All fields should be updated correctly self.assertEqual(self.po_line.product_qty, 15) self.assertEqual(self.po_line.price_unit, 175.0) self.assertEqual(self.po_line.discount1, 18.0) self.assertEqual(self.po_line.discount2, 12.0) self.assertEqual(self.po_line.discount3, 6.0) - + # Calculate expected subtotal expected = 15 * 175 * 0.82 * 0.88 * 0.94 - self.assertAlmostEqual(self.po_line.price_subtotal, expected, places=2) + self.assertAlmostEqual( + self.po_line.price_subtotal, expected, places=2 + ) def test_po_confirm_with_discounts(self): """Test confirming PO doesn't alter discounts""" - self.po_line.write( - { - "discount1": 10.0, - "discount2": 5.0, - "discount3": 2.0, - } - ) - + self.po_line.write({ + "discount1": 10.0, + "discount2": 5.0, + "discount3": 2.0, + }) + # Confirm the purchase order self.purchase_order.button_confirm() - + # Discounts should remain unchanged after confirmation self.assertEqual(self.po_line.discount1, 10.0) self.assertEqual(self.po_line.discount2, 5.0) diff --git a/account_invoice_triple_discount_readonly/tests/test_triple_discount_mixin.py b/account_invoice_triple_discount_readonly/tests/test_triple_discount_mixin.py index 33b931f..f4600a2 100644 --- a/account_invoice_triple_discount_readonly/tests/test_triple_discount_mixin.py +++ b/account_invoice_triple_discount_readonly/tests/test_triple_discount_mixin.py @@ -10,45 +10,35 @@ class TestTripleDiscountMixin(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() - + # Create a partner - cls.partner = cls.env["res.partner"].create( - { - "name": "Test Partner", - } - ) - - # Create a product template first, then get the variant - cls.product_template = cls.env["product.template"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 100.0, - "standard_price": 50.0, - } - ) - # Get the auto-created product variant - cls.product = cls.product_template.product_variant_ids[0] - + cls.partner = cls.env["res.partner"].create({ + "name": "Test Partner", + }) + + # Create a product + cls.product = cls.env["product.product"].create({ + "name": "Test Product", + "type": "product", + "list_price": 100.0, + "standard_price": 50.0, + }) + # Create a purchase order - cls.purchase_order = cls.env["purchase.order"].create( - { - "partner_id": cls.partner.id, - } - ) - + cls.purchase_order = cls.env["purchase.order"].create({ + "partner_id": cls.partner.id, + }) + # Create a purchase order line - cls.po_line = cls.env["purchase.order.line"].create( - { - "order_id": cls.purchase_order.id, - "product_id": cls.product.id, - "product_qty": 10, - "price_unit": 100.0, - "discount1": 10.0, - "discount2": 5.0, - "discount3": 2.0, - } - ) + cls.po_line = cls.env["purchase.order.line"].create({ + "order_id": cls.purchase_order.id, + "product_id": cls.product.id, + "product_qty": 10, + "price_unit": 100.0, + "discount1": 10.0, + "discount2": 5.0, + "discount3": 2.0, + }) def test_discount_field_is_readonly(self): """Test that the discount field is readonly""" @@ -58,20 +48,18 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_with_explicit_discounts(self): """Test writing with explicit discount1, discount2, discount3""" # Write with explicit discounts - self.po_line.write( - { - "discount": 20.0, # This should be ignored - "discount1": 15.0, - "discount2": 10.0, - "discount3": 5.0, - } - ) - + self.po_line.write({ + "discount": 20.0, # This should be ignored + "discount1": 15.0, + "discount2": 10.0, + "discount3": 5.0, + }) + # Verify explicit discounts were applied self.assertEqual(self.po_line.discount1, 15.0) self.assertEqual(self.po_line.discount2, 10.0) self.assertEqual(self.po_line.discount3, 5.0) - + # The computed discount field should reflect the combined discounts # Formula: 100 - (100 * (1 - 0.15) * (1 - 0.10) * (1 - 0.05)) expected_discount = 100 - (100 * 0.85 * 0.90 * 0.95) @@ -79,13 +67,11 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_only_discount1(self): """Test writing only discount1 explicitly""" - self.po_line.write( - { - "discount": 25.0, # This should be ignored - "discount1": 20.0, - } - ) - + self.po_line.write({ + "discount": 25.0, # This should be ignored + "discount1": 20.0, + }) + # Only discount1 should change self.assertEqual(self.po_line.discount1, 20.0) # Others should remain unchanged @@ -94,13 +80,11 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_only_discount2(self): """Test writing only discount2 explicitly""" - self.po_line.write( - { - "discount": 30.0, # This should be ignored - "discount2": 12.0, - } - ) - + self.po_line.write({ + "discount": 30.0, # This should be ignored + "discount2": 12.0, + }) + # Only discount2 should change self.assertEqual(self.po_line.discount2, 12.0) # Others should remain unchanged from previous test @@ -109,13 +93,11 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_only_discount3(self): """Test writing only discount3 explicitly""" - self.po_line.write( - { - "discount": 35.0, # This should be ignored - "discount3": 8.0, - } - ) - + self.po_line.write({ + "discount": 35.0, # This should be ignored + "discount3": 8.0, + }) + # Only discount3 should change self.assertEqual(self.po_line.discount3, 8.0) # Others should remain unchanged from previous tests @@ -125,21 +107,17 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_legacy_discount_only(self): """Test legacy behavior: writing only discount field""" # Reset to known state first - self.po_line.write( - { - "discount1": 10.0, - "discount2": 5.0, - "discount3": 2.0, - } - ) - + self.po_line.write({ + "discount1": 10.0, + "discount2": 5.0, + "discount3": 2.0, + }) + # Write only discount (legacy behavior) - self.po_line.write( - { - "discount": 25.0, - } - ) - + self.po_line.write({ + "discount": 25.0, + }) + # Should map to discount1 and reset others self.assertEqual(self.po_line.discount1, 25.0) self.assertEqual(self.po_line.discount2, 0.0) @@ -148,24 +126,20 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_multiple_times(self): """Test writing multiple times to ensure consistency""" # First write - self.po_line.write( - { - "discount1": 10.0, - "discount2": 10.0, - } - ) - + self.po_line.write({ + "discount1": 10.0, + "discount2": 10.0, + }) + self.assertEqual(self.po_line.discount1, 10.0) self.assertEqual(self.po_line.discount2, 10.0) - + # Second write - self.po_line.write( - { - "discount": 5.0, - "discount3": 5.0, - } - ) - + self.po_line.write({ + "discount": 5.0, + "discount3": 5.0, + }) + # discount3 should change, others remain self.assertEqual(self.po_line.discount1, 10.0) self.assertEqual(self.po_line.discount2, 10.0) @@ -173,14 +147,12 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_zero_discounts(self): """Test writing zero discounts""" - self.po_line.write( - { - "discount1": 0.0, - "discount2": 0.0, - "discount3": 0.0, - } - ) - + self.po_line.write({ + "discount1": 0.0, + "discount2": 0.0, + "discount3": 0.0, + }) + self.assertEqual(self.po_line.discount1, 0.0) self.assertEqual(self.po_line.discount2, 0.0) self.assertEqual(self.po_line.discount3, 0.0) @@ -189,22 +161,18 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_combined_scenario(self): """Test a realistic combined scenario""" # Initial state - self.po_line.write( - { - "discount1": 15.0, - "discount2": 5.0, - "discount3": 0.0, - } - ) - + self.po_line.write({ + "discount1": 15.0, + "discount2": 5.0, + "discount3": 0.0, + }) + # User tries to update discount field (should be ignored if explicit discounts present) - self.po_line.write( - { - "discount": 50.0, - "discount1": 20.0, - } - ) - + self.po_line.write({ + "discount": 50.0, + "discount1": 20.0, + }) + # discount1 should be updated, others unchanged self.assertEqual(self.po_line.discount1, 20.0) self.assertEqual(self.po_line.discount2, 5.0) @@ -212,14 +180,12 @@ class TestTripleDiscountMixin(TransactionCase): def test_discount_calculation_accuracy(self): """Test that discount calculation is accurate""" - self.po_line.write( - { - "discount1": 10.0, - "discount2": 10.0, - "discount3": 10.0, - } - ) - + self.po_line.write({ + "discount1": 10.0, + "discount2": 10.0, + "discount3": 10.0, + }) + # Combined discount: 100 - (100 * 0.9 * 0.9 * 0.9) = 27.1 expected = 100 - (100 * 0.9 * 0.9 * 0.9) self.assertAlmostEqual(self.po_line.discount, expected, places=2) @@ -227,15 +193,13 @@ class TestTripleDiscountMixin(TransactionCase): def test_write_without_discount_field(self): """Test writing other fields without touching discount fields""" initial_discount1 = self.po_line.discount1 - + # Write other fields - self.po_line.write( - { - "product_qty": 20, - "price_unit": 150.0, - } - ) - + self.po_line.write({ + "product_qty": 20, + "price_unit": 150.0, + }) + # Discounts should remain unchanged self.assertEqual(self.po_line.discount1, initial_discount1) # But other fields should be updated diff --git a/docker-compose.yml b/docker-compose.yml index c83e9da..711ac1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,8 +21,8 @@ services: db: condition: service_healthy ports: - - "8069:8069" - - "8072:8072" + - "8070:8069" + - "8073:8072" environment: HOST: 0.0.0.0 PORT: "8069" diff --git a/docs/FINAL_SOLUTION_SUMMARY.md b/docs/FINAL_SOLUTION_SUMMARY.md deleted file mode 100644 index f038cd6..0000000 --- a/docs/FINAL_SOLUTION_SUMMARY.md +++ /dev/null @@ -1,290 +0,0 @@ -# Template Error - FINAL SOLUTION - -**Status**: ✅ **PERMANENTLY FIXED** via commit 5721687 - -## Problem Statement - -The `TypeError: 'NoneType' object is not callable` error in the `website_sale_aplicoop.eskaera_shop_products` template was caused by QWeb's strict parsing limitations. - -**Error Location**: -``` -Template: website_sale_aplicoop.eskaera_shop_products -Path: /t/t/div/div/form -Node:
-``` - -## Root Cause Analysis - -QWeb template engine cannot parse: - -1. **Complex nested conditionals in t-set**: - ```xml - ❌ FAILS - - ``` - -2. **Chained 'or' operators in t-attf-* attributes**: - ```xml - ❌ FAILS - t-attf-data-price="{{ price_info.get('price') or product.list_price or 0 }}" - ``` - -3. **Deep object attribute chains with conditionals**: - ```xml - ❌ FAILS - t-set="uom" t-value="product.uom_id.category_id.name if (product.uom_id and product.uom_id.category_id) else ''" - ``` - -## Solution Approach - -**Move ALL logic from template to controller** where Python can safely process it. - -### Previous Failed Attempts - -| Commit | Approach | Result | -|--------|----------|--------| -| df57233 | Add `or` operators in attributes | ❌ Still failed | -| 0a0cf5a | Complex nested conditionals in t-set | ❌ Still failed | -| 8e5a4a3 | Three-step pattern with `or` chains | ⚠️ Partially worked but template still had logic | - -### Final Solution (Commit 5721687) - -**Strategy**: Let Python do all the work, pass clean data to template - -#### Step 1: Create Helper Method in Controller - -```python -def _prepare_product_display_info(self, product, product_price_info): - """Pre-process all display values for QWeb safety. - - Returns dict with: - - display_price: float, never None - - safe_uom_category: string, never None - """ - # Get price - all logic here, not in template - price_data = product_price_info.get(product.id, {}) - price = price_data.get("price", product.list_price) if price_data else product.list_price - price_safe = float(price) if price else 0.0 - - # Get UoM - all logic here, not in template - uom_category_name = "" - if product.uom_id: - if product.uom_id.category_id: - uom_category_name = product.uom_id.category_id.name or "" - - return { - "display_price": price_safe, - "safe_uom_category": uom_category_name, - } -``` - -#### Step 2: Build Dict in Both Endpoints - -```python -# In eskaera_shop() method -product_display_info = {} -for product in products: - display_info = self._prepare_product_display_info(product, product_price_info) - product_display_info[product.id] = display_info - -# In load_eskaera_page() method (lazy loading) -product_display_info = {} -for product in products_page: - display_info = self._prepare_product_display_info(product, product_price_info) - product_display_info[product.id] = display_info -``` - -#### Step 3: Pass to Template - -```python -return request.render( - "website_sale_aplicoop.eskaera_shop", - { - # ... other variables ... - "product_display_info": product_display_info, - } -) -``` - -#### Step 4: Simplify Template to Simple Variable References - -```xml - - - - - - - -``` - -## Why This Works - -1. **Python handles complexity**: Conditional logic runs in Python where it's safe -2. **Template gets clean data**: Only simple variable references, no expressions -3. **QWeb is happy**: `.get()` method calls are simple enough for QWeb parser -4. **No None values**: Values are pre-processed to never be None -5. **Maintainable**: Clear separation: Controller = logic, Template = display - -## Files Modified - -### website_sale_aplicoop/controllers/website_sale.py - -**Added**: -- `_prepare_product_display_info(product, product_price_info)` method (lines 390-417) -- Calls to `_prepare_product_display_info()` in `eskaera_shop()` (lines 1062-1065) -- Calls to `_prepare_product_display_info()` in `load_eskaera_page()` (lines 1260-1263) -- Pass `product_display_info` to both template renders - -**Total additions**: ~55 lines of Python - -### website_sale_aplicoop/views/website_templates.xml - -**Changed**: -- Line ~1170: `display_price` - from complex conditional to simple `dict.get()` -- Line ~1225: `safe_uom_category` - from nested conditional to simple `dict.get()` - -**Total changes**: -10 lines of complex XML, +5 lines of simple XML - -## Verification - -✅ Module loads without parsing errors: -``` -Module website_sale_aplicoop loaded in 0.62s, 612 queries (+612 other) -``` - -✅ Template variables in database match expectations - -✅ No runtime errors when accessing eskaera_shop page - -## Key Learnings - -### QWeb Parsing Rules - -**Safe in t-set**: -- ✅ `dict.get('key')` -- ✅ `dict.get('key', default)` -- ✅ Simple method calls with literals -- ✅ Basic `or` between simple values (with caution) - -**Unsafe in t-set**: -- ❌ Nested `if-else` conditionals -- ❌ Complex boolean expressions -- ❌ Chained method calls with conditionals - -**For attributes (t-attf-*)**: -- ✅ Simple variable references: `{{ var }}` -- ✅ Simple method calls: `{{ obj.method() }}` -- ⚠️ `or` operators may work but unreliable -- ❌ Anything complex - -### Best Practice Pattern - -``` -CONTROLLER (Python): -┌─────────────────────────────────────────┐ -│ Process data │ -│ Handle None/defaults │ -│ Build clean dicts │ -│ Return display-ready values │ -└──────────────────┬──────────────────────┘ - │ - ↓ - product_display_info - │ - ↓ -TEMPLATE (QWeb): -┌──────────────────────────────────────────┐ -│ Simple dict.get() calls only │ -│ NO conditional logic │ -│ NO complex expressions │ -│ Just display variables │ -└──────────────────────────────────────────┘ -``` - -This pattern ensures QWeb stays happy while keeping code clean and maintainable. - -## Deployment Checklist - -- ✅ Code committed (5721687) -- ✅ Module loads without errors -- ✅ Template renders without 500 error -- ✅ Pre-commit hooks satisfied -- ✅ Ready for production - -## Future Prevention - -When adding new display logic to templates: - -1. **Ask**: "Does this involve conditional logic?" - - If NO → Can go in template - - If YES → Must go in controller - -2. **Never put in template**: - - `if-else` statements - - Complex `or` chains - - Deep attribute chains with fallbacks - - Method calls that might return None - -3. **Always process in controller**: - - Pre-calculate values - - Handle None cases - - Build display dicts - - Pass to template - ---- - -**Solution Complexity**: ⭐⭐ (Simple and elegant) -**Code Quality**: ⭐⭐⭐⭐⭐ (Clean separation of concerns) -**Maintainability**: ⭐⭐⭐⭐⭐ (Easy to extend) -**Production Ready**: ✅ YES - ---- - -## FINAL VERIFICATION (2026-02-16 - Session Complete) - -### ✅ All Tests Passing - -**1. Database Template Verification**: -``` -SELECT id, key FROM ir_ui_view -WHERE key = 'website_sale_aplicoop.eskaera_shop_products'; -Result: 4591 | website_sale_aplicoop.eskaera_shop_products ✅ -``` - -**2. Template Content Check**: -``` -SELECT arch_db::text LIKE '%order_id_safe%' FROM ir_ui_view -WHERE id = 4591; -Result: t (TRUE) ✅ -``` - -**3. Module Load Test**: -``` -odoo -d odoo -u website_sale_aplicoop --stop-after-init -Result: Module loaded in 0.63s, 612 queries, NO ERRORS ✅ -``` - -**4. Web Interface Test**: -``` -curl -s -i http://localhost:8069/web | head -1 -Result: HTTP/1.1 200 OK - No 500 errors ✅ -``` - -**5. Lazy Loading Pages**: -``` -/eskaera/2/load-page?page=2 HTTP/1.1" 200 ✅ -/eskaera/2/load-page?page=3 HTTP/1.1" 200 ✅ -``` - -**6. Odoo Log Verification**: -- No TypeError in logs ✅ -- No traceback in logs ✅ -- No NoneType is not callable errors ✅ - -### Status: ✅ PRODUCTION READY - -The template error has been fully resolved and verified. All systems operational. diff --git a/docs/FIX_TEMPLATE_ERROR_SUMMARY.md b/docs/FIX_TEMPLATE_ERROR_SUMMARY.md deleted file mode 100644 index 58f2222..0000000 --- a/docs/FIX_TEMPLATE_ERROR_SUMMARY.md +++ /dev/null @@ -1,332 +0,0 @@ -# Fix Template Error Summary - website_sale_aplicoop - -**Date**: 2026-02-16 -**Final Status**: ✅ PERMANENTLY RESOLVED -**Solution Commit**: 5721687 -**Version**: 18.0.1.1.1 - ---- - -## Problem - -The `eskaera_shop_products` QWeb template was throwing a `TypeError: 'NoneType' object is not callable` error when loading the store page. - -### Root Cause - QWeb Parsing Limitations - -QWeb has strict limitations on what expressions it can parse: - -1. **Complex nested conditionals in t-set fail** - ```xml - ❌ - ``` - -2. **Direct 'or' in attributes unreliable** - ```xml - ❌
- ``` - -3. **Deep object chains with conditionals fail** - ```xml - ❌ t-set="uom" t-value="product.uom_id.category_id.name if product.uom_id.category_id else ''" - ``` - ---- - -## Solution - -### Architecture: Move Logic to Controller - -**Final insight**: Don't fight QWeb's limitations. Move ALL complex logic to the Python controller where it belongs. - -#### The Pattern - -``` -CONTROLLER (Python) - ↓ (process data, handle None) -product_display_info = { - product.id: { - 'display_price': 10.99, # Always a float, never None - 'safe_uom_category': 'Weight' # Always a string, never None - } -} - ↓ (pass clean data to template) -TEMPLATE (QWeb) - ↓ (simple dict.get() calls, no logic) - -``` - -#### Implementation - -**In Controller** - Added `_prepare_product_display_info()` method: - -```python -def _prepare_product_display_info(self, product, product_price_info): - """Pre-process all display values for QWeb safety. - - All logic happens HERE in Python, not in template. - Returns dict with safe values ready for display. - """ - # Get price - handle None safely - price_data = product_price_info.get(product.id, {}) - price = price_data.get("price", product.list_price) if price_data else product.list_price - price_safe = float(price) if price else 0.0 - - # Get UoM category - handle None/nested attributes safely - uom_category_name = "" - if product.uom_id: - if product.uom_id.category_id: - uom_category_name = product.uom_id.category_id.name or "" - - return { - "display_price": price_safe, # Never None - "safe_uom_category": uom_category_name, # Never None - } -``` - -**In Template** - Simple dict.get() calls: - -```xml - - - - - - - -``` - ---- - -## What Changed - -### Files Modified - -1. **website_sale_aplicoop/controllers/website_sale.py** - - Added `_prepare_product_display_info()` method (lines 390-417) - - Generate `product_display_info` dict in `eskaera_shop()` (lines 1062-1065) - - Generate `product_display_info` dict in `load_eskaera_page()` (lines 1260-1263) - - Pass to template renders - -2. **website_sale_aplicoop/views/website_templates.xml** - - Removed complex conditional expressions from template - - Replaced with simple `dict.get()` calls - - No business logic remains in template - -### Iteration History - -| Commit | Approach | Result | -|--------|----------|--------| -| df57233 | Add `or` operators in attributes | ❌ Error persisted | -| 0a0cf5a | Complex nested conditionals in t-set | ❌ Error persisted | -| 8e5a4a3 | Three-step pattern with `or` chains | ⚠️ Error persisted | -| 5721687 | Move logic to controller | ✅ SOLVED | - - - -### Why This Works - -1. **Two-step computation**: Separates extraction from fallback logic -2. **Python short-circuit evaluation**: `or` operator properly handles None values -3. **Avoids complex conditionals**: Simple `or` chains instead of nested `if-else` -4. **QWeb-compatible**: The `or` operator works reliably when value is pre-extracted -5. **Readable**: Clear intent - extract value, then fall back - ---- - -## Changes Made - -### File: `website_sale_aplicoop/views/website_templates.xml` - -**Location 1**: Price computation (lines 1165-1177) - -**Before**: -```xml - - - -``` - -**After**: -```xml - - - - -``` - -**Location 2**: Form element (lines 1215-1228) - -**Before**: -```xml - - - -``` - -**After**: -```xml - - -``` - ---- - -## Verification - -### Template Validation -✅ XML validation: Passed -✅ Pre-commit hooks: Passed (check xml) - -### Runtime Verification -✅ Module loaded successfully without parsing errors -✅ Template compiled correctly in ir.ui.view -✅ Safe variables present in rendered template -``` -FOUND: safe_display_price in Eskaera Shop Products -FOUND: safe_uom_category in Eskaera Shop Products -``` - -### Module Status -``` -Module: website_sale_aplicoop -State: installed -Version: 18.0.1.1.1 -``` - ---- - -## Git Commits - -### Commit 1: First Fix Attempt (df57233) -- Used simple `or` operators in t-attf-* attributes -- Result: Error persisted - direct attribute operators don't work in QWeb - -### Commit 2: Complex Conditionals Attempt (0a0cf5a) -- Added safe variables with nested `if-else` expressions -- Result: Error persisted - complex conditionals in t-set fail -- Issue: QWeb can't properly evaluate `if var else (if var2 else val)` patterns - -### Commit 3: Final Fix - Intermediate Variable Pattern (8e5a4a3) ✅ -``` -[FIX] website_sale_aplicoop: Simplify price handling using Python or operator in t-set - -- Create intermediate variable: display_price_value = price_info.get('price') -- Then compute: display_price = display_price_value or product.list_price or 0.0 -- Use simple reference in t-attf attribute: {{ display_price }} - -This approach: -1. Avoids complex nested conditionals in t-set -2. Uses Python's native short-circuit evaluation for None-safety -3. Keeps template expressions simple and readable -4. Properly handles fallback values in the right evaluation order -``` -- Result: ✅ Template loads successfully, no errors - ---- - -## Testing - -### Test Status -- ✅ All 85 unit tests passed (executed in previous iteration) -- ✅ Template parsing: No errors -- ✅ Variable rendering: Safe variables correctly computed -- ✅ Docker services: All running - -### Next Steps (if needed) -Run full test suite: -```bash -docker-compose exec -T odoo odoo -d odoo --test-enable --test-tags=website_sale_aplicoop --stop-after-init -``` - ---- - -## Key Learnings - -### QWeb Rendering Limitations - -QWeb's template attribute system (`t-attf-*`) has specific limitations: - -1. **Direct `or` operators in attributes don't work reliably** - - ❌ Bad: `t-attf-value="{{ var1 or var2 or default }}"` - - Issue: QWeb doesn't parse `or` correctly in attribute context - -2. **Complex conditionals in t-set can fail** - - ❌ Bad: `` - - Issue: Nested conditionals confuse QWeb's expression parser - -3. **Simple fallbacks work best** - - ✅ Good: `` - - ✅ Good: `` - - These are simple expressions QWeb can reliably evaluate - -4. **Intermediate variables solve the problem** - - Extract the value first (with `.get()`) - - Then apply fallbacks (with `or`) - - Finally reference in attributes - - Keeps each step simple and QWeb-safe - -### The Pattern - -When you need safe None-handling in attributes: - -```xml - - - - - - - -
-``` - -This three-step pattern ensures: -- Each computation is simple (QWeb-compatible) -- None values are handled correctly (Python's `or`) -- Attributes are never nil (fallback chain) -- Code is readable and maintainable - ---- - -## Related Files - -- [website_templates.xml](../website_sale_aplicoop/views/website_templates.xml) - Template file (modified) -- [__manifest__.py](../website_sale_aplicoop/__manifest__.py) - Module manifest -- [README.md](../website_sale_aplicoop/README.md) - Module documentation - ---- - -## Environment - -**Odoo**: 18.0.20251208 -**Docker**: Compose v2+ -**Python**: 3.10+ -**Module Version**: 18.0.1.1.1 - ---- - -## Conclusion - -The template error has been successfully fixed by applying the proper QWeb pattern for None-safe value handling. The solution is: - -- ✅ **Simple**: Three-step intermediate variable pattern -- ✅ **Tested**: Module loads without errors, all tests passing -- ✅ **Robust**: Handles None values, missing attributes, and type conversions -- ✅ **Maintainable**: Clear intent, easy to understand and modify -- ✅ **Production-ready**: Deployed and verified - -The module is now ready for production use. Future templates should follow this pattern to avoid similar issues. - -**Key Takeaway**: In QWeb templates, keep variable computations simple by using intermediate variables and let Python's native operators (`or`, `.get()`) handle the logic. diff --git a/docs/LAZY_LOADING.md b/docs/LAZY_LOADING.md deleted file mode 100644 index 1790e55..0000000 --- a/docs/LAZY_LOADING.md +++ /dev/null @@ -1,444 +0,0 @@ -# Lazy Loading de Productos en Tienda Aplicoop - -**Versión**: 18.0.1.3.0 -**Fecha**: 16 de febrero de 2026 -**Addon**: `website_sale_aplicoop` - -## 📋 Resumen - -Implementación de **lazy loading configurable** para cargar productos bajo demanda en la tienda de órdenes grupales. Reduce significativamente el tiempo de carga inicial al paginar productos (de 10-20s a 500-800ms). - -## 🎯 Problema Resuelto - -**Antes**: La tienda cargaba y calculaba precios para **TODOS** los productos de una vez (potencialmente 1000+), causando: -- ⏱️ 10-20 segundos de delay en carga inicial -- 💾 Cálculo secuencial de precios para cada producto -- 🌳 1000+ elementos en el DOM - -**Ahora**: Carga paginada bajo demanda: -- ⚡ 500-800ms de carga inicial (20 productos/página por defecto) -- 📦 Cálculo de precios solo para página actual -- 🔄 Cargas posteriores de 200-400ms - -## 🔧 Configuración - -### 1. Activar/Desactivar Lazy Loading - -**Ubicación**: Settings → Website → Shop Performance - -``` -[✓] Enable Lazy Loading -[20] Products Per Page -``` - -**Parámetros configurables**: -- `website_sale_aplicoop.lazy_loading_enabled` (Boolean, default: True) -- `website_sale_aplicoop.products_per_page` (Integer, default: 20, rango: 5-100) - -### 2. Comportamiento Según Configuración - -| Configuración | Comportamiento | -|---|---| -| Lazy loading **habilitado** | Carga página 1, muestra botón "Load More" si hay más productos | -| Lazy loading **deshabilitado** | Carga TODOS los productos como en versión anterior | -| `products_per_page = 20` | 20 productos por página (recomendado) | -| `products_per_page = 50` | 50 productos por página (para tiendas grandes) | - -## 📐 Arquitectura Técnica - -### Backend: Python/Odoo - -#### 1. Modelo: `group_order.py` - -**Nuevo método**: -```python -def _get_products_paginated(self, order_id, page=1, per_page=20): - """Get paginated products for a group order. - - Returns: - tuple: (products_page, total_count, has_next) - """ -``` - -**Comportamiento**: -- Obtiene todos los productos del pedido (sin paginar) -- Aplica slice en Python: `products[offset:offset + per_page]` -- Retorna página actual, total de productos, y si hay siguiente - -#### 2. Controlador: `website_sale.py` - -**Método modificado**: `eskaera_shop(order_id, **post)` - -Cambios principales: -```python -# Leer configuración -lazy_loading_enabled = request.env["ir.config_parameter"].get_param( - "website_sale_aplicoop.lazy_loading_enabled", "True" -) == "True" -per_page = int(request.env["ir.config_parameter"].get_param( - "website_sale_aplicoop.products_per_page", 20 -)) - -# Parámetro de página (GET) -page = int(post.get("page", 1)) - -# Paginar si está habilitado -if lazy_loading_enabled: - offset = (page - 1) * per_page - products = products[offset:offset + per_page] - has_next = offset + per_page < total_products -``` - -**Variables pasadas al template**: -- `lazy_loading_enabled`: Boolean -- `per_page`: Integer (20, 50, etc) -- `current_page`: Integer (página actual) -- `has_next`: Boolean (hay más productos) -- `total_products`: Integer (total de productos) - -**Nuevo endpoint**: `load_eskaera_page(order_id, **post)` - -Route: `GET /eskaera//load-page?page=N` - -```python -@http.route( - ["/eskaera//load-page"], - type="http", - auth="user", - website=True, - methods=["GET"], -) -def load_eskaera_page(self, order_id, **post): - """Load next page of products for lazy loading. - - Returns: - HTML: Snippet de productos (sin wrapper de página) - """ -``` - -**Características**: -- Calcula precios solo para productos en la página solicitada -- Retorna HTML puro (sin estructura de página) -- Soporta búsqueda y filtrado del mismo modo que página principal -- Sin validación de precios (no cambian frecuentemente) - -### Frontend: QWeb/HTML - -#### Template: `eskaera_shop` - -**Cambios principales**: -1. Grid de productos con `id="products-grid"` (era sin id) -2. Llama a template reutilizable: `eskaera_shop_products` -3. Botón "Load More" visible si lazy loading está habilitado y `has_next=True` - -```xml - -
- -
- - - -
-
- -
-
- - -``` - -#### Template: `eskaera_shop_products` (nueva) - -Template reutilizable que renderiza solo productos. Usada por: -- Página inicial `eskaera_shop` (página 1) -- Endpoint AJAX `load_eskaera_page` (páginas 2, 3, ...) - -```xml - -``` - -### Frontend: JavaScript - -#### Método nuevo: `_attachLoadMoreListener()` - -Ubicación: `website_sale.js` - -Características: -- ✅ Event listener en botón "Load More" -- ✅ AJAX GET a `/eskaera//load-page?page=N` -- ✅ Spinner simple: desactiva botón + cambia texto -- ✅ Append HTML al grid (`.insertAdjacentHTML('beforeend', html)`) -- ✅ Re-attach listeners para nuevos productos -- ✅ Actualiza página en botón -- ✅ Oculta botón si no hay más páginas - -```javascript -_attachLoadMoreListener: function() { - var self = this; - var btn = document.getElementById('load-more-btn'); - - if (!btn) return; - - btn.addEventListener('click', function(e) { - e.preventDefault(); - - var orderId = btn.getAttribute('data-order-id'); - var nextPage = btn.getAttribute('data-page'); - - // Mostrar spinner - btn.disabled = true; - btn.innerHTML = 'Loading...'; - - // AJAX GET - var xhr = new XMLHttpRequest(); - xhr.open('GET', '/eskaera/' + orderId + '/load-page?page=' + nextPage, true); - - xhr.onload = function() { - if (xhr.status === 200) { - var html = xhr.responseText; - var grid = document.getElementById('products-grid'); - - // Insertar productos - grid.insertAdjacentHTML('beforeend', html); - - // Re-attach listeners - self._attachEventListeners(); - - // Actualizar botón - btn.setAttribute('data-page', parseInt(nextPage) + 1); - - // Ocultar si no hay más - if (html.trim().length < 100) { - btn.style.display = 'none'; - } else { - btn.disabled = false; - btn.innerHTML = originalText; - } - } - }; - - xhr.send(); - }); -} -``` - -**Llamada en `_attachEventListeners()`**: -```javascript -_attachEventListeners: function() { - var self = this; - - // ============ LAZY LOADING: Load More Button ============ - this._attachLoadMoreListener(); - - // ... resto de listeners ... -} -``` - -## 📁 Archivos Modificados - -``` -website_sale_aplicoop/ -├── models/ -│ ├── group_order.py [MODIFICADO] +método _get_products_paginated -│ └── res_config_settings.py [MODIFICADO] +campos de configuración -├── controllers/ -│ └── website_sale.py [MODIFICADO] eskaera_shop() + nuevo load_eskaera_page() -├── views/ -│ └── website_templates.xml [MODIFICADO] split productos en template reutilizable -│ [NUEVO] template eskaera_shop_products -│ [MODIFICADO] add botón Load More -└── static/src/js/ - └── website_sale.js [MODIFICADO] +método _attachLoadMoreListener() -``` - -## 🧪 Testing - -### Prueba Manual - -1. **Configuración**: - ``` - Settings > Website > Shop Performance - ✓ Enable Lazy Loading - 20 Products Per Page - ``` - -2. **Página de tienda**: - - `/eskaera/` debe cargar en ~500-800ms (vs 10-20s antes) - - Mostrar solo 20 productos inicialmente - - Botón "Load More" visible al final - -3. **Click en "Load More"**: - - Botón muestra "Loading..." - - Esperar 200-400ms - - Productos se agregan sin recargar página - - Event listeners funcionales en nuevos productos (qty +/-, add-to-cart) - - Botón actualizado a página siguiente - -4. **Última página**: - - No hay más productos - - Botón desaparece automáticamente - -### Casos de Prueba - -| Caso | Pasos | Resultado Esperado | -|---|---|---| -| Lazy loading habilitado | Abrir tienda | Cargar 20 productos, mostrar botón | -| Lazy loading deshabilitado | Settings: desactivar lazy loading | Cargar TODOS los productos | -| Cambiar per_page | Settings: 50 productos | Página 1 con 50 productos | -| Load More funcional | Click en botón | Agregar 20 productos más sin recargar | -| Re-attach listeners | Qty +/- en nuevos productos | +/- funcionan correctamente | -| Última página | Click en Load More varias veces | Botón desaparece al final | - -## 📊 Rendimiento - -### Métricas de Carga - -**Escenario: 1000 productos, 20 por página** - -| Métrica | Antes | Ahora | Mejora | -|---|---|---|---| -| Tiempo carga inicial | 10-20s | 500-800ms | **20x más rápido** | -| Productos en DOM (inicial) | 1000 | 20 | **50x menos** | -| Tiempo cálculo precios (inicial) | 10-20s | 100-200ms | **100x más rápido** | -| Carga página siguiente | N/A | 200-400ms | **Bajo demanda** | - -### Factores que Afectan Rendimiento - -1. **Número de productos por página** (`products_per_page`): - - Menor (5): Más llamadas AJAX, menos DOM - - Mayor (50): Menos llamadas AJAX, más DOM - - **Recomendado**: 20 para balance - -2. **Cálculo de precios**: - - No es cuello de botella si pricelist es simple - - Cacheado en Odoo automáticamente - -3. **Conexión de red**: - - AJAX requests añaden latencia de red (50-200ms típico) - - Sin validación extra de precios - -## 🔄 Flujo de Datos - -``` -Usuario abre /eskaera/ - ↓ -Controller eskaera_shop(): - - Lee lazy_loading_enabled, per_page de config - - Obtiene todos los productos - - Pagina: products = products[0:20] - - Calcula precios SOLO para estos 20 - - Pasa al template: has_next=True - ↓ -Template renderiza: - - 20 productos con datos precalculados - - Botón "Load More" (visible si has_next) - - localStorage cart sincronizado - ↓ -JavaScript init(): - - _attachLoadMoreListener() → listener en botón - - realtime_search.js → búsqueda en DOM actual - ↓ -Usuario click "Load More" - ↓ -AJAX GET /eskaera//load-page?page=2 - ↓ -Controller load_eskaera_page(): - - Obtiene SOLO 20 productos de página 2 - - Calcula precios - - Retorna HTML (sin wrapper) - ↓ -JavaScript: - - Inserta HTML en #products-grid (append) - - _attachEventListeners() → listeners en nuevos productos - - Actualiza data-page en botón - - Oculta botón si no hay más -``` - -## ⚙️ Configuración Recomendada - -### Para tiendas pequeñas (<200 productos) -``` -Lazy Loading: Habilitado (opcional) -Products Per Page: 20 -``` - -### Para tiendas medianas (200-1000 productos) -``` -Lazy Loading: Habilitado (recomendado) -Products Per Page: 20-30 -``` - -### Para tiendas grandes (>1000 productos) -``` -Lazy Loading: Habilitado (RECOMENDADO) -Products Per Page: 20 -``` - -## 🐛 Troubleshooting - -### "Load More" no aparece -- ✓ Verificar `lazy_loading_enabled = True` en Settings -- ✓ Verificar que hay más de `per_page` productos -- ✓ Check logs: `_logger.info("load_eskaera_page")` debe aparecer - -### Botón no funciona -- ✓ Check console JS (F12 → Console) -- ✓ Verificar AJAX GET en Network tab -- ✓ Revisar respuesta HTML (debe tener `.product-card`) - -### Event listeners no funcionan en nuevos productos -- ✓ `_attachEventListeners()` debe ser llamado después de insertar HTML -- ✓ Verificar que clones elementos viejos (para evitar duplicados) - -### Precios incorrectos -- ✓ Configurar pricelist en Settings → Aplicoop Pricelist -- ✓ Verificar que no cambian frecuentemente (no hay validación) -- ✓ Revisar logs: `eskaera_shop: Starting price calculation` - -## 📝 Notas de Desarrollo - -### Decisiones Arquitectónicas - -1. **Sin validación de precios**: Los precios se calculan una sola vez en backend. No se revalidan al cargar siguientes páginas (no cambian frecuentemente). - -2. **HTML puro, no JSON**: El endpoint retorna HTML directo, no JSON. Simplifica inserción en DOM sin necesidad de templating adicional. - -3. **Sin cambio de URL**: Las páginas no usan URL con `?page=N`. Todo es AJAX transparente. Sin SEO pero más simple. - -4. **Búsqueda local**: `realtime_search.js` busca en DOM actual (20 productos). Si el usuario necesita buscar en TODOS, debe refrescar. - -5. **Configuración en caché Odoo**: `get_param()` es automáticamente cacheado dentro de la request. Sin latencia extra. - -### Extensiones Futuras - -1. **Búsqueda remota**: Hacer que la búsqueda valide en servidor si usuario busca en >20 productos -2. **Infinite Scroll**: Usar Intersection Observer en lugar de botón -3. **Precarga**: Prefetch página 2 mientras usuario ve página 1 -4. **Filtrado remoto**: Enviar search + category filter al servidor para filtar antes de paginar - -## 📚 Referencias - -- [Odoo 18 HTTP Routes](https://www.odoo.com/documentation/18.0/developer/reference/http.html) -- [Fetch API vs XMLHttpRequest](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) -- [QWeb Templates](https://www.odoo.com/documentation/18.0/developer/reference/frontend/qweb.html) -- [OCA product_get_price_helper](../product_get_price_helper/README.md) - -## 👨‍💻 Autor - -**Fecha**: 16 de febrero de 2026 -**Versión Odoo**: 18.0 -**Versión addon**: 18.0.1.3.0 diff --git a/docs/LAZY_LOADING_DOCS_INDEX.md b/docs/LAZY_LOADING_DOCS_INDEX.md deleted file mode 100644 index a400a1f..0000000 --- a/docs/LAZY_LOADING_DOCS_INDEX.md +++ /dev/null @@ -1,192 +0,0 @@ -# 🚀 Lazy Loading Documentation Index - -## Overview - -Este índice centraliza toda la documentación relacionada con la nueva feature de **lazy loading** implementada en `website_sale_aplicoop` v18.0.1.3.0. La feature reduce significativamente el tiempo de carga de la tienda (de 10-20s a 500-800ms) mediante carga bajo demanda de productos. - -## 📚 Documentos Principales - -### 1. [LAZY_LOADING.md](./LAZY_LOADING.md) -**Tipo**: Documentación Técnica Completa -**Audiencia**: Desarrolladores, Administradores Técnicos -**Contenido**: -- Arquitectura y diseño detallado -- Explicación del algoritmo de paginación -- Configuración en settings -- Cambios de código por archivo -- Métricas de rendimiento -- Testing y debugging -- Troubleshooting avanzado -- Roadmap de mejoras futuras - -**Secciones principales**: -- Definición del problema (10-20s de carga) -- Solución implementada (lazy loading + configuración) -- Impacto de rendimiento (20x más rápido) -- Guía de troubleshooting - -**Lectura estimada**: 30-45 minutos - -### 2. [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](./UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) -**Tipo**: Guía de Actualización e Instalación -**Audiencia**: Administradores de Sistema, DevOps -**Contenido**: -- Pasos de actualización paso a paso -- Configuración post-instalación -- Opciones de settings y valores recomendados -- Checklist de validación (4 pasos) -- Troubleshooting de problemas comunes (4 escenarios) -- Métricas de rendimiento esperado -- Instrucciones de rollback -- Notas importantes sobre comportamiento - -**Secciones principales**: -- Resumen de cambios -- Proceso de actualización -- Configuración de settings -- Validación post-instalación -- Rollback en caso de problemas - -**Lectura estimada**: 15-20 minutos - -### 3. [website_sale_aplicoop/README.md](../website_sale_aplicoop/README.md) -**Tipo**: Documentación del Addon -**Audiencia**: Usuarios Finales, Administradores -**Contenido**: -- Features del addon (incluyendo lazy loading) -- Instrucciones de instalación -- Guía de uso -- Detalles técnicos de modelos -- Información de testing -- Changelog - -**Secciones relacionadas a lazy loading**: -- ✨ Features list: "Lazy Loading: Configurable product pagination..." -- Changelog v18.0.1.3.0: Descripción completa del feature -- Performance Considerations - -**Lectura estimada**: 10-15 minutos (solo sección lazy loading) - -### 4. [website_sale_aplicoop/CHANGELOG.md](../website_sale_aplicoop/CHANGELOG.md) -**Tipo**: Registro de Cambios -**Audiencia**: Todos -**Contenido**: -- Historial de versiones -- v18.0.1.3.0: Lazy loading feature -- v18.0.1.2.0: UI improvements -- v18.0.1.0.0: Initial release - -**Lectura estimada**: 5 minutos - -## 🎯 Guía de Selección de Documentos - -### Si eres Administrador/Usuario: -1. **Primero**: Lee [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](./UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) -2. **Luego**: Consulta la sección de configuración en [website_sale_aplicoop/README.md](../website_sale_aplicoop/README.md) -3. **Si hay problemas**: Ve a troubleshooting en UPGRADE_INSTRUCTIONS - -### Si eres Desarrollador: -1. **Primero**: Lee [LAZY_LOADING.md](./LAZY_LOADING.md) para entender la arquitectura -2. **Luego**: Revisa los cambios de código en la sección "Code Changes" de LAZY_LOADING.md -3. **Para debugging**: Consulta la sección "Debugging & Testing" en LAZY_LOADING.md -4. **Para mejoras**: Ver "Future Improvements" al final de LAZY_LOADING.md - -### Si necesitas Troubleshooting: -- **Problema de carga**: Ve a [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md - Troubleshooting](./UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md#troubleshooting) -- **Problema técnico**: Ve a [LAZY_LOADING.md - Debugging](./LAZY_LOADING.md#debugging--testing) -- **Rollback**: Ve a [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md - Rollback](./UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md#rollback-instructions) - -## 📊 Información de Impacto - -### Performance Improvements -- **Antes**: 10-20 segundos de carga inicial -- **Después**: 500-800ms de carga inicial (20x más rápido) -- **Carga de páginas posteriores**: 200-400ms - -### Technical Details -- **Tecnología**: Backend pagination + AJAX lazy loading -- **Frontend**: Vanilla JavaScript (XMLHttpRequest) -- **Configurable**: Sí (enable/disable + items per page) -- **Backward compatible**: Sí (can disable in settings) - -## 🔄 Cambios de Código - -### Archivos Modificados: -1. `/models/res_config_settings.py` - Campos de configuración -2. `/models/group_order.py` - Método de paginación -3. `/controllers/website_sale.py` - Controladores HTTP -4. `/views/website_templates.xml` - Templates QWeb -5. `/static/src/js/website_sale.js` - JavaScript AJAX - -Para detalles específicos de cada cambio, ver [LAZY_LOADING.md - Code Changes](./LAZY_LOADING.md#code-changes-by-file) - -## ✅ Checklist de Implementación - -- ✅ Feature implementado en v18.0.1.3.0 -- ✅ Documentación técnica completa -- ✅ Guía de actualización e instalación -- ✅ Changelog actualizado -- ✅ Tests unitarios incluidos -- ✅ Backward compatible (desactivable) -- ✅ Rendimiento verificado (20x más rápido) - -## 📝 Notas Importantes - -1. **Configuración Recomendada**: - - `eskaera_lazy_loading_enabled`: True (activo por defecto) - - `eskaera_products_per_page`: 20 (recomendado) - -2. **Requisitos**: - - Odoo 18.0+ - - website_sale_aplicoop instalado - - JavaScript habilitado en navegador - -3. **Limitaciones Conocidas**: - - No aplica a búsqueda en tiempo real (load-more tampoco) - - Precios se calculan una vez al cargar página - - Cambios de pricelist no afectan productos ya cargados - -4. **Mejoras Futuras Potenciales**: - - Infinite scroll en lugar de "Load More" button - - Carga inteligente con prefetch de próxima página - - Caching local de páginas cargadas - - Infinite scroll con intersectionObserver - -## 🔗 Enlaces Rápidos - -| Documento | URL | Propósito | -|-----------|-----|----------| -| Lazy Loading Tech Docs | [docs/LAZY_LOADING.md](./LAZY_LOADING.md) | Detalles técnicos completos | -| Upgrade Guide | [docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](./UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) | Instrucciones de instalación | -| Addon README | [website_sale_aplicoop/README.md](../website_sale_aplicoop/README.md) | Features y uso general | -| Changelog | [website_sale_aplicoop/CHANGELOG.md](../website_sale_aplicoop/CHANGELOG.md) | Historial de versiones | -| Main README | [README.md](../README.md) | Descripción del proyecto | - -## 📞 Soporte - -Para issues, preguntas o reportes de bugs: - -1. **Antes de reportar**: Consulta el troubleshooting en UPGRADE_INSTRUCTIONS -2. **Si el problema persiste**: Revisa la sección de debugging en LAZY_LOADING.md -3. **Para reportar**: Abre un issue con: - - Versión de Odoo - - Configuración de lazy loading (enabled/disabled, products_per_page) - - Error específico o comportamiento inesperado - - Pasos para reproducir - -## 🎓 Aprendizajes Clave - -Esta implementación demuestra: -- Optimización de rendimiento en Odoo -- Paginación backend efectiva -- AJAX sin frameworks (vanilla JavaScript) -- Integración con sistema de configuración de Odoo -- Backward compatibility en features -- Documentación técnica completa - ---- - -**Última Actualización**: 2026-02-16 -**Versión Aplicable**: 18.0.1.3.0+ -**Autor**: Criptomart SL -**Licencia**: AGPL-3.0 or later diff --git a/docs/LAZY_LOADING_QUICK_START.md b/docs/LAZY_LOADING_QUICK_START.md deleted file mode 100644 index b0880b3..0000000 --- a/docs/LAZY_LOADING_QUICK_START.md +++ /dev/null @@ -1,138 +0,0 @@ -# ⚡ Quick Start - Lazy Loading v18.0.1.3.0 - -## TL;DR - Lo más importante - -**Lazy loading reduce el tiempo de carga de la tienda de 10-20 segundos a 500-800ms** (20x más rápido). - ---- - -## 🎯 ¿Qué necesito hacer? - -### Opción 1: Actualizar a v18.0.1.3.0 (Recomendado) - -```bash -# 1. Actualizar el addon -docker-compose exec odoo odoo -d odoo -u website_sale_aplicoop --stop-after-init - -# 2. Ir a Settings > Website > Shop Settings -# 3. Lazy Loading está ACTIVADO por defecto ✅ -``` - -**Hecho**. Eso es todo. Tu tienda ahora carga mucho más rápido. - ---- - -### Opción 2: Desactivar Lazy Loading - -Si por alguna razón quieres desactivarlo: - -1. Ve a **Settings** → **Website** → **Shop Settings** -2. Desactiva: "Enable Lazy Loading" -3. Guarda - ---- - -## 📊 ¿Cuánto más rápido? - -| Métrica | Antes | Después | -|---------|-------|---------| -| **Carga inicial** | 10-20s | 500-800ms | -| **Carga página 2** | (no existe) | 200-400ms | -| **Productos en DOM** | 1000+ | 20 | -| **Velocidad** | 1x | **20x** 🚀 | - ---- - -## ⚙️ Configuración (Opcional) - -Ve a **Settings → Website → Shop Settings** para: - -- **Enable Lazy Loading**: Activar/Desactivar la feature (default: ON) -- **Products Per Page**: Cuántos productos cargar por vez (default: 20) - - 5-100 recomendado - - Menos = más rápido pero más clicks - - Más = menos clicks pero más lento - ---- - -## 📖 Documentación Completa - -Si necesitas más detalles: - -- **Visión General**: [docs/LAZY_LOADING_DOCS_INDEX.md](docs/LAZY_LOADING_DOCS_INDEX.md) -- **Instalación Detallada**: [docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) -- **Detalles Técnicos**: [docs/LAZY_LOADING.md](docs/LAZY_LOADING.md) - ---- - -## 🐛 ¿Algo funciona mal? - -### "No veo botón 'Load More'" -- Asegúrate de que lazy loading esté activado en Settings -- Asegúrate de que haya más de 20 productos (o el `products_per_page` que configuraste) - -### "Clic en 'Load More' no hace nada" -- Revisa la consola del navegador (F12 → Console) -- Comprueba que JavaScript esté habilitado - -### "Spinner nunca desaparece" -- Espera 10 segundos (timeout automático) -- Recarga la página - -### "La página se cuelga" -- Disminuye `products_per_page` en Settings (prueba con 10) -- Desactiva lazy loading si persiste - ---- - -## ✅ Verificación Rápida - -Para confirmar que lazy loading está funcionando: - -1. Ve a la tienda (eskaera page) -2. Abre navegador DevTools (F12) -3. Abre pestaña **Network** -4. Hace scroll o busca el botón "Load More" -5. Cuando hagas clic, deberías ver: - - Petición HTTP GET a `/eskaera//load-page?page=2` - - Respuesta HTML con productos - - Spinner apareciendo y desapareciendo - ---- - -## 🔄 Rollback (Si es necesario) - -Si necesitas volver a la versión anterior: - -```bash -# 1. Disactiva lazy loading en Settings primero (por seguridad) -# 2. Ejecuta rollback del addon -docker-compose exec odoo odoo -d odoo -u website_sale_aplicoop --stop-after-init - -# 3. Limpia caché del navegador (IMPORTANTE) -# - Presiona Ctrl+Shift+Del -# - Selecciona "All time" y "Cache" -# - Limpia -``` - ---- - -## 📞 ¿Necesito ayuda? - -1. **Quick troubleshooting**: Sección anterior (🐛) -2. **Problemas comunes**: [Troubleshooting en UPGRADE_INSTRUCTIONS](docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md#troubleshooting) -3. **Detalles técnicos**: [LAZY_LOADING.md](docs/LAZY_LOADING.md) - ---- - -## 🎉 Eso es todo - -Lazy loading está diseñado para "simplemente funcionar". Si está activado en Settings, tu tienda debería cargar mucho más rápido. - -**Versión**: 18.0.1.3.0 -**Estado**: ✅ Producción -**Compatibilidad**: Odoo 18.0+ - ---- - -Para información más completa, consulta [docs/LAZY_LOADING_DOCS_INDEX.md](docs/LAZY_LOADING_DOCS_INDEX.md) diff --git a/docs/QWEB_BEST_PRACTICES.md b/docs/QWEB_BEST_PRACTICES.md deleted file mode 100644 index a2a4eef..0000000 --- a/docs/QWEB_BEST_PRACTICES.md +++ /dev/null @@ -1,399 +0,0 @@ -# QWeb Template Best Practices - Odoo 18 - -**Reference**: website_sale_aplicoop template error fix -**Odoo Version**: 18.0+ -**Created**: 2026-02-16 - ---- - -## Table of Contents - -1. [Attribute Expression Best Practices](#attribute-expression-best-practices) -2. [None/Null Safety Patterns](#nonenull-safety-patterns) -3. [Variable Computation Patterns](#variable-computation-patterns) -4. [Common Pitfalls](#common-pitfalls) -5. [Real-World Examples](#real-world-examples) - ---- - -## Attribute Expression Best Practices - -### The Problem: t-attf-* Operator Issues - -**Issue**: QWeb's `t-attf-*` (template attribute) directives don't handle chained `or` operators well when expressions can evaluate to None. - -```xml - - - - -``` - -### The Solution: Pre-compute Safe Variables - -**Key Pattern**: Use `` to compute safe values **before** using them in attributes. - -```xml - - - -``` - -### Why This Works - -1. **Separation of Concerns**: Logic (t-set) is separate from rendering (t-attf-*) -2. **Explicit Evaluation**: QWeb evaluates the conditional expression fully before passing to t-set -3. **Type Safety**: Pre-computed value is guaranteed to be non-None -4. **Readability**: Clear intent of what value is being used - ---- - -## None/Null Safety Patterns - -### Pattern 1: Intermediate Variable + Simple Fallback (RECOMMENDED) - -**Scenario**: Value might be None, need a default - -```python -# Python context -price_value = None # or any value that could be None -product_price = 100.0 -``` - -```xml - - - - - - - - -
-``` - -**Why this works**: -- Step 1 extracts without defaults (returns None if missing) -- Step 2 uses Python's short-circuit `or` for safe None-handling -- Step 3 uses simple variable reference in attribute -- QWeb can reliably evaluate each step - -### Pattern 2: Nested Object Access (Safe Chaining) - -**Scenario**: Need to access nested attributes safely (e.g., `product.uom_id.category_id.name`) - -```python -# Python context -product.uom_id = UoM(...) # Valid UoM with category_id -product.uom_id.category_id = None # Category is None -``` - -```xml - - -
-``` - -### Pattern 3: Type Coercion - -**Scenario**: Value might be wrong type, need guaranteed type - -```python -# Python context -quantity = "invalid_string" # Should be int/float -``` - -```xml - - - - - - -``` - ---- - -## Variable Computation Patterns - -### Pattern 1: Extract Then Fallback (The Safe Pattern) - -When values might be None, use extraction + fallback: - -```xml - - - - - - - - - -
- -``` - -**Why it works**: -- Extraction returns None cleanly -- `or` operator handles None values using Python's short-circuit evaluation -- Each step is simple enough for QWeb to parse -- No complex conditionals that might fail - -### Pattern 2: Sequential Computation with Dependencies - -When multiple variables depend on each other: - -```xml - - - - - - -``` - -### Pattern 3: Conditional Blocks with t-set - -For complex branching logic: - -```xml - - - - - - - - -
-``` - ---- - -## Common Pitfalls - -### Pitfall 1: Complex Conditionals in t-set - -**Problem**: Nested `if-else` expressions in t-set fail - -```xml - - - - - - - -``` - -**Why**: QWeb's expression parser gets confused by nested `if-else`. Python's `or` operator is simpler and works reliably. - -### Pitfall 2: Using `or` Directly in Attributes - -**Problem**: The `or` operator might not work in `t-attf-*` contexts - -```xml - -
- - - -
-``` - -**Why**: Attribute parsing is stricter than body content. Always pre-compute to be safe. - -### Pitfall 3: Assuming Nested Attributes Exist - -**Problem**: Not checking intermediate objects before accessing - -```python -# Context: product.uom_id might be None -``` - -```xml - -
- - - -
-``` - -### Pitfall 3: Complex Logic in t-att (non-template attributes) - -**Problem**: Using complex expressions in non-template attributes - -```xml - -
- - - -
-``` - -### Pitfall 4: Forgetting t-attf- Prefix - -**Problem**: Using `data-*` instead of `t-attf-data-*` - -```xml - - - - - - - -``` - ---- - -## Real-World Examples - -### Example 1: E-commerce Product Card - -**Scenario**: Displaying product with optional fields - -```xml - - - - - - - - - - - - - -``` - -### Example 2: Nested Data Attributes - -**Scenario**: Form with deeply nested object access - -```xml - - - - - - - - - -
- ... -
-``` - -### Example 3: Conditional Styling - -**Scenario**: Attribute value depends on conditions - -```xml - - - - - - - -
- ... -
-``` - ---- - -## Summary Table - -| Pattern | ❌ Don't | ✅ Do | -|---------|---------|-------| -| **Fallback values** | `t-attf-x="{{ a or b or c }}"` | `` then `{{ x }}` | -| **Nested objects** | `{{ obj.nested.prop }}` | `` | -| **Type checking** | `` | `` | -| **Complex logic** | `{{ function(a, b) if condition else default }}` | Pre-compute in Python, reference in template | -| **Chained operators** | `{{ a or b if c else d or e }}` | Break into multiple t-set statements | - ---- - -## Tools & Validation - -### XML Validation -```bash -# Validate XML syntax -python3 -m xml.dom.minidom template.xml - -# Or use pre-commit hooks -pre-commit run check-xml -``` - -### QWeb Template Testing -```python -# In Odoo shell -from odoo.tools import misc -arch = env['ir.ui.view'].search([('name', '=', 'template_name')])[0].arch -# Check if template compiles without errors -``` - -### Debugging Template Issues -```xml - - - - - - -``` - ---- - -## References - -- [Odoo QWeb Documentation](https://www.odoo.com/documentation/18.0/developer/reference/frontend/qweb.html) -- [Odoo Templates](https://www.odoo.com/documentation/18.0/developer/reference/backend/orm.html#templates) -- [Python Ternary Expressions](https://docs.python.org/3/tutorial/controlflow.html#more-on-conditions) - ---- - -## Related Issues & Fixes - -- [website_sale_aplicoop Template Error Fix](./FIX_TEMPLATE_ERROR_SUMMARY.md) - Real-world example of this pattern -- [Git Commit 0a0cf5a](../../../.git/logs/HEAD) - Implementation of these patterns - ---- - -**Last Updated**: 2026-02-16 -**Odoo Version**: 18.0+ -**Status**: ✅ Documented and tested diff --git a/docs/README.md b/docs/README.md index 9faa4dc..6fdd6e2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,17 +4,6 @@ Esta carpeta contiene documentación técnica y de referencia del proyecto. ## Contenido -### � Cambios Recientes - -- **[RECENT_CHANGES.md](RECENT_CHANGES.md)** - 🆕 Resumen de todos los cambios recientes (Feb 2026) - -### �🚀 Performance & Features (Nuevas) - -- **[LAZY_LOADING_QUICK_START.md](LAZY_LOADING_QUICK_START.md)** - ⚡ Guía rápida (5 min) si solo necesitas lo esencial -- **[LAZY_LOADING_DOCS_INDEX.md](LAZY_LOADING_DOCS_INDEX.md)** - Índice centralizado de documentación de lazy loading (v18.0.1.3.0) -- **[LAZY_LOADING.md](LAZY_LOADING.md)** - Documentación técnica completa de lazy loading en website_sale_aplicoop -- **[UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md)** - Guía de actualización e instalación de lazy loading - ### Configuración y Desarrollo - **[LINTERS_README.md](LINTERS_README.md)** - Guía de herramientas de calidad de código (black, isort, flake8, pylint) @@ -24,10 +13,6 @@ Esta carpeta contiene documentación técnica y de referencia del proyecto. ### Resolución de Problemas -- **[FINAL_SOLUTION_SUMMARY.md](FINAL_SOLUTION_SUMMARY.md)** - Solución definitiva para errores de templates QWeb en website_sale_aplicoop -- **[FIX_TEMPLATE_ERROR_SUMMARY.md](FIX_TEMPLATE_ERROR_SUMMARY.md)** - Resumen de correcciones de templates -- **[QWEB_BEST_PRACTICES.md](QWEB_BEST_PRACTICES.md)** - Mejores prácticas para templates QWeb (CRÍTICO) -- **[TEMPLATE_FIX_INDEX.md](TEMPLATE_FIX_INDEX.md)** - Índice de documentación de fixes de templates - **[CORRECCION_PRECIOS_IVA.md](CORRECCION_PRECIOS_IVA.md)** - Correcciones relacionadas con precios e IVA - **[TEST_MANUAL.md](TEST_MANUAL.md)** - Guía de tests manuales diff --git a/docs/RECENT_CHANGES.md b/docs/RECENT_CHANGES.md deleted file mode 100644 index 50ad4ee..0000000 --- a/docs/RECENT_CHANGES.md +++ /dev/null @@ -1,278 +0,0 @@ -# Cambios Recientes del Proyecto - -**Última actualización**: 18 de febrero de 2026 - -## Resumen Ejecutivo - -El proyecto ha recibido importantes mejoras en rendimiento, arquitectura y estabilidad durante febrero de 2026: - -1. **Refactoring de `product_main_seller`** - Eliminación de campo alias innecesario -2. **Lazy Loading v18.0.1.3.0** - Mejora de rendimiento de 10-20s → 500-800ms -3. **Template Rendering Fixes v18.0.1.3.1** - Solución definitiva para errores QWeb -4. **Date Calculation Fixes v18.0.1.3.1** - Correcciones críticas en validación de fechas - ---- - -## 📅 Timeline de Cambios - -### 18 de Febrero (Hoy) - -#### `[REF] product_main_seller: Remover campo alias default_supplier_id` - -**Commit**: `ed048c8` - -**Cambio**: Se eliminó el campo `default_supplier_id` que era un alias innecesario - -**Razón**: -- Campo redundante que duplicaba `main_seller_id` -- Los addons custom ya usan `main_seller_id` directamente -- Evitar crear extensiones innecesarias en addons OCA - -**Impacto**: -- ✅ Código más limpio -- ✅ Menos confusión en arquitectura -- ⚠️ Revisar cualquier código personalizado que use `default_supplier_id` - -**Archivos Afectados**: -- `product_main_seller/models/product_template.py` - Se removió campo alias - -**Acción Requerida**: -```bash -# Actualizar addon en instancia Odoo -docker-compose exec odoo odoo -d odoo -u product_main_seller --stop-after-init -``` - -**Para Developers**: -```python -# ❌ ANTES -product.default_supplier_id # Alias innecesario - -# ✅ AHORA (preferido) -product.main_seller_id # Campo original -``` - ---- - -### 16 de Febrero (v18.0.1.3.1) - -#### `[FIX] website_sale_aplicoop: Critical date calculation fixes` - -**Versión**: 18.0.1.3.1 - -**Cambios Principales**: - -1. **Date Calculation Logic**: - - Corregido cálculo de `cutoff_date`: Changed `days_ahead <= 0` to `days_ahead < 0` - - Permite que cutoff_date sea el mismo día que hoy - - Agregado `store=True` en `delivery_date` para persistencia - -2. **Constraints & Validations**: - - Nueva constraint `_check_cutoff_before_pickup` - - Valida que pickup_day >= cutoff_day en órdenes semanales - - Previene configuraciones inválidas - -3. **Cron Job Automático**: - - Nuevo `_cron_update_dates` que recalcula fechas diariamente - - Asegura que las fechas computadas permanezcan actuales - -4. **UI Improvements**: - - Nueva sección "Calculated Dates" en formulario - - Muestra readonly cutoff_date, pickup_date, delivery_date - - Mejor visibilidad de fechas automáticas - -**Testing**: -- 6 nuevos tests de regresión con tag `post_install` y `date_calculations` -- Validación de todas las combinaciones de días (49 combinaciones) -- Asegura que cutoff puede ser hoy sin errores - -**Para Developers**: -```python -# Ahora es seguro establecer cutoff_date al mismo día -if today == cutoff_day: # ✅ Funciona correctamente - # La validación permite esto - pass -``` - ---- - -### 12 de Febrero (v18.0.1.3.0) - -#### `[ADD] website_sale_aplicoop: Lazy Loading Implementation` - -**Versión**: 18.0.1.3.0 - -**Cambio Mayor**: Implementación de lazy loading configurable para productos - -**Resultados de Rendimiento**: -- **Antes**: Carga de página = 10-20 segundos (todos los productos) -- **Después**: - - Página 1: 500-800ms (20 productos) - - Páginas subsecuentes: 200-400ms vía AJAX - - **Mejora**: 95% más rápido - -**Configuración**: -``` -Settings > Website > Shop Performance - [✓] Enable Lazy Loading - [20] Products Per Page -``` - -**Características**: -- Botón "Load More" configurable -- Spinner durante carga -- Event listeners re-attached en nuevos productos -- Botón se oculta automáticamente cuando no hay más productos - -**Archivos Modificados**: -- `website_sale_aplicoop/models/group_order.py` - Método `_get_products_paginated()` -- `website_sale_aplicoop/views/website_templates.xml` - Nuevo template `eskaera_shop_products` -- `website_sale_aplicoop/static/js/` - JavaScript para AJAX y event handling - -**Documentación**: -- [LAZY_LOADING.md](LAZY_LOADING.md) - Documentación técnica completa -- [LAZY_LOADING_QUICK_START.md](LAZY_LOADING_QUICK_START.md) - Guía rápida -- [UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md](UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md) - Pasos de actualización - ---- - -### Febrero 2-16 (v18.0.1.2.0 - v18.0.1.3.0) - -#### `[FIX] website_sale_aplicoop: Move template logic to controller` - -**Commit**: `5721687` - FINAL SOLUTION - -**Problema**: -``` -TypeError: 'NoneType' object is not callable -Template: website_sale_aplicoop.eskaera_shop_products -``` - -**Causa Raíz**: QWeb no puede parsear: -- Conditionals complejos en `t-set` -- Operadores 'or' encadenados en `t-attf-*` -- Cadenas profundas de atributos con lógica - -**Solución**: Mover TODA la lógica al controller - -```python -# Controller prepara datos limpios -def _prepare_product_display_info(self, product, price_info): - price = price_info.get(product.id, {}).get('price') or 0.0 - uom = product.uom_id.category_id.name if product.uom_id and product.uom_id.category_id else '' - return { - 'display_price': float(price), - 'safe_uom_category': uom, - } - -# Template usa acceso simple -# -``` - -**Documentación**: -- [FINAL_SOLUTION_SUMMARY.md](FINAL_SOLUTION_SUMMARY.md) - Análisis completo -- [QWEB_BEST_PRACTICES.md](QWEB_BEST_PRACTICES.md) - Mejores prácticas - -**Para Developers**: -Este es el patrón recomendado para todos los templates complejos: -1. Preparar datos en el controller -2. Pasar dict simple al template -3. Template solo accede atributos, sin lógica - ---- - -## 🎯 Cambios Transversales - -### Mejoras de Código - -| Commit | Descripción | -|--------|-------------| -| 6fbc7b9 | Remover atributos string= redundantes en website_sale_aplicoop | -| 5c89795 | Corregir errores de traducción obligatorios (linting) | -| 40ce973 | Infinite scroll + search filter integration | -| dc44ace | Agregar configuración ESLint | -| b15e9bc | Aumentar threshold de complejidad ciclomática en flake8 | - -### Pruebas - -- Tests de regresión para date calculations (v18.0.1.3.1) -- Tests de lazy loading (v18.0.1.3.0) -- Validación de constraints de fechas - ---- - -## 📚 Documentación Actualizada - -- **`.github/copilot-instructions.md`** - Actualizado con nuevos patrones y fixes -- **`README.md`** - Información sobre v18.0.1.3.1 y lazy loading -- **`product_main_seller/README.md`** - Actualizado sin `default_supplier_id` -- **`docs/README.md`** - Nuevo índice de documentación de fixes -- **`website_sale_aplicoop/README.md`** - Changelog actualizado - ---- - -## ⚠️ Cosas Importantes para Developers - -### 1. Patrón de Templates QWeb -**Cambio Crítico**: Nunca poner lógica en templates, siempre en controller - -```python -# ✅ CORRECTO -def _prepare_data(self): - return {'price': 100.0, 'name': 'Product'} - -# ❌ INCORRECTO (No hagas esto) -# -``` - -### 2. Field Names en product_main_seller -**Cambio**: Use `main_seller_id` en lugar de `default_supplier_id` - -```python -# ✅ CORRECTO -product.main_seller_id - -# ❌ OBSOLETO -product.default_supplier_id # Ya no existe -``` - -### 3. Lazy Loading Configuration -Si trabajas con website_sale_aplicoop, la configuración está en: - -``` -Settings > Website > Shop Performance -``` - -No es necesario modificar código, es configurable. - -### 4. Date Calculations en Eskaera -Ahora puedes usar cutoff_date = hoy sin problemas: - -```python -# ✅ Ahora funciona -order.cutoff_date = today # Antes fallaba -``` - ---- - -## 🔍 Cambios Detectados pero No Documentados - -Verifica si necesitas cambios en: - -1. Código que usa `default_supplier_id` de `product_main_seller` -2. Lógica en templates (especialmente en website_sale_aplicoop) -3. Configuración de lazy loading si tienes instancia personalizada - ---- - -## 📞 Para Más Detalles - -- Refactoring product_main_seller: Ver commit `ed048c8` -- Lazy loading: Ver [docs/LAZY_LOADING.md](LAZY_LOADING.md) -- Template fixes: Ver [docs/FINAL_SOLUTION_SUMMARY.md](FINAL_SOLUTION_SUMMARY.md) -- Date calculations: Ver [website_sale_aplicoop/README.md](../website_sale_aplicoop/README.md) - ---- - -**Última actualización**: 2026-02-18 -**Versión Actual**: 18.0.1.3.1 -**Status**: ✅ Production Ready diff --git a/docs/TAG_FILTER_FIX.md b/docs/TAG_FILTER_FIX.md deleted file mode 100644 index 126a4cd..0000000 --- a/docs/TAG_FILTER_FIX.md +++ /dev/null @@ -1,470 +0,0 @@ -# Arreglo de Búsqueda y Filtrado por Tags - -**Fecha**: 18 de febrero de 2026 -**Versión**: 18.0.1.3.2 -**Addon**: `website_sale_aplicoop` - ---- - -## 📋 Problemas Identificados - -### 1. Contador de Badge Incorrecto - -**Problema**: El número dentro del badge de tags mostraba solo el total de productos de la primera página (20 con lazy loading), no el total de productos con ese tag en todo el dataset. - -**Causa**: El JavaScript recalculaba dinámicamente los contadores en `_filterProducts()` usando `self.allProducts`, que con lazy loading solo contiene los productos de la página actual cargada. - -### 2. Filtrado por Tag (Ya Funcionaba Correctamente) - -**Estado**: El filtrado por tags ya estaba funcionando correctamente. Al hacer clic en un tag: -- Se añade/remueve del `selectedTags` Set -- Se aplica filtro OR: productos con AL MENOS UN tag seleccionado se muestran -- Los productos sin tags seleccionados se ocultan con clase `.hidden-product` - ---- - -## 🔧 Solución Implementada - -### Cambio en `realtime_search.js` - -**Archivo**: `/home/snt/Documentos/lab/odoo/addons-cm/website_sale_aplicoop/static/src/js/realtime_search.js` - -**Antes (líneas 609-656)**: -```javascript -var visibleCount = 0; -var hiddenCount = 0; - -// Track tag counts for dynamic badge updates -var tagCounts = {}; -for (var tagId in self.availableTags) { - tagCounts[tagId] = 0; -} - -self.allProducts.forEach(function (product) { - // ... filtrado ... - - if (shouldShow) { - product.element.classList.remove("hidden-product"); - visibleCount++; - - // Count this product's tags toward the dynamic counters - product.tags.forEach(function (tagId) { - if (tagCounts.hasOwnProperty(tagId)) { - tagCounts[tagId]++; - } - }); - } else { - product.element.classList.add("hidden-product"); - hiddenCount++; - } -}); - -// Update badge counts dynamically -for (var tagId in tagCounts) { - var badge = document.querySelector('[data-tag-id="' + tagId + '"]'); - if (badge) { - var countSpan = badge.querySelector(".tag-count"); - if (countSpan) { - countSpan.textContent = tagCounts[tagId]; - } - } -} -``` - -**Después**: -```javascript -var visibleCount = 0; -var hiddenCount = 0; - -// NOTE: Tag counts are NOT updated dynamically here because with lazy loading, -// self.allProducts only contains products from current page. -// Tag counts must remain as provided by backend (calculated on full dataset). - -self.allProducts.forEach(function (product) { - var nameMatches = !searchQuery || product.name.indexOf(searchQuery) !== -1; - var categoryMatches = - !selectedCategoryId || allowedCategories[product.category]; - - // Tag filtering: if tags are selected, product must have AT LEAST ONE selected tag (OR logic) - var tagMatches = true; - if (self.selectedTags.size > 0) { - tagMatches = product.tags.some(function (productTagId) { - return self.selectedTags.has(productTagId); - }); - } - - var shouldShow = nameMatches && categoryMatches && tagMatches; - - if (shouldShow) { - product.element.classList.remove("hidden-product"); - visibleCount++; - } else { - product.element.classList.add("hidden-product"); - hiddenCount++; - } -}); -``` - -**Cambios**: -1. ✅ **Eliminado** recálculo dinámico de `tagCounts` -2. ✅ **Eliminado** actualización de `.tag-count` en badges -3. ✅ **Añadido** comentario explicativo sobre por qué no recalcular -4. ✅ **Mejorado** log de debug para incluir tags seleccionados - ---- - -## 🏗️ Arquitectura del Sistema de Tags - -### Backend: Cálculo de Contadores (Correcto) - -**Archivo**: `controllers/website_sale.py` (líneas 964-990) - -```python -# ===== Calculate available tags BEFORE pagination (on complete filtered set) ===== -available_tags_dict = {} -for product in filtered_products: # filtered_products = lista completa, no paginada - for tag in product.product_tag_ids: - # Only include tags that are visible on ecommerce - is_visible = getattr(tag, "visible_on_ecommerce", True) - if not is_visible: - continue - - if tag.id not in available_tags_dict: - tag_color = tag.color if tag.color else None - available_tags_dict[tag.id] = { - "id": tag.id, - "name": tag.name, - "color": tag_color, - "count": 0, - } - available_tags_dict[tag.id]["count"] += 1 - -# Convert to sorted list of tags (sorted by name for consistent display) -available_tags = sorted(available_tags_dict.values(), key=lambda t: t["name"]) -``` - -**Características**: -- ✅ Calcula sobre `filtered_products` (lista completa sin paginar) -- ✅ Excluye tags con `visible_on_ecommerce=False` -- ✅ Ordena por nombre -- ✅ Pasa al template vía contexto - -### Frontend: Inicialización (Correcto) - -**Método**: `_initializeAvailableTags()` (líneas 547-564) - -```javascript -_initializeAvailableTags: function () { - var self = this; - var tagBadges = document.querySelectorAll('[data-toggle="tag-filter"]'); - - tagBadges.forEach(function (badge) { - var tagId = parseInt(badge.getAttribute("data-tag-id"), 10); - var tagName = badge.getAttribute("data-tag-name") || ""; - var countSpan = badge.querySelector(".tag-count"); - var count = countSpan ? parseInt(countSpan.textContent, 10) : 0; - - self.availableTags[tagId] = { - id: tagId, - name: tagName, - count: count, // ✅ Leído del DOM (viene del backend) - }; - }); -} -``` - -**Características**: -- ✅ Lee contadores iniciales del DOM (generados por backend) -- ✅ No recalcula nunca -- ✅ Mantiene referencia para saber qué tags existen - -### Frontend: Filtrado (Corregido) - -**Método**: `_filterProducts()` (líneas 566-668) - -**Lógica de filtrado**: -```javascript -// Tag filtering: if tags are selected, product must have AT LEAST ONE selected tag (OR logic) -var tagMatches = true; -if (self.selectedTags.size > 0) { - tagMatches = product.tags.some(function (productTagId) { - return self.selectedTags.has(productTagId); - }); -} -``` - -**Comportamiento**: -- Si `selectedTags` vacío → todos los productos pasan -- Si `selectedTags` tiene 1+ elementos → solo productos con AL MENOS UN tag seleccionado pasan -- Lógica OR entre tags seleccionados - ---- - -## 🔍 Cómo Funciona Ahora - -### Flujo Completo - -1. **Backend** (al cargar `/eskaera/`): - - Obtiene TODOS los productos filtrados (sin paginar) - - Calcula `available_tags` con contadores correctos - - Pagina productos (20 por página con lazy loading) - - Pasa al template: `available_tags`, `products` (paginados) - -2. **Template** (`website_templates.xml`): - - Renderiza badges con `t-esc="tag['count']"` (del backend) - - Renderiza productos con `data-product-tags="1,2,3"` (IDs de tags) - -3. **JavaScript** (al cargar página): - - `_initializeAvailableTags()`: Lee contadores del DOM (una sola vez) - - `_storeAllProducts()`: Guarda productos cargados con sus tags - - Listeners de badges: Toggle selección visual + llamar `_filterProducts()` - -4. **Usuario hace click en tag**: - - Se añade/remueve ID del tag de `selectedTags` Set - - Se actualizan colores de TODOS los badges (primario si seleccionado, secundario si no) - - Se llama `_filterProducts()`: - - Itera sobre `allProducts` (solo página actual) - - Aplica filtro: nombre AND categoría AND tags - - Añade/remueve clase `.hidden-product` - - **Contadores NO se recalculan** (mantienen valor del backend) - -5. **Usuario carga más productos** (lazy loading): - - AJAX GET a `/eskaera//load-page?page=2` - - Backend retorna HTML con 20 productos más - - JavaScript hace `grid.insertAdjacentHTML('beforeend', html)` - - Se re-attach event listeners para qty +/- - - `_storeAllProducts()` NO se vuelve a llamar (❌ limitación actual) - - Tags seleccionados se aplican automáticamente al nuevo DOM - ---- - -## ⚠️ Limitaciones Conocidas - -### ~~1. Filtrado de Productos Cargados Dinámicamente~~ (✅ ARREGLADO) - -**Problema**: Cuando se cargan nuevas páginas con lazy loading, los productos se añaden al DOM pero NO se añaden a `self.allProducts`. Esto significa que el filtrado solo se aplica a productos de la primera página. - -**Solución Implementada** (líneas 420-436 de `infinite_scroll.js`): -```javascript -// Update realtime search to include newly loaded products -if ( - window.realtimeSearch && - typeof window.realtimeSearch._storeAllProducts === "function" -) { - window.realtimeSearch._storeAllProducts(); - console.log("[INFINITE_SCROLL] Products list updated for realtime search"); - - // Apply current filters to newly loaded products - if (typeof window.realtimeSearch._filterProducts === "function") { - window.realtimeSearch._filterProducts(); - console.log("[INFINITE_SCROLL] Filters applied to new products"); - } -} -``` - -**Resultado**: ✅ Los productos cargados dinámicamente ahora: -1. Se añaden a `self.allProducts` automáticamente -2. Los filtros actuales (búsqueda, categoría, tags) se aplican inmediatamente -3. Mantienen consistencia de estado de filtrado - -### ~~Workaround Anterior~~: Ya no necesario, arreglado en código. - -### 2. Búsqueda y Categoría con Lazy Loading - -**Problema Similar**: La búsqueda y filtrado por categoría tienen la misma limitación. Solo filtran productos ya cargados en el DOM. - -**Solución Actual**: Usar `infiniteScroll.resetWithFilters()` para recargar desde servidor cuando cambian filtros de búsqueda/categoría. - ---- - -## 🧪 Testing - -### Casos de Prueba - -#### Test 1: Contadores Correctos al Cargar - -1. Abrir `/eskaera/` -2. Verificar que badges muestran contadores correctos (del backend) -3. **Ejemplo**: Si "Ecológico" tiene 45 productos en total, debe decir "(45)" aunque solo se muestren 20 productos - -**Resultado Esperado**: ✅ Contadores muestran total de productos con ese tag en dataset completo - -#### Test 2: Filtrar por Tag - -1. Abrir `/eskaera/` -2. Hacer click en badge "Ecológico" -3. Verificar que: - - Badge "Ecológico" cambia a color primario - - Otros badges cambian a gris - - Solo productos con tag "Ecológico" visibles - - Productos sin tag ocultos (clase `.hidden-product`) - -**Resultado Esperado**: ✅ Solo productos con tag seleccionado visibles - -#### Test 3: Filtrar por Múltiples Tags (OR) - -1. Hacer click en "Ecológico" -2. Hacer click en "Local" -3. Verificar que: - - Ambos badges primarios - - Productos con "Ecológico" OR "Local" visibles - - Productos sin ninguno de esos tags ocultos - -**Resultado Esperado**: ✅ Lógica OR entre tags seleccionados - -#### Test 4: Deseleccionar Todos - -1. Con tags seleccionados, hacer click en el mismo tag para deseleccionar -2. Verificar que: - - Todos los badges vuelven a color original - - Todos los productos visibles de nuevo - -**Resultado Esperado**: ✅ Estado inicial restaurado - -#### Test 5: Contadores NO Cambian con Filtros - -1. Seleccionar categoría "Verduras" -2. Verificar que contadores de tags NO cambian -3. Hacer búsqueda "tomate" -4. Verificar que contadores de tags NO cambian - -**Resultado Esperado**: ✅ Contadores permanecen estáticos (calculados en backend sobre dataset completo) - ---- - -## 📝 Código Relevante - -### Template: Badges de Tags - -**Archivo**: `views/website_templates.xml` (líneas 499-540) - -```xml -
- - - - - - - - -
-``` - -### Template: Producto con Tags - -**Archivo**: `views/website_templates.xml` (líneas 1075-1080) - -```xml -
-``` - -**Nota**: Los tags se almacenan como string CSV de IDs: `"1,2,3"` → parseado en JS a `[1, 2, 3]` - -### CSS: Ocultar Productos - -**Archivo**: `static/src/css/base/utilities.css` (línea 32) - -```css -.hidden-product { - display: none !important; -} -``` - ---- - -## 🚀 ~~Próximos Pasos (Opcional)~~ → COMPLETADO - -### ~~Mejora 1: Filtrado con Lazy Loading~~ → ✅ IMPLEMENTADO - -**~~Problema~~**: ~~Al cargar más páginas, los nuevos productos no se añaden a `self.allProducts`.~~ - -**Solución Implementada**: -```javascript -// En infiniteScroll.js, después de insertar HTML (líneas 420-436): -// Update realtime search to include newly loaded products -if ( - window.realtimeSearch && - typeof window.realtimeSearch._storeAllProducts === "function" -) { - window.realtimeSearch._storeAllProducts(); - console.log("[INFINITE_SCROLL] Products list updated for realtime search"); - - // Apply current filters to newly loaded products - if (typeof window.realtimeSearch._filterProducts === "function") { - window.realtimeSearch._filterProducts(); - console.log("[INFINITE_SCROLL] Filters applied to new products"); - } -} -``` - -**Estado**: ✅ Implementado y funcional - -### Mejora 2: Filtrado Dinámico en DOM - -**Alternativa**: En lugar de mantener lista `self.allProducts`, buscar en DOM cada vez: - -```javascript -_filterProducts: function () { - var self = this; - var productCards = document.querySelectorAll('.product-card'); - - productCards.forEach(function(card) { - // Parse attributes on the fly - var name = (card.getAttribute('data-product-name') || '').toLowerCase(); - var categoryId = card.getAttribute('data-category-id') || ''; - var tagIds = (card.getAttribute('data-product-tags') || '') - .split(',') - .map(id => parseInt(id.trim(), 10)) - .filter(id => !isNaN(id)); - - // Apply filters... - }); -} -``` - -**Ventajas**: -- ✅ Funciona con productos cargados dinámicamente -- ✅ No necesita re-inicializar después de lazy loading - -**Desventajas**: -- ❌ Menos eficiente (parse en cada filtrado) - ---- - -## 📚 Referencias - -- [Odoo 18 QWeb Templates](https://www.odoo.com/documentation/18.0/developer/reference/frontend/qweb.html) -- [JavaScript Set](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set) -- [Array.prototype.some()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/some) -- [Lazy Loading Documentation](./LAZY_LOADING.md) - ---- - -**Autor**: Criptomart SL -**Versión Addon**: 18.0.1.3.2 -**Fecha**: 18 de febrero de 2026 diff --git a/docs/TEMPLATE_FIX_INDEX.md b/docs/TEMPLATE_FIX_INDEX.md deleted file mode 100644 index 66f32fc..0000000 --- a/docs/TEMPLATE_FIX_INDEX.md +++ /dev/null @@ -1,235 +0,0 @@ -# Template Error Fix - Complete Reference Index - -**Status**: ✅ RESOLVED -**Module**: website_sale_aplicoop v18.0.1.1.1 -**Date**: 2026-02-16 - ---- - -## Quick Links - -### 📋 Problem & Solution -- **Main Reference**: [FIX_TEMPLATE_ERROR_SUMMARY.md](FIX_TEMPLATE_ERROR_SUMMARY.md) - - Root cause analysis - - Solution explanation - - Verification results - -### 📚 Development Standards -- **Best Practices Guide**: [QWEB_BEST_PRACTICES.md](QWEB_BEST_PRACTICES.md) - - QWeb patterns and examples - - Common pitfalls to avoid - - Real-world code samples - -### 🔧 Implementation Details -- **Modified File**: [website_templates.xml](../website_sale_aplicoop/views/website_templates.xml) - - Lines 1217-1224: Safe variable definitions - - Template: `eskaera_shop_products` - -### 📦 Git History -``` -6fed863 [DOC] Add QWeb template best practices and error fix documentation -0a0cf5a [FIX] website_sale_aplicoop: Replace or operators with t-set safe variables -df57233 [FIX] website_sale_aplicoop: Fix NoneType error in eskaera_shop_products template -``` - ---- - -## The Problem (Short Version) - -**Error**: `TypeError: 'NoneType' object is not callable` - -**Cause**: QWeb parsing of `or` operators in `t-attf-*` attributes fails when values are None - -**Example**: -```xml - -
-``` - ---- - -## The Solution (Short Version) - -**Pattern**: Pre-compute safe values with `t-set` before using in attributes - -**Example**: -```xml - - - -``` - ---- - -## Key Changes Summary - -| Aspect | Before | After | -|--------|--------|-------| -| **Pattern** | Inline `or` operators | Pre-computed `t-set` | -| **Error** | TypeError on None values | Safe handling of None | -| **Code lines** | 7 | 15 | -| **QWeb compatible** | ❌ No | ✅ Yes | -| **Testable** | ❌ Hard | ✅ Easy | - ---- - -## Files in This Series - -1. **THIS FILE** (TEMPLATE_FIX_INDEX.md) - - Quick navigation and overview - - Links to detailed documentation - - Summary reference - -2. [FIX_TEMPLATE_ERROR_SUMMARY.md](FIX_TEMPLATE_ERROR_SUMMARY.md) - - Complete analysis of the error - - Step-by-step solution explanation - - Verification and testing results - - Debugging information - -3. [QWEB_BEST_PRACTICES.md](QWEB_BEST_PRACTICES.md) - - QWeb template development guide - - 3 None-safety patterns with examples - - 3 Variable computation patterns - - Common pitfalls and solutions - - Real-world code examples - - Summary reference table - ---- - -## When to Use Each Document - -### 📋 Read FIX_TEMPLATE_ERROR_SUMMARY.md if: -- You want to understand what the problem was -- You need to verify the fix is applied -- You're debugging similar template errors -- You want the full error-to-solution journey - -### 📚 Read QWEB_BEST_PRACTICES.md if: -- You're writing new QWeb templates -- You want to avoid similar issues in future -- You need QWeb patterns and examples -- You're doing code review of templates -- You want to improve template code quality - -### 🔧 Read template file directly if: -- You need to modify the fixed code -- You want to see the exact syntax -- You're learning from working code - ---- - -## One-Page Summary - -### The Error -``` -Traceback (most recent call last): - File "...", line XX, in ... - ValueError: TypeError: 'NoneType' object is not callable - eskaera_shop_products template at line ... -``` - -### The Root Cause -QWeb's `t-attf-*` (template attribute) directives evaluate expressions in a way that doesn't handle chained `or` operators well when values are `None`. - -### The Fix -Replace inline operators with pre-computed safe variables using `t-set`: - -```xml - - - - - - -``` - -### The Result -✅ Template loads without errors -✅ All tests passing -✅ Safe pattern documented -✅ Best practices established - ---- - -## Quick Reference Cards - -### Safe Variable Pattern -```xml - -``` - -### Safe Nested Access -```xml - -``` - -### Safe Chained Fallback -```xml - -``` - ---- - -## Testing the Fix - -### Verification Steps -1. Module loads without parsing errors ✅ -2. Template compiles in ir.ui.view ✅ -3. Safe variables are present ✅ -4. All 85 unit tests pass ✅ -5. Docker services stable ✅ - -### How to Re-verify -```bash -# Check template in database -docker-compose exec -T odoo odoo shell -d odoo -c /etc/odoo/odoo.conf << 'SHELL' -template = env['ir.ui.view'].search([('name', '=', 'Eskaera Shop Products')]) -print('safe_display_price' in template.arch) # Should print True -SHELL -``` - ---- - -## Common Questions - -**Q: Why not just fix the template in code?** -A: We did - that's the fix! But the pattern is important for preventing future issues. - -**Q: Can I use this pattern in other templates?** -A: Yes! This is now the standard pattern for all Odoo templates in this project. - -**Q: What if I need more complex logic?** -A: You can chain multiple `t-set` statements, each computing one safe variable. - -**Q: Does this impact performance?** -A: No - `t-set` is evaluated once during template compilation, not on each render. - ---- - -## Related Resources - -- [Odoo QWeb Documentation](https://www.odoo.com/documentation/18.0/developer/reference/frontend/qweb.html) -- [Odoo Template Reference](https://www.odoo.com/documentation/18.0/developer/reference/backend/orm.html#templates) -- [Python Ternary Expressions](https://docs.python.org/3/tutorial/controlflow.html#more-on-conditions) - ---- - -## Navigation - -``` -docs/ -├── TEMPLATE_FIX_INDEX.md (YOU ARE HERE) -├── FIX_TEMPLATE_ERROR_SUMMARY.md (Complete analysis) -├── QWEB_BEST_PRACTICES.md (Development guide) -├── README.md (Project documentation index) -└── ... (other documentation) -``` - ---- - -**Last Updated**: 2026-02-16 -**Status**: ✅ Production Ready -**Version**: Odoo 18.0.20251208 diff --git a/docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md b/docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md deleted file mode 100644 index f79920f..0000000 --- a/docs/UPGRADE_INSTRUCTIONS_v18.0.1.3.0.md +++ /dev/null @@ -1,187 +0,0 @@ -# Guía de Actualización: Lazy Loading v18.0.1.3.0 - -**Fecha**: 16 de febrero de 2026 -**Versión**: 18.0.1.3.0 -**Cambios Principales**: Lazy loading configurable de productos - -## 📋 Resumen de Cambios - -La tienda de Aplicoop ahora carga productos bajo demanda en lugar de cargar todos a la vez. Esto reduce dramáticamente el tiempo de carga de la página inicial (de 10-20 segundos a 500-800ms). - -## 🔄 Pasos de Actualización - -### 1. Descargar Cambios -```bash -cd /home/snt/Documentos/lab/odoo/addons-cm -git pull origin main # o tu rama correspondiente -``` - -### 2. Actualizar Addon en Odoo -```bash -# En Docker -docker-compose exec odoo odoo -d odoo -u website_sale_aplicoop --stop-after-init - -# O sin Docker -./odoo-bin -d odoo -u website_sale_aplicoop --stop-after-init -``` - -### 3. Activar Lazy Loading (Recomendado) -``` -Settings → Website → Shop Performance - [✓] Enable Lazy Loading - [20] Products Per Page - -Click: "Save" -``` - -## ⚙️ Configuración - -### Opción A: Lazy Loading Habilitado (Recomendado) -``` -Enable Lazy Loading: ✓ (checked) -Products Per Page: 20 -``` -**Resultado**: Página carga rápido, botón "Load More" visible - -### Opción B: Lazy Loading Deshabilitado (Compatibilidad) -``` -Enable Lazy Loading: ☐ (unchecked) -Products Per Page: 20 (ignorado) -``` -**Resultado**: Carga TODOS los productos como antes (no hay cambios visibles) - -### Opción C: Ajuste de Cantidad -``` -Products Per Page: 50 (o el valor que desees) -``` -**Valores recomendados**: 15-30 -**No recomendado**: <5 (muchas páginas) o >100 (lento) - -## ✅ Validación Post-Actualización - -### 1. Verificar Lazy Loading Activo -1. Ir a `/eskaera/` en tienda -2. Verificar que carga rápido (~500ms) -3. Buscar botón "Load More" al final -4. Producto debe tener ~20 items inicialmente - -### 2. Verificar Funcionamiento -1. Click en "Load More" -2. Spinner debe aparecer ("Loading...") -3. Nuevos productos se agregan al grid -4. Botón +/- y agregar al carrito funciona en nuevos productos - -### 3. Verificar Compatibilidad -1. Búsqueda (realtime-search) debe funcionar en página 1 -2. Carrito debe estar sincronizado -3. Checkout debe funcionar normalmente -4. Notificaciones de carrito deben actualizarse - -### 4. Verificar Logs -```bash -# En Docker -docker-compose logs -f odoo | grep -i "lazy_loading\|eskaera_shop" - -# Debería ver: -# [LAZY_LOADING] Attaching load-more-btn listener -# [LAZY_LOADING] Loading page 2 for order 1 -# [LAZY_LOADING] Products inserted into grid -``` - -## 🐛 Troubleshooting - -### Problema: Botón "Load More" no aparece -**Causa**: Lazy loading está deshabilitado o hay <20 productos - -**Solución**: -1. Settings → Website → Shop Performance -2. Verificar "Enable Lazy Loading" está ✓ -3. Asegurarse que hay >20 productos en orden - -### Problema: Botón no funciona (error AJAX) -**Causa**: Ruta `/eskaera//load-page` no funciona - -**Solución**: -1. Verificar que addon está actualizado: `odoo -u website_sale_aplicoop` -2. Revisar logs: `docker logs -f odoo | grep load-page` -3. Verificar que grupo tiene >20 productos - -### Problema: Event listeners no funcionan en nuevos productos -**Causa**: No se re-atacharon los listeners - -**Solución**: -1. Abrir console JS (F12) -2. Ver si hay errores en "Load More" -3. Verificar que `_attachEventListeners()` se ejecuta -4. Clear cache del navegador (Ctrl+Shift+Delete) - -### Problema: Precios incorrectos al cargar más -**Causa**: Cambio en pricelist entre cargas - -**Solución**: Sin validación de precios (no cambian frecuentemente). Si cambiaron: -1. Recargar página (no solo Load More) -2. O deshabilitar lazy loading - -## 📊 Verificación de Performance - -### Método: Usar Developer Tools (F12) - -1. **Abrir Network tab** -2. **Recargar página completa** -3. **Buscar request a `/eskaera/`** -4. **Timing debería ser**: - - Antes de cambios: 10-20s - - Después de cambios: 500-800ms - -5. **Click en "Load More"** -6. **Buscar request a `/eskaera//load-page`** -7. **Timing debería ser**: 200-400ms - -## 🔙 Rollback (Si Necesario) - -Si hay problemas críticos: - -```bash -# Desactivar lazy loading (opción rápida) -Settings → Website → Shop Performance - ☐ Disable Lazy Loading - Click: Save -``` - -O revertir código: -```bash -git revert -odoo -u website_sale_aplicoop --stop-after-init -``` - -## 📝 Notas Importantes - -1. **Sin validación de precios**: No se revalidan precios al cargar nuevas páginas. Asumir que no cambian frecuentemente. - -2. **Búsqueda local**: La búsqueda realtime busca en DOM actual (20 productos). Para buscar en TODOS, refrescar página. - -3. **Sin cambio de URL**: Las páginas no cambian la URL a `?page=2`. Todo es transparente vía AJAX. - -4. **Carrito sincronizado**: El carrito funciona normalmente, se guarda en localStorage y sincroniza entre páginas. - -5. **Traducciones**: Las etiquetas del botón "Load More" se traducen automáticamente desde `i18nManager`. - -## 📚 Documentación Adicional - -- **Guía completa**: `docs/LAZY_LOADING.md` -- **Changelog**: `website_sale_aplicoop/CHANGELOG.md` -- **README**: `website_sale_aplicoop/README.md` - -## 📞 Soporte - -Para problemas: - -1. Revisar `docs/LAZY_LOADING.md` sección "Troubleshooting" -2. Revisar logs: `docker-compose logs odoo | grep -i lazy` -3. Limpiar cache: Ctrl+Shift+Delete en navegador -4. Recargar addon: `odoo -u website_sale_aplicoop` - ---- - -**Actualización completada**: 16 de febrero de 2026 -**Versión instalada**: 18.0.1.3.0 diff --git a/eslint.config.js b/eslint.config.js deleted file mode 100644 index 004e3e6..0000000 --- a/eslint.config.js +++ /dev/null @@ -1,15 +0,0 @@ -module.exports = [ - { - ignores: [ - "node_modules/**", - "**/*.pyc", - "**/__pycache__/**", - "ocb/**", - "setup/**", - ".git/**", - "dist/**", - "build/**", - ], - rules: {}, - }, -]; diff --git a/product_main_seller/README.md b/product_main_seller/README.md index b58dfea..d9da2eb 100644 --- a/product_main_seller/README.md +++ b/product_main_seller/README.md @@ -21,19 +21,29 @@ Adds a "Main Vendor" field to products that automatically tracks the primary sup ### Fields Added -- `main_seller_id` (Many2one → res.partner, computed, stored) +- `default_supplier_id` (Many2one → res.partner, computed, stored) - The main vendor for this product - Computed from `seller_ids` with lowest sequence - Stored for performance - - Searchable and filterable + - Searchable + +- `default_supplier_ref` (Char, related to `default_supplier_id.ref`) + - The supplier's reference code + - Readonly ### Computation Logic The main vendor is determined by: 1. Looking at all supplierinfo records (`seller_ids`) -2. Filtering for valid suppliers (active partners) +2. Filtering for valid suppliers (not companies) 3. Selecting the one with the **lowest sequence** number -4. If no suppliers, returns empty +4. If no sequence, uses the first one + +### Migration Hook + +Includes `pre_init_hook` that: +- Populates `default_supplier_id` on existing products during installation +- Ensures data consistency from the start ## Dependencies @@ -47,8 +57,6 @@ docker-compose exec odoo odoo -d odoo -u product_main_seller --stop-after-init ## Usage -## Usage - ### Viewing Main Vendor 1. Open a product form (Products > Products > [Product]) @@ -68,17 +76,28 @@ To change the main vendor: ```python # Find all products from a specific vendor products = self.env['product.template'].search([ - ('main_seller_id', '=', vendor_id) + ('default_supplier_id', '=', vendor_id) ]) ``` +## OCA Source + +- **Repository**: [purchase-workflow](https://github.com/OCA/purchase-workflow) +- **Original Author**: GRAP +- **Maintainers**: legalsylvain, quentinDupont +- **License**: AGPL-3 + +## Modifications for Kidekoop + +None - Used as-is from OCA. + ## Use Cases in Kidekoop This module is critical for: -- Vendor performance analysis +- `product_price_category_supplier`: Bulk updating products by main vendor - Purchase order management +- Vendor performance analysis - Inventory planning by supplier -- Default supplier selection in purchase workflows ## Views Modified diff --git a/product_price_category_supplier/BEFORE_AND_AFTER.md b/product_price_category_supplier/BEFORE_AND_AFTER.md index cc4a1e5..5f3372c 100644 --- a/product_price_category_supplier/BEFORE_AND_AFTER.md +++ b/product_price_category_supplier/BEFORE_AND_AFTER.md @@ -1,7 +1,7 @@ # BEFORE & AFTER - Error Fixes -**Document**: Visual comparison of all changes made to fix installation errors -**Date**: 10 de febrero de 2026 +**Document**: Visual comparison of all changes made to fix installation errors +**Date**: 10 de febrero de 2026 **Status**: ✅ All fixed and working --- @@ -146,7 +146,7 @@ class ResPartner(models.Model): product_count = self.env['product.template'].search_count([ ('default_supplier_id', '=', self.id) ]) - + # ... rest of method ``` @@ -179,7 +179,7 @@ class ResPartner(models.Model): product_count = self.env['product.template'].search_count([ ('default_supplier_id', '=', self.id) ]) - + # ... rest of method ``` @@ -315,8 +315,8 @@ class WizardUpdateProductCategory(models.TransientModel): | `models/res_partner.py` | `_()` in field def | 2 `_()` calls | Removed | ✅ Fixed | | `models/wizard_update_product_category.py` | `_()` in field defs | 4 `_()` calls | Removed | ✅ Fixed | -**Total Changes**: 8 modifications across 3 files -**Total Errors Fixed**: 2 categories (XPath + Translation) +**Total Changes**: 8 modifications across 3 files +**Total Errors Fixed**: 2 categories (XPath + Translation) **Result**: ✅ **All fixed, addon working** --- @@ -325,11 +325,11 @@ class WizardUpdateProductCategory(models.TransientModel): ### Before (with errors): ``` -2026-02-10 16:17:56,252 47 INFO odoo odoo.modules.registry: module product_price_category_supplier: creating or updating database tables -2026-02-10 16:17:56,344 47 INFO odoo odoo.modules.loading: loading product_price_category_supplier/security/ir.model.access.csv -2026-02-10 16:17:56,351 47 INFO odoo odoo.modules.loading: loading product_price_category_supplier/views/res_partner_views.xml -2026-02-10 16:17:56,362 47 WARNING odoo odoo.modules.loading: Transient module states were reset -2026-02-10 16:17:56,362 47 ERROR odoo odoo.modules.registry: Failed to load registry +2026-02-10 16:17:56,252 47 INFO odoo odoo.modules.registry: module product_price_category_supplier: creating or updating database tables +2026-02-10 16:17:56,344 47 INFO odoo odoo.modules.loading: loading product_price_category_supplier/security/ir.model.access.csv +2026-02-10 16:17:56,351 47 INFO odoo odoo.modules.loading: loading product_price_category_supplier/views/res_partner_views.xml +2026-02-10 16:17:56,362 47 WARNING odoo odoo.modules.loading: Transient module states were reset +2026-02-10 16:17:56,362 47 ERROR odoo odoo.modules.registry: Failed to load registry 2026-02-10 16:17:56,362 47 CRITICAL odoo odoo.service.server: Failed to initialize database `odoo`. ❌ ParseError: while parsing /mnt/extra-addons/product_price_category_supplier/views/res_partner_views.xml:4 ``` @@ -365,6 +365,6 @@ In Odoo 18.0 partner form: --- -**Document Status**: ✅ Complete -**Last Updated**: 10 de febrero de 2026 +**Document Status**: ✅ Complete +**Last Updated**: 10 de febrero de 2026 **License**: AGPL-3.0 diff --git a/product_price_category_supplier/ERROR_FIX_REPORT.md b/product_price_category_supplier/ERROR_FIX_REPORT.md index f53306f..2e9c0de 100644 --- a/product_price_category_supplier/ERROR_FIX_REPORT.md +++ b/product_price_category_supplier/ERROR_FIX_REPORT.md @@ -1,7 +1,7 @@ # ERROR FIX REPORT - product_price_category_supplier -**Date**: 10 de febrero de 2026 -**Status**: ✅ FIXED & VERIFIED +**Date**: 10 de febrero de 2026 +**Status**: ✅ FIXED & VERIFIED **Author**: GitHub Copilot --- @@ -57,7 +57,7 @@ Element '' cannot be located in **Warning Message**: ``` -2026-02-10 16:17:56,165 47 WARNING odoo odoo.tools.translate: no translation language detected, +2026-02-10 16:17:56,165 47 WARNING odoo odoo.tools.translate: no translation language detected, skipping translation ``` @@ -262,9 +262,9 @@ docker-compose exec -T odoo odoo -d odoo -i product_price_category_supplier --st ## Summary of Changes -**Total Files Modified**: 3 -**Total Changes**: 8 -**Status**: ✅ All Fixed & Tested +**Total Files Modified**: 3 +**Total Changes**: 8 +**Status**: ✅ All Fixed & Tested The addon is now **ready for production use** with proper: - ✅ View inheritance (correct XPath paths) @@ -275,5 +275,5 @@ The addon is now **ready for production use** with proper: --- -**Maintained by**: Criptomart | **License**: AGPL-3.0 +**Maintained by**: Criptomart | **License**: AGPL-3.0 **Last Updated**: 10 de febrero de 2026 diff --git a/product_price_category_supplier/INSTALLATION_COMPLETE.md b/product_price_category_supplier/INSTALLATION_COMPLETE.md index ae72534..efb6cc5 100644 --- a/product_price_category_supplier/INSTALLATION_COMPLETE.md +++ b/product_price_category_supplier/INSTALLATION_COMPLETE.md @@ -1,8 +1,8 @@ # INSTALLATION COMPLETE - product_price_category_supplier -**Status**: ✅ **ADDON SUCCESSFULLY INSTALLED** -**Date**: 10 de febrero de 2026 -**Version**: 18.0.1.0.0 +**Status**: ✅ **ADDON SUCCESSFULLY INSTALLED** +**Date**: 10 de febrero de 2026 +**Version**: 18.0.1.0.0 **License**: AGPL-3.0 --- @@ -11,11 +11,11 @@ El addon `product_price_category_supplier` ha sido creado, corregido y **instalado exitosamente** en tu instancia Odoo 18.0. -✅ **21 files created** -✅ **3 files fixed** (XPath errors & translation issues) -✅ **0 remaining errors** -✅ **Database tables created** -✅ **Translations loaded** (Spanish + Euskera) +✅ **21 files created** +✅ **3 files fixed** (XPath errors & translation issues) +✅ **0 remaining errors** +✅ **Database tables created** +✅ **Translations loaded** (Spanish + Euskera) --- @@ -29,7 +29,7 @@ El addon `product_price_category_supplier` ha sido creado, corregido y **instala ### Problem 2: Translation Warnings - **Issue**: Uso de `_()` en definiciones de campos causaba warnings al importar módulo - **Solution**: Removidos `_()` de field definitions (se extraen automáticamente) -- **Files**: +- **Files**: - `models/res_partner.py` (1 cambio) - `models/wizard_update_product_category.py` (4 cambios) @@ -177,22 +177,22 @@ python3 -m py_compile product_price_category_supplier/models/*.py ## Installation Output ``` -2026-02-10 16:21:04,843 69 INFO odoo odoo.modules.loading: +2026-02-10 16:21:04,843 69 INFO odoo odoo.modules.loading: loading product_price_category_supplier/security/ir.model.access.csv -2026-02-10 16:21:04,868 69 INFO odoo odoo.modules.loading: +2026-02-10 16:21:04,868 69 INFO odoo odoo.modules.loading: loading product_price_category_supplier/views/res_partner_views.xml -2026-02-10 16:21:04,875 69 INFO odoo odoo.modules.loading: +2026-02-10 16:21:04,875 69 INFO odoo odoo.modules.loading: loading product_price_category_supplier/views/wizard_update_product_category.xml -2026-02-10 16:21:04,876 69 INFO odoo odoo.addons.base.models.ir_module: +2026-02-10 16:21:04,876 69 INFO odoo odoo.addons.base.models.ir_module: module product_price_category_supplier: loading translation file ...eu.po -2026-02-10 16:21:04,876 69 INFO odoo odoo.addons.base.models.ir_module: +2026-02-10 16:21:04,876 69 INFO odoo odoo.addons.base.models.ir_module: module product_price_category_supplier: loading translation file ...es.po -2026-02-10 16:21:04,912 69 INFO odoo odoo.modules.loading: +2026-02-10 16:21:04,912 69 INFO odoo odoo.modules.loading: Module product_price_category_supplier loaded in 0.68s, 179 queries ✅ No errors @@ -294,7 +294,7 @@ If you need to: --- -**Status**: ✅ Production Ready -**Created**: 10 de febrero de 2026 -**License**: AGPL-3.0 +**Status**: ✅ Production Ready +**Created**: 10 de febrero de 2026 +**License**: AGPL-3.0 **Author**: Criptomart diff --git a/product_price_category_supplier/INSTALLATION_STATUS.md b/product_price_category_supplier/INSTALLATION_STATUS.md index c53f792..731436c 100644 --- a/product_price_category_supplier/INSTALLATION_STATUS.md +++ b/product_price_category_supplier/INSTALLATION_STATUS.md @@ -1,8 +1,8 @@ # ✅ ADDON INSTALLATION STATUS REPORT -**Addon**: `product_price_category_supplier` -**Status**: ✅ **INSTALLED & WORKING** -**Date**: 10 de febrero de 2026 +**Addon**: `product_price_category_supplier` +**Status**: ✅ **INSTALLED & WORKING** +**Date**: 10 de febrero de 2026 **Installation Time**: 2 cycles (fixed errors on 2nd attempt) --- @@ -11,7 +11,7 @@ El addon `product_price_category_supplier` fue creado exitosamente para extender Odoo 18.0 con funcionalidad de categorías de precio por proveedor. -**Ciclo 1**: Error ParseError en XPath (vista XML) +**Ciclo 1**: Error ParseError en XPath (vista XML) **Ciclo 2**: ✅ Errores corregidos, addon instalado correctamente --- @@ -90,7 +90,7 @@ Error: Element '' cannot be loca - + ``` -**File**: `views/res_partner_views.xml` line 11 +**File**: `views/res_partner_views.xml` line 11 **Reason**: Odoo 18 partner form uses `sales_purchases` page name ### Fix 2: Field Name in Tree View @@ -98,7 +98,7 @@ Error: Element '' cannot be loca - + ``` -**File**: `views/res_partner_views.xml` line 27 +**File**: `views/res_partner_views.xml` line 27 **Reason**: Tree view uses `complete_name` as first field ### Fix 3: Remove _() from Partner Field @@ -108,7 +108,7 @@ Error: Element '' cannot be loca + string='Default Price Category', + help='Default price category for products from this supplier', ``` -**File**: `models/res_partner.py` lines 13-15 +**File**: `models/res_partner.py` lines 13-15 **Reason**: Automatic extraction, `_()` causes translation warnings ### Fix 4: Remove _() from Wizard Fields @@ -122,7 +122,7 @@ Error: Element '' cannot be loca + string='Price Category', + string='Number of Products', ``` -**File**: `models/wizard_update_product_category.py` lines 15, 21, 27, 34 +**File**: `models/wizard_update_product_category.py` lines 15, 21, 27, 34 **Reason**: Same as Fix 3 - automatic extraction by Odoo --- @@ -307,7 +307,7 @@ The addon is **production-ready** and fully functional. --- -**Created**: 10 de febrero de 2026 -**Status**: ✅ Installation Complete -**License**: AGPL-3.0 +**Created**: 10 de febrero de 2026 +**Status**: ✅ Installation Complete +**License**: AGPL-3.0 **Maintainer**: Criptomart diff --git a/product_price_category_supplier/QUICK_FIX_REFERENCE.md b/product_price_category_supplier/QUICK_FIX_REFERENCE.md index 9670cb6..5971b2f 100644 --- a/product_price_category_supplier/QUICK_FIX_REFERENCE.md +++ b/product_price_category_supplier/QUICK_FIX_REFERENCE.md @@ -1,7 +1,7 @@ # QUICK REFERENCE - Fixes Applied -**Date**: 10 de febrero de 2026 -**Addon**: product_price_category_supplier +**Date**: 10 de febrero de 2026 +**Addon**: product_price_category_supplier **Status**: ✅ All fixed --- diff --git a/product_price_category_supplier/README.rst b/product_price_category_supplier/README.rst deleted file mode 100644 index 247f66b..0000000 --- a/product_price_category_supplier/README.rst +++ /dev/null @@ -1,189 +0,0 @@ -====================================== -Product Price Category - Supplier -====================================== - -Extiende ``res.partner`` (proveedores) con un campo de categoría de precio por -defecto y permite actualizar masivamente todos los productos de un proveedor con -esta categoría mediante un wizard. - -Funcionalidades -=============== - -- **Campo en Proveedores**: Añade campo ``default_price_category_id`` en la - pestaña "Compras" (Purchases) de res.partner -- **Actualización Masiva**: Botón que abre wizard modal para confirmar - actualización de todos los productos del proveedor -- **Columna Configurable**: Campo oculto en vista tree de partner, - visible/configurable desde menú de columnas -- **Control de Permisos**: Acceso restringido a - ``sales_team.group_sale_manager`` (Gestores de Ventas) - -Dependencias -============ - -- ``product_price_category`` (OCA addon base) -- ``product_pricelists_margins_custom`` (Addon del proyecto) -- ``sales_team`` (Odoo core) - -Instalación -=========== - -.. code-block:: bash - - docker-compose exec -T odoo odoo -d odoo -u product_price_category_supplier --stop-after-init - -Flujo de Uso -============ - -1. Abrir formulario de un **Proveedor** (res.partner) -2. Ir a pestaña **"Compras"** (Purchases) -3. En sección **"Price Category Settings"**, seleccionar **categoría de precio - por defecto** -4. Hacer clic en botón **"Apply to All Products"** -5. Se abre modal de confirmación mostrando: - - - Nombre del proveedor - - Categoría de precio a aplicar - - Cantidad de productos que serán actualizados - -6. Hacer clic **"Confirm"** para ejecutar actualización en bulk -7. Notificación de éxito mostrando cantidad de productos actualizados - -Campos -====== - -res.partner ------------ - -- ``default_price_category_id`` (Many2one → product.price.category) - - - Ubicación: Pestaña "Compras", sección "Price Category Settings" - - Obligatorio: No - - Ayuda: "Default price category for products from this supplier" - - Visible en tree: Oculto por defecto (column_invisible=1), configurable vía menú - -Modelos -======= - -wizard.update.product.category (Transient) -------------------------------------------- - -- ``partner_id`` (Many2one → res.partner) - Readonly -- ``partner_name`` (Char, related to partner_id.name) - Readonly -- ``price_category_id`` (Many2one → product.price.category) - Readonly -- ``product_count`` (Integer) - Cantidad de productos a actualizar - Readonly - -**Métodos**: - -- ``action_confirm()`` - Realiza bulk update de productos y retorna notificación - -Vistas -====== - -res.partner ------------ - -- **Form**: Campo + botón en pestaña "Compras" -- **Tree**: Campo oculto (column_invisible=1) - -wizard.update.product.category ------------------------------- - -- **Form**: Formulario modal con información de confirmación y botones - -Seguridad -========= - -Acceso al wizard restringido a grupo ``sales_team.group_sale_manager``: - -- Lectura: Sí -- Escritura: Sí -- Creación: Sí -- Borrado: Sí - -Comportamiento -============== - -Actualización de Productos --------------------------- - -Cuando el usuario confirma la acción: - -1. Se buscan todos los productos (``product.template``) donde: - - - ``default_supplier_id = partner_id`` (este proveedor es su proveedor por - defecto) - -2. Se actualizan en bulk (single SQL UPDATE) con: - - - ``price_category_id = default_price_category_id`` - -3. Se retorna notificación de éxito: - - - "X products updated with category 'CATEGORY_NAME'." - -**Nota**: La actualización SOBRESCRIBE cualquier ``price_category_id`` -existente en los productos. - -Extensión Futura -================ - -Para implementar defaults automáticos al crear productos desde un proveedor: - -.. code-block:: python - - # En models/product_template.py - @api.model_create_multi - def create(self, vals_list): - # Si se proporciona default_supplier_id sin price_category_id, - # usar default_price_category_id del proveedor - for vals in vals_list: - if vals.get('default_supplier_id') and not vals.get('price_category_id'): - supplier = self.env['res.partner'].browse(vals['default_supplier_id']) - if supplier.default_price_category_id: - vals['price_category_id'] = supplier.default_price_category_id.id - return super().create(vals_list) - -Traducciones -============ - -Para añadir/actualizar traducciones: - -.. code-block:: bash - - # Exportar strings - docker-compose exec -T odoo odoo -d odoo \ - --addons-path=/mnt/extra-addons/product_price_category_supplier \ - -i product_price_category_supplier \ - --i18n-export=/tmp/product_price_category_supplier.pot \ - --stop-after-init - - # Mergar en archivos .po existentes - cd product_price_category_supplier/i18n - for lang in es eu; do - msgmerge -U ${lang}.po product_price_category_supplier.pot - done - -Testing -======= - -Ejecutar tests: - -.. code-block:: bash - - docker-compose exec -T odoo odoo -d odoo \ - -i product_price_category_supplier \ - --test-enable --stop-after-init - -Créditos -======== - -Autor ------ - -Criptomart - 2026 - -Licencia --------- - -AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) diff --git a/product_price_category_supplier/TEST_REPORT.md b/product_price_category_supplier/TEST_REPORT.md index a6eafa2..29e2bda 100644 --- a/product_price_category_supplier/TEST_REPORT.md +++ b/product_price_category_supplier/TEST_REPORT.md @@ -1,17 +1,17 @@ # TEST REPORT - product_price_category_supplier -**Date**: 10 de febrero de 2026 -**Status**: ✅ ALL TESTS PASSING -**Test Framework**: Odoo TransactionCase +**Date**: 10 de febrero de 2026 +**Status**: ✅ ALL TESTS PASSING +**Test Framework**: Odoo TransactionCase **Test Count**: 10 comprehensive tests --- ## Executive Summary -✅ **10/10 tests passing** (0 failures, 0 errors) -⏱️ **Execution time**: 0.35 seconds -📊 **Database queries**: 379 queries +✅ **10/10 tests passing** (0 failures, 0 errors) +⏱️ **Execution time**: 0.35 seconds +📊 **Database queries**: 379 queries 🎯 **Coverage**: All critical features tested --- @@ -33,8 +33,8 @@ ## Test Cases ### ✅ Test 01: Supplier Has Default Price Category Field -**Purpose**: Verify field existence and assignment -**Status**: PASSED +**Purpose**: Verify field existence and assignment +**Status**: PASSED **Verifies**: - `default_price_category_id` field exists on res.partner - Supplier can have category assigned @@ -43,8 +43,8 @@ --- ### ✅ Test 02: Action Opens Wizard -**Purpose**: Test wizard opening action -**Status**: PASSED +**Purpose**: Test wizard opening action +**Status**: PASSED **Verifies**: - Action type is `ir.actions.act_window` - Opens `wizard.update.product.category` model @@ -54,8 +54,8 @@ --- ### ✅ Test 03: Wizard Counts Products Correctly -**Purpose**: Verify product counting logic -**Status**: PASSED +**Purpose**: Verify product counting logic +**Status**: PASSED **Verifies**: - Wizard shows correct product count (3 for Supplier A) - Partner name displays correctly @@ -64,8 +64,8 @@ --- ### ✅ Test 04: Wizard Updates All Products -**Purpose**: Test bulk update functionality -**Status**: PASSED +**Purpose**: Test bulk update functionality +**Status**: PASSED **Verifies**: - All products from supplier get updated - Products from other suppliers remain unchanged @@ -83,8 +83,8 @@ Result: Products 1,2,3 now have Premium category --- ### ✅ Test 05: Wizard Handles No Products -**Purpose**: Test edge case - supplier with no products -**Status**: PASSED +**Purpose**: Test edge case - supplier with no products +**Status**: PASSED **Verifies**: - Warning notification displayed - No database errors @@ -93,8 +93,8 @@ Result: Products 1,2,3 now have Premium category --- ### ✅ Test 06: Customer Field Visibility -**Purpose**: Verify customers don't see price category -**Status**: PASSED +**Purpose**: Verify customers don't see price category +**Status**: PASSED **Verifies**: - Customer has `supplier_rank = 0` - No price category assigned to customer @@ -103,8 +103,8 @@ Result: Products 1,2,3 now have Premium category --- ### ✅ Test 07: Wizard Overwrites Existing Categories -**Purpose**: Test update behavior on pre-existing categories -**Status**: PASSED +**Purpose**: Test update behavior on pre-existing categories +**Status**: PASSED **Verifies**: - Existing categories get overwritten - No data loss or corruption @@ -120,8 +120,8 @@ Result: All products now Premium (overwritten) --- ### ✅ Test 08: Multiple Suppliers Independent Updates -**Purpose**: Test isolation between suppliers -**Status**: PASSED +**Purpose**: Test isolation between suppliers +**Status**: PASSED **Verifies**: - Updating Supplier A doesn't affect Supplier B products - Each supplier maintains independent category @@ -137,8 +137,8 @@ Both remain independent after updates --- ### ✅ Test 09: Wizard Readonly Fields -**Purpose**: Verify display field computations -**Status**: PASSED +**Purpose**: Verify display field computations +**Status**: PASSED **Verifies**: - `partner_name` computed from `partner_id.name` - Related fields work correctly @@ -147,8 +147,8 @@ Both remain independent after updates --- ### ✅ Test 10: Action Counts Products Correctly -**Purpose**: Verify product count accuracy -**Status**: PASSED +**Purpose**: Verify product count accuracy +**Status**: PASSED **Verifies**: - Manual count matches wizard count - Search logic is correct @@ -159,10 +159,10 @@ Both remain independent after updates ## Test Execution Results ``` -2026-02-10 16:40:38,977 1 INFO odoo odoo.tests.stats: +2026-02-10 16:40:38,977 1 INFO odoo odoo.tests.stats: product_price_category_supplier: 12 tests 0.35s 379 queries -2026-02-10 16:40:38,977 1 INFO odoo odoo.tests.result: +2026-02-10 16:40:38,977 1 INFO odoo odoo.tests.result: 0 failed, 0 error(s) of 10 tests when loading database 'odoo' ✅ Result: ALL TESTS PASSED @@ -267,11 +267,11 @@ All tests use `TransactionCase` which ensures: ## Code Quality Indicators -✅ **No test flakiness** - All tests pass consistently -✅ **Fast execution** - 0.35s for full suite -✅ **Good coverage** - All major features tested -✅ **Edge cases handled** - Empty suppliers, overwrites, isolation -✅ **Clear assertions** - Descriptive error messages +✅ **No test flakiness** - All tests pass consistently +✅ **Fast execution** - 0.35s for full suite +✅ **Good coverage** - All major features tested +✅ **Edge cases handled** - Empty suppliers, overwrites, isolation +✅ **Clear assertions** - Descriptive error messages --- @@ -307,6 +307,6 @@ All 10 tests passing with 0 failures and 0 errors confirms the addon is stable a --- -**Maintained by**: Criptomart -**License**: AGPL-3.0 +**Maintained by**: Criptomart +**License**: AGPL-3.0 **Last Updated**: 10 de febrero de 2026 diff --git a/product_price_category_supplier/VALIDATION.md b/product_price_category_supplier/VALIDATION.md index cdac99a..d3c5fd4 100644 --- a/product_price_category_supplier/VALIDATION.md +++ b/product_price_category_supplier/VALIDATION.md @@ -304,6 +304,6 @@ docker-compose exec -T odoo odoo -d odoo \ --- -**Status**: ✅ **IMPLEMENTACIÓN COMPLETA** -**Fecha**: 10 de febrero de 2026 +**Status**: ✅ **IMPLEMENTACIÓN COMPLETA** +**Fecha**: 10 de febrero de 2026 **Licencia**: AGPL-3.0 diff --git a/product_price_category_supplier/models/res_partner.py b/product_price_category_supplier/models/res_partner.py index 0eec36f..e1e9e08 100644 --- a/product_price_category_supplier/models/res_partner.py +++ b/product_price_category_supplier/models/res_partner.py @@ -1,21 +1,18 @@ # Copyright 2026 Your Company # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import _ -from odoo import api -from odoo import fields -from odoo import models +from odoo import _, api, fields, models class ResPartner(models.Model): """Extend res.partner with default price category for suppliers.""" - _inherit = "res.partner" + _inherit = 'res.partner' default_price_category_id = fields.Many2one( - comodel_name="product.price.category", - string="Default Price Category", - help="Default price category for products from this supplier", + comodel_name='product.price.category', + string='Default Price Category', + help='Default price category for products from this supplier', domain=[], ) @@ -24,26 +21,24 @@ class ResPartner(models.Model): self.ensure_one() # Count products where this partner is the default supplier - product_count = self.env["product.template"].search_count( - [("main_seller_id", "=", self.id)] - ) + product_count = self.env['product.template'].search_count([ + ('main_seller_id', '=', self.id) + ]) # Create wizard record with context data - wizard = self.env["wizard.update.product.category"].create( - { - "partner_id": self.id, - "partner_name": self.name, - "price_category_id": self.default_price_category_id.id, - "product_count": product_count, - } - ) + wizard = self.env['wizard.update.product.category'].create({ + 'partner_id': self.id, + 'partner_name': self.name, + 'price_category_id': self.default_price_category_id.id, + 'product_count': product_count, + }) # Return action to open wizard modal return { - "type": "ir.actions.act_window", - "name": _("Update Product Price Category"), - "res_model": "wizard.update.product.category", - "res_id": wizard.id, - "view_mode": "form", - "target": "new", + 'type': 'ir.actions.act_window', + 'name': _('Update Product Price Category'), + 'res_model': 'wizard.update.product.category', + 'res_id': wizard.id, + 'view_mode': 'form', + 'target': 'new', } diff --git a/product_price_category_supplier/models/wizard_update_product_category.py b/product_price_category_supplier/models/wizard_update_product_category.py index d7ca3f0..d49c421 100644 --- a/product_price_category_supplier/models/wizard_update_product_category.py +++ b/product_price_category_supplier/models/wizard_update_product_category.py @@ -1,40 +1,37 @@ # Copyright 2026 Your Company # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import _ -from odoo import api -from odoo import fields -from odoo import models +from odoo import _, api, fields, models class WizardUpdateProductCategory(models.TransientModel): """Wizard to confirm and bulk update product price categories.""" - _name = "wizard.update.product.category" - _description = "Update Product Price Category" + _name = 'wizard.update.product.category' + _description = 'Update Product Price Category' partner_id = fields.Many2one( - comodel_name="res.partner", - string="Supplier", + comodel_name='res.partner', + string='Supplier', readonly=True, required=True, ) partner_name = fields.Char( - string="Supplier Name", + string='Supplier Name', readonly=True, - related="partner_id.name", + related='partner_id.name', ) price_category_id = fields.Many2one( - comodel_name="product.price.category", - string="Price Category", + comodel_name='product.price.category', + string='Price Category', readonly=True, required=True, ) product_count = fields.Integer( - string="Number of Products", + string='Number of Products', readonly=True, required=True, ) @@ -44,33 +41,36 @@ class WizardUpdateProductCategory(models.TransientModel): self.ensure_one() # Search all products where this partner is the default supplier - products = self.env["product.template"].search( - [("main_seller_id", "=", self.partner_id.id)] - ) + products = self.env['product.template'].search([ + ('main_seller_id', '=', self.partner_id.id) + ]) if not products: return { - "type": "ir.actions.client", - "tag": "display_notification", - "params": { - "title": _("No Products"), - "message": _("No products found with this supplier."), - "type": "warning", - "sticky": False, - }, + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'params': { + 'title': _('No Products'), + 'message': _('No products found with this supplier.'), + 'type': 'warning', + 'sticky': False, + } } # Bulk update all products - products.write({"price_category_id": self.price_category_id.id}) + products.write({ + 'price_category_id': self.price_category_id.id + }) return { - "type": "ir.actions.client", - "tag": "display_notification", - "params": { - "title": _("Success"), - "message": _('%d products updated with category "%s".') - % (len(products), self.price_category_id.display_name), - "type": "success", - "sticky": False, - }, + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'params': { + 'title': _('Success'), + 'message': _( + '%d products updated with category "%s".' + ) % (len(products), self.price_category_id.display_name), + 'type': 'success', + 'sticky': False, + } } diff --git a/product_price_category_supplier/tests/test_product_price_category_supplier.py b/product_price_category_supplier/tests/test_product_price_category_supplier.py index 5d6d660..c65df85 100644 --- a/product_price_category_supplier/tests/test_product_price_category_supplier.py +++ b/product_price_category_supplier/tests/test_product_price_category_supplier.py @@ -2,6 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.tests.common import TransactionCase +from odoo.exceptions import UserError class TestProductPriceCategorySupplier(TransactionCase): @@ -13,127 +14,68 @@ class TestProductPriceCategorySupplier(TransactionCase): super().setUpClass() # Create price categories - cls.category_premium = cls.env["product.price.category"].create( - { - "name": "Premium", - } - ) - cls.category_standard = cls.env["product.price.category"].create( - { - "name": "Standard", - } - ) + cls.category_premium = cls.env['product.price.category'].create({ + 'name': 'Premium', + }) + cls.category_standard = cls.env['product.price.category'].create({ + 'name': 'Standard', + }) # Create suppliers - cls.supplier_a = cls.env["res.partner"].create( - { - "name": "Supplier A", - "supplier_rank": 1, - "default_price_category_id": cls.category_premium.id, - } - ) - cls.supplier_b = cls.env["res.partner"].create( - { - "name": "Supplier B", - "supplier_rank": 1, - "default_price_category_id": cls.category_standard.id, - } - ) + cls.supplier_a = cls.env['res.partner'].create({ + 'name': 'Supplier A', + 'supplier_rank': 1, + 'default_price_category_id': cls.category_premium.id, + }) + cls.supplier_b = cls.env['res.partner'].create({ + 'name': 'Supplier B', + 'supplier_rank': 1, + 'default_price_category_id': cls.category_standard.id, + }) # Create a non-supplier partner - cls.customer = cls.env["res.partner"].create( - { - "name": "Customer A", - "customer_rank": 1, - "supplier_rank": 0, - } - ) + cls.customer = cls.env['res.partner'].create({ + 'name': 'Customer A', + 'customer_rank': 1, + 'supplier_rank': 0, + }) - # Create products with supplier A as default (with seller_ids) - cls.product_1 = cls.env["product.template"].create( - { - "name": "Product 1", - "seller_ids": [ - ( - 0, - 0, - { - "partner_id": cls.supplier_a.id, - "sequence": 10, - "min_qty": 0, - }, - ) - ], - } - ) - cls.product_2 = cls.env["product.template"].create( - { - "name": "Product 2", - "seller_ids": [ - ( - 0, - 0, - { - "partner_id": cls.supplier_a.id, - "sequence": 10, - "min_qty": 0, - }, - ) - ], - } - ) - cls.product_3 = cls.env["product.template"].create( - { - "name": "Product 3", - "seller_ids": [ - ( - 0, - 0, - { - "partner_id": cls.supplier_a.id, - "sequence": 10, - "min_qty": 0, - }, - ) - ], - } - ) + # Create products with supplier A as default + cls.product_1 = cls.env['product.template'].create({ + 'name': 'Product 1', + 'default_supplier_id': cls.supplier_a.id, + }) + cls.product_2 = cls.env['product.template'].create({ + 'name': 'Product 2', + 'default_supplier_id': cls.supplier_a.id, + }) + cls.product_3 = cls.env['product.template'].create({ + 'name': 'Product 3', + 'default_supplier_id': cls.supplier_a.id, + }) # Create product with supplier B - cls.product_4 = cls.env["product.template"].create( - { - "name": "Product 4", - "seller_ids": [ - ( - 0, - 0, - { - "partner_id": cls.supplier_b.id, - "sequence": 10, - "min_qty": 0, - }, - ) - ], - } - ) + cls.product_4 = cls.env['product.template'].create({ + 'name': 'Product 4', + 'default_supplier_id': cls.supplier_b.id, + }) # Create product without supplier - cls.product_5 = cls.env["product.template"].create( - { - "name": "Product 5", - } - ) + cls.product_5 = cls.env['product.template'].create({ + 'name': 'Product 5', + 'default_supplier_id': False, + }) def test_01_supplier_has_default_price_category_field(self): """Test that supplier has default_price_category_id field.""" self.assertTrue( - hasattr(self.supplier_a, "default_price_category_id"), - "Supplier should have default_price_category_id field", + hasattr(self.supplier_a, 'default_price_category_id'), + 'Supplier should have default_price_category_id field' ) self.assertEqual( self.supplier_a.default_price_category_id.id, self.category_premium.id, - "Supplier should have Premium category assigned", + 'Supplier should have Premium category assigned' ) def test_02_action_update_products_opens_wizard(self): @@ -141,38 +83,41 @@ class TestProductPriceCategorySupplier(TransactionCase): action = self.supplier_a.action_update_products_price_category() self.assertEqual( - action["type"], "ir.actions.act_window", "Action should be a window action" + action['type'], 'ir.actions.act_window', + 'Action should be a window action' ) self.assertEqual( - action["res_model"], - "wizard.update.product.category", - "Action should open wizard model", + action['res_model'], 'wizard.update.product.category', + 'Action should open wizard model' ) self.assertEqual( - action["target"], "new", "Action should open in modal (target=new)" + action['target'], 'new', + 'Action should open in modal (target=new)' ) - self.assertIn("res_id", action, "Action should have res_id") + self.assertIn('res_id', action, 'Action should have res_id') self.assertTrue( - action["res_id"] > 0, "res_id should be a valid wizard record ID" + action['res_id'] > 0, + 'res_id should be a valid wizard record ID' ) def test_03_wizard_counts_products_correctly(self): """Test that wizard counts products from supplier correctly.""" action = self.supplier_a.action_update_products_price_category() - + # Get the wizard record that was created - wizard = self.env["wizard.update.product.category"].browse(action["res_id"]) + wizard = self.env['wizard.update.product.category'].browse(action['res_id']) self.assertEqual( - wizard.product_count, 3, "Wizard should count 3 products from Supplier A" + wizard.product_count, 3, + 'Wizard should count 3 products from Supplier A' ) self.assertEqual( - wizard.partner_name, "Supplier A", "Wizard should display supplier name" + wizard.partner_name, 'Supplier A', + 'Wizard should display supplier name' ) self.assertEqual( - wizard.price_category_id.id, - self.category_premium.id, - "Wizard should have Premium category from supplier", + wizard.price_category_id.id, self.category_premium.id, + 'Wizard should have Premium category from supplier' ) def test_04_wizard_updates_all_products_from_supplier(self): @@ -180,82 +125,75 @@ class TestProductPriceCategorySupplier(TransactionCase): # Verify initial state - no categories assigned self.assertFalse( self.product_1.price_category_id, - "Product 1 should not have category initially", + 'Product 1 should not have category initially' ) self.assertFalse( self.product_2.price_category_id, - "Product 2 should not have category initially", + 'Product 2 should not have category initially' ) # Create and execute wizard - wizard = self.env["wizard.update.product.category"].create( - { - "partner_id": self.supplier_a.id, - "price_category_id": self.category_premium.id, - "product_count": 3, - } - ) + wizard = self.env['wizard.update.product.category'].create({ + 'partner_id': self.supplier_a.id, + 'price_category_id': self.category_premium.id, + 'product_count': 3, + }) result = wizard.action_confirm() # Verify products were updated self.assertEqual( - self.product_1.price_category_id.id, - self.category_premium.id, - "Product 1 should have Premium category", + self.product_1.price_category_id.id, self.category_premium.id, + 'Product 1 should have Premium category' ) self.assertEqual( - self.product_2.price_category_id.id, - self.category_premium.id, - "Product 2 should have Premium category", + self.product_2.price_category_id.id, self.category_premium.id, + 'Product 2 should have Premium category' ) self.assertEqual( - self.product_3.price_category_id.id, - self.category_premium.id, - "Product 3 should have Premium category", + self.product_3.price_category_id.id, self.category_premium.id, + 'Product 3 should have Premium category' ) # Verify product from other supplier was NOT updated self.assertFalse( self.product_4.price_category_id, - "Product 4 (from Supplier B) should not be updated", + 'Product 4 (from Supplier B) should not be updated' ) # Verify success notification self.assertEqual( - result["type"], "ir.actions.client", "Result should be a client action" + result['type'], 'ir.actions.client', + 'Result should be a client action' ) self.assertEqual( - result["tag"], - "display_notification", - "Result should display a notification", + result['tag'], 'display_notification', + 'Result should display a notification' ) def test_05_wizard_handles_supplier_with_no_products(self): """Test wizard behavior when supplier has no products.""" # Create supplier without products - supplier_no_products = self.env["res.partner"].create( - { - "name": "Supplier No Products", - "supplier_rank": 1, - "default_price_category_id": self.category_standard.id, - } - ) + supplier_no_products = self.env['res.partner'].create({ + 'name': 'Supplier No Products', + 'supplier_rank': 1, + 'default_price_category_id': self.category_standard.id, + }) - wizard = self.env["wizard.update.product.category"].create( - { - "partner_id": supplier_no_products.id, - "price_category_id": self.category_standard.id, - "product_count": 0, - } - ) + wizard = self.env['wizard.update.product.category'].create({ + 'partner_id': supplier_no_products.id, + 'price_category_id': self.category_standard.id, + 'product_count': 0, + }) result = wizard.action_confirm() # Verify warning notification self.assertEqual( - result["type"], "ir.actions.client", "Result should be a client action" + result['type'], 'ir.actions.client', + 'Result should be a client action' ) self.assertEqual( - result["params"]["type"], "warning", "Should display warning notification" + result['params']['type'], 'warning', + 'Should display warning notification' ) def test_06_customer_does_not_show_price_category_field(self): @@ -263,10 +201,11 @@ class TestProductPriceCategorySupplier(TransactionCase): # This is a view-level test - we verify the field exists but logic is correct self.assertFalse( self.customer.default_price_category_id, - "Customer should not have price category set", + 'Customer should not have price category set' ) self.assertEqual( - self.customer.supplier_rank, 0, "Customer should have supplier_rank = 0" + self.customer.supplier_rank, 0, + 'Customer should have supplier_rank = 0' ) def test_07_wizard_overwrites_existing_categories(self): @@ -276,99 +215,87 @@ class TestProductPriceCategorySupplier(TransactionCase): self.product_2.price_category_id = self.category_standard.id self.assertEqual( - self.product_1.price_category_id.id, - self.category_standard.id, - "Product 1 should have Standard category initially", + self.product_1.price_category_id.id, self.category_standard.id, + 'Product 1 should have Standard category initially' ) # Execute wizard to change to Premium - wizard = self.env["wizard.update.product.category"].create( - { - "partner_id": self.supplier_a.id, - "price_category_id": self.category_premium.id, - "product_count": 3, - } - ) + wizard = self.env['wizard.update.product.category'].create({ + 'partner_id': self.supplier_a.id, + 'price_category_id': self.category_premium.id, + 'product_count': 3, + }) wizard.action_confirm() # Verify categories were overwritten self.assertEqual( - self.product_1.price_category_id.id, - self.category_premium.id, - "Product 1 category should be overwritten to Premium", + self.product_1.price_category_id.id, self.category_premium.id, + 'Product 1 category should be overwritten to Premium' ) self.assertEqual( - self.product_2.price_category_id.id, - self.category_premium.id, - "Product 2 category should be overwritten to Premium", + self.product_2.price_category_id.id, self.category_premium.id, + 'Product 2 category should be overwritten to Premium' ) def test_08_multiple_suppliers_independent_updates(self): """Test that updating one supplier doesn't affect other suppliers' products.""" # Update Supplier A products - wizard_a = self.env["wizard.update.product.category"].create( - { - "partner_id": self.supplier_a.id, - "price_category_id": self.category_premium.id, - "product_count": 3, - } - ) + wizard_a = self.env['wizard.update.product.category'].create({ + 'partner_id': self.supplier_a.id, + 'price_category_id': self.category_premium.id, + 'product_count': 3, + }) wizard_a.action_confirm() # Update Supplier B products - wizard_b = self.env["wizard.update.product.category"].create( - { - "partner_id": self.supplier_b.id, - "price_category_id": self.category_standard.id, - "product_count": 1, - } - ) + wizard_b = self.env['wizard.update.product.category'].create({ + 'partner_id': self.supplier_b.id, + 'price_category_id': self.category_standard.id, + 'product_count': 1, + }) wizard_b.action_confirm() # Verify each supplier's products have correct category self.assertEqual( - self.product_1.price_category_id.id, - self.category_premium.id, - "Supplier A products should have Premium", + self.product_1.price_category_id.id, self.category_premium.id, + 'Supplier A products should have Premium' ) self.assertEqual( - self.product_4.price_category_id.id, - self.category_standard.id, - "Supplier B products should have Standard", + self.product_4.price_category_id.id, self.category_standard.id, + 'Supplier B products should have Standard' ) def test_09_wizard_readonly_fields(self): """Test that wizard display fields are readonly.""" - wizard = self.env["wizard.update.product.category"].create( - { - "partner_id": self.supplier_a.id, - "price_category_id": self.category_premium.id, - "product_count": 3, - } - ) + wizard = self.env['wizard.update.product.category'].create({ + 'partner_id': self.supplier_a.id, + 'price_category_id': self.category_premium.id, + 'product_count': 3, + }) # Verify partner_name is computed from partner_id self.assertEqual( - wizard.partner_name, - "Supplier A", - "partner_name should be related to partner_id.name", + wizard.partner_name, 'Supplier A', + 'partner_name should be related to partner_id.name' ) def test_10_action_counts_products_correctly(self): """Test that action_update_products_price_category counts products correctly.""" action = self.supplier_a.action_update_products_price_category() - + # Get the wizard that was created - wizard = self.env["wizard.update.product.category"].browse(action["res_id"]) + wizard = self.env['wizard.update.product.category'].browse(action['res_id']) # Count products manually - actual_count = self.env["product.template"].search_count( - [("main_seller_id", "=", self.supplier_a.id)] - ) + actual_count = self.env['product.template'].search_count([ + ('default_supplier_id', '=', self.supplier_a.id) + ]) self.assertEqual( - wizard.product_count, - actual_count, - f"Wizard should count {actual_count} products", + wizard.product_count, actual_count, + f'Wizard should count {actual_count} products' + ) + self.assertEqual( + wizard.product_count, 3, + 'Supplier A should have 3 products' ) - self.assertEqual(wizard.product_count, 3, "Supplier A should have 3 products") diff --git a/product_sale_price_from_pricelist/models/product_pricelist_item.py b/product_sale_price_from_pricelist/models/product_pricelist_item.py index 22f1eee..ba2e9ad 100644 --- a/product_sale_price_from_pricelist/models/product_pricelist_item.py +++ b/product_sale_price_from_pricelist/models/product_pricelist_item.py @@ -2,8 +2,7 @@ # @author Santi Noreña () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields -from odoo import models +from odoo import fields, models class ProductPricelistItem(models.Model): @@ -14,8 +13,8 @@ class ProductPricelistItem(models.Model): ondelete={"last_purchase_price": "set default"}, ) - def _compute_price(self, product, quantity, uom, date, currency=None): - result = super()._compute_price(product, quantity, uom, date, currency) + def _compute_price(self, product, qty, uom, date, currency=None): + result = super()._compute_price(product, qty, uom, date, currency) if self.compute_price == "formula" and self.base == "last_purchase_price": result = product.sudo().last_purchase_price_received return result diff --git a/product_sale_price_from_pricelist/models/res_config.py b/product_sale_price_from_pricelist/models/res_config.py index 596c8c4..699d53c 100644 --- a/product_sale_price_from_pricelist/models/res_config.py +++ b/product_sale_price_from_pricelist/models/res_config.py @@ -1,6 +1,4 @@ -from odoo import api -from odoo import fields -from odoo import models +from odoo import models, fields, api class ResConfigSettings(models.TransientModel): diff --git a/product_sale_price_from_pricelist/tests/test_pricelist.py b/product_sale_price_from_pricelist/tests/test_pricelist.py index 88698cb..b879ae3 100644 --- a/product_sale_price_from_pricelist/tests/test_pricelist.py +++ b/product_sale_price_from_pricelist/tests/test_pricelist.py @@ -93,7 +93,7 @@ class TestPricelist(TransactionCase): # _compute_price should return the base price (last_purchase_price_received) result = pricelist_item._compute_price( - self.product, quantity=1, uom=self.product.uom_id, date=False, currency=None + self.product, qty=1, uom=self.product.uom_id, date=False, currency=None ) # Should return the last purchase price as base @@ -112,7 +112,7 @@ class TestPricelist(TransactionCase): ) result = pricelist_item._compute_price( - self.product, quantity=1, uom=self.product.uom_id, date=False, currency=None + self.product, qty=1, uom=self.product.uom_id, date=False, currency=None ) # Should return last_purchase_price_received diff --git a/product_sale_price_from_pricelist/tests/test_product_template.py b/product_sale_price_from_pricelist/tests/test_product_template.py index 59bf89c..6f3419c 100644 --- a/product_sale_price_from_pricelist/tests/test_product_template.py +++ b/product_sale_price_from_pricelist/tests/test_product_template.py @@ -203,9 +203,16 @@ class TestProductTemplate(TransactionCase): def test_company_dependent_fields(self): """Test that price fields are company dependent""" - # NOTE: company_dependent=True would require adding schema migration - # to convert existing columns in production databases. These fields - # use standard float/selection storage instead. + # Verify field properties + field_last_purchase = self.product._fields["last_purchase_price_received"] + field_theoritical = self.product._fields["list_price_theoritical"] + field_updated = self.product._fields["last_purchase_price_updated"] + field_compute_type = self.product._fields["last_purchase_price_compute_type"] + + self.assertTrue(field_last_purchase.company_dependent) + self.assertTrue(field_theoritical.company_dependent) + self.assertTrue(field_updated.company_dependent) + self.assertTrue(field_compute_type.company_dependent) def test_compute_theoritical_price_with_actual_purchase_price(self): """Test that theoretical price is calculated correctly from last purchase price diff --git a/product_sale_price_from_pricelist/tests/test_res_config.py b/product_sale_price_from_pricelist/tests/test_res_config.py index 25669b0..7c48926 100644 --- a/product_sale_price_from_pricelist/tests/test_res_config.py +++ b/product_sale_price_from_pricelist/tests/test_res_config.py @@ -10,31 +10,25 @@ class TestResConfigSettings(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() - - cls.pricelist = cls.env["product.pricelist"].create( - { - "name": "Test Config Pricelist", - "currency_id": cls.env.company.currency_id.id, - } - ) + + cls.pricelist = cls.env["product.pricelist"].create({ + "name": "Test Config Pricelist", + "currency_id": cls.env.company.currency_id.id, + }) def test_config_parameter_set_and_get(self): """Test setting and getting pricelist configuration""" - config = self.env["res.config.settings"].create( - { - "product_pricelist_automatic": self.pricelist.id, - } - ) - + config = self.env["res.config.settings"].create({ + "product_pricelist_automatic": self.pricelist.id, + }) + config.execute() - + # Verify parameter was saved - saved_id = ( - self.env["ir.config_parameter"] - .sudo() - .get_param("product_sale_price_from_pricelist.product_pricelist_automatic") + saved_id = self.env["ir.config_parameter"].sudo().get_param( + "product_sale_price_from_pricelist.product_pricelist_automatic" ) - + self.assertEqual(int(saved_id), self.pricelist.id) def test_config_load_from_parameter(self): @@ -42,51 +36,43 @@ class TestResConfigSettings(TransactionCase): # Set parameter directly self.env["ir.config_parameter"].sudo().set_param( "product_sale_price_from_pricelist.product_pricelist_automatic", - str(self.pricelist.id), + str(self.pricelist.id) ) - + # Create config and check if value is loaded config = self.env["res.config.settings"].create({}) - + self.assertEqual(config.product_pricelist_automatic.id, self.pricelist.id) def test_config_update_pricelist(self): """Test updating pricelist configuration""" # Set initial pricelist - config = self.env["res.config.settings"].create( - { - "product_pricelist_automatic": self.pricelist.id, - } - ) + config = self.env["res.config.settings"].create({ + "product_pricelist_automatic": self.pricelist.id, + }) config.execute() - + # Create new pricelist and update - new_pricelist = self.env["product.pricelist"].create( - { - "name": "New Config Pricelist", - "currency_id": self.env.company.currency_id.id, - } - ) - - config2 = self.env["res.config.settings"].create( - { - "product_pricelist_automatic": new_pricelist.id, - } - ) + new_pricelist = self.env["product.pricelist"].create({ + "name": "New Config Pricelist", + "currency_id": self.env.company.currency_id.id, + }) + + config2 = self.env["res.config.settings"].create({ + "product_pricelist_automatic": new_pricelist.id, + }) config2.execute() - + # Verify new value - saved_id = ( - self.env["ir.config_parameter"] - .sudo() - .get_param("product_sale_price_from_pricelist.product_pricelist_automatic") + saved_id = self.env["ir.config_parameter"].sudo().get_param( + "product_sale_price_from_pricelist.product_pricelist_automatic" ) - + self.assertEqual(int(saved_id), new_pricelist.id) def test_config_without_pricelist(self): """Test configuration can be saved without pricelist""" config = self.env["res.config.settings"].create({}) - + # Should not raise error config.execute() diff --git a/product_sale_price_from_pricelist/views/actions.xml b/product_sale_price_from_pricelist/views/actions.xml index 813df8a..4a4a372 100644 --- a/product_sale_price_from_pricelist/views/actions.xml +++ b/product_sale_price_from_pricelist/views/actions.xml @@ -11,7 +11,7 @@ Update Sales Price - + code records.action_update_list_price() @@ -19,3 +19,4 @@ + diff --git a/purchase_triple_discount/models/purchase_order.py b/purchase_triple_discount/models/purchase_order.py index 5ddc2cb..de23b23 100644 --- a/purchase_triple_discount/models/purchase_order.py +++ b/purchase_triple_discount/models/purchase_order.py @@ -10,6 +10,9 @@ class PurchaseOrder(models.Model): def _prepare_supplier_info(self, partner, line, price, currency): res = super()._prepare_supplier_info(partner, line, price, currency) res.update( - {fname: line[fname] for fname in line._get_multiple_discount_field_names()} + { + fname: line[fname] + for fname in line._get_multiple_discount_field_names() + } ) return res diff --git a/purchase_triple_discount/models/purchase_order_line.py b/purchase_triple_discount/models/purchase_order_line.py index 5a48af5..0dd635e 100644 --- a/purchase_triple_discount/models/purchase_order_line.py +++ b/purchase_triple_discount/models/purchase_order_line.py @@ -43,7 +43,10 @@ class PurchaseOrderLine(models.Model): self.ensure_one() res = super()._prepare_account_move_line(move) res.update( - {fname: self[fname] for fname in self._get_multiple_discount_field_names()} + { + fname: self[fname] + for fname in self._get_multiple_discount_field_names() + } ) return res diff --git a/website_sale_aplicoop/.codeclimate.yml b/website_sale_aplicoop/.codeclimate.yml index 31b6e57..83d75d5 100644 --- a/website_sale_aplicoop/.codeclimate.yml +++ b/website_sale_aplicoop/.codeclimate.yml @@ -1,29 +1,29 @@ -version: "2" +version: '2' checks: - similar-code: - enabled: true - config: - threshold: 3 - duplicate-code: - enabled: true - config: - threshold: 3 + similar-code: + enabled: true + config: + threshold: 3 + duplicate-code: + enabled: true + config: + threshold: 3 exclude-patterns: - - tests/ - - migrations/ + - tests/ + - migrations/ python-targets: - - 3.10 - - 3.11 - - 3.12 + - 3.10 + - 3.11 + - 3.12 plugins: - pylint: - enabled: true - config: - load-plugins: - - pylint_odoo - pydocstyle: - enabled: false + pylint: + enabled: true + config: + load-plugins: + - pylint_odoo + pydocstyle: + enabled: false diff --git a/website_sale_aplicoop/.pre-commit-config.yaml b/website_sale_aplicoop/.pre-commit-config.yaml index 029d3ea..5d2060c 100644 --- a/website_sale_aplicoop/.pre-commit-config.yaml +++ b/website_sale_aplicoop/.pre-commit-config.yaml @@ -1,33 +1,33 @@ repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 - hooks: - - id: trailing-whitespace - - id: end-of-file-fixer - - id: check-yaml - - id: check-added-large-files - - id: check-merge-conflict + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files + - id: check-merge-conflict - - repo: https://github.com/psf/black - rev: 23.3.0 - hooks: - - id: black - language_version: python3.10 + - repo: https://github.com/psf/black + rev: 23.3.0 + hooks: + - id: black + language_version: python3.10 - - repo: https://github.com/PyCQA/isort - rev: 5.12.0 - hooks: - - id: isort - args: ["--profile", "black"] + - repo: https://github.com/PyCQA/isort + rev: 5.12.0 + hooks: + - id: isort + args: ["--profile", "black"] - - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 - hooks: - - id: flake8 - args: ["--max-line-length=88", "--extend-ignore=E203"] + - repo: https://github.com/PyCQA/flake8 + rev: 6.0.0 + hooks: + - id: flake8 + args: ["--max-line-length=88", "--extend-ignore=E203"] - - repo: https://github.com/asottile/pyupgrade - rev: v3.4.0 - hooks: - - id: pyupgrade - args: ["--py310-plus"] + - repo: https://github.com/asottile/pyupgrade + rev: v3.4.0 + hooks: + - id: pyupgrade + args: ["--py310-plus"] diff --git a/website_sale_aplicoop/CHANGELOG.md b/website_sale_aplicoop/CHANGELOG.md deleted file mode 100644 index d5e0c07..0000000 --- a/website_sale_aplicoop/CHANGELOG.md +++ /dev/null @@ -1,82 +0,0 @@ -# Changelog - Website Sale Aplicoop - -## [18.0.1.3.0] - 2026-02-16 - -### Added -- **Lazy Loading Feature**: Configurable product pagination for significantly faster page loads - - New Settings: `Enable Lazy Loading`, `Products Per Page` - - New endpoint: `GET /eskaera//load-page?page=N` - - JavaScript method: `_attachLoadMoreListener()` - - Model method: `group_order._get_products_paginated()` - -- **Configuration Parameters**: - - `website_sale_aplicoop.lazy_loading_enabled` (Boolean, default: True) - - `website_sale_aplicoop.products_per_page` (Integer, default: 20) - -- **Frontend Components**: - - New template: `eskaera_shop_products` (reusable for initial page + AJAX) - - Load More button with pagination controls - - Spinner during AJAX load ("Loading..." state) - - Event listener re-attachment for dynamically loaded products - -- **Documentation**: - - Complete lazy loading guide: `docs/LAZY_LOADING.md` - - Configuration examples - - Troubleshooting section - - Performance metrics - -### Changed -- Template `eskaera_shop`: - - Products grid now has `id="products-grid"` - - Calls reusable `eskaera_shop_products` template - - Conditional "Load More" button display - -- JavaScript `website_sale.js`: - - `_attachEventListeners()` now calls `_attachLoadMoreListener()` - - Re-attaches listeners after AJAX loads new products - -- README.md: - - Added lazy loading feature to features list - - Added version 18.0.1.3.0 to changelog - -### Performance Impact -- **Initial page load**: 10-20s → 500-800ms (20x faster) -- **Product DOM size**: 1000 elements → 20 elements (initial) -- **Subsequent page loads**: 200-400ms via AJAX -- **Price calculation**: Only for visible products (reduced from 1000+ to 20) - -### Technical Details -- Zero-impact if lazy loading disabled -- Transparent pagination (no URL changes) -- Maintains cart synchronization -- Compatible with existing search/filter -- No changes to pricing logic or validation - ---- - -## [18.0.1.2.0] - 2026-02-02 - -### Added -- Improved UI elements in cart and checkout - -### Fixed -- Pickup date calculation (was adding extra week) -- Delivery date display on order pages - -### Changed -- Cart styling: 2x text size, larger icons -- Checkout button: Enhanced visibility - ---- - -## [18.0.1.0.0] - 2024-12-20 - -### Added -- Initial release of Website Sale Aplicoop -- Group order management system -- Multi-language support (ES, PT, GL, CA, EU, FR, IT) -- Member management and tracking -- Order state machine (draft → confirmed → collected → invoiced → completed) -- Separate shopping carts per group order -- Cutoff and pickup date validation -- Integration with OCA ecosystem (pricing, taxes, etc.) diff --git a/website_sale_aplicoop/README.md b/website_sale_aplicoop/README.md index 8f9e2fd..2cf416e 100644 --- a/website_sale_aplicoop/README.md +++ b/website_sale_aplicoop/README.md @@ -26,7 +26,6 @@ Website Sale Aplicoop provides a complete group ordering system designed for coo - ✅ Delivery tracking and group order fulfillment - ✅ Financial tracking per group member - ✅ Automatic translation of UI elements -- ✅ **Lazy Loading**: Configurable product pagination for fast page loads ## Installation @@ -240,46 +239,6 @@ python -m pytest website_sale_aplicoop/tests/ -v ## Changelog -### 18.0.1.3.1 (2026-02-18) -- **Date Calculation Fixes (Critical)**: - - Fixed `_compute_cutoff_date` logic: Changed `days_ahead <= 0` to `days_ahead < 0` to allow cutoff_date to be the same day as today - - Enabled `store=True` for `delivery_date` field to persist calculated values and enable database filtering - - Added constraint `_check_cutoff_before_pickup` to validate that pickup_day >= cutoff_day in weekly orders - - Added `@api.onchange` methods for immediate UI feedback when changing cutoff_day or pickup_day -- **Automatic Date Updates**: - - Created daily cron job `_cron_update_dates` to automatically recalculate dates for active orders - - Ensures computed dates stay current as time passes -- **UI Improvements**: - - Added "Calculated Dates" section in form view showing readonly cutoff_date, pickup_date, and delivery_date - - Improved visibility of automatically calculated dates for administrators -- **Testing**: - - Added 6 regression tests with `@tagged('post_install', 'date_calculations')`: - - `test_cutoff_same_day_as_today_bug_fix`: Validates cutoff can be today - - `test_delivery_date_stored_correctly`: Ensures delivery_date persistence - - `test_constraint_cutoff_before_pickup_invalid`: Tests invalid configurations are rejected - - `test_constraint_cutoff_before_pickup_valid`: Tests valid configurations work - - `test_all_weekday_combinations_consistency`: Tests all 49 date combinations - - `test_cron_update_dates_executes`: Validates cron job execution -- **Documentation**: - - Documented that this is a more robust fix than v18.0.1.2.0, addressing edge cases in date calculations - -### 18.0.1.3.0 (2026-02-16) -- **Performance**: Lazy loading of products for faster page loads - - Configurable product pagination (default: 20 per page) - - New Settings: Enable Lazy Loading, Products Per Page - - Page 1: 500-800ms load time (vs 10-20s before) - - Subsequent pages: 200-400ms via AJAX - - New endpoint: `GET /eskaera//load-page?page=N` -- **Templates**: Split product rendering into reusable template - - New: `eskaera_shop_products` template - - Backend: `_get_products_paginated()` in group_order model -- **JavaScript**: Load More button with event handling - - `_attachLoadMoreListener()` for AJAX pagination - - Spinner during load (button disabled + "Loading..." text) - - Re-attach event listeners for new products - - Auto-hide button when no more products -- Documentation: Added `docs/LAZY_LOADING.md` with full technical details - ### 18.0.1.2.0 (2026-02-02) - UI Improvements: - Increased cart text size (2x) for better readability @@ -329,7 +288,7 @@ For issues, feature requests, or contributions: --- -**Version:** 18.0.1.3.1 +**Version:** 18.0.1.2.0 **Odoo:** 18.0+ **License:** AGPL-3 **Maintainer:** Criptomart SL diff --git a/website_sale_aplicoop/__manifest__.py b/website_sale_aplicoop/__manifest__.py index 8f1a7fe..bd9883f 100644 --- a/website_sale_aplicoop/__manifest__.py +++ b/website_sale_aplicoop/__manifest__.py @@ -3,7 +3,7 @@ { # noqa: B018 "name": "Website Sale - Aplicoop", - "version": "18.0.1.3.1", + "version": "18.0.1.1.0", "category": "Website/Sale", "summary": "Modern replacement of legacy Aplicoop - Collaborative consumption group orders", "author": "Odoo Community Association (OCA), Criptomart", @@ -14,7 +14,6 @@ "website_sale", "product", "sale", - "stock", "account", "product_get_price_helper", "product_origin", @@ -22,10 +21,6 @@ "data": [ # Datos: Grupos propios "data/groups.xml", - # Datos: Menús del website - "data/website_menus.xml", - # Datos: Cron jobs - "data/cron.xml", # Vistas de seguridad "security/ir.model.access.csv", "security/record_rules.xml", @@ -36,7 +31,6 @@ "views/website_templates.xml", "views/product_template_views.xml", "views/sale_order_views.xml", - "views/stock_picking_views.xml", "views/portal_templates.xml", "views/load_from_history_templates.xml", ], @@ -50,17 +44,6 @@ "assets": { "web.assets_frontend": [ "website_sale_aplicoop/static/src/css/website_sale.css", - # i18n and helpers must load first - "website_sale_aplicoop/static/src/js/i18n_manager.js", - "website_sale_aplicoop/static/src/js/i18n_helpers.js", - # Core shop functionality - "website_sale_aplicoop/static/src/js/website_sale.js", - "website_sale_aplicoop/static/src/js/checkout_labels.js", - "website_sale_aplicoop/static/src/js/home_delivery.js", - "website_sale_aplicoop/static/src/js/checkout_summary.js", - # Search and pagination - "website_sale_aplicoop/static/src/js/infinite_scroll.js", - "website_sale_aplicoop/static/src/js/realtime_search.js", ], "web.assets_tests": [ "website_sale_aplicoop/static/tests/test_suite.js", diff --git a/website_sale_aplicoop/controllers/portal.py b/website_sale_aplicoop/controllers/portal.py index d9457bd..40ae0cd 100644 --- a/website_sale_aplicoop/controllers/portal.py +++ b/website_sale_aplicoop/controllers/portal.py @@ -1,72 +1,61 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -import logging - from odoo import _ -from odoo.http import request -from odoo.http import route - +from odoo.http import request, route from odoo.addons.sale.controllers import portal as sale_portal +import logging _logger = logging.getLogger(__name__) class CustomerPortal(sale_portal.CustomerPortal): - """Extend sale portal to include draft orders.""" + '''Extend sale portal to include draft orders.''' def _prepare_orders_domain(self, partner): - """Override to include draft and done orders.""" + '''Override to include draft and done orders.''' return [ - ("message_partner_ids", "child_of", [partner.commercial_partner_id.id]), - ("state", "in", ["draft", "sale", "done"]), # Include draft orders + ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]), + ('state', 'in', ['draft', 'sale', 'done']), # Include draft orders ] - @route( - ["/my/orders", "/my/orders/page/"], - type="http", - auth="user", - website=True, - ) + @route(['/my/orders', '/my/orders/page/'], + type='http', auth='user', website=True) def portal_my_orders(self, **kwargs): - """Override to add translated day names to context.""" + '''Override to add translated day names to context.''' # Get values from parent - values = self._prepare_sale_portal_rendering_values( - quotation_page=False, **kwargs - ) - + values = self._prepare_sale_portal_rendering_values(quotation_page=False, **kwargs) + # Add translated day names for pickup_day display - values["day_names"] = [ - _("Monday"), - _("Tuesday"), - _("Wednesday"), - _("Thursday"), - _("Friday"), - _("Saturday"), - _("Sunday"), + values['day_names'] = [ + _('Monday'), + _('Tuesday'), + _('Wednesday'), + _('Thursday'), + _('Friday'), + _('Saturday'), + _('Sunday'), ] - - request.session["my_orders_history"] = values["orders"].ids[:100] + + request.session['my_orders_history'] = values['orders'].ids[:100] return request.render("sale.portal_my_orders", values) - @route(["/my/orders/"], type="http", auth="public", website=True) + @route(['/my/orders/'], type='http', auth='public', website=True) def portal_order_page(self, order_id, access_token=None, **kwargs): - """Override to add translated day names for order detail page.""" + '''Override to add translated day names for order detail page.''' # Call parent to get response - response = super().portal_order_page( - order_id, access_token=access_token, **kwargs - ) - + response = super().portal_order_page(order_id, access_token=access_token, **kwargs) + # If it's a template render (not a redirect), add day_names to the context - if hasattr(response, "qcontext"): - response.qcontext["day_names"] = [ - _("Monday"), - _("Tuesday"), - _("Wednesday"), - _("Thursday"), - _("Friday"), - _("Saturday"), - _("Sunday"), + if hasattr(response, 'qcontext'): + response.qcontext['day_names'] = [ + _('Monday'), + _('Tuesday'), + _('Wednesday'), + _('Thursday'), + _('Friday'), + _('Saturday'), + _('Sunday'), ] - + return response diff --git a/website_sale_aplicoop/controllers/website_sale.py b/website_sale_aplicoop/controllers/website_sale.py index 93c0cf6..19a0ce3 100644 --- a/website_sale_aplicoop/controllers/website_sale.py +++ b/website_sale_aplicoop/controllers/website_sale.py @@ -293,7 +293,7 @@ class AplicoopWebsiteSale(WebsiteSale): # Identificar categorías raíz (sin padre en la lista) y organizar jerarquía roots = [] - for _cat_id, cat_info in category_map.items(): + for cat_id, cat_info in category_map.items(): parent_id = cat_info["parent_id"] # Si el padre no está en la lista de categorías disponibles, es una raíz @@ -313,440 +313,6 @@ class AplicoopWebsiteSale(WebsiteSale): sort_hierarchy(roots) return roots - # ========== PHASE 1: HELPER METHODS FOR VALIDATION AND CONFIGURATION ========== - - def _resolve_pricelist(self): - """Resolve the pricelist to use for pricing. - - Resolution order: - 1. Aplicoop configured pricelist (from settings) - 2. Website current pricelist - 3. First active pricelist (fallback) - - Returns: - product.pricelist record or False if none found - """ - pricelist = None - - # Try to get configured Aplicoop pricelist first - try: - aplicoop_pricelist_id = ( - request.env["ir.config_parameter"] - .sudo() - .get_param("website_sale_aplicoop.pricelist_id") - ) - if aplicoop_pricelist_id: - pricelist = request.env["product.pricelist"].browse( - int(aplicoop_pricelist_id) - ) - if pricelist.exists(): - _logger.info( - "_resolve_pricelist: Using configured Aplicoop pricelist: %s (id=%s)", - pricelist.name, - pricelist.id, - ) - return pricelist - else: - _logger.warning( - "_resolve_pricelist: Configured Aplicoop pricelist (id=%s) not found", - aplicoop_pricelist_id, - ) - except Exception as err: - _logger.warning( - "_resolve_pricelist: Error getting Aplicoop pricelist: %s", str(err) - ) - - # Fallback to website pricelist - try: - pricelist = request.website._get_current_pricelist() - if pricelist: - _logger.info( - "_resolve_pricelist: Using website pricelist: %s (id=%s)", - pricelist.name, - pricelist.id, - ) - return pricelist - except Exception as err: - _logger.warning( - "_resolve_pricelist: Error getting website pricelist: %s", str(err) - ) - - # Final fallback to first active pricelist - pricelist = request.env["product.pricelist"].search( - [("active", "=", True)], limit=1 - ) - if pricelist: - _logger.info( - "_resolve_pricelist: Using first active pricelist: %s (id=%s)", - pricelist.name, - pricelist.id, - ) - return pricelist - - _logger.error( - "_resolve_pricelist: ERROR - No pricelist found! Pricing may fail." - ) - return False - - def _prepare_product_display_info(self, product, product_price_info): - """Prepare all display information for a product in a QWeb-safe way. - - This function pre-processes all values that might be None or require - conditional logic, so the template can use simple variable references - without complex expressions that confuse QWeb's parser. - - Args: - product: product.template record - product_price_info: dict with 'price', 'list_price', etc. - - Returns: - dict with all pre-processed display values ready for template - """ - # Safety: Get price, ensure it's a float - price_data = product_price_info.get(product.id, {}) - price = ( - price_data.get("price", product.list_price) - if price_data - else product.list_price - ) - price_safe = float(price) if price else 0.0 - - # Safety: Get UoM category name - uom_category_name = "" - if product.uom_id: - if product.uom_id.category_id: - uom_category_name = product.uom_id.category_id.name or "" - - return { - "display_price": price_safe, - "safe_uom_category": uom_category_name, - } - - def _validate_confirm_request(self, data): - """Validate all requirements for confirm order request. - - Validates: - - order_id exists and is valid integer - - group.order exists and is in open state - - user has associated partner_id - - items list is not empty - - Args: - data: dict with 'order_id' and 'items' keys - - Returns: - tuple: (order_id, group_order, current_user) - - Raises: - ValueError: if any validation fails - """ - # Validate order_id - order_id = data.get("order_id") - if not order_id: - raise ValueError("order_id is required") from None - - try: - order_id = int(order_id) - except (ValueError, TypeError) as err: - raise ValueError(f"Invalid order_id format: {order_id}") from err - - # Verify that the group.order exists - group_order = request.env["group.order"].browse(order_id) - if not group_order.exists(): - raise ValueError(f"Order {order_id} not found") from None - - # Verify that the order is in open state - if group_order.state != "open": - raise ValueError("Order is not available (not in open state)") from None - - # Validate user has partner_id - current_user = request.env.user - if not current_user.partner_id: - raise ValueError("User has no associated partner") from None - - # Validate items - items = data.get("items", []) - if not items: - raise ValueError("No items in cart") from None - - _logger.info( - "_validate_confirm_request: Valid request for order %d with %d items", - order_id, - len(items), - ) - - return order_id, group_order, current_user, items - - def _validate_draft_request(self, data): - """Validate all requirements for draft order request. - - Validates: - - order_id exists and is valid integer - - group.order exists - - user has associated partner_id - - items list is not empty - - Args: - data: dict with 'order_id' and 'items' keys - - Returns: - tuple: (order_id, group_order, current_user, items, merge_action, existing_draft_id) - - Raises: - ValueError: if any validation fails - """ - # Validate order_id - order_id = data.get("order_id") - if not order_id: - raise ValueError("order_id is required") - - try: - order_id = int(order_id) - except (ValueError, TypeError) as err: - raise ValueError(f"Invalid order_id format: {order_id}") from err - - # Verify that the group.order exists - group_order = request.env["group.order"].browse(order_id) - if not group_order.exists(): - raise ValueError(f"Order {order_id} not found") - - # Validate user has partner_id - current_user = request.env.user - if not current_user.partner_id: - raise ValueError("User has no associated partner") - - # Validate items - items = data.get("items", []) - if not items: - raise ValueError("No items in cart") - - # Get optional merge/replace parameters - merge_action = data.get("merge_action") - existing_draft_id = data.get("existing_draft_id") - - _logger.info( - "_validate_draft_request: Valid request for order %d with %d items (merge_action=%s)", - order_id, - len(items), - merge_action, - ) - - return ( - order_id, - group_order, - current_user, - items, - merge_action, - existing_draft_id, - ) - - def _validate_confirm_json(self, data): - """Validate JSON data and order for confirm_eskaera endpoint. - - Validates: - - order_id is present and valid integer - - group.order exists and is in 'open' state - - user has associated partner_id - - items list is not empty - - Args: - data: dict with 'order_id' and 'items' keys - - Returns: - tuple: (order_id, group_order, current_user, items, is_delivery) - - Raises: - ValueError: if any validation fails - """ - # Validate order_id - order_id = data.get("order_id") - if not order_id: - raise ValueError("order_id is required") - - try: - order_id = int(order_id) - except (ValueError, TypeError) as err: - raise ValueError(f"Invalid order_id format: {order_id}") from err - - # Verify that the order exists - group_order = request.env["group.order"].browse(order_id) - if not group_order.exists(): - raise ValueError(f"Order {order_id} not found") - - # Verify that the order is open - if group_order.state != "open": - raise ValueError(f"Order is {group_order.state}") - - # Validate user has partner_id - current_user = request.env.user - if not current_user.partner_id: - raise ValueError("User has no associated partner") - - # Validate items - items = data.get("items", []) - if not items: - raise ValueError("No items in cart") - - # Get delivery flag - is_delivery = data.get("is_delivery", False) - - _logger.info( - "_validate_confirm_json: Valid request for order %d with %d items (is_delivery=%s)", - order_id, - len(items), - is_delivery, - ) - - return order_id, group_order, current_user, items, is_delivery - - def _process_cart_items(self, items, group_order): - """Process cart items and build sale.order line data. - - Args: - items: list of item dicts with product_id, quantity, product_price - group_order: group.order record for context - - Returns: - list of (0, 0, line_dict) tuples ready for sale.order creation - - Raises: - ValueError: if no valid items after processing - """ - sale_order_lines = [] - - for item in items: - try: - product_id = int(item.get("product_id")) - quantity = float(item.get("quantity", 1)) - price = float(item.get("product_price", 0)) - - product = request.env["product.product"].browse(product_id) - if not product.exists(): - _logger.warning( - "_process_cart_items: Product %d does not exist", product_id - ) - continue - - # Get product name in user's language context - product_in_lang = product.with_context(lang=request.env.lang) - product_name = product_in_lang.name - - line_data = { - "product_id": product_id, - "product_uom_qty": quantity, - "price_unit": price or product.list_price, - "name": product_name, # Force the translated product name - } - _logger.info("_process_cart_items: Adding line: %s", line_data) - sale_order_lines.append((0, 0, line_data)) - except (ValueError, TypeError) as e: - _logger.warning( - "_process_cart_items: Error processing item %s: %s", - item, - str(e), - ) - continue - - if not sale_order_lines: - raise ValueError("No valid items in cart") - - _logger.info( - "_process_cart_items: Created %d valid lines", len(sale_order_lines) - ) - return sale_order_lines - - def _build_confirmation_message(self, sale_order, group_order, is_delivery): - """Build localized confirmation message for confirm_eskaera. - - Translates message and pickup/delivery info according to user's language. - Handles day names and date formatting. - - Args: - sale_order: sale.order record just created - group_order: group.order record - is_delivery: boolean indicating if home delivery - - Returns: - dict with message, pickup_day, pickup_date, pickup_day_index - """ - # Get pickup day index - try: - pickup_day_index = int(group_order.pickup_day) - except Exception: - pickup_day_index = None - - # Initialize translatable strings - base_message = _("Thank you! Your order has been confirmed.") - order_reference_label = _("Order reference") - pickup_label = _("Pickup day") - delivery_label = _("Delivery date") - pickup_day_name = "" - pickup_date_str = "" - - # Add order reference to message - if sale_order.name: - base_message = ( - f"{base_message}\n\n{order_reference_label}: {sale_order.name}" - ) - - # Get translated day names - if pickup_day_index is not None: - try: - day_names = self._get_day_names(env=request.env) - pickup_day_name = day_names[pickup_day_index % len(day_names)] - except Exception: - pickup_day_name = "" - - # Add pickup/delivery date in numeric format - if group_order.pickup_date: - if is_delivery: - # For delivery, use delivery_date (already computed as pickup_date + 1) - if group_order.delivery_date: - pickup_date_str = group_order.delivery_date.strftime("%d/%m/%Y") - # For delivery, use the next day's name - if pickup_day_index is not None: - try: - day_names = self._get_day_names(env=request.env) - # Get the next day's name for delivery - next_day_index = (pickup_day_index + 1) % 7 - pickup_day_name = day_names[next_day_index] - except Exception: - pickup_day_name = "" - else: - pickup_date_str = group_order.pickup_date.strftime("%d/%m/%Y") - else: - # For pickup, use the same date - pickup_date_str = group_order.pickup_date.strftime("%d/%m/%Y") - - # Build final message with correct label and date based on delivery or pickup - message = base_message - label_to_use = delivery_label if is_delivery else pickup_label - if pickup_day_name and pickup_date_str: - message = ( - f"{message}\n\n\n{label_to_use}: {pickup_day_name} ({pickup_date_str})" - ) - elif pickup_day_name: - message = f"{message}\n\n\n{label_to_use}: {pickup_day_name}" - elif pickup_date_str: - message = f"{message}\n\n\n{label_to_use}: {pickup_date_str}" - - # Log for translation debugging - try: - _logger.info( - "_build_confirmation_message: lang=%s, message=%s", - request.env.lang, - message, - ) - except Exception: - _logger.info("_build_confirmation_message: message logging failed") - - return { - "message": message, - "pickup_day": pickup_day_name, - "pickup_date": pickup_date_str, - "pickup_day_index": pickup_day_index, - } - @http.route(["/eskaera"], type="http", auth="user", website=True) def eskaera_list(self, **post): """Página de pedidos de grupo abiertos esta semana. @@ -793,6 +359,7 @@ class AplicoopWebsiteSale(WebsiteSale): Soporta búsqueda y filtrado por categoría. """ group_order = request.env["group.order"].browse(order_id) + current_user = request.env.user if not group_order.exists(): return request.redirect("/eskaera") @@ -814,51 +381,21 @@ class AplicoopWebsiteSale(WebsiteSale): if group_order.end_date: _logger.info("End Date: %s", group_order.end_date.strftime("%Y-%m-%d")) - # Get lazy loading configuration - lazy_loading_enabled = ( - request.env["ir.config_parameter"].get_param( - "website_sale_aplicoop.lazy_loading_enabled", "True" - ) - == "True" - ) - per_page = int( - request.env["ir.config_parameter"].get_param( - "website_sale_aplicoop.products_per_page", 20 - ) - ) - - # Get page parameter (default to 1) - try: - page = int(post.get("page", 1)) - if page < 1: - page = 1 - except (ValueError, TypeError): - page = 1 - - _logger.info( - "eskaera_shop: lazy_loading=%s, per_page=%d, page=%d", - lazy_loading_enabled, - per_page, - page, - ) - # Collect products from all configured associations: # - Explicit products attached to the group order # - Products in the selected categories # - Products provided by the selected suppliers # - Delegate discovery to the order model (centralised logic) - all_products = group_order._get_products_for_group_order(group_order.id) + products = group_order._get_products_for_group_order(group_order.id) _logger.info( "eskaera_shop order_id=%d, total products=%d (discovered)", order_id, - len(all_products), + len(products), ) # Get all available categories BEFORE filtering (so dropdown always shows all) # Include not only product categories but also their parent categories - product_categories = all_products.mapped("categ_id").filtered( - lambda c: c.id > 0 - ) + product_categories = products.mapped("categ_id").filtered(lambda c: c.id > 0) # Collect all categories including parent chain all_categories_set = set() @@ -886,24 +423,19 @@ class AplicoopWebsiteSale(WebsiteSale): search_query = post.get("search", "").strip() category_filter = post.get("category", "0") - # ===== IMPORTANT: Filter COMPLETE catalog BEFORE pagination ===== - # This ensures search works on full catalog and tags show correct counts - filtered_products = all_products - - # Apply search to COMPLETE catalog + # Apply search if search_query: - filtered_products = filtered_products.filtered( + products = products.filtered( lambda p: search_query.lower() in p.name.lower() or search_query.lower() in (p.description or "").lower() ) _logger.info( - 'eskaera_shop: Filtered by search "%s". Found %d of %d total', + 'eskaera_shop: Filtered by search "%s". Found %d', search_query, - len(filtered_products), - len(all_products), + len(products), ) - # Apply category filter to COMPLETE catalog + # Apply category filter if category_filter != "0": try: category_id = int(category_filter) @@ -923,7 +455,7 @@ class AplicoopWebsiteSale(WebsiteSale): # Search for products in the selected category and all descendants # This ensures we get products even if the category is a parent with no direct products - cat_filtered = request.env["product.product"].search( + filtered_products = request.env["product.product"].search( [ ("categ_id", "in", all_category_ids), ("active", "=", True), @@ -946,66 +478,18 @@ class AplicoopWebsiteSale(WebsiteSale): get_order_descendants(group_order.category_ids) # Keep only products that are in both the selected category AND order's permitted categories - cat_filtered = cat_filtered.filtered( + filtered_products = filtered_products.filtered( lambda p: p.categ_id.id in order_cat_ids ) - filtered_products = cat_filtered + products = filtered_products _logger.info( - "eskaera_shop: Filtered by category %d and descendants. Found %d of %d total", + "eskaera_shop: Filtered by category %d and descendants. Found %d products", category_id, - len(filtered_products), - len(all_products), + len(products), ) - except (ValueError, TypeError) as e: - _logger.warning("eskaera_shop: Invalid category filter: %s", str(e)) - - # ===== Calculate available tags BEFORE pagination (on complete filtered set) ===== - available_tags_dict = {} - for product in filtered_products: - for tag in product.product_tag_ids: - # Only include tags that are visible on ecommerce - is_visible = getattr( - tag, "visible_on_ecommerce", True - ) # Default to True if field doesn't exist - if not is_visible: - continue - - if tag.id not in available_tags_dict: - tag_color = tag.color if tag.color else None - available_tags_dict[tag.id] = { - "id": tag.id, - "name": tag.name, - "color": tag_color, - "count": 0, - } - available_tags_dict[tag.id]["count"] += 1 - - # Convert to sorted list of tags (sorted by name for consistent display) - available_tags = sorted(available_tags_dict.values(), key=lambda t: t["name"]) - _logger.info( - "eskaera_shop: Found %d available tags for %d filtered products", - len(available_tags), - len(filtered_products), - ) - - # ===== NOW apply pagination to the FILTERED results ===== - total_products = len(filtered_products) - has_next = False - products = filtered_products - if lazy_loading_enabled: - offset = (page - 1) * per_page - products = filtered_products[offset : offset + per_page] - has_next = offset + per_page < total_products - _logger.info( - "eskaera_shop: Paginated - page=%d, offset=%d, per_page=%d, has_next=%s, showing %d of %d", - page, - offset, - per_page, - has_next, - len(products), - total_products, - ) + except (ValueError, TypeError): + pass # Prepare supplier info dict: {product.id: 'Supplier (City)'} product_supplier_info = {} @@ -1020,17 +504,71 @@ class AplicoopWebsiteSale(WebsiteSale): # Get pricelist and calculate prices with taxes using Odoo's pricelist system _logger.info("eskaera_shop: Starting price calculation for order %d", order_id) - pricelist = self._resolve_pricelist() + pricelist = None - # Log pricelist selection status - if pricelist: - _logger.info( - "eskaera_shop: Using pricelist %s (id=%s, currency=%s)", - pricelist.name, - pricelist.id, - pricelist.currency_id.name if pricelist.currency_id else "None", + # Try to get configured aplicoop pricelist first + try: + aplicoop_pricelist_id = ( + request.env["ir.config_parameter"] + .sudo() + .get_param("website_sale_aplicoop.pricelist_id") ) - else: + if aplicoop_pricelist_id: + pricelist = request.env["product.pricelist"].browse( + int(aplicoop_pricelist_id) + ) + if pricelist.exists(): + _logger.info( + "eskaera_shop: Using configured Aplicoop pricelist: %s (id=%s, currency=%s)", + pricelist.name, + pricelist.id, + pricelist.currency_id.name if pricelist.currency_id else "None", + ) + else: + pricelist = None + _logger.warning( + "eskaera_shop: Configured Aplicoop pricelist (id=%s) not found", + aplicoop_pricelist_id, + ) + except Exception as e: + _logger.warning( + "eskaera_shop: Error getting configured Aplicoop pricelist: %s", + str(e), + ) + + # Fallback to website pricelist + if not pricelist: + try: + pricelist = request.website._get_current_pricelist() + _logger.info( + "eskaera_shop: Using website pricelist: %s (id=%s, currency=%s)", + pricelist.name if pricelist else "None", + pricelist.id if pricelist else "None", + ( + pricelist.currency_id.name + if pricelist and pricelist.currency_id + else "None" + ), + ) + except Exception as e: + _logger.warning( + "eskaera_shop: Error getting pricelist from website: %s. Trying default pricelist.", + str(e), + ) + + # Final fallback to any active pricelist + if not pricelist: + pricelist = request.env["product.pricelist"].search( + [("active", "=", True)], limit=1 + ) + if pricelist: + _logger.info( + "eskaera_shop: Using first active pricelist as fallback: %s (id=%s)", + pricelist.name, + pricelist.id, + ) + + if not pricelist: _logger.error( "eskaera_shop: ERROR - No pricelist found! All prices will use list_price as fallback." ) @@ -1103,14 +641,43 @@ class AplicoopWebsiteSale(WebsiteSale): "tax_included": False, } - # Prepare display info for each product (QWeb-safe: all values pre-processed) - # This ensures the template can use simple variable references without complex conditionals - product_display_info = {} + # Calculate available tags with product count (only show tags that are actually used and visible) + # Build a dict: {tag_id: {'id': tag_id, 'name': tag_name, 'count': num_products}} + available_tags_dict = {} for product in products: - display_info = self._prepare_product_display_info( - product, product_price_info - ) - product_display_info[product.id] = display_info + for tag in product.product_tag_ids: + # Only include tags that are visible on ecommerce + is_visible = getattr( + tag, "visible_on_ecommerce", True + ) # Default to True if field doesn't exist + if not is_visible: + continue + + if tag.id not in available_tags_dict: + tag_color = tag.color if tag.color else None + _logger.info( + "Tag %s (id=%s): color=%s (type=%s)", + tag.name, + tag.id, + tag_color, + type(tag_color), + ) + available_tags_dict[tag.id] = { + "id": tag.id, + "name": tag.name, + "color": tag_color, # Use tag color (hex) or None for theme color + "count": 0, + } + available_tags_dict[tag.id]["count"] += 1 + + # Convert to sorted list of tags (sorted by name for consistent display) + available_tags = sorted(available_tags_dict.values(), key=lambda t: t["name"]) + _logger.info( + "eskaera_shop: Found %d available tags for %d products", + len(available_tags), + len(products), + ) + _logger.info("eskaera_shop: available_tags = %s", available_tags) # Manage session for separate cart per order session_key = f"eskaera_{order_id}" @@ -1121,10 +688,10 @@ class AplicoopWebsiteSale(WebsiteSale): # Filter product tags to only show published ones # Create a dictionary with filtered tags for each product - filtered_products_dict = {} + filtered_products = {} for product in products: published_tags = self._filter_published_tags(product.product_tag_ids) - filtered_products_dict[product.id] = { + filtered_products[product.id] = { "product": product, "published_tags": published_tags, } @@ -1134,7 +701,7 @@ class AplicoopWebsiteSale(WebsiteSale): { "group_order": group_order, "products": products, - "filtered_product_tags": filtered_products_dict, + "filtered_product_tags": filtered_products, "cart": cart, "available_categories": available_categories, "category_hierarchy": category_hierarchy, @@ -1144,481 +711,11 @@ class AplicoopWebsiteSale(WebsiteSale): "day_names": self._get_day_names(env=request.env), "product_supplier_info": product_supplier_info, "product_price_info": product_price_info, - "product_display_info": product_display_info, "labels": labels, "labels_json": json.dumps(labels, ensure_ascii=False), - "lazy_loading_enabled": lazy_loading_enabled, - "per_page": per_page, - "current_page": page, - "has_next": has_next, - "total_products": total_products, }, ) - @http.route( - ["/eskaera//load-page"], - type="http", - auth="user", - website=True, - methods=["GET"], - ) - def load_eskaera_page(self, order_id, **post): - """Load next page of products for lazy loading. - - Respects same search/filter parameters as eskaera_shop. - Returns only HTML of product cards without page wrapper. - """ - group_order = request.env["group_order"].browse(order_id) - - if not group_order.exists() or group_order.state != "open": - return "" - - # Get lazy loading configuration - per_page = int( - request.env["ir.config_parameter"].get_param( - "website_sale_aplicoop.products_per_page", 20 - ) - ) - - # Get page parameter - try: - page = int(post.get("page", 1)) - if page < 1: - page = 1 - except (ValueError, TypeError): - page = 1 - - _logger.info( - "load_eskaera_page: order_id=%d, page=%d, per_page=%d", - order_id, - page, - per_page, - ) - - # Get all products (same logic as eskaera_shop) - all_products = group_order._get_products_for_group_order(group_order.id) - - # Get search and filter parameters (passed via POST/GET) - search_query = post.get("search", "").strip() - category_filter = post.get("category", "0") - - # ===== Apply SAME filters as eskaera_shop ===== - filtered_products = all_products - - # Apply search - if search_query: - filtered_products = filtered_products.filtered( - lambda p: search_query.lower() in p.name.lower() - or search_query.lower() in (p.description or "").lower() - ) - _logger.info( - 'load_eskaera_page: search filter "%s" - found %d of %d', - search_query, - len(filtered_products), - len(all_products), - ) - - # Apply category filter - if category_filter != "0": - try: - category_id = int(category_filter) - selected_category = request.env["product.category"].browse(category_id) - - if selected_category.exists(): - all_category_ids = [category_id] - - def get_all_children(category): - for child in category.child_id: - all_category_ids.append(child.id) - get_all_children(child) - - get_all_children(selected_category) - - cat_filtered = request.env["product.product"].search( - [ - ("categ_id", "in", all_category_ids), - ("active", "=", True), - ("product_tmpl_id.is_published", "=", True), - ("product_tmpl_id.sale_ok", "=", True), - ] - ) - - if group_order.category_ids: - order_cat_ids = [] - - def get_order_descendants(categories): - for cat in categories: - order_cat_ids.append(cat.id) - if cat.child_id: - get_order_descendants(cat.child_id) - - get_order_descendants(group_order.category_ids) - cat_filtered = cat_filtered.filtered( - lambda p: p.categ_id.id in order_cat_ids - ) - - filtered_products = cat_filtered - _logger.info( - "load_eskaera_page: category filter %d - found %d of %d", - category_id, - len(filtered_products), - len(all_products), - ) - except (ValueError, TypeError): - _logger.warning("load_eskaera_page: Invalid category filter") - - # ===== Apply pagination to FILTERED results ===== - total_products = len(filtered_products) - offset = (page - 1) * per_page - products_page = filtered_products[offset : offset + per_page] - has_next = offset + per_page < total_products - - _logger.info( - "load_eskaera_page: page=%d, offset=%d, showing %d of %d filtered", - page, - offset, - len(products_page), - total_products, - ) - - # Get pricelist - pricelist = self._resolve_pricelist() - - # Calculate prices for this page - product_price_info = {} - for product in products_page: - product_variant = ( - product.product_variant_ids[0] if product.product_variant_ids else False - ) - if product_variant and pricelist: - try: - price_info = product_variant._get_price( - qty=1.0, - pricelist=pricelist, - fposition=request.website.fiscal_position_id, - ) - price = price_info.get("value", 0.0) - original_price = price_info.get("original_value", 0.0) - discount = price_info.get("discount", 0.0) - has_discount = discount > 0 - - product_price_info[product.id] = { - "price": price, - "list_price": original_price, - "has_discounted_price": has_discount, - "discount": discount, - "tax_included": price_info.get("tax_included", True), - } - except Exception as e: - _logger.warning( - "load_eskaera_page: Error getting price for product %s: %s", - product.name, - str(e), - ) - product_price_info[product.id] = { - "price": product.list_price, - "list_price": product.list_price, - "has_discounted_price": False, - "discount": 0.0, - "tax_included": False, - } - else: - product_price_info[product.id] = { - "price": product.list_price, - "list_price": product.list_price, - "has_discounted_price": False, - "discount": 0.0, - "tax_included": False, - } - - # Prepare supplier info - product_supplier_info = {} - for product in products_page: - supplier_name = "" - if product.seller_ids: - partner = product.seller_ids[0].partner_id.sudo() - supplier_name = partner.name or "" - if partner.city: - supplier_name += f" ({partner.city})" - product_supplier_info[product.id] = supplier_name - - # Filter product tags - filtered_products_dict = {} - for product in products_page: - published_tags = self._filter_published_tags(product.product_tag_ids) - filtered_products_dict[product.id] = { - "product": product, - "published_tags": published_tags, - } - - # Prepare display info for each product (QWeb-safe: all values pre-processed) - product_display_info = {} - for product in products_page: - display_info = self._prepare_product_display_info( - product, product_price_info - ) - product_display_info[product.id] = display_info - - # Get labels - labels = self.get_checkout_labels() - - # Render only the products HTML snippet (no page wrapper) - return request.render( - "website_sale_aplicoop.eskaera_shop_products", - { - "group_order": group_order, - "products": products_page, - "filtered_product_tags": filtered_products_dict, - "product_supplier_info": product_supplier_info, - "product_price_info": product_price_info, - "product_display_info": product_display_info, - "labels": labels, - "has_next": has_next, - "next_page": page + 1, - }, - ) - - @http.route( - ["/eskaera//load-products-ajax"], - type="http", - auth="user", - website=True, - methods=["POST"], - csrf=False, - ) - def load_products_ajax(self, order_id, **post): - """Load products via AJAX for infinite scroll. - - Returns JSON with: - - html: rendered product cards HTML - - has_next: whether there are more products - - next_page: page number to fetch next - - total: total filtered products - """ - group_order = request.env["group.order"].browse(order_id) - - if not group_order.exists() or group_order.state != "open": - return {"error": "Order not found or not open", "html": ""} - - # Get configuration - per_page = int( - request.env["ir.config_parameter"].get_param( - "website_sale_aplicoop.products_per_page", 20 - ) - ) - - # Parse JSON body for parameters (type="http" doesn't auto-parse JSON) - params = {} - try: - if request.httprequest.content_length: - data = request.httprequest.get_data(as_text=True) - if data: - params = json.loads(data) - except (ValueError, json.JSONDecodeError, AttributeError): - params = {} - - # Get page from POST/JSON - try: - page = int(params.get("page", post.get("page", 1))) - if page < 1: - page = 1 - except (ValueError, TypeError): - page = 1 - - # Get filters - search_query = params.get("search", post.get("search", "")).strip() - category_filter = str(params.get("category", post.get("category", "0"))) - - _logger.info( - "load_products_ajax: order_id=%d, page=%d, search=%s, category=%s", - order_id, - page, - search_query, - category_filter, - ) - - # Get all products - all_products = group_order._get_products_for_group_order(group_order.id) - filtered_products = all_products - - # Apply search filter (only if search_query is not empty) - if search_query: - _logger.info("load_products_ajax: Applying search filter: %s", search_query) - filtered_products = filtered_products.filtered( - lambda p: search_query.lower() in p.name.lower() - or search_query.lower() in (p.description or "").lower() - ) - _logger.info( - "load_products_ajax: After search filter: %d products", - len(filtered_products), - ) - - # Apply category filter - if category_filter != "0": - try: - category_id = int(category_filter) - selected_category = request.env["product.category"].browse(category_id) - - if selected_category.exists(): - _logger.info( - "load_products_ajax: Applying category filter: %d (%s)", - category_id, - selected_category.name, - ) - all_category_ids = [category_id] - - def get_all_children(category): - for child in category.child_id: - all_category_ids.append(child.id) - get_all_children(child) - - get_all_children(selected_category) - - cat_filtered = request.env["product.product"].search( - [ - ("categ_id", "in", all_category_ids), - ("active", "=", True), - ("product_tmpl_id.is_published", "=", True), - ("product_tmpl_id.sale_ok", "=", True), - ] - ) - - if group_order.category_ids: - order_cat_ids = [] - - def get_order_descendants(categories): - for cat in categories: - order_cat_ids.append(cat.id) - if cat.child_id: - get_order_descendants(cat.child_id) - - get_order_descendants(group_order.category_ids) - cat_filtered = cat_filtered.filtered( - lambda p: p.categ_id.id in order_cat_ids - ) - - # Preserve search filter by using intersection - filtered_products = filtered_products & cat_filtered - _logger.info( - "load_products_ajax: After category filter: %d products", - len(filtered_products), - ) - except (ValueError, TypeError) as e: - _logger.warning( - "load_products_ajax: Invalid category filter: %s", str(e) - ) - - # Paginate - total_products = len(filtered_products) - offset = (page - 1) * per_page - products_page = filtered_products[offset : offset + per_page] - has_next = offset + per_page < total_products - - _logger.info( - "load_products_ajax: Pagination - page=%d, offset=%d, per_page=%d, " - "total=%d, has_next=%s", - page, - offset, - per_page, - total_products, - has_next, - ) - - # Get prices - pricelist = self._resolve_pricelist() - product_price_info = {} - for product in products_page: - product_variant = ( - product.product_variant_ids[0] if product.product_variant_ids else False - ) - if product_variant and pricelist: - try: - price_info = product_variant._get_price( - qty=1.0, - pricelist=pricelist, - fposition=request.website.fiscal_position_id, - ) - product_price_info[product.id] = { - "price": price_info.get("value", 0.0), - "list_price": price_info.get("original_value", 0.0), - "has_discounted_price": price_info.get("discount", 0.0) > 0, - "discount": price_info.get("discount", 0.0), - "tax_included": price_info.get("tax_included", True), - } - except Exception: - product_price_info[product.id] = { - "price": product.list_price, - "list_price": product.list_price, - "has_discounted_price": False, - "discount": 0.0, - "tax_included": False, - } - else: - product_price_info[product.id] = { - "price": product.list_price, - "list_price": product.list_price, - "has_discounted_price": False, - "discount": 0.0, - "tax_included": False, - } - - # Prepare display info - product_display_info = {} - for product in products_page: - display_info = self._prepare_product_display_info( - product, product_price_info - ) - product_display_info[product.id] = display_info - - # Prepare supplier info - product_supplier_info = {} - for product in products_page: - supplier_name = "" - if product.seller_ids: - partner = product.seller_ids[0].partner_id.sudo() - supplier_name = partner.name or "" - if partner.city: - supplier_name += f" ({partner.city})" - product_supplier_info[product.id] = supplier_name - - # Filter tags - filtered_products_dict = {} - for product in products_page: - published_tags = self._filter_published_tags(product.product_tag_ids) - filtered_products_dict[product.id] = { - "product": product, - "published_tags": published_tags, - } - - # Render HTML - html = request.env["ir.ui.view"]._render_template( - "website_sale_aplicoop.eskaera_shop_products", - { - "group_order": group_order, - "products": products_page, - "filtered_product_tags": filtered_products_dict, - "product_supplier_info": product_supplier_info, - "product_price_info": product_price_info, - "product_display_info": product_display_info, - "labels": self.get_checkout_labels(), - "has_next": has_next, - "next_page": page + 1, - }, - ) - - return request.make_response( - json.dumps( - { - "html": html, - "has_next": has_next, - "next_page": page + 1, - "total": total_products, - "page": page, - } - ), - [("Content-Type", "application/json")], - ) - @http.route( ["/eskaera/add-to-cart"], type="http", @@ -1698,8 +795,57 @@ class AplicoopWebsiteSale(WebsiteSale): ) pricelist = None - # Resolve pricelist using centralized helper - pricelist = self._resolve_pricelist() + # Try to get configured aplicoop pricelist first + try: + aplicoop_pricelist_id = ( + request.env["ir.config_parameter"] + .sudo() + .get_param("website_sale_aplicoop.pricelist_id") + ) + if aplicoop_pricelist_id: + pricelist = request.env["product.pricelist"].browse( + int(aplicoop_pricelist_id) + ) + if pricelist.exists(): + _logger.info( + "add_to_eskaera_cart: Using configured Aplicoop pricelist: %s (id=%s)", + pricelist.name, + pricelist.id, + ) + else: + pricelist = None + except Exception as e: + _logger.warning( + "add_to_eskaera_cart: Error getting configured Aplicoop pricelist: %s", + str(e), + ) + + # Fallback to website pricelist + if not pricelist: + try: + pricelist = request.website._get_current_pricelist() + _logger.info( + "add_to_eskaera_cart: Using website pricelist: %s (id=%s)", + pricelist.name if pricelist else "None", + pricelist.id if pricelist else "None", + ) + except Exception as e: + _logger.warning( + "add_to_eskaera_cart: Error getting website pricelist: %s", + str(e), + ) + + # Final fallback to any active pricelist + if not pricelist: + pricelist = request.env["product.pricelist"].search( + [("active", "=", True)], limit=1 + ) + if pricelist: + _logger.info( + "add_to_eskaera_cart: Using first active pricelist: %s (id=%s)", + pricelist.name, + pricelist.id, + ) if not pricelist: _logger.error( @@ -1809,8 +955,10 @@ class AplicoopWebsiteSale(WebsiteSale): ) _logger.warning("========================================") - # Get delivery product from group_order (configured per group order) - delivery_product = group_order.delivery_product_id + # Get delivery product ID and name (translated to user's language) + delivery_product = request.env.ref( + "website_sale_aplicoop.product_home_delivery", raise_if_not_found=False + ) delivery_product_id = delivery_product.id if delivery_product else None # Get translated product name based on current language if delivery_product: @@ -1923,6 +1071,7 @@ class AplicoopWebsiteSale(WebsiteSale): # Get cart items and pickup date items = data.get("items", []) pickup_date = data.get("pickup_date") # Date from group_order + is_delivery = data.get("is_delivery", False) # If home delivery selected if not items: return request.make_response( @@ -2437,7 +1586,7 @@ class AplicoopWebsiteSale(WebsiteSale): # Find if product already exists in draft existing_line = existing_draft.order_line.filtered( - lambda line: line.product_id.id == product_id + lambda l: l.product_id.id == product_id ) if existing_line: @@ -2475,7 +1624,7 @@ class AplicoopWebsiteSale(WebsiteSale): elif merge_action == "replace" and existing_draft_id and existing_drafts: # Replace: Delete old draft and create new one existing_drafts.unlink() - _logger.info("Deleted existing draft %s", existing_draft_id) + _logger.info("Deleted existing draft %d", existing_draft_id) # Create new draft with current items sale_order = request.env["sale.order"].create( @@ -2591,32 +1740,77 @@ class AplicoopWebsiteSale(WebsiteSale): _logger.info("confirm_eskaera data received: %s", data) - # Validate request using helper - try: - ( - order_id, - group_order, - current_user, - items, - is_delivery, - ) = self._validate_confirm_json(data) - except ValueError as e: - _logger.warning("confirm_eskaera: Validation error: %s", str(e)) + # Validate order_id + order_id = data.get("order_id") + if not order_id: + _logger.warning("confirm_eskaera: order_id missing") return request.make_response( - json.dumps({"error": str(e)}), + json.dumps({"error": "order_id is required"}), [("Content-Type", "application/json")], status=400, ) + # Convert to int + try: + order_id = int(order_id) + except (ValueError, TypeError) as e: + _logger.warning("confirm_eskaera: Invalid order_id: %s", order_id) + return request.make_response( + json.dumps({"error": f"Invalid order_id format: {order_id}"}), + [("Content-Type", "application/json")], + status=400, + ) + + _logger.info("order_id: %d", order_id) + + # Verify that the order exists + group_order = request.env["group.order"].browse(order_id) + if not group_order.exists(): + _logger.warning("confirm_eskaera: Order %d not found", order_id) + return request.make_response( + json.dumps({"error": f"Order {order_id} not found"}), + [("Content-Type", "application/json")], + status=400, + ) + + # Verify that the order is open + if group_order.state != "open": + _logger.warning( + "confirm_eskaera: Order %d is not open (state: %s)", + order_id, + group_order.state, + ) + return request.make_response( + json.dumps({"error": f"Order is {group_order.state}"}), + [("Content-Type", "application/json")], + status=400, + ) + + current_user = request.env.user _logger.info("Current user: %d", current_user.id) - # Process cart items using helper - try: - sale_order_lines = self._process_cart_items(items, group_order) - except ValueError as e: - _logger.warning("confirm_eskaera: Cart processing error: %s", str(e)) + # Validate that the user has a partner_id + if not current_user.partner_id: + _logger.error( + "confirm_eskaera: User %d has no partner_id", current_user.id + ) return request.make_response( - json.dumps({"error": str(e)}), + json.dumps({"error": "User has no associated partner"}), + [("Content-Type", "application/json")], + status=400, + ) + + # Get cart items and delivery status + items = data.get("items", []) + is_delivery = data.get("is_delivery", False) + if not items: + _logger.warning( + "confirm_eskaera: No items in cart for user %d in order %d", + current_user.id, + order_id, + ) + return request.make_response( + json.dumps({"error": "No items in cart"}), [("Content-Type", "application/json")], status=400, ) @@ -2645,6 +1839,47 @@ class AplicoopWebsiteSale(WebsiteSale): ) sale_order = None + # Create sales.order lines from items + sale_order_lines = [] + for item in items: + try: + product_id = int(item.get("product_id")) + quantity = float(item.get("quantity", 1)) + price = float(item.get("product_price", 0)) + + product = request.env["product.product"].browse(product_id) + if not product.exists(): + _logger.warning( + "confirm_eskaera: Product %d does not exist", product_id + ) + continue + + # Get product name in user's language context + product_in_lang = product.with_context(lang=request.env.lang) + product_name = product_in_lang.name + + line_data = { + "product_id": product_id, + "product_uom_qty": quantity, + "price_unit": price or product.list_price, + "name": product_name, # Force the translated product name + } + _logger.info("Adding sale order line: %s", line_data) + sale_order_lines.append((0, 0, line_data)) + except (ValueError, TypeError) as e: + _logger.warning( + "confirm_eskaera: Error processing item %s: %s", item, str(e) + ) + continue + + if not sale_order_lines: + _logger.warning("confirm_eskaera: No valid items for sale.order") + return request.make_response( + json.dumps({"error": "No valid items in cart"}), + [("Content-Type", "application/json")], + status=400, + ) + # Get pickup date and delivery info from group order # If delivery, use delivery_date; otherwise use pickup_date commitment_date = None @@ -2706,14 +1941,64 @@ class AplicoopWebsiteSale(WebsiteSale): _logger.error("sale_order_lines: %s", sale_order_lines) raise - # Build confirmation message using helper - message_data = self._build_confirmation_message( - sale_order, group_order, is_delivery - ) - message = message_data["message"] - pickup_day_name = message_data["pickup_day"] - pickup_date_str = message_data["pickup_date"] - pickup_day_index = message_data["pickup_day_index"] + # Build a localized confirmation message on the server so the + # client only needs to display the final string. Use `_()` to + # mark strings for translation and `_get_day_names()` to obtain + # the translated day name according to the user's language. + try: + pickup_day_index = int(group_order.pickup_day) + except Exception: + pickup_day_index = None + + base_message = _("Thank you! Your order has been confirmed.") + order_reference_label = _("Order reference") + pickup_label = _("Pickup day") + delivery_label = _("Delivery date") + pickup_day_name = "" + pickup_date_str = "" + + # Add order reference to message + if sale_order.name: + base_message = ( + f"{base_message}\n\n{order_reference_label}: {sale_order.name}" + ) + if pickup_day_index is not None: + try: + day_names = self._get_day_names(env=request.env) + pickup_day_name = day_names[pickup_day_index % len(day_names)] + except Exception: + pickup_day_name = "" + + # Add pickup/delivery date in numeric format + if group_order.pickup_date: + if is_delivery: + # For delivery, use delivery_date (already computed as pickup_date + 1) + if group_order.delivery_date: + pickup_date_str = group_order.delivery_date.strftime("%d/%m/%Y") + # For delivery, use the next day's name + if pickup_day_index is not None: + try: + day_names = self._get_day_names(env=request.env) + # Get the next day's name for delivery + next_day_index = (pickup_day_index + 1) % 7 + pickup_day_name = day_names[next_day_index] + except Exception: + pickup_day_name = "" + else: + pickup_date_str = group_order.pickup_date.strftime("%d/%m/%Y") + else: + # For pickup, use the same date + pickup_date_str = group_order.pickup_date.strftime("%d/%m/%Y") + + # Build final message with correct label and date based on delivery or pickup + message = base_message + label_to_use = delivery_label if is_delivery else pickup_label + if pickup_day_name and pickup_date_str: + message = f"{message}\n\n\n{label_to_use}: {pickup_day_name} ({pickup_date_str})" + elif pickup_day_name: + message = f"{message}\n\n\n{label_to_use}: {pickup_day_name}" + elif pickup_date_str: + message = f"{message}\n\n\n{label_to_use}: {pickup_date_str}" response_data = { "success": True, @@ -2802,8 +2087,9 @@ class AplicoopWebsiteSale(WebsiteSale): return request.redirect("/eskaera/%d" % sale_order.group_order_id.id) # Extract items from the order (skip delivery product) - # Use the delivery_product_id from the group_order - delivery_product = sale_order.group_order_id.delivery_product_id + delivery_product = request.env.ref( + "website_sale_aplicoop.product_home_delivery", raise_if_not_found=False + ) delivery_product_id = delivery_product.id if delivery_product else None items = [] @@ -2824,6 +2110,9 @@ class AplicoopWebsiteSale(WebsiteSale): # Store items in localStorage by passing via URL parameter or session # We'll use sessionStorage in JavaScript to avoid URL length limits + # Get the current group order for comparison + current_group_order = request.env["group.order"].browse(group_order_id) + # Check if the order being loaded is from the same group order # If not, don't restore the old pickup fields - use the current group order's fields same_group_order = sale_order.group_order_id.id == group_order_id diff --git a/website_sale_aplicoop/data/cron.xml b/website_sale_aplicoop/data/cron.xml deleted file mode 100644 index 7194ae1..0000000 --- a/website_sale_aplicoop/data/cron.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Group Order: Update Dates Daily - - code - model._cron_update_dates() - 1 - days - - - - diff --git a/website_sale_aplicoop/data/website_menus.xml b/website_sale_aplicoop/data/website_menus.xml deleted file mode 100644 index a2a6e90..0000000 --- a/website_sale_aplicoop/data/website_menus.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Eskaera - /eskaera - - 50 - - - diff --git a/website_sale_aplicoop/i18n/README.md b/website_sale_aplicoop/i18n/README.md index 0dc25b6..e203387 100644 --- a/website_sale_aplicoop/i18n/README.md +++ b/website_sale_aplicoop/i18n/README.md @@ -21,7 +21,7 @@ Each `.po` file contains **66 translations** for: - **Selection Field Options** (Days of week, Recurrence periods) - Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday - Daily, Weekly, Biweekly, Monthly - + - **Order States** - Draft, Open, Closed, Cancelled @@ -36,7 +36,7 @@ Each `.po` file contains **66 translations** for: When users switch their Odoo interface language to any of the supported languages, all UI strings will automatically display in that language. ### Example -- English: "Group Order" +- English: "Group Order" - Spanish: "Pedido de Grupo" - Portuguese: "Pedido de Grupo" - French: "Commande de Groupe" diff --git a/website_sale_aplicoop/migrations/18.0.1.0.0/post-migrate.py b/website_sale_aplicoop/migrations/18.0.1.0.0/post-migrate.py index 93245bd..23a9ef7 100644 --- a/website_sale_aplicoop/migrations/18.0.1.0.0/post-migrate.py +++ b/website_sale_aplicoop/migrations/18.0.1.0.0/post-migrate.py @@ -1,40 +1,36 @@ """Fill pickup_day and pickup_date for existing group orders.""" -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta def migrate(cr, version): """ Fill pickup_day and pickup_date for existing group orders. - + This ensures that existing group orders show delivery information. """ - from odoo import SUPERUSER_ID - from odoo import api - + from odoo import api, SUPERUSER_ID + env = api.Environment(cr, SUPERUSER_ID, {}) - + # Get all group orders that don't have pickup_day set - group_orders = env["group.order"].search([("pickup_day", "=", False)]) - + group_orders = env['group.order'].search([('pickup_day', '=', False)]) + if not group_orders: return - + # Set default values: Friday (4) and one week from now today = datetime.now().date() - + # Find Friday of next week (day 4) days_until_friday = (4 - today.weekday()) % 7 # 4 = Friday if days_until_friday == 0: days_until_friday = 7 friday = today + timedelta(days=days_until_friday) - + for order in group_orders: - order.write( - { - "pickup_day": 4, # Friday - "pickup_date": friday, - "delivery_notice": "Home delivery available.", - } - ) + order.write({ + 'pickup_day': 4, # Friday + 'pickup_date': friday, + 'delivery_notice': 'Home delivery available.', + }) diff --git a/website_sale_aplicoop/migrations/18.0.1.0.2/post-migrate.py b/website_sale_aplicoop/migrations/18.0.1.0.2/post-migrate.py index 29f7523..6095a69 100644 --- a/website_sale_aplicoop/migrations/18.0.1.0.2/post-migrate.py +++ b/website_sale_aplicoop/migrations/18.0.1.0.2/post-migrate.py @@ -1,8 +1,7 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo import SUPERUSER_ID -from odoo import api +from odoo import api, SUPERUSER_ID def migrate(cr, version): @@ -14,7 +13,7 @@ def migrate(cr, version): env = api.Environment(cr, SUPERUSER_ID, {}) # Obtener la compañía por defecto - default_company = env["res.company"].search([], limit=1) + default_company = env['res.company'].search([], limit=1) if default_company: # Actualizar todos los registros de group.order que no tengan company_id @@ -24,7 +23,7 @@ def migrate(cr, version): SET company_id = %s WHERE company_id IS NULL """, - (default_company.id,), + (default_company.id,) ) cr.commit() diff --git a/website_sale_aplicoop/models/__init__.py b/website_sale_aplicoop/models/__init__.py index b94d3ea..5454723 100644 --- a/website_sale_aplicoop/models/__init__.py +++ b/website_sale_aplicoop/models/__init__.py @@ -3,5 +3,4 @@ from . import product_extension from . import res_config_settings from . import res_partner_extension from . import sale_order_extension -from . import stock_picking_extension from . import js_translations diff --git a/website_sale_aplicoop/models/group_order.py b/website_sale_aplicoop/models/group_order.py index 2e90b0d..cc16363 100644 --- a/website_sale_aplicoop/models/group_order.py +++ b/website_sale_aplicoop/models/group_order.py @@ -4,215 +4,239 @@ import logging from datetime import timedelta -from odoo import api -from odoo import fields -from odoo import models +from odoo import _, api, fields, models from odoo.exceptions import ValidationError _logger = logging.getLogger(__name__) class GroupOrder(models.Model): - _name = "group.order" - _description = "Consumer Group Order" - _inherit = ["mail.thread", "mail.activity.mixin"] - _order = "start_date desc" + _name = 'group.order' + _description = 'Consumer Group Order' + _inherit = ['mail.thread', 'mail.activity.mixin'] + _order = 'start_date desc' - def _get_order_type_selection(self): + @staticmethod + def _get_order_type_selection(records): """Return order type selection options with translations.""" return [ - ("regular", self.env._("Regular Order")), - ("special", self.env._("Special Order")), - ("promotional", self.env._("Promotional Order")), + ('regular', _('Regular Order')), + ('special', _('Special Order')), + ('promotional', _('Promotional Order')), ] - def _get_period_selection(self): + @staticmethod + def _get_period_selection(records): """Return period selection options with translations.""" return [ - ("once", self.env._("One-time")), - ("weekly", self.env._("Weekly")), - ("biweekly", self.env._("Biweekly")), - ("monthly", self.env._("Monthly")), + ('once', _('One-time')), + ('weekly', _('Weekly')), + ('biweekly', _('Biweekly')), + ('monthly', _('Monthly')), ] - def _get_day_selection(self): + @staticmethod + def _get_day_selection(records): """Return day of week selection options with translations.""" return [ - ("0", self.env._("Monday")), - ("1", self.env._("Tuesday")), - ("2", self.env._("Wednesday")), - ("3", self.env._("Thursday")), - ("4", self.env._("Friday")), - ("5", self.env._("Saturday")), - ("6", self.env._("Sunday")), + ('0', _('Monday')), + ('1', _('Tuesday')), + ('2', _('Wednesday')), + ('3', _('Thursday')), + ('4', _('Friday')), + ('5', _('Saturday')), + ('6', _('Sunday')), ] - def _get_state_selection(self): + @staticmethod + def _get_state_selection(records): """Return state selection options with translations.""" return [ - ("draft", self.env._("Draft")), - ("open", self.env._("Open")), - ("closed", self.env._("Closed")), - ("cancelled", self.env._("Cancelled")), + ('draft', _('Draft')), + ('open', _('Open')), + ('closed', _('Closed')), + ('cancelled', _('Cancelled')), ] # === Multicompañía === company_id = fields.Many2one( - "res.company", + 'res.company', + string='Company', required=True, default=lambda self: self.env.company, tracking=True, - help="Company that owns this consumer group order", + help='Company that owns this consumer group order', ) # === Campos básicos === name = fields.Char( + string='Name', required=True, tracking=True, translate=True, - help="Display name of this consumer group order", + help='Display name of this consumer group order', ) group_ids = fields.Many2many( - "res.partner", - "group_order_group_rel", - "order_id", - "group_id", + 'res.partner', + 'group_order_group_rel', + 'order_id', + 'group_id', + string='Consumer Groups', required=True, - domain=[("is_group", "=", True)], + domain=[('is_group', '=', True)], tracking=True, - help="Consumer groups that can participate in this order", + help='Consumer groups that can participate in this order', ) type = fields.Selection( selection=_get_order_type_selection, + string='Order Type', required=True, - default="regular", + default='regular', tracking=True, - help="Type of consumer group order: Regular, Special (one-time), or Promotional", + help='Type of consumer group order: Regular, Special (one-time), or Promotional', ) # === Fechas === start_date = fields.Date( + string='Start Date', required=False, tracking=True, - help="Day when the consumer group order opens for purchases", + help='Day when the consumer group order opens for purchases', ) end_date = fields.Date( + string='End Date', required=False, tracking=True, - help="If empty, the consumer group order is permanent", + help='If empty, the consumer group order is permanent', ) # === Período y días === period = fields.Selection( selection=_get_period_selection, + string='Recurrence Period', required=True, - default="weekly", + default='weekly', tracking=True, - help="How often this consumer group order repeats", + help='How often this consumer group order repeats', ) pickup_day = fields.Selection( selection=_get_day_selection, + string='Pickup Day', required=False, tracking=True, - help="Day of the week when members pick up their orders", + help='Day of the week when members pick up their orders', ) cutoff_day = fields.Selection( selection=_get_day_selection, + string='Cutoff Day', required=False, tracking=True, - help="Day when purchases stop and the consumer group order is locked for this week.", + help='Day when purchases stop and the consumer group order is locked for this week.', ) # === Home delivery === home_delivery = fields.Boolean( + string='Home Delivery', default=False, tracking=True, - help="Whether this consumer group order includes home delivery service", + help='Whether this consumer group order includes home delivery service', ) delivery_product_id = fields.Many2one( - "product.product", - domain=[("type", "=", "service")], + 'product.product', + string='Delivery Product', + domain=[('type', '=', 'service')], tracking=True, - help="Product to use for home delivery (service type)", + help='Product to use for home delivery (service type)', ) delivery_date = fields.Date( - compute="_compute_delivery_date", - store=True, + string='Delivery Date', + compute='_compute_delivery_date', + store=False, readonly=True, - help="Calculated delivery date (pickup date + 1 day)", + help='Calculated delivery date (pickup date + 1 day)', ) # === Computed date fields === pickup_date = fields.Date( - compute="_compute_pickup_date", + string='Pickup Date', + compute='_compute_pickup_date', store=True, readonly=True, - help="Calculated next occurrence of pickup day", + help='Calculated next occurrence of pickup day', ) cutoff_date = fields.Date( - compute="_compute_cutoff_date", + string='Cutoff Date', + compute='_compute_cutoff_date', store=True, readonly=True, - help="Calculated next occurrence of cutoff day", + help='Calculated next occurrence of cutoff day', ) # === Asociaciones === supplier_ids = fields.Many2many( - "res.partner", - "group_order_supplier_rel", - "order_id", - "supplier_id", - domain=[("supplier_rank", ">", 0)], + 'res.partner', + 'group_order_supplier_rel', + 'order_id', + 'supplier_id', + string='Suppliers', + domain=[('supplier_rank', '>', 0)], tracking=True, - help="Products from these suppliers will be available.", + help='Products from these suppliers will be available.', ) product_ids = fields.Many2many( - "product.product", - "group_order_product_rel", - "order_id", - "product_id", + 'product.product', + 'group_order_product_rel', + 'order_id', + 'product_id', + string='Products', tracking=True, - help="Directly assigned products.", + help='Directly assigned products.', ) category_ids = fields.Many2many( - "product.category", - "group_order_category_rel", - "order_id", - "category_id", + 'product.category', + 'group_order_category_rel', + 'order_id', + 'category_id', + string='Categories', tracking=True, - help="Products in these categories will be available", + help='Products in these categories will be available', ) # === Estado === state = fields.Selection( selection=_get_state_selection, - default="draft", + string='State', + default='draft', tracking=True, ) # === Descripción e imagen === description = fields.Text( + string='Description', translate=True, - help="Free text description for this consumer group order", + help='Free text description for this consumer group order', ) delivery_notice = fields.Text( + string='Delivery Notice', translate=True, - help="Notice about home delivery displayed to users (shown when home delivery is enabled)", + help='Notice about home delivery displayed to users (shown when home delivery is enabled)', ) image = fields.Binary( - help="Image displayed alongside the consumer group order name", + string='Image', + help='Image displayed alongside the consumer group order name', attachment=True, ) display_image = fields.Binary( - compute="_compute_display_image", + string='Display Image', + compute='_compute_display_image', store=True, - help="Image to display: uses consumer group order image if set, otherwise group image", + help='Image to display: uses consumer group order image if set, otherwise group image', attachment=True, ) - @api.depends("image", "group_ids") + @api.depends('image', 'group_ids') def _compute_display_image(self): - """Use order image if set, otherwise use first group image.""" + '''Use order image if set, otherwise use first group image.''' for record in self: if record.image: record.display_image = record.image @@ -222,84 +246,80 @@ class GroupOrder(models.Model): record.display_image = False available_products_count = fields.Integer( - compute="_compute_available_products_count", + string='Available Products Count', + compute='_compute_available_products_count', store=False, - help="Total count of available products from all sources", + help='Total count of available products from all sources', ) - @api.depends("product_ids", "category_ids", "supplier_ids") + @api.depends('product_ids', 'category_ids', 'supplier_ids') def _compute_available_products_count(self): - """Count all available products from all sources.""" + '''Count all available products from all sources.''' for record in self: products = self._get_products_for_group_order(record.id) record.available_products_count = len(products) - @api.constrains("company_id", "group_ids") + @api.constrains('company_id', 'group_ids') def _check_company_groups(self): - """Validate that groups belong to the same company.""" + '''Validate that groups belong to the same company.''' for record in self: for group in record.group_ids: if group.company_id and group.company_id != record.company_id: raise ValidationError( - self.env._( - "Group %(group)s belongs to company %(group_company)s, " - "not to %(record_company)s." - ) - % { - "group": group.name, - "group_company": group.company_id.name, - "record_company": record.company_id.name, - } + f'Group {group.name} belongs to company ' + f'{group.company_id.name}, not to {record.company_id.name}.' ) - @api.constrains("start_date", "end_date") + @api.constrains('start_date', 'end_date') def _check_dates(self): for record in self: if record.start_date and record.end_date: if record.start_date > record.end_date: raise ValidationError( - self.env._("Start date cannot be greater than end date") + 'Start date cannot be greater than end date' ) + + def action_open(self): - """Open order for purchases.""" - self.write({"state": "open"}) + '''Open order for purchases.''' + self.write({'state': 'open'}) def action_close(self): - """Close order.""" - self.write({"state": "closed"}) + '''Close order.''' + self.write({'state': 'closed'}) def action_cancel(self): - """Cancel order.""" - self.write({"state": "cancelled"}) + '''Cancel order.''' + self.write({'state': 'cancelled'}) def action_reset_to_draft(self): - """Reset order back to draft state.""" - self.write({"state": "draft"}) + '''Reset order back to draft state.''' + self.write({'state': 'draft'}) def get_active_orders_for_week(self): - """Get active orders for the current week. + '''Get active orders for the current week. Respects the allowed_company_ids context if defined. - """ + ''' today = fields.Date.today() week_start = today - timedelta(days=today.weekday()) week_end = week_start + timedelta(days=6) domain = [ - ("state", "=", "open"), - "|", - ("start_date", "=", False), # No start_date = always active - ("start_date", "<=", week_end), - "|", - ("end_date", "=", False), - ("end_date", ">=", week_start), + ('state', '=', 'open'), + '|', + ('start_date', '=', False), # No start_date = always active + ('start_date', '<=', week_end), + '|', + ('end_date', '=', False), + ('end_date', '>=', week_start), ] # Apply company filter if allowed_company_ids in context - if self.env.context.get("allowed_company_ids"): + if self.env.context.get('allowed_company_ids'): domain.append( - ("company_id", "in", self.env.context.get("allowed_company_ids")) + ('company_id', 'in', self.env.context.get('allowed_company_ids')) ) return self.search(domain) @@ -330,102 +350,69 @@ class GroupOrder(models.Model): """ order = self.browse(order_id) if not order.exists(): - return self.env["product.product"].browse() + return self.env['product.product'].browse() # Common domain for all searches: active, published, and sale_ok base_domain = [ - ("active", "=", True), - ("product_tmpl_id.is_published", "=", True), - ("product_tmpl_id.sale_ok", "=", True), + ('active', '=', True), + ('product_tmpl_id.is_published', '=', True), + ('product_tmpl_id.sale_ok', '=', True), ] - products = self.env["product.product"].browse() + products = self.env['product.product'].browse() # 1) Direct products assigned to order if order.product_ids: products |= order.product_ids.filtered( - lambda p: p.active - and p.product_tmpl_id.is_published - and p.product_tmpl_id.sale_ok + lambda p: p.active and p.product_tmpl_id.is_published and p.product_tmpl_id.sale_ok ) # 2) Products in categories assigned to order (including all subcategories) if order.category_ids: # Collect all category IDs including descendants all_category_ids = [] - def get_all_descendants(categories): """Recursively collect all descendant category IDs.""" for cat in categories: all_category_ids.append(cat.id) if cat.child_id: get_all_descendants(cat.child_id) - + get_all_descendants(order.category_ids) - + # Search for products in all categories and their descendants - cat_products = self.env["product.product"].search( - [("categ_id", "in", all_category_ids)] + base_domain + cat_products = self.env['product.product'].search( + [('categ_id', 'in', all_category_ids)] + base_domain ) products |= cat_products # 3) Products from suppliers (via product.template.seller_ids) if order.supplier_ids: - product_templates = self.env["product.template"].search( - [ - ("seller_ids.partner_id", "in", order.supplier_ids.ids), - ("is_published", "=", True), - ("sale_ok", "=", True), - ] - ) - supplier_products = product_templates.mapped( - "product_variant_ids" - ).filtered("active") + product_templates = self.env['product.template'].search([ + ('seller_ids.partner_id', 'in', order.supplier_ids.ids), + ('is_published', '=', True), + ('sale_ok', '=', True), + ]) + supplier_products = product_templates.mapped('product_variant_ids').filtered('active') products |= supplier_products return products - def _get_products_paginated(self, order_id, page=1, per_page=20): - """Get paginated products for a group order. - - Args: - order_id: ID of the group order - page: Page number (1-indexed) - per_page: Number of products per page - - Returns: - tuple: (products_page, total_count, has_next) - - products_page: recordset of product.product for this page - - total_count: total number of products in order - - has_next: boolean indicating if there are more pages - """ - all_products = self._get_products_for_group_order(order_id) - total_count = len(all_products) - - # Calculate pagination - offset = (page - 1) * per_page - products_page = all_products[offset : offset + per_page] - - has_next = offset + per_page < total_count - - return products_page, total_count, has_next - - @api.depends("cutoff_date", "pickup_day") + @api.depends('cutoff_date', 'pickup_day') def _compute_pickup_date(self): - """Compute pickup date as the first occurrence of pickup_day AFTER cutoff_date. - + '''Compute pickup date as the first occurrence of pickup_day AFTER cutoff_date. + This ensures pickup always comes after cutoff, maintaining logical order. - """ + ''' from datetime import datetime - - _logger.info("_compute_pickup_date called for %d records", len(self)) + _logger.info('_compute_pickup_date called for %d records', len(self)) for record in self: if not record.pickup_day: record.pickup_date = None continue - + target_weekday = int(record.pickup_day) - + # Start from cutoff_date if available, otherwise from today/start_date if record.cutoff_date: reference_date = record.cutoff_date @@ -435,146 +422,67 @@ class GroupOrder(models.Model): reference_date = today else: reference_date = record.start_date or today - + current_weekday = reference_date.weekday() - + # Calculate days to NEXT occurrence of pickup_day from reference days_ahead = target_weekday - current_weekday if days_ahead <= 0: days_ahead += 7 - + pickup_date = reference_date + timedelta(days=days_ahead) - + record.pickup_date = pickup_date - _logger.info( - "Computed pickup_date for order %d: %s (pickup_day=%s, reference=%s)", - record.id, - record.pickup_date, - record.pickup_day, - reference_date, - ) + _logger.info('Computed pickup_date for order %d: %s (pickup_day=%s, reference=%s)', + record.id, record.pickup_date, record.pickup_day, reference_date) - @api.depends("cutoff_day", "start_date") + @api.depends('cutoff_day', 'start_date') def _compute_cutoff_date(self): - """Compute the cutoff date (deadline to place orders before pickup). - + '''Compute the cutoff date (deadline to place orders before pickup). + The cutoff date is the NEXT occurrence of cutoff_day from today. This is when members can no longer place orders. - + Example (as of Monday 2026-02-09): - cutoff_day = 6 (Sunday) → cutoff_date = 2026-02-15 (next Sunday) - pickup_day = 1 (Tuesday) → pickup_date = 2026-02-17 (Tuesday after cutoff) - """ + ''' from datetime import datetime - - _logger.info("_compute_cutoff_date called for %d records", len(self)) + _logger.info('_compute_cutoff_date called for %d records', len(self)) for record in self: if record.cutoff_day: target_weekday = int(record.cutoff_day) today = datetime.now().date() - + # Use today as reference if start_date is in the past, otherwise use start_date if record.start_date and record.start_date < today: reference_date = today else: reference_date = record.start_date or today - + current_weekday = reference_date.weekday() - + # Calculate days to NEXT occurrence of cutoff_day days_ahead = target_weekday - current_weekday - - if days_ahead < 0: - # Target day already passed this week + + if days_ahead <= 0: + # Target day already passed this week or is today # Jump to next week's occurrence days_ahead += 7 - # If days_ahead == 0, cutoff is today (allowed) - + record.cutoff_date = reference_date + timedelta(days=days_ahead) - _logger.info( - "Computed cutoff_date for order %d: %s (target_weekday=%d, current=%d, days=%d)", - record.id, - record.cutoff_date, - target_weekday, - current_weekday, - days_ahead, - ) + _logger.info('Computed cutoff_date for order %d: %s (target_weekday=%d, current=%d, days=%d)', + record.id, record.cutoff_date, target_weekday, current_weekday, days_ahead) else: record.cutoff_date = None - @api.depends("pickup_date") + @api.depends('pickup_date') def _compute_delivery_date(self): - """Compute delivery date as pickup date + 1 day.""" - _logger.info("_compute_delivery_date called for %d records", len(self)) + '''Compute delivery date as pickup date + 1 day.''' + _logger.info('_compute_delivery_date called for %d records', len(self)) for record in self: if record.pickup_date: record.delivery_date = record.pickup_date + timedelta(days=1) - _logger.info( - "Computed delivery_date for order %d: %s", - record.id, - record.delivery_date, - ) + _logger.info('Computed delivery_date for order %d: %s', record.id, record.delivery_date) else: record.delivery_date = None - - # === Constraints === - - @api.constrains("cutoff_day", "pickup_day", "period") - def _check_cutoff_before_pickup(self): - """Validate that pickup_day comes after or equals cutoff_day in weekly orders. - - For weekly orders, if pickup_day < cutoff_day numerically, it means pickup - would be scheduled BEFORE cutoff in the same week cycle, which is illogical. - - Example: - - cutoff_day=3 (Thursday), pickup_day=1 (Tuesday): INVALID - (pickup Tuesday would be before cutoff Thursday) - - cutoff_day=1 (Tuesday), pickup_day=5 (Saturday): VALID - (pickup Saturday is after cutoff Tuesday) - - cutoff_day=5 (Saturday), pickup_day=5 (Saturday): VALID - (same day allowed) - """ - for record in self: - if record.cutoff_day and record.pickup_day and record.period == "weekly": - cutoff = int(record.cutoff_day) - pickup = int(record.pickup_day) - if pickup < cutoff: - pickup_name = dict(self._get_day_selection())[str(pickup)] - cutoff_name = dict(self._get_day_selection())[str(cutoff)] - raise ValidationError( - self.env._( - "For weekly orders, pickup day (%(pickup)s) must be after or equal to " - "cutoff day (%(cutoff)s) in the same week. Current configuration would " - "put pickup before cutoff, which is illogical." - ) - % {"pickup": pickup_name, "cutoff": cutoff_name} - ) - - # === Onchange Methods === - - @api.onchange("cutoff_day", "start_date") - def _onchange_cutoff_day(self): - """Force recompute cutoff_date on UI change for immediate feedback.""" - self._compute_cutoff_date() - - @api.onchange("pickup_day", "cutoff_day", "start_date") - def _onchange_pickup_day(self): - """Force recompute pickup_date on UI change for immediate feedback.""" - self._compute_pickup_date() - - # === Cron Methods === - - @api.model - def _cron_update_dates(self): - """Cron job to recalculate dates for active orders daily. - - This ensures that computed dates stay up-to-date as time passes. - Only updates orders in 'draft' or 'open' states. - """ - orders = self.search([("state", "in", ["draft", "open"])]) - _logger.info("Cron: Updating dates for %d active group orders", len(orders)) - for order in orders: - order._compute_cutoff_date() - order._compute_pickup_date() - order._compute_delivery_date() - _logger.info("Cron: Date update completed") diff --git a/website_sale_aplicoop/models/js_translations.py b/website_sale_aplicoop/models/js_translations.py index 01e24ad..686c0fa 100644 --- a/website_sale_aplicoop/models/js_translations.py +++ b/website_sale_aplicoop/models/js_translations.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. """ @@ -19,157 +20,151 @@ from odoo import _ def _register_translations(): """ Register all JavaScript translation strings. - + Called by Odoo's translation extraction system. These calls populate the POT/PO files for translation. """ # ======================== # Action Labels # ======================== - _("Save Cart") - _("Reload Cart") - _("Browse Product Categories") - _("Proceed to Checkout") - _("Confirm Order") - _("Back to Cart") - _("Remove Item") - _("Add to Cart") - _("Save as Draft") - _("Load Draft") - _("Browse Product Categories") + _('Save Cart') + _('Reload Cart') + _('Browse Product Categories') + _('Proceed to Checkout') + _('Confirm Order') + _('Back to Cart') + _('Remove Item') + _('Add to Cart') + _('Save as Draft') + _('Load Draft') + _('Browse Product Categories') # ======================== # Draft Modal Labels # ======================== - _("Draft Already Exists") - _("A saved draft already exists for this week.") - _("You have two options:") - _("Option 1: Merge with Existing Draft") - _("Combine your current cart with the existing draft.") - _("Existing draft has") - _("Current cart has") - _("item(s)") - _( - "Products will be merged by adding quantities. If a product exists in both, quantities will be combined." - ) - _("Option 2: Replace with Current Cart") - _("Delete the old draft and save only the current cart items.") - _("The existing draft will be permanently deleted.") - _("Merge") - _("Replace") + _('Draft Already Exists') + _('A saved draft already exists for this week.') + _('You have two options:') + _('Option 1: Merge with Existing Draft') + _('Combine your current cart with the existing draft.') + _('Existing draft has') + _('Current cart has') + _('item(s)') + _('Products will be merged by adding quantities. If a product exists in both, quantities will be combined.') + _('Option 2: Replace with Current Cart') + _('Delete the old draft and save only the current cart items.') + _('The existing draft will be permanently deleted.') + _('Merge') + _('Replace') # ======================== # Draft Save/Load Confirmations # ======================== - _("Are you sure you want to save this cart as draft? Items to save: ") - _("You will be able to reload this cart later.") - _("Are you sure you want to load your last saved draft?") - _("This will replace the current items in your cart") - _("with the saved draft.") + _('Are you sure you want to save this cart as draft? Items to save: ') + _('You will be able to reload this cart later.') + _('Are you sure you want to load your last saved draft?') + _('This will replace the current items in your cart') + _('with the saved draft.') # ======================== # Cart Messages (All Variations) # ======================== - _("Your cart is empty") - _("This order's cart is empty.") - _("This order's cart is empty") - _("added to cart") - _("items") - _("Your cart has been restored") + _('Your cart is empty') + _('This order\'s cart is empty.') + _('This order\'s cart is empty') + _('added to cart') + _('items') + _('Your cart has been restored') # ======================== # Confirmation & Validation # ======================== - _("Confirmation") - _("Confirm") - _("Cancel") - _("Please enter a valid quantity") + _('Confirmation') + _('Confirm') + _('Cancel') + _('Please enter a valid quantity') # ======================== # Error Messages # ======================== - _("Error: Order ID not found") - _("No draft orders found for this week") - _("Connection error") - _("Error loading order") - _("Error loading draft") - _("Unknown error") - _("Error saving cart") - _("Error processing response") + _('Error: Order ID not found') + _('No draft orders found for this week') + _('Connection error') + _('Error loading order') + _('Error loading draft') + _('Unknown error') + _('Error saving cart') + _('Error processing response') # ======================== # Success Messages # ======================== - _("Cart saved as draft successfully") - _("Draft order loaded successfully") - _("Draft merged successfully") - _("Draft replaced successfully") - _("Order loaded") - _("Thank you! Your order has been confirmed.") - _("Quantity updated") + _('Cart saved as draft successfully') + _('Draft order loaded successfully') + _('Draft merged successfully') + _('Draft replaced successfully') + _('Order loaded') + _('Thank you! Your order has been confirmed.') + _('Quantity updated') # ======================== # Field Labels # ======================== - _("Product") - _("Supplier") - _("Price") - _("Quantity") - _("Subtotal") - _("Total") + _('Product') + _('Supplier') + _('Price') + _('Quantity') + _('Subtotal') + _('Total') # ======================== # Checkout Page Labels # ======================== - _("Home Delivery") - _("Delivery Information") - _( - "Delivery Information: Your order will be delivered at {pickup_day} {pickup_date}" - ) - _("Your order will be delivered the day after pickup between 11:00 - 14:00") - _("Important") - _( - "Once you confirm this order, you will not be able to modify it. Please review carefully before confirming." - ) + _('Home Delivery') + _('Delivery Information') + _('Delivery Information: Your order will be delivered at {pickup_day} {pickup_date}') + _('Your order will be delivered the day after pickup between 11:00 - 14:00') + _('Important') + _('Once you confirm this order, you will not be able to modify it. Please review carefully before confirming.') # ======================== # Search & Filter Labels # ======================== - _("Search") - _("Search products...") - _("No products found") - _("Categories") - _("All categories") + _('Search') + _('Search products...') + _('No products found') + _('Categories') + _('All categories') # ======================== # Category Labels # ======================== - _("Order Type") - _("Order Period") - _("Cutoff Day") - _("Pickup Day") - _("Store Pickup Day") - _("Open until") + _('Order Type') + _('Order Period') + _('Cutoff Day') + _('Pickup Day') + _('Store Pickup Day') + _('Open until') # ======================== # Portal Page Labels (New) # ======================== - _("Load in Cart") - _("Consumer Group") - _("Delivery Information") - _("Delivery Date:") - _("Pickup Date:") - _("Delivery Notice:") - _("No special delivery instructions") - _("Pickup Location:") + _('Load in Cart') + _('Consumer Group') + _('Delivery Information') + _('Delivery Date:') + _('Pickup Date:') + _('Delivery Notice:') + _('No special delivery instructions') + _('Pickup Location:') # ======================== # Day Names (Required for translations) # ======================== - _("Monday") - _("Tuesday") - _("Wednesday") - _("Thursday") - _("Friday") - _("Saturday") - _("Sunday") + _('Monday') + _('Tuesday') + _('Wednesday') + _('Thursday') + _('Friday') + _('Saturday') + _('Sunday') diff --git a/website_sale_aplicoop/models/product_extension.py b/website_sale_aplicoop/models/product_extension.py index d02fdbd..90d896a 100644 --- a/website_sale_aplicoop/models/product_extension.py +++ b/website_sale_aplicoop/models/product_extension.py @@ -1,23 +1,20 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo import _ -from odoo import api -from odoo import fields -from odoo import models +from odoo import _, api, fields, models class ProductProduct(models.Model): - _inherit = "product.product" + _inherit = 'product.product' group_order_ids = fields.Many2many( - "group.order", - "group_order_product_rel", - "product_id", - "order_id", - string="Group Orders", + 'group.order', + 'group_order_product_rel', + 'product_id', + 'order_id', + string='Group Orders', readonly=True, - help="Group orders where this product is available", + help='Group orders where this product is available', ) @api.model @@ -28,25 +25,26 @@ class ProductProduct(models.Model): responsibilities together. Keep this wrapper so existing callers on `product.product` keep working. """ - order = self.env["group.order"].browse(order_id) + order = self.env['group.order'].browse(order_id) if not order.exists(): return self.browse() return order._get_products_for_group_order(order.id) class ProductTemplate(models.Model): - _inherit = "product.template" + _inherit = 'product.template' group_order_ids = fields.Many2many( - "group.order", - compute="_compute_group_order_ids", - string="Consumer Group Orders", + 'group.order', + compute='_compute_group_order_ids', + string='Consumer Group Orders', readonly=True, - help="Consumer group orders where variants of this product are available", + help='Consumer group orders where variants of this product are available', ) - @api.depends("product_variant_ids.group_order_ids") + @api.depends('product_variant_ids.group_order_ids') def _compute_group_order_ids(self): for template in self: variants = template.product_variant_ids - template.group_order_ids = variants.mapped("group_order_ids") + template.group_order_ids = variants.mapped('group_order_ids') + diff --git a/website_sale_aplicoop/models/res_config_settings.py b/website_sale_aplicoop/models/res_config_settings.py index b8dcfa3..d61476f 100644 --- a/website_sale_aplicoop/models/res_config_settings.py +++ b/website_sale_aplicoop/models/res_config_settings.py @@ -13,29 +13,3 @@ class ResConfigSettings(models.TransientModel): config_parameter="website_sale_aplicoop.pricelist_id", help="Pricelist to use for Aplicoop group orders. If not set, will use website default.", ) - - eskaera_lazy_loading_enabled = fields.Boolean( - string="Enable Lazy Loading", - config_parameter="website_sale_aplicoop.lazy_loading_enabled", - default=True, - help="Enable lazy loading of products in group order shop. Products will be paginated.", - ) - - eskaera_products_per_page = fields.Integer( - string="Products Per Page", - config_parameter="website_sale_aplicoop.products_per_page", - default=20, - help="Number of products to load per page in group order shop. Minimum 5, Maximum 100.", - ) - - @staticmethod - def _get_products_per_page_selection(records): - """Return default page sizes.""" - return [ - (5, "5"), - (10, "10"), - (15, "15"), - (20, "20"), - (30, "30"), - (50, "50"), - ] diff --git a/website_sale_aplicoop/models/res_partner_extension.py b/website_sale_aplicoop/models/res_partner_extension.py index 0168c9e..4095037 100644 --- a/website_sale_aplicoop/models/res_partner_extension.py +++ b/website_sale_aplicoop/models/res_partner_extension.py @@ -1,39 +1,37 @@ # Copyright 2025-Today Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo import _ -from odoo import fields -from odoo import models +from odoo import _, fields, models class ResPartner(models.Model): - _inherit = "res.partner" + _inherit = 'res.partner' # Campo para identificar si un partner es un grupo is_group = fields.Boolean( - string="Is a Consumer Group?", - help="Check this box if the partner represents a group of users", + string='Is a Consumer Group?', + help='Check this box if the partner represents a group of users', default=False, ) # Relación para los miembros de un grupo (si is_group es True) member_ids = fields.Many2many( - "res.partner", - "res_partner_group_members_rel", - "group_id", - "member_id", - domain=[("is_group", "=", True)], - string="Consumer Groups", - help="Consumer Groups this partner belongs to", + 'res.partner', + 'res_partner_group_members_rel', + 'group_id', + 'member_id', + domain=[('is_group', '=', True)], + string='Consumer Groups', + help='Consumer Groups this partner belongs to', ) # Inverse relation: group orders this group participates in group_order_ids = fields.Many2many( - "group.order", - "group_order_group_rel", - "group_id", - "order_id", - string="Consumer Group Orders", - help="Group orders this consumer group participates in", + 'group.order', + 'group_order_group_rel', + 'group_id', + 'order_id', + string='Consumer Group Orders', + help='Group orders this consumer group participates in', readonly=True, ) diff --git a/website_sale_aplicoop/models/sale_order_extension.py b/website_sale_aplicoop/models/sale_order_extension.py index 873b9a9..72a16be 100644 --- a/website_sale_aplicoop/models/sale_order_extension.py +++ b/website_sale_aplicoop/models/sale_order_extension.py @@ -1,52 +1,56 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo import fields -from odoo import models +from odoo import _, fields, models class SaleOrder(models.Model): - _inherit = "sale.order" + _inherit = 'sale.order' - def _get_pickup_day_selection(self): + @staticmethod + def _get_pickup_day_selection(records): """Return pickup day selection options with translations.""" return [ - ("0", self.env._("Monday")), - ("1", self.env._("Tuesday")), - ("2", self.env._("Wednesday")), - ("3", self.env._("Thursday")), - ("4", self.env._("Friday")), - ("5", self.env._("Saturday")), - ("6", self.env._("Sunday")), + ('0', _('Monday')), + ('1', _('Tuesday')), + ('2', _('Wednesday')), + ('3', _('Thursday')), + ('4', _('Friday')), + ('5', _('Saturday')), + ('6', _('Sunday')), ] pickup_day = fields.Selection( selection=_get_pickup_day_selection, - help="Day of week when this order will be picked up (inherited from group order)", + string='Pickup Day', + help='Day of week when this order will be picked up (inherited from group order)', ) group_order_id = fields.Many2one( - "group.order", - help="Reference to the consumer group order that originated this sale order", + 'group.order', + string='Consumer Group Order', + help='Reference to the consumer group order that originated this sale order', ) pickup_date = fields.Date( - help="Calculated pickup/delivery date (inherited from consumer group order)", + string='Pickup Date', + help='Calculated pickup/delivery date (inherited from consumer group order)', ) home_delivery = fields.Boolean( + string='Home Delivery', default=False, - help="Whether this order includes home delivery (inherited from consumer group order)", + help='Whether this order includes home delivery (inherited from consumer group order)', ) def _get_name_portal_content_view(self): """Override to return custom portal content template with group order info. - + This method is called by the portal template to determine which content template to render. We return our custom template that includes the group order information (Consumer Group, Delivery/Pickup info, etc.) """ self.ensure_one() if self.group_order_id: - return "website_sale_aplicoop.sale_order_portal_content_aplicoop" + return 'website_sale_aplicoop.sale_order_portal_content_aplicoop' return super()._get_name_portal_content_view() diff --git a/website_sale_aplicoop/models/stock_picking_extension.py b/website_sale_aplicoop/models/stock_picking_extension.py deleted file mode 100644 index 83b11f5..0000000 --- a/website_sale_aplicoop/models/stock_picking_extension.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2026 Criptomart -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) - -from odoo import fields -from odoo import models - - -class StockPicking(models.Model): - _inherit = "stock.picking" - - group_order_id = fields.Many2one( - "group.order", - related="sale_id.group_order_id", - string="Consumer Group Order", - store=True, - readonly=True, - help="Consumer group order from the related sale order", - ) - - home_delivery = fields.Boolean( - related="sale_id.home_delivery", - string="Home Delivery", - store=True, - readonly=True, - help="Whether this picking includes home delivery (from sale order)", - ) - - pickup_date = fields.Date( - related="sale_id.pickup_date", - string="Pickup Date", - store=True, - readonly=True, - help="Pickup/delivery date from sale order", - ) - - consumer_group_id = fields.Many2one( - "res.partner", - related="sale_id.partner_id", - string="Consumer Group", - store=True, - readonly=True, - domain=[("is_group", "=", True)], - help="Consumer group (partner) from sale order for warehouse grouping", - ) diff --git a/website_sale_aplicoop/readme/CREDITS.md b/website_sale_aplicoop/readme/CREDITS.md index 70ad028..d1e1972 100644 --- a/website_sale_aplicoop/readme/CREDITS.md +++ b/website_sale_aplicoop/readme/CREDITS.md @@ -6,3 +6,4 @@ The implementation follows OCA standards for: - Code quality and testing (26 passing tests) - Documentation structure and multilingual support - Security and access control + diff --git a/website_sale_aplicoop/readme/USAGE.md b/website_sale_aplicoop/readme/USAGE.md index db09130..4dcd7a5 100644 --- a/website_sale_aplicoop/readme/USAGE.md +++ b/website_sale_aplicoop/readme/USAGE.md @@ -48,3 +48,4 @@ - `start_date` must be ≤ `end_date` (when both filled) - Empty end_date = permanent order + diff --git a/website_sale_aplicoop/security/ir.model.access.csv b/website_sale_aplicoop/security/ir.model.access.csv index 10027e4..484ee9b 100644 --- a/website_sale_aplicoop/security/ir.model.access.csv +++ b/website_sale_aplicoop/security/ir.model.access.csv @@ -4,3 +4,4 @@ access_group_order_user,group.order user,model_group_order,website_sale_aplicoop access_group_order_manager,group.order manager,model_group_order,website_sale_aplicoop.group_group_order_manager,1,1,1,1 access_group_order_portal,group.order portal,model_group_order,base.group_portal,1,0,0,0 access_product_supplierinfo_portal,product.supplierinfo portal,product.model_product_supplierinfo,base.group_portal,1,0,0,0 + diff --git a/website_sale_aplicoop/setup.py b/website_sale_aplicoop/setup.py index ee38ad1..43c6b0c 100644 --- a/website_sale_aplicoop/setup.py +++ b/website_sale_aplicoop/setup.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 +# -*- coding: utf-8 -*- -from setuptools import find_packages -from setuptools import setup +from setuptools import setup, find_packages -with open("README.rst", encoding="utf-8") as fh: +with open("README.rst", "r", encoding="utf-8") as fh: long_description = fh.read() setup( diff --git a/website_sale_aplicoop/static/src/css/README.md b/website_sale_aplicoop/static/src/css/README.md index 938b4a0..fc15249 100644 --- a/website_sale_aplicoop/static/src/css/README.md +++ b/website_sale_aplicoop/static/src/css/README.md @@ -1,8 +1,8 @@ # CSS Architecture - Website Sale Aplicoop -**Refactoring Date**: 7 de febrero de 2026 -**Status**: ✅ Complete -**Previous Size**: 2,986 líneas en 1 archivo +**Refactoring Date**: 7 de febrero de 2026 +**Status**: ✅ Complete +**Previous Size**: 2,986 líneas en 1 archivo **New Size**: ~400 líneas distribuidas en 15 archivos modulares --- @@ -59,43 +59,43 @@ website_sale_aplicoop/static/src/css/ ## 📊 Desglose de Archivos ### **base/** - Fundamentos -- **variables.css** (~80 líneas) +- **variables.css** (~80 líneas) Colores, tipografía, espaciados, sombras, transiciones, z-index -- **utilities.css** (~15 líneas) +- **utilities.css** (~15 líneas) Clases utilitarias reutilizables (.sr-only, .text-muted, etc) ### **layout/** - Estructura Global -- **pages.css** (~70 líneas) +- **pages.css** (~70 líneas) Fondos de página, gradientes, pseudo-elementos (::before) -- **header.css** (~100 líneas) +- **header.css** (~100 líneas) Headers, navegación, títulos, información de pedidos -- **responsive.css** (~200 líneas) +- **responsive.css** (~200 líneas) Todas las media queries (4 breakpoints: 992px, 768px, 576px, etc) ### **components/** - Elementos Reutilizables -- **product-card.css** (~80 líneas) +- **product-card.css** (~80 líneas) Tarjetas de producto con hover, imagen, título, precio -- **order-card.css** (~100 líneas) +- **order-card.css** (~100 líneas) Tarjetas de orden (Eskaera) con metadatos, badges -- **cart.css** (~150 líneas) +- **cart.css** (~150 líneas) Carrito lateral, items, total, botones save/reload -- **buttons.css** (~80 líneas) +- **buttons.css** (~80 líneas) Botones primarios, checkout, acciones -- **quantity-control.css** (~100 líneas) +- **quantity-control.css** (~100 líneas) Control de cantidad (spinners + input numérico) -- **forms.css** (~70 líneas) +- **forms.css** (~70 líneas) Inputs, selects, checkboxes, labels -- **alerts.css** (~50 líneas) +- **alerts.css** (~50 líneas) Alertas, notificaciones, toasts ### **sections/** - Layouts Específicos de Página -- **products-grid.css** (~25 líneas) +- **products-grid.css** (~25 líneas) Grid de productos con responsive -- **order-list.css** (~40 líneas) +- **order-list.css** (~40 líneas) Lista de órdenes (Eskaera page) -- **checkout.css** (~100 líneas) +- **checkout.css** (~100 líneas) Tabla de checkout, totales, summary -- **info-cards.css** (~50 líneas) +- **info-cards.css** (~50 líneas) Tarjetas de información, metadatos --- @@ -183,7 +183,7 @@ Permitiría mejor nesting y variables más poderosas. ## 📈 Cambios Visuales -✅ **NINGUNO** - La refactorización es solo organizacional +✅ **NINGUNO** - La refactorización es solo organizacional El CSS compilado genera **exactamente el mismo output** que antes. --- @@ -231,6 +231,6 @@ grep -r "components/\|sections/\|base/\|layout/" css/website_sale.css --- -**Mantenido por**: Equipo de Frontend -**Última actualización**: 7 de febrero de 2026 +**Mantenido por**: Equipo de Frontend +**Última actualización**: 7 de febrero de 2026 **Licencia**: AGPL-3.0 diff --git a/website_sale_aplicoop/static/src/css/base/variables.css b/website_sale_aplicoop/static/src/css/base/variables.css index 9152e76..7289115 100644 --- a/website_sale_aplicoop/static/src/css/base/variables.css +++ b/website_sale_aplicoop/static/src/css/base/variables.css @@ -16,27 +16,26 @@ --info-color: #17a2b8; --light-color: #f8f9fa; --dark-color: #2d3748; - + /* Text colors */ --text-primary: #1a202c; --text-secondary: #4a5568; --text-muted: #6b7280; - + /* Border colors */ --border-light: #e2e8f0; --border-medium: #cbd5e0; --border-dark: #718096; - + /* ========== TYPOGRAPHY ========== */ - --font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", - Arial, sans-serif; + --font-family-base: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; --font-weight-light: 300; --font-weight-normal: 400; --font-weight-medium: 500; --font-weight-semibold: 600; --font-weight-bold: 700; --font-weight-extrabold: 800; - + /* ========== SPACING ========== */ --spacing-xs: 0.25rem; --spacing-sm: 0.5rem; @@ -44,23 +43,23 @@ --spacing-lg: 1.5rem; --spacing-xl: 2rem; --spacing-2xl: 3rem; - + /* ========== BORDER RADIUS ========== */ --radius-sm: 0.25rem; --radius-md: 0.5rem; --radius-lg: 0.75rem; --radius-xl: 1rem; - + /* ========== SHADOWS ========== */ --shadow-sm: 0 2px 8px rgba(0, 0, 0, 0.08); --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.1); --shadow-lg: 0 10px 25px rgba(0, 0, 0, 0.12); - + /* ========== TRANSITIONS ========== */ --transition-fast: 200ms ease; - --transition-normal: 320ms cubic-bezier(0.2, 0.9, 0.2, 1); + --transition-normal: 320ms cubic-bezier(.2, .9, .2, 1); --transition-slow: 500ms ease; - + /* ========== Z-INDEX ========== */ --z-dropdown: 1000; --z-sticky: 1020; diff --git a/website_sale_aplicoop/static/src/css/components/order-card.css b/website_sale_aplicoop/static/src/css/components/order-card.css index 781e166..699798f 100644 --- a/website_sale_aplicoop/static/src/css/components/order-card.css +++ b/website_sale_aplicoop/static/src/css/components/order-card.css @@ -17,8 +17,7 @@ border: 1px solid rgba(90, 103, 216, 0.12); border-radius: 0.75rem; box-shadow: 0 6px 18px rgba(28, 37, 80, 0.06); - transition: transform 320ms cubic-bezier(0.2, 0.9, 0.2, 1), box-shadow 320ms, border-color 320ms, - background 320ms; + transition: transform 320ms cubic-bezier(.2, .9, .2, 1), box-shadow 320ms, border-color 320ms, background 320ms; overflow: hidden; display: flex; flex-direction: column; @@ -140,7 +139,7 @@ } .eskaera-order-card .btn::before { - content: ""; + content: ''; position: absolute; top: 50%; left: 50%; diff --git a/website_sale_aplicoop/static/src/css/components/product-card.css b/website_sale_aplicoop/static/src/css/components/product-card.css index c6eef5c..5d5b73e 100644 --- a/website_sale_aplicoop/static/src/css/components/product-card.css +++ b/website_sale_aplicoop/static/src/css/components/product-card.css @@ -51,11 +51,7 @@ } .product-card:hover .card-body { - background: linear-gradient( - 135deg, - rgba(108, 117, 125, 0.1) 0%, - rgba(108, 117, 125, 0.08) 100% - ); + background: linear-gradient(135deg, rgba(108, 117, 125, 0.10) 0%, rgba(108, 117, 125, 0.08) 100%); } .product-card .card-title { diff --git a/website_sale_aplicoop/static/src/css/components/quantity-control.css b/website_sale_aplicoop/static/src/css/components/quantity-control.css index 64a0087..78e8ed1 100644 --- a/website_sale_aplicoop/static/src/css/components/quantity-control.css +++ b/website_sale_aplicoop/static/src/css/components/quantity-control.css @@ -21,7 +21,7 @@ .add-to-cart-form .input-group { width: 100%; gap: 0; - padding: 0; + padding: 0; display: flex; align-items: center; justify-content: center; diff --git a/website_sale_aplicoop/static/src/css/components/tag-filter.css b/website_sale_aplicoop/static/src/css/components/tag-filter.css index 45022d5..0ad42be 100644 --- a/website_sale_aplicoop/static/src/css/components/tag-filter.css +++ b/website_sale_aplicoop/static/src/css/components/tag-filter.css @@ -5,7 +5,7 @@ /** * Tag Filter Badges Component - * + * * Styles for interactive tag filter badges in the product search/filter bar. * Badges toggle between secondary (unselected) and primary (selected) states. */ @@ -65,7 +65,7 @@ .tag-filter-badges { gap: 0.375rem; } - + .tag-filter-badge { padding: 0.375rem 0.625rem; font-size: 0.8125rem; diff --git a/website_sale_aplicoop/static/src/css/layout/pages.css b/website_sale_aplicoop/static/src/css/layout/pages.css index 267e560..34ce83a 100644 --- a/website_sale_aplicoop/static/src/css/layout/pages.css +++ b/website_sale_aplicoop/static/src/css/layout/pages.css @@ -4,15 +4,13 @@ * Page backgrounds and main layout structures */ -html, -body { +html, body { background-color: transparent !important; background: transparent !important; } body.website_published { - background: linear-gradient( - 135deg, + background: linear-gradient(135deg, color-mix(in srgb, var(--primary-color) 30%, white), color-mix(in srgb, var(--primary-color) 60%, black) ) !important; @@ -34,24 +32,21 @@ body.website_published .eskaera-checkout-page { .eskaera-page, .eskaera-generic-page { - background: linear-gradient( - 180deg, + background: linear-gradient(180deg, color-mix(in srgb, var(--primary-color) 10%, white), color-mix(in srgb, var(--primary-color) 70%, black) ) !important; } .eskaera-shop-page { - background: linear-gradient( - 135deg, + background: linear-gradient(135deg, color-mix(in srgb, var(--primary-color) 10%, white), color-mix(in srgb, var(--primary-color) 10%, rgb(135, 135, 135)) ) !important; } .eskaera-checkout-page { - background: linear-gradient( - -135deg, + background: linear-gradient(-135deg, color-mix(in srgb, var(--primary-color) 0%, white), color-mix(in srgb, var(--primary-color) 60%, black) ) !important; @@ -59,54 +54,29 @@ body.website_published .eskaera-checkout-page { .eskaera-page::before, .eskaera-generic-page::before { - background-image: radial-gradient( - circle at 20% 50%, - color-mix(in srgb, var(--primary-color, white) 20%, transparent) 0%, - transparent 50% - ), - radial-gradient( - circle at 80% 80%, - color-mix(in srgb, var(--primary-color) 25%, transparent) 0%, - transparent 50% - ), - radial-gradient( - circle at 40% 20%, - color-mix(in srgb, var(--primary-color, white) 15%, transparent) 0%, - transparent 50% - ); + background-image: + radial-gradient(circle at 20% 50%, color-mix(in srgb, var(--primary-color, white) 20%, transparent) 0%, transparent 50%), + radial-gradient(circle at 80% 80%, color-mix(in srgb, var(--primary-color) 25%, transparent) 0%, transparent 50%), + radial-gradient(circle at 40% 20%, color-mix(in srgb, var(--primary-color, white) 15%, transparent) 0%, transparent 50%); } .eskaera-shop-page::before { - background-image: radial-gradient( - circle at 15% 30%, - color-mix(in srgb, var(--primary-color, white) 18%, transparent) 0%, - transparent 50% - ), - radial-gradient( - circle at 85% 70%, - color-mix(in srgb, var(--primary-color) 22%, transparent) 0%, - transparent 50% - ); + background-image: + radial-gradient(circle at 15% 30%, color-mix(in srgb, var(--primary-color, white) 18%, transparent) 0%, transparent 50%), + radial-gradient(circle at 85% 70%, color-mix(in srgb, var(--primary-color) 22%, transparent) 0%, transparent 50%); } .eskaera-checkout-page::before { - background-image: radial-gradient( - circle at 20% 50%, - color-mix(in srgb, var(--primary-color, white) 20%, transparent) 0%, - transparent 50% - ), - radial-gradient( - circle at 80% 80%, - color-mix(in srgb, var(--primary-color) 25%, transparent) 0%, - transparent 50% - ); + background-image: + radial-gradient(circle at 20% 50%, color-mix(in srgb, var(--primary-color, white) 20%, transparent) 0%, transparent 50%), + radial-gradient(circle at 80% 80%, color-mix(in srgb, var(--primary-color) 25%, transparent) 0%, transparent 50%); } .eskaera-page::before, .eskaera-shop-page::before, .eskaera-generic-page::before, .eskaera-checkout-page::before { - content: ""; + content: ''; position: absolute; top: 0; left: 0; diff --git a/website_sale_aplicoop/static/src/css/layout/responsive.css b/website_sale_aplicoop/static/src/css/layout/responsive.css index 1e62b6e..a0d0fd0 100644 --- a/website_sale_aplicoop/static/src/css/layout/responsive.css +++ b/website_sale_aplicoop/static/src/css/layout/responsive.css @@ -17,20 +17,20 @@ .cart-items { max-height: 400px; } - + #cart-items-container { width: 100%; padding: 0.75rem; } - + .list-group-item { padding: 0.75rem; } - + .list-group-item h6 { font-size: 0.95rem; } - + .list-group-item strong { min-width: 70px; } @@ -43,7 +43,7 @@ .cart-header h5 { font-size: 1.25rem; } - + .cart-title-lg { font-size: 1.25rem; } @@ -476,13 +476,13 @@ .product-tags { font-size: 1.1rem !important; } - + /* Scale down quantity input for 6-column layout */ .add-to-cart-form .product-qty { font-size: 0.85rem; max-width: 55px; } - + .add-to-cart-form .qty-decrease, .add-to-cart-form .qty-increase { font-size: 0.75rem; @@ -495,13 +495,13 @@ .product-tags { font-size: 1.25rem !important; } - + /* Scale down quantity input for 5-column layout */ .add-to-cart-form .product-qty { font-size: 0.9rem; max-width: 60px; } - + .add-to-cart-form .qty-decrease, .add-to-cart-form .qty-increase { font-size: 0.8rem; diff --git a/website_sale_aplicoop/static/src/css/sections/info-cards.css b/website_sale_aplicoop/static/src/css/sections/info-cards.css index 92927d2..0a0bf9a 100644 --- a/website_sale_aplicoop/static/src/css/sections/info-cards.css +++ b/website_sale_aplicoop/static/src/css/sections/info-cards.css @@ -19,7 +19,7 @@ grid-template-columns: 1fr 1fr; gap: 0.5rem; align-items: start; - margin-top: 0.5rem; + margin-top: 0.5rem; } .card-meta-compact { diff --git a/website_sale_aplicoop/static/src/css/website_sale.css b/website_sale_aplicoop/static/src/css/website_sale.css index dbce461..995c23d 100644 --- a/website_sale_aplicoop/static/src/css/website_sale.css +++ b/website_sale_aplicoop/static/src/css/website_sale.css @@ -3,7 +3,7 @@ /** * Website Sale Aplicoop - Main CSS Index File * This file imports all component stylesheets in the correct order - * + * * Architecture: * 1. Base & Variables (colors, spacing, typography) * 2. Layout & Pages (page backgrounds, containers) @@ -15,36 +15,36 @@ /* ============================================ 1. BASE & VARIABLES ============================================ */ -@import "base/variables.css"; -@import "base/utilities.css"; +@import 'base/variables.css'; +@import 'base/utilities.css'; /* ============================================ 2. LAYOUT & PAGES ============================================ */ -@import "layout/pages.css"; -@import "layout/header.css"; +@import 'layout/pages.css'; +@import 'layout/header.css'; /* ============================================ 3. COMPONENTS (Reusable UI elements) ============================================ */ -@import "components/product-card.css"; -@import "components/order-card.css"; -@import "components/cart.css"; -@import "components/buttons.css"; -@import "components/quantity-control.css"; -@import "components/forms.css"; -@import "components/alerts.css"; -@import "components/tag-filter.css"; +@import 'components/product-card.css'; +@import 'components/order-card.css'; +@import 'components/cart.css'; +@import 'components/buttons.css'; +@import 'components/quantity-control.css'; +@import 'components/forms.css'; +@import 'components/alerts.css'; +@import 'components/tag-filter.css'; /* ============================================ 4. SECTIONS (Page-specific layouts) ============================================ */ -@import "sections/products-grid.css"; -@import "sections/order-list.css"; -@import "sections/checkout.css"; -@import "sections/info-cards.css"; +@import 'sections/products-grid.css'; +@import 'sections/order-list.css'; +@import 'sections/checkout.css'; +@import 'sections/info-cards.css'; /* ============================================ 5. RESPONSIVE DESIGN (Media queries) ============================================ */ -@import "layout/responsive.css"; +@import 'layout/responsive.css'; diff --git a/website_sale_aplicoop/static/src/js/checkout_labels.js b/website_sale_aplicoop/static/src/js/checkout_labels.js index b2537db..494c22b 100644 --- a/website_sale_aplicoop/static/src/js/checkout_labels.js +++ b/website_sale_aplicoop/static/src/js/checkout_labels.js @@ -5,158 +5,140 @@ * before rendering the checkout summary. */ -(function () { - "use strict"; +(function() { + 'use strict'; - console.log("[CHECKOUT] Script loaded"); + console.log('[CHECKOUT] Script loaded'); // Get order ID from button - var confirmBtn = document.getElementById("confirm-order-btn"); + var confirmBtn = document.getElementById('confirm-order-btn'); if (!confirmBtn) { - console.log("[CHECKOUT] No confirm button found"); + console.log('[CHECKOUT] No confirm button found'); return; } - var orderId = confirmBtn.getAttribute("data-order-id"); + var orderId = confirmBtn.getAttribute('data-order-id'); if (!orderId) { - console.log("[CHECKOUT] No order ID found"); + console.log('[CHECKOUT] No order ID found'); return; } - console.log("[CHECKOUT] Order ID:", orderId); + console.log('[CHECKOUT] Order ID:', orderId); // Get summary div - var summaryDiv = document.getElementById("checkout-summary"); + var summaryDiv = document.getElementById('checkout-summary'); if (!summaryDiv) { - console.log("[CHECKOUT] No summary div found"); + console.log('[CHECKOUT] No summary div found'); return; } // Function to fetch labels and render checkout - var fetchLabelsAndRender = function () { - console.log("[CHECKOUT] Fetching labels..."); - + var fetchLabelsAndRender = function() { + console.log('[CHECKOUT] Fetching labels...'); + // Wait for window.groupOrderShop.labels to be initialized (contains hardcoded labels) - var waitForLabels = function (callback, maxWait = 3000, checkInterval = 50) { + var waitForLabels = function(callback, maxWait = 3000, checkInterval = 50) { var startTime = Date.now(); - var checkLabels = function () { - if ( - window.groupOrderShop && - window.groupOrderShop.labels && - Object.keys(window.groupOrderShop.labels).length > 0 - ) { - console.log("[CHECKOUT] ✅ Hardcoded labels found, proceeding"); + var checkLabels = function() { + if (window.groupOrderShop && window.groupOrderShop.labels && Object.keys(window.groupOrderShop.labels).length > 0) { + console.log('[CHECKOUT] ✅ Hardcoded labels found, proceeding'); callback(); } else if (Date.now() - startTime < maxWait) { setTimeout(checkLabels, checkInterval); } else { - console.log("[CHECKOUT] ⚠️ Timeout waiting for labels, proceeding anyway"); + console.log('[CHECKOUT] ⚠️ Timeout waiting for labels, proceeding anyway'); callback(); } }; checkLabels(); }; - - waitForLabels(function () { + + waitForLabels(function() { // Now fetch additional labels from server // Detect current language from document or navigator - var currentLang = - document.documentElement.lang || - document.documentElement.getAttribute("lang") || - navigator.language || - "es_ES"; - console.log("[CHECKOUT] Detected language:", currentLang); - - fetch("/eskaera/labels", { - method: "POST", + var currentLang = document.documentElement.lang || + document.documentElement.getAttribute('lang') || + navigator.language || + 'es_ES'; + console.log('[CHECKOUT] Detected language:', currentLang); + + fetch('/eskaera/labels', { + method: 'POST', headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, body: JSON.stringify({ - lang: currentLang, - }), + lang: currentLang + }) }) - .then(function (response) { - console.log("[CHECKOUT] Response status:", response.status); - return response.json(); - }) - .then(function (data) { - console.log("[CHECKOUT] Response data:", data); - var serverLabels = data.result || data; - console.log( - "[CHECKOUT] Server labels count:", - Object.keys(serverLabels).length - ); - console.log("[CHECKOUT] Sample server labels:", { - draft_merged_success: serverLabels.draft_merged_success, - home_delivery: serverLabels.home_delivery, - }); - - // CRITICAL: Merge server labels with existing hardcoded labels - // Hardcoded labels MUST take precedence over server labels - if (window.groupOrderShop && window.groupOrderShop.labels) { - var existingLabels = window.groupOrderShop.labels; - console.log( - "[CHECKOUT] Existing hardcoded labels count:", - Object.keys(existingLabels).length - ); - console.log("[CHECKOUT] Sample existing labels:", { - draft_merged_success: existingLabels.draft_merged_success, - home_delivery: existingLabels.home_delivery, - }); - - // Start with server labels, then overwrite with hardcoded ones - var mergedLabels = Object.assign({}, serverLabels); - Object.assign(mergedLabels, existingLabels); - - window.groupOrderShop.labels = mergedLabels; - console.log( - "[CHECKOUT] ✅ Merged labels - final count:", - Object.keys(mergedLabels).length - ); - console.log("[CHECKOUT] Verification:", { - draft_merged_success: mergedLabels.draft_merged_success, - home_delivery: mergedLabels.home_delivery, - }); - } else { - // If no existing labels, use server labels as fallback - if (window.groupOrderShop) { - window.groupOrderShop.labels = serverLabels; - } - console.log("[CHECKOUT] ⚠️ No existing labels, using server labels"); - } - - window.renderCheckoutSummary(window.groupOrderShop.labels); - }) - .catch(function (error) { - console.error("[CHECKOUT] Error:", error); - // Fallback to translated labels - window.renderCheckoutSummary(window.getCheckoutLabels()); + .then(function(response) { + console.log('[CHECKOUT] Response status:', response.status); + return response.json(); + }) + .then(function(data) { + console.log('[CHECKOUT] Response data:', data); + var serverLabels = data.result || data; + console.log('[CHECKOUT] Server labels count:', Object.keys(serverLabels).length); + console.log('[CHECKOUT] Sample server labels:', { + draft_merged_success: serverLabels.draft_merged_success, + home_delivery: serverLabels.home_delivery }); + + // CRITICAL: Merge server labels with existing hardcoded labels + // Hardcoded labels MUST take precedence over server labels + if (window.groupOrderShop && window.groupOrderShop.labels) { + var existingLabels = window.groupOrderShop.labels; + console.log('[CHECKOUT] Existing hardcoded labels count:', Object.keys(existingLabels).length); + console.log('[CHECKOUT] Sample existing labels:', { + draft_merged_success: existingLabels.draft_merged_success, + home_delivery: existingLabels.home_delivery + }); + + // Start with server labels, then overwrite with hardcoded ones + var mergedLabels = Object.assign({}, serverLabels); + Object.assign(mergedLabels, existingLabels); + + window.groupOrderShop.labels = mergedLabels; + console.log('[CHECKOUT] ✅ Merged labels - final count:', Object.keys(mergedLabels).length); + console.log('[CHECKOUT] Verification:', { + draft_merged_success: mergedLabels.draft_merged_success, + home_delivery: mergedLabels.home_delivery + }); + } else { + // If no existing labels, use server labels as fallback + if (window.groupOrderShop) { + window.groupOrderShop.labels = serverLabels; + } + console.log('[CHECKOUT] ⚠️ No existing labels, using server labels'); + } + + window.renderCheckoutSummary(window.groupOrderShop.labels); + }) + .catch(function(error) { + console.error('[CHECKOUT] Error:', error); + // Fallback to translated labels + window.renderCheckoutSummary(window.getCheckoutLabels()); + }); }); }; // Listen for cart ready event instead of polling if (window.groupOrderShop && window.groupOrderShop.orderId) { // Cart already initialized, render immediately - console.log("[CHECKOUT] Cart already ready"); + console.log('[CHECKOUT] Cart already ready'); fetchLabelsAndRender(); } else { // Wait for cart initialization event - console.log("[CHECKOUT] Waiting for cart ready event..."); - document.addEventListener( - "groupOrderCartReady", - function () { - console.log("[CHECKOUT] Cart ready event received"); - fetchLabelsAndRender(); - }, - { once: true } - ); - + console.log('[CHECKOUT] Waiting for cart ready event...'); + document.addEventListener('groupOrderCartReady', function() { + console.log('[CHECKOUT] Cart ready event received'); + fetchLabelsAndRender(); + }, { once: true }); + // Fallback timeout in case event never fires - setTimeout(function () { + setTimeout(function() { if (window.groupOrderShop && window.groupOrderShop.orderId) { - console.log("[CHECKOUT] Fallback timeout triggered"); + console.log('[CHECKOUT] Fallback timeout triggered'); fetchLabelsAndRender(); } }, 500); @@ -166,88 +148,67 @@ * Render order summary table or empty message * Exposed globally so other scripts can call it */ - window.renderCheckoutSummary = function (labels) { + window.renderCheckoutSummary = function(labels) { labels = labels || window.getCheckoutLabels(); - var summaryDiv = document.getElementById("checkout-summary"); + var summaryDiv = document.getElementById('checkout-summary'); if (!summaryDiv) return; - var cartKey = - "eskaera_" + - (document.getElementById("confirm-order-btn") - ? document.getElementById("confirm-order-btn").getAttribute("data-order-id") - : "1") + - "_cart"; - var cart = JSON.parse(localStorage.getItem(cartKey) || "{}"); + var cartKey = 'eskaera_' + (document.getElementById('confirm-order-btn') ? document.getElementById('confirm-order-btn').getAttribute('data-order-id') : '1') + '_cart'; + var cart = JSON.parse(localStorage.getItem(cartKey) || '{}'); - var summaryTable = summaryDiv.querySelector(".checkout-summary-table"); - var tbody = summaryDiv.querySelector("#checkout-summary-tbody"); - var totalSection = summaryDiv.querySelector(".checkout-total-section"); + var summaryTable = summaryDiv.querySelector('.checkout-summary-table'); + var tbody = summaryDiv.querySelector('#checkout-summary-tbody'); + var totalSection = summaryDiv.querySelector('.checkout-total-section'); // If no table found, create it with headers (shouldn't happen, but fallback) if (!summaryTable) { - var html = - '' + - '" + - '" + - '" + - '" + + var html = '
' + - escapeHtml(labels.product) + - "' + - escapeHtml(labels.quantity) + - "' + - escapeHtml(labels.price) + - "' + - escapeHtml(labels.subtotal) + - "
' + + '' + + '' + + '' + + '' + '
' + escapeHtml(labels.product) + '' + escapeHtml(labels.quantity) + '' + escapeHtml(labels.price) + '' + escapeHtml(labels.subtotal) + '
' + '
' + - '' + - escapeHtml(labels.total) + - "" + + '' + escapeHtml(labels.total) + '' + '€0.00' + - "
"; + '
'; summaryDiv.innerHTML = html; - summaryTable = summaryDiv.querySelector(".checkout-summary-table"); - tbody = summaryDiv.querySelector("#checkout-summary-tbody"); - totalSection = summaryDiv.querySelector(".checkout-total-section"); + summaryTable = summaryDiv.querySelector('.checkout-summary-table'); + tbody = summaryDiv.querySelector('#checkout-summary-tbody'); + totalSection = summaryDiv.querySelector('.checkout-total-section'); } // Clear only tbody, preserve headers - tbody.innerHTML = ""; + tbody.innerHTML = ''; if (Object.keys(cart).length === 0) { // Show empty message if cart is empty - var emptyRow = document.createElement("tr"); - emptyRow.id = "checkout-empty-row"; - emptyRow.className = "empty-message"; - emptyRow.innerHTML = - '' + + var emptyRow = document.createElement('tr'); + emptyRow.id = 'checkout-empty-row'; + emptyRow.className = 'empty-message'; + emptyRow.innerHTML = '' + '' + - "

" + - escapeHtml(labels.empty) + - "

" + - ""; + '

' + escapeHtml(labels.empty) + '

' + + ''; tbody.appendChild(emptyRow); - + // Hide total section - totalSection.style.display = "none"; + totalSection.style.display = 'none'; } else { // Hide empty row if visible - var emptyRow = tbody.querySelector("#checkout-empty-row"); + var emptyRow = tbody.querySelector('#checkout-empty-row'); if (emptyRow) emptyRow.remove(); // Get delivery product ID from page data - var checkoutPage = document.querySelector(".eskaera-checkout-page"); - var deliveryProductId = checkoutPage - ? checkoutPage.getAttribute("data-delivery-product-id") - : null; + var checkoutPage = document.querySelector('.eskaera-checkout-page'); + var deliveryProductId = checkoutPage ? checkoutPage.getAttribute('data-delivery-product-id') : null; // Separate normal products from delivery product var normalProducts = []; var deliveryProduct = null; - - Object.keys(cart).forEach(function (productId) { + + Object.keys(cart).forEach(function(productId) { if (productId === deliveryProductId) { deliveryProduct = { id: productId, item: cart[productId] }; } else { @@ -256,14 +217,14 @@ }); // Sort normal products numerically - normalProducts.sort(function (a, b) { + normalProducts.sort(function(a, b) { return parseInt(a.id) - parseInt(b.id); }); var total = 0; - + // Render normal products first - normalProducts.forEach(function (product) { + normalProducts.forEach(function(product) { var item = product.item; var qty = parseFloat(item.quantity || item.qty || 1); if (isNaN(qty)) qty = 1; @@ -272,20 +233,11 @@ var subtotal = qty * price; total += subtotal; - var row = document.createElement("tr"); - row.innerHTML = - "" + - escapeHtml(item.name) + - "" + - '' + - qty.toFixed(2).replace(/\.?0+$/, "") + - "" + - '€' + - price.toFixed(2) + - "" + - '€' + - subtotal.toFixed(2) + - ""; + var row = document.createElement('tr'); + row.innerHTML = '' + escapeHtml(item.name) + '' + + '' + qty.toFixed(2).replace(/\.?0+$/, '') + '' + + '€' + price.toFixed(2) + '' + + '€' + subtotal.toFixed(2) + ''; tbody.appendChild(row); }); @@ -299,41 +251,32 @@ var subtotal = qty * price; total += subtotal; - var row = document.createElement("tr"); - row.innerHTML = - "" + - escapeHtml(item.name) + - "" + - '' + - qty.toFixed(2).replace(/\.?0+$/, "") + - "" + - '€' + - price.toFixed(2) + - "" + - '€' + - subtotal.toFixed(2) + - ""; + var row = document.createElement('tr'); + row.innerHTML = '' + escapeHtml(item.name) + '' + + '' + qty.toFixed(2).replace(/\.?0+$/, '') + '' + + '€' + price.toFixed(2) + '' + + '€' + subtotal.toFixed(2) + ''; tbody.appendChild(row); } // Update total - var totalAmount = summaryDiv.querySelector("#checkout-total-amount"); + var totalAmount = summaryDiv.querySelector('#checkout-total-amount'); if (totalAmount) { - totalAmount.textContent = "€" + total.toFixed(2); + totalAmount.textContent = '€' + total.toFixed(2); } - + // Show total section - totalSection.style.display = "block"; + totalSection.style.display = 'block'; } - console.log("[CHECKOUT] Summary rendered"); + console.log('[CHECKOUT] Summary rendered'); }; /** * Escape HTML to prevent XSS */ function escapeHtml(text) { - var div = document.createElement("div"); + var div = document.createElement('div'); div.textContent = text; return div.innerHTML; } diff --git a/website_sale_aplicoop/static/src/js/checkout_summary.js b/website_sale_aplicoop/static/src/js/checkout_summary.js index 836ec67..ad6e333 100644 --- a/website_sale_aplicoop/static/src/js/checkout_summary.js +++ b/website_sale_aplicoop/static/src/js/checkout_summary.js @@ -3,7 +3,9 @@ * This file is kept for backwards compatibility but is no longer needed. * The main renderSummary() logic is in checkout_labels.js */ -(function () { - "use strict"; +(function() { + 'use strict'; // Checkout rendering is handled by checkout_labels.js })(); + + diff --git a/website_sale_aplicoop/static/src/js/home_delivery.js b/website_sale_aplicoop/static/src/js/home_delivery.js index 0479b8e..bb2cd7c 100644 --- a/website_sale_aplicoop/static/src/js/home_delivery.js +++ b/website_sale_aplicoop/static/src/js/home_delivery.js @@ -3,65 +3,56 @@ * Manages home delivery checkbox and product addition/removal */ -(function () { - "use strict"; +(function() { + 'use strict'; var HomeDeliveryManager = { deliveryProductId: null, deliveryProductPrice: 5.74, - deliveryProductName: "Home Delivery", // Default fallback + deliveryProductName: 'Home Delivery', // Default fallback orderId: null, homeDeliveryEnabled: false, - - init: function () { + + init: function() { // Get delivery product info from data attributes - var checkoutPage = document.querySelector(".eskaera-checkout-page"); + var checkoutPage = document.querySelector('.eskaera-checkout-page'); if (checkoutPage) { - this.deliveryProductId = checkoutPage.getAttribute("data-delivery-product-id"); - console.log( - "[HomeDelivery] deliveryProductId from attribute:", - this.deliveryProductId, - "type:", - typeof this.deliveryProductId - ); - - var price = checkoutPage.getAttribute("data-delivery-product-price"); + this.deliveryProductId = checkoutPage.getAttribute('data-delivery-product-id'); + console.log('[HomeDelivery] deliveryProductId from attribute:', this.deliveryProductId, 'type:', typeof this.deliveryProductId); + + var price = checkoutPage.getAttribute('data-delivery-product-price'); if (price) { this.deliveryProductPrice = parseFloat(price); } - + // Get translated product name from data attribute (auto-translated by Odoo server) - var productName = checkoutPage.getAttribute("data-delivery-product-name"); + var productName = checkoutPage.getAttribute('data-delivery-product-name'); if (productName) { this.deliveryProductName = productName; - console.log( - "[HomeDelivery] Using translated product name from server:", - this.deliveryProductName - ); + console.log('[HomeDelivery] Using translated product name from server:', this.deliveryProductName); } - + // Check if home delivery is enabled for this order - var homeDeliveryAttr = checkoutPage.getAttribute("data-home-delivery-enabled"); - this.homeDeliveryEnabled = - homeDeliveryAttr === "true" || homeDeliveryAttr === "True"; - console.log("[HomeDelivery] Home delivery enabled:", this.homeDeliveryEnabled); - + var homeDeliveryAttr = checkoutPage.getAttribute('data-home-delivery-enabled'); + this.homeDeliveryEnabled = homeDeliveryAttr === 'true' || homeDeliveryAttr === 'True'; + console.log('[HomeDelivery] Home delivery enabled:', this.homeDeliveryEnabled); + // Show/hide home delivery section based on configuration this.toggleHomeDeliverySection(); } - + // Get order ID from confirm button - var confirmBtn = document.getElementById("confirm-order-btn"); + var confirmBtn = document.getElementById('confirm-order-btn'); if (confirmBtn) { - this.orderId = confirmBtn.getAttribute("data-order-id"); - console.log("[HomeDelivery] orderId from button:", this.orderId); + this.orderId = confirmBtn.getAttribute('data-order-id'); + console.log('[HomeDelivery] orderId from button:', this.orderId); } - var checkbox = document.getElementById("home-delivery-checkbox"); + var checkbox = document.getElementById('home-delivery-checkbox'); if (!checkbox) return; var self = this; - checkbox.addEventListener("change", function () { + checkbox.addEventListener('change', function() { if (this.checked) { self.addDeliveryProduct(); self.showDeliveryInfo(); @@ -75,44 +66,42 @@ this.checkDeliveryInCart(); }, - toggleHomeDeliverySection: function () { - var homeDeliverySection = document.querySelector( - '[id*="home-delivery"], [class*="home-delivery"]' - ); - var checkbox = document.getElementById("home-delivery-checkbox"); - var homeDeliveryContainer = document.getElementById("home-delivery-container"); - + toggleHomeDeliverySection: function() { + var homeDeliverySection = document.querySelector('[id*="home-delivery"], [class*="home-delivery"]'); + var checkbox = document.getElementById('home-delivery-checkbox'); + var homeDeliveryContainer = document.getElementById('home-delivery-container'); + if (this.homeDeliveryEnabled) { // Show home delivery option if (checkbox) { - checkbox.closest(".form-check").style.display = "block"; + checkbox.closest('.form-check').style.display = 'block'; } if (homeDeliveryContainer) { - homeDeliveryContainer.style.display = "block"; + homeDeliveryContainer.style.display = 'block'; } - console.log("[HomeDelivery] Home delivery option shown"); + console.log('[HomeDelivery] Home delivery option shown'); } else { // Hide home delivery option and delivery info alert if (checkbox) { - checkbox.closest(".form-check").style.display = "none"; + checkbox.closest('.form-check').style.display = 'none'; checkbox.checked = false; } if (homeDeliveryContainer) { - homeDeliveryContainer.style.display = "none"; + homeDeliveryContainer.style.display = 'none'; } // Also hide the delivery info alert when home delivery is disabled this.hideDeliveryInfo(); this.removeDeliveryProduct(); - console.log("[HomeDelivery] Home delivery option and delivery info hidden"); + console.log('[HomeDelivery] Home delivery option and delivery info hidden'); } }, - checkDeliveryInCart: function () { + checkDeliveryInCart: function() { if (!this.deliveryProductId) return; var cart = this.getCart(); if (cart[this.deliveryProductId]) { - var checkbox = document.getElementById("home-delivery-checkbox"); + var checkbox = document.getElementById('home-delivery-checkbox'); if (checkbox) { checkbox.checked = true; this.showDeliveryInfo(); @@ -120,103 +109,93 @@ } }, - getCart: function () { + getCart: function() { if (!this.orderId) return {}; - var cartKey = "eskaera_" + this.orderId + "_cart"; + var cartKey = 'eskaera_' + this.orderId + '_cart'; var cartStr = localStorage.getItem(cartKey); return cartStr ? JSON.parse(cartStr) : {}; }, - saveCart: function (cart) { + saveCart: function(cart) { if (!this.orderId) return; - var cartKey = "eskaera_" + this.orderId + "_cart"; + var cartKey = 'eskaera_' + this.orderId + '_cart'; localStorage.setItem(cartKey, JSON.stringify(cart)); - + // Re-render checkout summary without reloading var self = this; - setTimeout(function () { + setTimeout(function() { // Use the global function from checkout_labels.js - if (typeof window.renderCheckoutSummary === "function") { + if (typeof window.renderCheckoutSummary === 'function') { window.renderCheckoutSummary(); } }, 50); }, - - renderCheckoutSummary: function () { + + renderCheckoutSummary: function() { // Stub - now handled by global window.renderCheckoutSummary }, - addDeliveryProduct: function () { + addDeliveryProduct: function() { if (!this.deliveryProductId) { - console.warn("[HomeDelivery] Delivery product ID not found"); + console.warn('[HomeDelivery] Delivery product ID not found'); return; } - console.log( - "[HomeDelivery] Adding delivery product - deliveryProductId:", - this.deliveryProductId, - "orderId:", - this.orderId - ); + console.log('[HomeDelivery] Adding delivery product - deliveryProductId:', this.deliveryProductId, 'orderId:', this.orderId); var cart = this.getCart(); - console.log("[HomeDelivery] Current cart before adding:", cart); - + console.log('[HomeDelivery] Current cart before adding:', cart); + cart[this.deliveryProductId] = { id: this.deliveryProductId, name: this.deliveryProductName, price: this.deliveryProductPrice, - qty: 1, + qty: 1 }; - console.log("[HomeDelivery] Cart after adding delivery:", cart); + console.log('[HomeDelivery] Cart after adding delivery:', cart); this.saveCart(cart); - console.log("[HomeDelivery] Delivery product added to localStorage"); + console.log('[HomeDelivery] Delivery product added to localStorage'); }, - removeDeliveryProduct: function () { + removeDeliveryProduct: function() { if (!this.deliveryProductId) { - console.warn("[HomeDelivery] Delivery product ID not found"); + console.warn('[HomeDelivery] Delivery product ID not found'); return; } - console.log( - "[HomeDelivery] Removing delivery product - deliveryProductId:", - this.deliveryProductId, - "orderId:", - this.orderId - ); + console.log('[HomeDelivery] Removing delivery product - deliveryProductId:', this.deliveryProductId, 'orderId:', this.orderId); var cart = this.getCart(); - console.log("[HomeDelivery] Current cart before removing:", cart); - + console.log('[HomeDelivery] Current cart before removing:', cart); + if (cart[this.deliveryProductId]) { delete cart[this.deliveryProductId]; - console.log("[HomeDelivery] Cart after removing delivery:", cart); + console.log('[HomeDelivery] Cart after removing delivery:', cart); } this.saveCart(cart); - console.log("[HomeDelivery] Delivery product removed from localStorage"); + console.log('[HomeDelivery] Delivery product removed from localStorage'); }, - showDeliveryInfo: function () { - var alert = document.getElementById("delivery-info-alert"); + showDeliveryInfo: function() { + var alert = document.getElementById('delivery-info-alert'); if (alert) { - console.log("[HomeDelivery] Showing delivery info alert"); - alert.classList.remove("d-none"); - alert.style.display = "block"; + console.log('[HomeDelivery] Showing delivery info alert'); + alert.classList.remove('d-none'); + alert.style.display = 'block'; } }, - hideDeliveryInfo: function () { - var alert = document.getElementById("delivery-info-alert"); + hideDeliveryInfo: function() { + var alert = document.getElementById('delivery-info-alert'); if (alert) { - console.log("[HomeDelivery] Hiding delivery info alert"); - alert.classList.add("d-none"); - alert.style.display = "none"; + console.log('[HomeDelivery] Hiding delivery info alert'); + alert.classList.add('d-none'); + alert.style.display = 'none'; } - }, + } }; // Initialize on DOM ready - if (document.readyState === "loading") { - document.addEventListener("DOMContentLoaded", function () { + if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', function() { HomeDeliveryManager.init(); }); } else { diff --git a/website_sale_aplicoop/static/src/js/i18n_helpers.js b/website_sale_aplicoop/static/src/js/i18n_helpers.js index 4462bf5..a55ca06 100644 --- a/website_sale_aplicoop/static/src/js/i18n_helpers.js +++ b/website_sale_aplicoop/static/src/js/i18n_helpers.js @@ -1,30 +1,30 @@ /** * DEPRECATED: Use i18n_manager.js instead - * + * * This file is kept for backwards compatibility only. * All translation logic has been moved to i18n_manager.js which * fetches translations from the server endpoint /eskaera/i18n - * + * * Migration guide: * OLD: window.getCheckoutLabels() * NEW: i18nManager.getAll() - * + * * OLD: window.formatCurrency(amount) * NEW: i18nManager.formatCurrency(amount) - * + * * Copyright 2025 Criptomart * License AGPL-3.0 or later */ -(function () { - "use strict"; +(function() { + 'use strict'; // Keep legacy functions as wrappers for backwards compatibility - + /** * DEPRECATED - Use i18nManager.getAll() or i18nManager.get(key) instead */ - window.getCheckoutLabels = function (key) { + window.getCheckoutLabels = function(key) { if (window.i18nManager && window.i18nManager.initialized) { if (key) { return window.i18nManager.get(key); @@ -38,29 +38,30 @@ /** * DEPRECATED - Use i18nManager.getAll() instead */ - window.getSearchLabels = function () { + window.getSearchLabels = function() { if (window.i18nManager && window.i18nManager.initialized) { return { - searchPlaceholder: window.i18nManager.get("search_products"), - noResults: window.i18nManager.get("no_results"), + 'searchPlaceholder': window.i18nManager.get('search_products'), + 'noResults': window.i18nManager.get('no_results') }; } return { - searchPlaceholder: "Search products...", - noResults: "No products found", + 'searchPlaceholder': 'Search products...', + 'noResults': 'No products found' }; }; /** * DEPRECATED - Use i18nManager.formatCurrency(amount) instead */ - window.formatCurrency = function (amount) { + window.formatCurrency = function(amount) { if (window.i18nManager) { return window.i18nManager.formatCurrency(amount); } // Fallback - return "€" + parseFloat(amount).toFixed(2); + return '€' + parseFloat(amount).toFixed(2); }; - console.log("[i18n_helpers] DEPRECATED - Use i18n_manager.js instead"); + console.log('[i18n_helpers] DEPRECATED - Use i18n_manager.js instead'); + })(); diff --git a/website_sale_aplicoop/static/src/js/i18n_manager.js b/website_sale_aplicoop/static/src/js/i18n_manager.js index cc13201..08a0f9e 100644 --- a/website_sale_aplicoop/static/src/js/i18n_manager.js +++ b/website_sale_aplicoop/static/src/js/i18n_manager.js @@ -1,21 +1,21 @@ /** * I18N Manager - Unified Translation Management - * + * * Single point of truth for all translations. * Fetches from server endpoint /eskaera/i18n once and caches. - * + * * Usage: * i18nManager.init().then(function() { * var translated = i18nManager.get('product'); // Returns translated string * var allLabels = i18nManager.getAll(); // Returns all labels * }); - * + * * Copyright 2025 Criptomart * License AGPL-3.0 or later */ -(function () { - "use strict"; +(function() { + 'use strict'; window.i18nManager = { labels: null, @@ -26,7 +26,7 @@ * Initialize by fetching translations from server * Returns a Promise that resolves when translations are loaded */ - init: function () { + init: function() { if (this.initialized) { return Promise.resolve(); } @@ -38,45 +38,41 @@ var self = this; // Detect user's language from document or fallback to en_US - var detectedLang = document.documentElement.lang || "es_ES"; - console.log("[i18nManager] Detected language:", detectedLang); + var detectedLang = document.documentElement.lang || 'es_ES'; + console.log('[i18nManager] Detected language:', detectedLang); // Fetch translations from server - this.initPromise = fetch("/eskaera/i18n", { - method: "POST", + this.initPromise = fetch('/eskaera/i18n', { + method: 'POST', headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, - body: JSON.stringify({ lang: detectedLang }), + body: JSON.stringify({ lang: detectedLang }) }) - .then(function (response) { - if (!response.ok) { - throw new Error("HTTP error, status = " + response.status); - } - return response.json(); - }) - .then(function (data) { - // Handle JSON-RPC response format - // Server returns: { "jsonrpc": "2.0", "id": null, "result": { labels } } - // Extract the actual labels from the result property - var labels = data.result || data; - - console.log( - "[i18nManager] ✓ Loaded", - Object.keys(labels).length, - "translation labels" - ); - self.labels = labels; - self.initialized = true; - return labels; - }) - .catch(function (error) { - console.error("[i18nManager] Error loading translations:", error); - // Fallback to empty object so app doesn't crash - self.labels = {}; - self.initialized = true; - return {}; - }); + .then(function(response) { + if (!response.ok) { + throw new Error('HTTP error, status = ' + response.status); + } + return response.json(); + }) + .then(function(data) { + // Handle JSON-RPC response format + // Server returns: { "jsonrpc": "2.0", "id": null, "result": { labels } } + // Extract the actual labels from the result property + var labels = data.result || data; + + console.log('[i18nManager] ✓ Loaded', Object.keys(labels).length, 'translation labels'); + self.labels = labels; + self.initialized = true; + return labels; + }) + .catch(function(error) { + console.error('[i18nManager] Error loading translations:', error); + // Fallback to empty object so app doesn't crash + self.labels = {}; + self.initialized = true; + return {}; + }); return this.initPromise; }, @@ -85,9 +81,9 @@ * Get a specific translation label * Returns the translated string or the key if not found */ - get: function (key) { + get: function(key) { if (!this.initialized) { - console.warn("[i18nManager] Not yet initialized. Call init() first."); + console.warn('[i18nManager] Not yet initialized. Call init() first.'); return key; } return this.labels[key] || key; @@ -96,9 +92,9 @@ /** * Get all translation labels as object */ - getAll: function () { + getAll: function() { if (!this.initialized) { - console.warn("[i18nManager] Not yet initialized. Call init() first."); + console.warn('[i18nManager] Not yet initialized. Call init() first.'); return {}; } return this.labels; @@ -107,7 +103,7 @@ /** * Check if a specific label exists */ - has: function (key) { + has: function(key) { if (!this.initialized) return false; return key in this.labels; }, @@ -115,42 +111,43 @@ /** * Format currency to Euro format */ - formatCurrency: function (amount) { + formatCurrency: function(amount) { try { - return new Intl.NumberFormat(document.documentElement.lang || "es_ES", { - style: "currency", - currency: "EUR", + return new Intl.NumberFormat(document.documentElement.lang || 'es_ES', { + style: 'currency', + currency: 'EUR' }).format(amount); } catch (e) { // Fallback to simple Euro format - return "€" + parseFloat(amount).toFixed(2); + return '€' + parseFloat(amount).toFixed(2); } }, /** * Escape HTML to prevent XSS */ - escapeHtml: function (text) { - if (!text) return ""; - var div = document.createElement("div"); + escapeHtml: function(text) { + if (!text) return ''; + var div = document.createElement('div'); div.textContent = text; return div.innerHTML; - }, + } }; // Auto-initialize on DOM ready - if (document.readyState === "loading") { - document.addEventListener("DOMContentLoaded", function () { - i18nManager.init().catch(function (err) { - console.error("[i18nManager] Auto-init failed:", err); + if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', function() { + i18nManager.init().catch(function(err) { + console.error('[i18nManager] Auto-init failed:', err); }); }); } else { // DOM already loaded - setTimeout(function () { - i18nManager.init().catch(function (err) { - console.error("[i18nManager] Auto-init failed:", err); + setTimeout(function() { + i18nManager.init().catch(function(err) { + console.error('[i18nManager] Auto-init failed:', err); }); }, 100); } + })(); diff --git a/website_sale_aplicoop/static/src/js/infinite_scroll.js b/website_sale_aplicoop/static/src/js/infinite_scroll.js deleted file mode 100644 index 89770fa..0000000 --- a/website_sale_aplicoop/static/src/js/infinite_scroll.js +++ /dev/null @@ -1,485 +0,0 @@ -/** - * Infinite Scroll Handler for Eskaera Shop - * - * Automatically loads more products as user scrolls down the page. - * Falls back to manual "Load More" button if disabled or on error. - */ - -console.log("[INFINITE_SCROLL] Script loaded!"); - -// DEBUG: Add MutationObserver to detect WHO is clearing the products grid -(function () { - var setupGridObserver = function () { - var grid = document.getElementById("products-grid"); - if (!grid) { - console.log("[MUTATION_DEBUG] products-grid not found yet, will retry..."); - setTimeout(setupGridObserver, 100); - return; - } - - console.log("[MUTATION_DEBUG] 🔍 Setting up MutationObserver on products-grid"); - console.log("[MUTATION_DEBUG] Initial child count:", grid.children.length); - console.log("[MUTATION_DEBUG] Grid innerHTML length:", grid.innerHTML.length); - - // Watch the grid itself for child changes - var gridObserver = new MutationObserver(function (mutations) { - mutations.forEach(function (mutation) { - if (mutation.type === "childList") { - if (mutation.removedNodes.length > 0) { - console.log("[MUTATION_DEBUG] ⚠️⚠️⚠️ PRODUCTS REMOVED FROM GRID!"); - console.log( - "[MUTATION_DEBUG] Removed nodes count:", - mutation.removedNodes.length - ); - console.log("[MUTATION_DEBUG] Stack trace:"); - console.trace(); - } - if (mutation.addedNodes.length > 0) { - console.log("[MUTATION_DEBUG] Products added:", mutation.addedNodes.length); - } - } - }); - }); - gridObserver.observe(grid, { childList: true, subtree: false }); - - // ALSO watch the parent for the grid element itself being replaced/removed - var parent = grid.parentElement; - if (parent) { - console.log( - "[MUTATION_DEBUG] 🔍 Also watching parent element:", - parent.tagName, - parent.className - ); - var parentObserver = new MutationObserver(function (mutations) { - mutations.forEach(function (mutation) { - if (mutation.type === "childList") { - mutation.removedNodes.forEach(function (node) { - if ( - node.id === "products-grid" || - (node.querySelector && node.querySelector("#products-grid")) - ) { - console.log( - "[MUTATION_DEBUG] ⚠️⚠️⚠️ PRODUCTS-GRID ELEMENT ITSELF WAS REMOVED!" - ); - console.log("[MUTATION_DEBUG] Stack trace:"); - console.trace(); - } - }); - } - }); - }); - parentObserver.observe(parent, { childList: true, subtree: true }); - } - - // Poll to detect innerHTML being cleared (as backup) - var lastChildCount = grid.children.length; - setInterval(function () { - var currentGrid = document.getElementById("products-grid"); - if (!currentGrid) { - console.log("[MUTATION_DEBUG] ⚠️⚠️⚠️ GRID ELEMENT NO LONGER EXISTS!"); - console.trace(); - return; - } - var currentChildCount = currentGrid.children.length; - if (currentChildCount !== lastChildCount) { - console.log( - "[MUTATION_DEBUG] 📊 Child count changed: " + - lastChildCount + - " → " + - currentChildCount - ); - if (currentChildCount === 0 && lastChildCount > 0) { - console.log("[MUTATION_DEBUG] ⚠️⚠️⚠️ GRID WAS EMPTIED!"); - console.trace(); - } - lastChildCount = currentChildCount; - } - }, 100); - - console.log("[MUTATION_DEBUG] ✅ Observers attached (grid + parent + polling)"); - }; - - // Start observing as soon as possible - if (document.readyState === "loading") { - document.addEventListener("DOMContentLoaded", setupGridObserver); - } else { - setupGridObserver(); - } -})(); - -(function () { - "use strict"; - - // Also run immediately if DOM is already loaded - var initInfiniteScroll = function () { - console.log("[INFINITE_SCROLL] Initializing infinite scroll..."); - - var infiniteScroll = { - orderId: null, - searchQuery: "", - category: "0", - perPage: 20, - currentPage: 1, - isLoading: false, - hasMore: true, - config: {}, - - init: function () { - console.log("[INFINITE_SCROLL] 🔧 init() called"); - - // Get configuration from page data - var configEl = document.getElementById("eskaera-config"); - console.log("[INFINITE_SCROLL] eskaera-config element:", configEl); - - if (!configEl) { - console.error( - "[INFINITE_SCROLL] ❌ No eskaera-config found, lazy loading disabled" - ); - return; - } - - this.orderId = configEl.getAttribute("data-order-id"); - this.searchQuery = configEl.getAttribute("data-search") || ""; - this.category = configEl.getAttribute("data-category") || "0"; - this.perPage = parseInt(configEl.getAttribute("data-per-page")) || 20; - this.currentPage = parseInt(configEl.getAttribute("data-current-page")) || 1; - - console.log("[INFINITE_SCROLL] Config loaded:", { - orderId: this.orderId, - searchQuery: this.searchQuery, - category: this.category, - perPage: this.perPage, - currentPage: this.currentPage, - }); - - // Check if there are more products to load from data attribute - var hasNextAttr = configEl.getAttribute("data-has-next"); - this.hasMore = hasNextAttr === "true" || hasNextAttr === "True"; - - console.log( - "[INFINITE_SCROLL] hasMore=" + - this.hasMore + - " (data-has-next=" + - hasNextAttr + - ")" - ); - - if (!this.hasMore) { - console.log( - "[INFINITE_SCROLL] ⚠️ No more pages available, but keeping initialized for filter handling (has_next=" + - hasNextAttr + - ")" - ); - // Don't return - we need to stay initialized so realtime_search can call resetWithFilters() - } - - console.log("[INFINITE_SCROLL] Initialized with:", { - orderId: this.orderId, - searchQuery: this.searchQuery, - category: this.category, - perPage: this.perPage, - currentPage: this.currentPage, - }); - - // Only attach scroll listener if there are more pages to load - if (this.hasMore) { - this.attachScrollListener(); - this.attachFallbackButtonListener(); - } else { - console.log("[INFINITE_SCROLL] Skipping scroll listener (no more pages)"); - } - }, - - attachScrollListener: function () { - var self = this; - var scrollThreshold = 300; // Load when within 300px of the bottom of the grid - - window.addEventListener("scroll", function () { - if (self.isLoading || !self.hasMore) { - return; - } - - var grid = document.getElementById("products-grid"); - if (!grid) { - return; - } - - // Calculate distance from bottom of grid to bottom of viewport - var gridRect = grid.getBoundingClientRect(); - var gridBottom = gridRect.bottom; - var viewportBottom = window.innerHeight; - var distanceFromBottom = gridBottom - viewportBottom; - - // Load more if we're within threshold pixels of the grid bottom - if (distanceFromBottom <= scrollThreshold && distanceFromBottom > 0) { - console.log( - "[INFINITE_SCROLL] Near grid bottom (distance: " + - Math.round(distanceFromBottom) + - "px), loading next page" - ); - self.loadNextPage(); - } - }); - - console.log( - "[INFINITE_SCROLL] Scroll listener attached (threshold: " + - scrollThreshold + - "px from grid bottom)" - ); - }, - - attachFallbackButtonListener: function () { - var self = this; - var btn = document.getElementById("load-more-btn"); - - if (!btn) { - console.log("[INFINITE_SCROLL] No fallback button found"); - return; - } - - btn.addEventListener("click", function (e) { - e.preventDefault(); - if (!self.isLoading && self.hasMore) { - console.log("[INFINITE_SCROLL] Manual button click, loading next page"); - self.loadNextPage(); - } - }); - - console.log("[INFINITE_SCROLL] Fallback button listener attached"); - }, - - resetWithFilters: function (searchQuery, categoryId) { - /** - * Reset infinite scroll to page 1 with new filters and reload products. - * Called by realtime_search when filters change. - * - * WARNING: This clears the grid! Only call when filters actually change. - */ - console.log( - "[INFINITE_SCROLL] ⚠️⚠️⚠️ resetWithFilters CALLED - search=" + - searchQuery + - " category=" + - categoryId - ); - console.trace("[INFINITE_SCROLL] ⚠️⚠️⚠️ WHO CALLED resetWithFilters? Call stack:"); - - // Normalize values: empty string to "", null to "0" for category - var newSearchQuery = (searchQuery || "").trim(); - var newCategory = (categoryId || "").trim() || "0"; - - // CHECK IF VALUES ACTUALLY CHANGED before clearing grid! - if (newSearchQuery === this.searchQuery && newCategory === this.category) { - console.log( - "[INFINITE_SCROLL] ✅ NO CHANGE - Skipping reset (values are identical)" - ); - return; // Don't clear grid if nothing changed! - } - - console.log( - "[INFINITE_SCROLL] 🔥 VALUES CHANGED - Old: search=" + - this.searchQuery + - " category=" + - this.category + - " → New: search=" + - newSearchQuery + - " category=" + - newCategory - ); - - this.searchQuery = newSearchQuery; - this.category = newCategory; - this.currentPage = 0; // Set to 0 so loadNextPage() increments to 1 - this.isLoading = false; - this.hasMore = true; - - console.log( - "[INFINITE_SCROLL] After normalization: search=" + - this.searchQuery + - " category=" + - this.category - ); - - // Update the config element data attributes for consistency - var configEl = document.getElementById("eskaera-config"); - if (configEl) { - configEl.setAttribute("data-search", this.searchQuery); - configEl.setAttribute("data-category", this.category); - configEl.setAttribute("data-current-page", "1"); - configEl.setAttribute("data-has-next", "true"); - console.log("[INFINITE_SCROLL] Updated eskaera-config attributes"); - } - - // Clear the grid and reload from page 1 - var grid = document.getElementById("products-grid"); - if (grid) { - console.log("[INFINITE_SCROLL] 🗑️ CLEARING GRID NOW!"); - grid.innerHTML = ""; - console.log("[INFINITE_SCROLL] Grid cleared"); - } - - // Load first page with new filters - console.log("[INFINITE_SCROLL] Calling loadNextPage()..."); - this.loadNextPage(); - }, - - loadNextPage: function () { - console.log( - "[INFINITE_SCROLL] 🚀 loadNextPage() CALLED - currentPage=" + - this.currentPage + - " isLoading=" + - this.isLoading + - " hasMore=" + - this.hasMore - ); - - if (this.isLoading || !this.hasMore) { - console.log("[INFINITE_SCROLL] ❌ ABORTING - already loading or no more pages"); - return; - } - - var self = this; - this.isLoading = true; - - // Only increment if we're not loading first page (currentPage will be 0 after reset) - if (this.currentPage === 0) { - console.log( - "[INFINITE_SCROLL] ✅ Incrementing from 0 to 1 (first page after reset)" - ); - this.currentPage = 1; - } else { - console.log( - "[INFINITE_SCROLL] ✅ Incrementing page " + - this.currentPage + - " → " + - (this.currentPage + 1) - ); - this.currentPage += 1; - } - - console.log( - "[INFINITE_SCROLL] 📡 About to fetch page", - this.currentPage, - "for order", - this.orderId - ); - - // Show spinner - var spinner = document.getElementById("loading-spinner"); - if (spinner) { - spinner.classList.remove("d-none"); - } - - var data = { - page: this.currentPage, - search: this.searchQuery, - category: this.category, - }; - - fetch("/eskaera/" + this.orderId + "/load-products-ajax", { - method: "POST", - headers: { - "Content-Type": "application/json", - "X-Requested-With": "XMLHttpRequest", - }, - body: JSON.stringify(data), - }) - .then(function (response) { - if (!response.ok) { - throw new Error("Network response was not ok: " + response.status); - } - return response.json(); - }) - .then(function (result) { - if (result.error) { - console.error("[INFINITE_SCROLL] Server error:", result.error); - self.isLoading = false; - self.currentPage -= 1; - return; - } - - console.log("[INFINITE_SCROLL] Page loaded successfully", result); - - // Insert HTML into grid - var grid = document.getElementById("products-grid"); - if (grid && result.html) { - grid.insertAdjacentHTML("beforeend", result.html); - console.log("[INFINITE_SCROLL] Products inserted into grid"); - } - - // Update has_more flag - self.hasMore = result.has_next || false; - - if (!self.hasMore) { - console.log("[INFINITE_SCROLL] No more products available"); - } - - // Hide spinner - if (spinner) { - spinner.classList.add("d-none"); - } - - self.isLoading = false; - - // Re-attach event listeners for newly added products - if ( - window.aplicoopShop && - typeof window.aplicoopShop._attachEventListeners === "function" - ) { - window.aplicoopShop._attachEventListeners(); - console.log("[INFINITE_SCROLL] Event listeners re-attached"); - } - - // Update realtime search to include newly loaded products - if ( - window.realtimeSearch && - typeof window.realtimeSearch._storeAllProducts === "function" - ) { - window.realtimeSearch._storeAllProducts(); - console.log( - "[INFINITE_SCROLL] Products list updated for realtime search" - ); - - // Apply current filters to newly loaded products - if (typeof window.realtimeSearch._filterProducts === "function") { - window.realtimeSearch._filterProducts(); - console.log("[INFINITE_SCROLL] Filters applied to new products"); - } - } - }) - .catch(function (error) { - console.error("[INFINITE_SCROLL] Fetch error:", error); - self.isLoading = false; - self.currentPage -= 1; - - // Hide spinner on error - if (spinner) { - spinner.classList.add("d-none"); - } - - // Show fallback button - var btn = document.getElementById("load-more-btn"); - if (btn) { - btn.classList.remove("d-none"); - btn.style.display = ""; - } - }); - }, - }; - - // Initialize infinite scroll - infiniteScroll.init(); - - // Export to global scope for debugging - window.infiniteScroll = infiniteScroll; - }; - - // Run on DOMContentLoaded if DOM not yet ready - if (document.readyState === "loading") { - console.log("[INFINITE_SCROLL] DOM not ready, waiting for DOMContentLoaded..."); - document.addEventListener("DOMContentLoaded", initInfiniteScroll); - } else { - // DOM is already loaded - console.log("[INFINITE_SCROLL] DOM already loaded, initializing immediately..."); - initInfiniteScroll(); - } -})(); diff --git a/website_sale_aplicoop/static/src/js/realtime_search.js b/website_sale_aplicoop/static/src/js/realtime_search.js index 2eef78c..a8da9c8 100644 --- a/website_sale_aplicoop/static/src/js/realtime_search.js +++ b/website_sale_aplicoop/static/src/js/realtime_search.js @@ -3,8 +3,8 @@ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) */ -(function () { - "use strict"; +(function() { + 'use strict'; window.realtimeSearch = { searchInput: null, @@ -16,59 +16,57 @@ selectedTags: new Set(), // Set of selected tag IDs (for OR logic filtering) availableTags: {}, // Maps tag ID to {id, name, count} - init: function () { - console.log("[realtimeSearch] Initializing..."); - + init: function() { + console.log('[realtimeSearch] Initializing...'); + // searchInput y categorySelect ya fueron asignados por tryInit() - console.log("[realtimeSearch] Search input:", this.searchInput); - console.log("[realtimeSearch] Category select:", this.categorySelect); + console.log('[realtimeSearch] Search input:', this.searchInput); + console.log('[realtimeSearch] Category select:', this.categorySelect); if (!this.searchInput) { - console.error("[realtimeSearch] ERROR: Search input not found!"); + console.error('[realtimeSearch] ERROR: Search input not found!'); return false; } - + if (!this.categorySelect) { - console.error("[realtimeSearch] ERROR: Category select not found!"); + console.error('[realtimeSearch] ERROR: Category select not found!'); return false; } this._buildCategoryHierarchyFromDOM(); this._storeAllProducts(); - console.log( - "[realtimeSearch] After _storeAllProducts(), calling _attachEventListeners()..." - ); + console.log('[realtimeSearch] After _storeAllProducts(), calling _attachEventListeners()...'); this._attachEventListeners(); - console.log("[realtimeSearch] ✓ Initialized successfully"); + console.log('[realtimeSearch] ✓ Initialized successfully'); return true; }, - _buildCategoryHierarchyFromDOM: function () { + _buildCategoryHierarchyFromDOM: function() { /** * Construye un mapa de jerarquía de categorías desde las opciones del select. * Ahora todas las opciones son planas pero con indentación visual (↳ arrows). - * + * * La profundidad se determina contando el número de arrows (↳). * Estructura: categoryHierarchy[parentCategoryId] = [childCategoryId1, childCategoryId2, ...] */ var self = this; - var allOptions = this.categorySelect.querySelectorAll("option[value]"); + var allOptions = this.categorySelect.querySelectorAll('option[value]'); var optionStack = []; // Stack para mantener los padres en cada nivel - - allOptions.forEach(function (option) { - var categoryId = option.getAttribute("value"); + + allOptions.forEach(function(option) { + var categoryId = option.getAttribute('value'); var text = option.textContent; - + // Contar arrows para determinar profundidad var arrowCount = (text.match(/↳/g) || []).length; var depth = arrowCount; // Depth: 0 for roots, 1 for children, 2 for grandchildren, etc. - + // Ajustar el stack al nivel actual // Si la profundidad es menor o igual, sacamos elementos del stack while (optionStack.length > depth) { optionStack.pop(); } - + // Si hay un padre en el stack (profundidad > 0), agregar como hijo if (depth > 0 && optionStack.length > 0) { var parentId = optionStack[optionStack.length - 1]; @@ -79,7 +77,7 @@ self.categoryHierarchy[parentId].push(categoryId); } } - + // Agregar este ID al stack como posible padre para los siguientes // Adjust position in stack based on depth if (optionStack.length > depth) { @@ -88,500 +86,286 @@ optionStack.push(categoryId); } }); - - console.log( - "[realtimeSearch] Complete category hierarchy built:", - self.categoryHierarchy - ); + + console.log('[realtimeSearch] Complete category hierarchy built:', self.categoryHierarchy); }, - _storeAllProducts: function () { - var productCards = document.querySelectorAll(".product-card"); - console.log("[realtimeSearch] Found " + productCards.length + " product cards"); - + _storeAllProducts: function() { + var productCards = document.querySelectorAll('.product-card'); + console.log('[realtimeSearch] Found ' + productCards.length + ' product cards'); + var self = this; this.allProducts = []; - - productCards.forEach(function (card, index) { - var name = card.getAttribute("data-product-name") || ""; - var categoryId = card.getAttribute("data-category-id") || ""; - var tagIdsStr = card.getAttribute("data-product-tags") || ""; - + + productCards.forEach(function(card, index) { + var name = card.getAttribute('data-product-name') || ''; + var categoryId = card.getAttribute('data-category-id') || ''; + var tagIdsStr = card.getAttribute('data-product-tags') || ''; + // Parse tag IDs from comma-separated string var tagIds = []; if (tagIdsStr) { - tagIds = tagIdsStr - .split(",") - .map(function (id) { - return parseInt(id.trim(), 10); - }) - .filter(function (id) { - return !isNaN(id); - }); + tagIds = tagIdsStr.split(',').map(function(id) { + return parseInt(id.trim(), 10); + }).filter(function(id) { + return !isNaN(id); + }); } - + self.allProducts.push({ element: card, name: name.toLowerCase(), category: categoryId.toString(), originalCategory: categoryId, - tags: tagIds, // Array of tag IDs for this product + tags: tagIds // Array of tag IDs for this product }); }); - - console.log("[realtimeSearch] Total products stored: " + this.allProducts.length); + + console.log('[realtimeSearch] Total products stored: ' + this.allProducts.length); }, - _attachEventListeners: function () { + _attachEventListeners: function() { var self = this; - - // Flag to prevent filtering during initialization - self.isInitializing = true; - + // Initialize available tags from DOM self._initializeAvailableTags(); - + // Store original colors for each tag badge self.originalTagColors = {}; // Maps tag ID to original color - + // Store last values at instance level so polling can access them - // Initialize to current values to avoid triggering reset on first poll - self.lastSearchValue = self.searchInput.value.trim(); - self.lastCategoryValue = self.categorySelect.value; - - console.log( - "[realtimeSearch] Initial values stored - search:", - JSON.stringify(self.lastSearchValue), - "category:", - JSON.stringify(self.lastCategoryValue) - ); - - // Clear search button - self.clearSearchBtn = document.getElementById("clear-search-btn"); - if (self.clearSearchBtn) { - console.log("[realtimeSearch] Clear search button found, attaching listeners"); - - // Show/hide button based on input content (passive, no filtering) - // This listener is separate from the filtering listener - self.searchInput.addEventListener("input", function () { - if (self.searchInput.value.trim().length > 0) { - self.clearSearchBtn.style.display = "block"; - } else { - self.clearSearchBtn.style.display = "none"; - } - }); - - // Clear search when button clicked - self.clearSearchBtn.addEventListener("click", function (e) { - e.preventDefault(); - e.stopPropagation(); - console.log("[realtimeSearch] Clear search button clicked"); - - // Clear the input - self.searchInput.value = ""; - self.clearSearchBtn.style.display = "none"; - - // Update last stored value to prevent polling from detecting "change" - self.lastSearchValue = ""; - - // Reset infinite scroll to reload all products from server - if ( - window.infiniteScroll && - typeof window.infiniteScroll.resetWithFilters === "function" - ) { - console.log( - "[realtimeSearch] Resetting infinite scroll to show all products" - ); - window.infiniteScroll.resetWithFilters("", self.lastCategoryValue); - } else if (!self.isInitializing) { - // Fallback: filter locally - self._filterProducts(); - } - - // Focus back to search input - self.searchInput.focus(); - }); - - // Initial check - don't show if empty - if (self.searchInput.value.trim().length > 0) { - self.clearSearchBtn.style.display = "block"; - } - } + self.lastSearchValue = ''; + self.lastCategoryValue = ''; // Prevent form submission completely - var form = self.searchInput.closest("form"); + var form = self.searchInput.closest('form'); if (form) { - form.addEventListener("submit", function (e) { + form.addEventListener('submit', function(e) { e.preventDefault(); e.stopPropagation(); - console.log("[realtimeSearch] Form submission prevented and stopped"); + console.log('[realtimeSearch] Form submission prevented and stopped'); return false; }); } - + // Prevent Enter key from submitting - self.searchInput.addEventListener("keypress", function (e) { - if (e.key === "Enter") { + self.searchInput.addEventListener('keypress', function(e) { + if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); - console.log("[realtimeSearch] Enter key prevented on search input"); + console.log('[realtimeSearch] Enter key prevented on search input'); return false; } }); // Search input: listen to 'input' for real-time filtering - self.searchInput.addEventListener("input", function (e) { + self.searchInput.addEventListener('input', function(e) { try { - // Skip filtering during initialization - if (self.isInitializing) { - console.log("[realtimeSearch] INPUT event during init - skipping filter"); - return; - } console.log('[realtimeSearch] INPUT event - value: "' + e.target.value + '"'); self._filterProducts(); } catch (error) { - console.error("[realtimeSearch] Error in input listener:", error.message); + console.error('[realtimeSearch] Error in input listener:', error.message); } }); - + // Also keep 'keyup' for extra compatibility - self.searchInput.addEventListener("keyup", function (e) { + self.searchInput.addEventListener('keyup', function(e) { try { - // Skip filtering during initialization - if (self.isInitializing) { - console.log("[realtimeSearch] KEYUP event during init - skipping filter"); - return; - } console.log('[realtimeSearch] KEYUP event - value: "' + e.target.value + '"'); self._filterProducts(); } catch (error) { - console.error("[realtimeSearch] Error in keyup listener:", error.message); + console.error('[realtimeSearch] Error in keyup listener:', error.message); } }); // Category select - self.categorySelect.addEventListener("change", function (e) { + self.categorySelect.addEventListener('change', function(e) { try { - // Skip filtering during initialization - if (self.isInitializing) { - console.log("[realtimeSearch] CHANGE event during init - skipping filter"); - return; - } - console.log( - '[realtimeSearch] CHANGE event - selected: "' + e.target.value + '"' - ); + console.log('[realtimeSearch] CHANGE event - selected: "' + e.target.value + '"'); self._filterProducts(); } catch (error) { - console.error( - "[realtimeSearch] Error in category change listener:", - error.message - ); + console.error('[realtimeSearch] Error in category change listener:', error.message); } }); - + // Tag filter badges: click to toggle selection (independent state) var tagBadges = document.querySelectorAll('[data-toggle="tag-filter"]'); - console.log("[realtimeSearch] Found " + tagBadges.length + " tag filter badges"); - + console.log('[realtimeSearch] Found ' + tagBadges.length + ' tag filter badges'); + // Get theme colors from CSS variables var rootStyles = getComputedStyle(document.documentElement); - var primaryColor = - rootStyles.getPropertyValue("--bs-primary").trim() || - rootStyles.getPropertyValue("--primary").trim() || - "#0d6efd"; - var secondaryColor = - rootStyles.getPropertyValue("--bs-secondary").trim() || - rootStyles.getPropertyValue("--secondary").trim() || - "#6c757d"; - - console.log( - "[realtimeSearch] Theme colors - Primary:", - primaryColor, - "Secondary:", - secondaryColor - ); - + var primaryColor = rootStyles.getPropertyValue('--bs-primary').trim() || + rootStyles.getPropertyValue('--primary').trim() || + '#0d6efd'; + var secondaryColor = rootStyles.getPropertyValue('--bs-secondary').trim() || + rootStyles.getPropertyValue('--secondary').trim() || + '#6c757d'; + + console.log('[realtimeSearch] Theme colors - Primary:', primaryColor, 'Secondary:', secondaryColor); + // Store original colors for each badge BEFORE adding event listeners - tagBadges.forEach(function (badge) { - var tagId = parseInt(badge.getAttribute("data-tag-id"), 10); - var tagColor = badge.getAttribute("data-tag-color"); - + tagBadges.forEach(function(badge) { + var tagId = parseInt(badge.getAttribute('data-tag-id'), 10); + var tagColor = badge.getAttribute('data-tag-color'); + // Store the original color (either from data-tag-color or use secondary for tags without color) if (tagColor) { self.originalTagColors[tagId] = tagColor; - console.log( - "[realtimeSearch] Stored original color for tag " + tagId + ": " + tagColor - ); + console.log('[realtimeSearch] Stored original color for tag ' + tagId + ': ' + tagColor); } else { - self.originalTagColors[tagId] = "var(--bs-secondary, " + secondaryColor + ")"; - console.log("[realtimeSearch] Tag " + tagId + " has no color, using secondary"); + self.originalTagColors[tagId] = 'var(--bs-secondary, ' + secondaryColor + ')'; + console.log('[realtimeSearch] Tag ' + tagId + ' has no color, using secondary'); } }); - - tagBadges.forEach(function (badge) { - badge.addEventListener("click", function (e) { + + tagBadges.forEach(function(badge) { + badge.addEventListener('click', function(e) { e.preventDefault(); - var tagId = parseInt(badge.getAttribute("data-tag-id"), 10); + var tagId = parseInt(badge.getAttribute('data-tag-id'), 10); var originalColor = self.originalTagColors[tagId]; - console.log( - "[realtimeSearch] Tag badge clicked: " + - tagId + - " (original color: " + - originalColor + - ")" - ); - + console.log('[realtimeSearch] Tag badge clicked: ' + tagId + ' (original color: ' + originalColor + ')'); + // Toggle tag selection if (self.selectedTags.has(tagId)) { // Deselect self.selectedTags.delete(tagId); - console.log("[realtimeSearch] Tag " + tagId + " deselected"); + console.log('[realtimeSearch] Tag ' + tagId + ' deselected'); } else { // Select self.selectedTags.add(tagId); - console.log("[realtimeSearch] Tag " + tagId + " selected"); + console.log('[realtimeSearch] Tag ' + tagId + ' selected'); } - + // Update colors for ALL badges based on selection state - tagBadges.forEach(function (badge) { - var id = parseInt(badge.getAttribute("data-tag-id"), 10); - + tagBadges.forEach(function(badge) { + var id = parseInt(badge.getAttribute('data-tag-id'), 10); + if (self.selectedTags.size === 0) { // No tags selected: restore all to original colors var originalColor = self.originalTagColors[id]; - badge.style.setProperty("background-color", originalColor, "important"); - badge.style.setProperty("border-color", originalColor, "important"); - badge.style.setProperty("color", "#ffffff", "important"); - console.log( - "[realtimeSearch] Badge " + - id + - " reset to original color (no selection)" - ); + badge.style.setProperty('background-color', originalColor, 'important'); + badge.style.setProperty('border-color', originalColor, 'important'); + badge.style.setProperty('color', '#ffffff', 'important'); + console.log('[realtimeSearch] Badge ' + id + ' reset to original color (no selection)'); } else if (self.selectedTags.has(id)) { // Selected: primary color - badge.style.setProperty( - "background-color", - "var(--bs-primary, " + primaryColor + ")", - "important" - ); - badge.style.setProperty( - "border-color", - "var(--bs-primary, " + primaryColor + ")", - "important" - ); - badge.style.setProperty("color", "#ffffff", "important"); - console.log( - "[realtimeSearch] Badge " + id + " set to primary (selected)" - ); + badge.style.setProperty('background-color', 'var(--bs-primary, ' + primaryColor + ')', 'important'); + badge.style.setProperty('border-color', 'var(--bs-primary, ' + primaryColor + ')', 'important'); + badge.style.setProperty('color', '#ffffff', 'important'); + console.log('[realtimeSearch] Badge ' + id + ' set to primary (selected)'); } else { // Not selected but others are: secondary color - badge.style.setProperty( - "background-color", - "var(--bs-secondary, " + secondaryColor + ")", - "important" - ); - badge.style.setProperty( - "border-color", - "var(--bs-secondary, " + secondaryColor + ")", - "important" - ); - badge.style.setProperty("color", "#ffffff", "important"); - console.log( - "[realtimeSearch] Badge " + id + " set to secondary (not selected)" - ); + badge.style.setProperty('background-color', 'var(--bs-secondary, ' + secondaryColor + ')', 'important'); + badge.style.setProperty('border-color', 'var(--bs-secondary, ' + secondaryColor + ')', 'important'); + badge.style.setProperty('color', '#ffffff', 'important'); + console.log('[realtimeSearch] Badge ' + id + ' set to secondary (not selected)'); } }); - + // Filter products (independent of search/category state) - // Skip during initialization - if (!self.isInitializing) { - self._filterProducts(); - } + self._filterProducts(); }); }); - + // POLLING FALLBACK: Since Odoo components may intercept events, // use polling to detect value changes - console.log("[realtimeSearch] 🚀 POLLING INITIALIZATION STARTING"); - console.log("[realtimeSearch] Search input element:", self.searchInput); - console.log("[realtimeSearch] Category select element:", self.categorySelect); - + console.log('[realtimeSearch] 🚀 POLLING INITIALIZATION STARTING'); + console.log('[realtimeSearch] Search input element:', self.searchInput); + console.log('[realtimeSearch] Category select element:', self.categorySelect); + var pollingCounter = 0; - var pollInterval = setInterval(function () { + var pollInterval = setInterval(function() { try { - // Skip polling during initialization to avoid clearing products - if (self.isInitializing) { - return; - } - pollingCounter++; - + // Try multiple ways to get the search value - var currentSearchValue = self.searchInput.value || ""; - var currentSearchAttr = self.searchInput.getAttribute("value") || ""; - var currentSearchDataValue = self.searchInput.getAttribute("data-value") || ""; - var currentSearchInnerText = self.searchInput.innerText || ""; - - var currentCategoryValue = self.categorySelect - ? self.categorySelect.value || "" - : ""; - + var currentSearchValue = self.searchInput.value || ''; + var currentSearchAttr = self.searchInput.getAttribute('value') || ''; + var currentSearchDataValue = self.searchInput.getAttribute('data-value') || ''; + var currentSearchInnerText = self.searchInput.innerText || ''; + + var currentCategoryValue = self.categorySelect ? (self.categorySelect.value || '') : ''; + // FIRST POLL: Detailed debug if (pollingCounter === 1) { - console.log("═══════════════════════════════════════════"); - console.log("[realtimeSearch] 🔍 FIRST POLLING DEBUG (POLL #1)"); - console.log("═══════════════════════════════════════════"); - console.log("Search input .value:", JSON.stringify(currentSearchValue)); - console.log( - 'Search input getAttribute("value"):', - JSON.stringify(currentSearchAttr) - ); - console.log( - 'Search input getAttribute("data-value"):', - JSON.stringify(currentSearchDataValue) - ); - console.log( - "Search input innerText:", - JSON.stringify(currentSearchInnerText) - ); - console.log( - "Category select .value:", - JSON.stringify(currentCategoryValue) - ); - console.log( - 'Last stored values - search:"' + - self.lastSearchValue + - '" category:"' + - self.lastCategoryValue + - '"' - ); - console.log("═══════════════════════════════════════════"); + console.log('═══════════════════════════════════════════'); + console.log('[realtimeSearch] 🔍 FIRST POLLING DEBUG (POLL #1)'); + console.log('═══════════════════════════════════════════'); + console.log('Search input .value:', JSON.stringify(currentSearchValue)); + console.log('Search input getAttribute("value"):', JSON.stringify(currentSearchAttr)); + console.log('Search input getAttribute("data-value"):', JSON.stringify(currentSearchDataValue)); + console.log('Search input innerText:', JSON.stringify(currentSearchInnerText)); + console.log('Category select .value:', JSON.stringify(currentCategoryValue)); + console.log('Last stored values - search:"' + self.lastSearchValue + '" category:"' + self.lastCategoryValue + '"'); + console.log('═══════════════════════════════════════════'); } - + // Log every 20 polls (reduce spam) if (pollingCounter % 20 === 0) { - console.log( - "[realtimeSearch] POLLING #" + - pollingCounter + - ': search="' + - currentSearchValue + - '" category="' + - currentCategoryValue + - '"' - ); + console.log('[realtimeSearch] POLLING #' + pollingCounter + ': search="' + currentSearchValue + '" category="' + currentCategoryValue + '"'); } - + // Check for ANY change in either field - if ( - currentSearchValue !== self.lastSearchValue || - currentCategoryValue !== self.lastCategoryValue - ) { - console.log( - '[realtimeSearch] ⚡ CHANGE DETECTED: search="' + - currentSearchValue + - '" (was:"' + - self.lastSearchValue + - '") | category="' + - currentCategoryValue + - '" (was:"' + - self.lastCategoryValue + - '")' - ); + if (currentSearchValue !== self.lastSearchValue || currentCategoryValue !== self.lastCategoryValue) { + console.log('[realtimeSearch] ⚡ CHANGE DETECTED: search="' + currentSearchValue + '" (was:"' + self.lastSearchValue + '") | category="' + currentCategoryValue + '" (was:"' + self.lastCategoryValue + '")'); self.lastSearchValue = currentSearchValue; self.lastCategoryValue = currentCategoryValue; - - // Reset infinite scroll with new filters (will reload from server) - if ( - window.infiniteScroll && - typeof window.infiniteScroll.resetWithFilters === "function" - ) { - console.log( - "[realtimeSearch] Calling infiniteScroll.resetWithFilters()" - ); - window.infiniteScroll.resetWithFilters( - currentSearchValue, - currentCategoryValue - ); - } else { - // Fallback: filter locally (but this only filters loaded products) - // Skip during initialization - if (!self.isInitializing) { - console.log( - "[realtimeSearch] infiniteScroll not available, filtering locally only" - ); - self._filterProducts(); - } - } + self._filterProducts(); } } catch (error) { - console.error("[realtimeSearch] ❌ Error in polling:", error.message); + console.error('[realtimeSearch] ❌ Error in polling:', error.message); } - }, 300); // Check every 300ms - - console.log("[realtimeSearch] ✅ Polling interval started with ID:", pollInterval); - - console.log("[realtimeSearch] Event listeners attached with polling fallback"); - - // Initialization complete - allow filtering now - self.isInitializing = false; - console.log("[realtimeSearch] ✅ Initialization complete - filtering enabled"); + }, 300); // Check every 300ms + + console.log('[realtimeSearch] ✅ Polling interval started with ID:', pollInterval); + + console.log('[realtimeSearch] Event listeners attached with polling fallback'); }, - - _initializeAvailableTags: function () { + + _initializeAvailableTags: function() { /** * Initialize availableTags map from the DOM tag filter badges. * Format: availableTags[tagId] = {id, name, count} */ var self = this; var tagBadges = document.querySelectorAll('[data-toggle="tag-filter"]'); - - tagBadges.forEach(function (badge) { - var tagId = parseInt(badge.getAttribute("data-tag-id"), 10); - var tagName = badge.getAttribute("data-tag-name") || ""; - var countSpan = badge.querySelector(".tag-count"); + + tagBadges.forEach(function(badge) { + var tagId = parseInt(badge.getAttribute('data-tag-id'), 10); + var tagName = badge.getAttribute('data-tag-name') || ''; + var countSpan = badge.querySelector('.tag-count'); var count = countSpan ? parseInt(countSpan.textContent, 10) : 0; - + self.availableTags[tagId] = { id: tagId, name: tagName, - count: count, + count: count }; }); - - console.log( - "[realtimeSearch] Initialized " + - Object.keys(self.availableTags).length + - " available tags" - ); + + console.log('[realtimeSearch] Initialized ' + Object.keys(self.availableTags).length + ' available tags'); }, - _filterProducts: function () { + _filterProducts: function() { var self = this; try { - var searchQuery = (self.searchInput.value || "").toLowerCase().trim(); - var selectedCategoryId = (self.categorySelect.value || "").toString(); - - console.log( - "[realtimeSearch] Filtering: search=" + - searchQuery + - " category=" + - selectedCategoryId + - " tags=" + - Array.from(self.selectedTags).join(",") - ); + var searchQuery = (self.searchInput.value || '').toLowerCase().trim(); + var selectedCategoryId = (self.categorySelect.value || '').toString(); + + console.log('[realtimeSearch] Filtering: search=' + searchQuery + ' category=' + selectedCategoryId + ' tags=' + Array.from(self.selectedTags).join(',')); // Build a set of allowed category IDs (selected category + ALL descendants recursively) var allowedCategories = {}; - + if (selectedCategoryId) { allowedCategories[selectedCategoryId] = true; - + // Recursive function to get all descendants - var getAllDescendants = function (parentId) { + var getAllDescendants = function(parentId) { var descendants = []; if (self.categoryHierarchy[parentId]) { - self.categoryHierarchy[parentId].forEach(function (childId) { + self.categoryHierarchy[parentId].forEach(function(childId) { descendants.push(childId); allowedCategories[childId] = true; // Recursivamente obtener descendientes del hijo @@ -591,171 +375,120 @@ } return descendants; }; - + var allDescendants = getAllDescendants(selectedCategoryId); - console.log( - "[realtimeSearch] Selected category " + - selectedCategoryId + - " has " + - allDescendants.length + - " total descendants" - ); - console.log( - "[realtimeSearch] Allowed categories:", - Object.keys(allowedCategories) - ); + console.log('[realtimeSearch] Selected category ' + selectedCategoryId + ' has ' + allDescendants.length + ' total descendants'); + console.log('[realtimeSearch] Allowed categories:', Object.keys(allowedCategories)); } var visibleCount = 0; var hiddenCount = 0; + + // Track tag counts for dynamic badge updates + var tagCounts = {}; + for (var tagId in self.availableTags) { + tagCounts[tagId] = 0; + } - // NOTE: Tag counts are NOT updated dynamically here because with lazy loading, - // self.allProducts only contains products from current page. - // Tag counts must remain as provided by backend (calculated on full dataset). - - self.allProducts.forEach(function (product) { + self.allProducts.forEach(function(product) { var nameMatches = !searchQuery || product.name.indexOf(searchQuery) !== -1; - var categoryMatches = - !selectedCategoryId || allowedCategories[product.category]; - + var categoryMatches = !selectedCategoryId || allowedCategories[product.category]; + // Tag filtering: if tags are selected, product must have AT LEAST ONE selected tag (OR logic) var tagMatches = true; if (self.selectedTags.size > 0) { - tagMatches = product.tags.some(function (productTagId) { + tagMatches = product.tags.some(function(productTagId) { return self.selectedTags.has(productTagId); }); } - + var shouldShow = nameMatches && categoryMatches && tagMatches; if (shouldShow) { - product.element.classList.remove("hidden-product"); + product.element.classList.remove('hidden-product'); visibleCount++; + + // Count this product's tags toward the dynamic counters + product.tags.forEach(function(tagId) { + if (tagCounts.hasOwnProperty(tagId)) { + tagCounts[tagId]++; + } + }); } else { - product.element.classList.add("hidden-product"); + product.element.classList.add('hidden-product'); hiddenCount++; } }); - console.log( - "[realtimeSearch] Filter result: visible=" + - visibleCount + - " hidden=" + - hiddenCount + - " (selectedTags: " + - Array.from(self.selectedTags).join(",") + - ")" - ); - - // Auto-load more products if too few are visible - self._autoLoadMoreIfNeeded(visibleCount); - } catch (error) { - console.error("[realtimeSearch] ERROR in _filterProducts():", error.message); - console.error("[realtimeSearch] Stack:", error.stack); - } - }, - - _autoLoadMoreIfNeeded: function (visibleCount) { - /** - * Automatically load more products if there are too few visible on screen. - * This prevents empty screens when filters hide most products. - * - * @param {number} visibleCount - Number of currently visible products - */ - var self = this; - var minVisibleProducts = 10; // Minimum products before auto-loading more - - // Only auto-load if infinite scroll is available and has more pages - if ( - !window.infiniteScroll || - typeof window.infiniteScroll.loadNextPage !== "function" - ) { - return; - } - - // Check if we need more products - if (visibleCount < minVisibleProducts && window.infiniteScroll.hasMore) { - console.log( - "[realtimeSearch] Only " + - visibleCount + - " products visible (min: " + - minVisibleProducts + - "), auto-loading next page..." - ); - - // Delay slightly to avoid race conditions - setTimeout(function () { - if ( - window.infiniteScroll && - !window.infiniteScroll.isLoading && - window.infiniteScroll.hasMore - ) { - window.infiniteScroll.loadNextPage(); + // Update badge counts dynamically + for (var tagId in tagCounts) { + var badge = document.querySelector('[data-tag-id="' + tagId + '"]'); + if (badge) { + var countSpan = badge.querySelector('.tag-count'); + if (countSpan) { + countSpan.textContent = tagCounts[tagId]; + } } - }, 100); + } + + console.log('[realtimeSearch] Filter result: visible=' + visibleCount + ' hidden=' + hiddenCount); + } catch (error) { + console.error('[realtimeSearch] ERROR in _filterProducts():', error.message); + console.error('[realtimeSearch] Stack:', error.stack); } - }, + } }; // Initialize when DOM is ready - console.log("[realtimeSearch] Script loaded, DOM state: " + document.readyState); - + console.log('[realtimeSearch] Script loaded, DOM state: ' + document.readyState); + function tryInit() { try { - console.log("[realtimeSearch] Attempting initialization..."); - + console.log('[realtimeSearch] Attempting initialization...'); + // Query product cards - var productCards = document.querySelectorAll(".product-card"); - console.log("[realtimeSearch] Found " + productCards.length + " product cards"); - + var productCards = document.querySelectorAll('.product-card'); + console.log('[realtimeSearch] Found ' + productCards.length + ' product cards'); + // Use the NEW pure HTML input with ID (not transformed by Odoo) - var searchInput = document.getElementById("realtime-search-input"); - console.log("[realtimeSearch] Search input found:", !!searchInput); + var searchInput = document.getElementById('realtime-search-input'); + console.log('[realtimeSearch] Search input found:', !!searchInput); if (searchInput) { - console.log("[realtimeSearch] Search input class:", searchInput.className); - console.log("[realtimeSearch] Search input type:", searchInput.type); + console.log('[realtimeSearch] Search input class:', searchInput.className); + console.log('[realtimeSearch] Search input type:', searchInput.type); } - + // Category select with ID (not transformed by Odoo) - var categorySelect = document.getElementById("realtime-category-select"); - console.log("[realtimeSearch] Category select found:", !!categorySelect); - + var categorySelect = document.getElementById('realtime-category-select'); + console.log('[realtimeSearch] Category select found:', !!categorySelect); + if (productCards.length > 0 && searchInput) { - console.log("[realtimeSearch] ✓ All elements found! Initializing..."); + console.log('[realtimeSearch] ✓ All elements found! Initializing...'); // Assign elements to window.realtimeSearch BEFORE calling init() window.realtimeSearch.searchInput = searchInput; window.realtimeSearch.categorySelect = categorySelect; window.realtimeSearch.init(); - console.log("[realtimeSearch] ✓ Initialization complete!"); + console.log('[realtimeSearch] ✓ Initialization complete!'); } else { - console.log( - "[realtimeSearch] Waiting for elements... (products:" + - productCards.length + - ", search:" + - !!searchInput + - ")" - ); + console.log('[realtimeSearch] Waiting for elements... (products:' + productCards.length + ', search:' + !!searchInput + ')'); if (productCards.length === 0) { - console.log( - "[realtimeSearch] No product cards found. Current HTML body length:", - document.body.innerHTML.length - ); + console.log('[realtimeSearch] No product cards found. Current HTML body length:', document.body.innerHTML.length); } setTimeout(tryInit, 500); } } catch (error) { - console.error("[realtimeSearch] ERROR in tryInit():", error.message); + console.error('[realtimeSearch] ERROR in tryInit():', error.message); } } - - if (document.readyState === "loading") { - console.log("[realtimeSearch] Adding DOMContentLoaded listener"); - document.addEventListener("DOMContentLoaded", function () { - console.log("[realtimeSearch] DOMContentLoaded fired"); + + if (document.readyState === 'loading') { + console.log('[realtimeSearch] Adding DOMContentLoaded listener'); + document.addEventListener('DOMContentLoaded', function() { + console.log('[realtimeSearch] DOMContentLoaded fired'); tryInit(); }); } else { - console.log("[realtimeSearch] DOM already loaded, initializing with delay"); + console.log('[realtimeSearch] DOM already loaded, initializing with delay'); setTimeout(tryInit, 500); } })(); diff --git a/website_sale_aplicoop/static/src/js/website_sale.js b/website_sale_aplicoop/static/src/js/website_sale.js index a02f2b7..57f3b77 100644 --- a/website_sale_aplicoop/static/src/js/website_sale.js +++ b/website_sale_aplicoop/static/src/js/website_sale.js @@ -3,244 +3,226 @@ * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) */ -(function () { - "use strict"; +(function() { + 'use strict'; // Objeto global para gestión de carrito window.groupOrderShop = { orderId: null, cart: {}, - labels: {}, // Will be loaded from HTML data attributes + labels: {}, // Will be loaded from HTML data attributes - init: function () { - console.log("[groupOrderShop] Initializing..."); + init: function() { + console.log('[groupOrderShop] Initializing...'); var self = this; - + // Get order ID first (needed by i18nManager and other functions) - var confirmBtn = document.getElementById("confirm-order-btn"); - var cartContainer = document.getElementById("cart-items-container"); + var confirmBtn = document.getElementById('confirm-order-btn'); + var cartContainer = document.getElementById('cart-items-container'); var orderIdElement = confirmBtn || cartContainer; if (!orderIdElement) { - console.log("No elements found to get order ID"); + console.log('No elements found to get order ID'); return false; } // Get the order ID from the data attribute or from the URL - this.orderId = orderIdElement.getAttribute("data-order-id"); + this.orderId = orderIdElement.getAttribute('data-order-id'); if (!this.orderId) { var urlMatch = window.location.pathname.match(/\/eskaera\/(\d+)/); this.orderId = urlMatch ? urlMatch[1] : null; } if (!this.orderId) { - console.error("Order ID not found"); + console.error('Order ID not found'); if (cartContainer) { - cartContainer.innerHTML = - '
' + "Error: Order ID not found
"; + cartContainer.innerHTML = '
' + + 'Error: Order ID not found
'; } return false; } - console.log("Initializing cart for order:", this.orderId); - - // Attach event listeners FIRST (doesn't depend on translations) - this._attachEventListeners(); - console.log("[groupOrderShop] Event listeners attached"); + console.log('Initializing cart for order:', this.orderId); // Wait for i18nManager to load translations from server - i18nManager - .init() - .then(function () { - console.log("[groupOrderShop] Translations loaded from server"); - self.labels = i18nManager.getAll(); - - self._loadCart(); - self._checkConfirmationMessage(); - self._initializeTooltips(); - - // Update display if there is cart-items-container - if (cartContainer) { - self._updateCartDisplay(); - } - - // Check if we're loading from history - var storageKey = "load_from_history_" + self.orderId; - if (sessionStorage.getItem(storageKey)) { - // Load items from historical order - self._loadFromHistory(); - } else { - // Auto-load draft order on page load (silent mode) - self._autoLoadDraftOnInit(); - } - - // Emit event when fully initialized - document.dispatchEvent( - new CustomEvent("groupOrderShopReady", { - detail: { labels: self.labels }, - }) - ); - - console.log("[groupOrderShop] ✓ Initialization complete"); - }) - .catch(function (error) { - console.error("[groupOrderShop] Failed to initialize translations:", error); - // Fallback: use empty labels so app doesn't crash - self.labels = {}; - }); + i18nManager.init().then(function() { + console.log('[groupOrderShop] Translations loaded from server'); + self.labels = i18nManager.getAll(); + + // Initialize event listeners and state after translations are ready + self._attachEventListeners(); + self._loadCart(); + self._checkConfirmationMessage(); + self._initializeTooltips(); + + // Update display if there is cart-items-container + if (cartContainer) { + self._updateCartDisplay(); + } + + // Check if we're loading from history + var storageKey = 'load_from_history_' + self.orderId; + if (sessionStorage.getItem(storageKey)) { + // Load items from historical order + self._loadFromHistory(); + } else { + // Auto-load draft order on page load (silent mode) + self._autoLoadDraftOnInit(); + } + + // Emit event when fully initialized + document.dispatchEvent(new CustomEvent('groupOrderShopReady', { + detail: { labels: self.labels } + })); + + console.log('[groupOrderShop] ✓ Initialization complete'); + }).catch(function(error) { + console.error('[groupOrderShop] Failed to initialize translations:', error); + // Fallback: use empty labels so app doesn't crash + self.labels = {}; + }); // Dispatch event to notify that cart is ready (preliminary, will be fired again when translations loaded) - var event = new CustomEvent("groupOrderCartReady", { - detail: { orderId: this.orderId }, - }); + var event = new CustomEvent('groupOrderCartReady', { detail: { orderId: this.orderId } }); document.dispatchEvent(event); - console.log("Cart ready event dispatched for order:", this.orderId); + console.log('Cart ready event dispatched for order:', this.orderId); return true; }, - _checkConfirmationMessage: function () { + _checkConfirmationMessage: function() { // Removed: this was showing confirmation message again in eskaera page // which confused the user. The message is shown only in the checkout page // before redirecting. - var confirmationMessage = sessionStorage.getItem("confirmation_message"); + var confirmationMessage = sessionStorage.getItem('confirmation_message'); if (confirmationMessage) { // Just remove it, don't show it again - sessionStorage.removeItem("confirmation_message"); + sessionStorage.removeItem('confirmation_message'); } }, - _autoLoadDraftOnInit: function () { - console.log("Attempting to auto-load draft order..."); + _autoLoadDraftOnInit: function() { + console.log('Attempting to auto-load draft order...'); var self = this; // Only auto-load if cart is empty var cartItemsCount = Object.keys(this.cart).length; if (cartItemsCount > 0) { - console.log("Cart already has items (" + cartItemsCount + "), skipping auto-load"); + console.log('Cart already has items (' + cartItemsCount + '), skipping auto-load'); return; } var orderData = { - order_id: this.orderId, + order_id: this.orderId }; var xhr = new XMLHttpRequest(); - xhr.open("POST", "/eskaera/load-draft", true); - xhr.setRequestHeader("Content-Type", "application/json"); + xhr.open('POST', '/eskaera/load-draft', true); + xhr.setRequestHeader('Content-Type', 'application/json'); - xhr.onload = function () { + xhr.onload = function() { if (xhr.status === 200) { try { var data = JSON.parse(xhr.responseText); if (data.success) { // Clear current cart self.cart = {}; - + // Load items from draft order var items = data.items || []; - items.forEach(function (item) { + items.forEach(function(item) { var productId = item.product_id; self.cart[productId] = { name: item.product_name, price: item.product_price, - qty: item.quantity, + qty: item.quantity }; }); // Save to localStorage self._saveCart(); - + // Restore pickup fields if available if (data.pickup_day) { - var dayElement = document.getElementById("pickup-day"); + var dayElement = document.getElementById('pickup-day'); if (dayElement) { dayElement.value = data.pickup_day; - console.log("Auto-loaded pickup_day:", data.pickup_day); + console.log('Auto-loaded pickup_day:', data.pickup_day); } } - + if (data.pickup_date) { - var dateElement = document.getElementById("pickup-date"); + var dateElement = document.getElementById('pickup-date'); if (dateElement) { dateElement.value = data.pickup_date; - console.log("Auto-loaded pickup_date:", data.pickup_date); + console.log('Auto-loaded pickup_date:', data.pickup_date); } } - + if (data.home_delivery !== undefined) { - var homeDeliveryElement = - document.getElementById("home-delivery-checkbox"); + var homeDeliveryElement = document.getElementById('home-delivery-checkbox'); if (homeDeliveryElement) { homeDeliveryElement.checked = data.home_delivery; - console.log("Auto-loaded home_delivery:", data.home_delivery); + console.log('Auto-loaded home_delivery:', data.home_delivery); } } - + // Update display self._updateCartDisplay(); - console.log("Auto-loaded " + items.length + " items from draft"); + console.log('Auto-loaded ' + items.length + ' items from draft'); // Show a subtle notification var labels = self._getLabels(); - var cartRestoredMsg = - (labels.cart_restored || "Your cart has been restored") + - " (" + - items.length + - " items)"; - self._showNotification("✓ " + cartRestoredMsg, "info", 3000); + var cartRestoredMsg = (labels.cart_restored || 'Your cart has been restored') + ' (' + items.length + ' items)'; + self._showNotification('✓ ' + cartRestoredMsg, 'info', 3000); } else { // Silently ignore - no draft found (normal case) - console.log("No draft found to auto-load (normal)"); + console.log('No draft found to auto-load (normal)'); } } catch (e) { - console.error("Error parsing auto-load response:", e); + console.error('Error parsing auto-load response:', e); } } else if (xhr.status === 404) { // No draft found - this is normal, not an error - console.log("No draft order found (404 - normal)"); + console.log('No draft order found (404 - normal)'); } else { - console.log("Auto-load failed with status:", xhr.status); + console.log('Auto-load failed with status:', xhr.status); } }; - xhr.onerror = function () { - console.log("Auto-load connection error (non-critical)"); + xhr.onerror = function() { + console.log('Auto-load connection error (non-critical)'); }; xhr.send(JSON.stringify(orderData)); }, - _loadFromHistory: function () { + _loadFromHistory: function() { // Load items from historical order (called from load_from_history page) var self = this; - var storageKey = "load_from_history_" + this.orderId; - var orderNameKey = "load_from_history_order_name_" + this.orderId; - var pickupDayKey = "load_from_history_pickup_day_" + this.orderId; - var pickupDateKey = "load_from_history_pickup_date_" + this.orderId; - var homeDeliveryKey = "load_from_history_home_delivery_" + this.orderId; - + var storageKey = 'load_from_history_' + this.orderId; + var orderNameKey = 'load_from_history_order_name_' + this.orderId; + var pickupDayKey = 'load_from_history_pickup_day_' + this.orderId; + var pickupDateKey = 'load_from_history_pickup_date_' + this.orderId; + var homeDeliveryKey = 'load_from_history_home_delivery_' + this.orderId; + var itemsJson = sessionStorage.getItem(storageKey); var orderName = sessionStorage.getItem(orderNameKey); var pickupDay = sessionStorage.getItem(pickupDayKey); var pickupDate = sessionStorage.getItem(pickupDateKey); - var homeDelivery = sessionStorage.getItem(homeDeliveryKey) === "true"; + var homeDelivery = sessionStorage.getItem(homeDeliveryKey) === 'true'; - console.log("DEBUG: _loadFromHistory called for orderId:", this.orderId); - console.log("DEBUG: sessionStorageKey:", storageKey); - console.log("DEBUG: sessionStorage value type:", typeof itemsJson, "value:", itemsJson); - console.log("DEBUG: orderName:", orderName); - console.log("DEBUG: pickupDay:", pickupDay, "(empty means different group order)"); - console.log("DEBUG: pickupDate:", pickupDate, "(empty means different group order)"); - console.log( - "DEBUG: homeDelivery:", - homeDelivery, - "(empty means different group order)" - ); + console.log('DEBUG: _loadFromHistory called for orderId:', this.orderId); + console.log('DEBUG: sessionStorageKey:', storageKey); + console.log('DEBUG: sessionStorage value type:', typeof itemsJson, 'value:', itemsJson); + console.log('DEBUG: orderName:', orderName); + console.log('DEBUG: pickupDay:', pickupDay, '(empty means different group order)'); + console.log('DEBUG: pickupDate:', pickupDate, '(empty means different group order)'); + console.log('DEBUG: homeDelivery:', homeDelivery, '(empty means different group order)'); - if (!itemsJson || itemsJson === "[object Object]") { - console.log("No valid items from history found in sessionStorage"); + if (!itemsJson || itemsJson === '[object Object]') { + console.log('No valid items from history found in sessionStorage'); sessionStorage.removeItem(storageKey); sessionStorage.removeItem(orderNameKey); sessionStorage.removeItem(pickupDayKey); @@ -251,17 +233,17 @@ try { // Ensure itemsJson is a string before parsing - if (typeof itemsJson !== "string") { - console.log("itemsJson is not a string, converting..."); + if (typeof itemsJson !== 'string') { + console.log('itemsJson is not a string, converting...'); itemsJson = JSON.stringify(itemsJson); } // Parse items var items = JSON.parse(itemsJson); - + // Verify we got an array if (!Array.isArray(items)) { - console.error("Parsed items is not an array:", items); + console.error('Parsed items is not an array:', items); sessionStorage.removeItem(storageKey); sessionStorage.removeItem(orderNameKey); sessionStorage.removeItem(pickupDayKey); @@ -270,68 +252,59 @@ return; } - console.log("Loaded " + items.length + " items from history:", items); + console.log('Loaded ' + items.length + ' items from history:', items); // Clear current cart this.cart = {}; - console.log("Cart cleared, now empty"); + console.log('Cart cleared, now empty'); // Add each item to cart - items.forEach(function (item) { + items.forEach(function(item) { self.cart[item.product_id] = { - name: item.product_name || "Product " + item.product_id, + name: item.product_name || 'Product ' + item.product_id, price: item.price || 0, - qty: item.quantity || 1, + qty: item.quantity || 1 }; - console.log( - "Added to cart: product_id=" + item.product_id + ", qty=" + item.quantity - ); + console.log('Added to cart: product_id=' + item.product_id + ', qty=' + item.quantity); }); - console.log("Cart after adding all items:", self.cart); + console.log('Cart after adding all items:', self.cart); // Save to localStorage this._saveCart(); - console.log( - "After _saveCart(), localStorage contains:", - localStorage.getItem("eskaera_" + this.orderId + "_cart") - ); + console.log('After _saveCart(), localStorage contains:', localStorage.getItem('eskaera_' + this.orderId + '_cart')); // Restore pickup fields if available (non-empty) // Empty values mean the order was from a different group order, // so we use the current group order's pickup fields instead - if (pickupDay && pickupDay.trim() !== "") { - var dayElement = document.getElementById("pickup-day"); + if (pickupDay && pickupDay.trim() !== '') { + var dayElement = document.getElementById('pickup-day'); if (dayElement) { dayElement.value = pickupDay; - console.log("Restored pickup_day from old order:", pickupDay); + console.log('Restored pickup_day from old order:', pickupDay); } } else { - console.log( - "Did NOT restore pickup_day (empty = different group order, using current group order days)" - ); + console.log('Did NOT restore pickup_day (empty = different group order, using current group order days)'); } - - if (pickupDate && pickupDate.trim() !== "") { - var dateElement = document.getElementById("pickup-date"); + + if (pickupDate && pickupDate.trim() !== '') { + var dateElement = document.getElementById('pickup-date'); if (dateElement) { dateElement.value = pickupDate; - console.log("Restored pickup_date from old order:", pickupDate); + console.log('Restored pickup_date from old order:', pickupDate); } } else { - console.log("Did NOT restore pickup_date (empty = different group order)"); + console.log('Did NOT restore pickup_date (empty = different group order)'); } - + if (homeDelivery !== null && homeDelivery !== false) { - var homeDeliveryElement = document.getElementById("home-delivery-checkbox"); + var homeDeliveryElement = document.getElementById('home-delivery-checkbox'); if (homeDeliveryElement) { homeDeliveryElement.checked = homeDelivery; - console.log("Restored home_delivery from old order:", homeDelivery); + console.log('Restored home_delivery from old order:', homeDelivery); } } else { - console.log( - "Did NOT restore home_delivery (empty/false = different group order or not set)" - ); + console.log('Did NOT restore home_delivery (empty/false = different group order or not set)'); } // Update display @@ -339,13 +312,13 @@ // Show notification with order reference if available var labels = this._getLabels(); - var itemsLabel = labels.items || "items"; - var orderLoadedMsg = labels.order_loaded || "Order loaded"; - var message = "✓ " + orderLoadedMsg + " (" + items.length + " " + itemsLabel + ")"; + var itemsLabel = labels.items || 'items'; + var orderLoadedMsg = labels.order_loaded || 'Order loaded'; + var message = '✓ ' + orderLoadedMsg + ' (' + items.length + ' ' + itemsLabel + ')'; if (orderName) { - message += " - " + orderName; + message += ' - ' + orderName; } - this._showNotification(message, "success", 3000); + this._showNotification(message, 'success', 3000); // Clear sessionStorage sessionStorage.removeItem(storageKey); @@ -353,9 +326,10 @@ sessionStorage.removeItem(pickupDayKey); sessionStorage.removeItem(pickupDateKey); sessionStorage.removeItem(homeDeliveryKey); + } catch (e) { - console.error("Error loading from history:", e); - console.error("itemsJson was:", itemsJson); + console.error('Error loading from history:', e); + console.error('itemsJson was:', itemsJson); // Don't show error to user if sessionStorage had invalid data - just continue sessionStorage.removeItem(storageKey); sessionStorage.removeItem(orderNameKey); @@ -363,48 +337,45 @@ sessionStorage.removeItem(pickupDateKey); sessionStorage.removeItem(homeDeliveryKey); // Only show notification if we actually tried to load something - if (itemsJson && itemsJson !== "[object Object]") { - this._showNotification("Error loading order: " + e.message, "danger"); + if (itemsJson && itemsJson !== '[object Object]') { + this._showNotification('Error loading order: ' + e.message, 'danger'); } } }, - _loadCart: function () { - var cartKey = "eskaera_" + this.orderId + "_cart"; + _loadCart: function() { + var cartKey = 'eskaera_' + this.orderId + '_cart'; var savedCart = localStorage.getItem(cartKey); this.cart = savedCart ? JSON.parse(savedCart) : {}; - console.log("Cart loaded from localStorage[" + cartKey + "]:", this.cart); - console.log("Raw localStorage value:", savedCart); + console.log('Cart loaded from localStorage[' + cartKey + ']:', this.cart); + console.log('Raw localStorage value:', savedCart); }, - _saveCart: function () { - var cartKey = "eskaera_" + this.orderId + "_cart"; + _saveCart: function() { + var cartKey = 'eskaera_' + this.orderId + '_cart'; var cartJson = JSON.stringify(this.cart); localStorage.setItem(cartKey, cartJson); - console.log("Cart saved to localStorage[" + cartKey + "]:", this.cart); - console.log("Verification - immediately read back:", localStorage.getItem(cartKey)); + console.log('Cart saved to localStorage[' + cartKey + ']:', this.cart); + console.log('Verification - immediately read back:', localStorage.getItem(cartKey)); }, - _showNotification: function (message, type, duration) { + _showNotification: function(message, type, duration) { // type: 'success', 'error', 'warning', 'info' // duration: milliseconds (default 8000 = 8 seconds) - type = type || "info"; + type = type || 'info'; duration = duration || 8000; - var notification = document.createElement("div"); - notification.className = - "alert alert-" + type + " alert-dismissible fade show position-fixed"; - notification.style.cssText = - "top: 80px; right: 20px; z-index: 9999; min-width: 300px; max-width: 500px; font-size: 18px; padding: 1.5rem; transition: opacity 0.3s ease-out;"; - notification.innerHTML = - message + + var notification = document.createElement('div'); + notification.className = 'alert alert-' + type + ' alert-dismissible fade show position-fixed'; + notification.style.cssText = 'top: 80px; right: 20px; z-index: 9999; min-width: 300px; max-width: 500px; font-size: 18px; padding: 1.5rem; transition: opacity 0.3s ease-out;'; + notification.innerHTML = message + ''; - + document.body.appendChild(notification); - setTimeout(function () { - notification.classList.remove("show"); - setTimeout(function () { + setTimeout(function() { + notification.classList.remove('show'); + setTimeout(function() { if (notification.parentNode) { notification.parentNode.removeChild(notification); } @@ -412,81 +383,72 @@ }, duration); }, - _getLabels: function () { + _getLabels: function() { // Get current labels from window.groupOrderShop which is updated by checkout_labels.js - console.log("[_getLabels] Starting label resolution..."); - console.log("[_getLabels] window.groupOrderShop exists:", !!window.groupOrderShop); - + console.log('[_getLabels] Starting label resolution...'); + console.log('[_getLabels] window.groupOrderShop exists:', !!window.groupOrderShop); + if (window.groupOrderShop && window.groupOrderShop.labels) { - console.log("[_getLabels] window.groupOrderShop.labels exists"); + console.log('[_getLabels] window.groupOrderShop.labels exists'); var keysCount = Object.keys(window.groupOrderShop.labels).length; - console.log("[_getLabels] Keys count:", keysCount); + console.log('[_getLabels] Keys count:', keysCount); if (keysCount > 0) { - console.log( - "[_getLabels] ✅ USING window.groupOrderShop.labels (from endpoint):", - window.groupOrderShop.labels - ); + console.log('[_getLabels] ✅ USING window.groupOrderShop.labels (from endpoint):', window.groupOrderShop.labels); return window.groupOrderShop.labels; } } - - console.log("[_getLabels] window.groupOrderShop check failed, trying this.labels"); + + console.log('[_getLabels] window.groupOrderShop check failed, trying this.labels'); if (this.labels && Object.keys(this.labels).length > 0) { - console.log("[_getLabels] ⚠️ USING this.labels (fallback):", this.labels); + console.log('[_getLabels] ⚠️ USING this.labels (fallback):', this.labels); return this.labels; } - - console.log("[_getLabels] ❌ USING default labels"); + + console.log('[_getLabels] ❌ USING default labels'); return this._getDefaultLabels(); }, - _initializeTooltips: function () { - console.log("[_initializeTooltips] Initializing tooltips with translated labels..."); + _initializeTooltips: function() { + console.log('[_initializeTooltips] Initializing tooltips with translated labels...'); var self = this; var labels = this._getLabels(); - + // Map of button IDs/classes to label keys var tooltipMap = { - "save-cart-btn": "save_cart", - "reload-cart-btn": "reload_cart", - "confirm-order-btn": "confirm_order", - "remove-from-cart": "remove_item", + 'save-cart-btn': 'save_cart', + 'reload-cart-btn': 'reload_cart', + 'confirm-order-btn': 'confirm_order', + 'remove-from-cart': 'remove_item' }; - + // Map of href patterns to label keys var hrefPatterns = [ - { pattern: /\/checkout$/, labelKey: "proceed_to_checkout" }, - { pattern: /\/eskaera\/\d+$/, labelKey: "back_to_cart" }, + { pattern: /\/checkout$/, labelKey: 'proceed_to_checkout' }, + { pattern: /\/eskaera\/\d+$/, labelKey: 'back_to_cart' } ]; - + // Find all elements with data-bs-toggle="tooltip" var tooltipElements = document.querySelectorAll('[data-bs-toggle="tooltip"]'); - console.log("[_initializeTooltips] Found", tooltipElements.length, "tooltip elements"); - + console.log('[_initializeTooltips] Found', tooltipElements.length, 'tooltip elements'); + // Also update category select placeholder text - var categorySelect = document.getElementById("realtime-category-select"); + var categorySelect = document.getElementById('realtime-category-select'); if (categorySelect && categorySelect.options[0]) { - var allCategoriesLabel = - labels["browse_categories"] || - labels["all_categories"] || - "Browse Product Categories"; + var allCategoriesLabel = labels['browse_categories'] || labels['all_categories'] || 'Browse Product Categories'; categorySelect.options[0].text = allCategoriesLabel; - console.log( - "[_initializeTooltips] Updated category select option to:", - allCategoriesLabel - ); + console.log('[_initializeTooltips] Updated category select option to:', allCategoriesLabel); } - - tooltipElements.forEach(function (element) { + + tooltipElements.forEach(function(element) { var tooltipText = null; var labelKey = null; - + // Check ID-based mapping if (element.id && tooltipMap[element.id]) { labelKey = tooltipMap[element.id]; tooltipText = labels[labelKey]; } - + // Check class-based mapping if (!tooltipText) { for (var key in tooltipMap) { @@ -497,7 +459,7 @@ } } } - + // Check href-based mapping if (!tooltipText && element.href) { for (var i = 0; i < hrefPatterns.length; i++) { @@ -508,314 +470,273 @@ } } } - + // Fallback: use data-bs-title if no label found if (!tooltipText) { - tooltipText = element.getAttribute("data-bs-title"); + tooltipText = element.getAttribute('data-bs-title'); } - + if (tooltipText) { - element.setAttribute("title", tooltipText); - console.log( - "[_initializeTooltips] Set title on", - element.id || element.className, - "→", - tooltipText, - "(label key:", - labelKey, - ")" - ); + element.setAttribute('title', tooltipText); + console.log('[_initializeTooltips] Set title on', element.id || element.className, '→', tooltipText, '(label key:', labelKey, ')'); } else { - console.warn( - "[_initializeTooltips] No tooltip text found for", - element.id || element.className - ); + console.warn('[_initializeTooltips] No tooltip text found for', element.id || element.className); } }); }, - _showConfirmation: function (message, onConfirm, onCancel) { + _showConfirmation: function(message, onConfirm, onCancel) { var self = this; // Get current labels - may be updated by checkout_labels.js endpoint var labels = this._getLabels(); - console.log("[_showConfirmation] Using labels:", labels); - + console.log('[_showConfirmation] Using labels:', labels); + // Create modal backdrop - var backdrop = document.createElement("div"); - backdrop.className = "modal-backdrop fade show"; - backdrop.style.zIndex = "9998"; + var backdrop = document.createElement('div'); + backdrop.className = 'modal-backdrop fade show'; + backdrop.style.zIndex = '9998'; // Create modal - var modal = document.createElement("div"); - modal.className = "modal fade show d-block"; - modal.style.zIndex = "9999"; - modal.innerHTML = - '
' + + var modal = document.createElement('div'); + modal.className = 'modal fade show d-block'; + modal.style.zIndex = '9999'; + modal.innerHTML = '
' + '
' + '
' + - '
' + - (labels.confirmation || "Confirmation") + - "
" + + '
' + (labels.confirmation || 'Confirmation') + '
' + '' + - "
" + + '
' + '
' + - "

" + - message.replace(/\n/g, "
") + - "

" + - "
" + + '

' + message.replace(/\n/g, '
') + '

' + + '
' + '
' + - '" + - '" + - "
" + - "
" + - "
"; + '' + + '' + + '
' + + '
' + + '
'; document.body.appendChild(backdrop); document.body.appendChild(modal); - var closeModal = function () { - modal.classList.remove("show"); - backdrop.classList.remove("show"); - setTimeout(function () { + var closeModal = function() { + modal.classList.remove('show'); + backdrop.classList.remove('show'); + setTimeout(function() { if (modal.parentNode) modal.parentNode.removeChild(modal); if (backdrop.parentNode) backdrop.parentNode.removeChild(backdrop); }, 150); }; - document.getElementById("modal-confirm").addEventListener("click", function () { + document.getElementById('modal-confirm').addEventListener('click', function() { closeModal(); if (onConfirm) onConfirm(); }); - document.getElementById("modal-cancel").addEventListener("click", function () { + document.getElementById('modal-cancel').addEventListener('click', function() { closeModal(); if (onCancel) onCancel(); }); - document.getElementById("modal-close-x").addEventListener("click", function () { + document.getElementById('modal-close-x').addEventListener('click', function() { closeModal(); if (onCancel) onCancel(); }); }, - _attachEventListeners: function () { + _attachEventListeners: function() { var self = this; + // Adjust quantity step based on UoM category + // Categories without decimals (per unit): "Unit", "Units", etc. + // Categories with decimals: "Weight", "Volume", "Length", etc. + var unitInputs = document.querySelectorAll('.product-qty'); + console.log('=== ADJUSTING QUANTITY STEPS ==='); + console.log('Found ' + unitInputs.length + ' quantity inputs'); + + for (var j = 0; j < unitInputs.length; j++) { + var form = unitInputs[j].closest('.add-to-cart-form'); + var uomCategory = form.getAttribute('data-uom-category') || 'Unit'; + + // If category is "Unit" (English) or "Units" (plural), use step=1 (no decimals) + // If other category (Weight, Volume, etc.), use step=0.1 (with decimals) + var isUnitCategory = /^unit/i.test(uomCategory) || /^unidad/i.test(uomCategory); + + if (isUnitCategory) { + unitInputs[j].step = '1'; + unitInputs[j].min = '1'; + unitInputs[j].value = '1'; + unitInputs[j].dataset.isUnit = 'true'; + console.log('Input #' + j + ': UoM="' + uomCategory + '" → step=1 (integer)'); + } else { + // Para peso, volumen, etc. + unitInputs[j].step = '0.1'; + unitInputs[j].min = '0.1'; + unitInputs[j].value = '1'; + unitInputs[j].dataset.isUnit = 'false'; + console.log('Input #' + j + ': UoM="' + uomCategory + '" → step=0.1 (decimal)'); + } + } + console.log('=== END ADJUSTING QUANTITY STEPS ==='); + + // Botones + y - para aumentar/disminuir cantidad // Helper function to round decimals correctly function roundDecimal(value, decimals) { var factor = Math.pow(10, decimals); return Math.round(value * factor) / factor; } - // ============ ATTACH CHECKOUT BUTTONS (ALWAYS, on any page) ============ - // These buttons exist on checkout page, not on cart pages - if (!this._cartCheckoutListenersAttached) { - console.log("[_attachEventListeners] Attaching checkout button listeners..."); - - // Button to save as draft (in checkout page) - var saveBtn = document.getElementById("save-order-btn"); - console.log("[_attachEventListeners] save-order-btn found:", !!saveBtn); - - if (saveBtn) { - saveBtn.addEventListener("click", function (e) { - console.log("[CLICK] save-order-btn clicked"); - e.preventDefault(); - self._saveOrderDraft(); - }); - } - - // Confirm order button (in checkout page) - var confirmBtn = document.getElementById("confirm-order-btn"); - console.log("[_attachEventListeners] confirm-order-btn found:", !!confirmBtn); - - if (confirmBtn) { - confirmBtn.addEventListener("click", function (e) { - console.log("[CLICK] confirm-order-btn clicked"); - e.preventDefault(); - self._confirmOrder(); - }); - } - - // Button to reload from draft (in My Cart header - cart pages) - var reloadCartBtn = document.getElementById("reload-cart-btn"); - console.log("[_attachEventListeners] reload-cart-btn found:", !!reloadCartBtn); - - if (reloadCartBtn) { - reloadCartBtn.addEventListener("click", function (e) { - console.log("[CLICK] reload-cart-btn clicked"); - e.preventDefault(); - self._loadDraftCart(); - }); - } - - // Button to save cart as draft (in My Cart header - shop pages) - var saveCartBtn = document.getElementById("save-cart-btn"); - console.log("[_attachEventListeners] save-cart-btn found:", !!saveCartBtn); - - if (saveCartBtn) { - saveCartBtn.addEventListener("click", function (e) { - console.log("[CLICK] save-cart-btn clicked"); - e.preventDefault(); - self._saveCartAsDraft(); - }); - } - - this._cartCheckoutListenersAttached = true; - console.log("[_attachEventListeners] Checkout listeners attached (one-time)"); + // Remove old listeners by cloning elements (to avoid duplication) + var decreaseButtons = document.querySelectorAll('.qty-decrease'); + for (var k = 0; k < decreaseButtons.length; k++) { + var newBtn = decreaseButtons[k].cloneNode(true); + decreaseButtons[k].parentNode.replaceChild(newBtn, decreaseButtons[k]); } - // ============ LAZY LOADING: Load More Button ============ - this._attachLoadMoreListener(); - - // ============ USE EVENT DELEGATION FOR QUANTITY & CART BUTTONS ============ - // This way, new products loaded via AJAX will automatically have listeners - var productsGrid = document.getElementById("products-grid"); - - if (!productsGrid) { - console.log("[_attachEventListeners] No products-grid found (checkout page?)"); - return; + var increaseButtons = document.querySelectorAll('.qty-increase'); + for (var k = 0; k < increaseButtons.length; k++) { + var newBtn = increaseButtons[k].cloneNode(true); + increaseButtons[k].parentNode.replaceChild(newBtn, increaseButtons[k]); } - // First, adjust quantity steps for all existing inputs - var unitInputs = document.querySelectorAll(".product-qty"); - console.log("=== ADJUSTING QUANTITY STEPS ==="); - console.log("Found " + unitInputs.length + " quantity inputs"); - - for (var j = 0; j < unitInputs.length; j++) { - var form = unitInputs[j].closest(".add-to-cart-form"); - var uomCategory = form.getAttribute("data-uom-category") || "Unit"; - - // If category is "Unit" (English) or "Units" (plural), use step=1 (no decimals) - // If other category (Weight, Volume, etc.), use step=0.1 (with decimals) - var isUnitCategory = /^unit/i.test(uomCategory) || /^unidad/i.test(uomCategory); - - if (isUnitCategory) { - unitInputs[j].step = "1"; - unitInputs[j].min = "1"; - unitInputs[j].value = "1"; - unitInputs[j].dataset.isUnit = "true"; - console.log("Input #" + j + ': UoM="' + uomCategory + '" → step=1 (integer)'); - } else { - // Para peso, volumen, etc. - unitInputs[j].step = "0.1"; - unitInputs[j].min = "0.1"; - unitInputs[j].value = "1"; - unitInputs[j].dataset.isUnit = "false"; - console.log("Input #" + j + ': UoM="' + uomCategory + '" → step=0.1 (decimal)'); - } - } - console.log("=== END ADJUSTING QUANTITY STEPS ==="); - - // IMPORTANT: Do NOT clone the grid node - this destroys all products! - // Instead, use a flag to prevent adding duplicate event listeners - if (productsGrid._delegationListenersAttached) { - console.log( - "[_attachEventListeners] Grid delegation listeners already attached, skipping" - ); - return; - } - productsGrid._delegationListenersAttached = true; - console.log("[_attachEventListeners] Attaching grid delegation listeners (one-time)"); - - // Quantity decrease button (via event delegation) - productsGrid.addEventListener("click", function (e) { - var decreaseBtn = e.target.closest(".qty-decrease"); - if (!decreaseBtn) return; - - e.preventDefault(); - var productId = decreaseBtn.getAttribute("data-product-id"); - var input = document.getElementById("qty_" + productId); - if (!input) return; - - var step = parseFloat(input.step) || 1; - var currentValue = parseFloat(input.value) || 0; - var min = parseFloat(input.min) || 0; - var newValue = Math.max(min, roundDecimal(currentValue - step, 1)); - - // Si es unidad, mostrar como entero - if (input.dataset.isUnit === "true") { - input.value = Math.floor(newValue); - } else { - input.value = newValue; - } - }); - - // Quantity increase button (via event delegation) - productsGrid.addEventListener("click", function (e) { - var increaseBtn = e.target.closest(".qty-increase"); - if (!increaseBtn) return; - - e.preventDefault(); - var productId = increaseBtn.getAttribute("data-product-id"); - var input = document.getElementById("qty_" + productId); - if (!input) return; - - var step = parseFloat(input.step) || 1; - var currentValue = parseFloat(input.value) || 0; - var newValue = roundDecimal(currentValue + step, 1); - - // Si es unidad, mostrar como entero - if (input.dataset.isUnit === "true") { - input.value = Math.floor(newValue); - } else { - input.value = newValue; - } - }); - - // Add to cart button (via event delegation) - productsGrid.addEventListener("click", function (e) { - var cartBtn = e.target.closest(".add-to-cart-btn"); - if (!cartBtn) return; - - e.preventDefault(); - var form = cartBtn.closest(".add-to-cart-form"); - var productId = form.getAttribute("data-product-id"); - var productName = form.getAttribute("data-product-name") || "Product"; - var productPrice = parseFloat(form.getAttribute("data-product-price")) || 0; - var quantityInput = form.querySelector(".product-qty"); - var quantity = quantityInput ? parseFloat(quantityInput.value) : 1; - - console.log("Adding:", { - productId: productId, - productName: productName, - productPrice: productPrice, - quantity: quantity, + // Ahora asignar nuevos listeners + decreaseButtons = document.querySelectorAll('.qty-decrease'); + for (var k = 0; k < decreaseButtons.length; k++) { + decreaseButtons[k].addEventListener('click', function(e) { + e.preventDefault(); + var productId = this.getAttribute('data-product-id'); + var input = document.getElementById('qty_' + productId); + if (!input) return; + + var step = parseFloat(input.step) || 1; + var currentValue = parseFloat(input.value) || 0; + var min = parseFloat(input.min) || 0; + var newValue = Math.max(min, roundDecimal(currentValue - step, 1)); + + // Si es unidad, mostrar como entero + if (input.dataset.isUnit === 'true') { + input.value = Math.floor(newValue); + } else { + input.value = newValue; + } }); + } - if (quantity > 0) { - self._addToCart(productId, productName, productPrice, quantity); - } else { - var labels = self._getLabels(); - self._showNotification( - labels.invalid_quantity || "Please enter a valid quantity", - "warning" - ); - } - }); + increaseButtons = document.querySelectorAll('.qty-increase'); + for (var k = 0; k < increaseButtons.length; k++) { + increaseButtons[k].addEventListener('click', function(e) { + e.preventDefault(); + var productId = this.getAttribute('data-product-id'); + var input = document.getElementById('qty_' + productId); + if (!input) return; + + var step = parseFloat(input.step) || 1; + var currentValue = parseFloat(input.value) || 0; + var newValue = roundDecimal(currentValue + step, 1); + + // Si es unidad, mostrar como entero + if (input.dataset.isUnit === 'true') { + input.value = Math.floor(newValue); + } else { + input.value = newValue; + } + }); + } + + // Botones de agregar al carrito + var buttons = document.querySelectorAll('.add-to-cart-btn'); + for (var i = 0; i < buttons.length; i++) { + buttons[i].addEventListener('click', function(e) { + e.preventDefault(); + var form = this.closest('.add-to-cart-form'); + var productId = form.getAttribute('data-product-id'); + var productName = form.getAttribute('data-product-name') || + 'Product'; + var productPrice = parseFloat( + form.getAttribute('data-product-price')) || 0; + var quantityInput = form.querySelector('.product-qty'); + var quantity = quantityInput ? + parseFloat(quantityInput.value) : 1; + + console.log('Adding:', { + productId: productId, + productName: productName, + productPrice: productPrice, + quantity: quantity + }); + + if (quantity > 0) { + self._addToCart(productId, productName, + productPrice, quantity); + } else { + var labels = self._getLabels(); + self._showNotification(labels.invalid_quantity || 'Please enter a valid quantity', 'warning'); + } + }); + } + + // Button to save cart as draft (in My Cart header) + var savCartBtn = document.getElementById('save-cart-btn'); + if (savCartBtn) { + // Remove old listeners by cloning + var savCartBtnNew = savCartBtn.cloneNode(true); + savCartBtn.parentNode.replaceChild(savCartBtnNew, savCartBtn); + savCartBtnNew.addEventListener('click', function(e) { + e.preventDefault(); + self._saveCartAsDraft(); + }); + } + + // Button to reload from draft (in My Cart header) + var reloadCartBtn = document.getElementById('reload-cart-btn'); + if (reloadCartBtn) { + // Remove old listeners by cloning + var reloadCartBtnNew = reloadCartBtn.cloneNode(true); + reloadCartBtn.parentNode.replaceChild(reloadCartBtnNew, reloadCartBtn); + reloadCartBtnNew.addEventListener('click', function(e) { + e.preventDefault(); + self._loadDraftCart(); + }); + } + + // Button to save as draft + var saveBtn = document.getElementById('save-order-btn'); + if (saveBtn) { + saveBtn.addEventListener('click', function(e) { + e.preventDefault(); + self._saveOrderDraft(); + }); + } + + // Confirm order button + var confirmBtn = document.getElementById('confirm-order-btn'); + if (confirmBtn) { + confirmBtn.addEventListener('click', function(e) { + e.preventDefault(); + self._confirmOrder(); + }); + } }, - _addToCart: function (productId, productName, productPrice, quantity) { - console.log("_addToCart called with:", { + _addToCart: function(productId, productName, productPrice, quantity) { + console.log('_addToCart called with:', { productId: productId, productName: productName, productPrice: productPrice, - quantity: quantity, + quantity: quantity }); if (!this.cart[productId]) { this.cart[productId] = { name: productName, price: productPrice, - qty: 0, + qty: 0 }; } this.cart[productId].qty += quantity; - console.log("Product added:", productId, this.cart[productId]); + console.log('Product added:', productId, + this.cart[productId]); this._saveCart(); this._updateCartDisplay(); @@ -824,38 +745,37 @@ this._showAddedAnimation(productName); // Use aria-live to announce to screen readers - var liveRegion = document.getElementById("cart-items-container"); + var liveRegion = document.getElementById('cart-items-container'); if (liveRegion) { - liveRegion.setAttribute("aria-live", "assertive"); - setTimeout(function () { - liveRegion.setAttribute("aria-live", "polite"); + liveRegion.setAttribute('aria-live', 'assertive'); + setTimeout(function() { + liveRegion.setAttribute('aria-live', 'polite'); }, 1000); } }, - _showAddedAnimation: function (productName) { + _showAddedAnimation: function(productName) { var self = this; // Create toast element - var toast = document.createElement("div"); - toast.className = "toast-notification"; - + var toast = document.createElement('div'); + toast.className = 'toast-notification'; + // Get translated "added to cart" label from server var labels = this._getLabels(); - var addedMsg = labels.added_to_cart || "added to cart"; - - toast.innerHTML = - ' ' + productName + " " + addedMsg; + var addedMsg = labels.added_to_cart || 'added to cart'; + + toast.innerHTML = ' ' + productName + ' ' + addedMsg; document.body.appendChild(toast); // Force reflow to activate animation toast.offsetHeight; - toast.classList.add("show"); + toast.classList.add('show'); // Remove after 3 seconds - setTimeout(function () { - toast.classList.remove("show"); - setTimeout(function () { + setTimeout(function() { + toast.classList.remove('show'); + setTimeout(function() { document.body.removeChild(toast); }, 300); }, 3000); @@ -864,387 +784,220 @@ /** * Get default translated labels (fallback if JSON fails to parse) */ - _getDefaultLabels: function () { + _getDefaultLabels: function() { return { - confirmation: "Confirmation", - cancel: "Cancel", - confirm: "Confirm", - empty_cart: "Your cart is empty", - save_draft_confirm: - "Are you sure you want to save this cart as draft? Items to save: ", - save_draft_reload: "You will be able to reload this cart later.", - error_save_draft: "Error saving cart", - save_cart: "Save Cart", - reload_cart: "Reload Cart", - proceed_to_checkout: "Proceed to Checkout", - remove_item: "Remove Item", - confirm_order: "Confirm Order", - back_to_cart: "Back to Cart", - all_categories: "All categories", + confirmation: 'Confirmation', + cancel: 'Cancel', + confirm: 'Confirm', + empty_cart: 'Your cart is empty', + save_draft_confirm: 'Are you sure you want to save this cart as draft? Items to save: ', + save_draft_reload: 'You will be able to reload this cart later.', + error_save_draft: 'Error saving cart', + save_cart: 'Save Cart', + reload_cart: 'Reload Cart', + proceed_to_checkout: 'Proceed to Checkout', + remove_item: 'Remove Item', + confirm_order: 'Confirm Order', + back_to_cart: 'Back to Cart', + all_categories: 'All categories', // Draft modal labels - draft_already_exists: "Draft Already Exists", - draft_exists_message: "A saved draft already exists for this week.", - draft_two_options: "You have two options:", - draft_option1_title: "Option 1: Merge with Existing Draft", - draft_option1_desc: "Combine your current cart with the existing draft.", - draft_existing_items: "Existing draft has", - draft_current_items: "Current cart has", - draft_items_count: "item(s)", - draft_merge_note: - "Products will be merged by adding quantities. If a product exists in both, quantities will be combined.", - draft_option2_title: "Option 2: Replace with Current Cart", - draft_option2_desc: "Delete the old draft and save only the current cart items.", - draft_replace_warning: "The existing draft will be permanently deleted.", - draft_merge_btn: "Merge", - draft_replace_btn: "Replace", + draft_already_exists: 'Draft Already Exists', + draft_exists_message: 'A saved draft already exists for this week.', + draft_two_options: 'You have two options:', + draft_option1_title: 'Option 1: Merge with Existing Draft', + draft_option1_desc: 'Combine your current cart with the existing draft.', + draft_existing_items: 'Existing draft has', + draft_current_items: 'Current cart has', + draft_items_count: 'item(s)', + draft_merge_note: 'Products will be merged by adding quantities. If a product exists in both, quantities will be combined.', + draft_option2_title: 'Option 2: Replace with Current Cart', + draft_option2_desc: 'Delete the old draft and save only the current cart items.', + draft_replace_warning: 'The existing draft will be permanently deleted.', + draft_merge_btn: 'Merge', + draft_replace_btn: 'Replace' }; }, /** * Update DOM elements with translated labels */ - _updateDOMLabels: function (labels) { - console.log("[UPDATE_LABELS] Starting DOM update with labels:", labels); - + _updateDOMLabels: function(labels) { + console.log('[UPDATE_LABELS] Starting DOM update with labels:', labels); + // Map of element ID to label key var elementLabelMap = { - "label-home-delivery": "home_delivery", - "label-delivery-information": "delivery_information", - "label-important": "important", - "label-confirm-warning": "confirm_order_warning", + 'label-home-delivery': 'home_delivery', + 'label-delivery-information': 'delivery_information', + 'label-important': 'important', + 'label-confirm-warning': 'confirm_order_warning' }; - + // Update each element for (var elementId in elementLabelMap) { var element = document.getElementById(elementId); var labelKey = elementLabelMap[elementId]; var translatedText = labels[labelKey]; - - console.log( - "[UPDATE_LABELS] Element:", - elementId, - "| Exists:", - !!element, - "| Label Key:", - labelKey, - "| Translated:", - translatedText - ); - + + console.log('[UPDATE_LABELS] Element:', elementId, '| Exists:', !!element, '| Label Key:', labelKey, '| Translated:', translatedText); + if (element && translatedText) { var oldText = element.textContent; element.textContent = translatedText; - console.log( - "[UPDATE_LABELS] ✅ Updated #" + - elementId + - ': "' + - oldText + - '" → "' + - translatedText + - '"' - ); + console.log('[UPDATE_LABELS] ✅ Updated #' + elementId + ': "' + oldText + '" → "' + translatedText + '"'); } else if (!element) { - console.log("[UPDATE_LABELS] ❌ Element not found: #" + elementId); + console.log('[UPDATE_LABELS] ❌ Element not found: #' + elementId); } else if (!translatedText) { - console.log( - "[UPDATE_LABELS] ❌ Label not found: " + - labelKey + - " (available keys: " + - Object.keys(labels).join(", ") + - ")" - ); + console.log('[UPDATE_LABELS] ❌ Label not found: ' + labelKey + ' (available keys: ' + Object.keys(labels).join(', ') + ')'); } } - + // Update delivery day text if available - if ( - window.groupOrderShop && - window.groupOrderShop.labels && - window.groupOrderShop.labels.delivery_info_template - ) { - var deliveryDayText = document.getElementById("delivery-day-text"); - console.log("[UPDATE_LABELS] Delivery day text element exists:", !!deliveryDayText); - + if (window.groupOrderShop && window.groupOrderShop.labels && window.groupOrderShop.labels.delivery_info_template) { + var deliveryDayText = document.getElementById('delivery-day-text'); + console.log('[UPDATE_LABELS] Delivery day text element exists:', !!deliveryDayText); + if (deliveryDayText) { // Get delivery data from window.deliveryData first, then fallback to attributes - var pickupDayIndex = ""; - var pickupDate = ""; - var deliveryNotice = ""; - + var pickupDayIndex = ''; + var pickupDate = ''; + var deliveryNotice = ''; + if (window.deliveryData) { - console.log( - "[UPDATE_LABELS] Using window.deliveryData:", - window.deliveryData - ); - pickupDayIndex = window.deliveryData.pickupDay || ""; - pickupDate = window.deliveryData.pickupDate || ""; - deliveryNotice = window.deliveryData.deliveryNotice || ""; + console.log('[UPDATE_LABELS] Using window.deliveryData:', window.deliveryData); + pickupDayIndex = window.deliveryData.pickupDay || ''; + pickupDate = window.deliveryData.pickupDate || ''; + deliveryNotice = window.deliveryData.deliveryNotice || ''; } else { - console.log( - "[UPDATE_LABELS] window.deliveryData not found, using data attributes" - ); - var wrap = document.getElementById("wrap"); - pickupDayIndex = wrap ? wrap.getAttribute("data-pickup-day") : ""; - pickupDate = wrap ? wrap.getAttribute("data-pickup-date") : ""; - deliveryNotice = wrap ? wrap.getAttribute("data-delivery-notice") : ""; + console.log('[UPDATE_LABELS] window.deliveryData not found, using data attributes'); + var wrap = document.getElementById('wrap'); + pickupDayIndex = wrap ? wrap.getAttribute('data-pickup-day') : ''; + pickupDate = wrap ? wrap.getAttribute('data-pickup-date') : ''; + deliveryNotice = wrap ? wrap.getAttribute('data-delivery-notice') : ''; } - + // Normalize: convert "undefined" strings and null to empty for processing - if (pickupDayIndex === "undefined" || pickupDayIndex === null) - pickupDayIndex = ""; - if (pickupDate === "undefined" || pickupDate === null) pickupDate = ""; - if (deliveryNotice === "undefined" || deliveryNotice === null) - deliveryNotice = ""; - - console.log("[UPDATE_LABELS] Delivery data (final):", { + if (pickupDayIndex === 'undefined' || pickupDayIndex === null) pickupDayIndex = ''; + if (pickupDate === 'undefined' || pickupDate === null) pickupDate = ''; + if (deliveryNotice === 'undefined' || deliveryNotice === null) deliveryNotice = ''; + + console.log('[UPDATE_LABELS] Delivery data (final):', { pickupDayIndex: pickupDayIndex, pickupDate: pickupDate, - deliveryNotice: deliveryNotice, + deliveryNotice: deliveryNotice }); - + // Day names mapping var dayNames = { - 0: "Monday", - 1: "Tuesday", - 2: "Wednesday", - 3: "Thursday", - 4: "Friday", - 5: "Saturday", - 6: "Sunday", + '0': 'Monday', + '1': 'Tuesday', + '2': 'Wednesday', + '3': 'Thursday', + '4': 'Friday', + '5': 'Saturday', + '6': 'Sunday' }; - + // Get translated day names if available if (window.groupOrderShop && window.groupOrderShop.day_names) { dayNames = window.groupOrderShop.day_names; } - + // Get the day name from index - var pickupDayName = - pickupDayIndex && dayNames[pickupDayIndex] - ? dayNames[pickupDayIndex] - : pickupDayIndex; - + var pickupDayName = pickupDayIndex && dayNames[pickupDayIndex] ? dayNames[pickupDayIndex] : pickupDayIndex; + // Build message from template var msg = window.groupOrderShop.labels.delivery_info_template; - msg = msg.replace("{pickup_day}", pickupDayName); - msg = msg.replace("{pickup_date}", pickupDate); - - console.log("[UPDATE_LABELS] Built delivery message:", msg); - + msg = msg.replace('{pickup_day}', pickupDayName); + msg = msg.replace('{pickup_date}', pickupDate); + + console.log('[UPDATE_LABELS] Built delivery message:', msg); + // Build final HTML output var htmlOutput = msg; if (deliveryNotice) { // Replace newlines with
tags for HTML display - htmlOutput = - msg.replace(/\n/g, "
") + - "

" + - deliveryNotice.replace(/\n/g, "
"); - console.log("[UPDATE_LABELS] Final HTML with notice:", htmlOutput); + htmlOutput = msg.replace(/\n/g, '
') + '

' + + deliveryNotice.replace(/\n/g, '
'); + console.log('[UPDATE_LABELS] Final HTML with notice:', htmlOutput); } else { - htmlOutput = msg.replace(/\n/g, "
"); + htmlOutput = msg.replace(/\n/g, '
'); } - + deliveryDayText.innerHTML = htmlOutput; - console.log( - "[UPDATE_LABELS] ✅ Updated delivery day text with translated template" - ); + console.log('[UPDATE_LABELS] ✅ Updated delivery day text with translated template'); } } else { - console.log("[UPDATE_LABELS] ❌ delivery_info_template label not found"); + console.log('[UPDATE_LABELS] ❌ delivery_info_template label not found'); } }, - _attachLoadMoreListener: function () { - var self = this; - var btn = document.getElementById("load-more-btn"); - - if (!btn) { - console.log("[LAZY_LOADING] No load-more-btn found - lazy loading disabled"); - return; - } - - console.log("[LAZY_LOADING] Attaching load-more-btn listener"); - - btn.addEventListener("click", function (e) { - e.preventDefault(); - - var orderId = btn.getAttribute("data-order-id"); - var nextPage = btn.getAttribute("data-page"); - var perPage = btn.getAttribute("data-per-page"); - - if (!orderId || !nextPage || !perPage) { - console.error("[LAZY_LOADING] Missing data attributes", { - orderId: orderId, - nextPage: nextPage, - perPage: perPage, - }); - return; - } - - console.log("[LAZY_LOADING] Loading page", nextPage, "for order", orderId); - - // Show spinner: disable button and change text - var originalText = btn.innerHTML; - btn.disabled = true; - btn.innerHTML = 'Loading...'; - - // AJAX GET request - var xhr = new XMLHttpRequest(); - var url = "/eskaera/" + orderId + "/load-page?page=" + nextPage; - - xhr.open("GET", url, true); - xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest"); - - xhr.onload = function () { - if (xhr.status === 200) { - console.log("[LAZY_LOADING] Page loaded successfully"); - - // Parse response HTML - var html = xhr.responseText; - var grid = document.getElementById("products-grid"); - - if (!grid) { - console.error("[LAZY_LOADING] products-grid not found"); - btn.disabled = false; - btn.innerHTML = originalText; - return; - } - - // Insert new products at the end of grid - grid.insertAdjacentHTML("beforeend", html); - console.log("[LAZY_LOADING] Products inserted into grid"); - - // Re-attach event listeners for new products - self._attachEventListeners(); - console.log("[LAZY_LOADING] Event listeners re-attached"); - - // Update button state - var nextPageNum = parseInt(nextPage) + 1; - - // Check if there are more products by looking at the response - // If response contains data-next="false" or similar, hide button - // For now, we'll always increment and let backend handle has_next - btn.setAttribute("data-page", nextPageNum); - - // Hide button if no more pages (check if response indicates no more) - // Simple approach: if response is very short, assume no more products - if (html.trim().length < 100) { - console.log("[LAZY_LOADING] No more products, hiding load-more button"); - btn.style.display = "none"; - } else { - // Re-enable button for next page - btn.disabled = false; - btn.innerHTML = originalText; - } - } else { - console.error("[LAZY_LOADING] Error loading page:", xhr.status); - btn.disabled = false; - btn.innerHTML = originalText; - var errorMsg = "Error loading more products (status: " + xhr.status + ")"; - if (self._showNotification) { - self._showNotification(errorMsg, "danger"); - } else { - alert(errorMsg); - } - } - }; - - xhr.onerror = function () { - console.error("[LAZY_LOADING] Network error"); - btn.disabled = false; - btn.innerHTML = originalText; - var errorMsg = "Error: Network request failed"; - if (self._showNotification) { - self._showNotification(errorMsg, "danger"); - } else { - alert(errorMsg); - } - }; - - xhr.send(); - }); - }, - - _updateCartDisplay: function () { - var cartContainer = document.getElementById("cart-items-container"); + _updateCartDisplay: function() { + var cartContainer = document.getElementById('cart-items-container'); if (!cartContainer) return; // Get labels first before using them var labels = this._getLabels(); - + if (Object.keys(this.cart).length === 0) { cartContainer.innerHTML = - '

' + - (labels.empty_cart || "This order's cart is empty.") + - "

"; + '

' + (labels.empty_cart || 'This order\'s cart is empty.') + '

'; return; } var html = '
'; var total = 0; var self = this; - var removeItemLabel = labels.remove_item || "Remove Item"; + var removeItemLabel = labels.remove_item || 'Remove Item'; - Object.keys(this.cart).forEach(function (productId) { + Object.keys(this.cart).forEach(function(productId) { var item = self.cart[productId]; var subtotal = item.qty * item.price; total += subtotal; - html += - '
' + + html += '
' + '
' + - '
' + - self.escapeHtml(item.name) + - "
" + - "
" + + '
' + self.escapeHtml(item.name) + + '
' + + '
' + '
' + '' + - parseFloat(item.qty).toFixed(1) + - " x €" + - item.price.toFixed(2) + - "" + + parseFloat(item.qty).toFixed(1) + ' x €' + item.price.toFixed(2) + + '' + '
' + - '€' + - subtotal.toFixed(2) + - "" + + '€' + subtotal.toFixed(2) + '' + '" + - "
" + - "
" + - "
"; + '' + + '
' + + '
' + + '
'; }); - html += "
"; - html += - '
' + - "Total: €" + - total.toFixed(2) + - "
"; + html += '
'; + html += '
' + + 'Total: €' + total.toFixed(2) + + '
'; cartContainer.innerHTML = html; // Reassign event listeners to remove buttons - var removeButtons = cartContainer.querySelectorAll(".remove-from-cart"); + var removeButtons = cartContainer.querySelectorAll( + '.remove-from-cart'); for (var i = 0; i < removeButtons.length; i++) { - removeButtons[i].addEventListener("click", function (e) { + removeButtons[i].addEventListener('click', function(e) { e.preventDefault(); - var productId = this.getAttribute("data-product-id"); + var productId = this.getAttribute('data-product-id'); self._removeFromCart(productId); }); } - + // Reinitialize tooltips for newly added remove buttons - console.log("[_updateCartDisplay] Reinitializing tooltips for remove buttons"); + console.log('[_updateCartDisplay] Reinitializing tooltips for remove buttons'); var tooltipsToInit = cartContainer.querySelectorAll('[data-bs-toggle="tooltip"]'); - tooltipsToInit.forEach(function (elem) { + tooltipsToInit.forEach(function(elem) { var bsTooltip = window.bootstrap?.Tooltip; if (bsTooltip) { // Destroy existing tooltip if any @@ -1254,53 +1007,51 @@ } // Create new tooltip with updated title new bsTooltip(elem); - console.log( - "[_updateCartDisplay] Tooltip reinitialized for element:", - elem.getAttribute("title") - ); + console.log('[_updateCartDisplay] Tooltip reinitialized for element:', elem.getAttribute('title')); } }); + }, - _removeFromCart: function (productId) { - console.log("Removing from cart:", productId); + _removeFromCart: function(productId) { + console.log('Removing from cart:', productId); var removedItem = this.cart[productId]; - var itemName = removedItem ? removedItem.name : "Product"; + var itemName = removedItem ? removedItem.name : 'Product'; delete this.cart[productId]; this._saveCart(); // Use aria-live to announce to screen readers - var liveRegion = document.getElementById("cart-items-container"); + var liveRegion = document.getElementById('cart-items-container'); if (liveRegion) { - liveRegion.setAttribute("aria-live", "assertive"); - setTimeout(function () { - liveRegion.setAttribute("aria-live", "polite"); + liveRegion.setAttribute('aria-live', 'assertive'); + setTimeout(function() { + liveRegion.setAttribute('aria-live', 'polite'); }, 1000); } this._updateCartDisplay(); }, - _saveCartAsDraft: function () { - console.log("Saving cart as draft"); + _saveCartAsDraft: function() { + console.log('Saving cart as draft'); var self = this; var items = []; - Object.keys(this.cart).forEach(function (productId) { + Object.keys(this.cart).forEach(function(productId) { var item = self.cart[productId]; items.push({ product_id: productId, product_name: item.name, quantity: item.qty, - product_price: item.price, + product_price: item.price }); }); if (items.length === 0) { var labels = self._getLabels(); - self._showNotification(labels.empty_cart || "Your cart is empty", "warning"); + self._showNotification(labels.empty_cart || 'Your cart is empty', 'warning'); return; } @@ -1308,99 +1059,74 @@ self._executeSaveCartAsDraft(items); }, - _executeSaveCartAsDraft: function (items) { + _executeSaveCartAsDraft: function(items) { var self = this; var orderData = { order_id: this.orderId, - items: items, + items: items }; var xhr = new XMLHttpRequest(); - xhr.open("POST", "/eskaera/save-order", true); - xhr.setRequestHeader("Content-Type", "application/json"); + xhr.open('POST', '/eskaera/save-order', true); + xhr.setRequestHeader('Content-Type', 'application/json'); - xhr.onload = function () { + xhr.onload = function() { if (xhr.status === 200) { try { var data = JSON.parse(xhr.responseText); var labels = self._getLabels(); - + if (data.success) { - var successMsg = - (labels.draft_saved_success || "Cart saved as draft successfully") + - " (Order ID: " + - data.sale_order_id + - ")"; - self._showNotification("✓ " + successMsg, "success", 5000); + var successMsg = (labels.draft_saved_success || 'Cart saved as draft successfully') + ' (Order ID: ' + data.sale_order_id + ')'; + self._showNotification('✓ ' + successMsg, 'success', 5000); } else if (data.existing_draft) { // A draft already exists - show modal with merge/replace options self._showDraftConflictModal(data); } else { - self._showNotification( - "Error: " + (data.error || labels.error_unknown || "Unknown error"), - "danger" - ); + self._showNotification('Error: ' + (data.error || (labels.error_unknown || 'Unknown error')), 'danger'); } } catch (e) { - console.error("Error parsing response:", e); + console.error('Error parsing response:', e); var labels = self._getLabels(); - self._showNotification( - labels.error_processing_response || "Error processing response", - "danger" - ); + self._showNotification(labels.error_processing_response || 'Error processing response', 'danger'); } } else { try { var errorData = JSON.parse(xhr.responseText); - self._showNotification( - "Error " + xhr.status + ": " + (errorData.error || "Request error"), - "danger" - ); + self._showNotification('Error ' + xhr.status + ': ' + (errorData.error || 'Request error'), 'danger'); } catch (e) { var labels = self._getLabels(); - self._showNotification( - labels.error_saving_draft || - "Error saving cart (HTTP " + xhr.status + ")", - "danger" - ); + self._showNotification(labels.error_saving_draft || 'Error saving cart (HTTP ' + xhr.status + ')', 'danger'); } } }; - xhr.onerror = function () { - console.error("Error:", xhr); + xhr.onerror = function() { + console.error('Error:', xhr); var labels = self._getLabels(); - self._showNotification(labels.connection_error || "Connection error", "danger"); + self._showNotification(labels.connection_error || 'Connection error', 'danger'); }; xhr.send(JSON.stringify(orderData)); }, - _loadDraftCart: function () { - console.log("Loading draft cart (manual)"); + _loadDraftCart: function() { + console.log('Loading draft cart (manual)'); var self = this; // Check if cart has items var hasItems = Object.keys(this.cart).length > 0; - + if (hasItems) { // Ask for confirmation if cart has items var labels = this._getLabels(); - var confirmMessage = - (labels.reload_draft_confirm || - "Are you sure you want to load your last saved draft?") + - "\n\n" + - (labels.reload_draft_replace || "This will replace your current cart items") + - " (" + - Object.keys(this.cart).length + - " " + - (labels.items_placeholder || "items") + - ") " + - (labels.reload_draft_with || "with the saved draft."); - - self._showConfirmation(confirmMessage, function () { + var confirmMessage = (labels.reload_draft_confirm || 'Are you sure you want to load your last saved draft?') + '\n\n' + + (labels.reload_draft_replace || 'This will replace your current cart items') + ' (' + Object.keys(this.cart).length + ' ' + (labels.items_placeholder || 'items') + ') ' + + (labels.reload_draft_with || 'with the saved draft.'); + + self._showConfirmation(confirmMessage, function() { // User confirmed - continue with load self._executeLoadDraftCart(); }); @@ -1410,188 +1136,149 @@ } }, - _executeLoadDraftCart: function () { + _executeLoadDraftCart: function() { var self = this; var orderData = { - order_id: this.orderId, + order_id: this.orderId }; var xhr = new XMLHttpRequest(); - xhr.open("POST", "/eskaera/load-draft", true); - xhr.setRequestHeader("Content-Type", "application/json"); + xhr.open('POST', '/eskaera/load-draft', true); + xhr.setRequestHeader('Content-Type', 'application/json'); - xhr.onload = function () { + xhr.onload = function() { if (xhr.status === 200) { try { var data = JSON.parse(xhr.responseText); if (data.success) { // Clear current cart self.cart = {}; - + // Load items from draft order var items = data.items || []; - items.forEach(function (item) { + items.forEach(function(item) { var productId = item.product_id; self.cart[productId] = { name: item.product_name, price: item.product_price, - qty: item.quantity, + qty: item.quantity }; }); // Save to localStorage self._saveCart(); - + // Update display self._updateCartDisplay(); var labels = self._getLabels(); - var loadMsg = - (labels.draft_loaded_success || "Loaded") + - " " + - items.length + - " items from draft order (ID: " + - data.sale_order_id + - ")"; - self._showNotification("✓ " + loadMsg, "success", 5000); + var loadMsg = (labels.draft_loaded_success || 'Loaded') + ' ' + items.length + ' items from draft order (ID: ' + data.sale_order_id + ')'; + self._showNotification('✓ ' + loadMsg, 'success', 5000); } else { - self._showNotification( - "Error: " + (data.error || labels.error_unknown || "Unknown error"), - "danger" - ); + self._showNotification('Error: ' + (data.error || (labels.error_unknown || 'Unknown error')), 'danger'); } } catch (e) { - console.error("Error parsing response:", e); + console.error('Error parsing response:', e); var labels = self._getLabels(); - self._showNotification( - labels.error_processing_response || "Error processing response", - "danger" - ); + self._showNotification(labels.error_processing_response || 'Error processing response', 'danger'); } } else { try { var errorData = JSON.parse(xhr.responseText); - self._showNotification( - "Error " + xhr.status + ": " + (errorData.error || "Request error"), - "danger" - ); + self._showNotification('Error ' + xhr.status + ': ' + (errorData.error || 'Request error'), 'danger'); } catch (e) { var labels = self._getLabels(); - self._showNotification( - labels.error_loading_draft || - "Error loading draft (HTTP " + xhr.status + ")", - "danger" - ); + self._showNotification(labels.error_loading_draft || 'Error loading draft (HTTP ' + xhr.status + ')', 'danger'); } } }; - xhr.onerror = function () { - console.error("Error:", xhr); + xhr.onerror = function() { + console.error('Error:', xhr); var labels = self._getLabels(); - self._showNotification(labels.connection_error || "Connection error", "danger"); + self._showNotification(labels.connection_error || 'Connection error', 'danger'); }; xhr.send(JSON.stringify(orderData)); }, - _saveOrderDraft: function () { - console.log("[_saveOrderDraft] Starting - this.orderId:", this.orderId); + _saveOrderDraft: function() { + console.log('Saving order as draft:', this.orderId); var self = this; var items = []; - Object.keys(this.cart).forEach(function (productId) { + Object.keys(this.cart).forEach(function(productId) { var item = self.cart[productId]; items.push({ product_id: productId, product_name: item.name, quantity: item.qty, - product_price: item.price, + product_price: item.price }); }); var orderData = { order_id: this.orderId, - items: items, + items: items }; var xhr = new XMLHttpRequest(); - xhr.open("POST", "/eskaera/save-order", true); - xhr.setRequestHeader("Content-Type", "application/json"); + xhr.open('POST', '/eskaera/save-order', true); + xhr.setRequestHeader('Content-Type', 'application/json'); - xhr.onload = function () { + xhr.onload = function() { if (xhr.status === 200) { try { var data = JSON.parse(xhr.responseText); - console.log("Response:", data); - + console.log('Response:', data); + if (data.success) { - self._showNotification( - "✓ Order saved as draft successfully", - "success", - 5000 - ); + self._showNotification('✓ Order saved as draft successfully', 'success', 5000); } else if (data.existing_draft) { // A draft already exists - show modal with merge/replace options self._showDraftConflictModal(data); } else { - self._showNotification( - "Error: " + (data.error || labels.error_unknown || "Unknown error"), - "danger" - ); + self._showNotification('Error: ' + (data.error || (labels.error_unknown || 'Unknown error')), 'danger'); } } catch (e) { - console.error("Error parsing response:", e); - self._showNotification("Error processing response", "danger"); + console.error('Error parsing response:', e); + self._showNotification('Error processing response', 'danger'); } } else { try { var errorData = JSON.parse(xhr.responseText); - console.error("HTTP error:", xhr.status, errorData); - self._showNotification( - "Error " + xhr.status + ": " + (errorData.error || "Request error"), - "danger" - ); + console.error('HTTP error:', xhr.status, errorData); + self._showNotification('Error ' + xhr.status + ': ' + (errorData.error || 'Request error'), 'danger'); } catch (e) { - console.error("HTTP error:", xhr.status, xhr.responseText); - self._showNotification( - "Error saving order (HTTP " + xhr.status + ")", - "danger" - ); + console.error('HTTP error:', xhr.status, xhr.responseText); + self._showNotification('Error saving order (HTTP ' + xhr.status + ')', 'danger'); } } }; - xhr.onerror = function () { - console.error("Error:", xhr); + xhr.onerror = function() { + console.error('Error:', xhr); var labels = self._getLabels(); - self._showNotification(labels.connection_error || "Connection error", "danger"); + self._showNotification(labels.connection_error || 'Connection error', 'danger'); }; xhr.send(JSON.stringify(orderData)); }, - _showDraftConflictModal: function (data) { + _showDraftConflictModal: function(data) { /** * Show modal with merge/replace options for existing draft. * Uses labels from window.groupOrderShop.labels or falls back to defaults. */ var self = this; - + // Get labels - they should already be loaded by page init - var labels = - window.groupOrderShop && window.groupOrderShop.labels - ? window.groupOrderShop.labels - : self._getDefaultLabels(); - - console.log( - "[_showDraftConflictModal] Using labels:", - Object.keys(labels).length, - "keys available" - ); - + var labels = (window.groupOrderShop && window.groupOrderShop.labels) ? window.groupOrderShop.labels : self._getDefaultLabels(); + + console.log('[_showDraftConflictModal] Using labels:', Object.keys(labels).length, 'keys available'); + var existing_items = data.existing_items || []; var current_items = data.current_items || []; var existing_draft_id = data.existing_draft_id; @@ -1627,9 +1314,7 @@ justify-content: space-between; align-items: center; "> -
${ - labels.draft_already_exists || "Draft Already Exists" - }
+
${labels.draft_already_exists || 'Draft Already Exists'}
- +
- ${ - labels.draft_option2_title || "Option 2" - } + ${labels.draft_option2_title || 'Option 2'}
-

${labels.draft_option2_desc || "Replace with current"}

+

${labels.draft_option2_desc || 'Replace with current'}

- ${ - labels.draft_replace_warning || - "Old draft will be deleted" - } + ${labels.draft_replace_warning || 'Old draft will be deleted'}

@@ -1725,7 +1395,7 @@ border-radius: 4px; cursor: pointer; font-size: 0.9rem; - ">${labels.cancel || "Cancel"} + ">${labels.cancel || 'Cancel'}
@@ -1756,58 +1424,58 @@ `; // Remove existing modal if any - var existingModal = document.getElementById("draftConflictModal"); + var existingModal = document.getElementById('draftConflictModal'); if (existingModal) { existingModal.remove(); } // Add modal to body - document.body.insertAdjacentHTML("beforeend", modalHTML); - var modalElement = document.getElementById("draftConflictModal"); + document.body.insertAdjacentHTML('beforeend', modalHTML); + var modalElement = document.getElementById('draftConflictModal'); // Handle close buttons - document.querySelectorAll(".draft-modal-close").forEach(function (btn) { - btn.addEventListener("click", function () { + document.querySelectorAll('.draft-modal-close').forEach(function(btn) { + btn.addEventListener('click', function() { modalElement.remove(); }); }); // Handle merge button - document.getElementById("mergeBtn").addEventListener("click", function () { - var existingId = this.getAttribute("data-existing-id"); + document.getElementById('mergeBtn').addEventListener('click', function() { + var existingId = this.getAttribute('data-existing-id'); modalElement.remove(); - self._executeSaveDraftWithAction("merge", existingId); + self._executeSaveDraftWithAction('merge', existingId); }); // Handle replace button - document.getElementById("replaceBtn").addEventListener("click", function () { - var existingId = this.getAttribute("data-existing-id"); + document.getElementById('replaceBtn').addEventListener('click', function() { + var existingId = this.getAttribute('data-existing-id'); modalElement.remove(); - self._executeSaveDraftWithAction("replace", existingId); + self._executeSaveDraftWithAction('replace', existingId); }); // Close modal when clicking outside - modalElement.addEventListener("click", function (e) { + modalElement.addEventListener('click', function(e) { if (e.target === modalElement) { modalElement.remove(); } }); }, - _executeSaveDraftWithAction: function (action, existingDraftId) { + _executeSaveDraftWithAction: function(action, existingDraftId) { /** * Execute save draft with merge or replace action. */ var self = this; var items = []; - Object.keys(this.cart).forEach(function (productId) { + Object.keys(this.cart).forEach(function(productId) { var item = self.cart[productId]; items.push({ product_id: productId, product_name: item.name, quantity: item.qty, - product_price: item.price, + product_price: item.price }); }); @@ -1815,336 +1483,306 @@ order_id: this.orderId, items: items, merge_action: action, - existing_draft_id: existingDraftId, + existing_draft_id: existingDraftId }; var xhr = new XMLHttpRequest(); - xhr.open("POST", "/eskaera/save-order", true); - xhr.setRequestHeader("Content-Type", "application/json"); + xhr.open('POST', '/eskaera/save-order', true); + xhr.setRequestHeader('Content-Type', 'application/json'); - xhr.onload = function () { + xhr.onload = function() { if (xhr.status === 200) { try { var data = JSON.parse(xhr.responseText); - console.log("Response:", data); + console.log('Response:', data); if (data.success) { // Use server-provided labels instead of hardcoding var labels = self._getLabels(); - + // Use the translated messages from server - var msg = data.merged - ? "✓ " + - (labels.draft_merged_success || "Draft merged successfully") - : "✓ " + - (labels.draft_replaced_success || "Draft replaced successfully"); - - self._showNotification(msg, "success", 5000); + var msg = data.merged + ? ('✓ ' + (labels.draft_merged_success || 'Draft merged successfully')) + : ('✓ ' + (labels.draft_replaced_success || 'Draft replaced successfully')); + + self._showNotification(msg, 'success', 5000); } else { var labels = self._getLabels(); - self._showNotification( - "Error: " + (data.error || labels.error_unknown || "Unknown error"), - "danger" - ); + self._showNotification('Error: ' + (data.error || (labels.error_unknown || 'Unknown error')), 'danger'); } } catch (e) { - console.error("Error parsing response:", e); - self._showNotification("Error processing response", "danger"); + console.error('Error parsing response:', e); + self._showNotification('Error processing response', 'danger'); } } else { try { var errorData = JSON.parse(xhr.responseText); - self._showNotification( - "Error " + xhr.status + ": " + (errorData.error || "Request error"), - "danger" - ); + self._showNotification('Error ' + xhr.status + ': ' + (errorData.error || 'Request error'), 'danger'); } catch (e) { - self._showNotification( - "Error saving order (HTTP " + xhr.status + ")", - "danger" - ); + self._showNotification('Error saving order (HTTP ' + xhr.status + ')', 'danger'); } } }; - xhr.onerror = function () { - self._showNotification("Connection error", "danger"); + xhr.onerror = function() { + self._showNotification('Connection error', 'danger'); }; xhr.send(JSON.stringify(orderData)); }, - _confirmOrder: function () { - console.log("=== _confirmOrder started ==="); - console.log("orderId:", this.orderId); - + _confirmOrder: function() { + console.log('=== _confirmOrder started ==='); + console.log('orderId:', this.orderId); + // IMPORTANT: Read cart directly from localStorage, not from this.cart // because home_delivery.js updates localStorage directly - var cartKey = "eskaera_" + this.orderId + "_cart"; + var cartKey = 'eskaera_' + this.orderId + '_cart'; var storedCart = localStorage.getItem(cartKey); - console.log("localStorage[" + cartKey + "]:", storedCart); - + console.log('localStorage[' + cartKey + ']:', storedCart); + // Parse cart from localStorage (more reliable than this.cart) var cart = storedCart ? JSON.parse(storedCart) : this.cart; - console.log("Parsed cart from localStorage:", cart); + console.log('Parsed cart from localStorage:', cart); var self = this; var items = []; - Object.keys(cart).forEach(function (productId) { + Object.keys(cart).forEach(function(productId) { var item = cart[productId]; - console.log("Processing cart item: productId=" + productId + ", item=", item); + console.log('Processing cart item: productId=' + productId + ', item=', item); items.push({ product_id: productId, product_name: item.name, quantity: item.qty, - unit_price: item.price, + unit_price: item.price }); }); - console.log("Items to send to server:", items); - console.log("Total items count:", items.length); + console.log('Items to send to server:', items); + console.log('Total items count:', items.length); // Check if home delivery is enabled - var deliveryCheckbox = document.getElementById("home-delivery-checkbox"); + var deliveryCheckbox = document.getElementById('home-delivery-checkbox'); var isDelivery = deliveryCheckbox ? deliveryCheckbox.checked : false; var orderData = { order_id: this.orderId, items: items, - is_delivery: isDelivery, + is_delivery: isDelivery }; var xhr = new XMLHttpRequest(); - xhr.open("POST", "/eskaera/confirm", true); - xhr.setRequestHeader("Content-Type", "application/json"); + xhr.open('POST', '/eskaera/confirm', true); + xhr.setRequestHeader('Content-Type', 'application/json'); - console.log("Sending request to /eskaera/confirm with data:", orderData); + console.log('Sending request to /eskaera/confirm with data:', orderData); - xhr.onload = function () { + xhr.onload = function() { if (xhr.status === 200) { try { var data = JSON.parse(xhr.responseText); - console.log("Response:", data); + console.log('Response:', data); var labels = self._getLabels(); if (data.success) { - var message = - data.message || labels.order_confirmed || "Order confirmed"; - self._showNotification("✓ " + message, "success", 4000); + var message = data.message || (labels.order_confirmed || 'Order confirmed'); + self._showNotification('✓ ' + message, 'success', 4000); // Clear cart from localStorage - localStorage.removeItem("eskaera_" + self.orderId + "_cart"); - console.log("Cart cleared from localStorage after confirmation"); + localStorage.removeItem('eskaera_' + self.orderId + '_cart'); + console.log('Cart cleared from localStorage after confirmation'); // Save confirmation message in sessionStorage to display on eskaera page - sessionStorage.setItem("confirmation_message", message); + sessionStorage.setItem('confirmation_message', message); // Wait a moment before redirecting to let user see the message - setTimeout(function () { - window.location.href = data.redirect_url || "/eskaera"; + setTimeout(function() { + window.location.href = data.redirect_url || '/eskaera'; }, 4000); } else { - var unknownErrorMsg = - labels.error_unknown || labels.error_unknown || "Unknown error"; - self._showNotification( - "Error: " + (data.error || unknownErrorMsg), - "danger" - ); + var unknownErrorMsg = labels.error_unknown || (labels.error_unknown || 'Unknown error'); + self._showNotification('Error: ' + (data.error || unknownErrorMsg), 'danger'); } } catch (e) { - console.error("Error parsing response:", e); + console.error('Error parsing response:', e); var labels = self._getLabels(); - self._showNotification( - labels.error_processing_response || "Error processing response", - "danger" - ); + self._showNotification(labels.error_processing_response || 'Error processing response', 'danger'); } } else { try { var errorData = JSON.parse(xhr.responseText); - console.error("HTTP error:", xhr.status, errorData); - self._showNotification( - "Error " + xhr.status + ": " + (errorData.error || "Request error"), - "danger" - ); + console.error('HTTP error:', xhr.status, errorData); + self._showNotification('Error ' + xhr.status + ': ' + (errorData.error || 'Request error'), 'danger'); } catch (e) { - console.error("HTTP error:", xhr.status, xhr.responseText); - self._showNotification( - "Error confirming order (HTTP " + xhr.status + ")", - "danger" - ); + console.error('HTTP error:', xhr.status, xhr.responseText); + self._showNotification('Error confirming order (HTTP ' + xhr.status + ')', 'danger'); } } }; - xhr.onerror = function () { - console.error("Error:", xhr); + xhr.onerror = function() { + console.error('Error:', xhr); var labels = self._getLabels(); - self._showNotification(labels.connection_error || "Connection error", "danger"); + self._showNotification(labels.connection_error || 'Connection error', 'danger'); }; xhr.send(JSON.stringify(orderData)); }, - escapeHtml: function (text) { - var div = document.createElement("div"); + escapeHtml: function(text) { + var div = document.createElement('div'); div.textContent = text; return div.innerHTML; - }, + } }; // Initialize when DOM is ready - document.addEventListener("DOMContentLoaded", function () { - console.log("DOM loaded"); - console.log("Looking for #cart-items-container..."); - console.log("Looking for #confirm-order-btn..."); + document.addEventListener('DOMContentLoaded', function() { + console.log('DOM loaded'); + console.log('Looking for #cart-items-container...'); + console.log('Looking for #confirm-order-btn...'); - var cartContainer = document.getElementById("cart-items-container"); - var confirmBtn = document.getElementById("confirm-order-btn"); + var cartContainer = document.getElementById('cart-items-container'); + var confirmBtn = document.getElementById('confirm-order-btn'); - console.log("cart-items-container found:", !!cartContainer); - console.log("confirm-order-btn found:", !!confirmBtn); + console.log('cart-items-container found:', !!cartContainer); + console.log('confirm-order-btn found:', !!confirmBtn); - // Always initialize - it handles both cart pages and checkout pages - console.log("Calling init()"); - var result = window.groupOrderShop.init(); - console.log("init() result:", result); + if (cartContainer || confirmBtn) { + console.log('Calling init()'); + var result = window.groupOrderShop.init(); + console.log('init() result:', result); + } else { + console.warn( + 'No elements found to initialize cart' + ); + } }); // Handle confirm order buttons in portal (My Orders page) - document.addEventListener("click", function (e) { - if (e.target.closest(".confirm-order-btn")) { + document.addEventListener('click', function(e) { + if (e.target.closest('.confirm-order-btn')) { e.preventDefault(); - var btn = e.target.closest(".confirm-order-btn"); - var groupOrderId = btn.getAttribute("data-group-order-id"); - var orderId = btn.getAttribute("data-order-id"); - - console.log("Confirm order clicked: order=" + orderId + ", group=" + groupOrderId); - + var btn = e.target.closest('.confirm-order-btn'); + var groupOrderId = btn.getAttribute('data-group-order-id'); + var orderId = btn.getAttribute('data-order-id'); + + console.log('Confirm order clicked: order=' + orderId + ', group=' + groupOrderId); + if (!groupOrderId || !orderId) { if (window.groupOrderShop && window.groupOrderShop._showNotification) { - window.groupOrderShop._showNotification( - "Error: Missing order or group information", - "danger" - ); + window.groupOrderShop._showNotification('Error: Missing order or group information', 'danger'); } else { - alert("Error: Missing order or group information"); + alert('Error: Missing order or group information'); } return; } - + // Show loading state var originalText = btn.innerHTML; btn.disabled = true; btn.innerHTML = ''; - + // Send AJAX request to confirm the order var xhr = new XMLHttpRequest(); - xhr.open("POST", "/eskaera/" + groupOrderId + "/confirm/" + orderId, true); - xhr.setRequestHeader("Content-Type", "application/json"); - - xhr.onload = function () { + xhr.open('POST', '/eskaera/' + groupOrderId + '/confirm/' + orderId, true); + xhr.setRequestHeader('Content-Type', 'application/json'); + + xhr.onload = function() { btn.disabled = false; - + if (xhr.status === 200) { try { var response; - if ( - typeof xhr.responseText === "string" && - xhr.responseText.trim() !== "" - ) { + if (typeof xhr.responseText === 'string' && xhr.responseText.trim() !== '') { response = JSON.parse(xhr.responseText); } else { response = {}; } - - console.log("Response from confirm endpoint:", response); - + + console.log('Response from confirm endpoint:', response); + // Odoo JSON-RPC wraps the result in response.result var result = response.result || response; - + if (result && result.success) { - console.log( - "Order confirmed successfully: order_id=" + result.order_id - ); + console.log('Order confirmed successfully: order_id=' + result.order_id); btn.innerHTML = ''; - btn.classList.remove("btn-success"); - btn.classList.add("btn-secondary"); + btn.classList.remove('btn-success'); + btn.classList.add('btn-secondary'); btn.disabled = true; - btn.title = "Order confirmed"; - + btn.title = 'Order confirmed'; + // Show success notification with order_id - var message = "Order #" + result.order_id + " confirmed successfully"; + var message = 'Order #' + result.order_id + ' confirmed successfully'; if (result.message) { - message = result.message + " (Order #" + result.order_id + ")"; + message = result.message + ' (Order #' + result.order_id + ')'; } - + if (window.groupOrderShop && window.groupOrderShop._showNotification) { - window.groupOrderShop._showNotification(message, "success", 4000); + window.groupOrderShop._showNotification(message, 'success', 4000); } else { alert(message); } } else { - console.error("Error confirming order:", result); + console.error('Error confirming order:', result); btn.innerHTML = originalText; - var errorMsg = - "Error: " + - (result && result.error - ? result.error - : labels.error_unknown || "Unknown error"); + var errorMsg = 'Error: ' + (result && result.error ? result.error : (labels.error_unknown || 'Unknown error')); if (window.groupOrderShop && window.groupOrderShop._showNotification) { - window.groupOrderShop._showNotification(errorMsg, "danger"); + window.groupOrderShop._showNotification(errorMsg, 'danger'); } else { alert(errorMsg); } } } catch (e) { - console.error("Error parsing response:", e); - console.error("Response text was:", xhr.responseText); + console.error('Error parsing response:', e); + console.error('Response text was:', xhr.responseText); btn.innerHTML = originalText; - var errorMsg = "Error processing response: " + e.message; + var errorMsg = 'Error processing response: ' + e.message; if (window.groupOrderShop && window.groupOrderShop._showNotification) { - window.groupOrderShop._showNotification(errorMsg, "danger"); + window.groupOrderShop._showNotification(errorMsg, 'danger'); } else { alert(errorMsg); } } } else { - console.error("HTTP error:", xhr.status, xhr.responseText); + console.error('HTTP error:', xhr.status, xhr.responseText); btn.innerHTML = originalText; - var errorMsg = "Error " + xhr.status + ": Failed to confirm order"; + var errorMsg = 'Error ' + xhr.status + ': Failed to confirm order'; if (window.groupOrderShop && window.groupOrderShop._showNotification) { - window.groupOrderShop._showNotification(errorMsg, "danger"); + window.groupOrderShop._showNotification(errorMsg, 'danger'); } else { alert(errorMsg); } } }; - - xhr.onerror = function () { + + xhr.onerror = function() { btn.disabled = false; btn.innerHTML = originalText; - var errorMsg = "Error: Network request failed"; + var errorMsg = 'Error: Network request failed'; if (window.groupOrderShop && window.groupOrderShop._showNotification) { - window.groupOrderShop._showNotification(errorMsg, "danger"); + window.groupOrderShop._showNotification(errorMsg, 'danger'); } else { alert(errorMsg); } }; - + xhr.send(JSON.stringify({})); } }); // Also try to initialize after a delay in case DOM // takes longer to load - setTimeout(function () { + setTimeout(function() { if (!window.groupOrderShop.orderId) { - console.log("Reintentando init() después de delay..."); - var cartContainer = document.getElementById("cart-items-container"); - var confirmBtn = document.getElementById("confirm-order-btn"); + console.log('Reintentando init() después de delay...'); + var cartContainer = document.getElementById('cart-items-container'); + var confirmBtn = document.getElementById('confirm-order-btn'); if (cartContainer || confirmBtn) { - console.log("Llamando a init() en delay"); + console.log('Llamando a init() en delay'); var result = window.groupOrderShop.init(); - console.log("init() en delay resultado:", result); + console.log('init() en delay resultado:', result); } } }, 1000); + })(); + diff --git a/website_sale_aplicoop/static/tests/README.md b/website_sale_aplicoop/static/tests/README.md index eee11fd..82e9c51 100644 --- a/website_sale_aplicoop/static/tests/README.md +++ b/website_sale_aplicoop/static/tests/README.md @@ -134,7 +134,7 @@ docker-compose exec odoo odoo -d odoo --test-enable --log-level=test --stop-afte odoo.define('website_sale_aplicoop.test_my_feature', function (require) { 'use strict'; var QUnit = window.QUnit; - + QUnit.module('website_sale_aplicoop.my_feature', { beforeEach: function() { // Setup code @@ -257,6 +257,6 @@ exit $exit_code --- -**Maintainer**: Criptomart -**License**: AGPL-3.0 +**Maintainer**: Criptomart +**License**: AGPL-3.0 **Last Updated**: February 3, 2026 diff --git a/website_sale_aplicoop/static/tests/test_cart_functions.js b/website_sale_aplicoop/static/tests/test_cart_functions.js index 3fabe68..1160a05 100644 --- a/website_sale_aplicoop/static/tests/test_cart_functions.js +++ b/website_sale_aplicoop/static/tests/test_cart_functions.js @@ -3,273 +3,222 @@ * Tests core cart functionality (add, remove, update, calculate) */ -odoo.define("website_sale_aplicoop.test_cart_functions", function (require) { - "use strict"; +odoo.define('website_sale_aplicoop.test_cart_functions', function (require) { + 'use strict'; var QUnit = window.QUnit; - QUnit.module( - "website_sale_aplicoop", - { - beforeEach: function () { - // Setup: Initialize groupOrderShop object - window.groupOrderShop = { - orderId: "1", - cart: {}, - labels: { - save_cart: "Save Cart", - reload_cart: "Reload Cart", - checkout: "Checkout", - confirm_order: "Confirm Order", - back_to_cart: "Back to Cart", - }, - }; - - // Clear localStorage - localStorage.clear(); - }, - afterEach: function () { - // Cleanup - localStorage.clear(); - delete window.groupOrderShop; - }, + QUnit.module('website_sale_aplicoop', { + beforeEach: function() { + // Setup: Initialize groupOrderShop object + window.groupOrderShop = { + orderId: '1', + cart: {}, + labels: { + 'save_cart': 'Save Cart', + 'reload_cart': 'Reload Cart', + 'checkout': 'Checkout', + 'confirm_order': 'Confirm Order', + 'back_to_cart': 'Back to Cart' + } + }; + + // Clear localStorage + localStorage.clear(); }, - function () { - QUnit.test("groupOrderShop object initializes correctly", function (assert) { - assert.expect(3); - - assert.ok(window.groupOrderShop, "groupOrderShop object exists"); - assert.equal(window.groupOrderShop.orderId, "1", "orderId is set"); - assert.ok(typeof window.groupOrderShop.cart === "object", "cart is an object"); - }); - - QUnit.test("cart starts empty", function (assert) { - assert.expect(1); - - var cartKeys = Object.keys(window.groupOrderShop.cart); - assert.equal(cartKeys.length, 0, "cart has no items initially"); - }); - - QUnit.test("can add item to cart", function (assert) { - assert.expect(4); - - // Add a product to cart - var productId = "123"; - var productData = { - name: "Test Product", - price: 10.5, - quantity: 2, - }; - - window.groupOrderShop.cart[productId] = productData; - - assert.equal(Object.keys(window.groupOrderShop.cart).length, 1, "cart has 1 item"); - assert.ok(window.groupOrderShop.cart[productId], "product exists in cart"); - assert.equal( - window.groupOrderShop.cart[productId].name, - "Test Product", - "product name is correct" - ); - assert.equal( - window.groupOrderShop.cart[productId].quantity, - 2, - "product quantity is correct" - ); - }); - - QUnit.test("can remove item from cart", function (assert) { - assert.expect(2); - - // Add then remove - var productId = "123"; - window.groupOrderShop.cart[productId] = { - name: "Test Product", - price: 10.5, - quantity: 2, - }; - - assert.equal( - Object.keys(window.groupOrderShop.cart).length, - 1, - "cart has 1 item after add" - ); - - delete window.groupOrderShop.cart[productId]; - - assert.equal( - Object.keys(window.groupOrderShop.cart).length, - 0, - "cart is empty after remove" - ); - }); - - QUnit.test("can update item quantity", function (assert) { - assert.expect(3); - - var productId = "123"; - window.groupOrderShop.cart[productId] = { - name: "Test Product", - price: 10.5, - quantity: 2, - }; - - assert.equal( - window.groupOrderShop.cart[productId].quantity, - 2, - "initial quantity is 2" - ); - - // Update quantity - window.groupOrderShop.cart[productId].quantity = 5; - - assert.equal( - window.groupOrderShop.cart[productId].quantity, - 5, - "quantity updated to 5" - ); - assert.equal( - Object.keys(window.groupOrderShop.cart).length, - 1, - "still only 1 item in cart" - ); - }); - - QUnit.test("cart total calculates correctly", function (assert) { - assert.expect(1); - - // Add multiple products - window.groupOrderShop.cart["123"] = { - name: "Product 1", - price: 10.0, - quantity: 2, - }; - - window.groupOrderShop.cart["456"] = { - name: "Product 2", - price: 5.5, - quantity: 3, - }; - - // Calculate total manually - var total = 0; - Object.keys(window.groupOrderShop.cart).forEach(function (productId) { - var item = window.groupOrderShop.cart[productId]; - total += item.price * item.quantity; - }); - - // Expected: (10.00 * 2) + (5.50 * 3) = 20.00 + 16.50 = 36.50 - assert.equal(total.toFixed(2), "36.50", "cart total is correct"); - }); - - QUnit.test("localStorage saves cart correctly", function (assert) { - assert.expect(2); - - var cartKey = "eskaera_1_cart"; - var testCart = { - 123: { - name: "Test Product", - price: 10.5, - quantity: 2, - }, - }; - - // Save to localStorage - localStorage.setItem(cartKey, JSON.stringify(testCart)); - - // Retrieve and verify - var savedCart = JSON.parse(localStorage.getItem(cartKey)); - - assert.ok(savedCart, "cart was saved to localStorage"); - assert.equal(savedCart["123"].name, "Test Product", "cart data is correct"); - }); - - QUnit.test("labels object is initialized", function (assert) { - assert.expect(5); - - assert.ok(window.groupOrderShop.labels, "labels object exists"); - assert.equal( - window.groupOrderShop.labels["save_cart"], - "Save Cart", - "save_cart label exists" - ); - assert.equal( - window.groupOrderShop.labels["reload_cart"], - "Reload Cart", - "reload_cart label exists" - ); - assert.equal( - window.groupOrderShop.labels["checkout"], - "Checkout", - "checkout label exists" - ); - assert.equal( - window.groupOrderShop.labels["confirm_order"], - "Confirm Order", - "confirm_order label exists" - ); - }); - - QUnit.test("cart handles decimal quantities correctly", function (assert) { - assert.expect(2); - - window.groupOrderShop.cart["123"] = { - name: "Weight Product", - price: 8.99, - quantity: 1.5, - }; - - var item = window.groupOrderShop.cart["123"]; - var subtotal = item.price * item.quantity; - - assert.equal(item.quantity, 1.5, "decimal quantity stored correctly"); - assert.equal( - subtotal.toFixed(2), - "13.49", - "subtotal with decimal quantity is correct" - ); - }); - - QUnit.test("cart handles zero quantity", function (assert) { - assert.expect(1); - - window.groupOrderShop.cart["123"] = { - name: "Test Product", - price: 10.0, - quantity: 0, - }; - - var item = window.groupOrderShop.cart["123"]; - var subtotal = item.price * item.quantity; - - assert.equal(subtotal, 0, "zero quantity results in zero subtotal"); - }); - - QUnit.test("cart handles multiple items with same price", function (assert) { - assert.expect(2); - - window.groupOrderShop.cart["123"] = { - name: "Product A", - price: 10.0, - quantity: 2, - }; - - window.groupOrderShop.cart["456"] = { - name: "Product B", - price: 10.0, - quantity: 3, - }; - - var total = 0; - Object.keys(window.groupOrderShop.cart).forEach(function (productId) { - var item = window.groupOrderShop.cart[productId]; - total += item.price * item.quantity; - }); - - assert.equal(Object.keys(window.groupOrderShop.cart).length, 2, "cart has 2 items"); - assert.equal(total.toFixed(2), "50.00", "total is correct with same prices"); - }); + afterEach: function() { + // Cleanup + localStorage.clear(); + delete window.groupOrderShop; } - ); + }, function() { + + QUnit.test('groupOrderShop object initializes correctly', function(assert) { + assert.expect(3); + + assert.ok(window.groupOrderShop, 'groupOrderShop object exists'); + assert.equal(window.groupOrderShop.orderId, '1', 'orderId is set'); + assert.ok(typeof window.groupOrderShop.cart === 'object', 'cart is an object'); + }); + + QUnit.test('cart starts empty', function(assert) { + assert.expect(1); + + var cartKeys = Object.keys(window.groupOrderShop.cart); + assert.equal(cartKeys.length, 0, 'cart has no items initially'); + }); + + QUnit.test('can add item to cart', function(assert) { + assert.expect(4); + + // Add a product to cart + var productId = '123'; + var productData = { + name: 'Test Product', + price: 10.50, + quantity: 2 + }; + + window.groupOrderShop.cart[productId] = productData; + + assert.equal(Object.keys(window.groupOrderShop.cart).length, 1, 'cart has 1 item'); + assert.ok(window.groupOrderShop.cart[productId], 'product exists in cart'); + assert.equal(window.groupOrderShop.cart[productId].name, 'Test Product', 'product name is correct'); + assert.equal(window.groupOrderShop.cart[productId].quantity, 2, 'product quantity is correct'); + }); + + QUnit.test('can remove item from cart', function(assert) { + assert.expect(2); + + // Add then remove + var productId = '123'; + window.groupOrderShop.cart[productId] = { + name: 'Test Product', + price: 10.50, + quantity: 2 + }; + + assert.equal(Object.keys(window.groupOrderShop.cart).length, 1, 'cart has 1 item after add'); + + delete window.groupOrderShop.cart[productId]; + + assert.equal(Object.keys(window.groupOrderShop.cart).length, 0, 'cart is empty after remove'); + }); + + QUnit.test('can update item quantity', function(assert) { + assert.expect(3); + + var productId = '123'; + window.groupOrderShop.cart[productId] = { + name: 'Test Product', + price: 10.50, + quantity: 2 + }; + + assert.equal(window.groupOrderShop.cart[productId].quantity, 2, 'initial quantity is 2'); + + // Update quantity + window.groupOrderShop.cart[productId].quantity = 5; + + assert.equal(window.groupOrderShop.cart[productId].quantity, 5, 'quantity updated to 5'); + assert.equal(Object.keys(window.groupOrderShop.cart).length, 1, 'still only 1 item in cart'); + }); + + QUnit.test('cart total calculates correctly', function(assert) { + assert.expect(1); + + // Add multiple products + window.groupOrderShop.cart['123'] = { + name: 'Product 1', + price: 10.00, + quantity: 2 + }; + + window.groupOrderShop.cart['456'] = { + name: 'Product 2', + price: 5.50, + quantity: 3 + }; + + // Calculate total manually + var total = 0; + Object.keys(window.groupOrderShop.cart).forEach(function(productId) { + var item = window.groupOrderShop.cart[productId]; + total += item.price * item.quantity; + }); + + // Expected: (10.00 * 2) + (5.50 * 3) = 20.00 + 16.50 = 36.50 + assert.equal(total.toFixed(2), '36.50', 'cart total is correct'); + }); + + QUnit.test('localStorage saves cart correctly', function(assert) { + assert.expect(2); + + var cartKey = 'eskaera_1_cart'; + var testCart = { + '123': { + name: 'Test Product', + price: 10.50, + quantity: 2 + } + }; + + // Save to localStorage + localStorage.setItem(cartKey, JSON.stringify(testCart)); + + // Retrieve and verify + var savedCart = JSON.parse(localStorage.getItem(cartKey)); + + assert.ok(savedCart, 'cart was saved to localStorage'); + assert.equal(savedCart['123'].name, 'Test Product', 'cart data is correct'); + }); + + QUnit.test('labels object is initialized', function(assert) { + assert.expect(5); + + assert.ok(window.groupOrderShop.labels, 'labels object exists'); + assert.equal(window.groupOrderShop.labels['save_cart'], 'Save Cart', 'save_cart label exists'); + assert.equal(window.groupOrderShop.labels['reload_cart'], 'Reload Cart', 'reload_cart label exists'); + assert.equal(window.groupOrderShop.labels['checkout'], 'Checkout', 'checkout label exists'); + assert.equal(window.groupOrderShop.labels['confirm_order'], 'Confirm Order', 'confirm_order label exists'); + }); + + QUnit.test('cart handles decimal quantities correctly', function(assert) { + assert.expect(2); + + window.groupOrderShop.cart['123'] = { + name: 'Weight Product', + price: 8.99, + quantity: 1.5 + }; + + var item = window.groupOrderShop.cart['123']; + var subtotal = item.price * item.quantity; + + assert.equal(item.quantity, 1.5, 'decimal quantity stored correctly'); + assert.equal(subtotal.toFixed(2), '13.49', 'subtotal with decimal quantity is correct'); + }); + + QUnit.test('cart handles zero quantity', function(assert) { + assert.expect(1); + + window.groupOrderShop.cart['123'] = { + name: 'Test Product', + price: 10.00, + quantity: 0 + }; + + var item = window.groupOrderShop.cart['123']; + var subtotal = item.price * item.quantity; + + assert.equal(subtotal, 0, 'zero quantity results in zero subtotal'); + }); + + QUnit.test('cart handles multiple items with same price', function(assert) { + assert.expect(2); + + window.groupOrderShop.cart['123'] = { + name: 'Product A', + price: 10.00, + quantity: 2 + }; + + window.groupOrderShop.cart['456'] = { + name: 'Product B', + price: 10.00, + quantity: 3 + }; + + var total = 0; + Object.keys(window.groupOrderShop.cart).forEach(function(productId) { + var item = window.groupOrderShop.cart[productId]; + total += item.price * item.quantity; + }); + + assert.equal(Object.keys(window.groupOrderShop.cart).length, 2, 'cart has 2 items'); + assert.equal(total.toFixed(2), '50.00', 'total is correct with same prices'); + }); + }); return {}; }); diff --git a/website_sale_aplicoop/static/tests/test_realtime_search.js b/website_sale_aplicoop/static/tests/test_realtime_search.js index 9cd9468..bbac93c 100644 --- a/website_sale_aplicoop/static/tests/test_realtime_search.js +++ b/website_sale_aplicoop/static/tests/test_realtime_search.js @@ -3,247 +3,239 @@ * Tests product filtering and search behavior */ -odoo.define("website_sale_aplicoop.test_realtime_search", function (require) { - "use strict"; +odoo.define('website_sale_aplicoop.test_realtime_search', function (require) { + 'use strict'; var QUnit = window.QUnit; - QUnit.module( - "website_sale_aplicoop.realtime_search", - { - beforeEach: function () { - // Setup: Create test DOM with product cards - this.$fixture = $("#qunit-fixture"); - - this.$fixture.append( - '' + - '" + - '
' + - '
' + - '
' + - '
' - ); - - // Initialize search object - window.realtimeSearch = { - searchInput: document.getElementById("realtime-search-input"), - categorySelect: document.getElementById("realtime-category-select"), - productCards: document.querySelectorAll(".product-card"), - - filterProducts: function () { - var searchTerm = this.searchInput.value.toLowerCase().trim(); - var selectedCategory = this.categorySelect.value; - - var visibleCount = 0; - var hiddenCount = 0; - - this.productCards.forEach(function (card) { - var productName = card.getAttribute("data-product-name").toLowerCase(); - var categoryId = card.getAttribute("data-category-id"); - - var matchesSearch = !searchTerm || productName.includes(searchTerm); - var matchesCategory = - !selectedCategory || categoryId === selectedCategory; - - if (matchesSearch && matchesCategory) { - card.classList.remove("d-none"); - visibleCount++; - } else { - card.classList.add("d-none"); - hiddenCount++; - } - }); - - return { visible: visibleCount, hidden: hiddenCount }; - }, - }; - }, - afterEach: function () { - // Cleanup - this.$fixture.empty(); - delete window.realtimeSearch; - }, + QUnit.module('website_sale_aplicoop.realtime_search', { + beforeEach: function() { + // Setup: Create test DOM with product cards + this.$fixture = $('#qunit-fixture'); + + this.$fixture.append( + '' + + '' + + '
' + + '
' + + '
' + + '
' + ); + + // Initialize search object + window.realtimeSearch = { + searchInput: document.getElementById('realtime-search-input'), + categorySelect: document.getElementById('realtime-category-select'), + productCards: document.querySelectorAll('.product-card'), + + filterProducts: function() { + var searchTerm = this.searchInput.value.toLowerCase().trim(); + var selectedCategory = this.categorySelect.value; + + var visibleCount = 0; + var hiddenCount = 0; + + this.productCards.forEach(function(card) { + var productName = card.getAttribute('data-product-name').toLowerCase(); + var categoryId = card.getAttribute('data-category-id'); + + var matchesSearch = !searchTerm || productName.includes(searchTerm); + var matchesCategory = !selectedCategory || categoryId === selectedCategory; + + if (matchesSearch && matchesCategory) { + card.classList.remove('d-none'); + visibleCount++; + } else { + card.classList.add('d-none'); + hiddenCount++; + } + }); + + return { visible: visibleCount, hidden: hiddenCount }; + } + }; }, - function () { - QUnit.test("search input element exists", function (assert) { - assert.expect(1); - - var searchInput = document.getElementById("realtime-search-input"); - assert.ok(searchInput, "search input element exists"); - }); - - QUnit.test("category select element exists", function (assert) { - assert.expect(1); - - var categorySelect = document.getElementById("realtime-category-select"); - assert.ok(categorySelect, "category select element exists"); - }); - - QUnit.test("product cards are found", function (assert) { - assert.expect(1); - - var productCards = document.querySelectorAll(".product-card"); - assert.equal(productCards.length, 4, "found 4 product cards"); - }); - - QUnit.test("search filters by product name", function (assert) { - assert.expect(2); - - // Search for "cab" - window.realtimeSearch.searchInput.value = "cab"; - var result = window.realtimeSearch.filterProducts(); - - assert.equal(result.visible, 1, "1 product visible (Cabbage)"); - assert.equal(result.hidden, 3, "3 products hidden"); - }); - - QUnit.test("search is case insensitive", function (assert) { - assert.expect(2); - - // Search for "CARROT" in uppercase - window.realtimeSearch.searchInput.value = "CARROT"; - var result = window.realtimeSearch.filterProducts(); - - assert.equal(result.visible, 1, "1 product visible (Carrot)"); - assert.equal(result.hidden, 3, "3 products hidden"); - }); - - QUnit.test("empty search shows all products", function (assert) { - assert.expect(2); - - window.realtimeSearch.searchInput.value = ""; - var result = window.realtimeSearch.filterProducts(); - - assert.equal(result.visible, 4, "all 4 products visible"); - assert.equal(result.hidden, 0, "no products hidden"); - }); - - QUnit.test("category filter works", function (assert) { - assert.expect(2); - - // Select category 1 - window.realtimeSearch.categorySelect.value = "1"; - var result = window.realtimeSearch.filterProducts(); - - assert.equal(result.visible, 2, "2 products visible (Cabbage, Carrot)"); - assert.equal(result.hidden, 2, "2 products hidden (Apple, Banana)"); - }); - - QUnit.test("search and category filter work together", function (assert) { - assert.expect(2); - - // Search for "ca" in category 1 - window.realtimeSearch.searchInput.value = "ca"; - window.realtimeSearch.categorySelect.value = "1"; - var result = window.realtimeSearch.filterProducts(); - - // Should show: Cabbage, Carrot (both in category 1 and match "ca") - assert.equal(result.visible, 2, "2 products visible"); - assert.equal(result.hidden, 2, "2 products hidden"); - }); - - QUnit.test("search for non-existent product shows none", function (assert) { - assert.expect(2); - - window.realtimeSearch.searchInput.value = "xyz123"; - var result = window.realtimeSearch.filterProducts(); - - assert.equal(result.visible, 0, "no products visible"); - assert.equal(result.hidden, 4, "all 4 products hidden"); - }); - - QUnit.test("partial match works", function (assert) { - assert.expect(2); - - // Search for "an" should match "Banana" - window.realtimeSearch.searchInput.value = "an"; - var result = window.realtimeSearch.filterProducts(); - - assert.equal(result.visible, 1, "1 product visible (Banana)"); - assert.equal(result.hidden, 3, "3 products hidden"); - }); - - QUnit.test("search trims whitespace", function (assert) { - assert.expect(2); - - // Search with extra whitespace - window.realtimeSearch.searchInput.value = " apple "; - var result = window.realtimeSearch.filterProducts(); - - assert.equal(result.visible, 1, "1 product visible (Apple)"); - assert.equal(result.hidden, 3, "3 products hidden"); - }); - - QUnit.test("d-none class is added to hidden products", function (assert) { - assert.expect(1); - - window.realtimeSearch.searchInput.value = "cabbage"; - window.realtimeSearch.filterProducts(); - - var productCards = document.querySelectorAll(".product-card"); - var hiddenCards = Array.from(productCards).filter(function (card) { - return card.classList.contains("d-none"); - }); - - assert.equal(hiddenCards.length, 3, "3 cards have d-none class"); - }); - - QUnit.test("d-none class is removed from visible products", function (assert) { - assert.expect(2); - - // First hide all - window.realtimeSearch.searchInput.value = "xyz"; - window.realtimeSearch.filterProducts(); - - var allHidden = Array.from(window.realtimeSearch.productCards).every(function ( - card - ) { - return card.classList.contains("d-none"); - }); - assert.ok(allHidden, "all cards hidden initially"); - - // Then show all - window.realtimeSearch.searchInput.value = ""; - window.realtimeSearch.filterProducts(); - - var allVisible = Array.from(window.realtimeSearch.productCards).every(function ( - card - ) { - return !card.classList.contains("d-none"); - }); - assert.ok(allVisible, "all cards visible after clearing search"); - }); - - QUnit.test("filterProducts returns correct counts", function (assert) { - assert.expect(4); - - // All visible - window.realtimeSearch.searchInput.value = ""; - var result1 = window.realtimeSearch.filterProducts(); - assert.equal(result1.visible + result1.hidden, 4, "total count is 4"); - - // 1 visible - window.realtimeSearch.searchInput.value = "apple"; - var result2 = window.realtimeSearch.filterProducts(); - assert.equal(result2.visible, 1, "visible count is 1"); - - // None visible - window.realtimeSearch.searchInput.value = "xyz"; - var result3 = window.realtimeSearch.filterProducts(); - assert.equal(result3.visible, 0, "visible count is 0"); - - // Category filter - window.realtimeSearch.searchInput.value = ""; - window.realtimeSearch.categorySelect.value = "2"; - var result4 = window.realtimeSearch.filterProducts(); - assert.equal(result4.visible, 2, "category filter shows 2 products"); - }); + afterEach: function() { + // Cleanup + this.$fixture.empty(); + delete window.realtimeSearch; } - ); + }, function() { + + QUnit.test('search input element exists', function(assert) { + assert.expect(1); + + var searchInput = document.getElementById('realtime-search-input'); + assert.ok(searchInput, 'search input element exists'); + }); + + QUnit.test('category select element exists', function(assert) { + assert.expect(1); + + var categorySelect = document.getElementById('realtime-category-select'); + assert.ok(categorySelect, 'category select element exists'); + }); + + QUnit.test('product cards are found', function(assert) { + assert.expect(1); + + var productCards = document.querySelectorAll('.product-card'); + assert.equal(productCards.length, 4, 'found 4 product cards'); + }); + + QUnit.test('search filters by product name', function(assert) { + assert.expect(2); + + // Search for "cab" + window.realtimeSearch.searchInput.value = 'cab'; + var result = window.realtimeSearch.filterProducts(); + + assert.equal(result.visible, 1, '1 product visible (Cabbage)'); + assert.equal(result.hidden, 3, '3 products hidden'); + }); + + QUnit.test('search is case insensitive', function(assert) { + assert.expect(2); + + // Search for "CARROT" in uppercase + window.realtimeSearch.searchInput.value = 'CARROT'; + var result = window.realtimeSearch.filterProducts(); + + assert.equal(result.visible, 1, '1 product visible (Carrot)'); + assert.equal(result.hidden, 3, '3 products hidden'); + }); + + QUnit.test('empty search shows all products', function(assert) { + assert.expect(2); + + window.realtimeSearch.searchInput.value = ''; + var result = window.realtimeSearch.filterProducts(); + + assert.equal(result.visible, 4, 'all 4 products visible'); + assert.equal(result.hidden, 0, 'no products hidden'); + }); + + QUnit.test('category filter works', function(assert) { + assert.expect(2); + + // Select category 1 + window.realtimeSearch.categorySelect.value = '1'; + var result = window.realtimeSearch.filterProducts(); + + assert.equal(result.visible, 2, '2 products visible (Cabbage, Carrot)'); + assert.equal(result.hidden, 2, '2 products hidden (Apple, Banana)'); + }); + + QUnit.test('search and category filter work together', function(assert) { + assert.expect(2); + + // Search for "ca" in category 1 + window.realtimeSearch.searchInput.value = 'ca'; + window.realtimeSearch.categorySelect.value = '1'; + var result = window.realtimeSearch.filterProducts(); + + // Should show: Cabbage, Carrot (both in category 1 and match "ca") + assert.equal(result.visible, 2, '2 products visible'); + assert.equal(result.hidden, 2, '2 products hidden'); + }); + + QUnit.test('search for non-existent product shows none', function(assert) { + assert.expect(2); + + window.realtimeSearch.searchInput.value = 'xyz123'; + var result = window.realtimeSearch.filterProducts(); + + assert.equal(result.visible, 0, 'no products visible'); + assert.equal(result.hidden, 4, 'all 4 products hidden'); + }); + + QUnit.test('partial match works', function(assert) { + assert.expect(2); + + // Search for "an" should match "Banana" + window.realtimeSearch.searchInput.value = 'an'; + var result = window.realtimeSearch.filterProducts(); + + assert.equal(result.visible, 1, '1 product visible (Banana)'); + assert.equal(result.hidden, 3, '3 products hidden'); + }); + + QUnit.test('search trims whitespace', function(assert) { + assert.expect(2); + + // Search with extra whitespace + window.realtimeSearch.searchInput.value = ' apple '; + var result = window.realtimeSearch.filterProducts(); + + assert.equal(result.visible, 1, '1 product visible (Apple)'); + assert.equal(result.hidden, 3, '3 products hidden'); + }); + + QUnit.test('d-none class is added to hidden products', function(assert) { + assert.expect(1); + + window.realtimeSearch.searchInput.value = 'cabbage'; + window.realtimeSearch.filterProducts(); + + var productCards = document.querySelectorAll('.product-card'); + var hiddenCards = Array.from(productCards).filter(function(card) { + return card.classList.contains('d-none'); + }); + + assert.equal(hiddenCards.length, 3, '3 cards have d-none class'); + }); + + QUnit.test('d-none class is removed from visible products', function(assert) { + assert.expect(2); + + // First hide all + window.realtimeSearch.searchInput.value = 'xyz'; + window.realtimeSearch.filterProducts(); + + var allHidden = Array.from(window.realtimeSearch.productCards).every(function(card) { + return card.classList.contains('d-none'); + }); + assert.ok(allHidden, 'all cards hidden initially'); + + // Then show all + window.realtimeSearch.searchInput.value = ''; + window.realtimeSearch.filterProducts(); + + var allVisible = Array.from(window.realtimeSearch.productCards).every(function(card) { + return !card.classList.contains('d-none'); + }); + assert.ok(allVisible, 'all cards visible after clearing search'); + }); + + QUnit.test('filterProducts returns correct counts', function(assert) { + assert.expect(4); + + // All visible + window.realtimeSearch.searchInput.value = ''; + var result1 = window.realtimeSearch.filterProducts(); + assert.equal(result1.visible + result1.hidden, 4, 'total count is 4'); + + // 1 visible + window.realtimeSearch.searchInput.value = 'apple'; + var result2 = window.realtimeSearch.filterProducts(); + assert.equal(result2.visible, 1, 'visible count is 1'); + + // None visible + window.realtimeSearch.searchInput.value = 'xyz'; + var result3 = window.realtimeSearch.filterProducts(); + assert.equal(result3.visible, 0, 'visible count is 0'); + + // Category filter + window.realtimeSearch.searchInput.value = ''; + window.realtimeSearch.categorySelect.value = '2'; + var result4 = window.realtimeSearch.filterProducts(); + assert.equal(result4.visible, 2, 'category filter shows 2 products'); + }); + }); return {}; }); diff --git a/website_sale_aplicoop/static/tests/test_suite.js b/website_sale_aplicoop/static/tests/test_suite.js index 6e9682f..210f2d4 100644 --- a/website_sale_aplicoop/static/tests/test_suite.js +++ b/website_sale_aplicoop/static/tests/test_suite.js @@ -1,10 +1,10 @@ -odoo.define("website_sale_aplicoop.test_suite", function (require) { - "use strict"; +odoo.define('website_sale_aplicoop.test_suite', function (require) { + 'use strict'; // Import all test modules - require("website_sale_aplicoop.test_cart_functions"); - require("website_sale_aplicoop.test_tooltips_labels"); - require("website_sale_aplicoop.test_realtime_search"); + require('website_sale_aplicoop.test_cart_functions'); + require('website_sale_aplicoop.test_tooltips_labels'); + require('website_sale_aplicoop.test_realtime_search'); // Test suite is automatically registered by importing modules }); diff --git a/website_sale_aplicoop/static/tests/test_tooltips_labels.js b/website_sale_aplicoop/static/tests/test_tooltips_labels.js index e89b4a5..f8386c2 100644 --- a/website_sale_aplicoop/static/tests/test_tooltips_labels.js +++ b/website_sale_aplicoop/static/tests/test_tooltips_labels.js @@ -3,214 +3,185 @@ * Tests tooltip initialization and label loading */ -odoo.define("website_sale_aplicoop.test_tooltips_labels", function (require) { - "use strict"; +odoo.define('website_sale_aplicoop.test_tooltips_labels', function (require) { + 'use strict'; var QUnit = window.QUnit; - QUnit.module( - "website_sale_aplicoop.tooltips_labels", - { - beforeEach: function () { - // Setup: Create test DOM elements - this.$fixture = $("#qunit-fixture"); - - // Add test buttons with tooltip labels - this.$fixture.append( - '' + - '' + - '' - ); - - // Initialize groupOrderShop - window.groupOrderShop = { - orderId: "1", - cart: {}, - labels: { - save_cart: "Guardar Carrito", - reload_cart: "Recargar Carrito", - checkout: "Proceder al Pago", - confirm_order: "Confirmar Pedido", - back_to_cart: "Volver al Carrito", - }, - _initTooltips: function () { - var labels = window.groupOrderShop.labels || this.labels || {}; - var tooltipElements = document.querySelectorAll("[data-tooltip-label]"); - - tooltipElements.forEach(function (el) { - var labelKey = el.getAttribute("data-tooltip-label"); - if (labelKey && labels[labelKey]) { - el.setAttribute("title", labels[labelKey]); - } - }); - }, - }; - }, - afterEach: function () { - // Cleanup - this.$fixture.empty(); - delete window.groupOrderShop; - }, - }, - function () { - QUnit.test("tooltips are initialized from labels", function (assert) { - assert.expect(3); - - // Initialize tooltips - window.groupOrderShop._initTooltips(); - - var btn1 = document.getElementById("test-btn-1"); - var btn2 = document.getElementById("test-btn-2"); - var btn3 = document.getElementById("test-btn-3"); - - assert.equal( - btn1.getAttribute("title"), - "Guardar Carrito", - "save_cart tooltip is correct" - ); - assert.equal( - btn2.getAttribute("title"), - "Proceder al Pago", - "checkout tooltip is correct" - ); - assert.equal( - btn3.getAttribute("title"), - "Recargar Carrito", - "reload_cart tooltip is correct" - ); - }); - - QUnit.test("tooltips handle missing labels gracefully", function (assert) { - assert.expect(1); - - // Add button with non-existent label - this.$fixture.append( - '' - ); - - window.groupOrderShop._initTooltips(); - - var btn4 = document.getElementById("test-btn-4"); - var title = btn4.getAttribute("title"); - - // Should be null or empty since label doesn't exist - assert.ok(!title || title === "", "missing label does not set tooltip"); - }); - - QUnit.test("labels object contains expected keys", function (assert) { - assert.expect(5); - - var labels = window.groupOrderShop.labels; - - assert.ok("save_cart" in labels, "has save_cart label"); - assert.ok("reload_cart" in labels, "has reload_cart label"); - assert.ok("checkout" in labels, "has checkout label"); - assert.ok("confirm_order" in labels, "has confirm_order label"); - assert.ok("back_to_cart" in labels, "has back_to_cart label"); - }); - - QUnit.test("labels are strings", function (assert) { - assert.expect(5); - - var labels = window.groupOrderShop.labels; - - assert.equal(typeof labels.save_cart, "string", "save_cart is string"); - assert.equal(typeof labels.reload_cart, "string", "reload_cart is string"); - assert.equal(typeof labels.checkout, "string", "checkout is string"); - assert.equal(typeof labels.confirm_order, "string", "confirm_order is string"); - assert.equal(typeof labels.back_to_cart, "string", "back_to_cart is string"); - }); - - QUnit.test("_initTooltips uses window.groupOrderShop.labels", function (assert) { - assert.expect(1); - - // Update global labels - window.groupOrderShop.labels = { - save_cart: "Updated Label", - checkout: "Updated Checkout", - reload_cart: "Updated Reload", - }; - - window.groupOrderShop._initTooltips(); - - var btn1 = document.getElementById("test-btn-1"); - assert.equal( - btn1.getAttribute("title"), - "Updated Label", - "uses updated global labels" - ); - }); - - QUnit.test("tooltips can be reinitialized", function (assert) { - assert.expect(2); - - // First initialization - window.groupOrderShop._initTooltips(); - var btn1 = document.getElementById("test-btn-1"); - assert.equal(btn1.getAttribute("title"), "Guardar Carrito", "first init correct"); - - // Update labels and reinitialize - window.groupOrderShop.labels.save_cart = "New Translation"; - window.groupOrderShop._initTooltips(); - - assert.equal( - btn1.getAttribute("title"), - "New Translation", - "reinitialized with new label" - ); - }); - - QUnit.test("elements without data-tooltip-label are ignored", function (assert) { - assert.expect(1); - - this.$fixture.append(''); - - window.groupOrderShop._initTooltips(); - - var btnNoLabel = document.getElementById("test-btn-no-label"); - var title = btnNoLabel.getAttribute("title"); - - assert.ok(!title || title === "", "button without data-tooltip-label has no title"); - }); - - QUnit.test("querySelectorAll finds all tooltip elements", function (assert) { - assert.expect(1); - - var tooltipElements = document.querySelectorAll("[data-tooltip-label]"); - - // We have 3 buttons with data-tooltip-label - assert.equal( - tooltipElements.length, - 3, - "finds all 3 elements with data-tooltip-label" - ); - }); - - QUnit.test("labels survive JSON serialization", function (assert) { - assert.expect(2); - - var labels = window.groupOrderShop.labels; - var serialized = JSON.stringify(labels); - var deserialized = JSON.parse(serialized); - - assert.ok(serialized, "labels can be serialized to JSON"); - assert.deepEqual(deserialized, labels, "deserialized labels match original"); - }); - - QUnit.test("empty labels object does not break initialization", function (assert) { - assert.expect(1); - - window.groupOrderShop.labels = {}; - - try { - window.groupOrderShop._initTooltips(); - assert.ok(true, "initialization with empty labels does not throw error"); - } catch (e) { - assert.ok(false, "initialization threw error: " + e.message); + QUnit.module('website_sale_aplicoop.tooltips_labels', { + beforeEach: function() { + // Setup: Create test DOM elements + this.$fixture = $('#qunit-fixture'); + + // Add test buttons with tooltip labels + this.$fixture.append( + '' + + '' + + '' + ); + + // Initialize groupOrderShop + window.groupOrderShop = { + orderId: '1', + cart: {}, + labels: { + 'save_cart': 'Guardar Carrito', + 'reload_cart': 'Recargar Carrito', + 'checkout': 'Proceder al Pago', + 'confirm_order': 'Confirmar Pedido', + 'back_to_cart': 'Volver al Carrito' + }, + _initTooltips: function() { + var labels = window.groupOrderShop.labels || this.labels || {}; + var tooltipElements = document.querySelectorAll('[data-tooltip-label]'); + + tooltipElements.forEach(function(el) { + var labelKey = el.getAttribute('data-tooltip-label'); + if (labelKey && labels[labelKey]) { + el.setAttribute('title', labels[labelKey]); + } + }); } - }); + }; + }, + afterEach: function() { + // Cleanup + this.$fixture.empty(); + delete window.groupOrderShop; } - ); + }, function() { + + QUnit.test('tooltips are initialized from labels', function(assert) { + assert.expect(3); + + // Initialize tooltips + window.groupOrderShop._initTooltips(); + + var btn1 = document.getElementById('test-btn-1'); + var btn2 = document.getElementById('test-btn-2'); + var btn3 = document.getElementById('test-btn-3'); + + assert.equal(btn1.getAttribute('title'), 'Guardar Carrito', 'save_cart tooltip is correct'); + assert.equal(btn2.getAttribute('title'), 'Proceder al Pago', 'checkout tooltip is correct'); + assert.equal(btn3.getAttribute('title'), 'Recargar Carrito', 'reload_cart tooltip is correct'); + }); + + QUnit.test('tooltips handle missing labels gracefully', function(assert) { + assert.expect(1); + + // Add button with non-existent label + this.$fixture.append(''); + + window.groupOrderShop._initTooltips(); + + var btn4 = document.getElementById('test-btn-4'); + var title = btn4.getAttribute('title'); + + // Should be null or empty since label doesn't exist + assert.ok(!title || title === '', 'missing label does not set tooltip'); + }); + + QUnit.test('labels object contains expected keys', function(assert) { + assert.expect(5); + + var labels = window.groupOrderShop.labels; + + assert.ok('save_cart' in labels, 'has save_cart label'); + assert.ok('reload_cart' in labels, 'has reload_cart label'); + assert.ok('checkout' in labels, 'has checkout label'); + assert.ok('confirm_order' in labels, 'has confirm_order label'); + assert.ok('back_to_cart' in labels, 'has back_to_cart label'); + }); + + QUnit.test('labels are strings', function(assert) { + assert.expect(5); + + var labels = window.groupOrderShop.labels; + + assert.equal(typeof labels.save_cart, 'string', 'save_cart is string'); + assert.equal(typeof labels.reload_cart, 'string', 'reload_cart is string'); + assert.equal(typeof labels.checkout, 'string', 'checkout is string'); + assert.equal(typeof labels.confirm_order, 'string', 'confirm_order is string'); + assert.equal(typeof labels.back_to_cart, 'string', 'back_to_cart is string'); + }); + + QUnit.test('_initTooltips uses window.groupOrderShop.labels', function(assert) { + assert.expect(1); + + // Update global labels + window.groupOrderShop.labels = { + 'save_cart': 'Updated Label', + 'checkout': 'Updated Checkout', + 'reload_cart': 'Updated Reload' + }; + + window.groupOrderShop._initTooltips(); + + var btn1 = document.getElementById('test-btn-1'); + assert.equal(btn1.getAttribute('title'), 'Updated Label', 'uses updated global labels'); + }); + + QUnit.test('tooltips can be reinitialized', function(assert) { + assert.expect(2); + + // First initialization + window.groupOrderShop._initTooltips(); + var btn1 = document.getElementById('test-btn-1'); + assert.equal(btn1.getAttribute('title'), 'Guardar Carrito', 'first init correct'); + + // Update labels and reinitialize + window.groupOrderShop.labels.save_cart = 'New Translation'; + window.groupOrderShop._initTooltips(); + + assert.equal(btn1.getAttribute('title'), 'New Translation', 'reinitialized with new label'); + }); + + QUnit.test('elements without data-tooltip-label are ignored', function(assert) { + assert.expect(1); + + this.$fixture.append(''); + + window.groupOrderShop._initTooltips(); + + var btnNoLabel = document.getElementById('test-btn-no-label'); + var title = btnNoLabel.getAttribute('title'); + + assert.ok(!title || title === '', 'button without data-tooltip-label has no title'); + }); + + QUnit.test('querySelectorAll finds all tooltip elements', function(assert) { + assert.expect(1); + + var tooltipElements = document.querySelectorAll('[data-tooltip-label]'); + + // We have 3 buttons with data-tooltip-label + assert.equal(tooltipElements.length, 3, 'finds all 3 elements with data-tooltip-label'); + }); + + QUnit.test('labels survive JSON serialization', function(assert) { + assert.expect(2); + + var labels = window.groupOrderShop.labels; + var serialized = JSON.stringify(labels); + var deserialized = JSON.parse(serialized); + + assert.ok(serialized, 'labels can be serialized to JSON'); + assert.deepEqual(deserialized, labels, 'deserialized labels match original'); + }); + + QUnit.test('empty labels object does not break initialization', function(assert) { + assert.expect(1); + + window.groupOrderShop.labels = {}; + + try { + window.groupOrderShop._initTooltips(); + assert.ok(true, 'initialization with empty labels does not throw error'); + } catch (e) { + assert.ok(false, 'initialization threw error: ' + e.message); + } + }); + }); return {}; }); diff --git a/website_sale_aplicoop/tests/COBERTURA_TESTS_ANALISIS.md b/website_sale_aplicoop/tests/COBERTURA_TESTS_ANALISIS.md index 5f881c9..360d1aa 100644 --- a/website_sale_aplicoop/tests/COBERTURA_TESTS_ANALISIS.md +++ b/website_sale_aplicoop/tests/COBERTURA_TESTS_ANALISIS.md @@ -1,7 +1,7 @@ # Análisis de Cobertura de Tests - website_sale_aplicoop -**Fecha**: 11 de febrero de 2026 -**Estado**: ✅ **ACTUALIZADO** - Tests de pricing agregados +**Fecha**: 11 de febrero de 2026 +**Estado**: ✅ **ACTUALIZADO** - Tests de pricing agregados **Última actualización**: Sistema de precios completamente cubierto (16 nuevos tests) --- @@ -310,7 +310,7 @@ Sistema de precios: 0% coverage (CRÍTICO) Sistema de precios: ~95% coverage (✅ RESUELTO) ``` -**Tiempo invertido**: ~2 horas +**Tiempo invertido**: ~2 horas **ROI**: Alto - Se cubrió funcionalidad crítica de cálculo de precios --- @@ -343,7 +343,7 @@ Si se necesita más cobertura, priorizar en este orden: --- -**Conclusión Final**: +**Conclusión Final**: ✅ **El sistema de precios está completamente testeado y producción-ready.** diff --git a/website_sale_aplicoop/tests/PHASE3_TEST_SUMMARY.md b/website_sale_aplicoop/tests/PHASE3_TEST_SUMMARY.md deleted file mode 100644 index 58bb46e..0000000 --- a/website_sale_aplicoop/tests/PHASE3_TEST_SUMMARY.md +++ /dev/null @@ -1,257 +0,0 @@ -# Phase 3 Test Suite - Implementation Summary - -## Overview - -Implementation of comprehensive test suite for Phase 3 refactoring of `confirm_eskaera()` method in website_sale_aplicoop addon. - -## File Created - -- **File**: `test_phase3_confirm_eskaera.py` -- **Lines**: 671 -- **Test Classes**: 4 -- **Test Methods**: 24 -- **Assertions**: 61 -- **Docstrings**: 29 - -## Test Classes - -### 1. TestValidateConfirmJson (5 tests) - -Tests for `_validate_confirm_json()` helper method. - -- `test_validate_confirm_json_success`: Validates successful JSON parsing and validation -- `test_validate_confirm_json_missing_order_id`: Tests error handling for missing order_id -- `test_validate_confirm_json_order_not_exists`: Tests error for non-existent orders -- `test_validate_confirm_json_no_items`: Tests error when cart is empty -- `test_validate_confirm_json_with_delivery_flag`: Validates is_delivery flag handling - -**Coverage**: 100% of validation logic including success and error paths - -### 2. TestProcessCartItems (5 tests) - -Tests for `_process_cart_items()` helper method. - -- `test_process_cart_items_success`: Validates successful cart item processing -- `test_process_cart_items_uses_list_price_fallback`: Tests fallback to product.list_price when price=0 -- `test_process_cart_items_skips_invalid_product`: Tests handling of non-existent products -- `test_process_cart_items_empty_after_filtering`: Tests error when no valid items remain -- `test_process_cart_items_translates_product_name`: Validates product name translation - -**Coverage**: Item processing, error handling, price fallbacks, translation - -### 3. TestBuildConfirmationMessage (11 tests) - -Tests for `_build_confirmation_message()` helper method. - -#### Message Generation -- `test_build_confirmation_message_pickup`: Tests pickup message generation -- `test_build_confirmation_message_delivery`: Tests delivery message generation -- `test_build_confirmation_message_no_dates`: Tests handling when no dates are set -- `test_build_confirmation_message_formats_date`: Validates DD/MM/YYYY date format - -#### Multi-Language Support (7 languages) -- `test_build_confirmation_message_multilang_es`: Spanish (es_ES) -- `test_build_confirmation_message_multilang_eu`: Basque (eu_ES) -- `test_build_confirmation_message_multilang_ca`: Catalan (ca_ES) -- `test_build_confirmation_message_multilang_gl`: Galician (gl_ES) -- `test_build_confirmation_message_multilang_pt`: Portuguese (pt_PT) -- `test_build_confirmation_message_multilang_fr`: French (fr_FR) -- `test_build_confirmation_message_multilang_it`: Italian (it_IT) - -**Coverage**: Message building, date handling, multi-language support - -### 4. TestConfirmEskaera_Integration (3 tests) - -Integration tests for the complete `confirm_eskaera()` flow. - -- `test_confirm_eskaera_full_flow_pickup`: Tests complete pickup order flow -- `test_confirm_eskaera_full_flow_delivery`: Tests complete delivery order flow -- `test_confirm_eskaera_updates_existing_draft`: Tests updating existing draft orders - -**Coverage**: End-to-end validation → processing → confirmation - -## Helper Methods Covered - -### _validate_confirm_json(data) - -**Purpose**: Validate JSON request data for confirm_eskaera - -**Tests**: -- ✅ Successful validation with all required fields -- ✅ Error handling for missing order_id -- ✅ Error handling for non-existent orders -- ✅ Error handling for empty cart -- ✅ Delivery flag (is_delivery) handling - -**Coverage**: 5 tests, all success and error paths - -### _process_cart_items(items, group_order) - -**Purpose**: Process cart items into sale.order line data - -**Tests**: -- ✅ Successful processing of valid items -- ✅ Fallback to list_price when product_price=0 -- ✅ Skipping invalid/non-existent products -- ✅ Error when no valid items remain -- ✅ Product name translation in user's language - -**Coverage**: 5 tests, item processing, error handling, translations - -### _build_confirmation_message(sale_order, group_order, is_delivery) - -**Purpose**: Build localized confirmation messages - -**Tests**: -- ✅ Pickup message generation -- ✅ Delivery message generation -- ✅ Handling missing dates -- ✅ Date formatting (DD/MM/YYYY) -- ✅ Multi-language support (7 languages) - -**Coverage**: 11 tests, message building, date handling, i18n - -## Features Validated - -### Request Validation -- ✓ JSON parsing and validation -- ✓ Order existence verification -- ✓ User authentication check -- ✓ Cart content validation -- ✓ Delivery flag handling - -### Cart Processing -- ✓ Product existence validation -- ✓ Quantity and price handling -- ✓ Price fallback to list_price -- ✓ Invalid product skipping -- ✓ Product name translation -- ✓ sale.order line creation - -### Message Building -- ✓ Base message construction -- ✓ Order reference inclusion -- ✓ Pickup vs delivery differentiation -- ✓ Date formatting (DD/MM/YYYY) -- ✓ Day name translation -- ✓ Multi-language support (ES, EU, CA, GL, PT, FR, IT) - -### Integration Flow -- ✓ Complete pickup order flow -- ✓ Complete delivery order flow -- ✓ Draft order update (not duplicate) -- ✓ Commitment date setting -- ✓ sale.order confirmation - -## Quality Checks - -### Code Quality -- ✅ Python syntax validation -- ✅ Pre-commit hooks (all passed): - - autoflake - - black - - isort - - flake8 - - pylint (optional) - - pylint (mandatory) - -### Code Style -- ✅ OCA guidelines compliance -- ✅ PEP 8 formatting -- ✅ Proper docstrings (29 total) -- ✅ Clear test method names -- ✅ Comprehensive assertions (61 total) - -## Test Execution - -### Run Tests via Docker - -```bash -# Update addon and run tests -docker-compose exec -T odoo odoo -d odoo \ - --test-enable --stop-after-init \ - -i website_sale_aplicoop - -# Or update without stopping -docker-compose exec -T odoo odoo -d odoo \ - -u website_sale_aplicoop --test-enable -``` - -### Run Specific Test Class - -```bash -# Run only Phase 3 tests -docker-compose exec -T odoo python3 -m pytest \ - /mnt/extra-addons/website_sale_aplicoop/tests/test_phase3_confirm_eskaera.py \ - -v -``` - -## Complete Test Suite Metrics - -### Phase 1: test_helper_methods_phase1.py -- Classes: 3 -- Methods: 18 -- Lines: 354 - -### Phase 2: test_phase2_eskaera_shop.py -- Classes: 4 -- Methods: 11 -- Lines: 286 - -### Phase 3: test_phase3_confirm_eskaera.py -- Classes: 4 -- Methods: 24 -- Lines: 671 - -### Total Metrics -- **Test Files**: 3 -- **Test Classes**: 11 -- **Test Methods**: 53 -- **Total Lines**: 1,311 -- **Total Assertions**: 61+ (Phase 3 only) - -## Git Commit - -``` -Branch: feature/refactor-cyclomatic-complexity -Commit: eb6b53d -Message: [ADD] website_sale_aplicoop: Phase 3 test suite implementation -Files: +669 insertions, 1 file changed -``` - -## Refactoring Impact - -### Code Metrics -- **Total Helpers Created**: 6 (across 3 phases) -- **Total Lines Saved**: 277 (-26%) -- **C901 Improvements**: - - `eskaera_shop`: 42 → 33 (-21.4%) - - `confirm_eskaera`: 47 → 24 (-48.9%) - -### Test Coverage -- **Phase 1**: 3 helpers, 18 tests -- **Phase 2**: eskaera_shop refactoring, 11 tests -- **Phase 3**: confirm_eskaera refactoring, 24 tests - -## Next Steps - -1. **Execute Tests**: Run tests in Docker environment to validate -2. **Code Review**: Review and approve feature branch -3. **Merge**: Merge to development branch -4. **Deploy**: Deploy to staging/production -5. **Monitor**: Monitor production logs for any issues - -## Status - -✅ **IMPLEMENTATION COMPLETE** -✅ **QUALITY CHECKS PASSED** -✅ **READY FOR CODE REVIEW** -✅ **PRODUCTION READY** - ---- - -**Created**: 2026-02-16 -**Author**: Criptomart -**Addon**: website_sale_aplicoop -**Odoo Version**: 18.0 -**License**: AGPL-3.0 diff --git a/website_sale_aplicoop/tests/test_date_calculations.py b/website_sale_aplicoop/tests/test_date_calculations.py index 98190c6..ec6aa1b 100644 --- a/website_sale_aplicoop/tests/test_date_calculations.py +++ b/website_sale_aplicoop/tests/test_date_calculations.py @@ -1,31 +1,26 @@ # Copyright 2026 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from datetime import timedelta +from datetime import datetime, timedelta -from odoo import fields -from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase -from odoo.tests.common import tagged +from odoo import fields -@tagged("post_install", "date_calculations") class TestDateCalculations(TransactionCase): - """Test suite for date calculation methods in group.order model.""" + '''Test suite for date calculation methods in group.order model.''' def setUp(self): super().setUp() # Create a test group - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - "email": "group@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + 'email': 'group@test.com', + }) def test_compute_pickup_date_basic(self): - """Test pickup_date calculation returns next occurrence of pickup day.""" + '''Test pickup_date calculation returns next occurrence of pickup day.''' # Use today as reference and calculate next Tuesday today = fields.Date.today() # Find next Sunday (weekday 6) from today @@ -34,18 +29,16 @@ class TestDateCalculations(TransactionCase): start_date = today else: start_date = today + timedelta(days=days_until_sunday) - + # Create order with pickup_day = Tuesday (1), starting on Sunday # NO cutoff_day to avoid dependency on cutoff_date - order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start_date, # Sunday - "pickup_day": "1", # Tuesday - "cutoff_day": False, # Disable to avoid cutoff_date interference - } - ) + order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': start_date, # Sunday + 'pickup_day': '1', # Tuesday + 'cutoff_day': False, # Disable to avoid cutoff_date interference + }) # Force computation order._compute_pickup_date() @@ -55,11 +48,11 @@ class TestDateCalculations(TransactionCase): self.assertEqual( order.pickup_date, expected_date, - f"Expected {expected_date}, got {order.pickup_date}", + f"Expected {expected_date}, got {order.pickup_date}" ) def test_compute_pickup_date_same_day(self): - """Test pickup_date when start_date is same weekday as pickup_day.""" + '''Test pickup_date when start_date is same weekday as pickup_day.''' # Find next Tuesday from today today = fields.Date.today() days_until_tuesday = (1 - today.weekday()) % 7 @@ -67,16 +60,14 @@ class TestDateCalculations(TransactionCase): start_date = today else: start_date = today + timedelta(days=days_until_tuesday) - + # Start on Tuesday, pickup also Tuesday - should return next week's Tuesday - order = self.env["group.order"].create( - { - "name": "Test Order Same Day", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start_date, # Tuesday - "pickup_day": "1", # Tuesday - } - ) + order = self.env['group.order'].create({ + 'name': 'Test Order Same Day', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': start_date, # Tuesday + 'pickup_day': '1', # Tuesday + }) order._compute_pickup_date() @@ -85,15 +76,13 @@ class TestDateCalculations(TransactionCase): self.assertEqual(order.pickup_date, expected_date) def test_compute_pickup_date_no_start_date(self): - """Test pickup_date calculation when no start_date is set.""" - order = self.env["group.order"].create( - { - "name": "Test Order No Start", - "group_ids": [(6, 0, [self.group.id])], - "start_date": False, - "pickup_day": "1", # Tuesday - } - ) + '''Test pickup_date calculation when no start_date is set.''' + order = self.env['group.order'].create({ + 'name': 'Test Order No Start', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': False, + 'pickup_day': '1', # Tuesday + }) order._compute_pickup_date() @@ -104,43 +93,32 @@ class TestDateCalculations(TransactionCase): self.assertEqual(order.pickup_date.weekday(), 1) # 1 = Tuesday def test_compute_pickup_date_without_pickup_day(self): - """Test pickup_date is None when pickup_day is not set.""" - order = self.env["group.order"].create( - { - "name": "Test Order No Pickup Day", - "group_ids": [(6, 0, [self.group.id])], - "start_date": fields.Date.today(), - "pickup_day": False, - } - ) + '''Test pickup_date is None when pickup_day is not set.''' + order = self.env['group.order'].create({ + 'name': 'Test Order No Pickup Day', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': fields.Date.today(), + 'pickup_day': False, + }) order._compute_pickup_date() # In Odoo, computed Date fields return False (not None) when no value self.assertFalse(order.pickup_date) def test_compute_pickup_date_all_weekdays(self): - """Test pickup_date calculation for each day of the week.""" - base_date = fields.Date.from_string("2026-02-02") # Monday + '''Test pickup_date calculation for each day of the week.''' + base_date = fields.Date.from_string('2026-02-02') # Monday for day_num in range(7): - day_name = [ - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - "Sunday", - ][day_num] + day_name = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', + 'Friday', 'Saturday', 'Sunday'][day_num] - order = self.env["group.order"].create( - { - "name": f"Test Order {day_name}", - "group_ids": [(6, 0, [self.group.id])], - "start_date": base_date, - "pickup_day": str(day_num), - } - ) + order = self.env['group.order'].create({ + 'name': f'Test Order {day_name}', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': base_date, + 'pickup_day': str(day_num), + }) order._compute_pickup_date() @@ -148,14 +126,14 @@ class TestDateCalculations(TransactionCase): self.assertEqual( order.pickup_date.weekday(), day_num, - f"Pickup date weekday should be {day_num} ({day_name})", + f"Pickup date weekday should be {day_num} ({day_name})" ) # Verify it's after start_date self.assertGreater(order.pickup_date, base_date) def test_compute_delivery_date_basic(self): - """Test delivery_date is pickup_date + 1 day.""" + '''Test delivery_date is pickup_date + 1 day.''' # Find next Sunday from today today = fields.Date.today() days_until_sunday = (6 - today.weekday()) % 7 @@ -163,15 +141,13 @@ class TestDateCalculations(TransactionCase): start_date = today else: start_date = today + timedelta(days=days_until_sunday) - - order = self.env["group.order"].create( - { - "name": "Test Delivery Date", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start_date, # Sunday - "pickup_day": "1", # Tuesday = start_date + 2 days - } - ) + + order = self.env['group.order'].create({ + 'name': 'Test Delivery Date', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': start_date, # Sunday + 'pickup_day': '1', # Tuesday = start_date + 2 days + }) order._compute_pickup_date() order._compute_delivery_date() @@ -183,15 +159,13 @@ class TestDateCalculations(TransactionCase): self.assertEqual(order.delivery_date, expected_delivery) def test_compute_delivery_date_without_pickup(self): - """Test delivery_date is None when pickup_date is not set.""" - order = self.env["group.order"].create( - { - "name": "Test No Delivery", - "group_ids": [(6, 0, [self.group.id])], - "start_date": fields.Date.today(), - "pickup_day": False, # No pickup day = no pickup_date - } - ) + '''Test delivery_date is None when pickup_date is not set.''' + order = self.env['group.order'].create({ + 'name': 'Test No Delivery', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': fields.Date.today(), + 'pickup_day': False, # No pickup day = no pickup_date + }) order._compute_pickup_date() order._compute_delivery_date() @@ -200,17 +174,15 @@ class TestDateCalculations(TransactionCase): self.assertFalse(order.delivery_date) def test_compute_cutoff_date_basic(self): - """Test cutoff_date calculation returns next occurrence of cutoff day.""" + '''Test cutoff_date calculation returns next occurrence of cutoff day.''' # Create order with cutoff_day = Sunday (6) # If today is Sunday, cutoff should be today (days_ahead = 0 is allowed) - order = self.env["group.order"].create( - { - "name": "Test Cutoff Date", - "group_ids": [(6, 0, [self.group.id])], - "start_date": fields.Date.from_string("2026-02-01"), # Sunday - "cutoff_day": "6", # Sunday - } - ) + order = self.env['group.order'].create({ + 'name': 'Test Cutoff Date', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': fields.Date.from_string('2026-02-01'), # Sunday + 'cutoff_day': '6', # Sunday + }) order._compute_cutoff_date() @@ -221,22 +193,20 @@ class TestDateCalculations(TransactionCase): self.assertEqual(order.cutoff_date.weekday(), 6) # Sunday def test_compute_cutoff_date_without_cutoff_day(self): - """Test cutoff_date is None when cutoff_day is not set.""" - order = self.env["group.order"].create( - { - "name": "Test No Cutoff", - "group_ids": [(6, 0, [self.group.id])], - "start_date": fields.Date.today(), - "cutoff_day": False, - } - ) + '''Test cutoff_date is None when cutoff_day is not set.''' + order = self.env['group.order'].create({ + 'name': 'Test No Cutoff', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': fields.Date.today(), + 'cutoff_day': False, + }) order._compute_cutoff_date() # In Odoo, computed Date fields return False (not None) when no value self.assertFalse(order.cutoff_date) def test_date_dependency_chain(self): - """Test that changing start_date triggers recomputation of date fields.""" + '''Test that changing start_date triggers recomputation of date fields.''' # Find next Sunday from today today = fields.Date.today() days_until_sunday = (6 - today.weekday()) % 7 @@ -244,16 +214,14 @@ class TestDateCalculations(TransactionCase): start_date = today else: start_date = today + timedelta(days=days_until_sunday) - - order = self.env["group.order"].create( - { - "name": "Test Date Chain", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start_date, # Dynamic Sunday - "pickup_day": "6", # Sunday (must be >= cutoff_day) - "cutoff_day": "5", # Saturday - } - ) + + order = self.env['group.order'].create({ + 'name': 'Test Date Chain', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': start_date, # Dynamic Sunday + 'pickup_day': '1', # Tuesday + 'cutoff_day': '6', # Sunday + }) # Get initial dates initial_pickup = order.pickup_date @@ -262,7 +230,7 @@ class TestDateCalculations(TransactionCase): # Change start_date to a week later new_start_date = start_date + timedelta(days=7) - order.write({"start_date": new_start_date}) + order.write({'start_date': new_start_date}) # Verify pickup and delivery dates changed self.assertNotEqual(order.pickup_date, initial_pickup) @@ -274,17 +242,17 @@ class TestDateCalculations(TransactionCase): self.assertEqual(delta.days, 1) def test_pickup_date_no_extra_week_bug(self): - """Regression test: ensure pickup_date doesn't add extra week incorrectly. + '''Regression test: ensure pickup_date doesn't add extra week incorrectly. Bug context: Previously when cutoff_day >= pickup_day numerically, logic incorrectly added 7 extra days even when pickup was already ahead in the calendar. - """ + ''' # Scenario: Pickup Tuesday (1) # Start: Sunday (dynamic) # Expected pickup: Tuesday (2 days later, NOT +9 days) # NOTE: NO cutoff_day to avoid cutoff_date dependency - + # Find next Sunday from today today = fields.Date.today() days_until_sunday = (6 - today.weekday()) % 7 @@ -292,16 +260,14 @@ class TestDateCalculations(TransactionCase): start_date = today else: start_date = today + timedelta(days=days_until_sunday) - - order = self.env["group.order"].create( - { - "name": "Regression Test Extra Week", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start_date, # Sunday (dynamic) - "pickup_day": "1", # Tuesday (numerically < 6) - "cutoff_day": False, # Disable to test pure start_date logic - } - ) + + order = self.env['group.order'].create({ + 'name': 'Regression Test Extra Week', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': start_date, # Sunday (dynamic) + 'pickup_day': '1', # Tuesday (numerically < 6) + 'cutoff_day': False, # Disable to test pure start_date logic + }) order._compute_pickup_date() @@ -310,30 +276,30 @@ class TestDateCalculations(TransactionCase): self.assertEqual( order.pickup_date, expected, - f"Bug detected: pickup_date should be {expected} not {order.pickup_date}", + f"Bug detected: pickup_date should be {expected} not {order.pickup_date}" ) # Verify it's exactly 2 days after start_date delta = order.pickup_date - order.start_date self.assertEqual( - delta.days, 2, "Pickup should be 2 days after Sunday start_date" + delta.days, + 2, + "Pickup should be 2 days after Sunday start_date" ) def test_multiple_orders_same_pickup_day(self): - """Test multiple orders with same pickup day get consistent dates.""" - start = fields.Date.from_string("2026-02-01") - pickup_day = "1" # Tuesday + '''Test multiple orders with same pickup day get consistent dates.''' + start = fields.Date.from_string('2026-02-01') + pickup_day = '1' # Tuesday orders = [] for i in range(3): - order = self.env["group.order"].create( - { - "name": f"Test Order {i}", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start, - "pickup_day": pickup_day, - } - ) + order = self.env['group.order'].create({ + 'name': f'Test Order {i}', + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': start, + 'pickup_day': pickup_day, + }) orders.append(order) # All should have same pickup_date @@ -341,229 +307,5 @@ class TestDateCalculations(TransactionCase): self.assertEqual( len(set(pickup_dates)), 1, - "All orders with same start_date and pickup_day should have same pickup_date", + "All orders with same start_date and pickup_day should have same pickup_date" ) - - # === NEW REGRESSION TESTS (v18.0.1.3.1) === - - def test_cutoff_same_day_as_today_bug_fix(self): - """Regression test: cutoff_date should allow same day as today. - - Bug fixed in v18.0.1.3.1: Previously, if cutoff_day == today.weekday(), - the system would incorrectly add 7 days, scheduling cutoff for next week. - Now cutoff_date can be today if cutoff_day matches today's weekday. - """ - today = fields.Date.today() - cutoff_day = str(today.weekday()) # Same as today - - order = self.env["group.order"].create( - { - "name": "Test Cutoff Today", - "group_ids": [(6, 0, [self.group.id])], - "start_date": today, - "cutoff_day": cutoff_day, - "period": "weekly", - } - ) - - # cutoff_date should be TODAY, not next week - self.assertEqual( - order.cutoff_date, - today, - f"Expected cutoff_date={today} (today), got {order.cutoff_date}. " - "Cutoff should be allowed on the same day.", - ) - - def test_delivery_date_stored_correctly(self): - """Regression test: delivery_date must be stored in database. - - Bug fixed in v18.0.1.3.1: delivery_date had store=False, causing - inconsistent values and inability to search/filter by this field. - Now delivery_date is stored (store=True). - """ - today = fields.Date.today() - # Set pickup for next Monday - days_until_monday = (0 - today.weekday()) % 7 - if days_until_monday == 0: - days_until_monday = 7 - start_date = today + timedelta(days=days_until_monday - 1) - - order = self.env["group.order"].create( - { - "name": "Test Delivery Stored", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start_date, - "pickup_day": "0", # Monday - "period": "weekly", - } - ) - - # Force computation - order._compute_pickup_date() - order._compute_delivery_date() - - expected_delivery = order.pickup_date + timedelta(days=1) - self.assertEqual( - order.delivery_date, - expected_delivery, - f"Expected delivery_date={expected_delivery}, got {order.delivery_date}", - ) - - # Verify it's stored: read from database - order_from_db = self.env["group.order"].browse(order.id) - self.assertEqual( - order_from_db.delivery_date, - expected_delivery, - "delivery_date should be persisted in database (store=True)", - ) - - def test_constraint_cutoff_before_pickup_invalid(self): - """Test constraint: pickup_day must be >= cutoff_day for weekly orders. - - New constraint in v18.0.1.3.1: For weekly orders, if pickup_day < cutoff_day - numerically, it creates an illogical scenario where pickup would be - scheduled before cutoff in the same week cycle. - """ - today = fields.Date.today() - - # Invalid configuration: pickup (Tuesday=1) < cutoff (Thursday=3) - with self.assertRaises( - ValidationError, - msg="Should raise ValidationError for pickup_day < cutoff_day", - ): - self.env["group.order"].create( - { - "name": "Invalid Order", - "group_ids": [(6, 0, [self.group.id])], - "start_date": today, - "cutoff_day": "3", # Thursday - "pickup_day": "1", # Tuesday (BEFORE Thursday) - "period": "weekly", - } - ) - - def test_constraint_cutoff_before_pickup_valid(self): - """Test constraint allows valid configurations. - - Valid scenarios: - - pickup_day > cutoff_day: pickup is after cutoff ✓ - - pickup_day == cutoff_day: same day allowed ✓ - """ - today = fields.Date.today() - - # Valid: pickup (Saturday=5) > cutoff (Tuesday=1) - order1 = self.env["group.order"].create( - { - "name": "Valid Order 1", - "group_ids": [(6, 0, [self.group.id])], - "start_date": today, - "cutoff_day": "1", # Tuesday - "pickup_day": "5", # Saturday (AFTER Tuesday) - "period": "weekly", - } - ) - self.assertTrue(order1.id, "Valid configuration should create order") - - # Valid: pickup == cutoff (same day) - order2 = self.env["group.order"].create( - { - "name": "Valid Order 2", - "group_ids": [(6, 0, [self.group.id])], - "start_date": today, - "cutoff_day": "5", # Saturday - "pickup_day": "5", # Saturday (SAME DAY) - "period": "weekly", - } - ) - self.assertTrue(order2.id, "Same day configuration should be allowed") - - def test_all_weekday_combinations_consistency(self): - """Test that all valid weekday combinations produce consistent results. - - This regression test ensures the date calculation logic works correctly - for all 49 combinations of start_date × pickup_day (7 × 7). - """ - today = fields.Date.today() - errors = [] - - for start_offset in range(7): # 7 possible start days - start_date = today + timedelta(days=start_offset) - - for pickup_weekday in range(7): # 7 possible pickup days - order = self.env["group.order"].create( - { - "name": f"Test S{start_offset}P{pickup_weekday}", - "group_ids": [(6, 0, [self.group.id])], - "start_date": start_date, - "pickup_day": str(pickup_weekday), - "period": "weekly", - } - ) - - # Validate pickup_date is set - if not order.pickup_date: - errors.append( - f"start_offset={start_offset}, pickup_day={pickup_weekday}: " - f"pickup_date is None" - ) - continue - - # Validate pickup_date is in the future or today - if order.pickup_date < start_date: - errors.append( - f"start_offset={start_offset}, pickup_day={pickup_weekday}: " - f"pickup_date {order.pickup_date} < start_date {start_date}" - ) - - # Validate pickup_date weekday matches pickup_day - if order.pickup_date.weekday() != pickup_weekday: - errors.append( - f"start_offset={start_offset}, pickup_day={pickup_weekday}: " - f"pickup_date weekday is {order.pickup_date.weekday()}, " - f"expected {pickup_weekday}" - ) - - self.assertEqual( - len(errors), - 0, - f"Found {len(errors)} errors in weekday combinations:\n" - + "\n".join(errors), - ) - - def test_cron_update_dates_executes(self): - """Test that cron job method executes without errors. - - New feature in v18.0.1.3.1: Daily cron job to recalculate dates - for active orders to keep them up-to-date as time passes. - """ - today = fields.Date.today() - - # Create multiple orders in different states - orders = [] - for i, state in enumerate(["draft", "open", "closed"]): - order = self.env["group.order"].create( - { - "name": f"Test Cron Order {state}", - "group_ids": [(6, 0, [self.group.id])], - "start_date": today, - "pickup_day": str((i + 1) % 7), - "cutoff_day": str(i % 7), - "period": "weekly", - "state": state, - } - ) - orders.append(order) - - # Execute cron method (should not raise errors) - try: - self.env["group.order"]._cron_update_dates() - except Exception as e: - self.fail(f"Cron method raised exception: {e}") - - # Verify dates are still valid for active orders - active_orders = [o for o in orders if o.state in ["draft", "open"]] - for order in active_orders: - self.assertIsNotNone( - order.pickup_date, - f"Pickup date should be set for active order {order.name}", - ) diff --git a/website_sale_aplicoop/tests/test_draft_persistence.py b/website_sale_aplicoop/tests/test_draft_persistence.py index e862e9c..44563ba 100644 --- a/website_sale_aplicoop/tests/test_draft_persistence.py +++ b/website_sale_aplicoop/tests/test_draft_persistence.py @@ -13,8 +13,7 @@ Coverage: - Draft timeline (very old draft, recent draft) """ -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta from odoo.tests.common import TransactionCase @@ -24,117 +23,91 @@ class TestSaveDraftOrder(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) + self.category = self.env['product.category'].create({ + 'name': 'Test Category', + }) - self.product1 = self.env["product.product"].create( - { - "name": "Product 1", - "type": "consu", - "list_price": 10.0, - "categ_id": self.category.id, - } - ) + self.product1 = self.env['product.product'].create({ + 'name': 'Product 1', + 'type': 'consu', + 'list_price': 10.0, + 'categ_id': self.category.id, + }) - self.product2 = self.env["product.product"].create( - { - "name": "Product 2", - "type": "consu", - "list_price": 20.0, - "categ_id": self.category.id, - } - ) + self.product2 = self.env['product.product'].create({ + 'name': 'Product 2', + 'type': 'consu', + 'list_price': 20.0, + 'categ_id': self.category.id, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "pickup_date": start_date + timedelta(days=3), - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'pickup_date': start_date + timedelta(days=3), + 'cutoff_day': '0', + }) self.group_order.action_open() self.group_order.product_ids = [(4, self.product1.id), (4, self.product2.id)] def test_save_draft_with_items(self): """Test saving draft order with products.""" - draft_order = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [ - ( - 0, - 0, - { - "product_id": self.product1.id, - "product_qty": 2, - "price_unit": self.product1.list_price, - }, - ), - ( - 0, - 0, - { - "product_id": self.product2.id, - "product_qty": 1, - "price_unit": self.product2.list_price, - }, - ), - ], - } - ) + draft_order = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + 'order_line': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_qty': 2, + 'price_unit': self.product1.list_price, + }), + (0, 0, { + 'product_id': self.product2.id, + 'product_qty': 1, + 'price_unit': self.product2.list_price, + }), + ], + }) self.assertTrue(draft_order.exists()) - self.assertEqual(draft_order.state, "draft") + self.assertEqual(draft_order.state, 'draft') self.assertEqual(len(draft_order.order_line), 2) def test_save_draft_empty_order(self): """Test saving draft order without items.""" # Edge case: empty draft - empty_draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [], - } - ) + empty_draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + 'order_line': [], + }) # Should be valid (user hasn't added products yet) self.assertTrue(empty_draft.exists()) @@ -143,23 +116,15 @@ class TestSaveDraftOrder(TransactionCase): def test_save_draft_updates_existing(self): """Test that saving draft updates existing draft, not creates new.""" # Create initial draft - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [ - ( - 0, - 0, - { - "product_id": self.product1.id, - "product_qty": 1, - }, - ) - ], - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + 'order_line': [(0, 0, { + 'product_id': self.product1.id, + 'product_qty': 1, + })], + }) draft_id = draft.id @@ -167,33 +132,29 @@ class TestSaveDraftOrder(TransactionCase): draft.order_line[0].product_qty = 5 # Should be same draft, not new one - updated_draft = self.env["sale.order"].browse(draft_id) + updated_draft = self.env['sale.order'].browse(draft_id) self.assertTrue(updated_draft.exists()) self.assertEqual(updated_draft.order_line[0].product_qty, 5) def test_save_draft_preserves_group_order_reference(self): """Test that group_order_id is preserved when saving.""" - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + }) # Link must be preserved self.assertEqual(draft.group_order_id, self.group_order) def test_save_draft_preserves_pickup_date(self): """Test that pickup_date is preserved in draft.""" - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_date": self.group_order.pickup_date, - "state": "draft", - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_date': self.group_order.pickup_date, + 'state': 'draft', + }) self.assertEqual(draft.pickup_date, self.group_order.pickup_date) @@ -203,83 +164,63 @@ class TestLoadDraftOrder(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 10.0, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 10.0, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.group_order.action_open() def test_load_existing_draft(self): """Test loading an existing draft order.""" # Create draft - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [ - ( - 0, - 0, - { - "product_id": self.product.id, - "product_qty": 3, - }, - ) - ], - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + 'order_line': [(0, 0, { + 'product_id': self.product.id, + 'product_qty': 3, + })], + }) # Load it - loaded = self.env["sale.order"].search( - [ - ("id", "=", draft.id), - ("partner_id", "=", self.member_partner.id), - ("state", "=", "draft"), - ] - ) + loaded = self.env['sale.order'].search([ + ('id', '=', draft.id), + ('partner_id', '=', self.member_partner.id), + ('state', '=', 'draft'), + ]) self.assertEqual(len(loaded), 1) self.assertEqual(loaded[0].order_line[0].product_qty, 3) @@ -287,37 +228,29 @@ class TestLoadDraftOrder(TransactionCase): def test_load_draft_not_visible_to_other_user(self): """Test that draft from one user not accessible to another.""" # Create draft for member_partner - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + }) # Create another user/partner - other_partner = self.env["res.partner"].create( - { - "name": "Other Member", - "email": "other@test.com", - } - ) + other_partner = self.env['res.partner'].create({ + 'name': 'Other Member', + 'email': 'other@test.com', + }) - other_user = self.env["res.users"].create( - { - "name": "Other User", - "login": "other@test.com", - "partner_id": other_partner.id, - } - ) + other_user = self.env['res.users'].create({ + 'name': 'Other User', + 'login': 'other@test.com', + 'partner_id': other_partner.id, + }) # Other user should not see original draft - other_drafts = self.env["sale.order"].search( - [ - ("id", "=", draft.id), - ("partner_id", "=", other_partner.id), - ] - ) + other_drafts = self.env['sale.order'].search([ + ('id', '=', draft.id), + ('partner_id', '=', other_partner.id), + ]) self.assertEqual(len(other_drafts), 0) @@ -327,16 +260,14 @@ class TestLoadDraftOrder(TransactionCase): self.group_order.action_close() # Create draft before closure (simulated) - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + }) # Draft should still be loadable (but should warn) - loaded = self.env["sale.order"].browse(draft.id) + loaded = self.env['sale.order'].browse(draft.id) self.assertTrue(loaded.exists()) # Controller should check: group_order.state and warn if closed @@ -346,51 +277,41 @@ class TestDraftConsistency(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 100.0, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 100.0, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.group_order.action_open() def test_draft_price_snapshot(self): @@ -398,24 +319,16 @@ class TestDraftConsistency(TransactionCase): original_price = self.product.list_price # Save draft with current price - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [ - ( - 0, - 0, - { - "product_id": self.product.id, - "product_qty": 1, - "price_unit": original_price, - }, - ) - ], - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + 'order_line': [(0, 0, { + 'product_id': self.product.id, + 'product_qty': 1, + 'price_unit': original_price, + })], + }) saved_price = draft.order_line[0].price_unit @@ -429,26 +342,18 @@ class TestDraftConsistency(TransactionCase): def test_draft_quantity_consistency(self): """Test that quantities are preserved across saves.""" # Save draft - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [ - ( - 0, - 0, - { - "product_id": self.product.id, - "product_qty": 5, - }, - ) - ], - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + 'order_line': [(0, 0, { + 'product_id': self.product.id, + 'product_qty': 5, + })], + }) # Re-load draft - reloaded = self.env["sale.order"].browse(draft.id) + reloaded = self.env['sale.order'].browse(draft.id) self.assertEqual(reloaded.order_line[0].product_qty, 5) @@ -457,80 +362,62 @@ class TestProductArchivedInDraft(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 10.0, - "active": True, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 10.0, + 'active': True, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.group_order.action_open() def test_load_draft_with_archived_product(self): """Test loading draft when product has been archived.""" # Create draft with active product - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [ - ( - 0, - 0, - { - "product_id": self.product.id, - "product_qty": 2, - }, - ) - ], - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + 'order_line': [(0, 0, { + 'product_id': self.product.id, + 'product_qty': 2, + })], + }) # Archive the product self.product.active = False # Load draft - should still work (historical data) - loaded = self.env["sale.order"].browse(draft.id) + loaded = self.env['sale.order'].browse(draft.id) self.assertTrue(loaded.exists()) # But product may not be editable/accessible @@ -540,128 +427,108 @@ class TestDraftTimeline(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 10.0, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 10.0, + }) def test_draft_from_current_week(self): """Test draft from current/open group order.""" start_date = datetime.now().date() - current_order = self.env["group.order"].create( - { - "name": "Current Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + current_order = self.env['group.order'].create({ + 'name': 'Current Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) current_order.action_open() - draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": current_order.id, - "state": "draft", - } - ) + draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': current_order.id, + 'state': 'draft', + }) # Should be accessible and valid self.assertTrue(draft.exists()) - self.assertEqual(draft.group_order_id.state, "open") + self.assertEqual(draft.group_order_id.state, 'open') def test_draft_from_old_order_6_months_ago(self): """Test draft from order that was 6 months ago.""" old_start = datetime.now().date() - timedelta(days=180) old_end = old_start + timedelta(days=7) - old_order = self.env["group.order"].create( - { - "name": "Old Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": old_start, - "end_date": old_end, - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + old_order = self.env['group.order'].create({ + 'name': 'Old Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': old_start, + 'end_date': old_end, + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) old_order.action_open() old_order.action_close() - old_draft = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": old_order.id, - "state": "draft", - } - ) + old_draft = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': old_order.id, + 'state': 'draft', + }) # Should still exist but be inaccessible (order closed) self.assertTrue(old_draft.exists()) - self.assertEqual(old_order.state, "closed") + self.assertEqual(old_order.state, 'closed') def test_draft_order_count_for_user(self): """Test counting total drafts for a user.""" # Create multiple orders and drafts orders = [] for i in range(3): - start = datetime.now().date() + timedelta(days=i * 7) - order = self.env["group.order"].create( - { - "name": f"Order {i}", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": start + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + start = datetime.now().date() + timedelta(days=i*7) + order = self.env['group.order'].create({ + 'name': f'Order {i}', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': start + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) order.action_open() orders.append(order) # Create draft for each for order in orders: - self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": order.id, - "state": "draft", - } - ) + self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': order.id, + 'state': 'draft', + }) # Count drafts for user - user_drafts = self.env["sale.order"].search( - [ - ("partner_id", "=", self.member_partner.id), - ("state", "=", "draft"), - ] - ) + user_drafts = self.env['sale.order'].search([ + ('partner_id', '=', self.member_partner.id), + ('state', '=', 'draft'), + ]) self.assertEqual(len(user_drafts), 3) diff --git a/website_sale_aplicoop/tests/test_edge_cases.py b/website_sale_aplicoop/tests/test_edge_cases.py index bcacf48..53d7d8c 100644 --- a/website_sale_aplicoop/tests/test_edge_cases.py +++ b/website_sale_aplicoop/tests/test_edge_cases.py @@ -13,13 +13,11 @@ Coverage: - Extreme dates (year 1900, year 2099) """ -from datetime import date -from datetime import timedelta - +from datetime import datetime, timedelta, date from dateutil.relativedelta import relativedelta -from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase +from odoo.exceptions import ValidationError class TestLeapYearHandling(TransactionCase): @@ -27,12 +25,10 @@ class TestLeapYearHandling(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) def test_order_spans_leap_day(self): """Test order that includes Feb 29 (leap year).""" @@ -40,18 +36,16 @@ class TestLeapYearHandling(TransactionCase): start = date(2024, 2, 25) end = date(2024, 3, 3) # Spans Feb 29 - order = self.env["group.order"].create( - { - "name": "Leap Year Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "2", # Wednesday (Feb 28 or 29 depending on week) - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Leap Year Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '2', # Wednesday (Feb 28 or 29 depending on week) + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # Should correctly calculate pickup date @@ -63,18 +57,16 @@ class TestLeapYearHandling(TransactionCase): start = date(2024, 2, 26) # Monday end = date(2024, 3, 3) - order = self.env["group.order"].create( - { - "name": "Feb 29 Pickup", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "3", # Thursday = Feb 29 - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Feb 29 Pickup', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '3', # Thursday = Feb 29 + 'cutoff_day': '0', + }) self.assertEqual(order.pickup_date, date(2024, 2, 29)) @@ -84,18 +76,16 @@ class TestLeapYearHandling(TransactionCase): start = date(2023, 2, 25) end = date(2023, 3, 3) - order = self.env["group.order"].create( - { - "name": "Non-Leap Year Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "2", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Non-Leap Year Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '2', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # Pickup should be Feb 28 (last day of Feb) @@ -107,30 +97,26 @@ class TestLongDurationOrders(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) def test_order_spans_entire_year(self): """Test order running for 365 days.""" start = date(2024, 1, 1) end = date(2024, 12, 31) - order = self.env["group.order"].create( - { - "name": "Year-Long Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "3", # Same day each week - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Year-Long Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '3', # Same day each week + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # Should handle 52+ weeks correctly @@ -142,18 +128,16 @@ class TestLongDurationOrders(TransactionCase): start = date(2024, 1, 1) end = date(2026, 12, 31) # 3 years - order = self.env["group.order"].create( - { - "name": "Multi-Year Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "monthly", - "pickup_day": "15", - "cutoff_day": "10", - } - ) + order = self.env['group.order'].create({ + 'name': 'Multi-Year Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'monthly', + 'pickup_day': '15', + 'cutoff_day': '10', + }) self.assertTrue(order.exists()) days_diff = (end - start).days @@ -163,18 +147,16 @@ class TestLongDurationOrders(TransactionCase): """Test order with start_date == end_date (single day).""" same_day = date(2024, 2, 15) - order = self.env["group.order"].create( - { - "name": "One-Day Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "once", - "start_date": same_day, - "end_date": same_day, - "period": "once", - "pickup_day": "0", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'One-Day Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'once', + 'start_date': same_day, + 'end_date': same_day, + 'period': 'once', + 'pickup_day': '0', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) @@ -184,12 +166,10 @@ class TestPickupDayBoundary(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) def test_pickup_day_same_as_start_date(self): """Test when pickup_day equals start date (today).""" @@ -197,18 +177,16 @@ class TestPickupDayBoundary(TransactionCase): start = today end = today + timedelta(days=7) - order = self.env["group.order"].create( - { - "name": "Today Pickup", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": str(start.weekday()), # Same as start - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Today Pickup', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': str(start.weekday()), # Same as start + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # Pickup should be today @@ -220,18 +198,16 @@ class TestPickupDayBoundary(TransactionCase): start = date(2024, 1, 24) end = date(2024, 2, 1) - order = self.env["group.order"].create( - { - "name": "Month-End Pickup", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "once", - "pickup_day": "2", # Wednesday = Jan 31 - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Month-End Pickup', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'once', + 'pickup_day': '2', # Wednesday = Jan 31 + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) @@ -241,18 +217,16 @@ class TestPickupDayBoundary(TransactionCase): start = date(2024, 1, 28) end = date(2024, 2, 5) - order = self.env["group.order"].create( - { - "name": "Month Boundary Pickup", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "4", # Friday (Feb 2) - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Month Boundary Pickup', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '4', # Friday (Feb 2) + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # Pickup should be in Feb @@ -264,18 +238,16 @@ class TestPickupDayBoundary(TransactionCase): end = date(2024, 1, 8) for day_num in range(7): - order = self.env["group.order"].create( - { - "name": f"Pickup Day {day_num}", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": str(day_num), - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': f'Pickup Day {day_num}', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': str(day_num), + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # Each should have valid pickup_date @@ -287,12 +259,10 @@ class TestFutureStartDateOrders(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) def test_order_starts_tomorrow(self): """Test order starting tomorrow.""" @@ -300,18 +270,16 @@ class TestFutureStartDateOrders(TransactionCase): start = today + timedelta(days=1) end = start + timedelta(days=7) - order = self.env["group.order"].create( - { - "name": "Future Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Future Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) self.assertGreater(order.start_date, today) @@ -322,18 +290,16 @@ class TestFutureStartDateOrders(TransactionCase): start = today + relativedelta(months=6) end = start + timedelta(days=30) - order = self.env["group.order"].create( - { - "name": "Far Future Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "monthly", - "pickup_day": "15", - "cutoff_day": "10", - } - ) + order = self.env['group.order'].create({ + 'name': 'Far Future Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'monthly', + 'pickup_day': '15', + 'cutoff_day': '10', + }) self.assertTrue(order.exists()) @@ -343,30 +309,26 @@ class TestExtremeDate(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) def test_order_year_2000(self): """Test order in year 2000 (Y2K edge case).""" start = date(2000, 1, 1) end = date(2000, 12, 31) - order = self.env["group.order"].create( - { - "name": "Y2K Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Y2K Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) @@ -375,18 +337,16 @@ class TestExtremeDate(TransactionCase): start = date(2099, 1, 1) end = date(2099, 12, 31) - order = self.env["group.order"].create( - { - "name": "Far Future Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Far Future Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) @@ -395,18 +355,16 @@ class TestExtremeDate(TransactionCase): start = date(1999, 12, 26) end = date(2000, 1, 2) - order = self.env["group.order"].create( - { - "name": "Century Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "6", # Saturday - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Century Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '6', # Saturday + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # Should handle date arithmetic correctly across years @@ -419,29 +377,25 @@ class TestOrderWithoutEndDate(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) def test_permanent_order_with_null_end_date(self): """Test order with end_date = NULL (ongoing order).""" start = date.today() - order = self.env["group.order"].create( - { - "name": "Permanent Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": False, # No end date - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Permanent Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': False, # No end date + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) # If supported, should handle gracefully # Otherwise, may be optional validation @@ -452,12 +406,10 @@ class TestPickupCalculationAccuracy(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) def test_pickup_date_calculation_multiple_weeks(self): """Test pickup_date calculation over multiple weeks.""" @@ -465,18 +417,16 @@ class TestPickupCalculationAccuracy(TransactionCase): start = date(2024, 1, 1) end = date(2024, 1, 22) - order = self.env["group.order"].create( - { - "name": "Multi-Week Pickup", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "weekly", - "pickup_day": "3", # Thursday - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Multi-Week Pickup', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'weekly', + 'pickup_day': '3', # Thursday + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) # First pickup should be first Thursday on or after start @@ -488,18 +438,16 @@ class TestPickupCalculationAccuracy(TransactionCase): start = date(2024, 2, 1) end = date(2024, 3, 31) - order = self.env["group.order"].create( - { - "name": "Monthly Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start, - "end_date": end, - "period": "monthly", - "pickup_day": "15", - "cutoff_day": "10", - } - ) + order = self.env['group.order'].create({ + 'name': 'Monthly Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start, + 'end_date': end, + 'period': 'monthly', + 'pickup_day': '15', + 'cutoff_day': '10', + }) self.assertTrue(order.exists()) # First pickup should be Feb 15 diff --git a/website_sale_aplicoop/tests/test_endpoints.py b/website_sale_aplicoop/tests/test_endpoints.py index d7a7e50..1c2c1ab 100644 --- a/website_sale_aplicoop/tests/test_endpoints.py +++ b/website_sale_aplicoop/tests/test_endpoints.py @@ -16,13 +16,11 @@ Coverage: - /eskaera/labels (GET) - Get translated labels """ -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta +import json -from odoo.exceptions import AccessError -from odoo.exceptions import ValidationError -from odoo.tests.common import HttpCase -from odoo.tests.common import TransactionCase +from odoo.tests.common import TransactionCase, HttpCase +from odoo.exceptions import ValidationError, AccessError class TestEskaearaListEndpoint(TransactionCase): @@ -30,75 +28,63 @@ class TestEskaearaListEndpoint(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - "email": "group@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + 'email': 'group@test.com', + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) # Create multiple group orders (some open, some closed) start_date = datetime.now().date() - self.open_order = self.env["group.order"].create( - { - "name": "Open Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.open_order = self.env['group.order'].create({ + 'name': 'Open Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.open_order.action_open() - self.draft_order = self.env["group.order"].create( - { - "name": "Draft Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date - timedelta(days=14), - "end_date": start_date - timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.draft_order = self.env['group.order'].create({ + 'name': 'Draft Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date - timedelta(days=14), + 'end_date': start_date - timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) # Stay in draft - self.closed_order = self.env["group.order"].create( - { - "name": "Closed Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date - timedelta(days=21), - "end_date": start_date - timedelta(days=14), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.closed_order = self.env['group.order'].create({ + 'name': 'Closed Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date - timedelta(days=21), + 'end_date': start_date - timedelta(days=14), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.closed_order.action_open() self.closed_order.action_close() @@ -106,12 +92,10 @@ class TestEskaearaListEndpoint(TransactionCase): """Test that /eskaera shows only open/draft orders, not closed.""" # In controller context, only open and draft should be visible to members # This is business logic: closed orders are historical - visible_orders = self.env["group.order"].search( - [ - ("state", "in", ["open", "draft"]), - ("group_ids", "in", self.group.id), - ] - ) + visible_orders = self.env['group.order'].search([ + ('state', 'in', ['open', 'draft']), + ('group_ids', 'in', self.group.id), + ]) self.assertIn(self.open_order, visible_orders) self.assertIn(self.draft_order, visible_orders) @@ -119,36 +103,30 @@ class TestEskaearaListEndpoint(TransactionCase): def test_eskaera_list_filters_by_user_groups(self): """Test that user only sees orders from their groups.""" - other_group = self.env["res.partner"].create( - { - "name": "Other Group", - "is_company": True, - "email": "other@test.com", - } - ) + other_group = self.env['res.partner'].create({ + 'name': 'Other Group', + 'is_company': True, + 'email': 'other@test.com', + }) - other_order = self.env["group.order"].create( - { - "name": "Other Group Order", - "group_ids": [(6, 0, [other_group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + other_order = self.env['group.order'].create({ + 'name': 'Other Group Order', + 'group_ids': [(6, 0, [other_group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) other_order.action_open() # User should not see orders from groups they're not in user_groups = self.member_partner.group_ids - visible_orders = self.env["group.order"].search( - [ - ("state", "in", ["open", "draft"]), - ("group_ids", "in", user_groups.ids), - ] - ) + visible_orders = self.env['group.order'].search([ + ('state', 'in', ['open', 'draft']), + ('group_ids', 'in', user_groups.ids), + ]) self.assertNotIn(other_order, visible_orders) @@ -158,75 +136,61 @@ class TestAddToCartEndpoint(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - "email": "group@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + 'email': 'group@test.com', + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) + self.category = self.env['product.category'].create({ + 'name': 'Test Category', + }) # Published product - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 10.0, - "categ_id": self.category.id, - "sale_ok": True, - "is_published": True, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 10.0, + 'categ_id': self.category.id, + 'sale_ok': True, + 'is_published': True, + }) # Unpublished product (should not be available) - self.unpublished_product = self.env["product.product"].create( - { - "name": "Unpublished Product", - "type": "consu", - "list_price": 15.0, - "categ_id": self.category.id, - "sale_ok": False, - "is_published": False, - } - ) + self.unpublished_product = self.env['product.product'].create({ + 'name': 'Unpublished Product', + 'type': 'consu', + 'list_price': 15.0, + 'categ_id': self.category.id, + 'sale_ok': False, + 'is_published': False, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) self.group_order.action_open() self.group_order.product_ids = [(4, self.product.id)] @@ -234,13 +198,13 @@ class TestAddToCartEndpoint(TransactionCase): """Test adding published product to cart.""" # Simulate controller logic cart_line = { - "product_id": self.product.id, - "quantity": 2, - "group_order_id": self.group_order.id, - "partner_id": self.member_partner.id, + 'product_id': self.product.id, + 'quantity': 2, + 'group_order_id': self.group_order.id, + 'partner_id': self.member_partner.id, } # Should succeed - self.assertTrue(cart_line["product_id"]) + self.assertTrue(cart_line['product_id']) def test_add_to_cart_zero_quantity(self): """Test that adding zero quantity is rejected.""" @@ -264,13 +228,11 @@ class TestAddToCartEndpoint(TransactionCase): def test_add_to_cart_product_not_in_order(self): """Test that products not in the order cannot be added.""" # Create a product NOT associated with group_order - other_product = self.env["product.product"].create( - { - "name": "Other Product", - "type": "consu", - "list_price": 25.0, - } - ) + other_product = self.env['product.product'].create({ + 'name': 'Other Product', + 'type': 'consu', + 'list_price': 25.0, + }) # Controller should check: product in group_order.product_ids self.assertNotIn(other_product, self.group_order.product_ids) @@ -279,7 +241,7 @@ class TestAddToCartEndpoint(TransactionCase): """Test that adding to closed order is rejected.""" self.group_order.action_close() # Controller should check: order.state == 'open' - self.assertEqual(self.group_order.state, "closed") + self.assertEqual(self.group_order.state, 'closed') class TestCheckoutEndpoint(TransactionCase): @@ -287,46 +249,38 @@ class TestCheckoutEndpoint(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - "email": "group@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + 'email': 'group@test.com', + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "pickup_date": start_date + timedelta(days=3), - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'pickup_date': start_date + timedelta(days=3), + 'cutoff_day': '0', + }) self.group_order.action_open() def test_checkout_page_loads(self): @@ -347,18 +301,16 @@ class TestCheckoutEndpoint(TransactionCase): def test_checkout_order_without_products(self): """Test checkout when no products available.""" # Order with empty product_ids - empty_order = self.env["group.order"].create( - { - "name": "Empty Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + empty_order = self.env['group.order'].create({ + 'name': 'Empty Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) empty_order.action_open() # Should handle gracefully @@ -370,115 +322,95 @@ class TestConfirmOrderEndpoint(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - "email": "group@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + 'email': 'group@test.com', + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) + self.category = self.env['product.category'].create({ + 'name': 'Test Category', + }) - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 10.0, - "categ_id": self.category.id, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 10.0, + 'categ_id': self.category.id, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "pickup_date": start_date + timedelta(days=3), - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'pickup_date': start_date + timedelta(days=3), + 'cutoff_day': '0', + }) self.group_order.action_open() self.group_order.product_ids = [(4, self.product.id)] # Create a draft sale order - self.draft_sale = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_date": self.group_order.pickup_date, - "state": "draft", - } - ) + self.draft_sale = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_date': self.group_order.pickup_date, + 'state': 'draft', + }) def test_confirm_order_creates_sale_order(self): """Test that confirming creates a confirmed sale.order.""" # Controller should change state from draft to sale self.draft_sale.action_confirm() - self.assertEqual(self.draft_sale.state, "sale") + self.assertEqual(self.draft_sale.state, 'sale') def test_confirm_empty_order(self): """Test confirming order without items fails.""" # Order with no order_lines should fail - empty_sale = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - } - ) + empty_sale = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + }) # Should validate: must have at least one line self.assertEqual(len(empty_sale.order_line), 0) def test_confirm_order_wrong_group(self): """Test that user cannot confirm order from different group.""" - other_group = self.env["res.partner"].create( - { - "name": "Other Group", - "is_company": True, - } - ) + other_group = self.env['res.partner'].create({ + 'name': 'Other Group', + 'is_company': True, + }) - other_order = self.env["group.order"].create( - { - "name": "Other Order", - "group_ids": [(6, 0, [other_group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + other_order = self.env['group.order'].create({ + 'name': 'Other Order', + 'group_ids': [(6, 0, [other_group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) # User should not be in other_group self.assertNotIn(self.member_partner, other_group.member_ids) @@ -489,94 +421,76 @@ class TestLoadDraftEndpoint(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - "email": "group@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + 'email': 'group@test.com', + }) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member', + 'email': 'member@test.com', + }) self.group.member_ids = [(4, self.member_partner.id)] - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) + self.category = self.env['product.category'].create({ + 'name': 'Test Category', + }) - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 10.0, - "categ_id": self.category.id, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 10.0, + 'categ_id': self.category.id, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "pickup_date": start_date + timedelta(days=3), - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'pickup_date': start_date + timedelta(days=3), + 'cutoff_day': '0', + }) self.group_order.action_open() self.group_order.product_ids = [(4, self.product.id)] def test_load_draft_from_history(self): """Test loading a previous draft order.""" # Create old draft sale - old_sale = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - } - ) + old_sale = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + }) # Should be able to load self.assertTrue(old_sale.exists()) def test_load_draft_not_owned_by_user(self): """Test that user cannot load draft from other user.""" - other_partner = self.env["res.partner"].create( - { - "name": "Other Member", - "email": "other@test.com", - } - ) + other_partner = self.env['res.partner'].create({ + 'name': 'Other Member', + 'email': 'other@test.com', + }) - other_sale = self.env["sale.order"].create( - { - "partner_id": other_partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - } - ) + other_sale = self.env['sale.order'].create({ + 'partner_id': other_partner.id, + 'group_order_id': self.group_order.id, + 'state': 'draft', + }) # User should not be able to load other's draft self.assertNotEqual(other_sale.partner_id, self.member_partner) @@ -586,28 +500,24 @@ class TestLoadDraftEndpoint(TransactionCase): old_start = datetime.now().date() - timedelta(days=30) old_end = datetime.now().date() - timedelta(days=23) - expired_order = self.env["group.order"].create( - { - "name": "Expired Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": old_start, - "end_date": old_end, - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + expired_order = self.env['group.order'].create({ + 'name': 'Expired Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': old_start, + 'end_date': old_end, + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) expired_order.action_open() expired_order.action_close() - old_sale = self.env["sale.order"].create( - { - "partner_id": self.member_partner.id, - "group_order_id": expired_order.id, - "state": "draft", - } - ) + old_sale = self.env['sale.order'].create({ + 'partner_id': self.member_partner.id, + 'group_order_id': expired_order.id, + 'state': 'draft', + }) # Should warn: order expired - self.assertEqual(expired_order.state, "closed") + self.assertEqual(expired_order.state, 'closed') diff --git a/website_sale_aplicoop/tests/test_eskaera_shop.py b/website_sale_aplicoop/tests/test_eskaera_shop.py index f46dfbe..88b0ae9 100644 --- a/website_sale_aplicoop/tests/test_eskaera_shop.py +++ b/website_sale_aplicoop/tests/test_eskaera_shop.py @@ -1,158 +1,127 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta from odoo.tests.common import TransactionCase class TestEskaerShop(TransactionCase): - """Test suite para la lógica de eskaera_shop (descubrimiento de productos).""" + '''Test suite para la lógica de eskaera_shop (descubrimiento de productos).''' def setUp(self): super().setUp() # Crear un grupo (res.partner) - self.group = self.env["res.partner"].create( - { - "name": "Grupo Test Eskaera", - "is_company": True, - "email": "grupo@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Grupo Test Eskaera', + 'is_company': True, + 'email': 'grupo@test.com', + }) # Crear usuario miembro del grupo - user_partner = self.env["res.partner"].create( - { - "name": "Usuario Test Partner", - "email": "usuario_test@test.com", - } - ) + user_partner = self.env['res.partner'].create({ + 'name': 'Usuario Test Partner', + 'email': 'usuario_test@test.com', + }) - self.user = self.env["res.users"].create( - { - "name": "Usuario Test", - "login": "usuario_test@test.com", - "email": "usuario_test@test.com", - "partner_id": user_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Usuario Test', + 'login': 'usuario_test@test.com', + 'email': 'usuario_test@test.com', + 'partner_id': user_partner.id, + }) # Añadir el partner del usuario como miembro del grupo self.group.member_ids = [(4, user_partner.id)] # Crear categorías de producto - self.category1 = self.env["product.category"].create( - { - "name": "Categoría Test 1", - } - ) + self.category1 = self.env['product.category'].create({ + 'name': 'Categoría Test 1', + }) - self.category2 = self.env["product.category"].create( - { - "name": "Categoría Test 2", - } - ) + self.category2 = self.env['product.category'].create({ + 'name': 'Categoría Test 2', + }) # Crear proveedor - self.supplier = self.env["res.partner"].create( - { - "name": "Proveedor Test", - "is_company": True, - "supplier_rank": 1, - "email": "proveedor@test.com", - } - ) + self.supplier = self.env['res.partner'].create({ + 'name': 'Proveedor Test', + 'is_company': True, + 'supplier_rank': 1, + 'email': 'proveedor@test.com', + }) # Crear productos - self.product_cat1 = self.env["product.product"].create( - { - "name": "Producto Categoría 1", - "type": "consu", - "list_price": 10.0, - "categ_id": self.category1.id, - "active": True, - } - ) - self.product_cat1.product_tmpl_id.write( - { - "is_published": True, - "sale_ok": True, - } - ) + self.product_cat1 = self.env['product.product'].create({ + 'name': 'Producto Categoría 1', + 'type': 'consu', + 'list_price': 10.0, + 'categ_id': self.category1.id, + 'active': True, + }) + self.product_cat1.product_tmpl_id.write({ + 'is_published': True, + 'sale_ok': True, + }) - self.product_cat2 = self.env["product.product"].create( - { - "name": "Producto Categoría 2", - "type": "consu", - "list_price": 20.0, - "categ_id": self.category2.id, - "active": True, - } - ) - self.product_cat2.product_tmpl_id.write( - { - "is_published": True, - "sale_ok": True, - } - ) + self.product_cat2 = self.env['product.product'].create({ + 'name': 'Producto Categoría 2', + 'type': 'consu', + 'list_price': 20.0, + 'categ_id': self.category2.id, + 'active': True, + }) + self.product_cat2.product_tmpl_id.write({ + 'is_published': True, + 'sale_ok': True, + }) # Crear producto con relación a proveedor - self.product_supplier_template = self.env["product.template"].create( - { - "name": "Producto Proveedor", - "type": "consu", - "list_price": 30.0, - "categ_id": self.category1.id, - "is_published": True, - "sale_ok": True, - } - ) + self.product_supplier_template = self.env['product.template'].create({ + 'name': 'Producto Proveedor', + 'type': 'consu', + 'list_price': 30.0, + 'categ_id': self.category1.id, + 'is_published': True, + 'sale_ok': True, + }) self.product_supplier = self.product_supplier_template.product_variant_ids[0] self.product_supplier.active = True # Crear relación con proveedor - self.env["product.supplierinfo"].create( - { - "product_tmpl_id": self.product_supplier_template.id, - "partner_id": self.supplier.id, - "min_qty": 1.0, - } - ) + self.env['product.supplierinfo'].create({ + 'product_tmpl_id': self.product_supplier_template.id, + 'partner_id': self.supplier.id, + 'min_qty': 1.0, + }) - self.product_direct = self.env["product.product"].create( - { - "name": "Producto Directo", - "type": "consu", - "list_price": 40.0, - "categ_id": self.category1.id, - "active": True, - } - ) - self.product_direct.product_tmpl_id.write( - { - "is_published": True, - "sale_ok": True, - } - ) + self.product_direct = self.env['product.product'].create({ + 'name': 'Producto Directo', + 'type': 'consu', + 'list_price': 40.0, + 'categ_id': self.category1.id, + 'active': True, + }) + self.product_direct.product_tmpl_id.write({ + 'is_published': True, + 'sale_ok': True, + }) def test_product_discovery_direct(self): - """Test que los productos directos se descubren correctamente.""" - order = self.env["group.order"].create( - { - "name": "Pedido Directo", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "product_ids": [(6, 0, [self.product_direct.id])], - } - ) + '''Test que los productos directos se descubren correctamente.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Directo', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'product_ids': [(6, 0, [self.product_direct.id])], + }) order.action_open() @@ -162,124 +131,96 @@ class TestEskaerShop(TransactionCase): self.assertEqual(len(products), 1) self.assertIn(self.product_direct, products) - products = self.env["product.product"]._get_products_for_group_order(order.id) - self.assertIn( - self.product_direct.product_tmpl_id, products.mapped("product_tmpl_id") - ) + products = self.env['product.product']._get_products_for_group_order(order.id) + self.assertIn(self.product_direct.product_tmpl_id, products.mapped('product_tmpl_id')) def test_product_discovery_by_category(self): - """Test que los productos se descubren por categoría cuando no hay directos.""" - order = self.env["group.order"].create( - { - "name": "Pedido por Categoría", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "category_ids": [(6, 0, [self.category1.id])], - } - ) + '''Test que los productos se descubren por categoría cuando no hay directos.''' + order = self.env['group.order'].create({ + 'name': 'Pedido por Categoría', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'category_ids': [(6, 0, [self.category1.id])], + }) order.action_open() # Simular lo que hace eskaera_shop (fallback a categorías) products = order.product_ids if not products: - products = self.env["product.product"].search( - [ - ("categ_id", "in", order.category_ids.ids), - ] - ) + products = self.env['product.product'].search([ + ('categ_id', 'in', order.category_ids.ids), + ]) # Debe incluir todos los productos de la categoría 1 self.assertGreaterEqual(len(products), 2) - self.assertIn( - self.product_cat1.product_tmpl_id, products.mapped("product_tmpl_id") - ) - self.assertIn( - self.product_supplier.product_tmpl_id, products.mapped("product_tmpl_id") - ) - self.assertIn( - self.product_direct.product_tmpl_id, products.mapped("product_tmpl_id") - ) + self.assertIn(self.product_cat1.product_tmpl_id, products.mapped('product_tmpl_id')) + self.assertIn(self.product_supplier.product_tmpl_id, products.mapped('product_tmpl_id')) + self.assertIn(self.product_direct.product_tmpl_id, products.mapped('product_tmpl_id')) - order.write({"category_ids": [(4, self.category1.id)]}) - products = self.env["product.product"]._get_products_for_group_order(order.id) - self.assertIn( - self.product_cat1.product_tmpl_id, products.mapped("product_tmpl_id") - ) - self.assertNotIn( - self.product_cat2.product_tmpl_id, products.mapped("product_tmpl_id") - ) + order.write({'category_ids': [(4, self.category1.id)]}) + products = self.env['product.product']._get_products_for_group_order(order.id) + self.assertIn(self.product_cat1.product_tmpl_id, products.mapped('product_tmpl_id')) + self.assertNotIn(self.product_cat2.product_tmpl_id, products.mapped('product_tmpl_id')) def test_product_discovery_by_supplier(self): - """Test que los productos se descubren por proveedor cuando no hay directos ni categorías.""" - order = self.env["group.order"].create( - { - "name": "Pedido por Proveedor", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "supplier_ids": [(6, 0, [self.supplier.id])], - } - ) + '''Test que los productos se descubren por proveedor cuando no hay directos ni categorías.''' + order = self.env['group.order'].create({ + 'name': 'Pedido por Proveedor', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'supplier_ids': [(6, 0, [self.supplier.id])], + }) order.action_open() # Simular lo que hace eskaera_shop (fallback a proveedores) products = order.product_ids if not products and order.category_ids: - products = self.env["product.product"].search( - [ - ("categ_id", "in", order.category_ids.ids), - ] - ) + products = self.env['product.product'].search([ + ('categ_id', 'in', order.category_ids.ids), + ]) if not products and order.supplier_ids: # Buscar productos que tienen estos proveedores en seller_ids - product_templates = self.env["product.template"].search( - [ - ("seller_ids.partner_id", "in", order.supplier_ids.ids), - ] - ) - products = product_templates.mapped("product_variant_ids") + product_templates = self.env['product.template'].search([ + ('seller_ids.partner_id', 'in', order.supplier_ids.ids), + ]) + products = product_templates.mapped('product_variant_ids') # Debe incluir el producto del proveedor self.assertEqual(len(products), 1) - self.assertIn( - self.product_supplier.product_tmpl_id, products.mapped("product_tmpl_id") - ) + self.assertIn(self.product_supplier.product_tmpl_id, products.mapped('product_tmpl_id')) - order.write({"supplier_ids": [(4, self.supplier.id)]}) - products = self.env["product.product"]._get_products_for_group_order(order.id) - self.assertIn( - self.product_supplier.product_tmpl_id, products.mapped("product_tmpl_id") - ) + order.write({'supplier_ids': [(4, self.supplier.id)]}) + products = self.env['product.product']._get_products_for_group_order(order.id) + self.assertIn(self.product_supplier.product_tmpl_id, products.mapped('product_tmpl_id')) def test_product_discovery_priority(self): - """Test que la prioridad de descubrimiento es: directos > categorías > proveedores.""" - order = self.env["group.order"].create( - { - "name": "Pedido con Todos", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "product_ids": [(6, 0, [self.product_direct.id])], - "category_ids": [(6, 0, [self.category1.id, self.category2.id])], - "supplier_ids": [(6, 0, [self.supplier.id])], - } - ) + '''Test que la prioridad de descubrimiento es: directos > categorías > proveedores.''' + order = self.env['group.order'].create({ + 'name': 'Pedido con Todos', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'product_ids': [(6, 0, [self.product_direct.id])], + 'category_ids': [(6, 0, [self.category1.id, self.category2.id])], + 'supplier_ids': [(6, 0, [self.supplier.id])], + }) order.action_open() @@ -288,122 +229,94 @@ class TestEskaerShop(TransactionCase): # Debe retornar los productos directos, no los de categoría/proveedor self.assertEqual(len(products), 1) - self.assertIn( - self.product_direct.product_tmpl_id, products.mapped("product_tmpl_id") - ) - self.assertNotIn( - self.product_cat1.product_tmpl_id, products.mapped("product_tmpl_id") - ) - self.assertNotIn( - self.product_cat2.product_tmpl_id, products.mapped("product_tmpl_id") - ) - self.assertNotIn( - self.product_supplier.product_tmpl_id, products.mapped("product_tmpl_id") - ) + self.assertIn(self.product_direct.product_tmpl_id, products.mapped('product_tmpl_id')) + self.assertNotIn(self.product_cat1.product_tmpl_id, products.mapped('product_tmpl_id')) + self.assertNotIn(self.product_cat2.product_tmpl_id, products.mapped('product_tmpl_id')) + self.assertNotIn(self.product_supplier.product_tmpl_id, products.mapped('product_tmpl_id')) # 2. The canonical helper now returns the UNION of all association # sources (direct products, categories, suppliers). Assert all are # present to reflect the new behaviour. - products = self.env["product.product"]._get_products_for_group_order(order.id) - tmpl_ids = products.mapped("product_tmpl_id") + products = self.env['product.product']._get_products_for_group_order(order.id) + tmpl_ids = products.mapped('product_tmpl_id') self.assertIn(self.product_direct.product_tmpl_id, tmpl_ids) self.assertIn(self.product_cat1.product_tmpl_id, tmpl_ids) self.assertIn(self.product_supplier.product_tmpl_id, tmpl_ids) def test_product_discovery_fallback_from_category_to_supplier(self): - """Test que si no hay directos ni categorías, usa proveedores.""" - order = self.env["group.order"].create( - { - "name": "Pedido Fallback", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - # Sin product_ids - # Sin category_ids - "supplier_ids": [(6, 0, [self.supplier.id])], - } - ) + '''Test que si no hay directos ni categorías, usa proveedores.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Fallback', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + # Sin product_ids + # Sin category_ids + 'supplier_ids': [(6, 0, [self.supplier.id])], + }) order.action_open() # Simular lo que hace eskaera_shop products = order.product_ids if not products and order.category_ids: - products = self.env["product.product"].search( - [ - ("categ_id", "in", order.category_ids.ids), - ] - ) + products = self.env['product.product'].search([ + ('categ_id', 'in', order.category_ids.ids), + ]) if not products and order.supplier_ids: # Buscar productos que tienen estos proveedores en seller_ids - product_templates = self.env["product.template"].search( - [ - ("seller_ids.partner_id", "in", order.supplier_ids.ids), - ] - ) - products = product_templates.mapped("product_variant_ids") + product_templates = self.env['product.template'].search([ + ('seller_ids.partner_id', 'in', order.supplier_ids.ids), + ]) + products = product_templates.mapped('product_variant_ids') # Debe retornar productos del proveedor self.assertEqual(len(products), 1) - self.assertIn( - self.product_supplier.product_tmpl_id, products.mapped("product_tmpl_id") - ) + self.assertIn(self.product_supplier.product_tmpl_id, products.mapped('product_tmpl_id')) # Clear categories so supplier-only fallback remains active - order.write( - { - "category_ids": [(5, 0, 0)], - "supplier_ids": [(4, self.supplier.id)], - } - ) - products = self.env["product.product"]._get_products_for_group_order(order.id) - self.assertIn( - self.product_supplier.product_tmpl_id, products.mapped("product_tmpl_id") - ) - self.assertNotIn( - self.product_direct.product_tmpl_id, products.mapped("product_tmpl_id") - ) + order.write({ + 'category_ids': [(5, 0, 0)], + 'supplier_ids': [(4, self.supplier.id)], + }) + products = self.env['product.product']._get_products_for_group_order(order.id) + self.assertIn(self.product_supplier.product_tmpl_id, products.mapped('product_tmpl_id')) + self.assertNotIn(self.product_direct.product_tmpl_id, products.mapped('product_tmpl_id')) def test_no_products_available(self): - """Test que retorna vacío si no hay productos definidos de ninguna forma.""" - order = self.env["group.order"].create( - { - "name": "Pedido Sin Productos", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - # Sin product_ids, category_ids, supplier_ids - } - ) + '''Test que retorna vacío si no hay productos definidos de ninguna forma.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Sin Productos', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + # Sin product_ids, category_ids, supplier_ids + }) order.action_open() # Simular lo que hace eskaera_shop products = order.product_ids if not products and order.category_ids: - products = self.env["product.product"].search( - [ - ("categ_id", "in", order.category_ids.ids), - ] - ) + products = self.env['product.product'].search([ + ('categ_id', 'in', order.category_ids.ids), + ]) if not products and order.supplier_ids: # Buscar productos que tienen estos proveedores en seller_ids - product_templates = self.env["product.template"].search( - [ - ("seller_ids.partner_id", "in", order.supplier_ids.ids), - ] - ) - products = product_templates.mapped("product_variant_ids") + product_templates = self.env['product.template'].search([ + ('seller_ids.partner_id', 'in', order.supplier_ids.ids), + ]) + products = product_templates.mapped('product_variant_ids') # Debe estar vacío self.assertEqual(len(products), 0) diff --git a/website_sale_aplicoop/tests/test_group_order.py b/website_sale_aplicoop/tests/test_group_order.py index ec8b502..4b71869 100644 --- a/website_sale_aplicoop/tests/test_group_order.py +++ b/website_sale_aplicoop/tests/test_group_order.py @@ -1,354 +1,310 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta -from psycopg2 import IntegrityError - -from odoo import fields -from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase +from odoo.exceptions import ValidationError +from psycopg2 import IntegrityError +from odoo import fields class TestGroupOrder(TransactionCase): - """Test suite para el modelo group.order.""" + '''Test suite para el modelo group.order.''' def setUp(self): super().setUp() # Crear un grupo (res.partner) - self.group = self.env["res.partner"].create( - { - "name": "Grupo Test", - "is_company": True, - "email": "grupo@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Grupo Test', + 'is_company': True, + 'email': 'grupo@test.com', + }) # Crear productos - self.product1 = self.env["product.product"].create( - { - "name": "Producto Test 1", - "type": "consu", - "list_price": 10.0, - } - ) + self.product1 = self.env['product.product'].create({ + 'name': 'Producto Test 1', + 'type': 'consu', + 'list_price': 10.0, + }) - self.product2 = self.env["product.product"].create( - { - "name": "Producto Test 2", - "type": "consu", - "list_price": 20.0, - } - ) + self.product2 = self.env['product.product'].create({ + 'name': 'Producto Test 2', + 'type': 'consu', + 'list_price': 20.0, + }) def test_create_group_order(self): - """Test crear un pedido de grupo.""" - order = self.env["group.order"].create( - { - "name": "Pedido Semanal Test", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test crear un pedido de grupo.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Semanal Test', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) - self.assertEqual(order.state, "draft") + self.assertEqual(order.state, 'draft') self.assertIn(self.group, order.group_ids) def test_group_order_dates_validation(self): - """Test that start_date must be before end_date""" + """ Test that start_date must be before end_date """ with self.assertRaises(ValidationError): - self.env["group.order"].create( - { - "name": "Pedido Invalid", - "start_date": fields.Date.today() + timedelta(days=7), - "end_date": fields.Date.today(), - } - ) + self.env['group.order'].create({ + 'name': 'Pedido Invalid', + 'start_date': fields.Date.today() + timedelta(days=7), + 'end_date': fields.Date.today(), + }) def test_group_order_state_transitions(self): - """Test transiciones de estado.""" - order = self.env["group.order"].create( - { - "name": "Pedido State Test", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test transiciones de estado.''' + order = self.env['group.order'].create({ + 'name': 'Pedido State Test', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) # Draft -> Open order.action_open() - self.assertEqual(order.state, "open") + self.assertEqual(order.state, 'open') # Open -> Closed order.action_close() - self.assertEqual(order.state, "closed") + self.assertEqual(order.state, 'closed') def test_group_order_action_cancel(self): - """Test cancelar un pedido.""" - order = self.env["group.order"].create( - { - "name": "Pedido Cancel Test", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test cancelar un pedido.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Cancel Test', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) order.action_cancel() - self.assertEqual(order.state, "cancelled") + self.assertEqual(order.state, 'cancelled') def test_get_active_orders_for_week(self): - """Test obtener pedidos activos para la semana.""" + '''Test obtener pedidos activos para la semana.''' today = datetime.now().date() week_start = today - timedelta(days=today.weekday()) week_end = week_start + timedelta(days=6) # Crear pedido activo esta semana - active_order = self.env["group.order"].create( - { - "name": "Pedido Activo", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": week_start, - "end_date": week_end, - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "state": "open", - } - ) + active_order = self.env['group.order'].create({ + 'name': 'Pedido Activo', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': week_start, + 'end_date': week_end, + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'state': 'open', + }) # Crear pedido inactivo (futuro) - future_order = self.env["group.order"].create( - { - "name": "Pedido Futuro", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": week_end + timedelta(days=1), - "end_date": week_end + timedelta(days=8), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "state": "open", - } - ) + future_order = self.env['group.order'].create({ + 'name': 'Pedido Futuro', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': week_end + timedelta(days=1), + 'end_date': week_end + timedelta(days=8), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'state': 'open', + }) - active_orders = self.env["group.order"].search( - [ - ("state", "=", "open"), - "|", - ("end_date", ">=", week_start), - ("end_date", "=", False), - ("start_date", "<=", week_end), - ] - ) + active_orders = self.env['group.order'].search([ + ('state', '=', 'open'), + '|', + ('end_date', '>=', week_start), + ('end_date', '=', False), + ('start_date', '<=', week_end), + ]) self.assertIn(active_order, active_orders) self.assertNotIn(future_order, active_orders) def test_permanent_group_order(self): - """Test crear un pedido permanente (sin end_date).""" - order = self.env["group.order"].create( - { - "name": "Pedido Permanente", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": False, - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test crear un pedido permanente (sin end_date).''' + order = self.env['group.order'].create({ + 'name': 'Pedido Permanente', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': False, + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) self.assertFalse(order.end_date) def test_get_active_orders_excludes_draft(self): - """Test que get_active_orders_for_week NO incluye pedidos en draft.""" + '''Test que get_active_orders_for_week NO incluye pedidos en draft.''' today = datetime.now().date() # Crear pedido en draft (no abierto) - draft_order = self.env["group.order"].create( - { - "name": "Pedido Draft", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": today, - "end_date": today + timedelta(days=7), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "state": "draft", - } - ) + draft_order = self.env['group.order'].create({ + 'name': 'Pedido Draft', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': today, + 'end_date': today + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'state': 'draft', + }) today = datetime.now().date() week_start = today - timedelta(days=today.weekday()) week_end = week_start + timedelta(days=6) - active_orders = self.env["group.order"].search( - [ - ("state", "=", "open"), - "|", - ("end_date", ">=", week_start), - ("end_date", "=", False), - ("start_date", "<=", week_end), - ] - ) + active_orders = self.env['group.order'].search([ + ('state', '=', 'open'), + '|', + ('end_date', '>=', week_start), + ('end_date', '=', False), + ('start_date', '<=', week_end), + ]) self.assertNotIn(draft_order, active_orders) def test_get_active_orders_excludes_closed(self): - """Test que get_active_orders_for_week NO incluye pedidos cerrados.""" + '''Test que get_active_orders_for_week NO incluye pedidos cerrados.''' today = datetime.now().date() - closed_order = self.env["group.order"].create( - { - "name": "Pedido Cerrado", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": today, - "end_date": today + timedelta(days=7), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "state": "closed", - } - ) + closed_order = self.env['group.order'].create({ + 'name': 'Pedido Cerrado', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': today, + 'end_date': today + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'state': 'closed', + }) today = datetime.now().date() week_start = today - timedelta(days=today.weekday()) week_end = week_start + timedelta(days=6) - active_orders = self.env["group.order"].search( - [ - ("state", "=", "open"), - "|", - ("end_date", ">=", week_start), - ("end_date", "=", False), - ("start_date", "<=", week_end), - ] - ) + active_orders = self.env['group.order'].search([ + ('state', '=', 'open'), + '|', + ('end_date', '>=', week_start), + ('end_date', '=', False), + ('start_date', '<=', week_end), + ]) self.assertNotIn(closed_order, active_orders) def test_get_active_orders_excludes_cancelled(self): - """Test que get_active_orders_for_week NO incluye pedidos cancelados.""" + '''Test que get_active_orders_for_week NO incluye pedidos cancelados.''' today = datetime.now().date() - cancelled_order = self.env["group.order"].create( - { - "name": "Pedido Cancelado", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": today, - "end_date": today + timedelta(days=7), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - "state": "cancelled", - } - ) + cancelled_order = self.env['group.order'].create({ + 'name': 'Pedido Cancelado', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': today, + 'end_date': today + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + 'state': 'cancelled', + }) today = datetime.now().date() week_start = today - timedelta(days=today.weekday()) week_end = week_start + timedelta(days=6) - active_orders = self.env["group.order"].search( - [ - ("state", "=", "open"), - "|", - ("end_date", ">=", week_start), - ("end_date", "=", False), - ("start_date", "<=", week_end), - ] - ) + active_orders = self.env['group.order'].search([ + ('state', '=', 'open'), + '|', + ('end_date', '>=', week_start), + ('end_date', '=', False), + ('start_date', '<=', week_end), + ]) self.assertNotIn(cancelled_order, active_orders) def test_state_transition_draft_to_open(self): - """Test que un pedido pasa de draft a open.""" - order = self.env["group.order"].create( - { - "name": "Pedido Estado Test", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test que un pedido pasa de draft a open.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Estado Test', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) - self.assertEqual(order.state, "draft") + self.assertEqual(order.state, 'draft') order.action_open() - self.assertEqual(order.state, "open") + self.assertEqual(order.state, 'open') def test_state_transition_open_to_closed(self): - """Test transición válida open -> closed.""" - order = self.env["group.order"].create( - { - "name": "Pedido Estado Test", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test transición válida open -> closed.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Estado Test', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) order.action_open() - self.assertEqual(order.state, "open") + self.assertEqual(order.state, 'open') order.action_close() - self.assertEqual(order.state, "closed") + self.assertEqual(order.state, 'closed') def test_state_transition_any_to_cancelled(self): - """Test cancelar desde cualquier estado.""" - order = self.env["group.order"].create( - { - "name": "Pedido Estado Test", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test cancelar desde cualquier estado.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Estado Test', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) # Desde draft order.action_cancel() - self.assertEqual(order.state, "cancelled") + self.assertEqual(order.state, 'cancelled') # Crear otro desde open - order2 = self.env["group.order"].create( - { - "name": "Pedido Estado Test 2", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + order2 = self.env['group.order'].create({ + 'name': 'Pedido Estado Test 2', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) order2.action_open() order2.action_cancel() - self.assertEqual(order2.state, "cancelled") + self.assertEqual(order2.state, 'cancelled') diff --git a/website_sale_aplicoop/tests/test_helper_methods_phase1.py b/website_sale_aplicoop/tests/test_helper_methods_phase1.py deleted file mode 100644 index 9284bb2..0000000 --- a/website_sale_aplicoop/tests/test_helper_methods_phase1.py +++ /dev/null @@ -1,353 +0,0 @@ -# Copyright 2026 Criptomart -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) - -""" -Test suite for Phase 1 refactoring helper methods. - -Tests for extracted helper methods that reduce cyclomatic complexity: -- _resolve_pricelist(): Consolidate pricelist resolution logic -- _validate_confirm_request(): Validate confirm order request -- _validate_draft_request(): Validate draft order request -""" - -from datetime import datetime -from datetime import timedelta - -from odoo.tests.common import TransactionCase - - -class TestResolvePricelist(TransactionCase): - """Test _resolve_pricelist() helper method.""" - - def setUp(self): - super().setUp() - self.pricelist_aplicoop = self.env["product.pricelist"].create( - { - "name": "Aplicoop Pricelist", - "currency_id": self.env.company.currency_id.id, - } - ) - - self.pricelist_website = self.env["product.pricelist"].create( - { - "name": "Website Pricelist", - "currency_id": self.env.company.currency_id.id, - } - ) - - self.website = self.env["website"].get_current_website() - self.website.pricelist_id = self.pricelist_website.id - - def test_resolve_pricelist_aplicoop_configured(self): - """Test pricelist resolution when Aplicoop pricelist is configured.""" - # Set Aplicoop pricelist in config - self.env["ir.config_parameter"].sudo().set_param( - "website_sale_aplicoop.pricelist_id", str(self.pricelist_aplicoop.id) - ) - - # When calling _resolve_pricelist, should return Aplicoop pricelist - # Placeholder: will be implemented with actual controller call - - def test_resolve_pricelist_fallback_to_website(self): - """Test fallback to website pricelist when Aplicoop not configured.""" - # Don't set Aplicoop pricelist in config (leave empty) - self.env["ir.config_parameter"].sudo().set_param( - "website_sale_aplicoop.pricelist_id", "" - ) - - # When calling _resolve_pricelist, should return website pricelist - # Placeholder: will be implemented with actual controller call - - def test_resolve_pricelist_fallback_to_first_active(self): - """Test final fallback to first active pricelist.""" - # Remove both configured pricelists - self.env["ir.config_parameter"].sudo().set_param( - "website_sale_aplicoop.pricelist_id", "" - ) - self.website.pricelist_id = False - - # When calling _resolve_pricelist, should return first active pricelist - # Placeholder: will be implemented with actual controller call - - -class TestValidateConfirmRequest(TransactionCase): - """Test _validate_confirm_request() helper method.""" - - def setUp(self): - super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) - - self.member = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) - self.group.member_ids = [(4, self.member.id)] - - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member.id, - } - ) - - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "product", - "list_price": 100.0, - } - ) - - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(4, self.group.id)], - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "pickup_day": "3", - "cutoff_day": "0", - "state": "open", - } - ) - - def test_validate_confirm_valid_request(self): - """Test validation passes for valid confirm request.""" - _ = { - "order_id": str(self.group_order.id), - "items": [ - { - "product_id": str(self.product.id), - "quantity": 1.0, - "product_price": 100.0, - } - ], - "is_delivery": False, - } - - # Validation should pass without raising exception - # Placeholder: will be implemented with actual controller call - - def test_validate_confirm_missing_order_id(self): - """Test validation fails when order_id missing.""" - _ = { - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError: "order_id is required" - # Placeholder: will be implemented with actual controller call - - def test_validate_confirm_invalid_order_id(self): - """Test validation fails for invalid order_id format.""" - _ = { - "order_id": "invalid", - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError with "Invalid order_id format" - # Placeholder: will be implemented with actual controller call - - def test_validate_confirm_nonexistent_order(self): - """Test validation fails when order doesn't exist.""" - _ = { - "order_id": "99999", - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError with "not found" - # Placeholder: will be implemented with actual controller call - - def test_validate_confirm_closed_order(self): - """Test validation fails when order is closed.""" - self.group_order.state = "confirmed" - - _ = { - "order_id": str(self.group_order.id), - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError with "not available" - # Placeholder: will be implemented with actual controller call - - def test_validate_confirm_no_items(self): - """Test validation fails when no items provided.""" - _ = { - "order_id": str(self.group_order.id), - "items": [], - } - - # Validation should raise ValueError with "No items in cart" - # Placeholder: will be implemented with actual controller call - - def test_validate_confirm_user_no_partner(self): - """Test validation fails when user has no partner_id.""" - _ = self.env["res.users"].create( - { - "name": "User No Partner", - "login": "nopartner@test.com", - "email": "nopartner@test.com", - } - ) - - _ = { - "order_id": str(self.group_order.id), - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError with "no associated partner" - # Placeholder: will be implemented with actual controller call - - -class TestValidateDraftRequest(TransactionCase): - """Test _validate_draft_request() helper method.""" - - def setUp(self): - super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) - - self.member = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) - self.group.member_ids = [(4, self.member.id)] - - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member.id, - } - ) - - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "product", - "list_price": 100.0, - } - ) - - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(4, self.group.id)], - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "pickup_day": "3", - "cutoff_day": "0", - "state": "open", - } - ) - - def test_validate_draft_valid_request(self): - """Test validation passes for valid draft request.""" - _ = { - "order_id": str(self.group_order.id), - "items": [ - { - "product_id": str(self.product.id), - "quantity": 1.0, - "product_price": 100.0, - } - ], - } - - # Validation should pass without raising exception - # Placeholder: will be implemented with actual controller call - - def test_validate_draft_missing_order_id(self): - """Test validation fails when order_id missing.""" - _ = { - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError: "order_id is required" - # Placeholder: will be implemented with actual controller call - - def test_validate_draft_invalid_order_id(self): - """Test validation fails for invalid order_id.""" - _ = { - "order_id": "invalid", - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError with "Invalid order_id format" - # Placeholder: will be implemented with actual controller call - - def test_validate_draft_nonexistent_order(self): - """Test validation fails when order doesn't exist.""" - _ = { - "order_id": "99999", - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError with "not found" - # Placeholder: will be implemented with actual controller call - - def test_validate_draft_no_items(self): - """Test validation fails when no items.""" - _ = { - "order_id": str(self.group_order.id), - "items": [], - } - - # Validation should raise ValueError with "No items in cart" - # Placeholder: will be implemented with actual controller call - - def test_validate_draft_user_no_partner(self): - """Test validation fails when user has no partner.""" - _ = self.env["res.users"].create( - { - "name": "User No Partner", - "login": "nopartner@test.com", - "email": "nopartner@test.com", - } - ) - - _ = { - "order_id": str(self.group_order.id), - "items": [{"product_id": "1", "quantity": 1.0}], - } - - # Validation should raise ValueError with "no associated partner" - # Placeholder: will be implemented with actual controller call - - def test_validate_draft_with_merge_action(self): - """Test validation passes when merge_action is specified.""" - _ = { - "order_id": str(self.group_order.id), - "items": [{"product_id": "1", "quantity": 1.0}], - "merge_action": "merge", - "existing_draft_id": "123", - } - - # Validation should pass and return merge_action and existing_draft_id - # Placeholder: will be implemented with actual controller call - - def test_validate_draft_with_replace_action(self): - """Test validation passes when replace_action is specified.""" - _ = { - "order_id": str(self.group_order.id), - "items": [{"product_id": "1", "quantity": 1.0}], - "merge_action": "replace", - "existing_draft_id": "123", - } - - # Validation should pass and return merge_action and existing_draft_id - # Placeholder: will be implemented with actual controller call diff --git a/website_sale_aplicoop/tests/test_multi_company.py b/website_sale_aplicoop/tests/test_multi_company.py index c503812..de20bb5 100644 --- a/website_sale_aplicoop/tests/test_multi_company.py +++ b/website_sale_aplicoop/tests/test_multi_company.py @@ -1,178 +1,147 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta -from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase +from odoo.exceptions import ValidationError class TestMultiCompanyGroupOrder(TransactionCase): - """Test suite para el soporte multicompañía en group.order.""" + '''Test suite para el soporte multicompañía en group.order.''' def setUp(self): super().setUp() # Crear dos compañías - self.company1 = self.env["res.company"].create( - { - "name": "Company 1", - } - ) - self.company2 = self.env["res.company"].create( - { - "name": "Company 2", - } - ) + self.company1 = self.env['res.company'].create({ + 'name': 'Company 1', + }) + self.company2 = self.env['res.company'].create({ + 'name': 'Company 2', + }) # Crear grupos en diferentes compañías - self.group1 = self.env["res.partner"].create( - { - "name": "Grupo Company 1", - "is_company": True, - "email": "grupo1@test.com", - "company_id": self.company1.id, - } - ) + self.group1 = self.env['res.partner'].create({ + 'name': 'Grupo Company 1', + 'is_company': True, + 'email': 'grupo1@test.com', + 'company_id': self.company1.id, + }) - self.group2 = self.env["res.partner"].create( - { - "name": "Grupo Company 2", - "is_company": True, - "email": "grupo2@test.com", - "company_id": self.company2.id, - } - ) + self.group2 = self.env['res.partner'].create({ + 'name': 'Grupo Company 2', + 'is_company': True, + 'email': 'grupo2@test.com', + 'company_id': self.company2.id, + }) # Crear productos en cada compañía - self.product1 = self.env["product.product"].create( - { - "name": "Producto Company 1", - "type": "consu", - "list_price": 10.0, - "company_id": self.company1.id, - } - ) + self.product1 = self.env['product.product'].create({ + 'name': 'Producto Company 1', + 'type': 'consu', + 'list_price': 10.0, + 'company_id': self.company1.id, + }) - self.product2 = self.env["product.product"].create( - { - "name": "Producto Company 2", - "type": "consu", - "list_price": 20.0, - "company_id": self.company2.id, - } - ) + self.product2 = self.env['product.product'].create({ + 'name': 'Producto Company 2', + 'type': 'consu', + 'list_price': 20.0, + 'company_id': self.company2.id, + }) def test_group_order_has_company_id(self): - """Test que group.order tenga el campo company_id.""" - order = self.env["group.order"].create( - { - "name": "Pedido Company 1", - "group_ids": [(6, 0, [self.group1.id])], - "company_id": self.company1.id, - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + '''Test que group.order tenga el campo company_id.''' + order = self.env['group.order'].create({ + 'name': 'Pedido Company 1', + 'group_ids': [(6, 0, [self.group1.id])], + 'company_id': self.company1.id, + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) self.assertEqual(order.company_id, self.company1) def test_group_order_default_company(self): - """Test que company_id por defecto sea la compañía del usuario.""" + '''Test que company_id por defecto sea la compañía del usuario.''' # Crear usuario con compañía específica - user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser", - "password": "test123", - "company_id": self.company1.id, - "company_ids": [(6, 0, [self.company1.id])], - } - ) + user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser', + 'password': 'test123', + 'company_id': self.company1.id, + 'company_ids': [(6, 0, [self.company1.id])], + }) - order = ( - self.env["group.order"] - .with_user(user) - .create( - { - "name": "Pedido Default Company", - "group_ids": [(6, 0, [self.group1.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) - ) + order = self.env['group.order'].with_user(user).create({ + 'name': 'Pedido Default Company', + 'group_ids': [(6, 0, [self.group1.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) # Verificar que se asignó la compañía del usuario self.assertEqual(order.company_id, self.company1) def test_group_order_company_constraint(self): - """Test que solo grupos de la misma compañía se puedan asignar.""" + '''Test que solo grupos de la misma compañía se puedan asignar.''' # Intentar asignar un grupo de otra compañía with self.assertRaises(ValidationError): - self.env["group.order"].create( - { - "name": "Pedido Mixed Companies", - "group_ids": [(6, 0, [self.group1.id, self.group2.id])], - "company_id": self.company1.id, - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + self.env['group.order'].create({ + 'name': 'Pedido Mixed Companies', + 'group_ids': [(6, 0, [self.group1.id, self.group2.id])], + 'company_id': self.company1.id, + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) def test_group_order_multi_company_filter(self): - """Test que get_active_orders_for_week() respete company_id.""" + '''Test que get_active_orders_for_week() respete company_id.''' # Crear órdenes en diferentes compañías - order1 = self.env["group.order"].create( - { - "name": "Pedido Company 1", - "group_ids": [(6, 0, [self.group1.id])], - "company_id": self.company1.id, - "type": "regular", - "state": "open", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + order1 = self.env['group.order'].create({ + 'name': 'Pedido Company 1', + 'group_ids': [(6, 0, [self.group1.id])], + 'company_id': self.company1.id, + 'type': 'regular', + 'state': 'open', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) - order2 = self.env["group.order"].create( - { - "name": "Pedido Company 2", - "group_ids": [(6, 0, [self.group2.id])], - "company_id": self.company2.id, - "type": "regular", - "state": "open", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + order2 = self.env['group.order'].create({ + 'name': 'Pedido Company 2', + 'group_ids': [(6, 0, [self.group2.id])], + 'company_id': self.company2.id, + 'type': 'regular', + 'state': 'open', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) # Obtener órdenes activas de company1 - active_orders = ( - self.env["group.order"] - .with_context(allowed_company_ids=[self.company1.id]) - .get_active_orders_for_week() - ) + active_orders = self.env['group.order'].with_context( + allowed_company_ids=[self.company1.id] + ).get_active_orders_for_week() # Debería contener solo order1 self.assertIn(order1, active_orders) @@ -180,28 +149,24 @@ class TestMultiCompanyGroupOrder(TransactionCase): # el filtro de compañía correctamente def test_product_company_isolation(self): - """Test que los productos de diferentes compañías estén aislados.""" + '''Test que los productos de diferentes compañías estén aislados.''' # Crear categoría para products - category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) + category = self.env['product.category'].create({ + 'name': 'Test Category', + }) - order = self.env["group.order"].create( - { - "name": "Pedido con Categoría", - "group_ids": [(6, 0, [self.group1.id])], - "category_ids": [(6, 0, [category.id])], - "company_id": self.company1.id, - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Pedido con Categoría', + 'group_ids': [(6, 0, [self.group1.id])], + 'category_ids': [(6, 0, [category.id])], + 'company_id': self.company1.id, + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) self.assertTrue(order.exists()) self.assertEqual(order.company_id, self.company1) diff --git a/website_sale_aplicoop/tests/test_phase2_eskaera_shop.py b/website_sale_aplicoop/tests/test_phase2_eskaera_shop.py deleted file mode 100644 index d4b8ada..0000000 --- a/website_sale_aplicoop/tests/test_phase2_eskaera_shop.py +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 2026 Criptomart -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) - -""" -Test suite for Phase 2 refactoring of eskaera_shop() method. - -Tests for refactored eskaera_shop using extracted helpers: -- Usage of _resolve_pricelist() instead of inline 3-tier fallback -- Extracted category filtering logic -- Price calculation with pricelist -- Search and category filter functionality -""" - -from datetime import datetime -from datetime import timedelta - -from odoo.tests.common import TransactionCase - - -class TestEskaeraShopobjInit(TransactionCase): - """Test eskaera_shop() initial validation and setup.""" - - def setUp(self): - super().setUp() - self.pricelist = self.env["product.pricelist"].create( - { - "name": "Test Pricelist", - "currency_id": self.env.company.currency_id.id, - } - ) - - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) - - self.member = self.env["res.partner"].create( - { - "name": "Group Member", - "email": "member@test.com", - } - ) - self.group.member_ids = [(4, self.member.id)] - - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member.id, - } - ) - - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) - - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "product", - "list_price": 100.0, - "categ_id": self.category.id, - } - ) - - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(4, self.group.id)], - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "pickup_day": "3", - "cutoff_day": "0", - "state": "open", - "category_ids": [(4, self.category.id)], - } - ) - - def test_eskaera_shop_order_not_found(self): - """Test that eskaera_shop redirects when order doesn't exist.""" - # Nonexistent order_id should redirect to /eskaera - # Placeholder: will be tested via HttpCase with request.Client - - def test_eskaera_shop_order_not_open(self): - """Test that eskaera_shop redirects when order is not open.""" - self.group_order.state = "confirmed" - # Should redirect to /eskaera - # Placeholder: will be tested via HttpCase with request.Client - - def test_eskaera_shop_uses_resolve_pricelist(self): - """Test that eskaera_shop uses _resolve_pricelist() helper.""" - # Configure Aplicoop pricelist - self.env["ir.config_parameter"].sudo().set_param( - "website_sale_aplicoop.pricelist_id", str(self.pricelist.id) - ) - - # When eskaera_shop is called, should use _resolve_pricelist() - # Placeholder: will verify via mock or direct method call - - -class TestEskaeraShopcategoryHierarchy(TransactionCase): - """Test eskaera_shop category hierarchy building.""" - - def setUp(self): - super().setUp() - self.parent_category = self.env["product.category"].create( - { - "name": "Parent Category", - } - ) - - self.child_category = self.env["product.category"].create( - { - "name": "Child Category", - "parent_id": self.parent_category.id, - } - ) - - self.product1 = self.env["product.product"].create( - { - "name": "Product in Parent", - "type": "product", - "list_price": 100.0, - "categ_id": self.parent_category.id, - } - ) - - self.product2 = self.env["product.product"].create( - { - "name": "Product in Child", - "type": "product", - "list_price": 200.0, - "categ_id": self.child_category.id, - } - ) - - def test_category_hierarchy_includes_parents(self): - """Test that available_categories includes parent categories.""" - # When products have categories, category hierarchy should include parents - # Placeholder: verify category tree structure - - def test_category_filter_includes_descendants(self): - """Test that category filter includes child categories.""" - # When filtering by parent category, should include products from children - # Placeholder: verify filtered products - - -class TestEskaeraShopriceCalculation(TransactionCase): - """Test eskaera_shop price calculation with pricelist.""" - - def setUp(self): - super().setUp() - self.pricelist = self.env["product.pricelist"].create( - { - "name": "Test Pricelist", - "currency_id": self.env.company.currency_id.id, - } - ) - - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) - - self.product_no_tax = self.env["product.product"].create( - { - "name": "Product No Tax", - "type": "product", - "list_price": 100.0, - "categ_id": self.category.id, - "taxes_id": False, - } - ) - - # Create tax - self.tax = self.env["account.tax"].create( - { - "name": "Test Tax", - "type_tax_use": "sale", - "amount": 21.0, - "amount_type": "percent", - } - ) - - self.product_with_tax = self.env["product.product"].create( - { - "name": "Product With Tax", - "type": "product", - "list_price": 100.0, - "categ_id": self.category.id, - "taxes_id": [(4, self.tax.id)], - } - ) - - def test_price_calculation_uses_pricelist(self): - """Test that product prices are calculated using configured pricelist.""" - # Configure Aplicoop pricelist - self.env["ir.config_parameter"].sudo().set_param( - "website_sale_aplicoop.pricelist_id", str(self.pricelist.id) - ) - - # When eskaera_shop renders, should calculate prices via pricelist - # Placeholder: verify price_info dict populated - - def test_price_info_structure(self): - """Test that product_price_info has correct structure.""" - # product_price_info should have: price, list_price, has_discounted_price, discount, tax_included - # Placeholder: verify dict structure - - -class TestEskaeraShoosearch(TransactionCase): - """Test eskaera_shop search functionality.""" - - def setUp(self): - super().setUp() - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) - - self.product1 = self.env["product.product"].create( - { - "name": "Apple Juice", - "type": "product", - "list_price": 10.0, - "categ_id": self.category.id, - } - ) - - self.product2 = self.env["product.product"].create( - { - "name": "Orange Juice", - "type": "product", - "list_price": 12.0, - "categ_id": self.category.id, - "description": "Fresh orange juice from Spain", - } - ) - - self.product3 = self.env["product.product"].create( - { - "name": "Water", - "type": "product", - "list_price": 2.0, - "categ_id": self.category.id, - } - ) - - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "pickup_day": "3", - "cutoff_day": "0", - "state": "open", - "category_ids": [(4, self.category.id)], - } - ) - - def test_search_filters_by_name(self): - """Test that search query filters products by name.""" - # When search='apple', should return only Apple Juice - # Placeholder: verify filtered products - - def test_search_filters_by_description(self): - """Test that search query filters products by description.""" - # When search='spain', should return Orange Juice (matches description) - # Placeholder: verify filtered products - - def test_search_case_insensitive(self): - """Test that search is case insensitive.""" - # search='APPLE' should match 'Apple Juice' - # Placeholder: verify filtered products - - def test_search_empty_returns_all(self): - """Test that empty search returns all products.""" - # When search='', should return all products - # Placeholder: verify all products returned diff --git a/website_sale_aplicoop/tests/test_phase3_confirm_eskaera.py b/website_sale_aplicoop/tests/test_phase3_confirm_eskaera.py deleted file mode 100644 index 1614ab2..0000000 --- a/website_sale_aplicoop/tests/test_phase3_confirm_eskaera.py +++ /dev/null @@ -1,669 +0,0 @@ -# Copyright 2026 - Today Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -""" -Test suite for Phase 3 refactoring of confirm_eskaera(). - -Tests the 3 helper methods created in Phase 3: -- _validate_confirm_json(): Validates JSON request data -- _process_cart_items(): Processes cart items into sale.order lines -- _build_confirmation_message(): Builds localized confirmation messages - -Includes tests for: -- Request validation with various error conditions -- Cart item processing with product context -- Multi-language message building (ES, EU, CA, GL, PT, FR, IT) -- Pickup vs delivery date handling -- Edge cases and error handling -""" - -import json -from datetime import date -from datetime import timedelta -from unittest.mock import Mock -from unittest.mock import patch - -from odoo import http -from odoo.tests.common import TransactionCase - - -class TestValidateConfirmJson(TransactionCase): - """Test _validate_confirm_json() helper method.""" - - def setUp(self): - super().setUp() - self.controller = http.request.env["website.sale"].browse([]) - self.user = self.env.ref("base.user_admin") - self.partner = self.env.ref("base.partner_admin") - - # Create test group order - self.group_order = self.env["group.order"].create( - { - "name": "Test Order Phase 3", - "state": "open", - "collection_date": date.today() + timedelta(days=3), - "cutoff_day": "3", # Thursday - "pickup_day": "5", # Saturday - } - ) - - @patch("odoo.http.request") - def test_validate_confirm_json_success(self, mock_request): - """Test successful validation of confirm JSON data.""" - mock_request.env = self.env.with_user(self.user) - - data = { - "order_id": self.group_order.id, - "items": [{"product_id": 1, "quantity": 2, "product_price": 10.0}], - "is_delivery": False, - } - - order_id, group_order, current_user, items, is_delivery = ( - self.controller._validate_confirm_json(data) - ) - - self.assertEqual(order_id, self.group_order.id) - self.assertEqual(group_order.id, self.group_order.id) - self.assertEqual(current_user.id, self.user.id) - self.assertEqual(len(items), 1) - self.assertFalse(is_delivery) - - @patch("odoo.http.request") - def test_validate_confirm_json_missing_order_id(self, mock_request): - """Test validation fails without order_id.""" - mock_request.env = self.env.with_user(self.user) - - data = {"items": [{"product_id": 1, "quantity": 2}]} - - with self.assertRaises(ValueError) as context: - self.controller._validate_confirm_json(data) - - self.assertIn("Missing order_id", str(context.exception)) - - @patch("odoo.http.request") - def test_validate_confirm_json_order_not_exists(self, mock_request): - """Test validation fails with non-existent order.""" - mock_request.env = self.env.with_user(self.user) - - data = { - "order_id": 99999, # Non-existent ID - "items": [{"product_id": 1, "quantity": 2}], - } - - with self.assertRaises(ValueError) as context: - self.controller._validate_confirm_json(data) - - self.assertIn("Order", str(context.exception)) - - @patch("odoo.http.request") - def test_validate_confirm_json_no_items(self, mock_request): - """Test validation fails without items in cart.""" - mock_request.env = self.env.with_user(self.user) - - data = { - "order_id": self.group_order.id, - "items": [], - } - - with self.assertRaises(ValueError) as context: - self.controller._validate_confirm_json(data) - - self.assertIn("No items in cart", str(context.exception)) - - @patch("odoo.http.request") - def test_validate_confirm_json_with_delivery_flag(self, mock_request): - """Test validation correctly handles is_delivery flag.""" - mock_request.env = self.env.with_user(self.user) - - data = { - "order_id": self.group_order.id, - "items": [{"product_id": 1, "quantity": 1}], - "is_delivery": True, - } - - _, _, _, _, is_delivery = self.controller._validate_confirm_json(data) - - self.assertTrue(is_delivery) - - -class TestProcessCartItems(TransactionCase): - """Test _process_cart_items() helper method.""" - - def setUp(self): - super().setUp() - self.controller = http.request.env["website.sale"].browse([]) - - # Create test products - self.product1 = self.env["product.product"].create( - { - "name": "Test Product 1", - "list_price": 15.0, - "type": "consu", - } - ) - self.product2 = self.env["product.product"].create( - { - "name": "Test Product 2", - "list_price": 25.0, - "type": "consu", - } - ) - - # Create test group order - self.group_order = self.env["group.order"].create( - { - "name": "Test Order for Cart", - "state": "open", - } - ) - - @patch("odoo.http.request") - def test_process_cart_items_success(self, mock_request): - """Test successful cart item processing.""" - mock_request.env = self.env - mock_request.env.lang = "es_ES" - - items = [ - { - "product_id": self.product1.id, - "quantity": 2, - "product_price": 15.0, - }, - { - "product_id": self.product2.id, - "quantity": 1, - "product_price": 25.0, - }, - ] - - result = self.controller._process_cart_items(items, self.group_order) - - self.assertEqual(len(result), 2) - self.assertEqual(result[0][0], 0) # Command (0, 0, vals) - self.assertEqual(result[0][1], 0) - self.assertIn("product_id", result[0][2]) - self.assertEqual(result[0][2]["product_uom_qty"], 2) - self.assertEqual(result[0][2]["price_unit"], 15.0) - - @patch("odoo.http.request") - def test_process_cart_items_uses_list_price_fallback(self, mock_request): - """Test cart processing uses list_price when product_price is 0.""" - mock_request.env = self.env - mock_request.env.lang = "es_ES" - - items = [ - { - "product_id": self.product1.id, - "quantity": 1, - "product_price": 0, # Should fallback to list_price - } - ] - - result = self.controller._process_cart_items(items, self.group_order) - - self.assertEqual(len(result), 1) - # Should use product.list_price as fallback - self.assertEqual(result[0][2]["price_unit"], self.product1.list_price) - - @patch("odoo.http.request") - def test_process_cart_items_skips_invalid_product(self, mock_request): - """Test cart processing skips non-existent products.""" - mock_request.env = self.env - mock_request.env.lang = "es_ES" - - items = [ - { - "product_id": 99999, # Non-existent - "quantity": 1, - "product_price": 10.0, - }, - { - "product_id": self.product1.id, - "quantity": 2, - "product_price": 15.0, - }, - ] - - result = self.controller._process_cart_items(items, self.group_order) - - # Should only process the valid product - self.assertEqual(len(result), 1) - self.assertEqual(result[0][2]["product_id"], self.product1.id) - - @patch("odoo.http.request") - def test_process_cart_items_empty_after_filtering(self, mock_request): - """Test cart processing raises error when no valid items remain.""" - mock_request.env = self.env - mock_request.env.lang = "es_ES" - - items = [{"product_id": 99999, "quantity": 1, "product_price": 10.0}] - - with self.assertRaises(ValueError) as context: - self.controller._process_cart_items(items, self.group_order) - - self.assertIn("No valid items", str(context.exception)) - - @patch("odoo.http.request") - def test_process_cart_items_translates_product_name(self, mock_request): - """Test cart processing uses translated product names.""" - mock_request.env = self.env - mock_request.env.lang = "eu_ES" # Basque - - # Add translation for product name - self.env["ir.translation"].create( - { - "type": "model", - "name": "product.product,name", - "module": "website_sale_aplicoop", - "lang": "eu_ES", - "res_id": self.product1.id, - "src": "Test Product 1", - "value": "Proba Produktua 1", - "state": "translated", - } - ) - - items = [ - { - "product_id": self.product1.id, - "quantity": 1, - "product_price": 15.0, - } - ] - - result = self.controller._process_cart_items(items, self.group_order) - - # Product name should be in Basque context - product_name = result[0][2]["name"] - self.assertIsNotNone(product_name) - # In real test, would be "Proba Produktua 1" but translation may not work in test - - -class TestBuildConfirmationMessage(TransactionCase): - """Test _build_confirmation_message() helper method.""" - - def setUp(self): - super().setUp() - self.controller = http.request.env["website.sale"].browse([]) - self.user = self.env.ref("base.user_admin") - self.partner = self.env.ref("base.partner_admin") - - # Create test group order with dates - pickup_date = date.today() + timedelta(days=5) - delivery_date = pickup_date + timedelta(days=1) - - self.group_order = self.env["group.order"].create( - { - "name": "Test Order Messages", - "state": "open", - "pickup_day": "5", # Saturday (0=Monday) - "pickup_date": pickup_date, - "delivery_date": delivery_date, - } - ) - - # Create test sale order - self.sale_order = self.env["sale.order"].create( - { - "partner_id": self.partner.id, - "group_order_id": self.group_order.id, - } - ) - - @patch("odoo.http.request") - def test_build_confirmation_message_pickup(self, mock_request): - """Test confirmation message for pickup (not delivery).""" - mock_request.env = self.env.with_context(lang="es_ES") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - self.assertIn("message", result) - self.assertIn("pickup_day", result) - self.assertIn("pickup_date", result) - self.assertIn("pickup_day_index", result) - - # Should contain "Thank you" text (or translation) - self.assertIn("Thank you", result["message"]) - - # Should contain order reference - self.assertIn(self.sale_order.name, result["message"]) - - # Should have pickup day index - self.assertEqual(result["pickup_day_index"], 5) - - @patch("odoo.http.request") - def test_build_confirmation_message_delivery(self, mock_request): - """Test confirmation message for home delivery.""" - mock_request.env = self.env.with_context(lang="es_ES") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=True - ) - - self.assertIn("message", result) - - # Should contain "Delivery date" label (or translation) - # and should use delivery_date, not pickup_date - message = result["message"] - self.assertIsNotNone(message) - - # Delivery day should be next day after pickup (Saturday -> Sunday) - # pickup_day_index=5 (Saturday), delivery should be 6 (Sunday) - # Note: _get_day_names would need to be mocked for exact day name - - @patch("odoo.http.request") - def test_build_confirmation_message_no_dates(self, mock_request): - """Test confirmation message when no pickup date is set.""" - mock_request.env = self.env.with_context(lang="es_ES") - - # Create order without dates - group_order_no_dates = self.env["group.order"].create( - { - "name": "Order No Dates", - "state": "open", - } - ) - - sale_order_no_dates = self.env["sale.order"].create( - { - "partner_id": self.partner.id, - "group_order_id": group_order_no_dates.id, - } - ) - - result = self.controller._build_confirmation_message( - sale_order_no_dates, group_order_no_dates, is_delivery=False - ) - - # Should still build message without dates - self.assertIn("message", result) - self.assertIn("Thank you", result["message"]) - - # Date fields should be empty - self.assertEqual(result["pickup_date"], "") - - @patch("odoo.http.request") - def test_build_confirmation_message_formats_date(self, mock_request): - """Test confirmation message formats dates correctly (DD/MM/YYYY).""" - mock_request.env = self.env.with_context(lang="es_ES") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - # Should have date in DD/MM/YYYY format - pickup_date_str = result["pickup_date"] - self.assertIsNotNone(pickup_date_str) - - # Verify format with regex - - date_pattern = r"\d{2}/\d{2}/\d{4}" - self.assertRegex(pickup_date_str, date_pattern) - - @patch("odoo.http.request") - def test_build_confirmation_message_multilang_es(self, mock_request): - """Test confirmation message in Spanish (es_ES).""" - mock_request.env = self.env.with_context(lang="es_ES") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - message = result["message"] - # Should contain translated strings (if translations loaded) - self.assertIsNotNone(message) - # In real scenario, would check for "¡Gracias!" or similar - - @patch("odoo.http.request") - def test_build_confirmation_message_multilang_eu(self, mock_request): - """Test confirmation message in Basque (eu_ES).""" - mock_request.env = self.env.with_context(lang="eu_ES") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - message = result["message"] - self.assertIsNotNone(message) - # In real scenario, would check for "Eskerrik asko!" or similar - - @patch("odoo.http.request") - def test_build_confirmation_message_multilang_ca(self, mock_request): - """Test confirmation message in Catalan (ca_ES).""" - mock_request.env = self.env.with_context(lang="ca_ES") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - message = result["message"] - self.assertIsNotNone(message) - # In real scenario, would check for "Gràcies!" or similar - - @patch("odoo.http.request") - def test_build_confirmation_message_multilang_gl(self, mock_request): - """Test confirmation message in Galician (gl_ES).""" - mock_request.env = self.env.with_context(lang="gl_ES") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - message = result["message"] - self.assertIsNotNone(message) - # In real scenario, would check for "Grazas!" or similar - - @patch("odoo.http.request") - def test_build_confirmation_message_multilang_pt(self, mock_request): - """Test confirmation message in Portuguese (pt_PT).""" - mock_request.env = self.env.with_context(lang="pt_PT") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - message = result["message"] - self.assertIsNotNone(message) - # In real scenario, would check for "Obrigado!" or similar - - @patch("odoo.http.request") - def test_build_confirmation_message_multilang_fr(self, mock_request): - """Test confirmation message in French (fr_FR).""" - mock_request.env = self.env.with_context(lang="fr_FR") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - message = result["message"] - self.assertIsNotNone(message) - # In real scenario, would check for "Merci!" or similar - - @patch("odoo.http.request") - def test_build_confirmation_message_multilang_it(self, mock_request): - """Test confirmation message in Italian (it_IT).""" - mock_request.env = self.env.with_context(lang="it_IT") - - result = self.controller._build_confirmation_message( - self.sale_order, self.group_order, is_delivery=False - ) - - message = result["message"] - self.assertIsNotNone(message) - # In real scenario, would check for "Grazie!" or similar - - -class TestConfirmEskaera_Integration(TransactionCase): - """Integration tests for confirm_eskaera() with all 3 helpers.""" - - def setUp(self): - super().setUp() - self.controller = http.request.env["website.sale"].browse([]) - self.user = self.env.ref("base.user_admin") - self.partner = self.env.ref("base.partner_admin") - - # Create test product - self.product = self.env["product.product"].create( - { - "name": "Integration Test Product", - "list_price": 20.0, - "type": "consu", - } - ) - - # Create test group order - self.group_order = self.env["group.order"].create( - { - "name": "Integration Test Order", - "state": "open", - "pickup_day": "5", - "pickup_date": date.today() + timedelta(days=5), - } - ) - - @patch("odoo.http.request") - def test_confirm_eskaera_full_flow_pickup(self, mock_request): - """Test full confirm_eskaera flow for pickup order.""" - mock_request.env = self.env.with_user(self.user) - mock_request.env.lang = "es_ES" - mock_request.httprequest = Mock() - - # Prepare request data - data = { - "order_id": self.group_order.id, - "items": [ - { - "product_id": self.product.id, - "quantity": 3, - "product_price": 20.0, - } - ], - "is_delivery": False, - } - - mock_request.httprequest.data = json.dumps(data).encode("utf-8") - - # Call confirm_eskaera - response = self.controller.confirm_eskaera() - - # Verify response - self.assertIsNotNone(response) - response_data = json.loads(response.data.decode("utf-8")) - - self.assertTrue(response_data.get("success")) - self.assertIn("message", response_data) - self.assertIn("sale_order_id", response_data) - - # Verify sale.order was created - sale_order_id = response_data["sale_order_id"] - sale_order = self.env["sale.order"].browse(sale_order_id) - - self.assertTrue(sale_order.exists()) - self.assertEqual(sale_order.partner_id.id, self.partner.id) - self.assertEqual(sale_order.group_order_id.id, self.group_order.id) - self.assertEqual(len(sale_order.order_line), 1) - self.assertEqual(sale_order.order_line[0].product_uom_qty, 3) - - @patch("odoo.http.request") - def test_confirm_eskaera_full_flow_delivery(self, mock_request): - """Test full confirm_eskaera flow for delivery order.""" - mock_request.env = self.env.with_user(self.user) - mock_request.env.lang = "es_ES" - mock_request.httprequest = Mock() - - # Add delivery_date to group order - self.group_order.delivery_date = self.group_order.pickup_date + timedelta( - days=1 - ) - - # Prepare request data - data = { - "order_id": self.group_order.id, - "items": [ - { - "product_id": self.product.id, - "quantity": 2, - "product_price": 20.0, - } - ], - "is_delivery": True, - } - - mock_request.httprequest.data = json.dumps(data).encode("utf-8") - - # Call confirm_eskaera - response = self.controller.confirm_eskaera() - - # Verify response - response_data = json.loads(response.data.decode("utf-8")) - - self.assertTrue(response_data.get("success")) - - # Verify sale.order has delivery flag - sale_order_id = response_data["sale_order_id"] - sale_order = self.env["sale.order"].browse(sale_order_id) - - self.assertTrue(sale_order.home_delivery) - # commitment_date should be delivery_date - self.assertEqual( - sale_order.commitment_date.date(), self.group_order.delivery_date - ) - - @patch("odoo.http.request") - def test_confirm_eskaera_updates_existing_draft(self, mock_request): - """Test confirm_eskaera updates existing draft order instead of creating new.""" - mock_request.env = self.env.with_user(self.user) - mock_request.env.lang = "es_ES" - mock_request.httprequest = Mock() - - # Create existing draft order - existing_order = self.env["sale.order"].create( - { - "partner_id": self.partner.id, - "group_order_id": self.group_order.id, - "state": "draft", - "order_line": [ - ( - 0, - 0, - { - "product_id": self.product.id, - "product_uom_qty": 1, - "price_unit": 20.0, - }, - ) - ], - } - ) - - existing_order_id = existing_order.id - - # Prepare new request data - data = { - "order_id": self.group_order.id, - "items": [ - { - "product_id": self.product.id, - "quantity": 5, # Different quantity - "product_price": 20.0, - } - ], - "is_delivery": False, - } - - mock_request.httprequest.data = json.dumps(data).encode("utf-8") - - # Call confirm_eskaera - response = self.controller.confirm_eskaera() - - response_data = json.loads(response.data.decode("utf-8")) - - # Should update existing order, not create new - self.assertEqual(response_data["sale_order_id"], existing_order_id) - - # Verify order was updated - existing_order.invalidate_recordset() - self.assertEqual(len(existing_order.order_line), 1) - self.assertEqual(existing_order.order_line[0].product_uom_qty, 5) diff --git a/website_sale_aplicoop/tests/test_pricing_with_pricelist.py b/website_sale_aplicoop/tests/test_pricing_with_pricelist.py index e5050a9..be8e8af 100644 --- a/website_sale_aplicoop/tests/test_pricing_with_pricelist.py +++ b/website_sale_aplicoop/tests/test_pricing_with_pricelist.py @@ -13,166 +13,131 @@ Coverage: - Product price info structure in eskaera_shop """ -from odoo.tests import tagged +import json from odoo.tests.common import TransactionCase +from odoo.tests import tagged -@tagged("post_install", "-at_install") +@tagged('post_install', '-at_install') class TestPricingWithPricelist(TransactionCase): """Test pricing calculations using OCA product_get_price_helper addon.""" def setUp(self): super().setUp() - + # Create test company - self.company = self.env["res.company"].create( - { - "name": "Test Company Pricing", - } - ) - + self.company = self.env['res.company'].create({ + 'name': 'Test Company Pricing', + }) + # Create test group - self.group = self.env["res.partner"].create( - { - "name": "Test Group Pricing", - "is_company": True, - "company_id": self.company.id, - } - ) - + self.group = self.env['res.partner'].create({ + 'name': 'Test Group Pricing', + 'is_company': True, + 'company_id': self.company.id, + }) + # Create test user - self.user = self.env["res.users"].create( - { - "name": "Test User Pricing", - "login": "testpricing@example.com", - "company_id": self.company.id, - "company_ids": [(6, 0, [self.company.id])], - } - ) - + self.user = self.env['res.users'].create({ + 'name': 'Test User Pricing', + 'login': 'testpricing@example.com', + 'company_id': self.company.id, + 'company_ids': [(6, 0, [self.company.id])], + }) + # Get or create default tax group - tax_group = self.env["account.tax.group"].search( - [("company_id", "=", self.company.id)], limit=1 - ) + tax_group = self.env['account.tax.group'].search([ + ('company_id', '=', self.company.id) + ], limit=1) if not tax_group: - tax_group = self.env["account.tax.group"].create( - { - "name": "IVA", - "company_id": self.company.id, - } - ) - + tax_group = self.env['account.tax.group'].create({ + 'name': 'IVA', + 'company_id': self.company.id, + }) + # Get default country (Spain) - country_es = self.env.ref("base.es") - + country_es = self.env.ref('base.es') + # Create tax (21% IVA) - self.tax_21 = self.env["account.tax"].create( - { - "name": "IVA 21%", - "amount": 21.0, - "amount_type": "percent", - "type_tax_use": "sale", - "company_id": self.company.id, - "country_id": country_es.id, - "tax_group_id": tax_group.id, - } - ) - + self.tax_21 = self.env['account.tax'].create({ + 'name': 'IVA 21%', + 'amount': 21.0, + 'amount_type': 'percent', + 'type_tax_use': 'sale', + 'company_id': self.company.id, + 'country_id': country_es.id, + 'tax_group_id': tax_group.id, + }) + # Create tax (10% IVA reducido) - self.tax_10 = self.env["account.tax"].create( - { - "name": "IVA 10%", - "amount": 10.0, - "amount_type": "percent", - "type_tax_use": "sale", - "company_id": self.company.id, - "country_id": country_es.id, - "tax_group_id": tax_group.id, - } - ) - + self.tax_10 = self.env['account.tax'].create({ + 'name': 'IVA 10%', + 'amount': 10.0, + 'amount_type': 'percent', + 'type_tax_use': 'sale', + 'company_id': self.company.id, + 'country_id': country_es.id, + 'tax_group_id': tax_group.id, + }) + # Create fiscal position (maps 21% to 10%) - self.fiscal_position = self.env["account.fiscal.position"].create( - { - "name": "Test Fiscal Position", - "company_id": self.company.id, - } - ) - self.env["account.fiscal.position.tax"].create( - { - "position_id": self.fiscal_position.id, - "tax_src_id": self.tax_21.id, - "tax_dest_id": self.tax_10.id, - } - ) - + self.fiscal_position = self.env['account.fiscal.position'].create({ + 'name': 'Test Fiscal Position', + 'company_id': self.company.id, + }) + self.env['account.fiscal.position.tax'].create({ + 'position_id': self.fiscal_position.id, + 'tax_src_id': self.tax_21.id, + 'tax_dest_id': self.tax_10.id, + }) + # Create product category - self.category = self.env["product.category"].create( - { - "name": "Test Category Pricing", - } - ) - + self.category = self.env['product.category'].create({ + 'name': 'Test Category Pricing', + }) + # Create test products with different tax configurations - self.product_with_tax = self.env["product.product"].create( - { - "name": "Product With 21% Tax", - "list_price": 100.0, - "categ_id": self.category.id, - "taxes_id": [(6, 0, [self.tax_21.id])], - "company_id": self.company.id, - } - ) - - self.product_without_tax = self.env["product.product"].create( - { - "name": "Product Without Tax", - "list_price": 50.0, - "categ_id": self.category.id, - "taxes_id": False, - "company_id": self.company.id, - } - ) - + self.product_with_tax = self.env['product.product'].create({ + 'name': 'Product With 21% Tax', + 'list_price': 100.0, + 'categ_id': self.category.id, + 'taxes_id': [(6, 0, [self.tax_21.id])], + 'company_id': self.company.id, + }) + + self.product_without_tax = self.env['product.product'].create({ + 'name': 'Product Without Tax', + 'list_price': 50.0, + 'categ_id': self.category.id, + 'taxes_id': False, + 'company_id': self.company.id, + }) + # Create pricelist with discount - self.pricelist_with_discount = self.env["product.pricelist"].create( - { - "name": "Test Pricelist 10% Discount", - "company_id": self.company.id, - "item_ids": [ - ( - 0, - 0, - { - "compute_price": "percentage", - "percent_price": 10.0, # 10% discount - "applied_on": "3_global", - }, - ) - ], - } - ) - + self.pricelist_with_discount = self.env['product.pricelist'].create({ + 'name': 'Test Pricelist 10% Discount', + 'company_id': self.company.id, + 'item_ids': [(0, 0, { + 'compute_price': 'percentage', + 'percent_price': 10.0, # 10% discount + 'applied_on': '3_global', + })], + }) + # Create pricelist without discount - self.pricelist_no_discount = self.env["product.pricelist"].create( - { - "name": "Test Pricelist No Discount", - "company_id": self.company.id, - } - ) - + self.pricelist_no_discount = self.env['product.pricelist'].create({ + 'name': 'Test Pricelist No Discount', + 'company_id': self.company.id, + }) + # Create group order - self.group_order = self.env["group.order"].create( - { - "name": "Test Order Pricing", - "state": "open", - "group_ids": [(6, 0, [self.group.id])], - "product_ids": [ - (6, 0, [self.product_with_tax.id, self.product_without_tax.id]) - ], - "company_id": self.company.id, - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order Pricing', + 'state': 'open', + 'group_ids': [(6, 0, [self.group.id])], + 'product_ids': [(6, 0, [self.product_with_tax.id, self.product_without_tax.id])], + 'company_id': self.company.id, + }) def test_add_to_cart_basic_price_without_tax(self): """Test basic price calculation for product without taxes.""" @@ -182,15 +147,11 @@ class TestPricingWithPricelist(TransactionCase): pricelist=self.pricelist_no_discount, fposition=False, ) - - self.assertEqual( - result["value"], 50.0, "Product without tax should have price = list_price" - ) - self.assertEqual( - result.get("discount", 0), - 0, - "No discount pricelist should have 0% discount", - ) + + self.assertEqual(result['value'], 50.0, + "Product without tax should have price = list_price") + self.assertEqual(result.get('discount', 0), 0, + "No discount pricelist should have 0% discount") def test_add_to_cart_with_pricelist_discount(self): """Test that discounted prices are calculated correctly.""" @@ -200,18 +161,14 @@ class TestPricingWithPricelist(TransactionCase): pricelist=self.pricelist_with_discount, fposition=False, ) - + # OCA addon returns price without taxes by default expected_price = 100.0 * 0.9 # 90.0 - - self.assertIn("value", result, "Result must contain 'value' key") - self.assertIn("tax_included", result, "Result must contain 'tax_included' key") - self.assertAlmostEqual( - result["value"], - expected_price, - places=2, - msg=f"Expected {expected_price}, got {result['value']}", - ) + + self.assertIn('value', result, "Result must contain 'value' key") + self.assertIn('tax_included', result, "Result must contain 'tax_included' key") + self.assertAlmostEqual(result['value'], expected_price, places=2, + msg=f"Expected {expected_price}, got {result['value']}") def test_add_to_cart_with_fiscal_position(self): """Test fiscal position maps taxes correctly (21% -> 10%).""" @@ -221,19 +178,19 @@ class TestPricingWithPricelist(TransactionCase): pricelist=self.pricelist_no_discount, fposition=False, ) - + result_with_fp = self.product_with_tax._get_price( qty=1.0, pricelist=self.pricelist_no_discount, fposition=self.fiscal_position, ) - + # Both should return base price (100.0) without tax by default # Tax mapping only affects tax calculation, not the base price returned - self.assertIn("value", result_without_fp, "Result must contain 'value'") - self.assertIn("value", result_with_fp, "Result must contain 'value'") - self.assertEqual(result_without_fp["value"], 100.0) - self.assertEqual(result_with_fp["value"], 100.0) + self.assertIn('value', result_without_fp, "Result must contain 'value'") + self.assertIn('value', result_with_fp, "Result must contain 'value'") + self.assertEqual(result_without_fp['value'], 100.0) + self.assertEqual(result_with_fp['value'], 100.0) def test_add_to_cart_with_tax_included(self): """Test price calculation returns tax_included flag correctly.""" @@ -243,53 +200,43 @@ class TestPricingWithPricelist(TransactionCase): pricelist=self.pricelist_no_discount, fposition=False, ) - + # By default, tax is not included in price - self.assertIn("tax_included", result) - self.assertEqual( - result["value"], 100.0, "Price should be base price without tax" - ) + self.assertIn('tax_included', result) + self.assertEqual(result['value'], 100.0, "Price should be base price without tax") def test_add_to_cart_with_quantity_discount(self): """Test quantity-based discounts if applicable.""" # Create pricelist with quantity-based rule - pricelist_qty = self.env["product.pricelist"].create( - { - "name": "Quantity Discount Pricelist", - "company_id": self.company.id, - "item_ids": [ - ( - 0, - 0, - { - "compute_price": "percentage", - "percent_price": 20.0, # 20% discount - "min_quantity": 5.0, - "applied_on": "3_global", - }, - ) - ], - } - ) - + pricelist_qty = self.env['product.pricelist'].create({ + 'name': 'Quantity Discount Pricelist', + 'company_id': self.company.id, + 'item_ids': [(0, 0, { + 'compute_price': 'percentage', + 'percent_price': 20.0, # 20% discount + 'min_quantity': 5.0, + 'applied_on': '3_global', + })], + }) + # Quantity 1: No discount result_qty_1 = self.product_with_tax._get_price( qty=1.0, pricelist=pricelist_qty, fposition=False, ) - + # Quantity 5: 20% discount result_qty_5 = self.product_with_tax._get_price( qty=5.0, pricelist=pricelist_qty, fposition=False, ) - + # Qty 1: 100.0 (no discount, no tax in value) # Qty 5: 100 * 0.8 = 80.0 (with 20% discount, no tax in value) - self.assertAlmostEqual(result_qty_1["value"], 100.0, places=2) - self.assertAlmostEqual(result_qty_5["value"], 80.0, places=2) + self.assertAlmostEqual(result_qty_1['value'], 100.0, places=2) + self.assertAlmostEqual(result_qty_5['value'], 80.0, places=2) def test_add_to_cart_price_fallback_no_pricelist(self): """Test fallback to list_price when pricelist is not available.""" @@ -300,39 +247,35 @@ class TestPricingWithPricelist(TransactionCase): pricelist=False, fposition=False, ) - + # Should return list_price with taxes (fallback behavior) # This depends on OCA addon implementation self.assertIsNotNone(result, "Should not fail when pricelist is False") - self.assertIn("value", result, "Result should contain 'value' key") + self.assertIn('value', result, "Result should contain 'value' key") def test_add_to_cart_price_fallback_no_variant(self): """Test handling when product has no variants.""" # Create product template without variants - product_template = self.env["product.template"].create( - { - "name": "Product Without Variant", - "list_price": 75.0, - "categ_id": self.category.id, - "company_id": self.company.id, - } - ) - + product_template = self.env['product.template'].create({ + 'name': 'Product Without Variant', + 'list_price': 75.0, + 'categ_id': self.category.id, + 'company_id': self.company.id, + }) + # Should have auto-created variant - self.assertTrue( - product_template.product_variant_ids, - "Product template should have at least one variant", - ) - + self.assertTrue(product_template.product_variant_ids, + "Product template should have at least one variant") + variant = product_template.product_variant_ids[0] result = variant._get_price( qty=1.0, pricelist=self.pricelist_no_discount, fposition=False, ) - + self.assertIsNotNone(result, "Should handle product with auto-created variant") - self.assertAlmostEqual(result["value"], 75.0, places=2) + self.assertAlmostEqual(result['value'], 75.0, places=2) def test_product_price_info_structure(self): """Test product_price_info dict structure returned by _get_price.""" @@ -341,19 +284,18 @@ class TestPricingWithPricelist(TransactionCase): pricelist=self.pricelist_with_discount, fposition=False, ) - + # Verify structure - self.assertIn("value", result, "Result must contain 'value' key") - self.assertIsInstance( - result["value"], (int, float), "Price value must be numeric" - ) - + self.assertIn('value', result, "Result must contain 'value' key") + self.assertIsInstance(result['value'], (int, float), + "Price value must be numeric") + # Optional keys (depends on OCA addon version) - if "discount" in result: - self.assertIsInstance(result["discount"], (int, float)) - - if "original_value" in result: - self.assertIsInstance(result["original_value"], (int, float)) + if 'discount' in result: + self.assertIsInstance(result['discount'], (int, float)) + + if 'original_value' in result: + self.assertIsInstance(result['original_value'], (int, float)) def test_discounted_price_visual_comparison(self): """Test comparison of original vs discounted price for UI display.""" @@ -362,83 +304,71 @@ class TestPricingWithPricelist(TransactionCase): pricelist=self.pricelist_with_discount, fposition=False, ) - + # When there's a discount, original_value should be higher than value - if result.get("discount", 0) > 0: - original = result.get("original_value", result["value"]) - discounted = result["value"] - self.assertGreater( - original, - discounted, - "Original price should be higher than discounted price", - ) + if result.get('discount', 0) > 0: + original = result.get('original_value', result['value']) + discounted = result['value'] + self.assertGreater(original, discounted, + "Original price should be higher than discounted price") def test_price_calculation_with_multiple_taxes(self): """Test product with multiple taxes applied.""" # Get tax group and country from existing tax tax_group = self.tax_21.tax_group_id country = self.tax_21.country_id - + # Create additional tax - tax_extra = self.env["account.tax"].create( - { - "name": "Extra Tax 5%", - "amount": 5.0, - "amount_type": "percent", - "type_tax_use": "sale", - "company_id": self.company.id, - "country_id": country.id, - "tax_group_id": tax_group.id, - } - ) - - product_multi_tax = self.env["product.product"].create( - { - "name": "Product With Multiple Taxes", - "list_price": 100.0, - "categ_id": self.category.id, - "taxes_id": [(6, 0, [self.tax_21.id, tax_extra.id])], - "company_id": self.company.id, - } - ) - + tax_extra = self.env['account.tax'].create({ + 'name': 'Extra Tax 5%', + 'amount': 5.0, + 'amount_type': 'percent', + 'type_tax_use': 'sale', + 'company_id': self.company.id, + 'country_id': country.id, + 'tax_group_id': tax_group.id, + }) + + product_multi_tax = self.env['product.product'].create({ + 'name': 'Product With Multiple Taxes', + 'list_price': 100.0, + 'categ_id': self.category.id, + 'taxes_id': [(6, 0, [self.tax_21.id, tax_extra.id])], + 'company_id': self.company.id, + }) + result = product_multi_tax._get_price( qty=1.0, pricelist=self.pricelist_no_discount, fposition=False, ) - + # Base price 100.0 (taxes not included in value by default) - self.assertEqual( - result["value"], - 100.0, - msg="Should return base price (taxes applied separately)", - ) + self.assertEqual(result['value'], 100.0, + msg="Should return base price (taxes applied separately)") def test_price_currency_handling(self): """Test price calculation with different currencies.""" # Get or use existing EUR currency - eur = self.env["res.currency"].search([("name", "=", "EUR")], limit=1) + eur = self.env['res.currency'].search([('name', '=', 'EUR')], limit=1) if not eur: self.skipTest("EUR currency not available in test database") - + # Create pricelist with EUR - pricelist_eur = self.env["product.pricelist"].create( - { - "name": "EUR Pricelist", - "currency_id": eur.id, - "company_id": self.company.id, - } - ) - + pricelist_eur = self.env['product.pricelist'].create({ + 'name': 'EUR Pricelist', + 'currency_id': eur.id, + 'company_id': self.company.id, + }) + result = self.product_with_tax._get_price( qty=1.0, pricelist=pricelist_eur, fposition=False, ) - + self.assertIsNotNone(result, "Should handle different currency pricelist") - self.assertIn("value", result) + self.assertIn('value', result) def test_price_consistency_across_calls(self): """Test that multiple calls with same params return same price.""" @@ -447,37 +377,33 @@ class TestPricingWithPricelist(TransactionCase): pricelist=self.pricelist_with_discount, fposition=False, ) - + result2 = self.product_with_tax._get_price( qty=1.0, pricelist=self.pricelist_with_discount, fposition=False, ) - - self.assertEqual( - result1["value"], - result2["value"], - "Price calculation should be deterministic", - ) + + self.assertEqual(result1['value'], result2['value'], + "Price calculation should be deterministic") def test_zero_price_product(self): """Test handling of free products (price = 0).""" - free_product = self.env["product.product"].create( - { - "name": "Free Product", - "list_price": 0.0, - "categ_id": self.category.id, - "company_id": self.company.id, - } - ) - + free_product = self.env['product.product'].create({ + 'name': 'Free Product', + 'list_price': 0.0, + 'categ_id': self.category.id, + 'company_id': self.company.id, + }) + result = free_product._get_price( qty=1.0, pricelist=self.pricelist_no_discount, fposition=False, ) - - self.assertEqual(result["value"], 0.0, "Free product should have price = 0") + + self.assertEqual(result['value'], 0.0, + "Free product should have price = 0") def test_negative_quantity_handling(self): """Test that negative quantities are handled properly.""" diff --git a/website_sale_aplicoop/tests/test_product_discovery.py b/website_sale_aplicoop/tests/test_product_discovery.py index cd27b05..45a8261 100644 --- a/website_sale_aplicoop/tests/test_product_discovery.py +++ b/website_sale_aplicoop/tests/test_product_discovery.py @@ -17,8 +17,7 @@ Coverage: - Ordering and deduplication """ -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta from odoo.tests.common import TransactionCase @@ -28,105 +27,81 @@ class TestProductDiscoveryUnion(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) # Create a supplier - self.supplier = self.env["res.partner"].create( - { - "name": "Test Supplier", - "is_supplier": True, - } - ) + self.supplier = self.env['res.partner'].create({ + 'name': 'Test Supplier', + 'is_supplier': True, + }) # Create categories - self.category1 = self.env["product.category"].create( - { - "name": "Category 1", - } - ) + self.category1 = self.env['product.category'].create({ + 'name': 'Category 1', + }) - self.category2 = self.env["product.category"].create( - { - "name": "Category 2", - } - ) + self.category2 = self.env['product.category'].create({ + 'name': 'Category 2', + }) # Create products # Direct product - self.direct_product = self.env["product.product"].create( - { - "name": "Direct Product", - "type": "consu", - "list_price": 10.0, - "is_published": True, - "sale_ok": True, - } - ) + self.direct_product = self.env['product.product'].create({ + 'name': 'Direct Product', + 'type': 'consu', + 'list_price': 10.0, + 'is_published': True, + 'sale_ok': True, + }) # Category 1 product - self.cat1_product = self.env["product.product"].create( - { - "name": "Category 1 Product", - "type": "consu", - "list_price": 20.0, - "categ_id": self.category1.id, - "is_published": True, - "sale_ok": True, - } - ) + self.cat1_product = self.env['product.product'].create({ + 'name': 'Category 1 Product', + 'type': 'consu', + 'list_price': 20.0, + 'categ_id': self.category1.id, + 'is_published': True, + 'sale_ok': True, + }) # Category 2 product - self.cat2_product = self.env["product.product"].create( - { - "name": "Category 2 Product", - "type": "consu", - "list_price": 30.0, - "categ_id": self.category2.id, - "is_published": True, - "sale_ok": True, - } - ) + self.cat2_product = self.env['product.product'].create({ + 'name': 'Category 2 Product', + 'type': 'consu', + 'list_price': 30.0, + 'categ_id': self.category2.id, + 'is_published': True, + 'sale_ok': True, + }) # Supplier product - self.supplier_product = self.env["product.product"].create( - { - "name": "Supplier Product", - "type": "consu", - "list_price": 40.0, - "categ_id": self.category1.id, # Also in category - "seller_ids": [ - ( - 0, - 0, - { - "partner_id": self.supplier.id, - "product_name": "Supplier Product", - }, - ) - ], - "is_published": True, - "sale_ok": True, - } - ) + self.supplier_product = self.env['product.product'].create({ + 'name': 'Supplier Product', + 'type': 'consu', + 'list_price': 40.0, + 'categ_id': self.category1.id, # Also in category + 'seller_ids': [(0, 0, { + 'partner_id': self.supplier.id, + 'product_name': 'Supplier Product', + })], + 'is_published': True, + 'sale_ok': True, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) def test_discovery_from_direct_products(self): """Test discovery returns directly linked products.""" @@ -170,16 +145,14 @@ class TestProductDiscoveryUnion(TransactionCase): def test_discovery_filters_unpublished(self): """Test that unpublished products are excluded from discovery.""" - unpublished = self.env["product.product"].create( - { - "name": "Unpublished Product", - "type": "consu", - "list_price": 50.0, - "categ_id": self.category1.id, - "is_published": False, - "sale_ok": True, - } - ) + unpublished = self.env['product.product'].create({ + 'name': 'Unpublished Product', + 'type': 'consu', + 'list_price': 50.0, + 'categ_id': self.category1.id, + 'is_published': False, + 'sale_ok': True, + }) self.group_order.category_ids = [(4, self.category1.id)] discovered = self.group_order.product_ids @@ -189,16 +162,14 @@ class TestProductDiscoveryUnion(TransactionCase): def test_discovery_filters_not_for_sale(self): """Test that non-sellable products are excluded.""" - not_for_sale = self.env["product.product"].create( - { - "name": "Not For Sale", - "type": "consu", - "list_price": 60.0, - "categ_id": self.category1.id, - "is_published": True, - "sale_ok": False, - } - ) + not_for_sale = self.env['product.product'].create({ + 'name': 'Not For Sale', + 'type': 'consu', + 'list_price': 60.0, + 'categ_id': self.category1.id, + 'is_published': True, + 'sale_ok': False, + }) self.group_order.category_ids = [(4, self.category1.id)] discovered = self.group_order.product_ids @@ -212,96 +183,76 @@ class TestDeepCategoryHierarchies(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) # Create nested category structure: # Root -> L1 -> L2 -> L3 -> L4 - self.cat_l1 = self.env["product.category"].create( - { - "name": "Level 1", - } - ) + self.cat_l1 = self.env['product.category'].create({ + 'name': 'Level 1', + }) - self.cat_l2 = self.env["product.category"].create( - { - "name": "Level 2", - "parent_id": self.cat_l1.id, - } - ) + self.cat_l2 = self.env['product.category'].create({ + 'name': 'Level 2', + 'parent_id': self.cat_l1.id, + }) - self.cat_l3 = self.env["product.category"].create( - { - "name": "Level 3", - "parent_id": self.cat_l2.id, - } - ) + self.cat_l3 = self.env['product.category'].create({ + 'name': 'Level 3', + 'parent_id': self.cat_l2.id, + }) - self.cat_l4 = self.env["product.category"].create( - { - "name": "Level 4", - "parent_id": self.cat_l3.id, - } - ) + self.cat_l4 = self.env['product.category'].create({ + 'name': 'Level 4', + 'parent_id': self.cat_l3.id, + }) - self.cat_l5 = self.env["product.category"].create( - { - "name": "Level 5", - "parent_id": self.cat_l4.id, - } - ) + self.cat_l5 = self.env['product.category'].create({ + 'name': 'Level 5', + 'parent_id': self.cat_l4.id, + }) # Create products at each level - self.product_l2 = self.env["product.product"].create( - { - "name": "Product L2", - "type": "consu", - "list_price": 10.0, - "categ_id": self.cat_l2.id, - "is_published": True, - "sale_ok": True, - } - ) + self.product_l2 = self.env['product.product'].create({ + 'name': 'Product L2', + 'type': 'consu', + 'list_price': 10.0, + 'categ_id': self.cat_l2.id, + 'is_published': True, + 'sale_ok': True, + }) - self.product_l4 = self.env["product.product"].create( - { - "name": "Product L4", - "type": "consu", - "list_price": 20.0, - "categ_id": self.cat_l4.id, - "is_published": True, - "sale_ok": True, - } - ) + self.product_l4 = self.env['product.product'].create({ + 'name': 'Product L4', + 'type': 'consu', + 'list_price': 20.0, + 'categ_id': self.cat_l4.id, + 'is_published': True, + 'sale_ok': True, + }) - self.product_l5 = self.env["product.product"].create( - { - "name": "Product L5", - "type": "consu", - "list_price": 30.0, - "categ_id": self.cat_l5.id, - "is_published": True, - "sale_ok": True, - } - ) + self.product_l5 = self.env['product.product'].create({ + 'name': 'Product L5', + 'type': 'consu', + 'list_price': 30.0, + 'categ_id': self.cat_l5.id, + 'is_published': True, + 'sale_ok': True, + }) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) def test_discovery_root_category_includes_all_descendants(self): """Test that linking root category discovers all nested products.""" @@ -356,41 +307,33 @@ class TestEmptySourcesDiscovery(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) - self.category = self.env["product.category"].create( - { - "name": "Empty Category", - } - ) + self.category = self.env['product.category'].create({ + 'name': 'Empty Category', + }) # No products in this category - self.supplier = self.env["res.partner"].create( - { - "name": "Supplier No Products", - "is_supplier": True, - } - ) + self.supplier = self.env['res.partner'].create({ + 'name': 'Supplier No Products', + 'is_supplier': True, + }) # No products from this supplier start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) def test_discovery_empty_category(self): """Test discovery from empty category.""" @@ -428,47 +371,39 @@ class TestProductDiscoveryOrdering(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) + self.category = self.env['product.category'].create({ + 'name': 'Test Category', + }) # Create products with specific names self.products = [] for i in range(5): - product = self.env["product.product"].create( - { - "name": f"Product {chr(65 + i)}", # A, B, C, D, E - "type": "consu", - "list_price": (i + 1) * 10.0, - "categ_id": self.category.id, - "is_published": True, - "sale_ok": True, - } - ) + product = self.env['product.product'].create({ + 'name': f'Product {chr(65 + i)}', # A, B, C, D, E + 'type': 'consu', + 'list_price': (i + 1) * 10.0, + 'categ_id': self.category.id, + 'is_published': True, + 'sale_ok': True, + }) self.products.append(product) start_date = datetime.now().date() - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) def test_discovery_consistent_ordering(self): """Test that repeated calls return same order.""" @@ -478,7 +413,10 @@ class TestProductDiscoveryOrdering(TransactionCase): discovered2 = list(self.group_order.product_ids) # Order should be consistent - self.assertEqual([p.id for p in discovered1], [p.id for p in discovered2]) + self.assertEqual( + [p.id for p in discovered1], + [p.id for p in discovered2] + ) def test_discovery_alphabetical_or_price_order(self): """Test that products are ordered predictably.""" @@ -489,6 +427,6 @@ class TestProductDiscoveryOrdering(TransactionCase): # Should be in some consistent order (name, price, ID, etc) # Verify they're the same products, regardless of order self.assertEqual(len(discovered), 5) - discovered_ids = {p.id for p in discovered} - expected_ids = {p.id for p in self.products} + discovered_ids = set(p.id for p in discovered) + expected_ids = set(p.id for p in self.products) self.assertEqual(discovered_ids, expected_ids) diff --git a/website_sale_aplicoop/tests/test_product_extension.py b/website_sale_aplicoop/tests/test_product_extension.py index 2c3d0c8..f8ed4d9 100644 --- a/website_sale_aplicoop/tests/test_product_extension.py +++ b/website_sale_aplicoop/tests/test_product_extension.py @@ -1,106 +1,91 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from datetime import datetime, timedelta from odoo.tests.common import TransactionCase class TestProductExtension(TransactionCase): - """Test suite para las extensiones de product.template.""" + '''Test suite para las extensiones de product.template.''' def setUp(self): - super().setUp() - self.product = self.env["product.product"].create( - { - "name": "Test Product", - } - ) - self.order = self.env["group.order"].create( - {"name": "Test Order", "product_ids": [(4, self.product.id)]} - ) + super(TestProductExtension, self).setUp() + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + }) + self.order = self.env['group.order'].create({ + 'name': 'Test Order', + 'product_ids': [(4, self.product.id)] + }) def test_product_template_group_order_ids_field_exists(self): - """Test que el campo group_order_ids existe en product.template.""" + '''Test que el campo group_order_ids existe en product.template.''' product_template = self.product.product_tmpl_id # El campo debe existir y ser readonly - self.assertTrue(hasattr(product_template, "group_order_ids")) + self.assertTrue(hasattr(product_template, 'group_order_ids')) def test_product_group_order_ids_readonly(self): - """Test that group_order_ids is a readonly field""" - field = self.env["product.template"]._fields["group_order_ids"] + """ Test that group_order_ids is a readonly field """ + field = self.env['product.template']._fields['group_order_ids'] self.assertTrue(field.readonly) def test_product_group_order_ids_reverse_lookup(self): - """Test that adding a product to an order reflects in group_order_ids""" + """ Test that adding a product to an order reflects in group_order_ids """ related_orders = self.product.product_tmpl_id.group_order_ids self.assertIn(self.order, related_orders) def test_product_group_order_ids_empty_by_default(self): - """Test that a new product has no group orders""" - new_product = self.env["product.product"].create({"name": "New Product"}) + """ Test that a new product has no group orders """ + new_product = self.env['product.product'].create({'name': 'New Product'}) self.assertFalse(new_product.product_tmpl_id.group_order_ids) def test_product_group_order_ids_multiple_orders(self): - """Test that group_order_ids can contain multiple orders""" - order2 = self.env["group.order"].create( - {"name": "Test Order 2", "product_ids": [(4, self.product.id)]} - ) + """ Test that group_order_ids can contain multiple orders """ + order2 = self.env['group.order'].create({ + 'name': 'Test Order 2', + 'product_ids': [(4, self.product.id)] + }) self.assertIn(self.order, self.product.product_tmpl_id.group_order_ids) self.assertIn(order2, self.product.product_tmpl_id.group_order_ids) def test_product_group_order_ids_empty_after_remove_from_order(self): - """Test that group_order_ids is empty after removing the product from all orders""" - self.order.write({"product_ids": [(3, self.product.id)]}) + """ Test that group_order_ids is empty after removing the product from all orders """ + self.order.write({'product_ids': [(3, self.product.id)]}) self.assertFalse(self.product.product_tmpl_id.group_order_ids) def test_product_group_order_ids_with_multiple_products(self): - """Test group_order_ids with multiple products in one order""" - product2 = self.env["product.product"].create({"name": "Test Product 2"}) - self.order.write({"product_ids": [(4, self.product.id), (4, product2.id)]}) + """ Test group_order_ids with multiple products in one order """ + product2 = self.env['product.product'].create({'name': 'Test Product 2'}) + self.order.write({'product_ids': [ + (4, self.product.id), + (4, product2.id) + ]}) self.assertIn(self.order, self.product.product_tmpl_id.group_order_ids) self.assertIn(self.order, product2.product_tmpl_id.group_order_ids) def test_product_with_variants_group_order_ids(self): - """Test that group_order_ids works correctly with product variants""" + """ Test that group_order_ids works correctly with product variants """ # Create a product template with two variants - product_template = self.env["product.template"].create( - { - "name": "Product with Variants", - "attribute_line_ids": [ - ( - 0, - 0, - { - "attribute_id": self.env.ref( - "product.product_attribute_1" - ).id, - "value_ids": [ - ( - 4, - self.env.ref( - "product.product_attribute_value_1" - ).id, - ), - ( - 4, - self.env.ref( - "product.product_attribute_value_2" - ).id, - ), - ], - }, - ) - ], - } - ) + product_template = self.env['product.template'].create({ + 'name': 'Product with Variants', + 'attribute_line_ids': [(0, 0, { + 'attribute_id': self.env.ref('product.product_attribute_1').id, + 'value_ids': [ + (4, self.env.ref('product.product_attribute_value_1').id), + (4, self.env.ref('product.product_attribute_value_2').id) + ] + })] + }) variant1 = product_template.product_variant_ids[0] variant2 = product_template.product_variant_ids[1] # Add one variant to an order (store variant id, not template id) - order_with_variant = self.env["group.order"].create( - {"name": "Order with Variant", "product_ids": [(4, variant1.id)]} - ) + order_with_variant = self.env['group.order'].create({ + 'name': 'Order with Variant', + 'product_ids': [(4, variant1.id)] + }) # Check that the order appears in the group_order_ids of the template self.assertIn(order_with_variant, product_template.group_order_ids) diff --git a/website_sale_aplicoop/tests/test_record_rules.py b/website_sale_aplicoop/tests/test_record_rules.py index e8be191..e3f1e81 100644 --- a/website_sale_aplicoop/tests/test_record_rules.py +++ b/website_sale_aplicoop/tests/test_record_rules.py @@ -1,170 +1,145 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta -from odoo.exceptions import AccessError from odoo.tests.common import TransactionCase +from odoo.exceptions import AccessError class TestGroupOrderRecordRules(TransactionCase): - """Test suite para record rules de multicompañía en group.order.""" + '''Test suite para record rules de multicompañía en group.order.''' def setUp(self): super().setUp() # Crear dos compañías - self.company1 = self.env["res.company"].create( - { - "name": "Company 1", - } - ) - self.company2 = self.env["res.company"].create( - { - "name": "Company 2", - } - ) + self.company1 = self.env['res.company'].create({ + 'name': 'Company 1', + }) + self.company2 = self.env['res.company'].create({ + 'name': 'Company 2', + }) # Crear usuarios para cada compañía - self.user_company1 = self.env["res.users"].create( - { - "name": "User Company 1", - "login": "user_c1", - "password": "pass123", - "company_id": self.company1.id, - "company_ids": [(6, 0, [self.company1.id])], - } - ) + self.user_company1 = self.env['res.users'].create({ + 'name': 'User Company 1', + 'login': 'user_c1', + 'password': 'pass123', + 'company_id': self.company1.id, + 'company_ids': [(6, 0, [self.company1.id])], + }) - self.user_company2 = self.env["res.users"].create( - { - "name": "User Company 2", - "login": "user_c2", - "password": "pass123", - "company_id": self.company2.id, - "company_ids": [(6, 0, [self.company2.id])], - } - ) + self.user_company2 = self.env['res.users'].create({ + 'name': 'User Company 2', + 'login': 'user_c2', + 'password': 'pass123', + 'company_id': self.company2.id, + 'company_ids': [(6, 0, [self.company2.id])], + }) # Crear admin con acceso a ambas compañías - self.admin_user = self.env["res.users"].create( - { - "name": "Admin Both", - "login": "admin_both", - "password": "pass123", - "company_id": self.company1.id, - "company_ids": [(6, 0, [self.company1.id, self.company2.id])], - } - ) + self.admin_user = self.env['res.users'].create({ + 'name': 'Admin Both', + 'login': 'admin_both', + 'password': 'pass123', + 'company_id': self.company1.id, + 'company_ids': [(6, 0, [self.company1.id, self.company2.id])], + }) # Crear grupos en cada compañía - self.group1 = self.env["res.partner"].create( - { - "name": "Grupo Company 1", - "is_company": True, - "email": "grupo1@test.com", - "company_id": self.company1.id, - } - ) + self.group1 = self.env['res.partner'].create({ + 'name': 'Grupo Company 1', + 'is_company': True, + 'email': 'grupo1@test.com', + 'company_id': self.company1.id, + }) - self.group2 = self.env["res.partner"].create( - { - "name": "Grupo Company 2", - "is_company": True, - "email": "grupo2@test.com", - "company_id": self.company2.id, - } - ) + self.group2 = self.env['res.partner'].create({ + 'name': 'Grupo Company 2', + 'is_company': True, + 'email': 'grupo2@test.com', + 'company_id': self.company2.id, + }) # Crear órdenes en cada compañía - self.order1 = self.env["group.order"].create( - { - "name": "Pedido Company 1", - "group_ids": [(6, 0, [self.group1.id])], - "company_id": self.company1.id, - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + self.order1 = self.env['group.order'].create({ + 'name': 'Pedido Company 1', + 'group_ids': [(6, 0, [self.group1.id])], + 'company_id': self.company1.id, + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) - self.order2 = self.env["group.order"].create( - { - "name": "Pedido Company 2", - "group_ids": [(6, 0, [self.group2.id])], - "company_id": self.company2.id, - "type": "regular", - "start_date": datetime.now().date(), - "end_date": (datetime.now() + timedelta(days=7)).date(), - "period": "weekly", - "pickup_day": "5", - "cutoff_day": "0", - } - ) + self.order2 = self.env['group.order'].create({ + 'name': 'Pedido Company 2', + 'group_ids': [(6, 0, [self.group2.id])], + 'company_id': self.company2.id, + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': (datetime.now() + timedelta(days=7)).date(), + 'period': 'weekly', + 'pickup_day': '5', + 'cutoff_day': '0', + }) def test_user_company1_can_read_own_orders(self): - """Test que usuario de Company 1 puede leer sus propias órdenes.""" - orders = ( - self.env["group.order"] - .with_user(self.user_company1) - .search([("company_id", "=", self.company1.id)]) - ) + '''Test que usuario de Company 1 puede leer sus propias órdenes.''' + orders = self.env['group.order'].with_user( + self.user_company1 + ).search([('company_id', '=', self.company1.id)]) self.assertIn(self.order1, orders) def test_user_company1_cannot_read_company2_orders(self): - """Test que usuario de Company 1 NO puede leer órdenes de Company 2.""" - orders = ( - self.env["group.order"] - .with_user(self.user_company1) - .search([("company_id", "=", self.company2.id)]) - ) + '''Test que usuario de Company 1 NO puede leer órdenes de Company 2.''' + orders = self.env['group.order'].with_user( + self.user_company1 + ).search([('company_id', '=', self.company2.id)]) self.assertNotIn(self.order2, orders) self.assertEqual(len(orders), 0) def test_admin_can_read_all_orders(self): - """Test que admin con acceso a ambas compañías ve todas las órdenes.""" - orders = self.env["group.order"].with_user(self.admin_user).search([]) + '''Test que admin con acceso a ambas compañías ve todas las órdenes.''' + orders = self.env['group.order'].with_user( + self.admin_user + ).search([]) self.assertIn(self.order1, orders) self.assertIn(self.order2, orders) def test_user_cannot_write_other_company_order(self): - """Test que usuario no puede escribir en orden de otra compañía.""" + '''Test que usuario no puede escribir en orden de otra compañía.''' with self.assertRaises(AccessError): - self.order2.with_user(self.user_company1).write( - { - "name": "Intentando cambiar nombre", - } - ) + self.order2.with_user(self.user_company1).write({ + 'name': 'Intentando cambiar nombre', + }) def test_record_rule_filters_search(self): - """Test que búsqueda automáticamente filtra por record rule.""" + '''Test que búsqueda automáticamente filtra por record rule.''' # Usuario de Company 1 busca todas las órdenes - orders_c1 = ( - self.env["group.order"] - .with_user(self.user_company1) - .search([("state", "=", "draft")]) - ) + orders_c1 = self.env['group.order'].with_user( + self.user_company1 + ).search([('state', '=', 'draft')]) # Solo debe ver su orden self.assertEqual(len(orders_c1), 1) self.assertEqual(orders_c1[0], self.order1) def test_cross_company_access_denied(self): - """Test que acceso entre compañías es denegado.""" + '''Test que acceso entre compañías es denegado.''' # Usuario company1 intenta acceder a orden de company2 with self.assertRaises(AccessError): self.order2.with_user(self.user_company1).read() def test_admin_can_bypass_company_restriction(self): - """Test que admin puede acceder a órdenes de cualquier compañía.""" + '''Test que admin puede acceder a órdenes de cualquier compañía.''' # Admin lee orden de company2 sin problema order2_admin = self.order2.with_user(self.admin_user) - self.assertEqual(order2_admin.name, "Pedido Company 2") + self.assertEqual(order2_admin.name, 'Pedido Company 2') self.assertEqual(order2_admin.company_id, self.company2) diff --git a/website_sale_aplicoop/tests/test_res_partner.py b/website_sale_aplicoop/tests/test_res_partner.py index 5d0bf03..2070ec7 100644 --- a/website_sale_aplicoop/tests/test_res_partner.py +++ b/website_sale_aplicoop/tests/test_res_partner.py @@ -5,40 +5,34 @@ from odoo.tests.common import TransactionCase class TestResPartnerExtension(TransactionCase): - """Test suite para la extensión res.partner (user-group relationship).""" + '''Test suite para la extensión res.partner (user-group relationship).''' def setUp(self): super().setUp() # Crear grupos (res.partner with is_company=True) - self.group1 = self.env["res.partner"].create( - { - "name": "Grupo 1", - "is_company": True, - "email": "grupo1@test.com", - } - ) + self.group1 = self.env['res.partner'].create({ + 'name': 'Grupo 1', + 'is_company': True, + 'email': 'grupo1@test.com', + }) - self.group2 = self.env["res.partner"].create( - { - "name": "Grupo 2", - "is_company": True, - "email": "grupo2@test.com", - } - ) + self.group2 = self.env['res.partner'].create({ + 'name': 'Grupo 2', + 'is_company': True, + 'email': 'grupo2@test.com', + }) # Crear usuario - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + }) def test_partner_can_belong_to_groups(self): - """Test que un partner (usuario) puede pertenecer a múltiples grupos.""" + '''Test que un partner (usuario) puede pertenecer a múltiples grupos.''' partner = self.user.partner_id - + # Agregar partner a grupos (usar campo member_ids) partner.member_ids = [(6, 0, [self.group1.id, self.group2.id])] @@ -48,14 +42,12 @@ class TestResPartnerExtension(TransactionCase): self.assertEqual(len(partner.member_ids), 2) def test_group_can_have_multiple_users(self): - """Test que un grupo puede tener múltiples usuarios.""" - user2 = self.env["res.users"].create( - { - "name": "Test User 2", - "login": "testuser2@test.com", - "email": "testuser2@test.com", - } - ) + '''Test que un grupo puede tener múltiples usuarios.''' + user2 = self.env['res.users'].create({ + 'name': 'Test User 2', + 'login': 'testuser2@test.com', + 'email': 'testuser2@test.com', + }) # Agregar usuarios al grupo self.group1.user_ids = [(6, 0, [self.user.id, user2.id])] @@ -66,28 +58,26 @@ class TestResPartnerExtension(TransactionCase): self.assertEqual(len(self.group1.user_ids), 2) def test_user_group_relationship_is_bidirectional(self): - """Test que se puede modificar la relación desde el lado del partner o el grupo.""" + '''Test que se puede modificar la relación desde el lado del partner o el grupo.''' partner = self.user.partner_id - + # Opción 1: Agregar grupo al usuario (desde el lado del usuario/partner) partner.member_ids = [(6, 0, [self.group1.id])] self.assertIn(self.group1, partner.member_ids) - - # Opción 2: Agregar usuario al grupo (desde el lado del grupo) + + # Opción 2: Agregar usuario al grupo (desde el lado del grupo) # Nota: Esto es una relación Many2many independiente - user2 = self.env["res.users"].create( - { - "name": "Test User 2", - "login": "testuser2@test.com", - "email": "testuser2@test.com", - } - ) + user2 = self.env['res.users'].create({ + 'name': 'Test User 2', + 'login': 'testuser2@test.com', + 'email': 'testuser2@test.com', + }) self.group2.user_ids = [(6, 0, [user2.id])] self.assertIn(user2, self.group2.user_ids) def test_empty_group_ids(self): - """Test que un partner sin grupos tiene group_ids vacío.""" + '''Test que un partner sin grupos tiene group_ids vacío.''' partner = self.user.partner_id - + # Sin agregar a ningún grupo self.assertEqual(len(partner.member_ids), 0) diff --git a/website_sale_aplicoop/tests/test_save_order_endpoints.py b/website_sale_aplicoop/tests/test_save_order_endpoints.py index 4e975fe..fe446a7 100644 --- a/website_sale_aplicoop/tests/test_save_order_endpoints.py +++ b/website_sale_aplicoop/tests/test_save_order_endpoints.py @@ -11,8 +11,7 @@ draft sale orders. See: website_sale_aplicoop/controllers/website_sale.py """ -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta from odoo.tests.common import TransactionCase @@ -24,72 +23,60 @@ class TestSaveOrderEndpoints(TransactionCase): super().setUp() # Create a consumer group - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - "email": "group@test.com", - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + 'email': 'group@test.com', + }) # Create a group member (user partner) - self.member_partner = self.env["res.partner"].create( - { - "name": "Group Member Partner", - "email": "member@test.com", - } - ) + self.member_partner = self.env['res.partner'].create({ + 'name': 'Group Member Partner', + 'email': 'member@test.com', + }) # Add member to group self.group.member_ids = [(4, self.member_partner.id)] # Create test user - self.user = self.env["res.users"].create( - { - "name": "Test User", - "login": "testuser@test.com", - "email": "testuser@test.com", - "partner_id": self.member_partner.id, - } - ) + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'testuser@test.com', + 'email': 'testuser@test.com', + 'partner_id': self.member_partner.id, + }) # Create a group order start_date = datetime.now().date() end_date = start_date + timedelta(days=7) - self.group_order = self.env["group.order"].create( - { - "name": "Test Group Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": end_date, - "period": "weekly", - "pickup_day": "3", # Wednesday - "pickup_date": start_date + timedelta(days=3), - "home_delivery": False, - "cutoff_day": "0", - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Group Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': end_date, + 'period': 'weekly', + 'pickup_day': '3', # Wednesday + 'pickup_date': start_date + timedelta(days=3), + 'home_delivery': False, + 'cutoff_day': '0', + }) # Open the group order self.group_order.action_open() # Create products for the order - self.category = self.env["product.category"].create( - { - "name": "Test Category", - } - ) + self.category = self.env['product.category'].create({ + 'name': 'Test Category', + }) - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", - "list_price": 10.0, - "categ_id": self.category.id, - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', + 'list_price': 10.0, + 'categ_id': self.category.id, + }) # Associate product with group order self.group_order.product_ids = [(4, self.product.id)] @@ -97,22 +84,22 @@ class TestSaveOrderEndpoints(TransactionCase): def test_save_eskaera_draft_creates_order_with_group_order_id(self): """ Test that save_eskaera_draft() creates a sale.order with group_order_id. - + This is the main fix: ensure that the /eskaera/save-order endpoint correctly links the created sale.order to the group.order. """ # Simulate what the controller does: create order with group_order_id order_vals = { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_day": self.group_order.pickup_day, - "pickup_date": self.group_order.pickup_date, - "home_delivery": self.group_order.home_delivery, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_day': self.group_order.pickup_day, + 'pickup_date': self.group_order.pickup_date, + 'home_delivery': self.group_order.home_delivery, + 'order_line': [], + 'state': 'draft', } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify the order was created with group_order_id self.assertIsNotNone(sale_order.id) @@ -122,34 +109,34 @@ class TestSaveOrderEndpoints(TransactionCase): def test_save_eskaera_draft_propagates_pickup_day(self): """Test that save_eskaera_draft() propagates pickup_day correctly.""" order_vals = { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_day": self.group_order.pickup_day, - "pickup_date": self.group_order.pickup_date, - "home_delivery": self.group_order.home_delivery, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_day': self.group_order.pickup_day, + 'pickup_date': self.group_order.pickup_date, + 'home_delivery': self.group_order.home_delivery, + 'order_line': [], + 'state': 'draft', } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify pickup_day was propagated - self.assertEqual(sale_order.pickup_day, "3") + self.assertEqual(sale_order.pickup_day, '3') self.assertEqual(sale_order.pickup_day, self.group_order.pickup_day) def test_save_eskaera_draft_propagates_pickup_date(self): """Test that save_eskaera_draft() propagates pickup_date correctly.""" order_vals = { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_day": self.group_order.pickup_day, - "pickup_date": self.group_order.pickup_date, - "home_delivery": self.group_order.home_delivery, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_day': self.group_order.pickup_day, + 'pickup_date': self.group_order.pickup_date, + 'home_delivery': self.group_order.home_delivery, + 'order_line': [], + 'state': 'draft', } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify pickup_date was propagated self.assertEqual(sale_order.pickup_date, self.group_order.pickup_date) @@ -157,35 +144,33 @@ class TestSaveOrderEndpoints(TransactionCase): def test_save_eskaera_draft_propagates_home_delivery(self): """Test that save_eskaera_draft() propagates home_delivery correctly.""" # Create a group order with home_delivery=True - group_order_home = self.env["group.order"].create( - { - "name": "Test Group Order with Home Delivery", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date(), - "end_date": datetime.now().date() + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "pickup_date": datetime.now().date() + timedelta(days=3), - "home_delivery": True, # Enable home delivery - "cutoff_day": "0", - } - ) + group_order_home = self.env['group.order'].create({ + 'name': 'Test Group Order with Home Delivery', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date(), + 'end_date': datetime.now().date() + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'pickup_date': datetime.now().date() + timedelta(days=3), + 'home_delivery': True, # Enable home delivery + 'cutoff_day': '0', + }) group_order_home.action_open() # Test with home_delivery=True order_vals = { - "partner_id": self.member_partner.id, - "group_order_id": group_order_home.id, - "pickup_day": group_order_home.pickup_day, - "pickup_date": group_order_home.pickup_date, - "home_delivery": group_order_home.home_delivery, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': group_order_home.id, + 'pickup_day': group_order_home.pickup_day, + 'pickup_date': group_order_home.pickup_date, + 'home_delivery': group_order_home.home_delivery, + 'order_line': [], + 'state': 'draft', } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify home_delivery was propagated self.assertTrue(sale_order.home_delivery) @@ -194,65 +179,65 @@ class TestSaveOrderEndpoints(TransactionCase): def test_save_eskaera_draft_order_is_draft_state(self): """Test that save_eskaera_draft() creates order in draft state.""" order_vals = { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_day": self.group_order.pickup_day, - "pickup_date": self.group_order.pickup_date, - "home_delivery": self.group_order.home_delivery, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_day': self.group_order.pickup_day, + 'pickup_date': self.group_order.pickup_date, + 'home_delivery': self.group_order.home_delivery, + 'order_line': [], + 'state': 'draft', } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify order is in draft state - self.assertEqual(sale_order.state, "draft") + self.assertEqual(sale_order.state, 'draft') def test_save_eskaera_draft_multiple_fields_together(self): """ Test that all fields are saved together correctly. - + This test ensures that the fix didn't break any field and that all group_order-related fields are propagated together. """ order_vals = { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_day": self.group_order.pickup_day, - "pickup_date": self.group_order.pickup_date, - "home_delivery": self.group_order.home_delivery, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_day': self.group_order.pickup_day, + 'pickup_date': self.group_order.pickup_date, + 'home_delivery': self.group_order.home_delivery, + 'order_line': [], + 'state': 'draft', } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify all fields together self.assertEqual(sale_order.group_order_id.id, self.group_order.id) self.assertEqual(sale_order.pickup_day, self.group_order.pickup_day) self.assertEqual(sale_order.pickup_date, self.group_order.pickup_date) self.assertEqual(sale_order.home_delivery, self.group_order.home_delivery) - self.assertEqual(sale_order.state, "draft") + self.assertEqual(sale_order.state, 'draft') def test_save_cart_draft_also_saves_group_order_id(self): """ Test that save_cart_draft() (the working endpoint) also saves group_order_id. - + This is a regression test to ensure that save_cart_draft() continues to work correctly after the fix to save_eskaera_draft(). """ # save_cart_draft should also include group_order_id order_vals = { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_day": self.group_order.pickup_day, - "pickup_date": self.group_order.pickup_date, - "home_delivery": self.group_order.home_delivery, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_day': self.group_order.pickup_day, + 'pickup_date': self.group_order.pickup_date, + 'home_delivery': self.group_order.home_delivery, + 'order_line': [], + 'state': 'draft', } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify all fields self.assertEqual(sale_order.group_order_id.id, self.group_order.id) @@ -262,18 +247,18 @@ class TestSaveOrderEndpoints(TransactionCase): def test_save_draft_order_without_group_order_id_still_works(self): """ Test that creating a normal sale.order (without group_order_id) still works. - + This ensures backward compatibility - you should still be able to create sale orders without associating them to a group order. """ order_vals = { - "partner_id": self.member_partner.id, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'order_line': [], + 'state': 'draft', # No group_order_id } - sale_order = self.env["sale.order"].create(order_vals) + sale_order = self.env['sale.order'].create(order_vals) # Verify order was created without group_order_id self.assertIsNotNone(sale_order.id) @@ -282,64 +267,62 @@ class TestSaveOrderEndpoints(TransactionCase): def test_group_order_id_field_exists_and_is_stored(self): """ Test that group_order_id field exists on sale.order and is stored correctly. - + This is a sanity check to ensure the field is properly defined in the model. """ # Verify the field exists in the model - sale_order_model = self.env["sale.order"] - self.assertIn("group_order_id", sale_order_model._fields) + sale_order_model = self.env['sale.order'] + self.assertIn('group_order_id', sale_order_model._fields) # Verify it's a Many2one field - field = sale_order_model._fields["group_order_id"] - self.assertEqual(field.type, "many2one") - self.assertEqual(field.comodel_name, "group.order") + field = sale_order_model._fields['group_order_id'] + self.assertEqual(field.type, 'many2one') + self.assertEqual(field.comodel_name, 'group.order') def test_different_group_orders_map_to_different_sale_orders(self): """ Test that different group orders create separate sale orders. - + This ensures that two users buying from different group orders don't accidentally share the same sale.order. """ # Create a second group order - group_order_2 = self.env["group.order"].create( - { - "name": "Test Group Order 2", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": datetime.now().date() + timedelta(days=10), - "end_date": datetime.now().date() + timedelta(days=17), - "period": "weekly", - "pickup_day": "5", - "pickup_date": datetime.now().date() + timedelta(days=12), - "home_delivery": True, - "cutoff_day": "0", - } - ) + group_order_2 = self.env['group.order'].create({ + 'name': 'Test Group Order 2', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': datetime.now().date() + timedelta(days=10), + 'end_date': datetime.now().date() + timedelta(days=17), + 'period': 'weekly', + 'pickup_day': '5', + 'pickup_date': datetime.now().date() + timedelta(days=12), + 'home_delivery': True, + 'cutoff_day': '0', + }) group_order_2.action_open() # Create order for first group order order_vals_1 = { - "partner_id": self.member_partner.id, - "group_order_id": self.group_order.id, - "pickup_day": self.group_order.pickup_day, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': self.group_order.id, + 'pickup_day': self.group_order.pickup_day, + 'order_line': [], + 'state': 'draft', } - sale_order_1 = self.env["sale.order"].create(order_vals_1) + sale_order_1 = self.env['sale.order'].create(order_vals_1) # Create order for second group order order_vals_2 = { - "partner_id": self.member_partner.id, - "group_order_id": group_order_2.id, - "pickup_day": group_order_2.pickup_day, - "order_line": [], - "state": "draft", + 'partner_id': self.member_partner.id, + 'group_order_id': group_order_2.id, + 'pickup_day': group_order_2.pickup_day, + 'order_line': [], + 'state': 'draft', } - sale_order_2 = self.env["sale.order"].create(order_vals_2) + sale_order_2 = self.env['sale.order'].create(order_vals_2) # Verify they're different orders with different group_order_ids self.assertNotEqual(sale_order_1.id, sale_order_2.id) diff --git a/website_sale_aplicoop/tests/test_templates_rendering.py b/website_sale_aplicoop/tests/test_templates_rendering.py index 5389f70..1998c9f 100644 --- a/website_sale_aplicoop/tests/test_templates_rendering.py +++ b/website_sale_aplicoop/tests/test_templates_rendering.py @@ -1,90 +1,77 @@ # Copyright 2025 Criptomart # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from datetime import date -from datetime import timedelta - +from datetime import date, timedelta +from odoo.tests.common import TransactionCase, tagged from odoo import _ -from odoo.tests.common import TransactionCase -from odoo.tests.common import tagged -@tagged("post_install", "-at_install") +@tagged('post_install', '-at_install') class TestTemplatesRendering(TransactionCase): - """Test suite to verify QWeb templates work with day_names context. + '''Test suite to verify QWeb templates work with day_names context. This test covers the fix for the issue where _() function calls in QWeb t-value attributes caused TypeError: 'NoneType' object is not callable. The fix moves day_names definition to Python controller and passes it as context. - """ + ''' def setUp(self): - """Set up test data: create a test group order.""" + '''Set up test data: create a test group order.''' super().setUp() # Create a test supplier - self.supplier = self.env["res.partner"].create( - { - "name": "Test Supplier", - "is_company": True, - } - ) + self.supplier = self.env['res.partner'].create({ + 'name': 'Test Supplier', + 'is_company': True, + }) # Create test products - self.product = self.env["product.product"].create( - { - "name": "Test Product", - "type": "consu", # consumable (consu), service, or storable - } - ) + self.product = self.env['product.product'].create({ + 'name': 'Test Product', + 'type': 'consu', # consumable (consu), service, or storable + }) # Create a test group - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) # Create a group order - self.group_order = self.env["group.order"].create( - { - "name": "Test Order", - "state": "open", - "supplier_ids": [(6, 0, [self.supplier.id])], - "product_ids": [(6, 0, [self.product.id])], - "group_ids": [(6, 0, [self.group.id])], - "start_date": date.today(), - "end_date": date.today() + timedelta(days=7), - "pickup_day": "5", # Saturday - "cutoff_day": "3", # Thursday - } - ) + self.group_order = self.env['group.order'].create({ + 'name': 'Test Order', + 'state': 'open', + 'supplier_ids': [(6, 0, [self.supplier.id])], + 'product_ids': [(6, 0, [self.product.id])], + 'group_ids': [(6, 0, [self.group.id])], + 'start_date': date.today(), + 'end_date': date.today() + timedelta(days=7), + 'pickup_day': '5', # Saturday + 'cutoff_day': '3', # Thursday + }) def test_eskaera_page_template_exists(self): - """Test that eskaera_page template compiles without errors.""" - template = self.env.ref("website_sale_aplicoop.eskaera_page") + '''Test that eskaera_page template compiles without errors.''' + template = self.env.ref('website_sale_aplicoop.eskaera_page') self.assertIsNotNone(template) - self.assertEqual(template.type, "qweb") + self.assertEqual(template.type, 'qweb') def test_eskaera_shop_template_exists(self): - """Test that eskaera_shop template compiles without errors.""" - template = self.env.ref("website_sale_aplicoop.eskaera_shop") + '''Test that eskaera_shop template compiles without errors.''' + template = self.env.ref('website_sale_aplicoop.eskaera_shop') self.assertIsNotNone(template) - self.assertEqual(template.type, "qweb") + self.assertEqual(template.type, 'qweb') def test_eskaera_checkout_template_exists(self): - """Test that eskaera_checkout template compiles without errors.""" - template = self.env.ref("website_sale_aplicoop.eskaera_checkout") + '''Test that eskaera_checkout template compiles without errors.''' + template = self.env.ref('website_sale_aplicoop.eskaera_checkout') self.assertIsNotNone(template) - self.assertEqual(template.type, "qweb") + self.assertEqual(template.type, 'qweb') def test_day_names_context_is_provided(self): - """Test that day_names context is provided by the controller method.""" + '''Test that day_names context is provided by the controller method.''' # Simulate what the controller does, passing env for test context - from odoo.addons.website_sale_aplicoop.controllers.website_sale import ( - AplicoopWebsiteSale, - ) + from odoo.addons.website_sale_aplicoop.controllers.website_sale import AplicoopWebsiteSale controller = AplicoopWebsiteSale() day_names = controller._get_day_names(env=self.env) @@ -99,61 +86,45 @@ class TestTemplatesRendering(TransactionCase): self.assertGreater(len(day_name), 0, f"Day at index {i} is empty string") def test_day_names_not_using_inline_underscore(self): - """Test that day_names are defined in Python, not in t-value attributes. + '''Test that day_names are defined in Python, not in t-value attributes. This test ensures the fix has been applied: - day_names MUST be passed from controller context - day_names MUST NOT be defined with _() inside t-value attributes - Templates use day_names[index] from context, not t-set with _() - """ - template = self.env.ref("website_sale_aplicoop.eskaera_page") + ''' + template = self.env.ref('website_sale_aplicoop.eskaera_page') # Read the template source to verify it doesn't have inline _() in t-value - self.assertIn( - "day_names", - template.arch_db, - "Template must reference day_names from context", - ) + self.assertIn('day_names', template.arch_db, + "Template must reference day_names from context") # The fix ensures no exists # which was causing the NoneType error def test_eskaera_checkout_summary_template_exists(self): - """Test that eskaera_checkout_summary sub-template exists.""" - template = self.env.ref("website_sale_aplicoop.eskaera_checkout_summary") + '''Test that eskaera_checkout_summary sub-template exists.''' + template = self.env.ref('website_sale_aplicoop.eskaera_checkout_summary') self.assertIsNotNone(template) - self.assertEqual(template.type, "qweb") + self.assertEqual(template.type, 'qweb') # Verify it has the expected structure - self.assertIn( - "checkout-summary-table", - template.arch_db, - "Template must have checkout-summary-table id", - ) - self.assertIn( - "Product", - template.arch_db, - "Template must have Product label for translation", - ) - self.assertIn( - "Quantity", - template.arch_db, - "Template must have Quantity label for translation", - ) - self.assertIn( - "Price", template.arch_db, "Template must have Price label for translation" - ) - self.assertIn( - "Subtotal", - template.arch_db, - "Template must have Subtotal label for translation", - ) + self.assertIn('checkout-summary-table', template.arch_db, + "Template must have checkout-summary-table id") + self.assertIn('Product', template.arch_db, + "Template must have Product label for translation") + self.assertIn('Quantity', template.arch_db, + "Template must have Quantity label for translation") + self.assertIn('Price', template.arch_db, + "Template must have Price label for translation") + self.assertIn('Subtotal', template.arch_db, + "Template must have Subtotal label for translation") def test_eskaera_checkout_summary_renders(self): - """Test that eskaera_checkout_summary renders without errors.""" - template = self.env.ref("website_sale_aplicoop.eskaera_checkout_summary") + '''Test that eskaera_checkout_summary renders without errors.''' + template = self.env.ref('website_sale_aplicoop.eskaera_checkout_summary') # Render the template with empty context html = template._render_template(template.xml_id, {}) # Should contain the basic table structure - self.assertIn(" Closed transition is not allowed.""" # Should not allow skipping Open state - self.assertEqual(self.order.state, "draft") - + self.assertEqual(self.order.state, 'draft') + # Calling action_close() without action_open() should fail with self.assertRaises((ValidationError, UserError)): self.order.action_close() @@ -293,36 +261,36 @@ class TestStateTransitions(TransactionCase): def test_illegal_transition_cancelled_to_open(self): """Test that Cancelled -> Open transition is not allowed.""" self.order.action_cancel() - self.assertEqual(self.order.state, "cancelled") - + self.assertEqual(self.order.state, 'cancelled') + # Should not allow re-opening cancelled order with self.assertRaises((ValidationError, UserError)): self.order.action_open() def test_legal_transition_draft_open_closed(self): """Test that Draft -> Open -> Closed is allowed.""" - self.assertEqual(self.order.state, "draft") - + self.assertEqual(self.order.state, 'draft') + self.order.action_open() - self.assertEqual(self.order.state, "open") - + self.assertEqual(self.order.state, 'open') + self.order.action_close() - self.assertEqual(self.order.state, "closed") + self.assertEqual(self.order.state, 'closed') def test_transition_draft_to_cancelled(self): """Test that Draft -> Cancelled is allowed.""" - self.assertEqual(self.order.state, "draft") - + self.assertEqual(self.order.state, 'draft') + self.order.action_cancel() - self.assertEqual(self.order.state, "cancelled") + self.assertEqual(self.order.state, 'cancelled') def test_transition_open_to_cancelled(self): """Test that Open -> Cancelled is allowed (emergency stop).""" self.order.action_open() - self.assertEqual(self.order.state, "open") - + self.assertEqual(self.order.state, 'open') + self.order.action_cancel() - self.assertEqual(self.order.state, "cancelled") + self.assertEqual(self.order.state, 'cancelled') class TestUserPartnerValidation(TransactionCase): @@ -330,37 +298,31 @@ class TestUserPartnerValidation(TransactionCase): def setUp(self): super().setUp() - self.group = self.env["res.partner"].create( - { - "name": "Test Group", - "is_company": True, - } - ) + self.group = self.env['res.partner'].create({ + 'name': 'Test Group', + 'is_company': True, + }) # Create user without partner (edge case) - self.user_no_partner = self.env["res.users"].create( - { - "name": "User No Partner", - "login": "noparnter@test.com", - "partner_id": False, # Explicitly no partner - } - ) + self.user_no_partner = self.env['res.users'].create({ + 'name': 'User No Partner', + 'login': 'noparnter@test.com', + 'partner_id': False, # Explicitly no partner + }) def test_user_without_partner_cannot_access_order(self): """Test that user without partner_id has no access to orders.""" start_date = datetime.now().date() - order = self.env["group.order"].create( - { - "name": "Test Order", - "group_ids": [(6, 0, [self.group.id])], - "type": "regular", - "start_date": start_date, - "end_date": start_date + timedelta(days=7), - "period": "weekly", - "pickup_day": "3", - "cutoff_day": "0", - } - ) + order = self.env['group.order'].create({ + 'name': 'Test Order', + 'group_ids': [(6, 0, [self.group.id])], + 'type': 'regular', + 'start_date': start_date, + 'end_date': start_date + timedelta(days=7), + 'period': 'weekly', + 'pickup_day': '3', + 'cutoff_day': '0', + }) # User without partner should not have access # This should be validated in controller diff --git a/website_sale_aplicoop/views/group_order_views.xml b/website_sale_aplicoop/views/group_order_views.xml index ed87af4..c7d9946 100644 --- a/website_sale_aplicoop/views/group_order_views.xml +++ b/website_sale_aplicoop/views/group_order_views.xml @@ -63,15 +63,6 @@ - - - - - - - - - diff --git a/website_sale_aplicoop/views/load_from_history_templates.xml b/website_sale_aplicoop/views/load_from_history_templates.xml index 1f254df..f664934 100644 --- a/website_sale_aplicoop/views/load_from_history_templates.xml +++ b/website_sale_aplicoop/views/load_from_history_templates.xml @@ -18,7 +18,7 @@ var pickupDate = ''; var homeDelivery = ; var sameGroupOrder = ; - + console.log('load_from_history template: groupOrderId=', groupOrderId); console.log('load_from_history template: saleOrderName=', saleOrderName); console.log('load_from_history template: pickupDay=', pickupDay); @@ -27,16 +27,16 @@ console.log('load_from_history template: sameGroupOrder=', sameGroupOrder); console.log('load_from_history template: itemsJson type=', typeof itemsJson); console.log('load_from_history template: itemsJson value=', itemsJson); - + // If itemsJson is already a string, use it directly; if it's an array, stringify it var itemsJsonString = (typeof itemsJson === 'string') ? itemsJson : JSON.stringify(itemsJson); - + // Store items to sessionStorage sessionStorage['load_from_history_' + groupOrderId] = itemsJsonString; - + // Store sale order name separately sessionStorage['load_from_history_order_name_' + groupOrderId] = saleOrderName; - + // Store pickup fields ONLY if from same group order if (sameGroupOrder === 'true') { sessionStorage['load_from_history_pickup_day_' + groupOrderId] = pickupDay; @@ -46,10 +46,10 @@ } else { console.log('Skipped saving pickup fields (different group order - will use current group order days)'); } - + console.log('Saved to sessionStorage[load_from_history_' + groupOrderId + ']:', itemsJsonString); console.log('Saved order name to sessionStorage[load_from_history_order_name_' + groupOrderId + ']:', saleOrderName); - + // Redirect to group order page // The JavaScript on that page will detect this and load the items window.location.href = '/eskaera/' + groupOrderId; diff --git a/website_sale_aplicoop/views/portal_templates.xml b/website_sale_aplicoop/views/portal_templates.xml index 10d1f77..9532ff5 100644 --- a/website_sale_aplicoop/views/portal_templates.xml +++ b/website_sale_aplicoop/views/portal_templates.xml @@ -9,7 +9,7 @@ Pickup Day Actions - + @@ -35,15 +35,15 @@ - @@ -57,7 +57,7 @@