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
d9189217
Commit
d9189217
authored
May 06, 2022
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linting
parent
da215ede
Pipeline
#2194
passed with stage
in 1 minute 30 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
reception_produits.js
reception/static/js/reception_produits.js
+9
-7
No files found.
reception/static/js/reception_produits.js
View file @
d9189217
...
...
@@ -93,7 +93,7 @@ function select_product_from_bc(barcode) {
$
.
each
(
list_processed
,
function
(
i
,
e
)
{
if
(
e
.
product_id
[
0
]
==
scannedProduct
.
data
[
barcodes
[
'keys'
][
'id'
]])
{
foundProduct
.
data
=
JSON
.
parse
(
JSON
.
stringify
(
e
));
foundProduct
.
data
.
product_qty
=
null
;
// Set qty to null from product already scanned
foundProduct
.
data
.
product_qty
=
null
;
// Set qty to null from product already scanned
foundProduct
.
place
=
'processed'
;
}
});
...
...
@@ -103,7 +103,7 @@ function select_product_from_bc(barcode) {
if
(
foundProduct
.
data
.
product_uom
[
0
]
==
21
)
{
//if qty is in weight
if
(
scannedProduct
.
rule
===
'weight'
)
{
editing_product
=
foundProduct
.
data
;
foundProduct
.
weightAddition
=
true
;
// product weight is directly added
foundProduct
.
weightAddition
=
true
;
// product weight is directly added
editProductInfo
(
foundProduct
.
data
,
scannedProduct
.
qty
);
editing_product
=
null
;
}
else
if
(
scannedProduct
.
rule
===
'price_to_weight'
)
{
...
...
@@ -119,6 +119,7 @@ function select_product_from_bc(barcode) {
if
(
foundProduct
.
place
===
'to_process'
)
{
let
row
=
table_to_process
.
row
(
$
(
'#'
+
foundProduct
.
data
.
product_id
[
0
]));
remove_from_toProcess
(
row
,
foundProduct
.
data
);
}
// Don't remove product from processed list
...
...
@@ -411,9 +412,9 @@ function initLists() {
+
display_barcode
+
'</span> </div>'
;
}
},
{
data
:
"product_uom.1"
,
title
:
"Unité vente"
,
className
:
"dt-body-center"
,
{
data
:
"product_uom.1"
,
title
:
"Unité vente"
,
className
:
"dt-body-center"
,
orderable
:
false
,
render
:
function
(
data
)
{
if
(
data
.
toLowerCase
().
indexOf
(
'unit'
)
===
0
)
{
...
...
@@ -1045,8 +1046,8 @@ function editProductInfo (productToEdit, value = null, batch = false) {
// addition mode = weight is directly added from scanned product
$
.
each
(
list_processed
,
function
(
i
,
e
)
{
if
(
e
.
product_id
[
0
]
==
productToEdit
.
product_id
[
0
]
&&
"weightAddition"
in
productToEdit
e
.
product_id
[
0
]
==
productToEdit
.
product_id
[
0
]
&&
"weightAddition"
in
productToEdit
&&
productToEdit
.
weightAddition
===
true
)
{
addition
=
true
;
...
...
@@ -1179,6 +1180,7 @@ function editProductInfo (productToEdit, value = null, batch = false) {
// - product comes from processed list
if
(
addition
===
true
||
firstUpdate
===
false
)
{
let
row
=
table_processed
.
row
(
$
(
'#'
+
productToEdit
.
product_id
[
0
]));
remove_from_processed
(
row
,
productToEdit
);
}
...
...
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