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
261
Issues
261
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Paul
third-party
Commits
96967cb5
Commit
96967cb5
authored
Jun 15, 2021
by
Alexis Aoun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Amelioration: Rajout de la quantite lors d un scan d un produit deja scanne
parent
53188c75
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
5 deletions
+21
-5
reception_produits.js
reception/static/js/reception_produits.js
+21
-5
No files found.
reception/static/js/reception_produits.js
View file @
96967cb5
...
@@ -63,6 +63,8 @@ function searchUpdatedProduct() {
...
@@ -63,6 +63,8 @@ function searchUpdatedProduct() {
// Directly send a line to edition when barcode is read
// Directly send a line to edition when barcode is read
function
select_product_from_bc
(
barcode
)
{
function
select_product_from_bc
(
barcode
)
{
try
{
try
{
console
.
log
(
"FLAG 1 !"
);
if
(
editing_product
==
null
)
{
if
(
editing_product
==
null
)
{
let
p
=
barcodes
.
get_corresponding_odoo_product
(
barcode
);
let
p
=
barcodes
.
get_corresponding_odoo_product
(
barcode
);
...
@@ -81,7 +83,9 @@ function select_product_from_bc(barcode) {
...
@@ -81,7 +83,9 @@ function select_product_from_bc(barcode) {
}
}
});
});
if
(
found
.
data
!=
null
)
{
console
.
log
(
found
.
data
);
if
(
found
.
data
==
null
)
{
$
.
each
(
list_processed
,
function
(
i
,
e
)
{
$
.
each
(
list_processed
,
function
(
i
,
e
)
{
if
(
e
.
product_id
[
0
]
==
p
.
data
[
barcodes
[
'keys'
][
'id'
]])
{
if
(
e
.
product_id
[
0
]
==
p
.
data
[
barcodes
[
'keys'
][
'id'
]])
{
found
.
data
=
e
;
found
.
data
=
e
;
...
@@ -98,8 +102,7 @@ function select_product_from_bc(barcode) {
...
@@ -98,8 +102,7 @@ function select_product_from_bc(barcode) {
remove_from_toProcess
(
row
,
found
.
data
);
remove_from_toProcess
(
row
,
found
.
data
);
}
else
{
}
else
{
let
row
=
table_processed
.
row
(
$
(
'#'
+
found
.
data
.
product_id
[
0
]));
let
row
=
table_processed
.
row
(
$
(
'#'
+
found
.
data
.
product_id
[
0
]));
console
.
log
(
"FLAG 2 !"
);
remove_from_processed
(
row
,
found
.
data
);
}
}
}
}
}
}
...
@@ -801,18 +804,27 @@ function editProductInfo (productToEdit, value = null) {
...
@@ -801,18 +804,27 @@ function editProductInfo (productToEdit, value = null) {
var
firstUpdate
=
false
;
var
firstUpdate
=
false
;
let
newValue
=
value
;
let
newValue
=
value
;
var
addition
=
false
;
// If 'value' parameter not set, get value from edition input
// If 'value' parameter not set, get value from edition input
if
(
value
==
null
)
{
if
(
value
==
null
)
{
newValue
=
parseFloat
(
document
.
getElementById
(
'edition_input'
).
value
.
replace
(
','
,
'.'
));
newValue
=
parseFloat
(
document
.
getElementById
(
'edition_input'
).
value
.
replace
(
','
,
'.'
));
}
}
$
.
each
(
list_processed
,
function
(
i
,
e
)
{
if
(
e
.
product_id
[
0
]
==
productToEdit
.
product_id
[
0
])
{
addition
=
true
;
productToEdit
=
e
;
newValue
=
newValue
+
productToEdit
.
product_qty
;
}
});
// If qty edition & Check if qty changed
// If qty edition & Check if qty changed
if
(
reception_status
==
"False"
&&
productToEdit
.
product_qty
!=
newValue
)
{
if
(
reception_status
==
"False"
&&
productToEdit
.
product_qty
!=
newValue
)
{
if
(
index
==
-
1
)
{
// First update
if
(
index
==
-
1
)
{
// First update
productToEdit
.
old_qty
=
productToEdit
.
product_qty
;
productToEdit
.
old_qty
=
productToEdit
.
product_qty
;
firstUpdate
=
true
;
firstUpdate
=
true
;
}
}
// Edit product info
// Edit product info
productToEdit
.
product_qty
=
newValue
;
productToEdit
.
product_qty
=
newValue
;
/*
/*
...
@@ -876,10 +888,14 @@ function editProductInfo (productToEdit, value = null) {
...
@@ -876,10 +888,14 @@ function editProductInfo (productToEdit, value = null) {
}
}
}
}
}
}
// Update local storage of product order
// Update local storage of product order
localStorage
.
setItem
(
"order_"
+
productToEdit
.
id_po
,
JSON
.
stringify
(
orders
[
productToEdit
.
id_po
]));
localStorage
.
setItem
(
"order_"
+
productToEdit
.
id_po
,
JSON
.
stringify
(
orders
[
productToEdit
.
id_po
]));
if
(
addition
){
let
row
=
table_processed
.
row
(
$
(
'#'
+
productToEdit
.
product_id
[
0
]));
remove_from_processed
(
row
,
productToEdit
);
}
add_to_processed
(
productToEdit
);
add_to_processed
(
productToEdit
);
}
catch
(
e
)
{
}
catch
(
e
)
{
err
=
{
msg
:
e
.
name
+
' : '
+
e
.
message
,
ctx
:
'edit product info'
};
err
=
{
msg
:
e
.
name
+
' : '
+
e
.
message
,
ctx
:
'edit product info'
};
...
...
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