Skip to content

Commit 3095643

Browse files
maulapimaulapi
committed
Aggiunta al Modulo Ubicazioni file modificati
1 parent a0fa0a0 commit 3095643

2 files changed

Lines changed: 51 additions & 35 deletions

File tree

‎modules/articoli/add.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</div>
6060

6161
<div class="col-md-3">
62-
{[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello", "id": "id_modello_add", "ajax-source": "modelli", "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>|id_original=0|hide" ]}
62+
{[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello", "id": "id_modello_add", "ajax-source": "modelli", "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>||hide" ]}
6363
</div>
6464
</div>
6565

@@ -137,6 +137,12 @@
137137
<input type="hidden" name="aliquota_predefinita" value="<?php echo $aliquota_predefinita; ?>">
138138
</div>
139139
</div>
140+
<!--aggiungo scelta dell'Ubicazione in fase di creazione Nuovo Articolo di Magazzino-->
141+
<div class="row">
142+
<div class="col-md-4">
143+
{[ "type": "select", "label": "<?php echo tr('Ubicazione'); ?>", "name": "ubicazione", "value": "$ubicazione$", "ajax-source": "ubicaz", "icon-after": "add|<?php echo Module::where('name', 'ubicazioni')->first()->id; ?>" ]}
144+
</div>
145+
</div>
140146
</div>
141147
</div>
142148

@@ -191,11 +197,6 @@
191197
}
192198
});
193199

194-
// Nascondi il pulsante modello se non c'è una marca selezionata all'inizio
195-
if(!$('#add-form').find('#id_marca').val()) {
196-
modello.parent().find(".input-group-append button").addClass("hide");
197-
}
198-
199200
input("coefficiente").on('keyup', function(){
200201
if (iva_vendita.val()) {
201202
percentuale = parseFloat(iva_vendita.selectData().percentuale);

‎modules/articoli/edit.php‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,19 @@
4545

4646
<div class="col-md-9">
4747
<div class="row">
48-
<div class="col-md-4">
48+
<div class="col-md-3">
4949
{[ "type": "text", "label": "<?php echo tr('Codice'); ?>", "name": "codice", "required": 1, "value": "$codice$", "validation": "codice" ]}
5050
</div>
5151

52-
<div class="col-md-4">
52+
<div class="col-md-3">
53+
<button type="button" class="btn btn-default btn-xs tip pull-right" id="generaBarcode"><i class="fa fa-refresh"></i> <?php echo tr('Genera'); ?></button>
54+
{[ "type": "text", "label": "<?php echo tr('Barcode'); ?>", "name": "barcode", "validation": "barcode", "class": "text-center", "value": "$barcode$" ]}
55+
</div>
56+
57+
<div class="col-md-3">
5358
{[ "type": "checkbox", "label": "<?php echo tr('Questo articolo è un servizio'); ?>", "name": "servizio", "value": "$servizio$", "help": "<?php echo tr('Le quantità non saranno considerate.'); ?>", "placeholder": "<?php echo tr('Servizio'); ?>" ]}
5459
</div>
55-
<div class="col-md-4">
60+
<div class="col-md-3">
5661
{[ "type": "checkbox", "label": "<?php echo tr('Attivo'); ?>", "name": "attivo", "help": "<?php echo tr('Seleziona per rendere attivo l\'articolo'); ?>", "value": "$attivo$", "placeholder": "<?php echo tr('Articolo attivo'); ?>" ]}
5762
</div>
5863
</div>
@@ -61,20 +66,20 @@
6166
<div class="col-md-3">
6267
<?php echo (!empty($record['id_categoria'])) ?
6368
Modules::link('Categorie', $record['id_categoria'], null, null, 'class="pull-right"') : ''; ?>
64-
{[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "categoria_edit", "id": "categoria_edit", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>" ]}
69+
{[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>" ]}
6570
</div>
6671

6772
<div class="col-md-3">
68-
{[ "type": "select", "label": "<?php echo tr('Sottocategoria'); ?>", "name": "subcategoria_edit", "id": "subcategoria_edit", "value": "$id_sottocategoria$", "ajax-source": "sottocategorie", "select-options": <?php echo json_encode(['id_categoria' => $record['id_categoria']]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>|id_original=<?php echo $record['id_categoria']; ?>" ]}
73+
{[ "type": "select", "label": "<?php echo tr('Sottocategoria'); ?>", "name": "subcategoria", "value": "$id_sottocategoria$", "ajax-source": "sottocategorie", "select-options": <?php echo json_encode(['id_categoria' => $record['id_categoria']]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Categorie')->first()->id; ?>|id_original=<?php echo $record['id_categoria']; ?>" ]}
6974
</div>
7075

7176
<div class="col-md-3">
7277
<?php echo !empty($record['id_marca']) ? Modules::link('Marche', $record['id_marca'], null, null, 'class="pull-right"') : ''; ?>
73-
{[ "type": "select", "label": "<?php echo tr('Marca'); ?>", "name": "id_marca_edit", "id": "id_marca_edit", "value":"$id_marca$", "ajax-source": "marche", "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>" ]}
78+
{[ "type": "select", "label": "<?php echo tr('Marca'); ?>", "name": "id_marca", "value":"$id_marca$", "ajax-source": "marche", "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>" ]}
7479
</div>
7580
<div class="col-md-3">
7681
<?php echo !empty($record['id_modello']) ? Modules::link('Marche', $record['id_modello'], null, null, 'class="pull-right"') : ''; ?>
77-
{[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello_edit", "id": "id_modello_edit", "value":"$id_modello$", "ajax-source": "modelli", "select-options": <?php echo json_encode(['id_marca' => $record['id_marca']]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>|id_original=<?php echo $record['id_marca']; ?>" ]}
82+
{[ "type": "select", "label": "<?php echo tr('Modello'); ?>", "name": "id_modello", "value":"$id_modello$", "ajax-source": "modelli", "select-options": <?php echo json_encode(['id_marca' => $record['id_marca']]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Marche')->first()->id; ?>|id_original=<?php echo $record['id_marca']; ?>" ]}
7883
</div>
7984
</div>
8085
<div class="row">
@@ -97,8 +102,11 @@
97102
<div class="col-md-4">
98103
{[ "type": "checkbox", "label": "<?php echo tr('Abilita serial number'); ?>", "name": "abilita_serial", "value": "$abilita_serial$", "help": "<?php echo tr('Abilita serial number in fase di aggiunta articolo in fattura o ddt'); ?>", "placeholder": "<?php echo tr('Serial number'); ?>", "extra": "<?php echo ($record['serial'] > 0) ? 'readonly' : ''; ?>" ]}
99104
</div>
100-
<div class="col-md-4">
105+
<!--<div class="col-md-4">
101106
{[ "type": "text", "label": "<?php echo tr('Ubicazione'); ?>", "name": "ubicazione", "value": "$ubicazione$" ]}
107+
</div>-->
108+
<div class="col-md-4">
109+
{[ "type": "select", "label": "<?php echo tr('Ubicazione'); ?>", "name": "ubicazione", "value": "$ubicazione$", "ajax-source": "ubicaz", "icon-after": "add|<?php echo Module::where('name', 'ubicazioni')->first()->id; ?>" ]}
102110
</div>
103111

104112
<div class="col-md-4">
@@ -338,45 +346,30 @@
338346
});
339347
});
340348

341-
$("#categoria_edit").change(function() {
349+
$("#categoria").change(function() {
342350
updateSelectOption("id_categoria", $(this).val());
343351

344-
$("#subcategoria_edit").val(null).trigger("change");
345-
346-
// Gestione del pulsante "aggiungi" per sottocategoria
347-
var sub = $("#subcategoria_edit");
348-
var button = sub.parent().find(".input-group-append button");
349-
350-
if($(this).val()) {
351-
button.removeClass("hide");
352-
var original = button.attr("onclick");
353-
if(original && original.indexOf("id_original=") !== -1) {
354-
var newOnclick = original.replace(/id_original=\d+/, "id_original=" + $(this).val());
355-
button.attr("onclick", newOnclick);
356-
}
357-
} else {
358-
button.addClass("hide");
359-
}
352+
$("#subcategoria").val(null).trigger("change");
360353
});
361354

362355
// Gestione del cambio marca per aggiornare i modelli
363-
$("#id_marca_edit").change(function() {
356+
$("#id_marca").change(function() {
364357
updateSelectOption("id_marca", $(this).val());
365358

366359
// Reset del modello
367-
$("#id_modello_edit").val(null).trigger("change");
360+
$("#id_modello").val(null).trigger("change");
368361

369362
// Aggiornamento dell'icona "aggiungi" per il modello
370363
if($(this).val()) {
371-
var button = $("#id_modello_edit").parent().find(".input-group-append button");
364+
var button = $("#id_modello").parent().find(".input-group-append button");
372365
var original = button.attr("onclick");
373366
if(original) {
374367
var newOnclick = original.replace(/id_original=\d+/, "id_original=" + $(this).val());
375368
button.attr("onclick", newOnclick);
376369
button.removeClass("hide");
377370
}
378371
} else {
379-
$("#id_modello_edit").parent().find(".input-group-append button").addClass("hide");
372+
$("#id_modello").parent().find(".input-group-append button").addClass("hide");
380373
}
381374
});
382375

@@ -393,6 +386,28 @@ function scorporaIva() {
393386
scorporaIva();
394387
});
395388

389+
function generaBarcode() {
390+
$.ajax({
391+
url: globals.rootdir + "/actions.php",
392+
type: "POST",
393+
data: {
394+
id_module: globals.id_module,
395+
id_record: globals.id_record,
396+
op: "generate-barcode"
397+
},
398+
success: function(response) {
399+
response = JSON.parse(response);
400+
let input = $("#barcode");
401+
input.val(response.barcode);
402+
},
403+
error: function(xhr, status, error) {
404+
}
405+
});
406+
}
407+
408+
$("#generaBarcode").click( function() {
409+
generaBarcode();
410+
});
396411
</script>
397412

398413

0 commit comments

Comments
 (0)