Compare commits

...
Author SHA1 Message Date
sagifer bbfa5b28c3 Merge pull request 'Invoice every payment again, test payments included' (#29) from main into prod
CI / test (push) Successful in 1m29s
CI / build (push) Successful in 1m50s
CI / deploy (push) Successful in 55s
Reviewed-on: #29
2026-11-20 11:09:30 +01:00
fecoandClaude Opus 5.5 e741f9b491 Invoice every payment again, test payments included
CI / test (push) Successful in 1m27s
CI / build (push) Successful in 4m36s
CI / deploy (push) Skipped
The Billingo account is a test one for now, and the whole flow is being
tested; skipping test payments was not asked for. Stripe and Billingo
go live together at the opening.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-20 10:00:48 +00:00
fecoandClaude Opus 5.5 ba11eda64c Merge main into prod: invoice fixes
CI / test (push) Successful in 1m28s
CI / build (push) Successful in 19s
CI / deploy (push) Successful in 34s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-20 08:56:08 +00:00
fecoandClaude Opus 5.5 e4905ec5f1 Invoice items: online content service, not astrology
CI / test (push) Successful in 1m32s
CI / build (push) Successful in 4m58s
CI / deploy (push) Skipped
The item reads e.g. 'Online tartalomszolgáltatás – Páros csomag', with
access to the site's software-made, personalised texts as its comment:
no profession is implied.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-20 08:55:55 +00:00
fecoandClaude Opus 5.5 f578e84b3f Invoice items say what the service is
CI / test (push) Successful in 1m32s
CI / build (push) Successful in 5m50s
CI / deploy (push) Skipped
'Sorsfonalak – Páros' does not identify the service, as the VAT act
(169. § e) asks. The item is now e.g. 'Asztrológiai elemzéscsomag –
Páros', unit 'csomag', with the package's contents as its comment.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-20 08:34:08 +00:00
fecoandClaude Opus 5.5 76bc965537 No invoice for test payments
CI / test (push) Successful in 1m28s
CI / build (push) Successful in 6m16s
CI / deploy (push) Skipped
Billingo's invoices are real (reported to the tax authority), so a
payment made with a Stripe test key grants the package but queues no
invoice.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-20 08:30:54 +00:00
7 changed files with 71 additions and 11 deletions
@@ -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
View File
@@ -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.
Minden igazolt fizetéshez készül számla, a teszt módúakhoz (`sk_test_…`) is: így a teljes folyamat próbálható egy teszt Billingo-fiókkal. Éles Billingo-fiók mellett ezért prodon már ne legyen teszt Stripe-kulcs (a kettőt megnyitáskor együtt kell élesre cserélni).
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:
+4 -3
View File
@@ -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)
+44
View File
@@ -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")));
}
} }
+4 -3
View File
@@ -170,7 +170,8 @@ 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, Option<OffsetDateTime>);
let row: Option<Checkout> = sqlx::query_as(
"SELECT user_id, package, price_huf, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE", "SELECT user_id, package, price_huf, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE",
) )
.bind(&session.id) .bind(&session.id)
@@ -206,9 +207,9 @@ async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, A
.execute(&mut *tx) .execute(&mut *tx)
.await?; .await?;
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)
+1 -1
View File
@@ -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));
+10 -3
View File
@@ -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"))