Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Pole-Web
Website
Commits
a07e10ec
Commit
a07e10ec
authored
Feb 21, 2021
by
HEVELINE Thomas
Committed by
HEVELINE Thomas
Sep 02, 2021
Browse files
(44): fix indentation
parent
cd2cb866
Changes
2
Hide whitespace changes
Inline
Side-by-side
boutique/models.py
View file @
a07e10ec
...
...
@@ -72,9 +72,9 @@ class Item(models.Model):
@
property
def
customizable
(
self
)
->
bool
:
return
(
(
self
.
customization
is
True
)
or
(
self
.
option
!=
""
)
or
(
self
.
second_option
!=
""
)
(
self
.
customization
is
True
)
or
(
self
.
option
!=
""
)
or
(
self
.
second_option
!=
""
)
)
@
property
...
...
@@ -267,41 +267,46 @@ class Order(models.Model):
try
:
return
self
.
payment
.
mean
except
Payment
.
DoesNotExist
:
return
None
return
'
None
'
@
property
def
contains_cotiz
(
self
)
->
bool
:
return
any
(
i
.
item
.
is_cotiz
for
i
in
self
.
items
.
all
())
def
compute_price
(
self
)
->
None
:
self
.
price
=
Decimal
(
"0.00"
)
for
item
in
self
.
items
.
all
():
if
not
item
.
is_pack_item
:
self
.
price
+=
item
.
get_final_price
()
@
property
def
contains_cotiz
(
self
)
->
bool
:
return
any
(
i
.
item
.
is_cotiz
for
i
in
self
.
items
.
all
())
def
post_payment
(
self
)
->
None
:
for
orderitem
in
self
.
items
.
all
():
orderitem
.
post_payment
()
def
save
(
self
,
*
args
,
**
kwargs
)
->
None
:
if
self
.
ordered
and
self
.
ordered_date
is
None
:
self
.
ordered_date
=
timezone
.
now
()
def
compute_price
(
self
)
->
None
:
self
.
price
=
Decimal
(
"0.00"
)
for
item
in
self
.
items
.
all
():
if
not
item
.
is_pack_item
:
self
.
price
+=
item
.
get_final_price
()
elif
self
.
rejected
and
self
.
rejected_date
is
None
:
self
.
rejected_date
=
timezone
.
now
()
super
().
save
(
*
args
,
**
kwargs
)
def
post_payment
(
self
)
->
None
:
for
orderitem
in
self
.
items
.
all
():
orderitem
.
post_payment
()
def
clean_illegal_items
(
self
)
->
int
:
# No suppression if already ordered
if
self
.
ordered
:
return
0
deleted_count
=
0
for
orderitem
in
self
.
items
.
filter
(
pack_parent
=
None
):
if
orderitem
.
item
.
contains_illegal_items
:
orderitem
.
delete
()
deleted_count
+=
1
return
deleted_count
def
save
(
self
,
*
args
,
**
kwargs
)
->
None
:
if
self
.
ordered
and
self
.
ordered_date
is
None
:
self
.
ordered_date
=
timezone
.
now
()
elif
self
.
rejected
and
self
.
rejected_date
is
None
:
self
.
rejected_date
=
timezone
.
now
()
super
().
save
(
*
args
,
**
kwargs
)
def
clean_illegal_items
(
self
)
->
int
:
# No suppression if already ordered
if
self
.
ordered
:
return
0
deleted_count
=
0
for
orderitem
in
self
.
items
.
filter
(
pack_parent
=
None
):
if
orderitem
.
item
.
contains_illegal_items
:
orderitem
.
delete
()
deleted_count
+=
1
return
deleted_count
class
Payment
(
models
.
Model
):
...
...
@@ -322,10 +327,10 @@ class OrderItemManager(models.Manager):
def
get_ordered_quantity
(
self
,
item
:
"Item"
,
user
)
->
int
:
"""Get the total quantity ever ordered/in order by that user"""
return
(
self
.
filter
(
item
=
item
,
order__user
=
user
,
order__rejected
=
False
).
aggregate
(
quantity
=
Sum
(
"quantity"
)
)[
"quantity"
]
or
0
self
.
filter
(
item
=
item
,
order__user
=
user
,
order__rejected
=
False
).
aggregate
(
quantity
=
Sum
(
"quantity"
)
)[
"quantity"
]
or
0
)
...
...
boutique/views.py
View file @
a07e10ec
...
...
@@ -121,7 +121,7 @@ class ItemDetailView(LoginRequiredMixin, DetailView, FormMixin):
)
kwargs
[
"is_special"
]
=
self
.
object
.
special
kwargs
[
"already_ordered"
]
=
(
OrderItem
.
objects
.
get_ordered_quantity
(
self
.
object
,
self
.
request
.
user
)
>=
1
OrderItem
.
objects
.
get_ordered_quantity
(
self
.
object
,
self
.
request
.
user
)
>=
1
)
return
kwargs
...
...
@@ -402,8 +402,8 @@ class OrderEditView(LoginRequiredMixin, UpdateView):
self
.
object
.
compute_price
()
kwargs
[
"total_price"
]
=
self
.
object
.
price
kwargs
[
"is_contributor"
]
=
(
bde
.
models
.
Contributor
.
is_contributor
(
self
.
request
.
user
)
or
self
.
object
.
contains_cotiz
bde
.
models
.
Contributor
.
is_contributor
(
self
.
request
.
user
)
or
self
.
object
.
contains_cotiz
)
return
kwargs
...
...
Write
Preview
Supports
Markdown
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