Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
UCC
uccportal
Commits
c46628bd
Commit
c46628bd
authored
Mar 03, 2019
by
frekk
Browse files
Merge remote-tracking branch 'origin/master' into frekk-testing
parents
8bf82864
bf5def24
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/squarepay/views.py
View file @
c46628bd
...
...
@@ -13,7 +13,7 @@ from memberdb.models import Membership, MEMBERSHIP_TYPES
from
.models
import
MembershipPayment
,
CardPayment
from
.
import
payments
from
.payments
import
try_capture_payment
from
.payments
import
try_capture_payment
,
log
from
.dispense
import
get_item_price
class
PaymentFormMixin
:
...
...
@@ -94,9 +94,11 @@ class MembershipPaymentView(MemberAccessMixin, PaymentFormMixin, DetailView):
)
except
Membership
.
DoesNotExist
as
e
:
# no unpaid membership found, return
log
.
warning
(
"could not find unpaid membership with id %s"
%
self
.
kwargs
[
'pk'
])
return
None
except
MembershipPayment
.
DoesNotExist
as
e
:
# found an unpaid membership, but no payment record exists yet
log
.
info
(
"creating membership payment for membership id %s"
%
self
.
kwargs
[
'pk'
])
return
create_membership_payment
(
ms
)
return
payment
...
...
@@ -126,10 +128,10 @@ class MembershipPaymentView(MemberAccessMixin, PaymentFormMixin, DetailView):
def
create_membership_payment
(
membership
,
commit
=
True
):
""" creates a MembershipPayment object for the given membership """
# get the amount from dispense
price
=
get_item_price
(
membership
.
membership_type
)
price
=
get_item_price
(
membership
.
get_dispense_item
()
)
if
(
price
is
None
or
price
==
0
):
return
None
desc
=
MEMBERSHIP_TYPES
[
membership
.
membership_type
][
'desc'
]
desc
=
membership
.
get_pretty_type
()
payment
=
MembershipPayment
(
description
=
desc
,
amount
=
price
,
membership
=
membership
)
if
(
commit
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment