Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71177f749c | ||
|
|
ac5e7fa4fd | ||
|
|
bbfa5b28c3 | ||
|
|
e741f9b491 |
+1
-1
@@ -28,7 +28,7 @@ A sorok a fiók törlése után is megmaradnak (`user_id` → NULL), mert a szá
|
||||
|
||||
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.
|
||||
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:
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ use crate::auth::AuthUser;
|
||||
use crate::credits::{self, Unit};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::{rfc3339, rfc3339_opt, sha256_hex};
|
||||
use db::Role;
|
||||
|
||||
#[derive(Debug, Clone, sqlx::FromRow)]
|
||||
/// An analysis as users see it; the model is left out on purpose (a business secret).
|
||||
@@ -136,10 +135,8 @@ async fn request(
|
||||
req: AnalysisRequest,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let language = validate_locale(state, Some(req.language.as_deref().unwrap_or(&auth.user.locale)))?;
|
||||
// Admins use no unit.
|
||||
let admin = auth.user.has_role(Role::Admin);
|
||||
// Admins use units too (they can add more on the admin page).
|
||||
let unit = match target {
|
||||
_ if admin => None,
|
||||
Target::Synastry { .. } => Some(Unit::Synastry),
|
||||
Target::Forecast { .. } => Some(Unit::Forecast),
|
||||
_ => Some(Unit::Natal),
|
||||
|
||||
@@ -170,14 +170,14 @@ pub async fn checkout(
|
||||
/// grants its package and queues the invoice, once. `false`: not our session.
|
||||
async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, ApiError> {
|
||||
let mut tx = state.db.begin().await?;
|
||||
type Checkout = (Option<Uuid>, String, i32, bool, Option<OffsetDateTime>);
|
||||
type Checkout = (Option<Uuid>, String, i32, Option<OffsetDateTime>);
|
||||
let row: Option<Checkout> = sqlx::query_as(
|
||||
"SELECT user_id, package, price_huf, live, 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)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
let Some((user_id, package_id, price_huf, live, completed_at)) = row else { return Ok(false) };
|
||||
let Some((user_id, package_id, price_huf, completed_at)) = row else { return Ok(false) };
|
||||
if completed_at.is_some() {
|
||||
return Ok(true);
|
||||
}
|
||||
@@ -206,15 +206,10 @@ async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, A
|
||||
.bind(&session.customer_details)
|
||||
.execute(&mut *tx)
|
||||
.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 (item, comment) = package.invoice_item();
|
||||
let gross = amount_huf.unwrap_or(i64::from(price_huf));
|
||||
invoices::queue(&mut tx, &session.id, user_id, &buyer, (&item, &comment), gross, state.config.invoice_vat)
|
||||
.await?;
|
||||
}
|
||||
let buyer = invoices::Buyer::from_stripe(session.customer_details.as_ref().unwrap_or(&Value::Null), None);
|
||||
let (item, comment) = package.invoice_item();
|
||||
let gross = amount_huf.unwrap_or(i64::from(price_huf));
|
||||
invoices::queue(&mut tx, &session.id, user_id, &buyer, (&item, &comment), gross, state.config.invoice_vat).await?;
|
||||
tx.commit().await?;
|
||||
tracing::info!(user = ?user_id, package = %package_id, session = %session.id, "package paid");
|
||||
Ok(true)
|
||||
|
||||
@@ -9,7 +9,6 @@ use axum::Json;
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum_extra::extract::WithRejection;
|
||||
use db::Role;
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
use sqlx::PgPool;
|
||||
@@ -145,7 +144,6 @@ pub async fn ask(
|
||||
));
|
||||
}
|
||||
|
||||
let admin = auth.user.has_role(Role::Admin);
|
||||
let (model, fallback, prompt_version) = model_and_version(&state, &analysis.language).await?;
|
||||
let question_id = Uuid::now_v7();
|
||||
let mut tx = state.db.begin().await?;
|
||||
@@ -161,13 +159,12 @@ pub async fn ask(
|
||||
.bind(&analysis.language)
|
||||
.bind(&model)
|
||||
.bind(&prompt_version)
|
||||
.bind(i32::from(!admin))
|
||||
.bind(1i32)
|
||||
.bind(&fallback)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
if !admin {
|
||||
credits::spend_question(&mut tx, auth.id(), question_id).await?;
|
||||
}
|
||||
// Admins use questions too (they can add more on the admin page).
|
||||
credits::spend_question(&mut tx, auth.id(), question_id).await?;
|
||||
tx.commit().await?;
|
||||
Ok((StatusCode::ACCEPTED, Json(row.view())))
|
||||
}
|
||||
|
||||
@@ -277,6 +277,15 @@ impl TestApp {
|
||||
r.body["session"]["token"].as_str().unwrap().to_string()
|
||||
}
|
||||
|
||||
/// An admin adds units to their own account (admins use units too).
|
||||
async fn add_own_units(&self, admin: &str, unit: &str, delta: i32) {
|
||||
let id = self.get("/v1/me", Some(admin)).await.body["user"]["id"].as_str().unwrap().to_string();
|
||||
let r = self
|
||||
.post(&format!("/v1/admin/users/{id}/credits"), Some(admin), json!({"unit": unit, "delta": delta}))
|
||||
.await;
|
||||
assert!(r.status.is_success(), "{}", r.body);
|
||||
}
|
||||
|
||||
async fn chart(&self, token: &str, label: &str, primary: bool, date: &str) -> Value {
|
||||
let r = self
|
||||
.post(
|
||||
@@ -1061,13 +1070,18 @@ async fn birth_data_changes_are_limited(pool: PgPool) {
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) {
|
||||
async fn admins_use_units_too_and_mock_payments_add_units(pool: PgPool) {
|
||||
let app = TestApp::new(pool).await;
|
||||
let admin = app.register("admin@example.com", "Admin").await;
|
||||
let chart = app.chart(&admin, "Saját", true, "1990-03-15").await;
|
||||
let r =
|
||||
app.call("POST", &format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap()), Some(&admin), None).await;
|
||||
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(0)), "{}", r.body);
|
||||
let analyses = format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap());
|
||||
// Admins pay with units like everyone (they add their own on the admin page).
|
||||
let r = app.call("POST", &analyses, Some(&admin), None).await;
|
||||
assert_eq!(r.status, StatusCode::PAYMENT_REQUIRED, "{}", r.body);
|
||||
app.add_own_units(&admin, "natal", 2).await;
|
||||
let r = app.call("POST", &analyses, Some(&admin), None).await;
|
||||
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(1)), "{}", r.body);
|
||||
assert_eq!(app.get("/v1/credits", Some(&admin)).await.body["balance"]["natal"], 1);
|
||||
|
||||
// a user "pays", which adds a unit, then requests the analysis
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
@@ -1750,6 +1764,7 @@ async fn admins_choose_the_model_of_each_function(pool: PgPool) {
|
||||
assert_eq!((r.status, &r.body["model"], &r.body["custom"]), (StatusCode::OK, &json!("openai/gpt-x"), &json!(true)));
|
||||
|
||||
// new analyses use it; regenerating writes it again in place with the current model
|
||||
app.add_own_units(&admin, "natal", 1).await;
|
||||
let chart = app.chart(&admin, "Saját", true, "1990-03-15").await;
|
||||
let chart_id = chart["id"].as_str().unwrap();
|
||||
let r = app.post(&format!("/v1/charts/{chart_id}/analyses"), Some(&admin), json!({})).await;
|
||||
@@ -1880,6 +1895,7 @@ async fn admins_restart_open_generations_with_the_current_models(pool: PgPool) {
|
||||
async move { app.call("PUT", "/v1/admin/models/analysis", Some(admin), Some(body)).await }
|
||||
};
|
||||
assert_eq!(put("openai/gpt-x").await.status, StatusCode::OK);
|
||||
app.add_own_units(&admin, "natal", 1).await;
|
||||
let chart = app.chart(&admin, "Saját", true, "1990-03-15").await;
|
||||
let chart_id = chart["id"].as_str().unwrap();
|
||||
let r = app.post(&format!("/v1/charts/{chart_id}/analyses"), Some(&admin), json!({})).await;
|
||||
@@ -2475,35 +2491,14 @@ async fn stripe_checkout_grants_the_paid_package_once(pool: PgPool) {
|
||||
.unwrap();
|
||||
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).
|
||||
let r = app.call("DELETE", "/v1/me", Some(&anna), Some(json!({"confirm": "DELETE"}))).await;
|
||||
assert!(r.status.is_success(), "{}", r.body);
|
||||
let (kept,): (i64,) = sqlx::query_as(
|
||||
"SELECT count(*) FROM stripe_checkouts WHERE user_id IS NULL AND completed_at IS NOT NULL AND live",
|
||||
)
|
||||
.fetch_one(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let (kept,): (i64,) =
|
||||
sqlx::query_as("SELECT count(*) FROM stripe_checkouts WHERE user_id IS NULL AND completed_at IS NOT NULL")
|
||||
.fetch_one(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(kept, 2);
|
||||
let (kept,): (i64,) =
|
||||
sqlx::query_as("SELECT count(*) FROM invoices WHERE user_id IS NULL").fetch_one(&app.pool).await.unwrap();
|
||||
|
||||
@@ -132,7 +132,7 @@ export function AnalysisQuestions({
|
||||
setBuying(false);
|
||||
}
|
||||
|
||||
const canAsk = isAdmin || left > 0;
|
||||
const canAsk = left > 0;
|
||||
return (
|
||||
<section className="questions" aria-labelledby={`${fieldId}-title`}>
|
||||
<h3 id={`${fieldId}-title`}>{TEXTS[about].title}</h3>
|
||||
@@ -196,11 +196,7 @@ export function AnalysisQuestions({
|
||||
{busy ? "Küldés…" : "Kérdés küldése"}
|
||||
</button>
|
||||
<span className="hint">
|
||||
{waiting
|
||||
? "Várd meg az előző válaszát."
|
||||
: isAdmin
|
||||
? "Adminként ingyenes."
|
||||
: `Még ${left} kérdésed van.`}{" "}
|
||||
{waiting ? "Várd meg az előző válaszát." : `Még ${left} kérdésed van.`}{" "}
|
||||
{text.length > MAX_CHARS - 100 && `${text.length}/${MAX_CHARS}`}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -198,7 +198,7 @@ export function DetailedAnalysis({
|
||||
<div className="msg msg-error" role="alert">
|
||||
<p style={{ margin: 0 }}>
|
||||
Az elemzés többszöri próbálkozás után sem készült el.
|
||||
{isAdmin || analysis.credits_charged === 0
|
||||
{analysis.credits_charged === 0
|
||||
? " Próbáld újra."
|
||||
: " A felhasznált egységet visszaadtuk, így ingyen újra kérheted."}
|
||||
</p>
|
||||
@@ -211,14 +211,7 @@ export function DetailedAnalysis({
|
||||
</p>
|
||||
)}
|
||||
|
||||
{isAdmin ? (
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
|
||||
{busy ? "Indítás…" : `${t.item} készítése`}
|
||||
</button>
|
||||
<span className="hint">Adminként ingyenes.</span>
|
||||
</div>
|
||||
) : left > 0 ? (
|
||||
{left > 0 ? (
|
||||
step === "confirm" ? (
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
|
||||
|
||||
Reference in New Issue
Block a user