feat(loyalty): multi-select categories on transactions
Some checks failed
CI / ruff (push) Successful in 24s
CI / validate (push) Has been cancelled
CI / dependency-scanning (push) Has been cancelled
CI / deploy (push) Has been cancelled
CI / docs (push) Has been cancelled
CI / pytest (push) Has been cancelled

Switch from single category_id to category_ids JSON array on
transactions. Sellers can now select multiple categories (e.g.,
Men + Accessories) when entering stamp/points transactions.

- Migration loyalty_009: drop category_id FK, add category_ids JSON
- Schemas: category_id → category_ids (list[int] | None)
- Services: stamp_service + points_service accept category_ids
- Terminal UI: pills are now multi-select (toggle on/off)
- Transaction response: category_names (list[str]) resolved from IDs
- Recent transactions table: new Category column showing comma-
  separated names

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-04-19 21:36:49 +02:00
parent 220f7e3a08
commit 29593f4c61
11 changed files with 81 additions and 32 deletions

View File

@@ -0,0 +1,43 @@
"""loyalty 009 - replace category_id FK with category_ids JSON
Switches from single-category to multi-category support on transactions.
Not live yet so no data migration needed.
Revision ID: loyalty_009
Revises: loyalty_008
Create Date: 2026-04-19
"""
import sqlalchemy as sa
from alembic import op
revision = "loyalty_009"
down_revision = "loyalty_008"
branch_labels = None
depends_on = None
def upgrade() -> None:
op.drop_column("loyalty_transactions", "category_id")
op.add_column(
"loyalty_transactions",
sa.Column(
"category_ids",
sa.JSON(),
nullable=True,
comment="List of category IDs selected for this transaction",
),
)
def downgrade() -> None:
op.drop_column("loyalty_transactions", "category_ids")
op.add_column(
"loyalty_transactions",
sa.Column(
"category_id",
sa.Integer(),
sa.ForeignKey("store_transaction_categories.id", ondelete="SET NULL"),
nullable=True,
),
)

View File

@@ -25,6 +25,7 @@ from sqlalchemy import (
String,
Text,
)
from sqlalchemy.dialects.sqlite import JSON
from sqlalchemy.orm import relationship
from app.core.database import Base
@@ -104,11 +105,10 @@ class LoyaltyTransaction(Base, TimestampMixin):
index=True,
comment="Staff PIN used for this operation",
)
category_id = Column(
Integer,
ForeignKey("store_transaction_categories.id", ondelete="SET NULL"),
category_ids = Column(
JSON,
nullable=True,
comment="Product category (e.g., Men, Women, Accessories)",
comment="List of category IDs selected for this transaction",
)
# Related transaction (for voids/returns)

View File

@@ -762,7 +762,7 @@ def add_stamp(
qr_code=data.qr_code,
card_number=data.card_number,
staff_pin=data.staff_pin,
category_id=data.category_id,
category_ids=data.category_ids,
ip_address=ip,
user_agent=user_agent,
notes=data.notes,
@@ -853,7 +853,7 @@ def earn_points(
purchase_amount_cents=data.purchase_amount_cents,
order_reference=data.order_reference,
staff_pin=data.staff_pin,
category_id=data.category_id,
category_ids=data.category_ids,
ip_address=ip,
user_agent=user_agent,
notes=data.notes,

View File

@@ -188,8 +188,8 @@ class TransactionResponse(BaseModel):
order_reference: str | None = None
reward_id: str | None = None
reward_description: str | None = None
category_id: int | None = None
category_name: str | None = None
category_ids: list[int] | None = None
category_names: list[str] | None = None
notes: str | None = None
# Customer

View File

@@ -47,10 +47,10 @@ class PointsEarnRequest(BaseModel):
description="Staff PIN for verification",
)
# Category (what was sold)
category_id: int | None = Field(
# Categories (what was sold — multi-select)
category_ids: list[int] | None = Field(
None,
description="Transaction category ID (e.g., Men, Women, Accessories)",
description="Transaction category IDs",
)
# Optional metadata

View File

@@ -37,10 +37,10 @@ class StampRequest(BaseModel):
description="Staff PIN for verification",
)
# Category (what was sold)
category_id: int | None = Field(
# Categories (what was sold — multi-select)
category_ids: list[int] | None = Field(
None,
description="Transaction category ID (e.g., Men, Women, Accessories)",
description="Transaction category IDs",
)
# Optional metadata

View File

@@ -836,8 +836,8 @@ class CardService:
"transaction_at": tx.transaction_at.isoformat() if tx.transaction_at else None,
"notes": tx.notes,
"store_name": None,
"category_id": tx.category_id,
"category_name": None,
"category_ids": tx.category_ids,
"category_names": None,
}
if tx.store_id:
@@ -845,15 +845,19 @@ class CardService:
if store_obj:
tx_data["store_name"] = store_obj.name
if tx.category_id:
if tx.category_ids and isinstance(tx.category_ids, list):
from app.modules.loyalty.services.category_service import (
category_service,
)
cat_name = category_service.validate_category_for_store(
db, tx.category_id, tx.store_id or 0
)
tx_data["category_name"] = cat_name
names = []
for cid in tx.category_ids:
name = category_service.validate_category_for_store(
db, cid, tx.store_id or 0
)
if name:
names.append(name)
tx_data["category_names"] = names if names else None
tx_responses.append(tx_data)

View File

@@ -49,7 +49,7 @@ class PointsService:
purchase_amount_cents: int,
order_reference: str | None = None,
staff_pin: str | None = None,
category_id: int | None = None,
category_ids: list[int] | None = None,
ip_address: str | None = None,
user_agent: str | None = None,
notes: str | None = None,
@@ -104,7 +104,7 @@ class PointsService:
raise OrderReferenceRequiredException()
# Category is mandatory when the store has categories configured
if not category_id:
if not category_ids:
from app.modules.loyalty.services.category_service import category_service
store_categories = category_service.list_categories(
@@ -196,7 +196,7 @@ class PointsService:
card_id=card.id,
store_id=store_id,
staff_pin_id=verified_pin.id if verified_pin else None,
category_id=category_id,
category_ids=category_ids,
transaction_type=TransactionType.POINTS_EARNED.value,
points_delta=points_earned,
stamps_balance_after=card.stamp_count,

View File

@@ -46,7 +46,7 @@ class StampService:
qr_code: str | None = None,
card_number: str | None = None,
staff_pin: str | None = None,
category_id: int | None = None,
category_ids: list[int] | None = None,
ip_address: str | None = None,
user_agent: str | None = None,
notes: str | None = None,
@@ -144,7 +144,7 @@ class StampService:
card_id=card.id,
store_id=store_id,
staff_pin_id=verified_pin.id if verified_pin else None,
category_id=category_id,
category_ids=category_ids,
transaction_type=TransactionType.STAMP_EARNED.value,
stamps_delta=1,
stamps_balance_after=card.stamp_count,

View File

@@ -31,7 +31,7 @@ function storeLoyaltyTerminal() {
// Transaction inputs
earnAmount: null,
selectedReward: '',
selectedCategory: null,
selectedCategories: [],
categories: [],
// PIN entry
@@ -300,7 +300,7 @@ function storeLoyaltyTerminal() {
await apiClient.post('/store/loyalty/stamp', {
card_id: this.selectedCard.id,
staff_pin: this.pinDigits,
category_id: this.selectedCategory || undefined,
category_ids: this.selectedCategories.length > 0 ? this.selectedCategories : undefined,
});
Utils.showToast(I18n.t('loyalty.store.terminal.stamp_added'), 'success');
@@ -326,7 +326,7 @@ function storeLoyaltyTerminal() {
card_id: this.selectedCard.id,
purchase_amount_cents: Math.round(this.earnAmount * 100),
staff_pin: this.pinDigits,
category_id: this.selectedCategory || undefined,
category_ids: this.selectedCategories.length > 0 ? this.selectedCategories : undefined,
});
const pointsEarned = response.points_earned || Math.floor(this.earnAmount * (this.program?.points_per_euro || 1));

View File

@@ -286,13 +286,14 @@
<th class="px-4 py-3">{{ _('loyalty.store.terminal.col_customer') }}</th>
<th class="px-4 py-3">{{ _('loyalty.store.terminal.col_type') }}</th>
<th class="px-4 py-3 text-right">{{ _('loyalty.store.terminal.col_points') }}</th>
<th class="px-4 py-3">{{ _('loyalty.store.terminal.select_category') }}</th>
<th class="px-4 py-3">{{ _('loyalty.store.terminal.col_notes') }}</th>
</tr>
</thead>
<tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
<template x-if="recentTransactions.length === 0">
<tr>
<td colspan="5" class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">
<td colspan="6" class="px-4 py-6 text-center text-gray-500 dark:text-gray-400">
{{ _('loyalty.store.terminal.no_recent_transactions') }}
</td>
</tr>
@@ -309,6 +310,7 @@
<td class="px-4 py-3 text-sm text-right font-medium"
:class="tx.points_delta > 0 ? 'text-green-600' : 'text-orange-600'"
x-text="(tx.points_delta > 0 ? '+' : '') + formatNumber(tx.points_delta)"></td>
<td class="px-4 py-3 text-sm text-gray-500" x-text="tx.category_names?.join(', ') || '-'"></td>
<td class="px-4 py-3 text-sm text-gray-500" x-text="tx.notes || '-'"></td>
</tr>
</template>
@@ -331,9 +333,9 @@
<div class="flex flex-wrap gap-2">
<template x-for="cat in categories" :key="cat.id">
<button type="button"
@click="selectedCategory = (selectedCategory === cat.id) ? null : cat.id"
@click="selectedCategories.includes(cat.id) ? selectedCategories = selectedCategories.filter(id => id !== cat.id) : selectedCategories.push(cat.id)"
class="px-3 py-1.5 text-sm font-medium rounded-full border transition-colors"
:class="selectedCategory === cat.id
:class="selectedCategories.includes(cat.id)
? 'bg-purple-600 text-white border-purple-600'
: 'bg-white text-gray-700 border-gray-300 hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600'"
x-text="cat.name">