refactor: updates to Amazon tests & subscriptionPlan.js

HabitRPG · Dec 17, 2024 · 4b49938 · 4b49938
1 parent 2e4457d
commit 4b49938
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/test/api/unit/libs/payments/amazon/cancel.test.js b/test/api/unit/libs/payments/amazon/cancel.test.js
@@ -177,4 +177,4 @@ describe('Amazon Payments - Cancel Subscription', () => {
     expectAmazonCancelGroupSubscriptionSpy(group._id);
     amzLib.closeBillingAgreement.restore();
   });
-});
+});
diff --git a/test/api/unit/libs/payments/amazon/upgrade-groupplan.test.js b/test/api/unit/libs/payments/amazon/upgrade-groupplan.test.js
@@ -83,4 +83,4 @@ describe('#upgradeGroupPlan', () => {
       },
     });
   });
-});
+});
diff --git a/website/client/src/mixins/payments.js b/website/client/src/mixins/payments.js
@@ -279,7 +279,7 @@ export default {
       let paymentMethod = group
         ? group.purchased.plan.paymentMethod
         : this.user.purchased.plan.paymentMethod;
-      paymentMethod = paymentMethod.toLowerCase();
+      paymentMethod = paymentMethod === 'Amazon Payments' ? 'amazon' : paymentMethod.toLowerCase();
 
       const queryParams = {
         noRedirect: true,

diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
@@ -192,7 +192,7 @@ async function prepareSubscriptionValues (data) {
       dateTerminated: null,
       // Specify a lastBillingDate just for Amazon Payments
       // Resetted every time the subscription restarts
-      lastBillingDate: data.paymentMethod === 'Amazon Payments' ? today : undefined,
+      // lastBillingDate: data.paymentMethod === 'Amazon Payments' ? today : undefined,
       nextPaymentProcessing: data.nextPaymentProcessing,
       nextBillingDate: data.nextBillingDate,
       additionalData: data.additionalData,

diff --git a/website/server/models/subscriptionPlan.js b/website/server/models/subscriptionPlan.js
@@ -8,7 +8,7 @@ export const schema = new mongoose.Schema({
   subscriptionId: String,
   owner: { $type: String, ref: 'User', validate: [v => validator.isUUID(v), 'Invalid uuid for subscription owner.'] },
   quantity: { $type: Number, default: 1 },
-  paymentMethod: String, // enum: ['Paypal', 'Stripe', 'Gift', 'Amazon Payments', Google', '']}
+  paymentMethod: String, // enum: ['Paypal', 'Stripe', 'Gift', 'Amazon Payments', 'Google', '']}
   customerId: String, // Billing Agreement Id in case of Amazon Payments
   dateCreated: Date,
   dateTerminated: Date,
-Original file line number
+Diff line change
@@ Expand Up / @@ -177,4 +177,4 @@ describe('Amazon Payments - Cancel Subscription', () => { @@
         expectAmazonCancelGroupSubscriptionSpy(group._id);
         amzLib.closeBillingAgreement.restore();
       });
-    });
+    });