Skip to content

Commit d665617

Browse files
BeppeJQBeppeJQ
committed
feat: Gestione barcode multipli articolo sui documenti
1 parent 3e3ca73 commit d665617

20 files changed

Lines changed: 35 additions & 81 deletions

File tree

‎modules/contratti/actions.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@
609609
$dir = 'entrata';
610610

611611
if (!empty($barcode)) {
612-
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => $barcode])['id'];
612+
$id_articolo = $dbo->selectOne('mg_articoli_barcode', 'idarticolo', ['barcode' => $barcode])['idarticolo'];
613613
if (empty($id_articolo)) {
614614
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => '', 'codice' => $barcode])['id'];
615615
}
@@ -625,6 +625,7 @@
625625
$qta = 1;
626626

627627
$articolo->um = $originale->um;
628+
$articolo->barcode = $barcode;
628629
$articolo->qta = 1;
629630
$articolo->costo_unitario = $originale->prezzo_acquisto;
630631

‎modules/contratti/edit.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -515,16 +515,6 @@ function caricaRighe(id_riga) {
515515
$("#data_rifiuto").trigger("dp.change");
516516
517517
$("#id_articolo").on("change", function(e) {
518-
if ($(this).val()) {
519-
var data = $(this).selectData();
520-
521-
if (data.barcode) {
522-
$("#barcode").val(data.barcode);
523-
} else {
524-
$("#barcode").val("");
525-
}
526-
}
527-
528518
e.preventDefault();
529519
530520
setTimeout(function(){

‎modules/contratti/row-list.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@
116116
}
117117
}
118118

119-
if ($riga->isArticolo() && !empty($riga->articolo->barcode)) {
119+
if ($riga->isArticolo() && !empty($riga->barcode)) {
120120
echo '
121-
<br><small><i class="fa fa-barcode"></i> '.$riga->articolo->barcode.'</small>';
121+
<br><small><i class="fa fa-barcode"></i> '.$riga->barcode.'</small>';
122122
}
123123

124124
if (!empty($riga->note)) {

‎modules/ddt/actions.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@
567567
$barcode = post('barcode');
568568

569569
if (!empty($barcode)) {
570-
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => $barcode])['id'];
570+
$id_articolo = $dbo->selectOne('mg_articoli_barcode', 'idarticolo', ['barcode' => $barcode])['idarticolo'];
571571
if (empty($id_articolo)) {
572572
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => '', 'codice' => $barcode])['id'];
573573
}
@@ -587,6 +587,7 @@
587587
$qta = 1;
588588

589589
$articolo->um = $originale->um;
590+
$articolo->barcode = $barcode;
590591
$articolo->qta = 1;
591592
$articolo->costo_unitario = $originale->prezzo_acquisto;
592593

‎modules/ddt/edit.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -579,16 +579,6 @@ function caricaRighe(id_riga) {
579579
});
580580
581581
$("#id_articolo").on("change", function(e) {
582-
if ($(this).val()) {
583-
var data = $(this).selectData();
584-
585-
if (data.barcode) {
586-
$("#barcode").val(data.barcode);
587-
} else {
588-
$("#barcode").val("");
589-
}
590-
}
591-
592582
e.preventDefault();
593583
594584
setTimeout(function(){

‎modules/ddt/row-list.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@
121121
}
122122
}
123123

124-
if ($riga->isArticolo() && !empty($riga->articolo->barcode)) {
124+
if ($riga->isArticolo() && !empty($riga->barcode)) {
125125
echo '
126-
<br><small><i class="fa fa-barcode"></i> '.$riga->articolo->barcode.'</small>';
126+
<br><small><i class="fa fa-barcode"></i> '.$riga->barcode.'</small>';
127127
}
128128

129129
if (!empty($riga->note)) {

‎modules/fatture/actions.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@
10191019
$barcode = post('barcode');
10201020

10211021
if (!empty($barcode)) {
1022-
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => $barcode])['id'];
1022+
$id_articolo = $dbo->selectOne('mg_articoli_barcode', 'idarticolo', ['barcode' => $barcode])['idarticolo'];
10231023
if (empty($id_articolo)) {
10241024
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => '', 'codice' => $barcode])['id'];
10251025
}
@@ -1039,6 +1039,7 @@
10391039
$qta = 1;
10401040

10411041
$articolo->um = $originale->um;
1042+
$articolo->barcode = $barcode;
10421043
$articolo->qta = 1;
10431044
$articolo->costo_unitario = $originale->prezzo_acquisto;
10441045

‎modules/fatture/edit.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,16 +1148,6 @@ function caricaRighe(id_riga) {
11481148
});
11491149
11501150
$("#id_articolo").on("change", function(e) {
1151-
if ($(this).val()) {
1152-
var data = $(this).selectData();
1153-
1154-
if (data.barcode) {
1155-
$("#barcode").val(data.barcode);
1156-
} else {
1157-
$("#barcode").val("");
1158-
}
1159-
}
1160-
11611151
e.preventDefault();
11621152
11631153
setTimeout(function(){

‎modules/fatture/row-list.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@
180180
}
181181
}
182182

183-
if ($riga->isArticolo() && !empty($riga->articolo->barcode)) {
183+
if ($riga->isArticolo() && !empty($riga->barcode)) {
184184
echo '
185-
<br><small><i class="fa fa-barcode"></i> '.$riga->articolo->barcode.'</small>';
185+
<br><small><i class="fa fa-barcode"></i> '.$riga->barcode.'</small>';
186186
}
187187

188188
if (!empty($riga->note)) {

‎modules/interventi/actions.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@
11871187
$dir = 'entrata';
11881188

11891189
if (!empty($barcode)) {
1190-
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => $barcode])['id'];
1190+
$id_articolo = $dbo->selectOne('mg_articoli_barcode', 'idarticolo', ['barcode' => $barcode])['idarticolo'];
11911191
if (empty($id_articolo)) {
11921192
$id_articolo = $dbo->selectOne('mg_articoli', 'id', ['deleted_at' => null, 'attivo' => 1, 'barcode' => '', 'codice' => $barcode])['id'];
11931193
}
@@ -1207,6 +1207,7 @@
12071207
$qta = 1;
12081208

12091209
$articolo->um = $originale->um;
1210+
$articolo->barcode = $barcode;
12101211
$articolo->qta = 1;
12111212
$articolo->costo_unitario = $originale->prezzo_acquisto;
12121213

0 commit comments

Comments
 (0)