Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
6f565edb
Commit
6f565edb
authored
Mar 16, 2016
by
Vedran Karačić
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #620 from edx/vkaracic/SOL-1708
[SOL-1708] Restrict the basket to one voucher
parents
8cec634e
c7e99874
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
ecommerce/extensions/basket/tests/test_utils.py
+15
-1
ecommerce/extensions/basket/utils.py
+5
-1
No files found.
ecommerce/extensions/basket/tests/test_utils.py
View file @
6f565edb
...
@@ -2,7 +2,7 @@ import ddt
...
@@ -2,7 +2,7 @@ import ddt
from
django.test
import
RequestFactory
from
django.test
import
RequestFactory
from
oscar.core.loading
import
get_model
from
oscar.core.loading
import
get_model
from
oscar.test.factories
import
ProductFactory
,
RangeFactory
from
oscar.test.factories
import
ProductFactory
,
RangeFactory
,
VoucherFactory
from
ecommerce.extensions.basket.utils
import
get_certificate_type_display_value
,
prepare_basket
from
ecommerce.extensions.basket.utils
import
get_certificate_type_display_value
,
prepare_basket
from
ecommerce.extensions.partner.models
import
StockRecord
from
ecommerce.extensions.partner.models
import
StockRecord
...
@@ -45,6 +45,20 @@ class BasketUtilsTests(TestCase):
...
@@ -45,6 +45,20 @@ class BasketUtilsTests(TestCase):
self
.
assertEqual
(
basket
.
total_discount
,
10.00
)
self
.
assertEqual
(
basket
.
total_discount
,
10.00
)
self
.
assertEqual
(
basket
.
total_excl_tax
,
90.00
)
self
.
assertEqual
(
basket
.
total_excl_tax
,
90.00
)
def
test_multiple_vouchers
(
self
):
""" Verify only the last entered voucher is contained in the basket. """
product
=
ProductFactory
()
voucher1
=
VoucherFactory
(
code
=
'FIRST'
)
basket
=
prepare_basket
(
self
.
request
,
product
,
voucher1
)
self
.
assertEqual
(
basket
.
vouchers
.
count
(),
1
)
self
.
assertEqual
(
basket
.
vouchers
.
first
(),
voucher1
)
voucher2
=
VoucherFactory
(
code
=
'SECOND'
)
new_basket
=
prepare_basket
(
self
.
request
,
product
,
voucher2
)
self
.
assertEqual
(
basket
,
new_basket
)
self
.
assertEqual
(
new_basket
.
vouchers
.
count
(),
1
)
self
.
assertEqual
(
new_basket
.
vouchers
.
first
(),
voucher2
)
def
test_prepare_basket_without_voucher
(
self
):
def
test_prepare_basket_without_voucher
(
self
):
""" Verify a basket is returned and does not contain a voucher. """
""" Verify a basket is returned and does not contain a voucher. """
product
=
ProductFactory
()
product
=
ProductFactory
()
...
...
ecommerce/extensions/basket/utils.py
View file @
6f565edb
...
@@ -13,7 +13,9 @@ def prepare_basket(request, product, voucher=None):
...
@@ -13,7 +13,9 @@ def prepare_basket(request, product, voucher=None):
Create or get the basket, add the product, and apply a voucher.
Create or get the basket, add the product, and apply a voucher.
Existing baskets are merged. The specified product will
Existing baskets are merged. The specified product will
be added to the remaining open basket. The Voucher is applied to the basket.
be added to the remaining open basket. If a voucher is passed, all existing
ones added to the basket are removed because we allow only one voucher per
basket after the Voucher is applied to the basket.
Arguments:
Arguments:
request (Request): The request object made to the view.
request (Request): The request object made to the view.
...
@@ -27,6 +29,8 @@ def prepare_basket(request, product, voucher=None):
...
@@ -27,6 +29,8 @@ def prepare_basket(request, product, voucher=None):
basket
.
flush
()
basket
.
flush
()
basket
.
add_product
(
product
,
1
)
basket
.
add_product
(
product
,
1
)
if
voucher
:
if
voucher
:
for
v
in
basket
.
vouchers
.
all
():
basket
.
vouchers
.
remove
(
v
)
basket
.
vouchers
.
add
(
voucher
)
basket
.
vouchers
.
add
(
voucher
)
Applicator
()
.
apply
(
basket
,
request
.
user
,
request
)
Applicator
()
.
apply
(
basket
,
request
.
user
,
request
)
logger
.
info
(
'Applied Voucher [
%
s] to basket [
%
s].'
,
voucher
.
code
,
basket
.
id
)
logger
.
info
(
'Applied Voucher [
%
s] to basket [
%
s].'
,
voucher
.
code
,
basket
.
id
)
...
...
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