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
b828ca7e
Commit
b828ca7e
authored
Jul 23, 2021
by
Alexis AOUN
Committed by
Alexis Aoun
Jul 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correction du bug #1236
parent
ad361176
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
44 additions
and
4 deletions
+44
-4
reception_produits.js
reception/static/js/reception_produits.js
+44
-4
No files found.
reception/static/js/reception_produits.js
View file @
b828ca7e
...
@@ -857,6 +857,7 @@ function editProductInfo (productToEdit, value = null, batch = false) {
...
@@ -857,6 +857,7 @@ function editProductInfo (productToEdit, value = null, batch = false) {
// Check if the product is already in the 'updated' list
// Check if the product is already in the 'updated' list
var
index
=
searchUpdatedProduct
();
var
index
=
searchUpdatedProduct
();
var
firstUpdate
=
false
;
var
firstUpdate
=
false
;
var
isValid
=
false
;
let
newValue
=
value
;
let
newValue
=
value
;
var
addition
=
false
;
var
addition
=
false
;
...
@@ -873,10 +874,14 @@ function editProductInfo (productToEdit, value = null, batch = false) {
...
@@ -873,10 +874,14 @@ function editProductInfo (productToEdit, value = null, batch = false) {
}
}
});
});
// 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"
)
{
if
(
index
==
-
1
)
{
// First update
firstUpdate
=
(
index
==
-
1
);
//first update
if
(
productToEdit
.
product_qty
!=
newValue
)
{
if
(
firstUpdate
)
{
productToEdit
.
old_qty
=
productToEdit
.
product_qty
;
productToEdit
.
old_qty
=
productToEdit
.
product_qty
;
firstUpdate
=
true
;
}
else
{
//if it is not the first update AND newValue is equal to the validation qty then the product is valid
isValid
=
(
newValue
===
productToEdit
.
old_qty
);
}
}
// Edit product info
// Edit product info
...
@@ -887,6 +892,11 @@ function editProductInfo (productToEdit, value = null, batch = false) {
...
@@ -887,6 +892,11 @@ function editProductInfo (productToEdit, value = null, batch = false) {
*/
*/
productToEdit
.
product_qty_package
=
1
;
productToEdit
.
product_qty_package
=
1
;
productToEdit
.
package_qty
=
productToEdit
.
product_qty
;
productToEdit
.
package_qty
=
productToEdit
.
product_qty
;
}
else
if
(
firstUpdate
)
{
// if the product is updated for the first time and productQty is equal to the newValue then the product is validated
isValid
=
true
;
}
}
}
// Check if price changed
// Check if price changed
...
@@ -918,6 +928,14 @@ function editProductInfo (productToEdit, value = null, batch = false) {
...
@@ -918,6 +928,14 @@ function editProductInfo (productToEdit, value = null, batch = false) {
if
(
firstUpdate
)
{
if
(
firstUpdate
)
{
updatedProducts
.
push
(
productToEdit
);
updatedProducts
.
push
(
productToEdit
);
//if product is validated thru edition -> add to valid_products
if
(
isValid
)
{
// Create 'valid_products' list in order if not exists
if
(
!
orders
[
productToEdit
.
id_po
][
'valid_products'
])
{
orders
[
productToEdit
.
id_po
][
'valid_products'
]
=
[];
}
orders
[
productToEdit
.
id_po
][
'valid_products'
].
push
(
productToEdit
[
'id'
]);
}
else
{
// Create 'updated_products' list in order if not exists
// Create 'updated_products' list in order if not exists
if
(
!
orders
[
productToEdit
.
id_po
][
'updated_products'
])
{
if
(
!
orders
[
productToEdit
.
id_po
][
'updated_products'
])
{
orders
[
productToEdit
.
id_po
][
'updated_products'
]
=
[];
orders
[
productToEdit
.
id_po
][
'updated_products'
]
=
[];
...
@@ -933,6 +951,26 @@ function editProductInfo (productToEdit, value = null, batch = false) {
...
@@ -933,6 +951,26 @@ function editProductInfo (productToEdit, value = null, batch = false) {
orders
[
productToEdit
.
id_po
][
'valid_products'
].
splice
(
i
,
1
);
orders
[
productToEdit
.
id_po
][
'valid_products'
].
splice
(
i
,
1
);
}
}
}
}
}
}
else
{
if
(
isValid
)
{
//if product is valid -> remove from updated_products list and add to valid_products list
//removing from updated_products
for
(
i
in
orders
[
productToEdit
.
id_po
][
'updated_products'
])
{
if
(
orders
[
productToEdit
.
id_po
][
'updated_products'
][
i
][
'product_id'
][
0
]
==
productToEdit
[
'product_id'
][
0
])
{
orders
[
productToEdit
.
id_po
][
'updated_products'
].
splice
(
i
,
1
);
}
}
//add to valid_products
// Create 'valid_products' list in order if not exists
if
(
!
orders
[
productToEdit
.
id_po
][
'valid_products'
])
{
orders
[
productToEdit
.
id_po
][
'valid_products'
]
=
[];
}
orders
[
productToEdit
.
id_po
][
'valid_products'
].
push
(
productToEdit
[
'id'
]);
}
else
{
}
else
{
// Look for product in order's updated products list
// Look for product in order's updated products list
for
(
i
in
orders
[
productToEdit
.
id_po
][
'updated_products'
])
{
for
(
i
in
orders
[
productToEdit
.
id_po
][
'updated_products'
])
{
...
@@ -942,14 +980,16 @@ function editProductInfo (productToEdit, value = null, batch = false) {
...
@@ -942,14 +980,16 @@ function editProductInfo (productToEdit, value = null, batch = false) {
}
}
}
}
}
}
}
if
(
batch
===
false
)
{
if
(
batch
===
false
)
{
// Update product order
// Update product order
update_distant_order
(
productToEdit
.
id_po
);
update_distant_order
(
productToEdit
.
id_po
);
}
}
if
(
addition
)
{
if
(
addition
)
{
let
row
=
table_processed
.
row
(
$
(
'#'
+
productToEdit
.
product_id
[
0
]));
let
row
=
table_processed
.
row
(
$
(
'#'
+
productToEdit
.
product_id
[
0
]));
remove_from_processed
(
row
,
productToEdit
);
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