diff --git a/public_html/gest-lib/inventario/include/main.php b/public_html/gest-lib/inventario/include/main.php
index ccd753810..43059cfa8 100644
--- a/public_html/gest-lib/inventario/include/main.php
+++ b/public_html/gest-lib/inventario/include/main.php
@@ -47,6 +47,7 @@
foreach ($arr_rows as $row) {
$idInventario = array_get($row, "idInventario");
$dataInventario = array_get($row, "dataInventario");
+ $dataOraInv = array_get($row, "dataOraInv");
$filtro = array_get($row, "filtro");
$codMdep = array_get($row, "codMdep");
$numRighe = array_get($row, "numRighe");
@@ -55,6 +56,7 @@
">
diff --git a/public_html/gest-lib/inventario/js/main.js b/public_html/gest-lib/inventario/js/main.js
index 9cdc267b5..09f9134d9 100644
--- a/public_html/gest-lib/inventario/js/main.js
+++ b/public_html/gest-lib/inventario/js/main.js
@@ -40,12 +40,14 @@ $(function () {
const idInventario = $tr.getAttr("data-idInventario");
const codMdep = $tr.getAttr("data-codMdep");
const dataInventario = $tr.getAttr("data-dataInventario");
+ const dataOraInv = $tr.getAttr("data-dataOraInv");
const profileDb = $tr.getAttr("data-profileDb");
const key = {
idInventario,
codMdep,
dataInventario,
+ dataOraInv,
profileDb,
}
@@ -176,9 +178,11 @@ const _inventario = {
const idInventario = key.idInventario;
const codMdep = key.codMdep;
const today = moment().startOf("day").unix();
- const unixDataInv = moment(key.dataInventario, "DD/MM/YYYY").unix();
+ const unixDataInv = key?.dataOraInv ? moment(key.dataOraInv, "DD/MM/YYYY").unix() : null;
- key.isInventarioGiorno = today === unixDataInv;
+ if (unixDataInv) {
+ key.isInventarioGiorno = today === unixDataInv;
+ }
ajax.get("popup-invenr")
.data(key)
@@ -193,8 +197,7 @@ const _inventario = {
const modalBoxPopup = new ModalBox();
if (_USER.is_puntoVendita() || !key.isInventarioGiorno) {
- modalBoxPopup
- .closeOnly()
+ modalBoxPopup.closeOnly();
} else {
modalBoxPopup
.okClose()
@@ -209,7 +212,6 @@ const _inventario = {
modalBoxPopup.close();
modalBoxWait.close();
});
-
}
})
}
diff --git a/public_html/gest-lib/inventario/sql/invenr.sql b/public_html/gest-lib/inventario/sql/invenr.sql
deleted file mode 100644
index 480b0a0b6..000000000
--- a/public_html/gest-lib/inventario/sql/invenr.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-SELECT mtb_invenr.cod_mart,
- CASE
- WHEN mtb_invenr.cod_mart IS NULL THEN 'ARTICOLO NON RICONOSCIUTO ' + scan_cod_barre
- ELSE descrizione END AS descrizione,
- qta_inv,
- unt_mis,
- id_riga,
- data_ora_inv,
- cod_tagl,
- cod_col,
- ISNULL(id_disp, '[np_value]') AS id_disp,
- ISNULL(zona, '[np_value]') AS zona
-FROM mtb_invenr
- LEFT OUTER JOIN mtb_aart ON mtb_invenr.cod_mart = mtb_aart.cod_mart
-WHERE id_inventario = [id_inventario]
- AND cod_mdep = '[cod_mdep]'
-ORDER BY zona, id_disp + 0, data_ora_inv, id_riga
\ No newline at end of file
diff --git a/public_html/gest-lib/inventario/sql/invent.sql b/public_html/gest-lib/inventario/sql/invent.sql
deleted file mode 100644
index 5ea06a668..000000000
--- a/public_html/gest-lib/inventario/sql/invent.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT id_inventario,
- data_inventario,
- filtro,
- cod_mdep,
- (SELECT COUNT(*)
- FROM mtb_invenr
- WHERE mtb_invent.id_inventario = mtb_invenr.id_inventario
- AND mtb_invent.cod_mdep = mtb_invenr.cod_mdep) AS num_righe
-FROM mtb_invent
-WHERE data_inventario >= DATEADD(YEAR, -5, GETDATE())
\ No newline at end of file
diff --git a/public_html/gest-lib/ordini_a_riass_clie/js/filtroArticoli.js b/public_html/gest-lib/ordini_a_riass_clie/js/filtroArticoli.js
index 14484a3e1..849f08c27 100644
--- a/public_html/gest-lib/ordini_a_riass_clie/js/filtroArticoli.js
+++ b/public_html/gest-lib/ordini_a_riass_clie/js/filtroArticoli.js
@@ -374,10 +374,12 @@ const _ordiniARiassClie_filtroArticoli = {
},
getLineeCambioMerce: function () {
- var self = this;
+ const self = this;
+
if (_ordiniARiassClie.righeOrdine.length > 0) {
- var codLine = _ordiniARiassClie.righeOrdine[0].cod_line;
- var linea = self.getLinea(codLine);
+ const codLine = _ordiniARiassClie.righeOrdine[0].cod_line;
+ const linea = self.getLinea(codLine);
+
if (is_null(linea)) {
new ModalBox()
.message("La linea " + codLine + " non รจ valida.
Contattare l'azienda per le opportune verifiche.")
@@ -385,11 +387,13 @@ const _ordiniARiassClie_filtroArticoli = {
_URL.replace(_URL.current.removeParameter("k")).reload();
})
.danger().show();
+
return;
}
return (!is_null(linea.linee_cambio_merce) && !_.isEmpty(linea.linee_cambio_merce.trim())) ? linea.linee_cambio_merce.trim().split("|") : [];
}
+
return [];
},
@@ -416,10 +420,11 @@ const _ordiniARiassClie_filtroArticoli = {
},
getLinea: function (codLine) {
- var self = this;
- var result = Enumerable.From(self.listLinee).Where(function (x) {
- return x.cod_line == codLine;
+ const self = this;
+ const result = Enumerable.From(self.listLinee).Where(function (x) {
+ return x.cod_line === codLine;
}).ToArray();
+
return result.length > 0 ? result[0] : null;
},
@@ -514,16 +519,18 @@ const _ordiniARiassClie_filtroArticoli = {
},
refreshArticoli: function () {
- var self = this;
+ const self = this;
+ const filter = {};
- var filter = {};
$("#flt-articoli input, #flt-articoli select").each(function () {
- var $input = $(this);
- var key = $input.attr("id");
- var value = $input.getValue();
+ const $input = $(this);
+ const key = $input.attr("id");
+ let value = $input.getValue();
+
if ($input.is_inputCheckbox()) {
value = $input.prop("checked");
}
+
filter[key] = value;
});
diff --git a/public_html/js/ModalArtTagCol.js b/public_html/js/ModalArtTagCol.js
index 0e6bd4a2f..6a8e08eeb 100644
--- a/public_html/js/ModalArtTagCol.js
+++ b/public_html/js/ModalArtTagCol.js
@@ -1063,7 +1063,6 @@ ModalArtTagCol.prototype._setRowPrices = function () {
return x.cod_tagl === codTagl;
})
.Select(function (x) {
- console.log(x.price);
if (x.perc_sco1 > 0 || x.perc_sco2 > 0) {
return `€${x.price.toFixed(2)} €${((x.price * (100 - (x.perc_sco1 || 0)) / 100) * ((100 - (x.perc_sco2 || 0)) / 100)).toFixed(2)}`
} else {