From 3a478e59acb3c70b287d372db8fe43d2714df5e1 Mon Sep 17 00:00:00 2001 From: Brett Slaski Date: Wed, 4 Oct 2023 14:50:47 -0500 Subject: [PATCH 1/4] chore: remove bing ping, no longer supported by bing --- .github/workflows/release-success.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release-success.yml b/.github/workflows/release-success.yml index c4110082c..81ede7a56 100644 --- a/.github/workflows/release-success.yml +++ b/.github/workflows/release-success.yml @@ -12,9 +12,6 @@ jobs: - name: Ping Google run: | curl https://www.google.com/ping?sitemap=https://that.us/sitemap.xml - - name: Ping Bing - run: | - curl https://www.bing.com/ping?sitemap=https://that.us/sitemap.xml - name: Purge CloudFlare run: | curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_THATUS_ID }}/purge_cache" -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}" -H "Content-Type:application/json" --data '{"purge_everything":true}' From 1c6a95068da60618c228267e59ba89e15e89063b Mon Sep 17 00:00:00 2001 From: Brett Slaski Date: Fri, 6 Oct 2023 08:52:22 -0500 Subject: [PATCH 2/4] refactor: strong to span --- src/routes/orders/success/claim-ticket/+page.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/orders/success/claim-ticket/+page.svelte b/src/routes/orders/success/claim-ticket/+page.svelte index 353501445..97f0fd58a 100644 --- a/src/routes/orders/success/claim-ticket/+page.svelte +++ b/src/routes/orders/success/claim-ticket/+page.svelte @@ -48,9 +48,9 @@ When you get to the event make sure you check in at registration to get your sponsor badge.
  • - On Monday at 1:00 PM there will be a sponsor meeting in the Open Spaces area. - This is an opportunity to meet one another, discuss the event, answer any questions, and get things - kicked off before the early registration meet and greet that evening. + On Monday at 1:00 PM there will be a sponsor meeting in the Open + Spaces area. This is an opportunity to meet one another, discuss the event, answer any questions, + and get things kicked off before the early registration meet and greet that evening.
    • From 521844047f0cb76a7928b16c5744626ceabce837 Mon Sep 17 00:00:00 2001 From: Brett Slaski Date: Fri, 6 Oct 2023 08:54:55 -0500 Subject: [PATCH 3/4] refactor: transfer a ticket page --- src/routes/support/transfer-a-ticket/+page.svelte | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/routes/support/transfer-a-ticket/+page.svelte b/src/routes/support/transfer-a-ticket/+page.svelte index 6112ab52e..b9d155ed1 100644 --- a/src/routes/support/transfer-a-ticket/+page.svelte +++ b/src/routes/support/transfer-a-ticket/+page.svelte @@ -53,8 +53,11 @@

    Transferring is easy, just enter a valid THAT.us account profile email address and click transfer. The page will inform you if the email address is not found. Check with the person - you are transferring the ticket to for the email address they're using in their profile (Note: Their profile email address may be different than their login email address) + you are transferring the ticket to for the email address they're using in their profile. +

    +

    + (Note: Their profile email address may be different than their + login email address)

    @@ -80,7 +83,7 @@

    Family Tickets

    - All family tickets (Campmate, Geekling, etc.) also need to be assigned to someone. If the + All family tickets (Campmate, Geekling, etc.) also should be assigned to someone. If the family member isn't old enough to have a THAT account or doesn't wish to have one, then simply assign the family ticket to the Camper they are coming with.

    From d955c5151f63308972c15a7b6a5dd404f0cd0519 Mon Sep 17 00:00:00 2001 From: Brett Slaski Date: Fri, 6 Oct 2023 09:06:23 -0500 Subject: [PATCH 4/4] refactor: order success page refactor: ticket refund copy between cart and order success --- package.json | 2 +- src/_elements/links/Standard.svelte | 2 + src/routes/orders/_components/_Cart.svelte | 2 +- src/routes/orders/success/+page.svelte | 181 +++++++++++++-------- 4 files changed, 117 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index 20ee291d0..57324a688 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "that-us", - "version": "3.13.6", + "version": "3.13.7", "description": "THAT.us website", "main": "index.js", "type": "module", diff --git a/src/_elements/links/Standard.svelte b/src/_elements/links/Standard.svelte index cadce0550..3666fac80 100644 --- a/src/_elements/links/Standard.svelte +++ b/src/_elements/links/Standard.svelte @@ -1,11 +1,13 @@ + text="Ticket refunds will not be issued on any ticket 30 days before the event or thereafter. Prior to that, a $30.00 (per ticket) processing fee will be applied to each Camper ticket refund and a $10.00 (per ticket) processing fee will be applied to each Geekling and Campmate ticket refund. Memberships are non-refundable.">
    openRefundPolicyModal(false)}>Cancel Agree and Continue diff --git a/src/routes/orders/success/+page.svelte b/src/routes/orders/success/+page.svelte index bc24ec6a9..6ebd9f06b 100644 --- a/src/routes/orders/success/+page.svelte +++ b/src/routes/orders/success/+page.svelte @@ -35,9 +35,11 @@ const eventLocation = $page.url.searchParams.has('EL') ? $page.url.searchParams.get('EL') : undefined; - const targetLocations = $page.url.searchParams.has('TL') - ? $page.url.searchParams.getAll('TL') - : []; + let targetLocations = []; + if ($page.url.searchParams.has('TL')) { + targetLocations = $page.url.searchParams.getAll('TL'); + targetLocations = targetLocations.map((tl) => tl.toUpperCase()); + } @@ -69,83 +71,122 @@ >If you do not see those, please check your junk/spam folders, as sometimes we manage to land there accidentally. At any time you can view your - order history and reprint your receipt. + order history and reprint + your receipt.

    - View Your Order History + View Your Order History
    -

    Next steps

    -

    Based on your purchase we have a few follow up things for you.

    + {#if eventLocation && targetLocations.length > 0} +

    Next steps

    +

    Based on your purchase we have some follow-ups for you.

    +

    You're going to THAT Conference!

    + + {#if targetLocations.includes('AT')} +

    + Time to get your travel and hotel rooms sorted. Head over to our travel page for hotel + room blocks, addresses, and other details. +

    + +
    + {#if eventLocation.toUpperCase() === 'WI'} + Book Your Travel To Wisconsin + {/if} + {#if eventLocation.toUpperCase() === 'TX'} + Book Your Travel To Texas + {/if} +
    + +

    Dietary Requirements and T-Shirts

    +

    + Do you have dietary requirements? THAT Conference works with the Kalahari catering team + to provide meals that encompass a variety of dietary choices. At every meal, we strive + to provide gluten-free, vegetarian and vegan options. Menus are posted daily and labels + are displayed next to each food item to help you make the best decision based on your + needs. If you have a severe dietary requirement, please email us at hello@that.us so we can work together in finding the right solution to + fit your needs. +

    +

    + All Camper, Campmate and Geekling tickets include an official THAT t-shirt. During + on-site registration, you can choose your desired shirt size. We order a wide range of + sizes for each event. If for some reason, we run out of the size you’d like, we’ll send + you one after the event! +

    + {/if} - {#if eventLocation} - {#if targetLocations.length > 0} -

    You have event tickets!!!

    + {#if targetLocations.includes('ON')} +

    + No further action is required for your ON THAT tickets. + Ok, small lie there. You now have access to that event and are free to start adding to the + schedule. That's correct; you can add sessions as well, and make sure to select the right + event. +

    +
    + Create an Activity +
    + {/if} + {#if isBulkPurchase} +

    Action Required – You have unallocated tickets

    +

    + You've purchased multiple tickets, and those tickets need to be allocated (assigned) to + someone. The process is easy. All you need to transfer a ticket is the + profile email address of the person you are transferring + the ticket to. We've put together the steps + in this handy guide + for your reference. +

    +

    + Remember to allocate a ticket to yourself if you're attending! +

    {#if targetLocations.includes('AT')} -

    - First things first, let's get your travel and rooms sorted. Just head over to our - travel page for room blocks, addresses, and other details. -

    - -
    - {#if eventLocation.toUpperCase() === 'WI'} - Book Your Travel To Wisconsin - {/if} - {#if eventLocation.toUpperCase() === 'TX'} - Book Your Travel To Texas - {/if} -
    - -

    - Soon we will also send you an email asking for your dietary restrictions, shirt sizes, - and a few other items. -

    +

    If any of the tickets are for a spouse or child, they don't need to be allocated.

    {/if} - {#if targetLocations.includes('ON')} -

    - No further action is required for your ON THAT tickets. - Ok, small lie there. You now have access to that event and are free to start adding to - the schedule. That's correct; you can add sessions as well, and make sure to select the - right event. -

    - -
    - Create an Activity -
    - {/if} +
    + Allocate Tickets Now +
    {/if} - {/if} - {#if isBulkPurchase} -

    Action Required - You have unallocated tickets.

    +

    Ticket Refunds

    - You've purchased multiple tickets, and some or all of those tickets now need to be - allocated to someone. To gain access, that someone has to have a valid account on THAT.us. - You need that user's email address to assign the ticket. Once assigned, THAT.us will - contact them and take care of the rest. + Ticket refunds will not be issued on any ticket 30 days before + the event or thereafter. Prior to that, a $30.00 (per ticket) processing fee will be applied + to each Camper ticket refund and a $10.00 (per ticket) processing fee will be applied to each + Geekling and Campmate ticket refund.

    - {#if targetLocations.includes('AT')} -

    - If one of those tickets is for a spouse or child, they do not need to be allocated, but - you will need to answer the follow-up questions on their behalf. -

    - {/if} +

    Meet THAT Camper

    +

    + Say hello to Meet THAT Camper – your weekly chance to connect with a fellow geek before + THAT Conference. Every Monday at 9 AM central, we'll introduce you to another attendee + headed to the event. Getting started is easy, go to your + notification preferences and enable the Meet THAT Camper notification. It's that simple, + and you can shut it off at any time. There are more details about Meet THAT Camper on the notification + preferences page. +

    - Allocate Tickets + Meet THAT Camper
    - {/if} - - {#if isMembership} -

    Thank you purchasing an annual membership.

    + {:else if isMembership} +

    Thank you for purchasing an annual membership

    We're grateful to have you as an annual member. Your membership helps us run the daily operations while also having direct input into how things evolve. You will soon see - another email with a signup link to our private discord server. + another email with a signup link to our member's private discord server.

    Once again, Thank You!

    {/if} @@ -157,24 +198,28 @@

    -

    Lastly, we’re here to help.

    +

    Lastly, we're here to help

    We're here to support you and the community. Anything we can do to improve, or if you wish there was a particular feature, please tell us. Our entire platform is open source, and @@ -194,7 +239,7 @@

    -