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
793d102f
Commit
793d102f
authored
May 03, 2022
by
François C.
Browse files
Options
Browse Files
Download
Plain Diff
Fix conflict
parents
c16205e6
d66c0789
Pipeline
#2162
passed with stage
in 1 minute 29 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
25 deletions
+33
-25
models.py
products/models.py
+2
-0
barcodes.js
products/static/js/barcodes.js
+8
-1
shelfs_admin.js
shelfs/static/js/shelfs_admin.js
+23
-24
No files found.
products/models.py
View file @
793d102f
...
...
@@ -520,6 +520,8 @@ class CagetteProducts(models.Model):
rules
=
OdooAPI
()
.
search_read
(
'barcode.rule'
,
c
,
[
'pattern'
,
'type'
,
'alias'
],
order
=
"sequence ASC"
)
# As rules are ordered by sequence, let's find where to stop (.* pattern)
stop_idx
=
len
(
rules
)
-
1
# .* (catchall) rules, if exists, may be not the last rule
# let's find it and set stop_idx consequently
i
=
0
for
r
in
rules
:
if
r
[
'pattern'
]
==
".*"
:
...
...
products/static/js/barcodes.js
View file @
793d102f
...
...
@@ -112,7 +112,14 @@ IFCBarcodes = {
// let's seek "normalized" bc in codes array or alias map
for
(
alias
in
this
.
aliases
)
{
if
(
bc
==
alias
)
{
/*
bc.indexOf(alias) === 0
could be enough,
but is used to keep in mind .* caracters
can be used in rules (have been cleaned before beeing here)
*/
if
(
bc
==
alias
||
bc
.
indexOf
(
alias
)
===
0
)
{
is_alias
=
true
;
for
(
barcode
in
this
.
codes
)
{
if
(
barcode
==
this
.
aliases
[
alias
])
{
...
...
shelfs/static/js/shelfs_admin.js
View file @
793d102f
...
...
@@ -368,31 +368,30 @@ var addProductToList = async function(barcode) {
//It could also be a wrong reading one
odoo_product
=
barcodes
.
get_corresponding_odoo_product
(
barcode
);
if
(
is_product_in_shelf_adding_queue_list
(
odoo_product
.
data
[
barcodes
.
keys
.
id
]))
{
console
.
log
(
"Already added product"
);
}
else
{
add_to_shelf_product_ids
.
push
(
odoo_product
.
data
[
4
]);
if
(
odoo_product
===
null
)
{
alert
(
barcode
+
' : Code-barre inconnu'
);
if
(
odoo_product
)
{
if
(
is_product_in_shelf_adding_queue_list
(
odoo_product
.
data
[
barcodes
.
keys
.
id
]))
{
alert
(
"Produit déjà présent dans la liste."
);
}
else
{
var
pdt_line
=
$
(
'<tr>'
).
attr
(
'data-id'
,
odoo_product
.
data
[
barcodes
.
keys
.
id
])
.
attr
(
'data-bc'
,
odoo_product
.
barcode
)
.
addClass
(
'obc'
);
$
(
'<td>'
).
text
(
barcode
)
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
text
(
odoo_product
.
barcode
)
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
text
(
odoo_product
.
data
[
barcodes
.
keys
.
name
])
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
text
(
odoo_product
.
data
[
barcodes
.
keys
.
list_price
]
+
" €"
)
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
html
(
delete_icon
)
.
appendTo
(
pdt_line
);
adding_pdts_tpl
.
find
(
'#added_products tbody'
).
append
(
pdt_line
);
main_content
.
find
(
'button.add-products'
).
css
(
'display'
,
'block'
)
.
html
(
add_pdts_btn_text
);
add_to_shelf_product_ids
.
push
(
odoo_product
.
data
[
4
]);
if
(
odoo_product
===
null
)
{
alert
(
barcode
+
' : Code-barre inconnu'
);
}
else
{
var
pdt_line
=
$
(
'<tr>'
).
attr
(
'data-id'
,
odoo_product
.
data
[
barcodes
.
keys
.
id
])
.
attr
(
'data-bc'
,
odoo_product
.
barcode
)
.
addClass
(
'obc'
);
$
(
'<td>'
).
text
(
barcode
)
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
text
(
odoo_product
.
barcode
)
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
text
(
odoo_product
.
data
[
barcodes
.
keys
.
name
])
.
appendTo
(
pdt_line
);
$
(
'<td>'
).
html
(
delete_icon
)
.
appendTo
(
pdt_line
);
adding_pdts_tpl
.
find
(
'#added_products tbody'
).
append
(
pdt_line
);
main_content
.
find
(
'button.add-products'
).
css
(
'display'
,
'block'
)
.
html
(
add_pdts_btn_text
);
}
}
}
};
...
...
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