Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: membership details cart #1447

Merged
merged 1 commit into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/_dataSources/api.that.tech/products/queries.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export const QUERY_EVENT_PRODUCTS = `
event(findBy: {id: $eventId}) {
get {
id
startDate
endDate
products {
...productBaseFields
}
Expand All @@ -40,8 +42,8 @@ export default (fetch) => {
return client.query({ query: QUERY_EVENT_PRODUCTS, variables }).then(({ data, errors }) => {
if (errors) log({ errors, tag: 'QUERY_EVENT_PRODUCTS' });

const { event } = data.events;
return event ? event.get.products : [];
const { get } = data.events.event;
return get;
});
}

Expand Down
10 changes: 8 additions & 2 deletions src/routes/membership/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@

{#if $state.matches('ready')}
<Layout>
<Hero eventTicket={$state.context.eventTicket} membership={$state.context.membership} />
<Hero
endDate={$state.context.endDate}
eventTicket={$state.context.eventTicket}
membership={$state.context.membership} />

<Quote />

<Logo height="40" uri="/images/THAT-Logo-Words.svg" />

<PricingCore eventTicket={$state.context.eventTicket} membership={$state.context.membership} />
<PricingCore
eventTicket={$state.context.eventTicket}
endDate={$state.context.endDate}
membership={$state.context.membership} />

<FAQs />
<NotReady />
Expand Down
2 changes: 2 additions & 0 deletions src/routes/membership/_components/pricing/_Hero.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script>
// export let eventTicket;
export let membership;
export let endDate;

import { goto } from '$app/navigation';
import { getContext } from 'svelte';
Expand All @@ -16,6 +17,7 @@
const isBulkPurchase = quantity > 1 ? true : false;
send('ADD_ITEM', {
eventId: config.eventId,
eventDetails: { endDate },
...membership,
isBulkPurchase,
quantity
Expand Down
7 changes: 5 additions & 2 deletions src/routes/membership/_machines/pricing.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ function createServices() {
}),

queryProductsSuccess: assign({
eventTicket: (_, { data }) => data.find((element) => element.productType === 'TICKET'),
membership: (_, { data }) => data.find((element) => element.productType === 'MEMBERSHIP')
endDate: (_, { data }) => data.endDate,
eventTicket: (_, { data }) =>
data.products.find((element) => element.productType === 'TICKET'),
membership: (_, { data }) =>
data.products.find((element) => element.productType === 'MEMBERSHIP')
})
}
};
Expand Down