From 9e9d669c5c3a3153fe42e7791374970a2e7fbdaa Mon Sep 17 00:00:00 2001
From: ithiame <ithiame@agiltoo.fr>
Date: Wed, 4 Dec 2024 11:20:41 +0000
Subject: [PATCH 1/5] CB qr-code payment has lightning: in its href #1620

---
 src/routes/(app)/order/[id]/+page.svelte | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/routes/(app)/order/[id]/+page.svelte b/src/routes/(app)/order/[id]/+page.svelte
index b65ae0b12..ce72fb343 100644
--- a/src/routes/(app)/order/[id]/+page.svelte
+++ b/src/routes/(app)/order/[id]/+page.svelte
@@ -279,7 +279,7 @@
 						{/if}
 
 						{#if payment.status === 'pending'}
-							{#if payment.method === 'lightning' || payment.method === 'card'}
+							{#if payment.method === 'lightning'}
 								<a
 									href={lightningPaymentQrCodeString(
 										payment.address ?? '',
@@ -294,6 +294,13 @@
 									/></a
 								>
 							{/if}
+							{#if payment.method === 'card'}
+								<img
+									src="{$page.url.pathname}/payment/{payment.id}/qrcode"
+									class="w-96 h-96"
+									alt="QR code"
+								/>
+							{/if}
 							{#if payment.method === 'bitcoin' && payment.address}
 								<span class="body-hyperlink font-light italic">{t('order.clickQR')}</span>
 								<a

From 9ce1b33e0e8ebd6f7e120d1d03f3cea615c92d79 Mon Sep 17 00:00:00 2001
From: ithiame <ithiame@agiltoo.fr>
Date: Wed, 4 Dec 2024 15:13:01 +0000
Subject: [PATCH 2/5] =?UTF-8?q?=20=F0=9F=A6=8B=20Allow=20admin=20to=20set?=
 =?UTF-8?q?=20a=20QR-code-less=20order=20on=20their=20be-BOP=20#1621?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.css                                    |  4 ++++
 src/lib/server/runtime-config.ts               |  2 ++
 src/lib/server/theme.ts                        |  5 +++++
 src/lib/types/Theme.ts                         |  9 +++++++++
 .../config/+page.server.ts                     |  8 ++++++--
 .../config/+page.svelte                        | 18 ++++++++++++++++++
 src/routes/(app)/order/[id]/+page.server.ts    |  5 ++++-
 src/routes/(app)/order/[id]/+page.svelte       |  4 +++-
 8 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/app.css b/src/app.css
index e43f3ee3f..fd7b8ccc0 100644
--- a/src/app.css
+++ b/src/app.css
@@ -46,6 +46,7 @@
 	--tagWidget-cta-color: #ffffff;
 	--tagWidget-color: #000000;
 	--tagWidget-hyperlink-color: #2271b1;
+	--order-creditCard-svg-color: #2271b1;
 }
 
 @layer base {
@@ -298,6 +299,9 @@
 		--tw-prose-bold: inherit;
 		--tw-prose-links: var(--body-hyperlink-color);
 	}
+	.credit-card-svg-fill {
+		color: var(--order-creditCard-svg-color);
+	}
 }
 
 @layer utilities {
diff --git a/src/lib/server/runtime-config.ts b/src/lib/server/runtime-config.ts
index d6eed6249..4e5670b60 100644
--- a/src/lib/server/runtime-config.ts
+++ b/src/lib/server/runtime-config.ts
@@ -181,6 +181,8 @@ const baseConfig = {
 	],
 	contactModes: ['email', 'nostr'],
 	posTouchTag: [] as Tag['_id'][],
+	hideCbQrCode: false,
+	overwriteCbSvgColor: false,
 	hideCmsZonesOnMobile: false,
 	copyOrderEmailsToAdmin: true,
 	usersDarkDefaultTheme: false,
diff --git a/src/lib/server/theme.ts b/src/lib/server/theme.ts
index e30b8d356..f89461c0b 100644
--- a/src/lib/server/theme.ts
+++ b/src/lib/server/theme.ts
@@ -102,6 +102,11 @@ export const themeValidator = z.object({
 			cancel: z.object({ backgroundColor }),
 			delete: z.object({ backgroundColor })
 		})
+	}),
+	order: z.object({
+		creditCard: z.object({
+			svg: z.object({ color })
+		})
 	})
 });
 
diff --git a/src/lib/types/Theme.ts b/src/lib/types/Theme.ts
index bbca9f22e..3d30cd962 100644
--- a/src/lib/types/Theme.ts
+++ b/src/lib/types/Theme.ts
@@ -242,6 +242,15 @@ export const themeFormStructure = {
 				name: 'action.delete.backgroundColor'
 			}
 		]
+	},
+	order: {
+		label: 'Order',
+		elements: [
+			{
+				label: 'Credit card svg fill color',
+				name: 'creditCard.svg.color'
+			}
+		]
 	}
 } satisfies {
 	[key in keyof Omit<ThemeData, 'name'>]: {
diff --git a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts
index fea00ed52..871aaa46b 100644
--- a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts
+++ b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts
@@ -35,7 +35,9 @@ export async function load(event) {
 		copyOrderEmailsToAdmin: runtimeConfig.copyOrderEmailsToAdmin,
 		disableLanguageSelector: runtimeConfig.disableLanguageSelector,
 		defaultOnLocation: runtimeConfig.defaultOnLocation,
-		cartPreviewInteractive: runtimeConfig.cartPreviewInteractive
+		cartPreviewInteractive: runtimeConfig.cartPreviewInteractive,
+		overwriteCbSvgColor: runtimeConfig.overwriteCbSvgColor,
+		hideCbQrCode: runtimeConfig.hideCbQrCode
 	};
 }
 
@@ -90,7 +92,9 @@ export const actions = {
 				cartMaxSeparateItems: z.number({ coerce: true }).int().default(0),
 				disableLanguageSelector: z.boolean({ coerce: true }),
 				contactModes: z.string().array(),
-				cartPreviewInteractive: z.boolean({ coerce: true })
+				cartPreviewInteractive: z.boolean({ coerce: true }),
+				hideCbQrCode: z.boolean({ coerce: true }),
+				overwriteCbSvgColor: z.boolean({ coerce: true })
 			})
 			.parse({
 				...Object.fromEntries(formData),
diff --git a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte
index a9187aec1..b52cecca9 100644
--- a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte
+++ b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte
@@ -218,6 +218,24 @@
 			/>
 		</label>
 	{/if}
+	<h2 class="text-2xl">Order</h2>
+	<label class="checkbox-label">
+		<input type="checkbox" name="hideCbQrCode" class="form-checkbox" checked={data.hideCbQrCode} />
+		Don't display order URL qr code on order paid with credit card
+	</label>
+	<label class="checkbox-label">
+		<input
+			type="checkbox"
+			name="overwriteCbSvgColor"
+			class="form-checkbox"
+			checked={data.overwriteCbSvgColor}
+		/>
+		Overwrite credit card payment processor SVG color with custom color
+	</label>
+	<p>
+		Target color can be changed in <a href="/admin/theme" class="underline">theme</a>("Order" then
+		"Credit card svg fill color" in theme)
+	</p>
 	<h2 class="text-2xl">VAT</h2>
 
 	<label class="checkbox-label">
diff --git a/src/routes/(app)/order/[id]/+page.server.ts b/src/routes/(app)/order/[id]/+page.server.ts
index d29fcb648..2b169ae4d 100644
--- a/src/routes/(app)/order/[id]/+page.server.ts
+++ b/src/routes/(app)/order/[id]/+page.server.ts
@@ -6,6 +6,7 @@ import { getPublicS3DownloadLink } from '$lib/server/s3.js';
 import { uniqBy } from '$lib/utils/uniqBy.js';
 import { paymentMethods } from '$lib/server/payment-methods.js';
 import { cmsFromContent } from '$lib/server/cms.js';
+import { runtimeConfig } from '$lib/server/runtime-config.js';
 
 export async function load({ params, depends, locals }) {
 	depends(UrlDependency.Order);
@@ -75,7 +76,9 @@ export async function load({ params, depends, locals }) {
 		...(cmsOrderBottom && {
 			cmsOrderBottom,
 			cmsOrderBottomData: cmsFromContent({ content: cmsOrderBottom.content }, locals)
-		})
+		}),
+		overwriteCbSvgColor: runtimeConfig.overwriteCbSvgColor,
+		hideCbQrCode: runtimeConfig.hideCbQrCode
 	};
 }
 
diff --git a/src/routes/(app)/order/[id]/+page.svelte b/src/routes/(app)/order/[id]/+page.svelte
index b65ae0b12..bcf48bd10 100644
--- a/src/routes/(app)/order/[id]/+page.svelte
+++ b/src/routes/(app)/order/[id]/+page.svelte
@@ -151,7 +151,9 @@
 											>
 												<span>{t('order.paymentLink')}</span>
 												{#if payment.processor === 'sumup'}
-													<IconSumupWide class="h-12" />
+													<IconSumupWide
+														class="h-12 {data.overwriteCbSvgColor ? 'credit-card-svg-fill' : ''} "
+													/>
 												{:else if payment.processor === 'stripe'}
 													<IconStripe class="h-12" />
 												{:else if payment.processor === 'paypal'}

From 6878fdb02e0a2b62ad5ffc632bc64b0aa1e5fb51 Mon Sep 17 00:00:00 2001
From: ithiame <ithiame@agiltoo.fr>
Date: Wed, 4 Dec 2024 15:19:51 +0000
Subject: [PATCH 3/5] =?UTF-8?q?=20=F0=9F=A6=8B=20Allow=20admin=20to=20set?=
 =?UTF-8?q?=20a=20QR-code-less=20order=20on=20their=20be-BOP=20#1621?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.css                              | 2 +-
 src/routes/(app)/order/[id]/+page.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app.css b/src/app.css
index fd7b8ccc0..039f0aa00 100644
--- a/src/app.css
+++ b/src/app.css
@@ -299,7 +299,7 @@
 		--tw-prose-bold: inherit;
 		--tw-prose-links: var(--body-hyperlink-color);
 	}
-	.credit-card-svg-fill {
+	.order-creditCard-svg {
 		color: var(--order-creditCard-svg-color);
 	}
 }
diff --git a/src/routes/(app)/order/[id]/+page.svelte b/src/routes/(app)/order/[id]/+page.svelte
index bcf48bd10..efdab68fd 100644
--- a/src/routes/(app)/order/[id]/+page.svelte
+++ b/src/routes/(app)/order/[id]/+page.svelte
@@ -152,7 +152,7 @@
 												<span>{t('order.paymentLink')}</span>
 												{#if payment.processor === 'sumup'}
 													<IconSumupWide
-														class="h-12 {data.overwriteCbSvgColor ? 'credit-card-svg-fill' : ''} "
+														class="h-12 {data.overwriteCbSvgColor ? 'order-creditCard-svg' : ''} "
 													/>
 												{:else if payment.processor === 'stripe'}
 													<IconStripe class="h-12" />

From c87742f188217d82ae8d0efc9ec1dbf493bdfdf0 Mon Sep 17 00:00:00 2001
From: ithiame <ithiame@agiltoo.fr>
Date: Wed, 4 Dec 2024 15:21:54 +0000
Subject: [PATCH 4/5] =?UTF-8?q?=20=F0=9F=A6=8B=20Allow=20admin=20to=20set?=
 =?UTF-8?q?=20a=20QR-code-less=20order=20on=20their=20be-BOP=20#1621?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/(app)/order/[id]/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(app)/order/[id]/+page.svelte b/src/routes/(app)/order/[id]/+page.svelte
index e11d0b598..6a5daaaef 100644
--- a/src/routes/(app)/order/[id]/+page.svelte
+++ b/src/routes/(app)/order/[id]/+page.svelte
@@ -299,7 +299,7 @@
 							{#if payment.method === 'card'}
 								<img
 									src="{$page.url.pathname}/payment/{payment.id}/qrcode"
-									class="w-96 h-96"
+									class="w-96 h-96 {data.hideCbQrCode ? 'hidden' : ''}"
 									alt="QR code"
 								/>
 							{/if}

From 5b0542bbf747e8bfec2d8a7d4f82cb4e889c02f9 Mon Sep 17 00:00:00 2001
From: ithiame <ithiame@agiltoo.fr>
Date: Thu, 5 Dec 2024 09:52:16 +0000
Subject: [PATCH 5/5] add requested changes

---
 src/lib/server/runtime-config.ts                      |  4 ++--
 .../admin[[hash=admin_hash]]/config/+page.server.ts   |  8 ++++----
 .../admin[[hash=admin_hash]]/config/+page.svelte      | 11 ++++++++---
 src/routes/(app)/order/[id]/+page.server.ts           |  4 ++--
 src/routes/(app)/order/[id]/+page.svelte              |  8 +++++---
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/lib/server/runtime-config.ts b/src/lib/server/runtime-config.ts
index 4e5670b60..29a0c3baa 100644
--- a/src/lib/server/runtime-config.ts
+++ b/src/lib/server/runtime-config.ts
@@ -181,8 +181,8 @@ const baseConfig = {
 	],
 	contactModes: ['email', 'nostr'],
 	posTouchTag: [] as Tag['_id'][],
-	hideCbQrCode: false,
-	overwriteCbSvgColor: false,
+	hideCreditCardQrCode: false,
+	overwriteCreditCardSvgColor: false,
 	hideCmsZonesOnMobile: false,
 	copyOrderEmailsToAdmin: true,
 	usersDarkDefaultTheme: false,
diff --git a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts
index 871aaa46b..49a60bd94 100644
--- a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts
+++ b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.server.ts
@@ -36,8 +36,8 @@ export async function load(event) {
 		disableLanguageSelector: runtimeConfig.disableLanguageSelector,
 		defaultOnLocation: runtimeConfig.defaultOnLocation,
 		cartPreviewInteractive: runtimeConfig.cartPreviewInteractive,
-		overwriteCbSvgColor: runtimeConfig.overwriteCbSvgColor,
-		hideCbQrCode: runtimeConfig.hideCbQrCode
+		overwriteCreditCardSvgColor: runtimeConfig.overwriteCreditCardSvgColor,
+		hideCreditCardQrCode: runtimeConfig.hideCreditCardQrCode
 	};
 }
 
@@ -93,8 +93,8 @@ export const actions = {
 				disableLanguageSelector: z.boolean({ coerce: true }),
 				contactModes: z.string().array(),
 				cartPreviewInteractive: z.boolean({ coerce: true }),
-				hideCbQrCode: z.boolean({ coerce: true }),
-				overwriteCbSvgColor: z.boolean({ coerce: true })
+				hideCreditCardQrCode: z.boolean({ coerce: true }),
+				overwriteCreditCardSvgColor: z.boolean({ coerce: true })
 			})
 			.parse({
 				...Object.fromEntries(formData),
diff --git a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte
index b52cecca9..5b286a04c 100644
--- a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte
+++ b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte
@@ -220,15 +220,20 @@
 	{/if}
 	<h2 class="text-2xl">Order</h2>
 	<label class="checkbox-label">
-		<input type="checkbox" name="hideCbQrCode" class="form-checkbox" checked={data.hideCbQrCode} />
+		<input
+			type="checkbox"
+			name="hideCreditCardQrCode"
+			class="form-checkbox"
+			checked={data.hideCreditCardQrCode}
+		/>
 		Don't display order URL qr code on order paid with credit card
 	</label>
 	<label class="checkbox-label">
 		<input
 			type="checkbox"
-			name="overwriteCbSvgColor"
+			name="overwriteCreditCardSvgColor"
 			class="form-checkbox"
-			checked={data.overwriteCbSvgColor}
+			checked={data.overwriteCreditCardSvgColor}
 		/>
 		Overwrite credit card payment processor SVG color with custom color
 	</label>
diff --git a/src/routes/(app)/order/[id]/+page.server.ts b/src/routes/(app)/order/[id]/+page.server.ts
index 2b169ae4d..66185fa29 100644
--- a/src/routes/(app)/order/[id]/+page.server.ts
+++ b/src/routes/(app)/order/[id]/+page.server.ts
@@ -77,8 +77,8 @@ export async function load({ params, depends, locals }) {
 			cmsOrderBottom,
 			cmsOrderBottomData: cmsFromContent({ content: cmsOrderBottom.content }, locals)
 		}),
-		overwriteCbSvgColor: runtimeConfig.overwriteCbSvgColor,
-		hideCbQrCode: runtimeConfig.hideCbQrCode
+		overwriteCreditCardSvgColor: runtimeConfig.overwriteCreditCardSvgColor,
+		hideCreditCardQrCode: runtimeConfig.hideCreditCardQrCode
 	};
 }
 
diff --git a/src/routes/(app)/order/[id]/+page.svelte b/src/routes/(app)/order/[id]/+page.svelte
index 6a5daaaef..1ee56b204 100644
--- a/src/routes/(app)/order/[id]/+page.svelte
+++ b/src/routes/(app)/order/[id]/+page.svelte
@@ -152,7 +152,9 @@
 												<span>{t('order.paymentLink')}</span>
 												{#if payment.processor === 'sumup'}
 													<IconSumupWide
-														class="h-12 {data.overwriteCbSvgColor ? 'order-creditCard-svg' : ''} "
+														class="h-12 {data.overwriteCreditCardSvgColor
+															? 'order-creditCard-svg'
+															: ''} "
 													/>
 												{:else if payment.processor === 'stripe'}
 													<IconStripe class="h-12" />
@@ -296,10 +298,10 @@
 									/></a
 								>
 							{/if}
-							{#if payment.method === 'card'}
+							{#if payment.method === 'card' && !data.hideCreditCardQrCode}
 								<img
 									src="{$page.url.pathname}/payment/{payment.id}/qrcode"
-									class="w-96 h-96 {data.hideCbQrCode ? 'hidden' : ''}"
+									class="w-96 h-96"
 									alt="QR code"
 								/>
 							{/if}