Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba11eda64c | ||
|
|
e4905ec5f1 | ||
|
|
f578e84b3f | ||
|
|
76bc965537 |
@@ -0,0 +1,5 @@
|
|||||||
|
-- The invoice item must identify the service (Áfa tv. 169. § e): what the
|
||||||
|
-- package contains goes under the item, and the unit is "csomag".
|
||||||
|
ALTER TABLE invoices
|
||||||
|
ADD COLUMN item_comment text,
|
||||||
|
ADD COLUMN item_unit text NOT NULL DEFAULT 'csomag';
|
||||||
+3
-1
@@ -26,7 +26,9 @@ A sorok a fiók törlése után is megmaradnak (`user_id` → NULL), mert a szá
|
|||||||
|
|
||||||
## Számla
|
## Számla
|
||||||
|
|
||||||
Fizetéskor a backend egy `invoices` sort is létrehoz a számla minden adatával: a vevő (név, e-mail, ország, irányítószám, város, cím, Billingo-adótípus: `HAS_TAX_NUMBER` / `NO_TAX_NUMBER` / `FOREIGN`, adószám) és a tétel (név, végösszeg, nettó, áfa, áfakód). Az áfakód az `INVOICE_VAT` (a backend `.env`-je): alapból `AAM` (alanyi adómentes: nettó = végösszeg, áfa 0, a számla megjegyzésében „Alanyi adómentes.”), vagy egy kulcs, pl. `27%`. Cégnél a `business_name` és a magyar adószám (`hu_tin`, ennek híján `eu_vat`) kerül a számlára.
|
Fizetéskor a backend egy `invoices` sort is létrehoz a számla minden adatával: a vevő (név, e-mail, ország, irányítószám, város, cím, Billingo-adótípus: `HAS_TAX_NUMBER` / `NO_TAX_NUMBER` / `FOREIGN`, adószám) és a tétel (név, végösszeg, nettó, áfa, áfakód). Az áfakód az `INVOICE_VAT` (a backend `.env`-je): alapból `AAM` (alanyi adómentes: nettó = végösszeg, áfa 0, a számla megjegyzésében „Alanyi adómentes.”), vagy egy kulcs, pl. `27%`. A tétel a törvény szerint azonosítja a szolgáltatást (Áfa tv. 169. § e): megnevezése pl. „Online tartalomszolgáltatás – Páros csomag”, egysége `csomag`, megjegyzése a tartalom („Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: 2 képletelemzés, … Digitális tartalom.”; `Package::invoice_item`). Szándékosan nem „asztrológiai”: a szolgáltatás egy weboldal programmal előállított tartalma, nem személyes szakmai tanácsadás. Cégnél a `business_name` és a magyar adószám (`hu_tin`, ennek híján `eu_vat`) kerül a számlára.
|
||||||
|
|
||||||
|
**Teszt módú fizetéshez (`sk_test_…`) nem készül számla**, mert a Billingo számlái valódiak (a NAV-hoz is bekerülnek); a csomagot ilyenkor is megkapja az admin.
|
||||||
|
|
||||||
A worker `invoices` feladata (`WORKER_TASKS`, prodon a `worker` konténerben) a Billingo API v3-mal:
|
A worker `invoices` feladata (`WORKER_TASKS`, prodon a `worker` konténerben) a Billingo API v3-mal:
|
||||||
|
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ pub async fn queue(
|
|||||||
checkout_id: &str,
|
checkout_id: &str,
|
||||||
user_id: Option<Uuid>,
|
user_id: Option<Uuid>,
|
||||||
buyer: &Buyer,
|
buyer: &Buyer,
|
||||||
item_name: &str,
|
(item_name, item_comment): (&str, &str),
|
||||||
gross_huf: i64,
|
gross_huf: i64,
|
||||||
vat: Vat,
|
vat: Vat,
|
||||||
) -> Result<Uuid, ApiError> {
|
) -> Result<Uuid, ApiError> {
|
||||||
@@ -108,8 +108,8 @@ pub async fn queue(
|
|||||||
let (net, vat_huf) = vat.split(gross_huf);
|
let (net, vat_huf) = vat.split(gross_huf);
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO invoices (id, checkout_id, user_id, buyer_name, buyer_email, buyer_country, buyer_post_code, \
|
"INSERT INTO invoices (id, checkout_id, user_id, buyer_name, buyer_email, buyer_country, buyer_post_code, \
|
||||||
buyer_city, buyer_address, buyer_tax_type, buyer_tax_number, item_name, gross_huf, net_huf, vat_huf, vat_rate) \
|
buyer_city, buyer_address, buyer_tax_type, buyer_tax_number, item_name, gross_huf, net_huf, vat_huf, vat_rate, \
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) \
|
item_comment) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) \
|
||||||
ON CONFLICT (checkout_id) DO NOTHING",
|
ON CONFLICT (checkout_id) DO NOTHING",
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
@@ -128,6 +128,7 @@ pub async fn queue(
|
|||||||
.bind(net as i32)
|
.bind(net as i32)
|
||||||
.bind(vat_huf as i32)
|
.bind(vat_huf as i32)
|
||||||
.bind(vat.code())
|
.bind(vat.code())
|
||||||
|
.bind(item_comment)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
Ok(id)
|
Ok(id)
|
||||||
|
|||||||
@@ -202,6 +202,33 @@ impl Source {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Package {
|
impl Package {
|
||||||
|
/// The invoice item: a name that says what the service is (online,
|
||||||
|
/// software-made content; no profession implied), and what the package
|
||||||
|
/// contains (Áfa tv. 169. § e).
|
||||||
|
pub fn invoice_item(&self) -> (String, String) {
|
||||||
|
let name = match self.tier {
|
||||||
|
Tier::Main => format!("Online tartalomszolgáltatás – {} csomag", self.name),
|
||||||
|
Tier::Addon => format!("Online tartalomszolgáltatás – {} kiegészítő", self.name),
|
||||||
|
};
|
||||||
|
let lines: Vec<String> = [
|
||||||
|
(self.natal, "képletelemzés"),
|
||||||
|
(self.synastry, "kapcsolati elemzés"),
|
||||||
|
(self.forecast, "éves előrejelzés"),
|
||||||
|
(self.persons, "további személy felvétele"),
|
||||||
|
(self.questions, "kérdés"),
|
||||||
|
]
|
||||||
|
.into_iter()
|
||||||
|
.filter(|&(n, _)| n > 0)
|
||||||
|
.map(|(n, what)| format!("{n} {what}"))
|
||||||
|
.collect();
|
||||||
|
let comment = format!(
|
||||||
|
"Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: {}. \
|
||||||
|
Digitális tartalom.",
|
||||||
|
lines.join(", ")
|
||||||
|
);
|
||||||
|
(name, comment)
|
||||||
|
}
|
||||||
|
|
||||||
/// What the package gives, unit by unit.
|
/// What the package gives, unit by unit.
|
||||||
pub fn contents(&self) -> [(Unit, i64); 5] {
|
pub fn contents(&self) -> [(Unit, i64); 5] {
|
||||||
[
|
[
|
||||||
@@ -341,4 +368,21 @@ mod tests {
|
|||||||
assert!(CATALOG.iter().filter(|p| p.tier == Tier::Main).all(|p| p.questions == QUESTIONS_INCLUDED));
|
assert!(CATALOG.iter().filter(|p| p.tier == Tier::Main).all(|p| p.questions == QUESTIONS_INCLUDED));
|
||||||
assert_eq!(find("addon_questions").unwrap().questions, 5);
|
assert_eq!(find("addon_questions").unwrap().questions, 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn invoice_items_say_what_was_bought() {
|
||||||
|
let (name, comment) = find("couple").unwrap().invoice_item();
|
||||||
|
assert_eq!(name, "Online tartalomszolgáltatás – Páros csomag");
|
||||||
|
assert_eq!(
|
||||||
|
comment,
|
||||||
|
"Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: \
|
||||||
|
2 képletelemzés, 1 kapcsolati elemzés, 2 éves előrejelzés, 1 további személy felvétele, 3 kérdés. \
|
||||||
|
Digitális tartalom."
|
||||||
|
);
|
||||||
|
let (name, comment) = find("addon_persons").unwrap().invoice_item();
|
||||||
|
assert_eq!(name, "Online tartalomszolgáltatás – +5 személy kiegészítő");
|
||||||
|
assert!(comment.ends_with("tartalmaihoz: 5 további személy felvétele. Digitális tartalom."), "{comment}");
|
||||||
|
// No profession is implied.
|
||||||
|
assert!(CATALOG.iter().all(|p| !format!("{:?}", p.invoice_item()).to_lowercase().contains("asztrol")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -170,13 +170,14 @@ pub async fn checkout(
|
|||||||
/// grants its package and queues the invoice, once. `false`: not our session.
|
/// grants its package and queues the invoice, once. `false`: not our session.
|
||||||
async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, ApiError> {
|
async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, ApiError> {
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let row: Option<(Option<Uuid>, String, i32, Option<OffsetDateTime>)> = sqlx::query_as(
|
type Checkout = (Option<Uuid>, String, i32, bool, Option<OffsetDateTime>);
|
||||||
"SELECT user_id, package, price_huf, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE",
|
let row: Option<Checkout> = sqlx::query_as(
|
||||||
|
"SELECT user_id, package, price_huf, live, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE",
|
||||||
)
|
)
|
||||||
.bind(&session.id)
|
.bind(&session.id)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
let Some((user_id, package_id, price_huf, completed_at)) = row else { return Ok(false) };
|
let Some((user_id, package_id, price_huf, live, completed_at)) = row else { return Ok(false) };
|
||||||
if completed_at.is_some() {
|
if completed_at.is_some() {
|
||||||
return Ok(true);
|
return Ok(true);
|
||||||
}
|
}
|
||||||
@@ -205,10 +206,15 @@ async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, A
|
|||||||
.bind(&session.customer_details)
|
.bind(&session.customer_details)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
// A test payment gets no invoice: Billingo's invoices are real (reported
|
||||||
|
// to the tax authority).
|
||||||
|
if live {
|
||||||
let buyer = invoices::Buyer::from_stripe(session.customer_details.as_ref().unwrap_or(&Value::Null), None);
|
let buyer = invoices::Buyer::from_stripe(session.customer_details.as_ref().unwrap_or(&Value::Null), None);
|
||||||
let item = format!("Sorsfonalak – {}", package.name);
|
let (item, comment) = package.invoice_item();
|
||||||
let gross = amount_huf.unwrap_or(i64::from(price_huf));
|
let gross = amount_huf.unwrap_or(i64::from(price_huf));
|
||||||
invoices::queue(&mut tx, &session.id, user_id, &buyer, &item, gross, state.config.invoice_vat).await?;
|
invoices::queue(&mut tx, &session.id, user_id, &buyer, (&item, &comment), gross, state.config.invoice_vat)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
tracing::info!(user = ?user_id, package = %package_id, session = %session.id, "package paid");
|
tracing::info!(user = ?user_id, package = %package_id, session = %session.id, "package paid");
|
||||||
Ok(true)
|
Ok(true)
|
||||||
|
|||||||
@@ -2404,7 +2404,7 @@ async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) {
|
|||||||
(invoice.buyer_tax_type.as_str(), invoice.buyer_tax_number.as_deref()),
|
(invoice.buyer_tax_type.as_str(), invoice.buyer_tax_number.as_deref()),
|
||||||
("HAS_TAX_NUMBER", Some("12345678-1-23"))
|
("HAS_TAX_NUMBER", Some("12345678-1-23"))
|
||||||
);
|
);
|
||||||
assert_eq!(invoice.item_name, "Sorsfonalak – Páros");
|
assert_eq!(invoice.item_name, "Online tartalomszolgáltatás – Páros csomag");
|
||||||
// Alanyi adómentes (the default): no VAT.
|
// Alanyi adómentes (the default): no VAT.
|
||||||
assert_eq!((invoice.gross_huf, invoice.net_huf, invoice.vat_huf), (6000, 6000, 0));
|
assert_eq!((invoice.gross_huf, invoice.net_huf, invoice.vat_huf), (6000, 6000, 0));
|
||||||
|
|
||||||
@@ -2475,11 +2475,32 @@ async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!((name.as_str(), tax_type.as_str()), ("Anna Teszt", "NO_TAX_NUMBER"));
|
assert_eq!((name.as_str(), tax_type.as_str()), ("Anna Teszt", "NO_TAX_NUMBER"));
|
||||||
|
|
||||||
|
// A test payment grants the package but gets no invoice (Billingo's are real).
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO stripe_checkouts (id, user_id, package, price_huf, live) \
|
||||||
|
SELECT 'cs_test_1', id, 'single', 2000, false FROM users WHERE email = 'anna@example.com'",
|
||||||
|
)
|
||||||
|
.execute(&app.pool)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let test = json!({"type": "checkout.session.completed",
|
||||||
|
"data": {"object": {"id": "cs_test_1", "payment_status": "paid", "amount_total": 200000, "currency": "huf"}}});
|
||||||
|
let sig = crate::stripe::sign("whsec_fake", test.to_string().as_bytes(), now);
|
||||||
|
let r = app.call_with("POST", "/v1/payments/stripe/webhook", None, Some(test), &[("stripe-signature", &sig)]).await;
|
||||||
|
assert_eq!(r.status, StatusCode::OK);
|
||||||
|
assert_eq!(stripe_orders(&app.pool, "anna@example.com").await.len(), 3);
|
||||||
|
let (invoices,): (i64,) = sqlx::query_as("SELECT count(*) FROM invoices WHERE checkout_id = 'cs_test_1'")
|
||||||
|
.fetch_one(&app.pool)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(invoices, 0);
|
||||||
|
|
||||||
// Deleting the account keeps the payments (accounting law).
|
// Deleting the account keeps the payments (accounting law).
|
||||||
let r = app.call("DELETE", "/v1/me", Some(&anna), Some(json!({"confirm": "DELETE"}))).await;
|
let r = app.call("DELETE", "/v1/me", Some(&anna), Some(json!({"confirm": "DELETE"}))).await;
|
||||||
assert!(r.status.is_success(), "{}", r.body);
|
assert!(r.status.is_success(), "{}", r.body);
|
||||||
let (kept,): (i64,) =
|
let (kept,): (i64,) = sqlx::query_as(
|
||||||
sqlx::query_as("SELECT count(*) FROM stripe_checkouts WHERE user_id IS NULL AND completed_at IS NOT NULL")
|
"SELECT count(*) FROM stripe_checkouts WHERE user_id IS NULL AND completed_at IS NOT NULL AND live",
|
||||||
|
)
|
||||||
.fetch_one(&app.pool)
|
.fetch_one(&app.pool)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|||||||
@@ -86,6 +86,8 @@ struct Due {
|
|||||||
buyer_tax_type: String,
|
buyer_tax_type: String,
|
||||||
buyer_tax_number: Option<String>,
|
buyer_tax_number: Option<String>,
|
||||||
item_name: String,
|
item_name: String,
|
||||||
|
item_comment: Option<String>,
|
||||||
|
item_unit: String,
|
||||||
gross_huf: i32,
|
gross_huf: i32,
|
||||||
vat_rate: String,
|
vat_rate: String,
|
||||||
payment_method: String,
|
payment_method: String,
|
||||||
@@ -128,7 +130,7 @@ pub async fn run_once(db: &PgPool, billingo: &Billingo, max_attempts: i32) -> Re
|
|||||||
WHERE c.id = i.checkout_id AND i.id = (SELECT id FROM invoices WHERE status = 'pending' \
|
WHERE c.id = i.checkout_id AND i.id = (SELECT id FROM invoices WHERE status = 'pending' \
|
||||||
AND next_attempt_at <= now() ORDER BY next_attempt_at FOR UPDATE SKIP LOCKED LIMIT 1) \
|
AND next_attempt_at <= now() ORDER BY next_attempt_at FOR UPDATE SKIP LOCKED LIMIT 1) \
|
||||||
RETURNING i.id, i.attempts, i.buyer_name, i.buyer_email, i.buyer_country, i.buyer_post_code, \
|
RETURNING i.id, i.attempts, i.buyer_name, i.buyer_email, i.buyer_country, i.buyer_post_code, \
|
||||||
i.buyer_city, i.buyer_address, i.buyer_tax_type, i.buyer_tax_number, i.item_name, i.gross_huf, \
|
i.buyer_city, i.buyer_address, i.buyer_tax_type, i.buyer_tax_number, i.item_name, i.item_comment, i.item_unit, i.gross_huf, \
|
||||||
i.vat_rate, i.payment_method, i.billingo_partner_id, i.billingo_document_id, i.sent_at, \
|
i.vat_rate, i.payment_method, i.billingo_partner_id, i.billingo_document_id, i.sent_at, \
|
||||||
coalesce(c.completed_at, i.created_at) AS paid_at"
|
coalesce(c.completed_at, i.created_at) AS paid_at"
|
||||||
))
|
))
|
||||||
@@ -240,8 +242,9 @@ async fn issue(db: &PgPool, billingo: &Billingo, due: &Due) -> Result<String, Fa
|
|||||||
"unit_price": due.gross_huf,
|
"unit_price": due.gross_huf,
|
||||||
"unit_price_type": "gross",
|
"unit_price_type": "gross",
|
||||||
"quantity": 1,
|
"quantity": 1,
|
||||||
"unit": "db",
|
"unit": due.item_unit,
|
||||||
"vat": due.vat_rate,
|
"vat": due.vat_rate,
|
||||||
|
"comment": due.item_comment.clone().unwrap_or_default(),
|
||||||
}],
|
}],
|
||||||
"comment": if due.vat_rate == "AAM" {
|
"comment": if due.vat_rate == "AAM" {
|
||||||
"Bankkártyával kifizetve (Stripe). Alanyi adómentes."
|
"Bankkártyával kifizetve (Stripe). Alanyi adómentes."
|
||||||
@@ -399,7 +402,7 @@ mod tests {
|
|||||||
"INSERT INTO invoices (id, checkout_id, buyer_name, buyer_email, buyer_country, buyer_post_code, \
|
"INSERT INTO invoices (id, checkout_id, buyer_name, buyer_email, buyer_country, buyer_post_code, \
|
||||||
buyer_city, buyer_address, buyer_tax_type, buyer_tax_number, item_name, gross_huf, net_huf, vat_huf) \
|
buyer_city, buyer_address, buyer_tax_type, buyer_tax_number, item_name, gross_huf, net_huf, vat_huf) \
|
||||||
VALUES ($1, $2, 'Csillag Kft.', 'anna@example.com', 'HU', '6720', 'Szeged', 'Fő utca 1.', $3, $4, \
|
VALUES ($1, $2, 'Csillag Kft.', 'anna@example.com', 'HU', '6720', 'Szeged', 'Fő utca 1.', $3, $4, \
|
||||||
'Sorsfonalak – Páros', 6000, 6000, 0)",
|
'Online tartalomszolgáltatás – Páros csomag', 6000, 6000, 0)",
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(&checkout)
|
.bind(&checkout)
|
||||||
@@ -449,6 +452,10 @@ mod tests {
|
|||||||
(&json!(true), &json!("online_bankcard"), &json!("HUF"))
|
(&json!(true), &json!("online_bankcard"), &json!("HUF"))
|
||||||
);
|
);
|
||||||
assert_eq!(doc["items"][0]["unit_price"], 6000);
|
assert_eq!(doc["items"][0]["unit_price"], 6000);
|
||||||
|
assert_eq!(
|
||||||
|
(&doc["items"][0]["name"], &doc["items"][0]["unit"]),
|
||||||
|
(&json!("Online tartalomszolgáltatás – Páros csomag"), &json!("csomag"))
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
(&doc["items"][0]["unit_price_type"], &doc["items"][0]["vat"]),
|
(&doc["items"][0]["unit_price_type"], &doc["items"][0]["vat"]),
|
||||||
(&json!("gross"), &json!("AAM"))
|
(&json!("gross"), &json!("AAM"))
|
||||||
|
|||||||
Reference in New Issue
Block a user