Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
repanier
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
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chris
repanier
Commits
b9304d65
Commit
b9304d65
authored
Apr 02, 2017
by
Patrick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code cleanup
parent
4e83d831
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
8 deletions
+9
-8
repanier/apps.py
repanier/apps.py
+0
-2
repanier/task/task_order.py
repanier/task/task_order.py
+0
-1
repanier/tools.py
repanier/tools.py
+3
-1
repanier/views/order_class.py
repanier/views/order_class.py
+3
-2
repanier/views/order_init_ajax.py
repanier/views/order_init_ajax.py
+3
-2
No files found.
repanier/apps.py
View file @
b9304d65
...
...
@@ -83,8 +83,6 @@ class RepanierSettings(AppConfig):
group_name
=
group_name
,
name
=
PERMANENCE_NAME_PERMANENCE
,
bank_account
=
"BE99 9999 9999 9999"
,
vat_id
=
EMPTY_STRING
,
sms_gateway_mail
=
EMPTY_STRING
,
currency
=
CURRENCY_EUR
)
config
.
save
()
...
...
repanier/task/task_order.py
View file @
b9304d65
...
...
@@ -434,7 +434,6 @@ def close_order(permanence, all_producers, producers_id=None):
if
customer_invoice_id_save
!=
purchase
.
customer_invoice_id
:
customer_invoice_id_save
=
purchase
.
customer_invoice_id
# This order has been cancelled
# filename = force_filename("%s - %s.xlsx" % (_("Canceled order"), permanence))
filename
=
"{0}-{1}.xlsx"
.
format
(
slugify
(
_
(
"Canceled order"
)),
slugify
(
permanence
)
...
...
repanier/tools.py
View file @
b9304d65
...
...
@@ -1057,7 +1057,9 @@ def update_or_create_purchase(customer=None, offer_item_id=None, q_order=None, v
).
order_by
(
'?'
).
first
()
permanence
=
models
.
Permanence
.
objects
.
filter
(
id
=
permanence_id
).
only
(
"id"
,
"with_delivery_point"
,
"status"
).
order_by
(
'?'
).
first
()
).
only
(
"id"
,
"with_delivery_point"
,
"status"
).
order_by
(
'?'
).
first
()
if
customer_invoice
is
not
None
and
permanence
is
not
None
:
order_amount
=
customer_invoice
.
get_total_price_with_tax
()
status_changed
=
customer_invoice
.
cancel_confirm_order
()
...
...
repanier/views/order_class.py
View file @
b9304d65
...
...
@@ -37,8 +37,9 @@ class OrderView(ListView):
def
dispatch
(
self
,
request
,
*
args
,
**
kwargs
):
permanence_id
=
sint
(
kwargs
.
get
(
'permanence_id'
,
0
))
self
.
permanence
=
Permanence
.
objects
.
filter
(
id
=
permanence_id
).
only
(
"id"
,
"status"
,
"permanence_date"
,
"with_delivery_point"
).
order_by
(
'?'
).
first
()
self
.
permanence
=
Permanence
.
objects
.
filter
(
id
=
permanence_id
).
only
(
"id"
,
"status"
,
"permanence_date"
,
"with_delivery_point"
).
order_by
(
'?'
).
first
()
permanence_ok_or_404
(
self
.
permanence
)
self
.
user
=
request
.
user
self
.
basket
=
kwargs
.
get
(
'basket'
,
False
)
...
...
repanier/views/order_init_ajax.py
View file @
b9304d65
...
...
@@ -29,8 +29,9 @@ def order_init_ajax(request):
if
request
.
is_ajax
():
# construct a list which will contain all of the data for the response
permanence_id
=
sint
(
request
.
GET
.
get
(
'pe'
,
0
))
permanence_qs
=
Permanence
.
objects
.
filter
(
id
=
permanence_id
)
\
.
only
(
"id"
,
"status"
,
"with_delivery_point"
).
order_by
(
'?'
)
permanence_qs
=
Permanence
.
objects
.
filter
(
id
=
permanence_id
).
only
(
"id"
,
"status"
,
"with_delivery_point"
).
order_by
(
'?'
)
if
not
permanence_qs
.
exists
():
raise
Http404
user
=
request
.
user
...
...
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