backend/src/consts/paymentMethodLabel.ts

@@ -0,0 +1,6 @@
+import { PaymentMethod } from '../modules/payment/types/PaymentMethod';
+
+export const paymentMethodLabel: Record<PaymentMethod, string> = {
+    [PaymentMethod.Xmr]: 'XMR',
+    [PaymentMethod.Btc]: 'BTC'
+};

backend/src/modules/storefrontCart/StorefrontCartModule.ts

@@ -3,14 +3,13 @@ import { DiscountCodesModule } from '../discountCode/DiscountCodesModule';
 import { ProductsModule } from '../product/ProductsModule';
 import { StorefrontCoreModule } from '../storefrontCore/StorefrontCoreModule';
 import { StorefrontProductModule } from '../storefrontProduct/StorefrontProductModule';
-import { ExchangeRateModule } from '../exchangeRate/ExchangeRateModule';
 import { StorefrontCartController } from './controllers/StorefrontCartController';
 import { StorefrontCartDiscountResolver } from './services/StorefrontCartDiscountResolver';
 import { StorefrontCartService } from './services/StorefrontCartService';
 import { StorefrontDiscountService } from './services/StorefrontDiscountService';
 
 @Module({
-    imports: [StorefrontCoreModule, StorefrontProductModule, ProductsModule, DiscountCodesModule, ExchangeRateModule],
+    imports: [StorefrontCoreModule, StorefrontProductModule, ProductsModule, DiscountCodesModule],
     controllers: [StorefrontCartController],
     providers: [StorefrontCartService, StorefrontDiscountService, StorefrontCartDiscountResolver],
     exports: [StorefrontCartService]

backend/src/modules/storefrontCart/controllers/StorefrontCartController.ts

@@ -1,7 +1,10 @@
 import { Body, Controller, Get, HttpStatus, Post, Req, Res, UseFilters } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { Throttle } from '@nestjs/throttler';
 import type { Request, Response } from 'express';
 import { throttleProfiles } from '../../../config/throttleProfiles';
+import type { Config } from '../../../types/Config';
+import { paymentMethodLabel } from '../../../consts/paymentMethodLabel';
 import { StorefrontExceptionFilter } from '../../storefrontCore/filters/StorefrontExceptionFilter';
 import { StorefrontCartCookieService } from '../../storefrontCore/services/StorefrontCartCookieService';
 import { StorefrontCheckoutSessionCookieService } from '../../storefrontCore/services/StorefrontCheckoutSessionCookieService';
@@ -33,7 +36,8 @@ export class StorefrontCartController {
         private readonly feedbackCookieService: StorefrontFeedbackCookieService,
         private readonly checkoutSessionCookieService: StorefrontCheckoutSessionCookieService,
         private readonly captchaService: StorefrontCaptchaService,
-        private readonly captchaCookieService: StorefrontCaptchaCookieService
+        private readonly captchaCookieService: StorefrontCaptchaCookieService,
+        private readonly configService: ConfigService
     ) {}
 
     @Get('shop/cart')
@@ -62,9 +66,17 @@ export class StorefrontCartController {
 
         this.captchaCookieService.setAnswer(req, res, encryptedAnswer);
 
+        const { enabledPaymentMethods } = this.configService.get('shopSettings') as Config['shopSettings'];
+
+        const paymentMethods = enabledPaymentMethods.map(paymentMethod => ({
+            paymentMethod,
+            paymentMethodLabel: paymentMethodLabel[paymentMethod]
+        }));
+
         return res.render('cart-summary', {
             ...summary,
             ...shopLocals,
+            paymentMethods,
             captchaSvg
         });
     }

backend/src/modules/storefrontCart/types/CookieCartSummary.ts

@@ -4,8 +4,6 @@ import type { CookieCartExtended } from './CookieCartExtended';
 export type CookieCartSummary = {
     cartExtended: CookieCartExtended;
     cartSubtotal: number;
-    cartTotalXmr: string | null;
-    fiatPerXmr: number | null;
     hasManualLines: boolean;
     hasAutoLines: boolean;
     cartTotalIssueMessage: string | null;

backend/src/modules/storefrontCore/views/partials/cart-totals-panel.hbs

@@ -66,18 +66,27 @@
     {{/if}}
 
     <div class='sf-stack sf-mt-4'>
-            {{#unless hasIssues}}
-                <form class='sf-form-col' method='post' action='/shop/checkout/pay'>
-                    <div>{{{captchaSvg}}}</div>
-                    <label class='sf-field'>
-                        <span class='sf-field__label'>Enter the code above</span>
-                        <input class='sf-input' type='text' name='captcha' autocomplete='off' required />
-                    </label>
-                    <button type='submit' class='sf-btn sf-btn--primary'>Pay with XMR</button>
-                </form>
-            {{else}}
-                <button type='button' class='sf-btn sf-btn--primary' disabled title='Resolve cart issues before paying'>Pay with XMR</button>
-            {{/unless}}
+        {{#unless hasIssues}}
+            <form class='sf-form-col' method='post' action='/shop/checkout/pay'>
+                <div>{{{captchaSvg}}}</div>
+                <label class='sf-field'>
+                    <span class='sf-field__label'>Enter the code above</span>
+                    <input class='sf-input' type='text' name='captcha' autocomplete='off' required />
+                </label>
+
+                <div class='sf-stack'>
+                    {{#each paymentMethods}}
+                        <button
+                            type='submit'
+                            name='paymentMethod'
+                            value='{{paymentMethod}}'
+                            class='sf-btn sf-btn--primary'
+                        >
+                            Pay with {{paymentMethodLabel}}
+                        </button>
+                    {{/each}}
+                </div>
+            </form>
         {{else}}
             <button type='button' class='sf-btn sf-btn--primary' disabled title='Resolve cart issues before paying'>Continue to payment</button>
         {{/unless}}