From dd234421a4e39dfac59decf72519bc38720f74fc Mon Sep 17 00:00:00 2001 From: nobswebdev Date: Mon, 7 Sep 2026 12:28:09 +0200 Subject: [PATCH] Rename cryptoCurrency to paymentLabel in storefront invoice views. Align invoice view naming with InvoiceExtended and CMS. --- .../services/StorefrontCheckoutViewService.spec.ts | 2 +- .../storefrontCore/types/StorefrontInvoiceView.ts | 2 +- .../src/modules/storefrontCore/views/checkout.hbs | 4 ++-- .../views/partials/invoice-payment.hbs | 12 ++++++------ .../services/StorefrontOrderViewService.spec.ts | 2 +- .../utils/invoice/toStorefrontInvoiceView.spec.ts | 4 ++-- backend/src/utils/invoice/toStorefrontInvoiceView.ts | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/src/modules/storefrontCheckout/services/StorefrontCheckoutViewService.spec.ts b/backend/src/modules/storefrontCheckout/services/StorefrontCheckoutViewService.spec.ts index 245c635..7bf57ce 100644 --- a/backend/src/modules/storefrontCheckout/services/StorefrontCheckoutViewService.spec.ts +++ b/backend/src/modules/storefrontCheckout/services/StorefrontCheckoutViewService.spec.ts @@ -56,7 +56,7 @@ describe('StorefrontCheckoutViewService', () => { let toStorefrontInvoiceViewSpy: jest.SpiedFunction; const checkoutInvoiceView = { - cryptoCurrency: 'XMR', + paymentLabel: 'XMR', amountFiat: 9 } as unknown as StorefrontInvoiceView; diff --git a/backend/src/modules/storefrontCore/types/StorefrontInvoiceView.ts b/backend/src/modules/storefrontCore/types/StorefrontInvoiceView.ts index 69e6b68..e1f9fdc 100644 --- a/backend/src/modules/storefrontCore/types/StorefrontInvoiceView.ts +++ b/backend/src/modules/storefrontCore/types/StorefrontInvoiceView.ts @@ -3,7 +3,7 @@ import type { InvoiceStatusLabel } from '../../../utils/invoice/types/InvoiceSta import type { InvoiceStatusVariant } from '../../../utils/invoice/types/InvoiceStatusVariant'; export type StorefrontInvoiceView = { - cryptoCurrency: string; + paymentLabel: string; expectedTotalCrypto: string; receivedTotalCrypto: string | null; paymentAddress: string; diff --git a/backend/src/modules/storefrontCore/views/checkout.hbs b/backend/src/modules/storefrontCore/views/checkout.hbs index 910fddc..8e6ca82 100644 --- a/backend/src/modules/storefrontCore/views/checkout.hbs +++ b/backend/src/modules/storefrontCore/views/checkout.hbs @@ -23,14 +23,14 @@

Payment received

Received: - {{checkout.checkoutInvoice.receivedTotalCrypto}} {{checkout.checkoutInvoice.cryptoCurrency}} + {{checkout.checkoutInvoice.receivedTotalCrypto}} {{checkout.checkoutInvoice.paymentLabel}}

Your order is being prepared. This page will redirect automatically once it is ready.

{{> refresh-link href=checkout.refreshHref showAutoRefreshNote=true}} {{else}} -

Pay with {{checkout.checkoutInvoice.cryptoCurrency}}

+

Pay with {{checkout.checkoutInvoice.paymentLabel}}

{{#with checkout.checkoutInvoice}} {{> invoice-payment refreshHref=../checkout.refreshHref showAutoRefreshNote=true}} {{/with}} diff --git a/backend/src/modules/storefrontCore/views/partials/invoice-payment.hbs b/backend/src/modules/storefrontCore/views/partials/invoice-payment.hbs index d55537a..60ad578 100644 --- a/backend/src/modules/storefrontCore/views/partials/invoice-payment.hbs +++ b/backend/src/modules/storefrontCore/views/partials/invoice-payment.hbs @@ -3,27 +3,27 @@ {{/if}} {{#if showProminentAmount}} -

{{expectedTotalCrypto}} {{cryptoCurrency}}

+

{{expectedTotalCrypto}} {{paymentLabel}}

{{/if}} {{#if showReceivedTotal}}

Received: - {{receivedTotalCrypto}} {{cryptoCurrency}} + {{receivedTotalCrypto}} {{paymentLabel}}

{{/if}} {{#if showExpectedTotal}}

Expected total: - {{expectedTotalCrypto}} {{cryptoCurrency}} + {{expectedTotalCrypto}} {{paymentLabel}}

{{/if}} {{#if showInstruction}}

{{instructionPrefix}} - {{instructionAmountCrypto}} {{cryptoCurrency}} + {{instructionAmountCrypto}} {{paymentLabel}} {{instructionSuffix}} {{#if showExpiry}} Payment expires in @@ -34,7 +34,7 @@ {{#if showQr}}

- {{cryptoCurrency}} payment QR code + {{paymentLabel}} payment QR code
{{/if}} @@ -48,7 +48,7 @@