CZK implemented
This commit is contained in:
92
src/controllers/admin_currencies.rs
Normal file
92
src/controllers/admin_currencies.rs
Normal file
@@ -0,0 +1,92 @@
|
||||
//! Admin management of the alternative display currencies.
|
||||
//!
|
||||
//! EUR is the base/transaction currency and is shown read-only for context. The
|
||||
//! admin sets each alternative currency's exchange rate (units per 1 EUR) and
|
||||
//! toggles whether buyers may switch to it. The currencies themselves are fixed
|
||||
//! and seeded by `initializers::currency_seeder`.
|
||||
|
||||
use axum_extra::extract::cookie::CookieJar;
|
||||
use loco_rs::prelude::*;
|
||||
use sea_orm::{ActiveModelTrait, EntityTrait, QueryOrder, Set};
|
||||
use serde::Deserialize;
|
||||
use serde_json::json;
|
||||
|
||||
use crate::{
|
||||
controllers::i18n::current_lang,
|
||||
models::currencies,
|
||||
shared::{
|
||||
currency::{self, BASE_CODE, BASE_SYMBOL},
|
||||
guard,
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct CurrencyForm {
|
||||
rate: String,
|
||||
enabled: Option<String>,
|
||||
}
|
||||
|
||||
fn is_checked(value: &Option<String>) -> bool {
|
||||
matches!(value.as_deref(), Some("on" | "true" | "1"))
|
||||
}
|
||||
|
||||
#[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 rows = currencies::Entity::find()
|
||||
.order_by_asc(currencies::Column::Code)
|
||||
.all(&ctx.db)
|
||||
.await?;
|
||||
let currencies_json: Vec<serde_json::Value> = rows
|
||||
.iter()
|
||||
.map(|c| {
|
||||
json!({
|
||||
"id": c.id,
|
||||
"code": c.code,
|
||||
"symbol": c.symbol,
|
||||
"rate": currency::format_rate(c.rate_e4),
|
||||
"enabled": c.enabled,
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
format::view(
|
||||
&v,
|
||||
"admin/currencies/index.html",
|
||||
json!({
|
||||
"base_code": BASE_CODE,
|
||||
"base_symbol": BASE_SYMBOL,
|
||||
"currencies": currencies_json,
|
||||
"lang": current_lang(&jar),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
async fn update(
|
||||
auth: auth::JWT,
|
||||
Path(id): Path<i32>,
|
||||
State(ctx): State<AppContext>,
|
||||
Form(form): Form<CurrencyForm>,
|
||||
) -> Result<Response> {
|
||||
guard::current_admin(auth, &ctx).await?;
|
||||
let row = currencies::Entity::find_by_id(id)
|
||||
.one(&ctx.db)
|
||||
.await?
|
||||
.ok_or_else(|| Error::NotFound)?;
|
||||
let mut active = row.into_active_model();
|
||||
active.rate_e4 = Set(currency::parse_rate(&form.rate)?);
|
||||
active.enabled = Set(is_checked(&form.enabled));
|
||||
active.update(&ctx.db).await?;
|
||||
format::redirect("/admin/currencies")
|
||||
}
|
||||
|
||||
pub fn routes() -> Routes {
|
||||
Routes::new()
|
||||
.add("/admin/currencies", get(index))
|
||||
.add("/admin/currencies/{id}", post(update))
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
use crate::{controllers::i18n::current_lang, shared::{guard, money::format_price, pricing}, models::{product_variants, products}};
|
||||
use crate::{controllers::i18n::current_lang, shared::{currency::{self, Currency}, guard, pricing}, models::{product_variants, products}};
|
||||
use axum::{
|
||||
http::{HeaderMap, StatusCode},
|
||||
response::Redirect,
|
||||
@@ -173,7 +173,8 @@ async fn cart_response(
|
||||
return Ok((jar, Redirect::to("/cart")).into_response());
|
||||
}
|
||||
|
||||
let (lines, valid, total) = resolve_cart(ctx, &jar).await?;
|
||||
let cur = currency::resolve(ctx, &jar).await;
|
||||
let (lines, valid, total) = resolve_cart(ctx, &jar, &cur).await?;
|
||||
// Persist the re-validated cookie (drops now-invalid lines).
|
||||
let jar = jar.add(cart_cookie(serialize_cart(&valid)));
|
||||
let response = format::view(
|
||||
@@ -181,7 +182,8 @@ async fn cart_response(
|
||||
"shop/_cart_body.html",
|
||||
json!({
|
||||
"items": lines,
|
||||
"total": format_price(total),
|
||||
"total": cur.format(total),
|
||||
"currency_symbol": cur.symbol,
|
||||
"lang": current_lang(&jar),
|
||||
}),
|
||||
)?;
|
||||
@@ -194,6 +196,7 @@ async fn cart_response(
|
||||
pub(crate) async fn resolve_cart(
|
||||
ctx: &AppContext,
|
||||
jar: &CookieJar,
|
||||
cur: &Currency,
|
||||
) -> Result<(Vec<serde_json::Value>, Vec<(i32, i32)>, i64)> {
|
||||
// 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).
|
||||
@@ -226,12 +229,12 @@ pub(crate) async fn resolve_cart(
|
||||
"name": product.name,
|
||||
"variant_label": variant.label,
|
||||
"slug": product.slug,
|
||||
"price": format_price(unit_price),
|
||||
"regular_price": format_price(priced.regular_cents),
|
||||
"price": cur.format(unit_price),
|
||||
"regular_price": cur.format(priced.regular_cents),
|
||||
"on_sale": priced.is_reduced(),
|
||||
"quantity": qty,
|
||||
"stock": variant.stock,
|
||||
"line_total": format_price(line_total),
|
||||
"line_total": cur.format(line_total),
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -244,7 +247,8 @@ async fn show(
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
State(ctx): State<AppContext>,
|
||||
) -> Result<Response> {
|
||||
let (lines, valid, total) = resolve_cart(&ctx, &jar).await?;
|
||||
let cur = currency::resolve(&ctx, &jar).await;
|
||||
let (lines, valid, total) = resolve_cart(&ctx, &jar, &cur).await?;
|
||||
|
||||
// Drop any now-invalid lines from the cookie so the badge stays accurate.
|
||||
let rebuilt = serialize_cart(&valid);
|
||||
@@ -254,7 +258,8 @@ async fn show(
|
||||
"shop/cart.html",
|
||||
json!({
|
||||
"items": lines,
|
||||
"total": format_price(total),
|
||||
"total": cur.format(total),
|
||||
"currency_symbol": cur.symbol,
|
||||
"logged_in_admin": c.logged_in_admin,
|
||||
"logged_in_customer": c.logged_in_customer,
|
||||
"customer_name": c.customer_name,
|
||||
@@ -274,14 +279,16 @@ async fn preview(
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
State(ctx): State<AppContext>,
|
||||
) -> Result<Response> {
|
||||
let (lines, valid, total) = resolve_cart(&ctx, &jar).await?;
|
||||
let cur = currency::resolve(&ctx, &jar).await;
|
||||
let (lines, valid, total) = resolve_cart(&ctx, &jar, &cur).await?;
|
||||
let rebuilt = serialize_cart(&valid);
|
||||
let response = format::view(
|
||||
&v,
|
||||
"shop/_cart_preview.html",
|
||||
json!({
|
||||
"items": lines,
|
||||
"total": format_price(total),
|
||||
"total": cur.format(total),
|
||||
"currency_symbol": cur.symbol,
|
||||
"lang": current_lang(&jar),
|
||||
}),
|
||||
)?;
|
||||
|
||||
@@ -18,7 +18,7 @@ use crate::{
|
||||
users::{self, normalize_account_type},
|
||||
},
|
||||
controllers::i18n::current_lang,
|
||||
shared::{guard, money::format_price, settings},
|
||||
shared::{currency::Currency, guard, money::format_price, settings},
|
||||
views::checkout as view,
|
||||
};
|
||||
|
||||
@@ -77,7 +77,9 @@ async fn checkout_page(
|
||||
ViewEngine(v): ViewEngine<TeraView>,
|
||||
State(ctx): State<AppContext>,
|
||||
) -> Result<Response> {
|
||||
let (lines, _valid, subtotal) = resolve_cart(&ctx, &jar).await?;
|
||||
// Checkout and everything past it (orders, confirmation) stay in the EUR
|
||||
// base — the settlement currency — even when the buyer browsed in another.
|
||||
let (lines, _valid, subtotal) = resolve_cart(&ctx, &jar, &Currency::eur()).await?;
|
||||
if lines.is_empty() {
|
||||
return format::redirect("/cart");
|
||||
}
|
||||
@@ -159,7 +161,7 @@ async fn place_order(
|
||||
State(ctx): State<AppContext>,
|
||||
Form(form): Form<CheckoutForm>,
|
||||
) -> Result<Response> {
|
||||
let (_lines, valid, _total) = resolve_cart(&ctx, &jar).await?;
|
||||
let (_lines, valid, _total) = resolve_cart(&ctx, &jar, &Currency::eur()).await?;
|
||||
if valid.is_empty() {
|
||||
return format::redirect("/cart");
|
||||
}
|
||||
|
||||
39
src/controllers/currency.rs
Normal file
39
src/controllers/currency.rs
Normal file
@@ -0,0 +1,39 @@
|
||||
//! Storefront display-currency switcher.
|
||||
//!
|
||||
//! Sets the `currency` cookie to the buyer's chosen display currency, then sends
|
||||
//! them back where they were. EUR is the base; any other code must name an
|
||||
//! enabled row in `currencies` or it falls back to EUR on the next render.
|
||||
|
||||
use axum::{
|
||||
http::{header, HeaderMap},
|
||||
response::Redirect,
|
||||
};
|
||||
use loco_rs::prelude::*;
|
||||
use serde::Deserialize;
|
||||
|
||||
use crate::controllers::i18n::back_path;
|
||||
use crate::shared::currency::{BASE_CODE, COOKIE};
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct CurrencyForm {
|
||||
pub currency: String,
|
||||
}
|
||||
|
||||
#[debug_handler]
|
||||
async fn set_currency(headers: HeaderMap, Form(form): Form<CurrencyForm>) -> Result<Response> {
|
||||
// Store the code uppercased; validation against the enabled set happens at
|
||||
// render time (shared::currency::resolve), which falls back to EUR.
|
||||
let code = form.currency.trim().to_uppercase();
|
||||
let code = if code.is_empty() { BASE_CODE.to_string() } else { code };
|
||||
let cookie = format!("{COOKIE}={code}; Path=/; Max-Age=31536000; SameSite=Lax");
|
||||
|
||||
Ok((
|
||||
[(header::SET_COOKIE, cookie)],
|
||||
Redirect::to(&back_path(&headers)),
|
||||
)
|
||||
.into_response())
|
||||
}
|
||||
|
||||
pub fn routes() -> Routes {
|
||||
Routes::new().add("/currency", post(set_currency))
|
||||
}
|
||||
@@ -4,7 +4,9 @@ use axum_extra::extract::cookie::CookieJar;
|
||||
use loco_rs::prelude::*;
|
||||
use serde_json::json;
|
||||
|
||||
use crate::{controllers::i18n::current_lang, shared::guard, controllers::shop};
|
||||
use crate::{
|
||||
controllers::i18n::current_lang, controllers::shop, shared::currency, shared::guard,
|
||||
};
|
||||
|
||||
#[debug_handler]
|
||||
async fn index(
|
||||
@@ -13,7 +15,8 @@ async fn index(
|
||||
State(ctx): State<AppContext>,
|
||||
) -> Result<Response> {
|
||||
let user = guard::current_user(&ctx, &jar).await;
|
||||
let products = shop::featured_products(&ctx, user.as_ref(), 8).await?;
|
||||
let cur = currency::resolve(&ctx, &jar).await;
|
||||
let products = shop::featured_products(&ctx, user.as_ref(), 8, &cur).await?;
|
||||
let c = guard::chrome_from(&ctx, user.as_ref());
|
||||
|
||||
format::view(
|
||||
@@ -25,6 +28,7 @@ async fn index(
|
||||
"logged_in_customer": c.logged_in_customer,
|
||||
"customer_name": c.customer_name,
|
||||
"customer_account_type": c.customer_account_type,
|
||||
"currency_symbol": cur.symbol,
|
||||
"lang": current_lang(&jar),
|
||||
}),
|
||||
)
|
||||
|
||||
@@ -34,7 +34,7 @@ async fn set_lang(headers: HeaderMap, Form(form): Form<LangForm>) -> Result<Resp
|
||||
.into_response())
|
||||
}
|
||||
|
||||
fn back_path(headers: &HeaderMap) -> String {
|
||||
pub(crate) fn back_path(headers: &HeaderMap) -> String {
|
||||
let raw = headers
|
||||
.get(header::REFERER)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
|
||||
@@ -3,6 +3,7 @@ pub mod auth;
|
||||
pub mod auth_pages;
|
||||
pub mod oauth2;
|
||||
pub mod admin_categories;
|
||||
pub mod admin_currencies;
|
||||
pub mod admin_customers;
|
||||
pub mod admin_dashboard;
|
||||
pub mod admin_discount_profiles;
|
||||
@@ -12,6 +13,7 @@ pub mod admin_products;
|
||||
pub mod admin_shipping;
|
||||
pub mod cart;
|
||||
pub mod checkout;
|
||||
pub mod currency;
|
||||
pub mod home;
|
||||
pub mod i18n;
|
||||
pub mod media;
|
||||
|
||||
@@ -13,8 +13,9 @@ use serde_json::json;
|
||||
use crate::{
|
||||
controllers::i18n::current_lang,
|
||||
shared::{
|
||||
currency::{self, Currency},
|
||||
guard,
|
||||
money::{format_price, parse_price_to_cents},
|
||||
money::parse_price_to_cents,
|
||||
pricing,
|
||||
},
|
||||
models::{categories, product_images, product_variants, products, users},
|
||||
@@ -90,6 +91,7 @@ async fn run_search(
|
||||
ctx: &AppContext,
|
||||
user: Option<&users::Model>,
|
||||
params: &SearchParams,
|
||||
cur: &Currency,
|
||||
) -> Result<serde_json::Value> {
|
||||
let q = params.q.clone().unwrap_or_default();
|
||||
let q_trim = q.trim().to_string();
|
||||
@@ -136,9 +138,19 @@ async fn run_search(
|
||||
let price_floor = items.iter().map(|i| i.priced.price_cents).min().unwrap_or(0);
|
||||
let price_ceil = items.iter().map(|i| i.priced.price_cents).max().unwrap_or(0);
|
||||
|
||||
// 3. Non-category filters: price band + in-stock.
|
||||
let min_c = params.min_price.as_deref().and_then(|s| parse_price_to_cents(s).ok());
|
||||
let max_c = params.max_price.as_deref().and_then(|s| parse_price_to_cents(s).ok());
|
||||
// 3. Non-category filters: price band + in-stock. The typed bounds are in
|
||||
// the buyer's display currency; convert them back to EUR cents to compare
|
||||
// against the (EUR) resolved prices.
|
||||
let min_c = params
|
||||
.min_price
|
||||
.as_deref()
|
||||
.and_then(|s| parse_price_to_cents(s).ok())
|
||||
.map(|c| cur.to_eur_cents(c));
|
||||
let max_c = params
|
||||
.max_price
|
||||
.as_deref()
|
||||
.and_then(|s| parse_price_to_cents(s).ok())
|
||||
.map(|c| cur.to_eur_cents(c));
|
||||
let in_stock_only = is_on(¶ms.in_stock);
|
||||
items.retain(|i| {
|
||||
min_c.is_none_or(|m| i.priced.price_cents >= m)
|
||||
@@ -203,6 +215,7 @@ async fn run_search(
|
||||
item.count,
|
||||
image,
|
||||
cat_name,
|
||||
cur,
|
||||
));
|
||||
}
|
||||
|
||||
@@ -219,8 +232,9 @@ async fn run_search(
|
||||
"in_stock": in_stock_only,
|
||||
"min_price": params.min_price.clone().unwrap_or_default(),
|
||||
"max_price": params.max_price.clone().unwrap_or_default(),
|
||||
"price_floor": format_price(price_floor),
|
||||
"price_ceil": format_price(price_ceil),
|
||||
"price_floor": cur.format(price_floor),
|
||||
"price_ceil": cur.format(price_ceil),
|
||||
"currency_symbol": cur.symbol,
|
||||
"total": total,
|
||||
"page": page,
|
||||
"pages": pages,
|
||||
@@ -240,6 +254,7 @@ async fn product_rows(
|
||||
ctx: &AppContext,
|
||||
user: Option<&users::Model>,
|
||||
list: Vec<products::Model>,
|
||||
cur: &Currency,
|
||||
) -> Result<Vec<serde_json::Value>> {
|
||||
let ids: Vec<i32> = list.iter().map(|p| p.id).collect();
|
||||
let grouped = product_variants::Entity::grouped_for_products(&ctx.db, &ids).await?;
|
||||
@@ -261,7 +276,7 @@ async fn product_rows(
|
||||
let mut rows = Vec::with_capacity(entries.len());
|
||||
for ((product, rep, count), priced) in entries.iter().zip(priced.iter()) {
|
||||
let image = product_images::first_for(ctx, product.id).await?;
|
||||
rows.push(view::product_card(product, rep, priced, *count, image, None));
|
||||
rows.push(view::product_card(product, rep, priced, *count, image, None, cur));
|
||||
}
|
||||
Ok(rows)
|
||||
}
|
||||
@@ -272,6 +287,7 @@ pub(crate) async fn featured_products(
|
||||
ctx: &AppContext,
|
||||
user: Option<&users::Model>,
|
||||
limit: u64,
|
||||
cur: &Currency,
|
||||
) -> Result<Vec<serde_json::Value>> {
|
||||
let list = products::Entity::find()
|
||||
.filter(products::Column::Published.eq(true))
|
||||
@@ -279,7 +295,7 @@ pub(crate) async fn featured_products(
|
||||
.limit(limit)
|
||||
.all(&ctx.db)
|
||||
.await?;
|
||||
product_rows(ctx, user, list).await
|
||||
product_rows(ctx, user, list, cur).await
|
||||
}
|
||||
|
||||
/// The site-wide category sidebar, loaded lazily via htmx by the base layout so
|
||||
@@ -320,7 +336,8 @@ async fn index(
|
||||
State(ctx): State<AppContext>,
|
||||
) -> Result<Response> {
|
||||
let user = guard::current_user(&ctx, &jar).await;
|
||||
let mut context = run_search(&ctx, user.as_ref(), &SearchParams::default()).await?;
|
||||
let cur = currency::resolve(&ctx, &jar).await;
|
||||
let mut context = run_search(&ctx, user.as_ref(), &SearchParams::default(), &cur).await?;
|
||||
let c = guard::chrome_from(&ctx, user.as_ref());
|
||||
add_chrome(&mut context, &c, ¤t_lang(&jar));
|
||||
format::view(&v, "shop/index.html", context)
|
||||
@@ -341,7 +358,8 @@ async fn search(
|
||||
State(ctx): State<AppContext>,
|
||||
) -> Result<Response> {
|
||||
let user = guard::current_user(&ctx, &jar).await;
|
||||
let mut context = run_search(&ctx, user.as_ref(), ¶ms).await?;
|
||||
let cur = currency::resolve(&ctx, &jar).await;
|
||||
let mut context = run_search(&ctx, user.as_ref(), ¶ms, &cur).await?;
|
||||
let lang = current_lang(&jar);
|
||||
|
||||
if headers.contains_key("HX-Request") {
|
||||
@@ -385,12 +403,13 @@ async fn show(
|
||||
};
|
||||
|
||||
let user = guard::current_user(&ctx, &jar).await;
|
||||
let cur = currency::resolve(&ctx, &jar).await;
|
||||
let variants = product_variants::Entity::for_product(&ctx.db, product.id).await?;
|
||||
let variant_prices = pricing::price_variants(&ctx, &variants, user.as_ref()).await?;
|
||||
let options: Vec<serde_json::Value> = variants
|
||||
.iter()
|
||||
.zip(variant_prices.iter())
|
||||
.map(|(variant, priced)| view::variant_option(variant, priced))
|
||||
.map(|(variant, priced)| view::variant_option(variant, priced, &cur))
|
||||
.collect();
|
||||
// The card header uses the representative (first) variant for its headline
|
||||
// price; the picker below lets the customer switch.
|
||||
@@ -404,6 +423,7 @@ async fn show(
|
||||
variants.len(),
|
||||
None,
|
||||
category.as_ref().map(|c| c.name.clone()),
|
||||
&cur,
|
||||
),
|
||||
// A product with no variants isn't purchasable; show it without a price.
|
||||
_ => serde_json::json!({
|
||||
@@ -428,6 +448,7 @@ async fn show(
|
||||
"logged_in_customer": c.logged_in_customer,
|
||||
"customer_name": c.customer_name,
|
||||
"customer_account_type": c.customer_account_type,
|
||||
"currency_symbol": cur.symbol,
|
||||
"lang": current_lang(&jar),
|
||||
}),
|
||||
)
|
||||
@@ -463,7 +484,8 @@ async fn category(
|
||||
};
|
||||
|
||||
let user = guard::current_user(&ctx, &jar).await;
|
||||
let mut context = run_search(&ctx, user.as_ref(), ¶ms).await?;
|
||||
let cur = currency::resolve(&ctx, &jar).await;
|
||||
let mut context = run_search(&ctx, user.as_ref(), ¶ms, &cur).await?;
|
||||
if let Some(map) = context.as_object_mut() {
|
||||
map.insert("category".into(), serde_json::to_value(&category)?);
|
||||
map.insert("breadcrumbs".into(), serde_json::to_value(&breadcrumbs)?);
|
||||
|
||||
Reference in New Issue
Block a user