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
0ee8de08
Commit
0ee8de08
authored
Jul 23, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linting
parent
565034da
Pipeline
#1255
passed with stage
in 1 minute 21 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
orders_helper.js
orders/static/js/orders_helper.js
+12
-6
No files found.
orders/static/js/orders_helper.js
View file @
0ee8de08
...
@@ -102,6 +102,8 @@ function _compute_stats_date_from() {
...
@@ -102,6 +102,8 @@ function _compute_stats_date_from() {
case
'2weeks'
:
case
'2weeks'
:
date
.
setDate
(
date
.
getDate
()
-
14
);
date
.
setDate
(
date
.
getDate
()
-
14
);
break
;
break
;
default
:
break
;
}
}
let
day
=
(
"0"
+
date
.
getDate
()).
slice
(
-
2
);
let
day
=
(
"0"
+
date
.
getDate
()).
slice
(
-
2
);
...
@@ -146,7 +148,7 @@ function add_product() {
...
@@ -146,7 +148,7 @@ function add_product() {
let
data
=
{
let
data
=
{
pids
:
[
product
.
tpl_id
],
pids
:
[
product
.
tpl_id
],
stats_from
:
_compute_stats_date_from
()
stats_from
:
_compute_stats_date_from
()
}
}
;
$
.
ajax
({
$
.
ajax
({
type
:
'POST'
,
type
:
'POST'
,
...
@@ -252,7 +254,7 @@ function check_products_data() {
...
@@ -252,7 +254,7 @@ function check_products_data() {
products
.
push
(
product
);
products
.
push
(
product
);
}
else
{
}
else
{
// Save old product suppliersinfo to keep user qty inputs
// Save old product suppliersinfo to keep user qty inputs
const
old_suppliersinfo
=
[
...
products
[
p_index
].
suppliersinfo
];
const
old_suppliersinfo
=
[
...
products
[
p_index
].
suppliersinfo
];
// Update product data
// Update product data
products
[
p_index
]
=
product
;
products
[
p_index
]
=
product
;
...
@@ -468,7 +470,7 @@ function save_supplier_product_association(product, supplier, cell) {
...
@@ -468,7 +470,7 @@ function save_supplier_product_association(product, supplier, cell) {
* @param {object} product
* @param {object} product
* @param {object} supplier
* @param {object} supplier
*/
*/
function
remove_supplier_product_association
(
product
,
supplier
)
{
function
remove_supplier_product_association
(
product
,
supplier
)
{
openModal
();
openModal
();
const
data
=
{
const
data
=
{
...
@@ -484,10 +486,11 @@ function save_supplier_product_association(product, supplier, cell) {
...
@@ -484,10 +486,11 @@ function save_supplier_product_association(product, supplier, cell) {
traditional
:
true
,
traditional
:
true
,
contentType
:
"application/json; charset=utf-8"
,
contentType
:
"application/json; charset=utf-8"
,
data
:
JSON
.
stringify
(
data
),
data
:
JSON
.
stringify
(
data
),
success
:
(
res
)
=>
{
success
:
()
=>
{
// Remove relation locally
// Remove relation locally
let
p_index
=
products
.
findIndex
(
p
=>
p
.
id
==
product
.
id
);
let
p_index
=
products
.
findIndex
(
p
=>
p
.
id
==
product
.
id
);
let
psi_index
=
product
.
suppliersinfo
.
findIndex
(
psi
=>
psi
.
supplier_id
==
supplier
.
id
);
let
psi_index
=
product
.
suppliersinfo
.
findIndex
(
psi
=>
psi
.
supplier_id
==
supplier
.
id
);
products
[
p_index
].
suppliersinfo
.
splice
(
psi_index
,
1
);
products
[
p_index
].
suppliersinfo
.
splice
(
psi_index
,
1
);
// Update table
// Update table
...
@@ -1353,7 +1356,7 @@ function display_products(params) {
...
@@ -1353,7 +1356,7 @@ function display_products(params) {
// If datatable already exists, empty & clear events
// If datatable already exists, empty & clear events
if
(
products_table
)
{
if
(
products_table
)
{
$
(
products_table
.
table
().
header
()).
off
()
$
(
products_table
.
table
().
header
()).
off
()
;
$
(
'#products_table'
).
off
();
$
(
'#products_table'
).
off
();
products_table
.
clear
().
destroy
();
products_table
.
clear
().
destroy
();
...
@@ -1427,8 +1430,10 @@ function display_products(params) {
...
@@ -1427,8 +1430,10 @@ function display_products(params) {
let
modal_remove_supplier_product_association
=
$
(
'#templates #modal_remove_supplier_product_association'
);
let
modal_remove_supplier_product_association
=
$
(
'#templates #modal_remove_supplier_product_association'
);
const
product
=
products
.
find
(
p
=>
p
.
id
==
prod_id
);
const
product
=
products
.
find
(
p
=>
p
.
id
==
prod_id
);
modal_remove_supplier_product_association
.
find
(
".product_name"
).
text
(
product
.
name
);
modal_remove_supplier_product_association
.
find
(
".product_name"
).
text
(
product
.
name
);
const
supplier
=
selected_suppliers
.
find
(
s
=>
s
.
id
==
supplier_id
);
const
supplier
=
selected_suppliers
.
find
(
s
=>
s
.
id
==
supplier_id
);
modal_remove_supplier_product_association
.
find
(
".supplier_name"
).
text
(
supplier
.
display_name
);
modal_remove_supplier_product_association
.
find
(
".supplier_name"
).
text
(
supplier
.
display_name
);
openModal
(
openModal
(
...
@@ -1444,6 +1449,7 @@ function display_products(params) {
...
@@ -1444,6 +1449,7 @@ function display_products(params) {
()
=>
{
()
=>
{
// Reset value in input on cancel
// Reset value in input on cancel
const
psi
=
product
.
suppliersinfo
.
find
(
psi_item
=>
psi_item
.
supplier_id
==
supplier_id
);
const
psi
=
product
.
suppliersinfo
.
find
(
psi_item
=>
psi_item
.
supplier_id
==
supplier_id
);
$
(
this
).
val
(
psi
.
qty
);
$
(
this
).
val
(
psi
.
qty
);
}
}
);
);
...
@@ -1478,7 +1484,7 @@ function display_products(params) {
...
@@ -1478,7 +1484,7 @@ function display_products(params) {
// Validate on Enter pressed
// Validate on Enter pressed
$
(
this
).
blur
();
$
(
this
).
blur
();
}
}
});
;
})
;
// Associate product to supplier on click on 'X' in the table
// Associate product to supplier on click on 'X' in the table
$
(
'#products_table'
).
on
(
'click'
,
'tbody .product_not_from_supplier'
,
function
()
{
$
(
'#products_table'
).
on
(
'click'
,
'tbody .product_not_from_supplier'
,
function
()
{
...
...
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