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
3 years ago
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linting
parent
565034da
dev_cooperatic
…
#5673_bug_calendrier_echange_service
3832-makeups-and-member-status-update
4081
4444_improve_presence_recording
4709
4778-reception-dont-get-finished-orders
4809-remove-shelf-value-col-to-reduce-server-load
4880-rapports-reception-faux
4950-douchage-appli-reception
5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages
5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites
6286_bug_encaissement_souscription_cheque_espece
6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template
6832--certaines-absences-engendrent-une-erreur
7723-7559-change-purchase-order-workflow-django-side
7731-third-party-side-brinks-pos-export-not-working
7747-inventaire-par-article
7800-make-test-solution-work
7848-cannot-validate-qty-with-decimal-on-kg-product
adaptation_supercafoutch
adaptation_supercoop
adaptation_supercoop_supercafoutch
adpatation_chouette
assistance_import_article
coop_dev_necessitant_modules_bdm_odoo_modifies
correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif
dev_principale
docker
export_capital_detenu
fix_bug_process_picking
fusion_custom_graoucoop
graoucoop_backup
graoucoop_prod
graoucoop_tmp
hot_fix_shelf_labels_auto_print
impression_etiquettes_rayons
integration_lien_precommandes_dans_espace_membre
lacagette_prod
local_branch
master
meal-voucher-and-label-printer-software-bug
migration-v12
pour_graoucoop_prod
pour_version_prod_cagette
refonte_espace_membre_sc
retouches_tickets_supercoop
sc-setup-stock-app
supercafoutch-preprod
supercafoutch-prod-20221003
supercafoutch_prod
ticket_4146
supercafoutch_20250120_151258
supercafoutch_20250120_150340
supercafoutch_20240909_080630
supercafoutch_20240609_115709
supercafoutch_20240212_082431
supercafoutch_20240107_181851
supercafoutch_prod_until_240107
supercafoutch-prod-20221003
supercafoutch-230911
supercafoutch-230824
supercafoutch-230823
supercafoutch-230823-the-true-one
migration-v12-tag
lacagette_20240310_074751
lacagette_20240107_122554
lacagette_20240107_120916
graoucoop_20240609_122614
cagette_testtag
cagette-230814
cagette-230630
4 merge requests
!103
WIP: Dev cooperatic
,
!84
Ticket 1738
,
!104
merge dev_cooperatic into dev_principale
,
!106
Dev principale
Pipeline
#1255
passed with stage
in 1 minute 21 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
30 deletions
+36
-30
orders_helper.js
orders/static/js/orders_helper.js
+36
-30
No files found.
orders/static/js/orders_helper.js
View file @
0ee8de08
...
...
@@ -85,23 +85,25 @@ function dates_diff(date1, date2) {
/**
* Compute the date from which to calculate stats of sells,
* depending on the selected parameter.
*
* depending on the selected parameter.
*
* @returns String value of the date, ISO format
*/
function
_compute_stats_date_from
()
{
let
val
=
''
;
if
(
order_doc
.
stats_date_period
!==
''
)
{
let
date
=
new
Date
();
switch
(
order_doc
.
stats_date_period
)
{
case
'1week'
:
date
.
setDate
(
date
.
getDate
()
-
7
);
break
;
case
'2weeks'
:
date
.
setDate
(
date
.
getDate
()
-
14
);
break
;
case
'1week'
:
date
.
setDate
(
date
.
getDate
()
-
7
);
break
;
case
'2weeks'
:
date
.
setDate
(
date
.
getDate
()
-
14
);
break
;
default
:
break
;
}
let
day
=
(
"0"
+
date
.
getDate
()).
slice
(
-
2
);
...
...
@@ -109,7 +111,7 @@ function _compute_stats_date_from() {
let
year
=
date
.
getFullYear
();
val
=
`
${
year
}
-
${
month
}
-
${
day
}
`
;
}
}
return
val
;
}
...
...
@@ -146,7 +148,7 @@ function add_product() {
let
data
=
{
pids
:
[
product
.
tpl_id
],
stats_from
:
_compute_stats_date_from
()
}
}
;
$
.
ajax
({
type
:
'POST'
,
...
...
@@ -252,7 +254,7 @@ function check_products_data() {
products
.
push
(
product
);
}
else
{
// 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
products
[
p_index
]
=
product
;
...
...
@@ -260,7 +262,7 @@ function check_products_data() {
// Re-set qties
for
(
let
psi_index
in
products
[
p_index
].
suppliersinfo
)
{
const
old_psi
=
old_suppliersinfo
.
find
(
psi
=>
psi
.
supplier_id
==
products
[
p_index
].
suppliersinfo
[
psi_index
].
supplier_id
);
if
(
old_psi
!==
undefined
&&
old_psi
.
qty
!==
undefined
)
{
products
[
p_index
].
suppliersinfo
[
psi_index
].
qty
=
old_psi
.
qty
;
}
...
...
@@ -468,7 +470,7 @@ function save_supplier_product_association(product, supplier, cell) {
* @param {object} product
* @param {object} supplier
*/
function
remove_supplier_product_association
(
product
,
supplier
)
{
function
remove_supplier_product_association
(
product
,
supplier
)
{
openModal
();
const
data
=
{
...
...
@@ -484,15 +486,16 @@ function save_supplier_product_association(product, supplier, cell) {
traditional
:
true
,
contentType
:
"application/json; charset=utf-8"
,
data
:
JSON
.
stringify
(
data
),
success
:
(
res
)
=>
{
success
:
()
=>
{
// Remove relation locally
let
p_index
=
products
.
findIndex
(
p
=>
p
.
id
==
product
.
id
);
let
psi_index
=
product
.
suppliersinfo
.
findIndex
(
psi
=>
psi
.
supplier_id
==
supplier
.
id
);
products
[
p_index
].
suppliersinfo
.
splice
(
psi_index
,
1
);
// Update table
display_products
();
update_cdb_order
();
closeModal
();
},
...
...
@@ -1353,7 +1356,7 @@ function display_products(params) {
// If datatable already exists, empty & clear events
if
(
products_table
)
{
$
(
products_table
.
table
().
header
()).
off
()
$
(
products_table
.
table
().
header
()).
off
()
;
$
(
'#products_table'
).
off
();
products_table
.
clear
().
destroy
();
...
...
@@ -1427,8 +1430,10 @@ function display_products(params) {
let
modal_remove_supplier_product_association
=
$
(
'#templates #modal_remove_supplier_product_association'
);
const
product
=
products
.
find
(
p
=>
p
.
id
==
prod_id
);
modal_remove_supplier_product_association
.
find
(
".product_name"
).
text
(
product
.
name
);
const
supplier
=
selected_suppliers
.
find
(
s
=>
s
.
id
==
supplier_id
);
modal_remove_supplier_product_association
.
find
(
".supplier_name"
).
text
(
supplier
.
display_name
);
openModal
(
...
...
@@ -1444,24 +1449,25 @@ function display_products(params) {
()
=>
{
// Reset value in input on cancel
const
psi
=
product
.
suppliersinfo
.
find
(
psi_item
=>
psi_item
.
supplier_id
==
supplier_id
);
$
(
this
).
val
(
psi
.
qty
);
}
);
}
else
{
val
=
parseFloat
(
val
);
// If value is a number
if
(
!
isNaN
(
val
))
{
if
(
!
isNaN
(
val
))
{
// Save value
save_product_supplier_qty
(
prod_id
,
supplier_id
,
val
);
// Update row
const
product
=
products
.
find
(
p
=>
p
.
id
==
prod_id
);
const
new_row_data
=
prepare_datatable_data
([
product
.
id
])[
0
];
products_table
.
row
(
$
(
this
).
closest
(
'tr'
)).
data
(
new_row_data
)
.
draw
();
update_cdb_order
();
display_total_values
();
}
else
{
...
...
@@ -1469,16 +1475,16 @@ function display_products(params) {
}
}
})
.
on
(
'change'
,
'tbody td .product_qty_input'
,
function
()
{
.
on
(
'change'
,
'tbody td .product_qty_input'
,
function
()
{
// Since data change is saved on blur, set focus on change in case of arrows pressed
$
(
this
).
focus
();
})
.
on
(
'keypress'
,
'tbody td .product_qty_input'
,
function
(
e
)
{
if
(
e
.
which
==
13
)
{
$
(
this
).
focus
();
})
.
on
(
'keypress'
,
'tbody td .product_qty_input'
,
function
(
e
)
{
if
(
e
.
which
==
13
)
{
// Validate on Enter pressed
$
(
this
).
blur
();
}
});
;
$
(
this
).
blur
();
}
})
;
// Associate product to supplier on click on 'X' in the table
$
(
'#products_table'
).
on
(
'click'
,
'tbody .product_not_from_supplier'
,
function
()
{
...
...
This diff is collapsed.
Click to expand it.
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