2 Commits

Author SHA1 Message Date
Priec
1df8d66d5d discount profiles and discounts overall implemented and working
Some checks failed
CI / Check Style (push) Has been cancelled
CI / Run Clippy (push) Has been cancelled
CI / Run Tests (push) Has been cancelled
2026-06-21 23:46:37 +02:00
Priec
c713627a2c personal discounts to businesses done 2026-06-21 23:21:24 +02:00
50 changed files with 2148 additions and 47 deletions

View File

@@ -226,6 +226,34 @@ discount-invalid = Invalid price.
discount-must-be-positive = The sale price must be greater than zero.
discount-below-regular = The sale price must be below the regular price.
discount-percent-range = The percentage must be between 0 and 100.
admin-customers = Business accounts
admin-customers-desc = Manage negotiated prices for business (B2B) accounts.
admin-no-customers = No business accounts yet.
email = Email
back = Back
negotiated-prices = Negotiated prices
negotiated-prices-hint = Set a price for a specific product for this business account. The customer always pays the lower of the public and negotiated price.
manage-prices = Manage prices
public-price = Public price
negotiated-price = Negotiated price
effective-price = Effective price
admin-discount-profiles = Discount profiles
admin-discount-profiles-desc = Create reusable discount layers (a % over chosen products) and assign them to business accounts.
admin-no-profiles = No discount profiles yet.
new-profile = New profile
edit-profile = Edit profile
profile-name-required = Profile name is required.
scope = Scope
products = Products
scope-include = Selected products
scope-all-except = All except selected
scope-include-hint = Applies only to the products selected below.
scope-all-except-hint = Applies to every product except those selected below.
automated-price = Automated price
discount-profiles = Discount profiles
collision = Conflict
resolve = Resolve
no-profiles-assigned = No profiles assigned.
stock = Stock
sku = SKU
currency = Currency

View File

@@ -226,6 +226,34 @@ discount-invalid = Neplatná cena.
discount-must-be-positive = Zľavnená cena musí byť väčšia ako nula.
discount-below-regular = Zľavnená cena musí byť nižšia ako bežná cena.
discount-percent-range = Percento musí byť medzi 0 a 100.
admin-customers = Firemné účty
admin-customers-desc = Spravujte dohodnuté ceny pre firemné (B2B) účty.
admin-no-customers = Zatiaľ žiadne firemné účty.
email = E-mail
back = Späť
negotiated-prices = Dohodnuté ceny
negotiated-prices-hint = Nastavte cenu pre konkrétny produkt pre tento firemný účet. Zákazník vždy zaplatí najnižšiu z verejnej a dohodnutej ceny.
manage-prices = Spravovať ceny
public-price = Verejná cena
negotiated-price = Dohodnutá cena
effective-price = Výsledná cena
admin-discount-profiles = Zľavové profily
admin-discount-profiles-desc = Vytvorte opakovane použiteľné zľavové vrstvy (% na vybrané produkty) a priraďte ich firemným účtom.
admin-no-profiles = Zatiaľ žiadne zľavové profily.
new-profile = Nový profil
edit-profile = Upraviť profil
profile-name-required = Názov profilu je povinný.
scope = Rozsah
products = Produkty
scope-include = Vybrané produkty
scope-all-except = Všetky okrem vybraných
scope-include-hint = Platí len pre vybrané produkty nižšie.
scope-all-except-hint = Platí pre všetky produkty okrem vybraných nižšie.
automated-price = Automatická cena
discount-profiles = Zľavové profily
collision = Konflikt
resolve = Vyriešiť
no-profiles-assigned = Žiadne priradené profily.
stock = Sklad
sku = Kód (SKU)
currency = Mena

File diff suppressed because one or more lines are too long

View File

@@ -82,6 +82,10 @@
class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
{{ t(key="admin-discounts", lang=lang | default(value='sk')) }}
</a>
<a href="/admin/catalog/discount-profiles" data-nav="/admin/catalog/discount-profiles"
class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
{{ t(key="admin-discount-profiles", lang=lang | default(value='sk')) }}
</a>
<a href="/admin/catalog/categories" data-nav="/admin/catalog/categories"
class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
{{ t(key="admin-categories", lang=lang | default(value='sk')) }}
@@ -90,6 +94,10 @@
class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
{{ t(key="admin-orders", lang=lang | default(value='sk')) }}
</a>
<a href="/admin/customers" data-nav="/admin/customers"
class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
{{ t(key="admin-customers", lang=lang | default(value='sk')) }}
</a>
<a href="/admin/shipping" data-nav="/admin/shipping"
class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
{{ t(key="admin-shipping", lang=lang | default(value='sk')) }}

View File

@@ -0,0 +1,71 @@
{% extends "admin/base.html" %}
{% import "macros/ui.html" as ui %}
{% block title %}{% if profile %}{{ t(key="edit-profile", lang=lang | default(value='sk')) }}{% else %}{{ t(key="new-profile", lang=lang | default(value='sk')) }}{% endif %}{% endblock title %}
{% block crumb %}{{ t(key="admin-discount-profiles", lang=lang | default(value='sk')) }}{% endblock crumb %}
{% block content %}
<div class="flex items-center justify-between gap-3">
<h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">
{% if profile %}{{ t(key="edit-profile", lang=lang | default(value='sk')) }}{% else %}{{ t(key="new-profile", lang=lang | default(value='sk')) }}{% endif %}
</h1>
{{ ui::button(variant="outline-secondary", label=t(key="cancel", lang=lang | default(value='sk')), href="/admin/catalog/discount-profiles", size="px-3 py-2 text-sm") }}
</div>
{% if profile %}{% set v_name = profile.name %}{% set v_percent = profile.percent %}{% set v_scope = profile.scope_type %}
{% else %}{% set v_name = "" %}{% set v_percent = "" %}{% set v_scope = "include" %}{% endif %}
<form method="post"
action="{% if profile %}/admin/catalog/discount-profiles/{{ profile.id }}{% else %}/admin/catalog/discount-profiles{% endif %}"
class="mt-6 space-y-5 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
{{ ui::csrf_field() }}
{% if error %}{{ ui::alert_danger(message=t(key=error, lang=lang | default(value='sk'))) }}{% endif %}
<div class="grid gap-5 sm:grid-cols-2">
<div class="space-y-1.5">
<label for="name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="name", lang=lang | default(value='sk')) }}</label>
{{ ui::input(name="name", id="name", required=true, value=v_name) }}
</div>
<div class="space-y-1.5">
<label for="percent" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="discount-percent", lang=lang | default(value='sk')) }}</label>
{{ ui::input(name="percent", id="percent", required=true, value=v_percent, placeholder="0", attrs='inputmode="decimal" min="0" max="100"') }}
</div>
</div>
<fieldset class="space-y-2">
<legend class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="scope", lang=lang | default(value='sk')) }}</legend>
<label class="flex items-center gap-2 text-sm text-on-surface dark:text-on-surface-dark">
<input type="radio" name="scope_type" value="include" {% if v_scope != "all_except" %}checked{% endif %}>
{{ t(key="scope-include-hint", lang=lang | default(value='sk')) }}
</label>
<label class="flex items-center gap-2 text-sm text-on-surface dark:text-on-surface-dark">
<input type="radio" name="scope_type" value="all_except" {% if v_scope == "all_except" %}checked{% endif %}>
{{ t(key="scope-all-except-hint", lang=lang | default(value='sk')) }}
</label>
</fieldset>
<div class="space-y-1.5">
<span class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="products", lang=lang | default(value='sk')) }}</span>
<div class="max-h-72 overflow-y-auto rounded-radius border border-outline p-3 dark:border-outline-dark">
{% if products | length > 0 %}
<div class="grid gap-2 sm:grid-cols-2">
{% for product in products %}
<label class="flex items-center gap-2 text-sm text-on-surface dark:text-on-surface-dark">
<input type="checkbox" name="product_ids" value="{{ product.id }}" {% if product.selected %}checked{% endif %}>
{{ product.name }}
</label>
{% endfor %}
</div>
{% else %}
<p class="text-sm text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="admin-no-products", lang=lang | default(value='sk')) }}</p>
{% endif %}
</div>
</div>
<div class="flex gap-3 pt-2">
{{ ui::button(label=t(key="save", lang=lang | default(value='sk')), type="submit") }}
{{ ui::button(variant="outline-secondary", label=t(key="cancel", lang=lang | default(value='sk')), href="/admin/catalog/discount-profiles") }}
</div>
</form>
{% endblock content %}

View File

@@ -0,0 +1,58 @@
{% extends "admin/base.html" %}
{% import "macros/ui.html" as ui %}
{% block title %}{{ t(key="admin-discount-profiles", lang=lang | default(value='sk')) }}{% endblock title %}
{% block crumb %}{{ t(key="admin-discount-profiles", lang=lang | default(value='sk')) }}{% endblock crumb %}
{% block content %}
<div class="flex flex-wrap items-end justify-between gap-3">
<div>
<h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="admin-discount-profiles", lang=lang | default(value='sk')) }}</h1>
<p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="admin-discount-profiles-desc", lang=lang | default(value='sk')) }}</p>
</div>
{{ ui::button(label=t(key="new-profile", lang=lang | default(value='sk')), href="/admin/catalog/discount-profiles/new") }}
</div>
<div class="mt-6 {{ ui::table_wrap_cls() }}">
{% if profiles | length > 0 %}
<table class="{{ ui::table_cls() }}">
<thead class="{{ ui::thead_cls() }}">
<tr>
{{ ui::th(label=t(key="name", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="discount-percent", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="scope", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="products", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="actions", lang=lang | default(value='sk')), align="text-right") }}
</tr>
</thead>
<tbody class="{{ ui::tbody_cls() }}">
{% for profile in profiles %}
<tr class="{{ ui::row_cls() }}">
<td class="px-4 py-3 font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ profile.name }}</td>
<td class="px-4 py-3 tabular-nums">{{ profile.percent }}%</td>
<td class="px-4 py-3">
{% if profile.scope_type == "all_except" %}{{ t(key="scope-all-except", lang=lang | default(value='sk')) }}{% else %}{{ t(key="scope-include", lang=lang | default(value='sk')) }}{% endif %}
</td>
<td class="px-4 py-3 tabular-nums">{{ profile.product_count }}</td>
<td class="px-4 py-3">
<div class="flex flex-wrap justify-end gap-2">
{{ ui::button(variant="outline-secondary", label=t(key="edit", lang=lang | default(value='sk')), href="/admin/catalog/discount-profiles/" ~ profile.id ~ "/edit", size="px-3 py-1.5 text-xs") }}
<form method="post" action="/admin/catalog/discount-profiles/{{ profile.id }}/delete"
onsubmit="return confirm('{{ t(key="confirm-delete", lang=lang | default(value='sk')) }}')">
{{ ui::csrf_field() }}
{{ ui::button(variant="outline-danger", label=t(key="delete", lang=lang | default(value='sk')), type="submit", size="px-3 py-1.5 text-xs") }}
</form>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<div class="flex flex-col items-center gap-3 px-4 py-16 text-center">
<p class="text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="admin-no-profiles", lang=lang | default(value='sk')) }}</p>
{{ ui::button(label=t(key="new-profile", lang=lang | default(value='sk')), href="/admin/catalog/discount-profiles/new") }}
</div>
{% endif %}
</div>
{% endblock content %}

View File

@@ -0,0 +1,45 @@
{% extends "admin/base.html" %}
{% import "macros/ui.html" as ui %}
{% block title %}{{ t(key="admin-customers", lang=lang | default(value='sk')) }}{% endblock title %}
{% block crumb %}{{ t(key="admin-customers", lang=lang | default(value='sk')) }}{% endblock crumb %}
{% block content %}
<div class="flex flex-wrap items-end justify-between gap-3">
<div>
<h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="admin-customers", lang=lang | default(value='sk')) }}</h1>
<p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="admin-customers-desc", lang=lang | default(value='sk')) }}</p>
</div>
</div>
<div class="mt-6 {{ ui::table_wrap_cls() }}">
{% if customers | length > 0 %}
<table class="{{ ui::table_cls() }}">
<thead class="{{ ui::thead_cls() }}">
<tr>
{{ ui::th(label=t(key="name", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="email", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="negotiated-prices", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="actions", lang=lang | default(value='sk')), align="text-right") }}
</tr>
</thead>
<tbody class="{{ ui::tbody_cls() }}">
{% for customer in customers %}
<tr class="{{ ui::row_cls() }}">
<td class="px-4 py-3 font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ customer.name }}</td>
<td class="px-4 py-3 text-on-surface/70 dark:text-on-surface-dark/70">{{ customer.email }}</td>
<td class="px-4 py-3 tabular-nums">{{ customer.negotiated_count }}</td>
<td class="px-4 py-3 text-right">
{{ ui::button(variant="outline-secondary", label=t(key="manage-prices", lang=lang | default(value='sk')), href="/admin/customers/" ~ customer.id, size="px-3 py-1.5 text-xs") }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<div class="flex flex-col items-center gap-3 px-4 py-16 text-center">
<p class="text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="admin-no-customers", lang=lang | default(value='sk')) }}</p>
</div>
{% endif %}
</div>
{% endblock content %}

View File

@@ -0,0 +1,114 @@
{% extends "admin/base.html" %}
{% import "macros/ui.html" as ui %}
{% block title %}{{ customer.name }}{% endblock title %}
{% block crumb %}{{ t(key="admin-customers", lang=lang | default(value='sk')) }}{% endblock crumb %}
{% block content %}
<div class="flex items-center justify-between gap-3">
<div>
<h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ customer.name }}</h1>
<p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ customer.email }}</p>
</div>
{{ ui::button(variant="outline-secondary", label=t(key="back", lang=lang | default(value='sk')), href="/admin/customers", size="px-3 py-2 text-sm") }}
</div>
{% if error %}
<div class="mt-4">{{ ui::alert_danger(message=t(key=error, lang=lang | default(value='sk'))) }}</div>
{% endif %}
<!-- assigned discount profiles -->
<section class="mt-6 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
<h2 class="text-lg font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="discount-profiles", lang=lang | default(value='sk')) }}</h2>
{% if profiles | length > 0 %}
<form method="post" action="/admin/customers/{{ customer.id }}/profiles" class="mt-3 space-y-3">
{{ ui::csrf_field() }}
<div class="grid gap-2 sm:grid-cols-2">
{% for profile in profiles %}
<label class="flex items-center gap-2 text-sm text-on-surface dark:text-on-surface-dark">
<input type="checkbox" name="profile_ids" value="{{ profile.id }}" {% if profile.assigned %}checked{% endif %}>
<span>{{ profile.name }} <span class="text-on-surface/60 dark:text-on-surface-dark/60">({{ profile.percent }}%, {% if profile.scope_type == "all_except" %}{{ t(key="scope-all-except", lang=lang | default(value='sk')) }}{% else %}{{ t(key="scope-include", lang=lang | default(value='sk')) }}{% endif %})</span></span>
</label>
{% endfor %}
</div>
{{ ui::button(label=t(key="save", lang=lang | default(value='sk')), type="submit", size="px-4 py-2 text-sm") }}
</form>
{% else %}
<p class="mt-2 text-sm text-on-surface/70 dark:text-on-surface-dark/70">
{{ t(key="admin-no-profiles", lang=lang | default(value='sk')) }}
<a href="/admin/catalog/discount-profiles/new" class="text-primary dark:text-primary-dark">{{ t(key="new-profile", lang=lang | default(value='sk')) }}</a>
</p>
{% endif %}
</section>
<p class="mt-6 text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="negotiated-prices-hint", lang=lang | default(value='sk')) }}</p>
<div class="mt-3 {{ ui::table_wrap_cls() }}">
{% if products | length > 0 %}
<table class="{{ ui::table_cls() }}">
<thead class="{{ ui::thead_cls() }}">
<tr>
{{ ui::th(label=t(key="product", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="public-price", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="automated-price", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="negotiated-price", lang=lang | default(value='sk'))) }}
{{ ui::th(label=t(key="effective-price", lang=lang | default(value='sk')), align="text-right") }}
</tr>
</thead>
<tbody class="{{ ui::tbody_cls() }}">
{% for product in products %}
<tr class="{{ ui::row_cls() }}">
<td class="px-4 py-3 font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</td>
<td class="px-4 py-3 tabular-nums">
{% if product.on_public_sale %}
<span class="font-medium text-danger">{{ product.public_price }} {{ product.currency }}</span>
<span class="ml-1 text-xs text-on-surface/50 line-through dark:text-on-surface-dark/50">{{ product.regular_price }}</span>
{% else %}
{{ product.public_price }} {{ product.currency }}
{% endif %}
</td>
<td class="px-4 py-3 tabular-nums">
{% if product.auto_price %}
<div>{{ product.auto_price }} {{ product.currency }}</div>
{% if product.collision %}
<div class="mt-1">{{ ui::badge(label=t(key="collision", lang=lang | default(value='sk')), variant="warning") }}</div>
<form method="post" action="/admin/customers/{{ customer.id }}/resolutions/{{ product.product_id }}" class="mt-1 flex items-center gap-1">
{{ ui::csrf_field() }}
<select name="profile_id" class="rounded-radius border border-outline bg-surface-alt px-2 py-1 text-xs dark:border-outline-dark dark:bg-surface-dark-alt/50 dark:text-on-surface-dark">
{% for c in product.covering %}
<option value="{{ c.id }}" {% if c.id == product.auto_profile_id %}selected{% endif %}>{{ c.name }}</option>
{% endfor %}
</select>
{{ ui::button(label=t(key="resolve", lang=lang | default(value='sk')), type="submit", size="px-2 py-1 text-xs") }}
</form>
{% elif product.auto_profile_name %}
<div class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ product.auto_profile_name }}</div>
{% endif %}
{% else %}
<span class="text-on-surface/40 dark:text-on-surface-dark/40"></span>
{% endif %}
</td>
<td class="px-4 py-3">
<form method="post" action="/admin/customers/{{ customer.id }}/prices/{{ product.product_id }}" class="flex items-center gap-2">
{{ ui::csrf_field() }}
{{ ui::input(name="price", value=product.manual_price | default(value=""), placeholder="0.00", width="w-28", attrs='inputmode="decimal"') }}
{{ ui::button(label=t(key="save", lang=lang | default(value='sk')), type="submit", size="px-3 py-1.5 text-xs") }}
{% if product.manual_price %}
{{ ui::button(variant="outline-danger", label=t(key="remove", lang=lang | default(value='sk')), type="submit", size="px-3 py-1.5 text-xs", attrs='formaction="/admin/customers/' ~ customer.id ~ '/prices/' ~ product.product_id ~ '/remove"') }}
{% endif %}
</form>
</td>
<td class="px-4 py-3 text-right tabular-nums">
<span class="font-medium {% if product.is_business %}text-primary dark:text-primary-dark{% else %}text-on-surface-strong dark:text-on-surface-dark-strong{% endif %}">{{ product.effective_price }} {{ product.currency }}</span>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<div class="flex flex-col items-center gap-3 px-4 py-16 text-center">
<p class="text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="admin-no-products", lang=lang | default(value='sk')) }}</p>
</div>
{% endif %}
</div>
{% endblock content %}

View File

@@ -20,7 +20,14 @@
<td class="px-4 py-3">
<a href="/shop/{{ item.slug }}" class="font-medium text-on-surface-strong hover:text-primary dark:text-on-surface-dark-strong dark:hover:text-primary-dark">{{ item.name }}</a>
</td>
<td class="px-4 py-3 tabular-nums">{{ item.price }} {{ item.currency }}</td>
<td class="px-4 py-3 tabular-nums">
{% if item.on_sale %}
<span class="font-medium text-danger">{{ item.price }} {{ item.currency }}</span>
<span class="ml-1 text-xs text-on-surface/50 line-through dark:text-on-surface-dark/50">{{ item.regular_price }}</span>
{% else %}
{{ item.price }} {{ item.currency }}
{% endif %}
</td>
<td class="px-4 py-3">
{# Changing the quantity posts via htmx (custom `cartchange` event) and
swaps only #cart-body. Dropping to 0 asks for confirmation first,

View File

@@ -36,6 +36,8 @@ mod m20260618_000003_account_type;
mod m20260618_000004_account_ownership;
mod m20260620_000001_add_totp_to_users;
mod m20260621_000001_add_sale_price_to_products;
mod m20260621_000002_account_product_prices;
mod m20260621_000003_discount_profiles;
pub struct Migrator;
#[async_trait::async_trait]
@@ -76,6 +78,8 @@ impl MigratorTrait for Migrator {
Box::new(m20260618_000004_account_ownership::Migration),
Box::new(m20260620_000001_add_totp_to_users::Migration),
Box::new(m20260621_000001_add_sale_price_to_products::Migration),
Box::new(m20260621_000002_account_product_prices::Migration),
Box::new(m20260621_000003_discount_profiles::Migration),
// inject-above (do not remove this comment)
]
}

View File

@@ -0,0 +1,40 @@
use loco_rs::schema::*;
use sea_orm_migration::prelude::*;
#[derive(DeriveMigrationName)]
pub struct Migration;
#[async_trait::async_trait]
impl MigrationTrait for Migration {
async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
// A manually negotiated price (in minor units) for one product, for one
// business account — the "personal agreement" layer. `user`/`product`
// add the user_id/product_id FKs; the unique index below keeps it to one
// row per (account, product).
create_table(
m,
"account_product_prices",
&[
("id", ColType::PkAuto),
("price_cents", ColType::BigInteger),
],
&[("user", ""), ("product", "")],
)
.await?;
m.create_index(
Index::create()
.name("idx_account_product_prices_user_product_unique")
.table(Alias::new("account_product_prices"))
.col(Alias::new("user_id"))
.col(Alias::new("product_id"))
.unique()
.to_owned(),
)
.await
}
async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
drop_table(m, "account_product_prices").await
}
}

View File

@@ -0,0 +1,91 @@
use loco_rs::schema::*;
use sea_orm_migration::prelude::*;
#[derive(DeriveMigrationName)]
pub struct Migration;
#[async_trait::async_trait]
impl MigrationTrait for Migration {
async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
// A reusable, named discount layer: a percentage (basis points, 5% = 500)
// over a product scope. `scope_type` is 'include' (covers the listed
// products) or 'all_except' (covers everything but the listed products).
create_table(
m,
"discount_profiles",
&[
("id", ColType::PkAuto),
("name", ColType::String),
("percent_bp", ColType::Integer),
("scope_type", ColType::StringWithDefault("include".to_string())),
],
&[],
)
.await?;
// Which products the scope lists (meaning depends on scope_type).
create_table(
m,
"discount_profile_products",
&[("id", ColType::PkAuto)],
&[("discount_profile", ""), ("product", "")],
)
.await?;
m.create_index(
Index::create()
.name("idx_discount_profile_products_unique")
.table(Alias::new("discount_profile_products"))
.col(Alias::new("discount_profile_id"))
.col(Alias::new("product_id"))
.unique()
.to_owned(),
)
.await?;
// Which profiles a business account has (mixable).
create_table(
m,
"account_discount_profiles",
&[("id", ColType::PkAuto)],
&[("user", ""), ("discount_profile", "")],
)
.await?;
m.create_index(
Index::create()
.name("idx_account_discount_profiles_unique")
.table(Alias::new("account_discount_profiles"))
.col(Alias::new("user_id"))
.col(Alias::new("discount_profile_id"))
.unique()
.to_owned(),
)
.await?;
// The admin's chosen winning profile when two assigned profiles cover the
// same product for an account (collision resolution).
create_table(
m,
"account_product_resolutions",
&[("id", ColType::PkAuto)],
&[("user", ""), ("product", ""), ("discount_profile", "")],
)
.await?;
m.create_index(
Index::create()
.name("idx_account_product_resolutions_unique")
.table(Alias::new("account_product_resolutions"))
.col(Alias::new("user_id"))
.col(Alias::new("product_id"))
.unique()
.to_owned(),
)
.await
}
async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
drop_table(m, "account_product_resolutions").await?;
drop_table(m, "account_discount_profiles").await?;
drop_table(m, "discount_profile_products").await?;
drop_table(m, "discount_profiles").await
}
}

View File

@@ -17,8 +17,9 @@ use std::{path::Path, sync::Arc};
#[allow(unused_imports)]
use crate::{
controllers::{
account, admin_categories, admin_dashboard, admin_discounts, admin_form, admin_orders,
admin_products, admin_shipping, auth, auth_pages, cart, checkout, home, i18n, media, oauth2,
account, admin_categories, admin_customers, admin_dashboard, admin_discount_profiles,
admin_discounts, admin_form, admin_orders, admin_products, admin_shipping, auth, auth_pages,
cart, checkout, home, i18n, media, oauth2,
shop,
},
initializers,
@@ -105,8 +106,10 @@ impl Hooks for App {
.add_route(admin_dashboard::routes())
.add_route(admin_products::routes())
.add_route(admin_discounts::routes())
.add_route(admin_discount_profiles::routes())
.add_route(admin_categories::routes())
.add_route(admin_orders::routes())
.add_route(admin_customers::routes())
.add_route(admin_shipping::routes())
}

View File

@@ -0,0 +1,300 @@
//! Admin management of business (company) accounts and their pricing.
//!
//! Per company the admin can: assign reusable discount profiles (the automated
//! layer), resolve per-product collisions when two assigned profiles cover the
//! same product, and set a manually negotiated price per product. The effective
//! price the business pays is always resolved by [`crate::shared::pricing`]
//! (lowest of public / automated / negotiated), shown here for reference.
use std::collections::{HashMap, HashSet};
use axum_extra::extract::cookie::CookieJar;
use loco_rs::prelude::*;
use sea_orm::{
ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, PaginatorTrait, QueryFilter,
QueryOrder, Set, TransactionTrait,
};
use serde::Deserialize;
use serde_json::json;
use crate::{
controllers::i18n::current_lang,
models::{
account_discount_profiles, account_product_prices, account_product_resolutions,
discount_profiles, products, _entities::users,
},
shared::{
guard,
money::{format_bp, format_price, parse_price_to_cents},
pricing,
},
};
const COMPANY: &str = "company";
#[derive(Debug, Deserialize)]
struct PriceForm {
price: String,
}
#[derive(Debug, Deserialize)]
struct ResolutionForm {
profile_id: i32,
}
async fn company_by_id(ctx: &AppContext, id: i32) -> Result<users::Model> {
let user = users::Entity::find_by_id(id)
.one(&ctx.db)
.await?
.ok_or_else(|| Error::NotFound)?;
if user.account_type != COMPANY {
return Err(Error::NotFound);
}
Ok(user)
}
async fn assigned_profile_ids(ctx: &AppContext, user_id: i32) -> Result<HashSet<i32>> {
Ok(account_discount_profiles::Entity::find()
.filter(account_discount_profiles::Column::UserId.eq(user_id))
.all(&ctx.db)
.await?
.into_iter()
.map(|a| a.discount_profile_id)
.collect())
}
#[debug_handler]
async fn index(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let companies = users::Entity::find()
.filter(users::Column::AccountType.eq(COMPANY))
.order_by_asc(users::Column::Name)
.all(&ctx.db)
.await?;
let mut rows = Vec::with_capacity(companies.len());
for company in &companies {
let negotiated = account_product_prices::Entity::find()
.filter(account_product_prices::Column::UserId.eq(company.id))
.count(&ctx.db)
.await?;
rows.push(json!({
"id": company.id,
"name": company.name,
"email": company.email,
"negotiated_count": negotiated,
}));
}
format::view(
&v,
"admin/customers/index.html",
json!({ "customers": rows, "lang": current_lang(&jar) }),
)
}
#[debug_handler]
async fn show(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
Path(id): Path<i32>,
Query(params): Query<HashMap<String, String>>,
State(ctx): State<AppContext>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let company = company_by_id(&ctx, id).await?;
// All profiles (for the assignment section + name lookup) and which are
// assigned to this company.
let all_profiles = discount_profiles::Entity::find()
.order_by_asc(discount_profiles::Column::Name)
.all(&ctx.db)
.await?;
let assigned = assigned_profile_ids(&ctx, company.id).await?;
let profile_name: HashMap<i32, String> =
all_profiles.iter().map(|p| (p.id, p.name.clone())).collect();
let profiles_json: Vec<serde_json::Value> = all_profiles
.iter()
.map(|p| {
json!({
"id": p.id,
"name": p.name,
"percent": format_bp(p.percent_bp),
"scope_type": p.scope_type,
"assigned": assigned.contains(&p.id),
})
})
.collect();
let list = products::Entity::find()
.order_by_asc(products::Column::Name)
.all(&ctx.db)
.await?;
let details = pricing::detail_many(&ctx, &list, Some(&company)).await?;
let rows: Vec<serde_json::Value> = list
.iter()
.zip(details.iter())
.map(|(product, d)| {
let covering: Vec<serde_json::Value> = d
.covering_profile_ids
.iter()
.map(|pid| json!({ "id": pid, "name": profile_name.get(pid) }))
.collect();
json!({
"product_id": product.id,
"name": product.name,
"currency": product.currency,
"regular_price": format_price(d.regular_cents),
"public_price": format_price(d.public_cents),
"on_public_sale": product.on_sale(),
"manual_price": d.manual_cents.map(format_price),
"auto_price": d.auto_cents.map(format_price),
"auto_profile_name": d.auto_profile_id.and_then(|pid| profile_name.get(&pid)),
"auto_profile_id": d.auto_profile_id,
"collision": d.collision,
"covering": covering,
"effective_price": format_price(d.price_cents),
"is_business": d.is_business,
})
})
.collect();
format::view(
&v,
"admin/customers/show.html",
json!({
"customer": { "id": company.id, "name": company.name, "email": company.email },
"profiles": profiles_json,
"products": rows,
"error": params.get("error"),
"lang": current_lang(&jar),
}),
)
}
#[debug_handler]
async fn set_price(
auth: auth::JWT,
Path((id, product_id)): Path<(i32, i32)>,
State(ctx): State<AppContext>,
Form(form): Form<PriceForm>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let company = company_by_id(&ctx, id).await?;
let entered = form.price.trim().to_string();
if entered.is_empty() {
account_product_prices::Model::clear(&ctx.db, company.id, product_id).await?;
return format::redirect(&format!("/admin/customers/{id}"));
}
let cents = match parse_price_to_cents(&entered) {
Ok(cents) if cents > 0 => cents,
_ => {
return format::redirect(&format!(
"/admin/customers/{id}?error=discount-must-be-positive"
))
}
};
account_product_prices::Model::upsert(&ctx.db, company.id, product_id, cents).await?;
format::redirect(&format!("/admin/customers/{id}"))
}
#[debug_handler]
async fn remove_price(
auth: auth::JWT,
Path((id, product_id)): Path<(i32, i32)>,
State(ctx): State<AppContext>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let company = company_by_id(&ctx, id).await?;
account_product_prices::Model::clear(&ctx.db, company.id, product_id).await?;
format::redirect(&format!("/admin/customers/{id}"))
}
/// Replace the company's assigned profiles with the submitted set of checkboxes
/// (`profile_ids`, a repeated field axum `Form` can't collect, parsed directly).
#[debug_handler]
async fn sync_profiles(
auth: auth::JWT,
Path(id): Path<i32>,
State(ctx): State<AppContext>,
body: String,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let company = company_by_id(&ctx, id).await?;
let profile_ids: Vec<i32> = form_urlencoded::parse(body.as_bytes())
.filter(|(k, _)| k == "profile_ids")
.filter_map(|(_, v)| v.parse::<i32>().ok())
.collect();
let txn = ctx.db.begin().await?;
account_discount_profiles::Entity::delete_many()
.filter(account_discount_profiles::Column::UserId.eq(company.id))
.exec(&txn)
.await?;
for profile_id in profile_ids {
account_discount_profiles::ActiveModel {
user_id: Set(company.id),
discount_profile_id: Set(profile_id),
..Default::default()
}
.insert(&txn)
.await?;
}
txn.commit().await?;
format::redirect(&format!("/admin/customers/{id}"))
}
/// Record the admin's chosen winning profile for a colliding product.
#[debug_handler]
async fn set_resolution(
auth: auth::JWT,
Path((id, product_id)): Path<(i32, i32)>,
State(ctx): State<AppContext>,
Form(form): Form<ResolutionForm>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let company = company_by_id(&ctx, id).await?;
let existing = account_product_resolutions::Entity::find()
.filter(account_product_resolutions::Column::UserId.eq(company.id))
.filter(account_product_resolutions::Column::ProductId.eq(product_id))
.one(&ctx.db)
.await?;
let mut active = match existing {
Some(row) => row.into_active_model(),
None => account_product_resolutions::ActiveModel {
user_id: Set(company.id),
product_id: Set(product_id),
..Default::default()
},
};
active.discount_profile_id = Set(form.profile_id);
active.save(&ctx.db).await?;
format::redirect(&format!("/admin/customers/{id}"))
}
pub fn routes() -> Routes {
Routes::new()
.add("/admin/customers", get(index))
.add("/admin/customers/{id}", get(show))
.add("/admin/customers/{id}/profiles", post(sync_profiles))
.add("/admin/customers/{id}/prices/{product_id}", post(set_price))
.add(
"/admin/customers/{id}/prices/{product_id}/remove",
post(remove_price),
)
.add(
"/admin/customers/{id}/resolutions/{product_id}",
post(set_resolution),
)
}

View File

@@ -0,0 +1,298 @@
//! Admin CRUD for reusable discount profiles (a named percentage over a product
//! scope). Profiles are assigned to business accounts on the customer page; here
//! the admin only defines them.
use std::collections::HashSet;
use axum_extra::extract::cookie::CookieJar;
use loco_rs::prelude::*;
use sea_orm::{
ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, ModelTrait, PaginatorTrait,
QueryFilter, QueryOrder, Set, TransactionTrait,
};
use serde_json::json;
use crate::{
controllers::i18n::current_lang,
models::{discount_profile_products, discount_profiles, products},
shared::{
guard,
money::{format_bp, parse_percent, percent_to_bp},
},
};
/// Scalar + repeated fields parsed from the profile form. `product_ids` is a
/// repeated checkbox field, which `serde_urlencoded` (axum `Form`) can't collect,
/// so the body is parsed directly.
struct ProfileInput {
name: String,
percent: String,
scope_type: String,
product_ids: Vec<i32>,
}
fn parse_profile_form(body: &str) -> ProfileInput {
let mut name = String::new();
let mut percent = String::new();
let mut scope_type = discount_profiles::SCOPE_INCLUDE.to_string();
let mut product_ids = Vec::new();
for (key, value) in form_urlencoded::parse(body.as_bytes()) {
match key.as_ref() {
"name" => name = value.into_owned(),
"percent" => percent = value.into_owned(),
"scope_type" => scope_type = value.into_owned(),
"product_ids" => {
if let Ok(id) = value.parse::<i32>() {
product_ids.push(id);
}
}
_ => {}
}
}
ProfileInput {
name,
percent,
scope_type,
product_ids,
}
}
async fn profile_by_id(ctx: &AppContext, id: i32) -> Result<discount_profiles::Model> {
discount_profiles::Entity::find_by_id(id)
.one(&ctx.db)
.await?
.ok_or_else(|| Error::NotFound)
}
#[debug_handler]
async fn index(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let profiles = discount_profiles::Entity::find()
.order_by_asc(discount_profiles::Column::Name)
.all(&ctx.db)
.await?;
let mut rows = Vec::with_capacity(profiles.len());
for profile in &profiles {
let count = discount_profile_products::Entity::find()
.filter(discount_profile_products::Column::DiscountProfileId.eq(profile.id))
.count(&ctx.db)
.await?;
rows.push(json!({
"id": profile.id,
"name": profile.name,
"percent": format_bp(profile.percent_bp),
"scope_type": profile.scope_type,
"product_count": count,
}));
}
format::view(
&v,
"admin/catalog/discount_profiles.html",
json!({ "profiles": rows, "lang": current_lang(&jar) }),
)
}
/// Render the create/edit form. `profile` is null on create.
async fn render_form(
ctx: &AppContext,
v: &TeraView,
jar: &CookieJar,
profile: Option<&discount_profiles::Model>,
selected: &HashSet<i32>,
error: Option<&str>,
) -> Result<Response> {
let all_products = products::Entity::find()
.order_by_asc(products::Column::Name)
.all(&ctx.db)
.await?;
let product_rows: Vec<serde_json::Value> = all_products
.iter()
.map(|p| json!({ "id": p.id, "name": p.name, "selected": selected.contains(&p.id) }))
.collect();
let profile_json = match profile {
Some(p) => json!({
"id": p.id,
"name": p.name,
"percent": format_bp(p.percent_bp),
"scope_type": p.scope_type,
}),
None => serde_json::Value::Null,
};
format::view(
v,
"admin/catalog/discount_profile_form.html",
json!({
"profile": profile_json,
"products": product_rows,
"error": error,
"lang": current_lang(jar),
}),
)
}
#[debug_handler]
async fn new(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
render_form(&ctx, &v, &jar, None, &HashSet::new(), None).await
}
#[debug_handler]
async fn edit(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
Path(id): Path<i32>,
State(ctx): State<AppContext>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let profile = profile_by_id(&ctx, id).await?;
let selected = member_ids(&ctx, id).await?;
render_form(&ctx, &v, &jar, Some(&profile), &selected, None).await
}
async fn member_ids(ctx: &AppContext, profile_id: i32) -> Result<HashSet<i32>> {
Ok(discount_profile_products::Entity::find()
.filter(discount_profile_products::Column::DiscountProfileId.eq(profile_id))
.all(&ctx.db)
.await?
.into_iter()
.map(|r| r.product_id)
.collect())
}
/// Validate the parsed form into `(name, percent_bp, scope_type)`, or an error key.
fn validate(input: &ProfileInput) -> std::result::Result<(String, i32, String), &'static str> {
let name = input.name.trim().to_string();
if name.is_empty() {
return Err("profile-name-required");
}
let pct = parse_percent(&input.percent).ok_or("discount-invalid")?;
if pct <= 0.0 || pct >= 100.0 {
return Err("discount-percent-range");
}
let scope = if input.scope_type == discount_profiles::SCOPE_ALL_EXCEPT {
discount_profiles::SCOPE_ALL_EXCEPT
} else {
discount_profiles::SCOPE_INCLUDE
};
Ok((name, percent_to_bp(pct), scope.to_string()))
}
/// Replace a profile's product membership with `product_ids`.
async fn sync_membership(
ctx: &AppContext,
profile_id: i32,
product_ids: &[i32],
) -> Result<()> {
let txn = ctx.db.begin().await?;
discount_profile_products::Entity::delete_many()
.filter(discount_profile_products::Column::DiscountProfileId.eq(profile_id))
.exec(&txn)
.await?;
for product_id in product_ids {
discount_profile_products::ActiveModel {
discount_profile_id: Set(profile_id),
product_id: Set(*product_id),
..Default::default()
}
.insert(&txn)
.await?;
}
txn.commit().await?;
Ok(())
}
#[debug_handler]
async fn create(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
body: String,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let input = parse_profile_form(&body);
let (name, percent_bp, scope_type) = match validate(&input) {
Ok(values) => values,
Err(key) => {
let selected: HashSet<i32> = input.product_ids.iter().copied().collect();
return render_form(&ctx, &v, &jar, None, &selected, Some(key)).await;
}
};
let profile = discount_profiles::ActiveModel {
name: Set(name),
percent_bp: Set(percent_bp),
scope_type: Set(scope_type),
..Default::default()
}
.insert(&ctx.db)
.await?;
sync_membership(&ctx, profile.id, &input.product_ids).await?;
format::redirect("/admin/catalog/discount-profiles")
}
#[debug_handler]
async fn update(
auth: auth::JWT,
jar: CookieJar,
ViewEngine(v): ViewEngine<TeraView>,
Path(id): Path<i32>,
State(ctx): State<AppContext>,
body: String,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
let profile = profile_by_id(&ctx, id).await?;
let input = parse_profile_form(&body);
let (name, percent_bp, scope_type) = match validate(&input) {
Ok(values) => values,
Err(key) => {
let selected: HashSet<i32> = input.product_ids.iter().copied().collect();
return render_form(&ctx, &v, &jar, Some(&profile), &selected, Some(key)).await;
}
};
let mut active = profile.into_active_model();
active.name = Set(name);
active.percent_bp = Set(percent_bp);
active.scope_type = Set(scope_type);
active.update(&ctx.db).await?;
sync_membership(&ctx, id, &input.product_ids).await?;
format::redirect("/admin/catalog/discount-profiles")
}
#[debug_handler]
async fn delete(
auth: auth::JWT,
Path(id): Path<i32>,
State(ctx): State<AppContext>,
) -> Result<Response> {
guard::current_admin(auth, &ctx).await?;
// FK cascades remove membership, assignments and resolutions.
profile_by_id(&ctx, id).await?.delete(&ctx.db).await?;
format::redirect("/admin/catalog/discount-profiles")
}
pub fn routes() -> Routes {
Routes::new()
.add("/admin/catalog/discount-profiles", get(index))
.add("/admin/catalog/discount-profiles/new", get(new))
.add("/admin/catalog/discount-profiles", post(create))
.add("/admin/catalog/discount-profiles/{id}/edit", get(edit))
.add("/admin/catalog/discount-profiles/{id}", post(update))
.add("/admin/catalog/discount-profiles/{id}/delete", post(delete))
}

View File

@@ -16,7 +16,7 @@ use crate::{
models::products,
shared::{
guard,
money::{format_price, parse_price_to_cents},
money::{format_price, parse_percent, parse_price_to_cents},
},
};
@@ -29,12 +29,6 @@ struct DiscountForm {
percent: Option<String>,
}
/// Parse a percentage typed as "20", "20.5" or "20,5" into an `f64`.
fn parse_percent(value: &str) -> Option<f64> {
let parsed: f64 = value.trim().replace(',', ".").parse().ok()?;
parsed.is_finite().then_some(parsed)
}
/// Resolve a percentage off the regular price into a fixed sale price in cents.
/// Rounds the discount amount to the nearest cent.
fn percent_to_sale_cents(regular_cents: i64, percent: f64) -> i64 {

View File

@@ -18,6 +18,7 @@ use crate::{
shared::{
guard,
money::parse_price_to_cents,
pricing,
slug::{slugify, unique_slug},
},
models::{categories, product_images, products},
@@ -129,7 +130,8 @@ async fn index(
.map(|c| c.name),
None => None,
};
rows.push(view::product_card(&product, image, category_name));
let priced = pricing::price_for(&ctx, &product, None).await?;
rows.push(view::product_card(&product, &priced, image, category_name));
}
format::view(
&v,

View File

@@ -1,4 +1,4 @@
use crate::{controllers::i18n::current_lang, shared::{guard, money::format_price}, models::products};
use crate::{controllers::i18n::current_lang, shared::{guard, money::format_price, pricing}, models::products};
use axum::{
http::{HeaderMap, StatusCode},
response::Redirect,
@@ -189,10 +189,10 @@ pub(crate) async fn resolve_cart(
ctx: &AppContext,
jar: &CookieJar,
) -> Result<(Vec<serde_json::Value>, Vec<(i32, i32)>, i64)> {
let mut lines = Vec::new();
let mut valid = Vec::new();
let mut total: i64 = 0;
// Resolve the cart entries to in-stock products first, then price them all
// for the current viewer in one batch (the price depends on who's logged in).
let user = guard::current_user(ctx, jar).await;
let mut items: Vec<(products::Model, i32)> = Vec::new();
for (id, qty) in parse_cart(jar) {
let Some(product) = published_product(ctx, id).await? else {
continue;
@@ -201,15 +201,26 @@ pub(crate) async fn resolve_cart(
if qty == 0 {
continue;
}
let unit_price = product.effective_price_cents();
let line_total = unit_price * i64::from(qty);
items.push((product, qty));
}
let products_only: Vec<products::Model> = items.iter().map(|(p, _)| p.clone()).collect();
let priced = pricing::price_many(ctx, &products_only, user.as_ref()).await?;
let mut lines = Vec::new();
let mut valid = Vec::new();
let mut total: i64 = 0;
for ((product, qty), priced) in items.iter().zip(priced.iter()) {
let unit_price = priced.price_cents;
let line_total = unit_price * i64::from(*qty);
total += line_total;
valid.push((product.id, qty));
valid.push((product.id, *qty));
lines.push(json!({
"id": product.id,
"name": product.name,
"slug": product.slug,
"price": format_price(unit_price),
"regular_price": format_price(priced.regular_cents),
"on_sale": priced.is_reduced(),
"currency": product.currency,
"quantity": qty,
"stock": product.stock,

View File

@@ -331,6 +331,7 @@ async fn place_order(
pickup_point_id,
pickup_point_name,
},
logged_in_customer,
)
.await?;

View File

@@ -12,8 +12,9 @@ async fn index(
ViewEngine(v): ViewEngine<TeraView>,
State(ctx): State<AppContext>,
) -> Result<Response> {
let products = shop::featured_products(&ctx, 8).await?;
let c = guard::chrome(&ctx, &jar).await;
let user = guard::current_user(&ctx, &jar).await;
let products = shop::featured_products(&ctx, user.as_ref(), 8).await?;
let c = guard::chrome_from(&ctx, user.as_ref());
format::view(
&v,

View File

@@ -3,7 +3,9 @@ pub mod auth;
pub mod auth_pages;
pub mod oauth2;
pub mod admin_categories;
pub mod admin_customers;
pub mod admin_dashboard;
pub mod admin_discount_profiles;
pub mod admin_discounts;
pub mod admin_form;
pub mod admin_orders;

View File

@@ -8,17 +8,23 @@ use serde_json::json;
use crate::{
controllers::i18n::current_lang,
shared::guard,
models::{categories, product_images, products},
shared::{guard, pricing},
models::{categories, product_images, products, users},
views::shop as view,
};
/// Shape a list of products into card rows, loading each one's primary image.
async fn product_rows(ctx: &AppContext, list: Vec<products::Model>) -> Result<Vec<serde_json::Value>> {
/// Shape a list of products into card rows for `user` (None = public), pricing
/// each via [`pricing::price_many`] and loading its primary image.
async fn product_rows(
ctx: &AppContext,
user: Option<&users::Model>,
list: Vec<products::Model>,
) -> Result<Vec<serde_json::Value>> {
let priced = pricing::price_many(ctx, &list, user).await?;
let mut rows = Vec::with_capacity(list.len());
for product in list {
for (product, priced) in list.iter().zip(priced.iter()) {
let image = product_images::first_for(ctx, product.id).await?;
rows.push(view::product_card(&product, image, None));
rows.push(view::product_card(product, priced, image, None));
}
Ok(rows)
}
@@ -27,6 +33,7 @@ async fn product_rows(ctx: &AppContext, list: Vec<products::Model>) -> Result<Ve
/// by the home-page landing grid.
pub(crate) async fn featured_products(
ctx: &AppContext,
user: Option<&users::Model>,
limit: u64,
) -> Result<Vec<serde_json::Value>> {
let list = products::Entity::find()
@@ -35,7 +42,7 @@ pub(crate) async fn featured_products(
.limit(limit)
.all(&ctx.db)
.await?;
product_rows(ctx, list).await
product_rows(ctx, user, list).await
}
/// The site-wide category sidebar, loaded lazily via htmx by the base layout so
@@ -69,12 +76,13 @@ async fn index(
.all(&ctx.db)
.await?;
let c = guard::chrome(&ctx, &jar).await;
let user = guard::current_user(&ctx, &jar).await;
let c = guard::chrome_from(&ctx, user.as_ref());
format::view(
&v,
"shop/index.html",
json!({
"products": product_rows(&ctx, list).await?,
"products": product_rows(&ctx, user.as_ref(), list).await?,
"logged_in_admin": c.logged_in_admin,
"logged_in_customer": c.logged_in_customer,
"customer_name": c.customer_name,
@@ -112,12 +120,14 @@ async fn show(
None => None,
};
let c = guard::chrome(&ctx, &jar).await;
let user = guard::current_user(&ctx, &jar).await;
let priced = pricing::price_for(&ctx, &product, user.as_ref()).await?;
let c = guard::chrome_from(&ctx, user.as_ref());
format::view(
&v,
"shop/show.html",
json!({
"product": view::product_card(&product, None, category.as_ref().map(|c| c.name.clone())),
"product": view::product_card(&product, &priced, None, category.as_ref().map(|c| c.name.clone())),
"images": images.iter().map(|i| i.image_id.clone()).collect::<Vec<_>>(),
"category": category,
"logged_in_admin": c.logged_in_admin,
@@ -159,7 +169,8 @@ async fn category(
.all(&ctx.db)
.await?;
let c = guard::chrome(&ctx, &jar).await;
let user = guard::current_user(&ctx, &jar).await;
let c = guard::chrome_from(&ctx, user.as_ref());
format::view(
&v,
"shop/category.html",
@@ -167,7 +178,7 @@ async fn category(
"category": category,
"breadcrumbs": breadcrumbs,
"children": children,
"products": product_rows(&ctx, list).await?,
"products": product_rows(&ctx, user.as_ref(), list).await?,
"logged_in_admin": c.logged_in_admin,
"logged_in_customer": c.logged_in_customer,
"customer_name": c.customer_name,

View File

@@ -0,0 +1,48 @@
//! `SeaORM` Entity assigning a discount profile to a business account.
//! Hand-written to match the `account_discount_profiles` migration.
use sea_orm::entity::prelude::*;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
#[sea_orm(table_name = "account_discount_profiles")]
pub struct Model {
pub created_at: DateTimeWithTimeZone,
pub updated_at: DateTimeWithTimeZone,
#[sea_orm(primary_key)]
pub id: i32,
pub user_id: i32,
pub discount_profile_id: i32,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {
#[sea_orm(
belongs_to = "super::users::Entity",
from = "Column::UserId",
to = "super::users::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
Users,
#[sea_orm(
belongs_to = "super::discount_profiles::Entity",
from = "Column::DiscountProfileId",
to = "super::discount_profiles::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
DiscountProfiles,
}
impl Related<super::users::Entity> for Entity {
fn to() -> RelationDef {
Relation::Users.def()
}
}
impl Related<super::discount_profiles::Entity> for Entity {
fn to() -> RelationDef {
Relation::DiscountProfiles.def()
}
}

View File

@@ -0,0 +1,49 @@
//! `SeaORM` Entity for per-account negotiated product prices. Hand-written to
//! match the `account_product_prices` migration (one row per (user, product)).
use sea_orm::entity::prelude::*;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
#[sea_orm(table_name = "account_product_prices")]
pub struct Model {
pub created_at: DateTimeWithTimeZone,
pub updated_at: DateTimeWithTimeZone,
#[sea_orm(primary_key)]
pub id: i32,
pub user_id: i32,
pub product_id: i32,
pub price_cents: i64,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {
#[sea_orm(
belongs_to = "super::users::Entity",
from = "Column::UserId",
to = "super::users::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
Users,
#[sea_orm(
belongs_to = "super::products::Entity",
from = "Column::ProductId",
to = "super::products::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
Products,
}
impl Related<super::users::Entity> for Entity {
fn to() -> RelationDef {
Relation::Users.def()
}
}
impl Related<super::products::Entity> for Entity {
fn to() -> RelationDef {
Relation::Products.def()
}
}

View File

@@ -0,0 +1,64 @@
//! `SeaORM` Entity for an account's chosen profile when two assigned profiles
//! cover one product. Hand-written to match the `account_product_resolutions`
//! migration.
use sea_orm::entity::prelude::*;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
#[sea_orm(table_name = "account_product_resolutions")]
pub struct Model {
pub created_at: DateTimeWithTimeZone,
pub updated_at: DateTimeWithTimeZone,
#[sea_orm(primary_key)]
pub id: i32,
pub user_id: i32,
pub product_id: i32,
pub discount_profile_id: i32,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {
#[sea_orm(
belongs_to = "super::users::Entity",
from = "Column::UserId",
to = "super::users::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
Users,
#[sea_orm(
belongs_to = "super::products::Entity",
from = "Column::ProductId",
to = "super::products::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
Products,
#[sea_orm(
belongs_to = "super::discount_profiles::Entity",
from = "Column::DiscountProfileId",
to = "super::discount_profiles::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
DiscountProfiles,
}
impl Related<super::users::Entity> for Entity {
fn to() -> RelationDef {
Relation::Users.def()
}
}
impl Related<super::products::Entity> for Entity {
fn to() -> RelationDef {
Relation::Products.def()
}
}
impl Related<super::discount_profiles::Entity> for Entity {
fn to() -> RelationDef {
Relation::DiscountProfiles.def()
}
}

View File

@@ -0,0 +1,48 @@
//! `SeaORM` Entity for a discount profile's product membership. Hand-written to
//! match the `discount_profile_products` migration.
use sea_orm::entity::prelude::*;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
#[sea_orm(table_name = "discount_profile_products")]
pub struct Model {
pub created_at: DateTimeWithTimeZone,
pub updated_at: DateTimeWithTimeZone,
#[sea_orm(primary_key)]
pub id: i32,
pub discount_profile_id: i32,
pub product_id: i32,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {
#[sea_orm(
belongs_to = "super::discount_profiles::Entity",
from = "Column::DiscountProfileId",
to = "super::discount_profiles::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
DiscountProfiles,
#[sea_orm(
belongs_to = "super::products::Entity",
from = "Column::ProductId",
to = "super::products::Column::Id",
on_update = "Cascade",
on_delete = "Cascade"
)]
Products,
}
impl Related<super::discount_profiles::Entity> for Entity {
fn to() -> RelationDef {
Relation::DiscountProfiles.def()
}
}
impl Related<super::products::Entity> for Entity {
fn to() -> RelationDef {
Relation::Products.def()
}
}

View File

@@ -0,0 +1,39 @@
//! `SeaORM` Entity for reusable discount profiles. Hand-written to match the
//! `discount_profiles` migration.
use sea_orm::entity::prelude::*;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
#[sea_orm(table_name = "discount_profiles")]
pub struct Model {
pub created_at: DateTimeWithTimeZone,
pub updated_at: DateTimeWithTimeZone,
#[sea_orm(primary_key)]
pub id: i32,
pub name: String,
/// Discount in basis points (5% = 500).
pub percent_bp: i32,
/// "include" (covers listed products) or "all_except" (covers all but them).
pub scope_type: String,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {
#[sea_orm(has_many = "super::discount_profile_products::Entity")]
DiscountProfileProducts,
#[sea_orm(has_many = "super::account_discount_profiles::Entity")]
AccountDiscountProfiles,
}
impl Related<super::discount_profile_products::Entity> for Entity {
fn to() -> RelationDef {
Relation::DiscountProfileProducts.def()
}
}
impl Related<super::account_discount_profiles::Entity> for Entity {
fn to() -> RelationDef {
Relation::AccountDiscountProfiles.def()
}
}

View File

@@ -2,8 +2,13 @@
pub mod prelude;
pub mod account_discount_profiles;
pub mod account_product_prices;
pub mod account_product_resolutions;
pub mod audit_logs;
pub mod categories;
pub mod discount_profile_products;
pub mod discount_profiles;
pub mod customer_profiles;
pub mod o_auth2_sessions;
pub mod order_items;

View File

@@ -1,8 +1,13 @@
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
pub use super::account_discount_profiles::Entity as AccountDiscountProfiles;
pub use super::account_product_prices::Entity as AccountProductPrices;
pub use super::account_product_resolutions::Entity as AccountProductResolutions;
pub use super::audit_logs::Entity as AuditLogs;
pub use super::categories::Entity as Categories;
pub use super::customer_profiles::Entity as CustomerProfiles;
pub use super::discount_profile_products::Entity as DiscountProfileProducts;
pub use super::discount_profiles::Entity as DiscountProfiles;
pub use super::o_auth2_sessions::Entity as OAuth2Sessions;
pub use super::order_items::Entity as OrderItems;
pub use super::orders::Entity as Orders;

View File

@@ -0,0 +1,16 @@
//! Assignment of a discount profile to a business account.
pub use crate::models::_entities::account_discount_profiles::{ActiveModel, Column, Entity, Model};
use sea_orm::entity::prelude::*;
pub type AccountDiscountProfiles = Entity;
#[async_trait::async_trait]
impl ActiveModelBehavior for ActiveModel {
async fn before_save<C>(self, _db: &C, _insert: bool) -> std::result::Result<Self, DbErr>
where
C: ConnectionTrait,
{
Ok(self)
}
}

View File

@@ -0,0 +1,77 @@
//! Per-account negotiated product prices: an admin-set price for one product,
//! for one business account ("personal agreement"). One row per (user, product),
//! kept unique by the index in the migration.
pub use crate::models::_entities::account_product_prices::{ActiveModel, Column, Entity, Model};
use sea_orm::entity::prelude::*;
use sea_orm::{ActiveValue, IntoActiveModel, QueryFilter, TryIntoModel};
pub type AccountProductPrices = Entity;
#[async_trait::async_trait]
impl ActiveModelBehavior for ActiveModel {
async fn before_save<C>(self, _db: &C, insert: bool) -> std::result::Result<Self, DbErr>
where
C: ConnectionTrait,
{
if !insert && self.updated_at.is_unchanged() {
let mut this = self;
this.updated_at = ActiveValue::set(chrono::Utc::now().into());
Ok(this)
} else {
Ok(self)
}
}
}
impl Model {
/// All negotiated prices for one account, as a `(product_id -> cents)` map.
pub async fn map_for_user(
db: &DatabaseConnection,
user_id: i32,
) -> Result<std::collections::HashMap<i32, i64>, DbErr> {
let rows = Entity::find()
.filter(Column::UserId.eq(user_id))
.all(db)
.await?;
Ok(rows.into_iter().map(|r| (r.product_id, r.price_cents)).collect())
}
/// Insert or update the negotiated price for `(user_id, product_id)`.
pub async fn upsert(
db: &DatabaseConnection,
user_id: i32,
product_id: i32,
price_cents: i64,
) -> Result<Self, DbErr> {
let existing = Entity::find()
.filter(Column::UserId.eq(user_id))
.filter(Column::ProductId.eq(product_id))
.one(db)
.await?;
let mut active = match existing {
Some(row) => row.into_active_model(),
None => ActiveModel {
user_id: ActiveValue::set(user_id),
product_id: ActiveValue::set(product_id),
..Default::default()
},
};
active.price_cents = ActiveValue::set(price_cents);
active.save(db).await?.try_into_model()
}
/// Remove the negotiated price for `(user_id, product_id)`, if any.
pub async fn clear(
db: &DatabaseConnection,
user_id: i32,
product_id: i32,
) -> Result<(), DbErr> {
Entity::delete_many()
.filter(Column::UserId.eq(user_id))
.filter(Column::ProductId.eq(product_id))
.exec(db)
.await?;
Ok(())
}
}

View File

@@ -0,0 +1,19 @@
//! The chosen winning profile for an account+product when assigned profiles
//! collide on that product.
pub use crate::models::_entities::account_product_resolutions::{
ActiveModel, Column, Entity, Model,
};
use sea_orm::entity::prelude::*;
pub type AccountProductResolutions = Entity;
#[async_trait::async_trait]
impl ActiveModelBehavior for ActiveModel {
async fn before_save<C>(self, _db: &C, _insert: bool) -> std::result::Result<Self, DbErr>
where
C: ConnectionTrait,
{
Ok(self)
}
}

View File

@@ -0,0 +1,17 @@
//! A discount profile's product membership (meaning depends on the profile's
//! scope: included products, or excluded ones).
pub use crate::models::_entities::discount_profile_products::{ActiveModel, Column, Entity, Model};
use sea_orm::entity::prelude::*;
pub type DiscountProfileProducts = Entity;
#[async_trait::async_trait]
impl ActiveModelBehavior for ActiveModel {
async fn before_save<C>(self, _db: &C, _insert: bool) -> std::result::Result<Self, DbErr>
where
C: ConnectionTrait,
{
Ok(self)
}
}

View File

@@ -0,0 +1,42 @@
//! Reusable discount profiles: a named percentage over a product scope, mixable
//! across business accounts.
pub use crate::models::_entities::discount_profiles::{ActiveModel, Column, Entity, Model};
use sea_orm::entity::prelude::*;
pub type DiscountProfiles = Entity;
/// Scope value: the profile covers exactly the listed products.
pub const SCOPE_INCLUDE: &str = "include";
/// Scope value: the profile covers every product except the listed ones.
pub const SCOPE_ALL_EXCEPT: &str = "all_except";
#[async_trait::async_trait]
impl ActiveModelBehavior for ActiveModel {
async fn before_save<C>(self, _db: &C, insert: bool) -> std::result::Result<Self, DbErr>
where
C: ConnectionTrait,
{
if !insert && self.updated_at.is_unchanged() {
let mut this = self;
this.updated_at = sea_orm::ActiveValue::set(chrono::Utc::now().into());
Ok(this)
} else {
Ok(self)
}
}
}
impl Model {
/// A profile covers `product_id` when its scope lists the product (include)
/// or does not list it (all_except). `membership` is the profile's product
/// id set.
#[must_use]
pub fn covers(&self, product_id: i32, membership: &std::collections::HashSet<i32>) -> bool {
let listed = membership.contains(&product_id);
match self.scope_type.as_str() {
SCOPE_ALL_EXCEPT => !listed,
_ => listed,
}
}
}

View File

@@ -6,8 +6,13 @@
pub mod _entities;
pub mod account_discount_profiles;
pub mod account_product_prices;
pub mod account_product_resolutions;
pub mod audit_logs;
pub mod categories;
pub mod discount_profile_products;
pub mod discount_profiles;
pub mod customer_profiles;
pub mod o_auth2_sessions;
pub mod order_items;

View File

@@ -4,6 +4,8 @@ use sea_orm::{Set, TransactionTrait};
use uuid::Uuid;
use crate::models::_entities::{order_items, products, shipping_methods};
use crate::models::users;
use crate::shared::pricing;
pub use crate::models::_entities::orders::{ActiveModel, Column, Entity, Model};
pub type Orders = Entity;
@@ -42,7 +44,12 @@ fn generate_order_number() -> String {
/// snapshot each product's price/name, decrement stock (re-checking inside the
/// transaction so an item can't oversell between cart and pay), then write the
/// order and its line items. Returns the persisted order.
pub async fn place(ctx: &AppContext, items: &[(i32, i32)], details: Checkout) -> Result<Model> {
pub async fn place(
ctx: &AppContext,
items: &[(i32, i32)],
details: Checkout,
user: Option<&users::Model>,
) -> Result<Model> {
let txn = ctx.db.begin().await?;
let mut subtotal: i64 = 0;
@@ -61,8 +68,10 @@ pub async fn place(ctx: &AppContext, items: &[(i32, i32)], details: Checkout) ->
)));
}
currency = product.currency.clone();
// Snapshot the effective price (honouring any active discount).
let unit_price_cents = product.effective_price_cents();
// Snapshot the price the buyer actually pays — public sale or, for a
// business account, their negotiated/lowest price (same resolver the
// cart and storefront use).
let unit_price_cents = pricing::price_for(ctx, &product, user).await?.price_cents;
subtotal += unit_price_cents * i64::from(*qty);
let mut active = product.clone().into_active_model();

View File

@@ -59,15 +59,21 @@ pub struct Chrome {
}
pub async fn chrome(ctx: &AppContext, jar: &CookieJar) -> Chrome {
match current_user(ctx, jar).await {
Some(user) if is_admin(ctx, &user) => Chrome {
chrome_from(ctx, current_user(ctx, jar).await.as_ref())
}
/// Same as [`chrome`] but from an already-loaded user, so a handler that needs
/// the user model (e.g. for pricing) can resolve chrome without a second lookup.
pub fn chrome_from(ctx: &AppContext, user: Option<&users::Model>) -> Chrome {
match user {
Some(user) if is_admin(ctx, user) => Chrome {
logged_in_admin: true,
..Default::default()
},
Some(user) => Chrome {
logged_in_customer: true,
customer_name: Some(user.name),
customer_account_type: Some(user.account_type),
customer_name: Some(user.name.clone()),
customer_account_type: Some(user.account_type.clone()),
..Default::default()
},
None => Chrome::default(),

View File

@@ -3,6 +3,7 @@
pub mod csrf;
pub mod guard;
pub mod money;
pub mod pricing;
pub mod rbac;
pub mod settings;
pub mod slug;

View File

@@ -34,3 +34,41 @@ pub fn parse_price_to_cents(value: &str) -> Result<i64> {
pub fn format_price(cents: i64) -> String {
format!("{}.{:02}", cents / 100, (cents % 100).abs())
}
/// Parse a percentage typed as "20", "20.5" or "20,5" into an `f64`. Returns
/// `None` for anything non-numeric or non-finite.
#[must_use]
pub fn parse_percent(value: &str) -> Option<f64> {
let parsed: f64 = value.trim().replace(',', ".").parse().ok()?;
parsed.is_finite().then_some(parsed)
}
/// Convert a percentage to basis points (5% -> 500), rounded to the nearest bp.
#[must_use]
pub fn percent_to_bp(percent: f64) -> i32 {
(percent * 100.0).round() as i32
}
/// Render basis points as a human percentage string, e.g. `550` -> `"5.5"`,
/// `500` -> `"5"`.
#[must_use]
pub fn format_bp(bp: i32) -> String {
let whole = bp / 100;
let frac = (bp % 100).abs();
if frac == 0 {
whole.to_string()
} else if frac % 10 == 0 {
format!("{whole}.{}", frac / 10)
} else {
format!("{whole}.{frac:02}")
}
}
/// Apply a basis-point discount to a price in minor units, rounding the discount
/// amount to the nearest cent. Never returns more than `cents`.
#[must_use]
pub fn apply_discount_bp(cents: i64, percent_bp: i32) -> i64 {
let bp = percent_bp.max(0) as i128;
let discount = (cents as i128 * bp + 5000) / 10000; // round half up
(cents - discount as i64).max(0)
}

309
src/shared/pricing.rs Normal file
View File

@@ -0,0 +1,309 @@
//! Single source of truth for the price a given viewer pays for a product, so
//! the storefront, cart, and placed orders always agree.
//!
//! Everyone sees the public price — the lower of the regular price and any
//! public sale ([`products::Model::effective_price_cents`]). A logged-in
//! **company** account additionally gets their business price: the lowest of the
//! public price, any admin-set negotiated price, and the price from their
//! assigned automated discount profiles. **Lowest wins.**
use std::collections::{HashMap, HashSet};
use loco_rs::prelude::*;
use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
use crate::models::{
account_discount_profiles, account_product_prices, account_product_resolutions,
discount_profile_products, discount_profiles, products, users,
};
use crate::shared::money::apply_discount_bp;
/// `account_type` value that unlocks business pricing.
const COMPANY: &str = "company";
/// The resolved price for one product and one viewer (the slim shape templates
/// and the cart use).
#[derive(Debug, Clone, Copy)]
pub struct PricedProduct {
/// What the viewer pays, in minor units.
pub price_cents: i64,
/// The regular list price, used as the struck-through reference.
pub regular_cents: i64,
/// True when a business-specific deal (not just a public sale) set the price.
pub is_business: bool,
}
impl PricedProduct {
/// Whether the final price is below the regular price (render it reduced).
#[must_use]
pub fn is_reduced(&self) -> bool {
self.price_cents < self.regular_cents
}
}
/// Full breakdown for one product and one viewer, used by the admin company page
/// (which needs to show each layer and any collision). The storefront only needs
/// [`PriceDetail::priced`].
#[derive(Debug, Clone)]
pub struct PriceDetail {
pub regular_cents: i64,
pub public_cents: i64,
pub manual_cents: Option<i64>,
pub auto_cents: Option<i64>,
/// The profile that produced `auto_cents` (the resolved/only/biggest one).
pub auto_profile_id: Option<i32>,
/// Every assigned profile that covers this product.
pub covering_profile_ids: Vec<i32>,
/// True when more than one profile covers the product and the admin has not
/// resolved which wins (a fallback was used).
pub collision: bool,
pub price_cents: i64,
pub is_business: bool,
}
impl PriceDetail {
fn public_only(regular_cents: i64, public_cents: i64) -> Self {
Self {
regular_cents,
public_cents,
manual_cents: None,
auto_cents: None,
auto_profile_id: None,
covering_profile_ids: Vec::new(),
collision: false,
price_cents: public_cents,
is_business: false,
}
}
#[must_use]
pub fn priced(&self) -> PricedProduct {
PricedProduct {
price_cents: self.price_cents,
regular_cents: self.regular_cents,
is_business: self.is_business,
}
}
}
/// The "lowest wins" decision: pick the business price only when it is at or
/// below the public price. Pure, so it is unit-tested directly.
fn decide(regular_cents: i64, public_cents: i64, business: Option<i64>) -> PricedProduct {
match business {
Some(b) if b <= public_cents => PricedProduct {
price_cents: b,
regular_cents,
is_business: true,
},
_ => PricedProduct {
price_cents: public_cents,
regular_cents,
is_business: false,
},
}
}
/// Is this viewer a business (company) account?
fn is_company(user: Option<&users::Model>) -> bool {
matches!(user, Some(u) if u.account_type == COMPANY)
}
/// Everything needed to resolve every product's business price for one account,
/// loaded once so listing pages and the cart avoid N+1 queries.
struct B2bContext {
manual: HashMap<i32, i64>,
profiles: Vec<discount_profiles::Model>,
membership: HashMap<i32, HashSet<i32>>,
resolutions: HashMap<i32, i32>,
}
async fn load_b2b(ctx: &AppContext, user_id: i32) -> Result<B2bContext> {
let manual = account_product_prices::Model::map_for_user(&ctx.db, user_id).await?;
let assigns = account_discount_profiles::Entity::find()
.filter(account_discount_profiles::Column::UserId.eq(user_id))
.all(&ctx.db)
.await?;
let profile_ids: Vec<i32> = assigns.iter().map(|a| a.discount_profile_id).collect();
let (profiles, membership) = if profile_ids.is_empty() {
(Vec::new(), HashMap::new())
} else {
let profiles = discount_profiles::Entity::find()
.filter(discount_profiles::Column::Id.is_in(profile_ids.clone()))
.all(&ctx.db)
.await?;
let rows = discount_profile_products::Entity::find()
.filter(discount_profile_products::Column::DiscountProfileId.is_in(profile_ids))
.all(&ctx.db)
.await?;
let mut membership: HashMap<i32, HashSet<i32>> = HashMap::new();
for row in rows {
membership
.entry(row.discount_profile_id)
.or_default()
.insert(row.product_id);
}
(profiles, membership)
};
let resolutions = account_product_resolutions::Entity::find()
.filter(account_product_resolutions::Column::UserId.eq(user_id))
.all(&ctx.db)
.await?
.into_iter()
.map(|r| (r.product_id, r.discount_profile_id))
.collect();
Ok(B2bContext {
manual,
profiles,
membership,
resolutions,
})
}
/// Resolve one product's full price breakdown for `b2b` (None = public viewer).
fn detail_for(product: &products::Model, b2b: Option<&B2bContext>) -> PriceDetail {
let regular = product.price_cents;
let public = product.effective_price_cents();
let Some(b2b) = b2b else {
return PriceDetail::public_only(regular, public);
};
let manual = b2b.manual.get(&product.id).copied();
// Which assigned profiles cover this product.
let empty = HashSet::new();
let covering: Vec<&discount_profiles::Model> = b2b
.profiles
.iter()
.filter(|p| p.covers(product.id, b2b.membership.get(&p.id).unwrap_or(&empty)))
.collect();
let mut auto_cents = None;
let mut auto_profile_id = None;
let mut collision = false;
if !covering.is_empty() {
let chosen = if covering.len() == 1 {
covering[0]
} else {
// Two+ profiles collide: honour the admin's resolution, else fall
// back to the biggest discount and flag it for resolving.
match b2b
.resolutions
.get(&product.id)
.and_then(|rid| covering.iter().find(|p| p.id == *rid).copied())
{
Some(resolved) => resolved,
None => {
collision = true;
covering
.iter()
.max_by_key(|p| p.percent_bp)
.copied()
.expect("covering is non-empty")
}
}
};
auto_profile_id = Some(chosen.id);
auto_cents = Some(apply_discount_bp(regular, chosen.percent_bp));
}
let business = [manual, auto_cents].into_iter().flatten().min();
let priced = decide(regular, public, business);
PriceDetail {
regular_cents: regular,
public_cents: public,
manual_cents: manual,
auto_cents,
auto_profile_id,
covering_profile_ids: covering.iter().map(|p| p.id).collect(),
collision,
price_cents: priced.price_cents,
is_business: priced.is_business,
}
}
/// Full breakdowns for many products for `user`, batching per-account lookups.
pub async fn detail_many(
ctx: &AppContext,
list: &[products::Model],
user: Option<&users::Model>,
) -> Result<Vec<PriceDetail>> {
let b2b = if is_company(user) {
Some(load_b2b(ctx, user.expect("is_company implies Some").id).await?)
} else {
None
};
Ok(list.iter().map(|p| detail_for(p, b2b.as_ref())).collect())
}
/// Price one product for `user` (`None` = anonymous/public).
pub async fn price_for(
ctx: &AppContext,
product: &products::Model,
user: Option<&users::Model>,
) -> Result<PricedProduct> {
let detail = detail_many(ctx, std::slice::from_ref(product), user).await?;
Ok(detail[0].priced())
}
/// Price many products for `user`, batching the per-account lookups to avoid
/// N+1 queries on listing pages and the cart.
pub async fn price_many(
ctx: &AppContext,
list: &[products::Model],
user: Option<&users::Model>,
) -> Result<Vec<PricedProduct>> {
Ok(detail_many(ctx, list, user)
.await?
.iter()
.map(PriceDetail::priced)
.collect())
}
#[cfg(test)]
mod tests {
use super::decide;
use crate::shared::money::apply_discount_bp;
#[test]
fn public_only() {
let p = decide(10000, 10000, None);
assert_eq!(p.price_cents, 10000);
assert!(!p.is_reduced());
assert!(!p.is_business);
}
#[test]
fn business_lower_wins() {
let p = decide(10000, 10000, Some(9000));
assert_eq!(p.price_cents, 9000);
assert!(p.is_business);
}
#[test]
fn public_sale_beats_business() {
// regular 100, public sale 80, business best 90 -> pay 80, not business.
let p = decide(10000, 8000, Some(9000));
assert_eq!(p.price_cents, 8000);
assert!(!p.is_business);
}
#[test]
fn business_equal_is_business() {
let p = decide(10000, 10000, Some(10000));
assert_eq!(p.price_cents, 10000);
assert!(p.is_business);
}
#[test]
fn discount_bp_rounds_half_up() {
assert_eq!(apply_discount_bp(10000, 500), 9500); // 5%
assert_eq!(apply_discount_bp(10000, 1500), 8500); // 15%
assert_eq!(apply_discount_bp(999, 500), 949); // 49.95 -> 50 off
assert_eq!(apply_discount_bp(10000, 0), 10000);
}
}

View File

@@ -4,11 +4,16 @@ use serde_json::{json, Value};
use crate::models::_entities::{categories, products};
use crate::shared::money::format_price;
use crate::shared::pricing::PricedProduct;
/// Card/list shape for a product: model fields plus a formatted price, its
/// optional primary image filename and category name.
/// Card/list shape for a product: model fields plus the viewer's resolved price
/// (from [`crate::shared::pricing`]), its optional primary image and category.
/// `on_sale` means "render the price as reduced" — driven by the resolved price,
/// so it covers both public sales and business deals; `is_business` flags the
/// latter.
pub fn product_card(
product: &products::Model,
priced: &PricedProduct,
image: Option<String>,
category_name: Option<String>,
) -> Value {
@@ -17,9 +22,10 @@ pub fn product_card(
"name": product.name,
"slug": product.slug,
"description": product.description,
"price": format_price(product.effective_price_cents()),
"on_sale": product.on_sale(),
"regular_price": format_price(product.price_cents),
"price": format_price(priced.price_cents),
"on_sale": priced.is_reduced(),
"is_business": priced.is_business,
"regular_price": format_price(priced.regular_cents),
"currency": product.currency,
"sku": product.sku,
"stock": product.stock,

View File

@@ -0,0 +1,29 @@
---
source: tests/models/users.rs
assertion_line: 61
expression: res
---
Ok(
Model {
created_at: DATE,
updated_at: DATE,
id: ID
pid: PID,
email: "test@framework.com",
password: "PASSWORD",
api_key: "lo-PID",
name: "framework",
reset_token: None,
reset_sent_at: None,
email_verification_token: None,
email_verification_sent_at: None,
email_verified_at: None,
magic_link_token: None,
magic_link_expiration: None,
theme: "light",
account_type: "personal",
totp_secret: None,
totp_enabled_at: None,
totp_backup_codes: None,
},
)

View File

@@ -0,0 +1,29 @@
---
source: tests/models/users.rs
assertion_line: 106
expression: existing_user
---
Ok(
Model {
created_at: 2023-11-12T12:34:56.789+00:00,
updated_at: 2023-11-12T12:34:56.789+00:00,
id: 2,
pid: 11111111-1111-1111-1111-111111111111,
email: "user1@example.com",
password: "$argon2id$v=19$m=19456,t=2,p=1$ETQBx4rTgNAZhSaeYZKOZg$eYTdH26CRT6nUJtacLDEboP0li6xUwUF/q5nSlQ8uuc",
api_key: "lo-95ec80d7-cb60-4b70-9b4b-9ef74cb88758",
name: "user1",
reset_token: None,
reset_sent_at: None,
email_verification_token: None,
email_verification_sent_at: None,
email_verified_at: None,
magic_link_token: None,
magic_link_expiration: None,
theme: "light",
account_type: "personal",
totp_secret: None,
totp_enabled_at: None,
totp_backup_codes: None,
},
)

View File

@@ -0,0 +1,29 @@
---
source: tests/models/users.rs
assertion_line: 127
expression: existing_user
---
Ok(
Model {
created_at: 2023-11-12T12:34:56.789+00:00,
updated_at: 2023-11-12T12:34:56.789+00:00,
id: 2,
pid: 11111111-1111-1111-1111-111111111111,
email: "user1@example.com",
password: "$argon2id$v=19$m=19456,t=2,p=1$ETQBx4rTgNAZhSaeYZKOZg$eYTdH26CRT6nUJtacLDEboP0li6xUwUF/q5nSlQ8uuc",
api_key: "lo-95ec80d7-cb60-4b70-9b4b-9ef74cb88758",
name: "user1",
reset_token: None,
reset_sent_at: None,
email_verification_token: None,
email_verification_sent_at: None,
email_verified_at: None,
magic_link_token: None,
magic_link_expiration: None,
theme: "light",
account_type: "personal",
totp_secret: None,
totp_enabled_at: None,
totp_backup_codes: None,
},
)

View File

@@ -0,0 +1,6 @@
---
source: tests/requests/auth.rs
assertion_line: 365
expression: magic_link_response.text()
---
"{\"token\":\"TOKEN\",\"pid\":\"PID\",\"name\":\"user1\",\"is_verified\":false,\"is_admin\":false}"

View File

@@ -0,0 +1,9 @@
---
source: tests/requests/auth.rs
assertion_line: 309
expression: "(response.status_code(), response.text())"
---
(
200,
"{\"pid\":\"PID\",\"name\":\"loco\",\"email\":\"test@loco.com\",\"is_admin\":false}",
)

View File

@@ -0,0 +1,6 @@
---
source: tests/requests/auth.rs
assertion_line: 189
expression: login_response.text()
---
"{\"token\":\"TOKEN\",\"pid\":\"PID\",\"name\":\"loco\",\"is_verified\":false,\"is_admin\":false}"

View File

@@ -0,0 +1,33 @@
---
source: tests/requests/auth.rs
assertion_line: 44
expression: saved_user
---
Ok(
Model {
created_at: DATE,
updated_at: DATE,
id: ID
pid: PID,
email: "test@loco.com",
password: "PASSWORD",
api_key: "lo-PID",
name: "loco",
reset_token: None,
reset_sent_at: None,
email_verification_token: Some(
"PID",
),
email_verification_sent_at: Some(
DATE,
),
email_verified_at: None,
magic_link_token: None,
magic_link_expiration: None,
theme: "light",
account_type: "personal",
totp_secret: None,
totp_enabled_at: None,
totp_backup_codes: None,
},
)

View File

@@ -0,0 +1,9 @@
---
source: tests/requests/auth.rs
assertion_line: 118
expression: "(response.status_code(), response.text())"
---
(
200,
"{\"token\":\"TOKEN\",\"pid\":\"PID\",\"name\":\"loco\",\"is_verified\":true,\"is_admin\":false}",
)

View File

@@ -0,0 +1,31 @@
---
source: tests/requests/auth.rs
assertion_line: 454
expression: user
---
Model {
created_at: DATE,
updated_at: DATE,
id: ID
pid: PID,
email: "test@loco.com",
password: "PASSWORD",
api_key: "lo-PID",
name: "loco",
reset_token: None,
reset_sent_at: None,
email_verification_token: Some(
"PID",
),
email_verification_sent_at: Some(
DATE,
),
email_verified_at: None,
magic_link_token: None,
magic_link_expiration: None,
theme: "light",
account_type: "personal",
totp_secret: None,
totp_enabled_at: None,
totp_backup_codes: None,
}