krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensured upgraded groups are charge correctly (#8567)

Browse Source 
* Ensured upgraded groups are charge correctly

* Added names to magic numbers

* Limited group fields query
This commit is contained in:
Keith Holliday
2017-03-14 17:09:12 -06:00
committed by Sabe Jones
parent cfa433aa75
commit 3dc20a9832
4 changed files with 125 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/server/libs/amazonPayments.js
View File

@@ -252,6 +252,17 @@ api.subscribe = async function subscribe (options) {
if (!result) throw new NotAuthorized(i18n.t('invalidCoupon'));
}
let amount = sub.price;
let leaderCount = 1;
let priceOfSingleMember = 3;
if (groupId) {
let groupFields = basicGroupFields.concat(' purchased');
let group = await Group.getGroup({user, groupId, populateLeader: false, groupFields});
amount = sub.price + (group.memberCount - leaderCount) * priceOfSingleMember;
}
await this.setBillingAgreementDetails({
AmazonBillingAgreementId: billingAgreementId,
BillingAgreementAttributes: {
@@ -273,7 +284,7 @@ api.subscribe = async function subscribe (options) {
AuthorizationReferenceId: common.uuid().substring(0, 32),
AuthorizationAmount: {
CurrencyCode: this.constants.CURRENCY_CODE,
Amount: sub.price,
Amount: amount,
},
SellerAuthorizationNote: this.constants.SELLER_NOTE_ATHORIZATION_SUBSCRIPTION,
TransactionTimeout: 0,