Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
amap
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
groupe-amap
amap
Commits
d0beda5f
Commit
d0beda5f
authored
Sep 11, 2016
by
Gabriel Detraz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Gère le cas pas d'objet sac
parent
d21485a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
users/models.py
users/models.py
+7
-3
No files found.
users/models.py
View file @
d0beda5f
...
...
@@ -5,7 +5,6 @@ from django import forms
from
django.db.models.signals
import
post_save
,
post_delete
from
django.dispatch
import
receiver
from
amap.settings
import
RIGHTS_LINK
,
REQ_EXPIRE_HRS
import
re
,
uuid
import
datetime
...
...
@@ -13,7 +12,7 @@ import datetime
from
django.utils
import
timezone
from
django.contrib.auth.models
import
AbstractBaseUser
,
BaseUserManager
from
panier.models
import
Credit
,
Commande
from
panier.models
import
Credit
,
Commande
,
Panier
def
get_admin_right
():
try
:
...
...
@@ -153,8 +152,13 @@ class User(AbstractBaseUser):
def
solde
(
self
):
""" Renvoie le solde dynamiquement"""
try
:
sac_prix
=
Panier
.
objects
.
get
(
nom
=
"Sac"
).
prix
except
Panier
.
DoesNotExist
:
# Pass silencieusement si l'objet n'existe pas
sac_prix
=
1
credit
=
sum
(
credit
.
montant
for
credit
in
Credit
.
objects
.
filter
(
user
=
self
)
if
credit
.
validite
)
debit
=
sum
(
commande
.
prix_unitaire
*
commande
.
quantite
for
commande
in
Commande
.
objects
.
filter
(
user
=
self
))
+
self
.
sac_consignes
debit
=
sum
(
commande
.
prix_unitaire
*
commande
.
quantite
for
commande
in
Commande
.
objects
.
filter
(
user
=
self
))
+
self
.
sac_consignes
*
sac_prix
return
credit
-
debit
def
__str__
(
self
):
...
...
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