From 01f79cd557a5c28af7a867f0a12d96498f9637a2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 11 Nov 2021 14:12:26 +0100 Subject: [PATCH] fixes --- rowers/braintreestuff.py | 3 ++- rowers/tests/test_payments.py | 4 ++-- rowers/tests/testdata/testdata.tcx.gz | Bin 4002 -> 0 bytes 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 rowers/tests/testdata/testdata.tcx.gz diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py index bb119be0..3825ff21 100644 --- a/rowers/braintreestuff.py +++ b/rowers/braintreestuff.py @@ -284,7 +284,8 @@ def update_subscription(rower,data,method='up'): if result.is_success: yesterday = (timezone.now()-datetime.timedelta(days=1)).date() rower.paidplan = plan - eurocredits = credits.upgrade(int(amount),rower) + amount_int = int(float(amount)) + eurocredits = credits.upgrade(amount_int,rower) rower.planexpires = result.subscription.billing_period_end_date rower.teamplanexpires = result.subscription.billing_period_end_date rower.clubsize = plan.clubsize diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py index 8531525d..26a8d708 100644 --- a/rowers/tests/test_payments.py +++ b/rowers/tests/test_payments.py @@ -406,8 +406,8 @@ description: "" @patch('rowers.views.braintreestuff.gateway', side_effect=MockBraintreeGateway) @patch('rowers.fakturoid.create_invoice',side_effect=mocked_invoiceid) - @patch('rowers.braintreestuff.myqueue') - def test_purchase_trainingplan_view(self, mocked_gateway,mocked_invoiceid,mocked_myqueue): + @patch('rowers.utils.myqueue') + def test_purchase_trainingplan_view(self, mocked_gateway,mocked_invoiceid, mocked_myqueue): u = UserFactory() r = Rower.objects.create(user=u, birthdate=faker.profile()['birthdate'], diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz deleted file mode 100644 index ff0f764533a3cb14f1001f86916c99d35627c902..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4002 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 I&%}TM0Jz#UI{*Lx