Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
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
2
Merge Requests
2
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
cooperatic-foodcoops
third-party
Commits
18789343
Commit
18789343
authored
Jun 21, 2022
by
Félicie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_cooperatic' into 3292-alert-message-barrecode
parents
a6f73d2a
4f582f12
Pipeline
#2256
passed with stage
in 1 minute 26 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletions
+6
-1
admin.py
members/admin.py
+1
-0
shelf_inventory.js
shelfs/static/js/shelf_inventory.js
+3
-0
manage_regular_shifts.html
templates/members/admin/manage_regular_shifts.html
+2
-1
No files found.
members/admin.py
View file @
18789343
...
...
@@ -351,6 +351,7 @@ def manage_regular_shifts(request):
'open_on_sunday'
:
getattr
(
settings
,
'OPEN_ON_SUNDAY'
,
False
),
'show_ftop_button'
:
getattr
(
settings
,
'BDM_SHOW_FTOP_BUTTON'
,
True
),
'has_committe_shift'
:
committees_shift_id
is
not
None
,
'committees_shift_id'
:
committees_shift_id
,
'ASSOCIATE_MEMBER_SHIFT'
:
getattr
(
settings
,
'ASSOCIATE_MEMBER_SHIFT'
,
''
)
}
return
HttpResponse
(
template
.
render
(
context
,
request
))
...
...
shelfs/static/js/shelf_inventory.js
View file @
18789343
...
...
@@ -158,6 +158,9 @@ function select_product_from_bc(barcode) {
qty
=
scannedProduct
.
qty
;
}
}
}
else
{
alert
(
"Le code-barre "
+
barcode
+
" n'est pas reconnu comme un EAN13 valide.'"
);
return
-
1
;
}
if
(
editing_item
===
null
)
{
...
...
templates/members/admin/manage_regular_shifts.html
View file @
18789343
...
...
@@ -95,7 +95,8 @@
var
max_begin_hour
=
'{{max_begin_hour}}'
var
couchdb_dbname
=
'{{db}}'
;
var
couchdb_server
=
'{{couchdb_server}}'
+
couchdb_dbname
;
var
committees_shift_id
=
'{{ASSOCIATE_MEMBER_SHIFT}}'
;
var
committees_shift_id
=
'{{committees_shift_id}}'
;
var
ASSOCIATE_MEMBER_SHIFT
=
'{{ASSOCIATE_MEMBER_SHIFT}}'
;
</script>
<script
src=
'{% static "js/common.js" %}?v=1651853225'
></script>
<script
src=
'{% static "js/all_common.js" %}?v=1651853225'
></script>
...
...
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