mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-10-15 02:21:08 +00:00
* badges: webapp (#7433) * badges: service migrations, store and catalog * badges: BTCPay provider and settlement poller * badges: web listener and /api endpoints * web: checkout single-page app * badges: tests and BTCPay fixtures * badges: README and ini reference * badges: fix hex16 build on GHC 8.10.7 * badges: Stripe card lane * badges: fix Stripe card checkout, add theming * badges: add a discount row to the order summary * badges: site navbar, embedding, theme, Forget move * badges: use SB code prefix in web checkout * badges: rename sxb app namespace to sb * badges: embed checkout nav via site; keep original app navbar * badges: post iframe height, apply site background when embedded * badges: embed dark surfaces, steadier iframe height * badges: hide app footer when embedded * badges: size embedded body to content, not viewport * badges: declare color-scheme to stop reload flash * badges: fade shell in on load, no reload blank * badges: prerender app shell into index.html * badges: pre-paint theme, hide shell on deep reload * badges: logo returns to landing client-side * badges: embedded wizard back, buy-a-code, resume * badges: signal app-managed screens, resume across reload * badges: rebuild wizard history on deep load so Back walks it * badges: carry welcome-page height as the iframe floor * badges: keep selection on Buy a code; rename to Your codes * badges: read web shell as UTF-8, not locale * badges: resume the exact paid order after Stripe card redirect * badges: move docker deploy under scripts * badges: add serve_webapp toggle and webapp export * badges: wire split webapp deploy in docker config * badges: quiet agent logs by default * badges: resume card redirect in the embedded frame * badges: migrate Stripe adapter to PaymentIntents * badges: correct Stripe restricted key scopes in ini example * badges: card via Payment Element and PaymentIntents * badges: fix stale Checkout Session wording in Stripe adapter * badges: fix stale CheckoutActions reference in card comment * badges: order shell stylesheet before bootstrap script * badges: remove development card stand-in * badges: theme the Stripe card form with the site palette * badges: exclude web from the Haskell build stage * badges: unify invoice cancel and mark canceled * badges: default log level to info * badges: unify closed-invoice buy-again button * badges: mute agent connection logs at info level * badges: show purchase time in local timezone in Your codes * badges: log service events on own channel, quiet agent * badges: fold service migrations into one baseline * badges: run compose on postgres over host network * badges: use high-res hero art * badges: add web CI to catch stale builds * badges: rebuild web shell from committed source * badges: normalize invoice-code link and columns * badges: drop unused columns, rename index * badges: note deferred receipt_hash in migrations * badges: apply code-review fixes * badges: reduce comments across service and web --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com> Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * badges: improve web page (#7546) * badges: improve web page * improve layout * improve layout * fix * small changes --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * badges: read one issuer key from the ini * badges: move and group the service tests * badges: service fixes (#7567) * badges: match the redeem error wording in tests * badges: drop unused imports in the bot tests * badges: cancel Stripe orders when they expire * badges: correct the Stripe config and docs * badges: refuse to revoke a redeemed code * badges: make the fake Stripe cancel like Stripe * badges: limit replayed webhook deliveries --------- Co-authored-by: sh <37271604+shumvgolove@users.noreply.github.com> Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> Co-authored-by: shum <github.shum@liber.li> Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
72 lines
3.0 KiB
TypeScript
72 lines
3.0 KiB
TypeScript
export type BadgeType = "supporter" | "legend";
|
|
|
|
export interface Price {
|
|
priceId: string;
|
|
badgeType: BadgeType;
|
|
monthPrice: number; // minor units
|
|
currency: string;
|
|
}
|
|
|
|
export type Discount =
|
|
| { type: "freeMonths"; freeMonths: number }
|
|
| { type: "discount"; discount: number };
|
|
|
|
export interface Offer {
|
|
offerId: string;
|
|
priceId: string;
|
|
months: number;
|
|
discount: Discount;
|
|
}
|
|
|
|
export interface Catalog {
|
|
prices: readonly Price[];
|
|
offers: readonly Offer[];
|
|
}
|
|
|
|
export const CATALOG: Catalog = {
|
|
prices: [
|
|
{ priceId: "price_supporter", badgeType: "supporter", monthPrice: 700, currency: "usd" },
|
|
{ priceId: "price_legend", badgeType: "legend", monthPrice: 7000, currency: "usd" },
|
|
],
|
|
offers: [
|
|
{ offerId: "offer_3m", priceId: "price_legend", months: 3, discount: { type: "freeMonths", freeMonths: 1 } },
|
|
{ offerId: "offer_12m", priceId: "price_legend", months: 12, discount: { type: "discount", discount: 50 } },
|
|
{ offerId: "offer_3m_s", priceId: "price_supporter", months: 3, discount: { type: "freeMonths", freeMonths: 1 } },
|
|
{ offerId: "offer_12m_s", priceId: "price_supporter", months: 12, discount: { type: "discount", discount: 50 } },
|
|
],
|
|
};
|
|
|
|
// This key names no row in CATALOG.offers, and the request must omit the offerId when it is chosen.
|
|
export const SINGLE_MONTH = "1m";
|
|
|
|
export interface Total { months: number; price: number; amount: number }
|
|
|
|
const MAX_AMOUNT = 100_000_000; // $1,000,000 in minor units
|
|
|
|
export function offerTotal(monthPrice: number, offer: Offer | undefined): Total | string {
|
|
if (!Number.isInteger(monthPrice) || monthPrice < 0) return "bad month price";
|
|
if (offer === undefined) return charge(1, monthPrice);
|
|
if (!Number.isInteger(offer.months) || offer.months < 0) return "months must be a non-negative integer";
|
|
if (offer.months <= 0) return "zero months";
|
|
const gross = monthPrice * offer.months;
|
|
if (offer.discount.type === "freeMonths") {
|
|
if (!Number.isInteger(offer.discount.freeMonths) || offer.discount.freeMonths < 0) return "free months must be a non-negative integer";
|
|
if (offer.discount.freeMonths >= offer.months) return "free months exceed the term";
|
|
return charge(offer.months, monthPrice * (offer.months - offer.discount.freeMonths), gross);
|
|
}
|
|
if (!Number.isInteger(offer.discount.discount) || offer.discount.discount < 0) return "discount must be a non-negative integer";
|
|
if (offer.discount.discount >= 100) return "discount too large";
|
|
return charge(offer.months, Math.floor((gross * (100 - offer.discount.discount)) / 100), gross);
|
|
}
|
|
|
|
// The full price is checked against the cap as well as the charge, because a total the page shows as sellable would otherwise be refused at checkout.
|
|
function charge(months: number, amount: number, price = amount): Total | string {
|
|
if (amount <= 0 || amount > MAX_AMOUNT || price > MAX_AMOUNT) return "amount unsellable";
|
|
return { months, price, amount };
|
|
}
|
|
|
|
export function savingPercent(price: number, amount: number): number {
|
|
if (price <= 0) return 0;
|
|
return Math.round(((price - amount) / price) * 100);
|
|
}
|