loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'master' into 2.4.2

This commit is contained in:
Thomas Zilio 2018-07-19 17:48:02 +02:00
parent 11ec680563 370d9f7e8e
commit 5894536ad2
5 changed files with 53 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/articoli/actions.php
View File

@ -7,22 +7,22 @@ switch (post('op')) {
case 'add':
$codice = post('codice');
// Inserisco l'articolo solo se non esiste un altro articolo con stesso codice
if ($dbo->fetchNum('SELECT * FROM mg_articoli WHERE codice='.prepare($codice)) == 0) {
$dbo->insert('mg_articoli', [
'codice' => $codice,
'descrizione' => post('descrizione'),
'id_categoria' => post('categoria'),
'id_sottocategoria' => post('subcategoria'),
'attivo' => 1,
]);
$id_record = $dbo->lastInsertedID();
flash()->info(tr('Aggiunto un nuovo articolo!'));
} else {
flash()->error(tr('Esiste già un articolo con questo codice!'));
// Inserisco l'articolo e avviso se esiste un altro articolo con stesso codice.
if ($dbo->fetchNum('SELECT * FROM mg_articoli WHERE codice='.prepare($codice)) == 1) {
flash()->warning(tr('Esiste già un articolo con questo codice'));
}
$dbo->insert('mg_articoli', [
'codice' => $codice,
'descrizione' => post('descrizione'),
'id_categoria' => post('categoria'),
'id_sottocategoria' => post('subcategoria'),
'attivo' => 1,
]);
$id_record = $dbo->lastInsertedID();
flash()->info(tr('Aggiunto un nuovo articolo'));
break;
// Modifica articolo
@ -111,6 +111,19 @@ switch (post('op')) {
break;
//Duplica articolo
case 'copy':
$dbo->query('CREATE TEMPORARY TABLE tmp SELECT * FROM mg_articoli WHERE id = '.prepare($id_record));
$dbo->query('ALTER TABLE tmp DROP id');
$dbo->query('INSERT INTO mg_articoli SELECT NULL,tmp.* FROM tmp');
$id_record = $dbo->lastInsertedID();
$dbo->query('DROP TEMPORARY TABLE tmp');
$dbo->query('UPDATE mg_articoli SET qta=0 WHERE id='.prepare($id_record));
$_SESSION['infos'][] = tr('Articolo duplicato correttamente!');
break;
// Aggiunta prodotto
case 'addprodotto':
// Per i 3 campi (lotto, serial, altro) leggo i numeri di partenza e arrivo e creo le combinazioni scelte

2
modules/articoli/add.php
View File

@ -22,7 +22,7 @@ unset($_SESSION['superselect']['id_categoria']);
</div>
<div class="col-md-6">
{[ "type": "select", "label": "<?php echo tr('Inserisci la subcategoria:'); ?>", "name": "subcategoria", "id": "subcategoria_add", "ajax-source": "sottocategorie", "icon-after": "add|<?php echo Modules::get('Categorie')['id']; ?>||hide" ]}
{[ "type": "select", "label": "<?php echo tr('Inserisci la sottocategoria:'); ?>", "name": "subcategoria", "id": "subcategoria_add", "ajax-source": "sottocategorie", "icon-after": "add|<?php echo Modules::get('Categorie')['id']; ?>||hide" ]}
</div>
</div>

14
modules/articoli/buttons.php Normal file
View File

@ -0,0 +1,14 @@
<?php
include_once __DIR__.'/../../core.php';
echo '
<form action="" class="text-right" method="post" id="form-copy">
<input type="hidden" name="backto" value="record-edit">
<input type="hidden" name="op" value="copy">
</form>
<button type="button" class="btn btn-primary" onclick="if( confirm(\'Duplicare questo articolo?\') ){ $(\'#form-copy\').submit(); }">
<i class="fa fa-copy"></i> '.tr('Duplica articolo').'
</button>';

2
modules/articoli/edit.php
View File

@ -41,7 +41,7 @@ if (!empty($record['immagine'])) {
<div class="col-md-5">
{[ "type": "checkbox", "label": "<?php echo tr("Seleziona per rendere attivo l'articolo"); ?>", "name": "attivo", "value": "$attivo$", "placeholder": "<?php echo tr('Articolo attivo'); ?>" ]}
<br>
{[ "type": "select", "label": "<?php echo tr('Subcategoria'); ?>", "name": "subcategoria", "value": "$id_sottocategoria$", "ajax-source": "sottocategorie" ]}
{[ "type": "select", "label": "<?php echo tr('Sottocategoria'); ?>", "name": "subcategoria", "value": "$id_sottocategoria$", "ajax-source": "sottocategorie" ]}
</div>
</div>
<div class="row">

10
update/2_4_1.sql
View File

@ -423,6 +423,11 @@ UPDATE `zz_views` SET `query` = REPLACE(
REPLACE(`query`, 'deleted=0', '`deleted_at` IS NULL')
, 'deleted = 0', '`deleted_at` IS NULL')
, '`deleted` = 0', '`deleted_at` IS NULL');
UPDATE `zz_settings` SET `tipo` = REPLACE(
REPLACE(
REPLACE(`tipo`, 'deleted=0', '`deleted_at` IS NULL')
, 'deleted = 0', '`deleted_at` IS NULL')
, '`deleted` = 0', '`deleted_at` IS NULL');
UPDATE `zz_widgets` SET `query` = REPLACE(
REPLACE(
@ -448,6 +453,11 @@ UPDATE `zz_views` SET `query` = REPLACE(
REPLACE(`query`, 'deleted=1', '`deleted_at` IS NOT NULL')
, 'deleted = 1', '`deleted_at` IS NOT NULL')
, '`deleted` = 1', '`deleted_at` IS NOT NULL');
UPDATE `zz_settings` SET `tipo` = REPLACE(
REPLACE(
REPLACE(`tipo`, 'deleted=1', '`deleted_at` IS NOT NULL')
, 'deleted = 1', '`deleted_at` IS NOT NULL')
, '`deleted` = 1', '`deleted_at` IS NOT NULL');
-- Fix id delle Banche
UPDATE `zz_views` SET `enabled` = 0 WHERE `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Banche') AND `name` = 'id';