Merge pull request #13 from WorldBrain/feature/pioneer-addon-variable-donation

cdharris · web-flow · commit c60bd9d4cc4f · 2020-06-10T12:21:11.000+02:00
Plan updates for yearly addon pricing
diff --git a/firebase/functions/src/subscriptions/index.ts b/firebase/functions/src/subscriptions/index.ts
@@ -44,7 +44,7 @@ export const getCheckoutLink = functions.https.onCall(
 
         if (data?.pioneerDonationAmount) {
             checkoutOptions.addons = [{
-                "id": "pioneer",
+                "id": `pioneer${data.planId.includes('yearly') ? '-yearly' : ''}`,
                 unit_price: Math.max(data.pioneerDonationAmount * 100,100),
                 quantity: 1,
             }]
diff --git a/firebase/functions/src/subscriptions/subscriptions.ts b/firebase/functions/src/subscriptions/subscriptions.ts
@@ -77,7 +77,7 @@ export const refreshUserSubscriptionStatus = async (userId: string, { getSubscri
                 if (existingSubscription == null || existingSubscription.expiry < expiry) {
 
                     const donationAddOnObject = entry.subscription?.addons?.find(
-                        (addOn: any) => addOn.id === 'pioneer'
+                        (addOn: any) => addOn.id === 'pioneer' || addOn.id === 'pioneer-yearly'
                     )
                     const donation = (donationAddOnObject) ? {
                         donation: donationAddOnObject.unit_price * donationAddOnObject.amount

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ export const refreshUserSubscriptionStatus = async (userId: string, { getSubscri`
`77`	`77`	`if (existingSubscription == null \|\| existingSubscription.expiry < expiry) {`
`78`	`78`
`79`	`79`	`const donationAddOnObject = entry.subscription?.addons?.find(`
`80`		`- (addOn: any) => addOn.id === 'pioneer'`
	`80`	`+ (addOn: any) => addOn.id === 'pioneer' \|\| addOn.id === 'pioneer-yearly'`
`81`	`81`	`)`
`82`	`82`	`const donation = (donationAddOnObject) ? {`
`83`	`83`	`donation: donationAddOnObject.unit_price * donationAddOnObject.amount`