Phillip Thelen
6887fd70c0
try something
2023-02-28 16:17:52 +01:00
Phillip Thelen
def24142ca
remove wrong test
2023-02-27 13:30:44 +01:00
Phillip Thelen
c29049146d
prevent sub accidentally also being applied to other account
2023-02-27 12:06:27 +01:00
Phillip Thelen
57fb7ca6f2
fix
2023-02-24 11:25:53 +01:00
Phillip Thelen
be18476292
correctly set perkMonthCount
2023-02-23 13:20:47 +01:00
Phillip Thelen
3f56b7fa3f
fix offset calculation
2023-02-17 15:42:31 +01:00
Phillip Thelen
d69de2948b
fix import
2023-02-16 09:58:09 +01:00
Phillip Thelen
2d5dcae406
fix tests
2023-02-16 09:37:00 +01:00
Phillip Thelen
6ee2e3a379
Merge remote-tracking branch 'origin/develop' into apple_sub_fix
2023-02-13 17:38:14 +01:00
Phillip Thelen
ad6555c92b
fix import
2023-02-06 17:16:43 +01:00
Phillip Thelen
c04e8ea514
comma
2023-02-06 13:01:06 +01:00
Phillip Thelen
aec2409227
lint fixes
2023-02-06 12:59:54 +01:00
Phillip Thelen
87aebcc19e
Merge branch 'apple_sub_fix' of https://github.com/HabitRPG/habitica into apple_sub_fix
...
# Conflicts:
# test/api/unit/libs/payments/apple.test.js
# website/server/libs/payments/subscriptions.js
2023-02-06 11:19:00 +01:00
Phillip Thelen
12479edb77
fix tests and some cases
2023-02-06 11:17:35 +01:00
Phillip Thelen
c0c6657536
handle upgrades and creations better
2023-02-06 11:17:35 +01:00
Phillip Thelen
82a1d6ff0e
Improve handling
2023-02-06 11:17:35 +01:00
Phillip Thelen
0f7001b609
fix lint
2023-02-06 11:17:35 +01:00
Phillip Thelen
87558a325e
Handle subscription cancelation better
2023-02-06 11:17:35 +01:00
Phillip Thelen
64a3515c10
Add logic for different types of sub upgrades
2023-02-06 11:17:35 +01:00
Phillip Thelen
8dfa21a4b8
Add field to track when current subscription type started
2023-02-06 11:17:35 +01:00
Phillip Thelen
f9a9d4919b
Improve recheck handling for test subs
2023-02-06 11:17:35 +01:00
Phillip Thelen
ddf1b4060d
Better handling for cancellation when user had multiple subs
2023-02-06 11:17:35 +01:00
Phillip Thelen
967717a010
Fix logic for apple subscriptions
2023-02-06 11:17:35 +01:00
Phillip Thelen
0dd25b6431
fix issue where subs would be applied multiple times
2023-02-06 11:17:35 +01:00
Phillip Thelen
777f7887b4
fix lint errors
2023-02-06 11:17:35 +01:00
Phillip Thelen
f07d0f6441
Implement correct handling for when subs are up/downgraded
2023-02-06 11:17:24 +01:00
SabreCat
742da1f2c6
fix(typo): customER
2023-02-06 11:16:24 +01:00
SabreCat
b3d5a8d083
fix(lint): line length
2023-02-06 11:16:24 +01:00
Phillip Thelen
b5f2e66025
fix check
2023-02-06 11:16:24 +01:00
Phillip Thelen
9a40674d8d
Allow sub upgrades/downgrades on iOS
2023-02-06 11:16:24 +01:00
SabreCat
a213fb723a
fix(purchases): correct hardcoded date range for Gryph
2023-02-03 09:23:21 -06:00
SabreCat
e1deb6adff
fix(payments): add missing SKU variations
2023-01-22 23:21:22 -06:00
SabreCat
f845bbd7a0
fix(payments): address some test failures
2023-01-22 22:30:48 -06:00
SabreCat
0dfc8de300
fix(lint): remove extraneous import
2023-01-20 16:25:24 -06:00
SabreCat
e5bbde7e97
feat(event): 10th Birthday Bash
...
with @CuriousMagpie and @phillipthelen
2023-01-20 16:14:33 -06:00
Phillip Thelen
21652c2670
fix tests and some cases
2022-12-02 17:12:17 +01:00
Phillip Thelen
d1ee679810
handle upgrades and creations better
2022-12-02 11:51:33 +01:00
Phillip Thelen
fae26a517d
Improve handling
2022-11-30 15:06:50 +01:00
SabreCat
f1fa6a8456
Revert "Allow sub upgrades/downgrades on iOS ( #14303 )"
...
This reverts commit 9e98e56e9b .
2022-11-21 16:40:56 -06:00
SabreCat
f2aaee15f3
Merge branch 'release' into develop
2022-11-18 15:29:06 -06:00
SabreCat
15353eba8a
fix(subs): roll all the way back, didn't work :(
2022-11-18 15:12:14 -06:00
SabreCat
febffb3f07
Revert "Fix double subscriptions, second attempt ( #14345 )"
...
This reverts commit 1a5cba57b7 .
2022-11-18 14:26:49 -06:00
SabreCat
fdfa2d6df4
Merge branch 'release' into develop
2022-11-15 19:29:37 -06:00
Sabe Jones
1a5cba57b7
Fix double subscriptions, second attempt ( #14345 )
...
* fix(subscriptions): reject subs that come in too fast
* fix(lint): remove unused import
* fix(groups): individual subs may come rapidly
* fix(subscriptions): bad paren, handle rapid testing
* fix(test): reset dateUpdated between subs
* fix(test): one more block for dateUpdated
Co-authored-by: SabreCat <sabe@habitica.com >
2022-11-15 19:19:37 -06:00
Phillip Thelen
e3c86349b4
fix lint
2022-11-11 13:58:45 +01:00
Phillip Thelen
6604f38144
Handle subscription cancelation better
2022-11-11 13:54:17 +01:00
Phillip Thelen
7d2529f5e1
Add logic for different types of sub upgrades
2022-11-09 19:49:53 +01:00
Phillip Thelen
8d732c59c4
Add field to track when current subscription type started
2022-11-08 12:38:24 +01:00
Phillip Thelen
3a34aa4cc5
Improve recheck handling for test subs
2022-11-08 12:19:17 +01:00
Phillip Thelen
e7fc7feddd
Better handling for cancellation when user had multiple subs
2022-11-04 13:30:50 +01:00