Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

_ python 3 fix #761

Merged
merged 1 commit into from
Jan 2, 2020
Merged

_ python 3 fix #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ledger/order/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def place_order(self, basket, total, # noqa (too complex (12))
basket and session data.
"""
if basket.is_empty:
raise ValueError(_("Empty baskets cannot be submitted"))
raise ValueError("Empty baskets cannot be submitted")
if not order_number:
generator = OrderNumberGenerator()
order_number = generator.order_number(basket)
Expand All @@ -31,8 +31,7 @@ def place_order(self, basket, total, # noqa (too complex (12))
except Order.DoesNotExist:
pass
else:
raise ValueError(_("There is already an order with number %s")
% order_number)
raise ValueError("There is already an order with number "+str(order_number))

# Ok - everything seems to be in order, let's place the order
order = self.create_order_model(
Expand Down
5 changes: 2 additions & 3 deletions ledger/payments/invoice/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def create_invoice_and_order(self,basket, total,
shipping_method = ShippingMethod()
total = self.get_order_totals(basket, shipping_charge, **kwargs)
if basket.is_empty:
raise ValueError(_("Empty baskets cannot be submitted"))
raise ValueError("Empty baskets cannot be submitted")
if not order_number:
generator = utils.OrderNumberGenerator()
order_number = generator.order_number(basket)
Expand All @@ -59,8 +59,7 @@ def create_invoice_and_order(self,basket, total,
else:
print ('ledger failed')
print (order_number)
raise ValueError(_("There is already an order with number %s")
% order_number)
raise ValueError("There is already an order with number "+str(order_number))

# Ok - everything seems to be in order, let's place the order
order = self.create_order_model(
Expand Down