Fix ordini
This commit is contained in:
Luca
parent
c17f5cf7ff
commit
ac7e43234a
|
|
@ -55,7 +55,7 @@ echo '
|
|||
</body>
|
||||
</html>';
|
||||
|
||||
if ($id_record OR basename($_SERVER["PHP_SELF"])=='controller.php'){
|
||||
if ($id_record OR basename($_SERVER["PHP_SELF"])=='controller.php' OR basename($_SERVER["PHP_SELF"])=='index.php'){
|
||||
unset($_SESSION['infos']);
|
||||
unset($_SESSION['errors']);
|
||||
unset($_SESSION['warnings']);
|
||||
|
|
|
|||
|
|
@ -96,14 +96,17 @@ if (!empty($rs)) {
|
|||
|
||||
<div class="col-md-6">
|
||||
{[ "type": "date", "label": "'.tr('Data del documento').'", "name": "data", "required": 1, "value": "-now-" ]}
|
||||
</div>
|
||||
|
||||
</div>';
|
||||
|
||||
if ($module_name=='Fatture di vendita' || $module_name == 'Fatture di acquisto'){
|
||||
echo '
|
||||
<div class="col-md-6">
|
||||
{[ "type": "select", "label": "'.tr('Sezionale').'", "name": "id_segment", "required": 1, "class": "", "values": "query=SELECT id, name AS descrizione FROM zz_segments WHERE id_module='.prepare(Modules::get($module_name)['id']).' ORDER BY name", "value": "'.$_SESSION['m'.$id_module]['id_segment'].'", "extra": "" ]}
|
||||
</div>
|
||||
|
||||
</div>';
|
||||
{[ "type": "select", "label": "'.tr('Sezionale').'", "name": "id_segment", "required": 1, "class": "", "values": "query=SELECT id, name AS descrizione FROM zz_segments WHERE id_module='.prepare(Modules::get($module_name)['id']).' ORDER BY name", "value": "'.Modules::get($module_name)['id_segment'].'", "extra": "" ]}
|
||||
</div>';
|
||||
}
|
||||
|
||||
echo
|
||||
'</div>';
|
||||
}
|
||||
|
||||
echo '
|
||||
|
|
@ -264,8 +267,9 @@ echo '
|
|||
|
||||
ricalcola_totale();
|
||||
}
|
||||
|
||||
|
||||
function ricalcola_totale(){
|
||||
tot_qta = 0;
|
||||
r = 0;
|
||||
totale = 0.00;
|
||||
$('input[id*=qta_]').each( function(){
|
||||
|
|
@ -288,13 +292,15 @@ echo '
|
|||
totale += subtot*qta+iva*qta;
|
||||
|
||||
r++;
|
||||
|
||||
tot_qta +=qta;
|
||||
});
|
||||
|
||||
$('#totale').html( (totale.toLocale()) + " €" );
|
||||
|
||||
if( qta==0 )
|
||||
$('#submit_btn').hide();
|
||||
else
|
||||
|
||||
if( tot_qta>0 )
|
||||
$('#submit_btn').show();
|
||||
else
|
||||
$('#submit_btn').hide();
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -118,11 +118,11 @@ switch (post('op')) {
|
|||
|
||||
// Ricalcolo inps, ritenuta e bollo (se l'ordine non è stato evaso)
|
||||
if ($dir == 'entrata') {
|
||||
if ($rs[0]['descrizione'] != 'Pagato') {
|
||||
if ($rs[0]['descrizione'] != 'Evaso') {
|
||||
ricalcola_costiagg_ordine($id_record);
|
||||
}
|
||||
} else {
|
||||
if ($rs[0]['descrizione'] != 'Pagato') {
|
||||
if ($rs[0]['descrizione'] != 'Evaso') {
|
||||
ricalcola_costiagg_ordine($id_record, $idrivalsainps, $idritenutaacconto, $bollo);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,13 +103,13 @@ if ($module['name'] == 'Ordini cliente') {
|
|||
<!-- Stampe -->
|
||||
<?php if ($records[0]['stato'] != 'Evaso') {
|
||||
?>
|
||||
<a class="btn btn-sm btn-info" data-href="<?php echo $rootdir; ?>/modules/fatture/crea_documento.php?id_module=<?php echo $id_module; ?>&&id_record=<?php echo $id_record; ?>&documento=ddt" data-toggle="modal" data-title="Crea ddt" data-target="#bs-popup" ><i class="fa fa-magic"></i> Crea ddt da ordine...</i></a>
|
||||
<a class="btn btn-sm btn-info" data-href="<?php echo $rootdir; ?>/modules/fatture/crea_documento.php?id_module=<?php echo $id_module; ?>&id_record=<?php echo $id_record; ?>&documento=fattura" data-toggle="modal" data-title="Crea fattura" data-target="#bs-popup" ><i class="fa fa-magic"></i> Crea fattura da ordine...</i></a>
|
||||
<a class="btn btn-info" data-href="<?php echo $rootdir; ?>/modules/fatture/crea_documento.php?id_module=<?php echo $id_module; ?>&&id_record=<?php echo $id_record; ?>&documento=ddt" data-toggle="modal" data-title="Crea ddt" data-target="#bs-popup" ><i class="fa fa-magic"></i> Crea ddt da ordine...</i></a>
|
||||
<a class="btn btn-info" data-href="<?php echo $rootdir; ?>/modules/fatture/crea_documento.php?id_module=<?php echo $id_module; ?>&id_record=<?php echo $id_record; ?>&documento=fattura" data-toggle="modal" data-title="Crea fattura" data-target="#bs-popup" ><i class="fa fa-magic"></i> Crea fattura da ordine...</i></a>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
{( "name": "button", "type": "print", "id_module": "<?php echo $id_module; ?>", "id_record": "<?php echo $id_record; ?>" )}
|
||||
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<br>
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
include_once __DIR__.'/../../core.php';
|
||||
|
||||
if (isset($id_record)) {
|
||||
// Aggiornamento stato di questo ordine
|
||||
$dbo->query( 'UPDATE or_ordini SET idstatoordine=(SELECT id FROM or_statiordine WHERE descrizione="'.get_stato_ordine($id_record).'") WHERE id='.prepare($id_record) );
|
||||
|
||||
// Aggiornamento stato di questo ordine (?)
|
||||
if (!empty(get_stato_ordine($id_record)))
|
||||
$dbo->query( 'UPDATE or_ordini SET idstatoordine=(SELECT id FROM or_statiordine WHERE descrizione="'.get_stato_ordine($id_record).'") WHERE id='.prepare($id_record) );
|
||||
|
||||
$records = $dbo->fetchArray('SELECT *, or_ordini.note, or_ordini.idpagamento, or_ordini.id AS idordine, or_statiordine.descrizione AS `stato`, or_tipiordine.descrizione AS `descrizione_tipodoc` FROM ((or_ordini LEFT OUTER JOIN or_statiordine ON or_ordini.idstatoordine=or_statiordine.id) INNER JOIN an_anagrafiche ON or_ordini.idanagrafica=an_anagrafiche.idanagrafica) INNER JOIN or_tipiordine ON or_ordini.idtipoordine=or_tipiordine.id WHERE or_ordini.id='.prepare($id_record));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ class Modules
|
|||
|
||||
$user = Auth::user();
|
||||
|
||||
$results = $database->fetchArray('SELECT * FROM `zz_modules` LEFT JOIN (SELECT `idmodule`, `permessi` FROM `zz_permissions` WHERE `idgruppo` = (SELECT `idgruppo` FROM `zz_users` WHERE `id` = '.prepare($user['id_utente']).')) AS `zz_permissions` ON `zz_modules`.`id`=`zz_permissions`.`idmodule` LEFT JOIN (SELECT NULL AS `idsegment`, `idmodule`, `clause`, `position` FROM `zz_group_module` WHERE `idgruppo` = (SELECT `idgruppo` FROM `zz_users` WHERE `id` = '.prepare($user['id_utente']).') AND `enabled` = 1 UNION SELECT `id` AS `idsegment`, `id_module` AS `idmodule`, `clause`, `position` FROM `zz_segments` ) AS `zz_group_module` ON `zz_modules`.`id`=`zz_group_module`.`idmodule`');
|
||||
$results = $database->fetchArray('SELECT * FROM `zz_modules` LEFT JOIN (SELECT `idmodule`, `permessi` FROM `zz_permissions` WHERE `idgruppo` = (SELECT `idgruppo` FROM `zz_users` WHERE `id` = '.prepare($user['id_utente']).')) AS `zz_permissions` ON `zz_modules`.`id`=`zz_permissions`.`idmodule` LEFT JOIN (SELECT NULL AS `id_segment`, `idmodule`, `clause`, `position` FROM `zz_group_module` WHERE `idgruppo` = (SELECT `idgruppo` FROM `zz_users` WHERE `id` = '.prepare($user['id_utente']).') AND `enabled` = 1 UNION SELECT `id` AS `id_segment`, `id_module` AS `idmodule`, `clause`, `position` FROM `zz_segments` ) AS `zz_group_module` ON `zz_modules`.`id`=`zz_group_module`.`idmodule`');
|
||||
|
||||
$modules = [];
|
||||
$additionals = [];
|
||||
|
|
@ -55,8 +55,8 @@ class Modules
|
|||
$result['option'] = empty($result['options2']) ? $result['options'] : $result['options2'];
|
||||
|
||||
if (!empty($result['clause'])) {
|
||||
if($result['idsegment']!=''){
|
||||
if($result['idsegment']==$_SESSION['m'.$result['id']]['id_segment']){
|
||||
if($result['id_segment']!=''){
|
||||
if($result['id_segment']==$_SESSION['m'.$result['id']]['id_segment']){
|
||||
$result['clause'] = App::replacePlaceholder($result['clause']);
|
||||
$additionals[$result['id']][$result['position']][] = $result['clause'];
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue