From 6d2599e12908cd3bcea3b2771517663c13c7471a Mon Sep 17 00:00:00 2001 From: ithiame <133223073+ithiame@users.noreply.github.com> Date: Fri, 6 Dec 2024 23:38:52 +0000 Subject: [PATCH] =?UTF-8?q?=20=F0=9F=A6=8B=20Add=20(optional)=20be-BOP=20l?= =?UTF-8?q?ogo=20on=20PoS=20QR=20code=20#1614=20(#1619)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christophe GERARD <50206014+Tirodem@users.noreply.github.com> Co-authored-by: coyotte508 --- assets/bebop-b.svg | 41 +++++++++++++++++++ src/lib/server/runtime-config.ts | 4 ++ .../config/+page.server.ts | 2 + .../config/+page.svelte | 9 ++++ .../payment/[paymentId]/qrcode/+server.ts | 40 +++++++++++++++++- src/routes/(app)/pos/session/+page.server.ts | 4 +- src/routes/(app)/pos/session/+page.svelte | 2 +- 7 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 assets/bebop-b.svg diff --git a/assets/bebop-b.svg b/assets/bebop-b.svg new file mode 100644 index 000000000..e46e13d53 --- /dev/null +++ b/assets/bebop-b.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + diff --git a/src/lib/server/runtime-config.ts b/src/lib/server/runtime-config.ts index 29a0c3baa..8dbbef1e9 100644 --- a/src/lib/server/runtime-config.ts +++ b/src/lib/server/runtime-config.ts @@ -179,6 +179,7 @@ const baseConfig = { 'wss://nos.lol', 'wss://relay.snort.social' ], + removeBebopLogoPOS: false, contactModes: ['email', 'nostr'], posTouchTag: [] as Tag['_id'][], hideCreditCardQrCode: false, @@ -317,6 +318,9 @@ if (!building) { } process.on('SIGINT', () => { changeStream?.close().catch(console.error); + + // Todo: keep track of everything instead and close ASAP + setTimeout(() => process.exit(0), 8000); }); async function refresh(item?: ChangeStreamDocument): Promise { 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 49a60bd94..d6c807d8a 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,6 +36,7 @@ export async function load(event) { disableLanguageSelector: runtimeConfig.disableLanguageSelector, defaultOnLocation: runtimeConfig.defaultOnLocation, cartPreviewInteractive: runtimeConfig.cartPreviewInteractive, + removeBebopLogoPOS: runtimeConfig.removeBebopLogoPOS, overwriteCreditCardSvgColor: runtimeConfig.overwriteCreditCardSvgColor, hideCreditCardQrCode: runtimeConfig.hideCreditCardQrCode }; @@ -93,6 +94,7 @@ export const actions = { disableLanguageSelector: z.boolean({ coerce: true }), contactModes: z.string().array(), cartPreviewInteractive: z.boolean({ coerce: true }), + removeBebopLogoPOS: z.boolean({ coerce: true }), hideCreditCardQrCode: z.boolean({ coerce: true }), overwriteCreditCardSvgColor: z.boolean({ coerce: true }) }) 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 5b286a04c..d6ad33ae7 100644 --- a/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte +++ b/src/routes/(app)/admin[[hash=admin_hash]]/config/+page.svelte @@ -205,6 +205,15 @@ /> Default enable "this is a fully-paid on-location physical order" + {#if hasCartLimitProductLine}