Compare commits

..

5 Commits

Author SHA1 Message Date
valentina 16872a5068 Miglioria grafica minore 2024-06-28 14:57:46 +02:00
valentina 67a39764a0 Fix minore 2024-06-28 14:38:45 +02:00
valentina 01889d6321 Fix 2024-06-28 13:04:50 +02:00
valentina 4d63b67023 Fix colore link 2024-06-28 12:58:28 +02:00
valentina d4a8ffc504 Fix minore 2024-06-28 11:46:25 +02:00
4 changed files with 14 additions and 5 deletions

View File

@ -30,6 +30,14 @@
url('../fonts/sourcesanspro-regular-webfont.svg') format('svg'); url('../fonts/sourcesanspro-regular-webfont.svg') format('svg');
} }
.li-widget > a {
color: #333;
}
.li-widget > a:hover {
color: #000;
}
.preloader{ .preloader{
background-color: #f4f6f9de ; background-color: #f4f6f9de ;
} }

View File

@ -104,7 +104,7 @@ if (setting('Cambia automaticamente stato ddt fatturati')) {
$id_stato_fatt = Stato::where('name', 'Fatturato')->first()->id; $id_stato_fatt = Stato::where('name', 'Fatturato')->first()->id;
$id_stato_parz_fatt = Stato::where('name', 'Parzialmente fatturato')->first()->id; $id_stato_parz_fatt = Stato::where('name', 'Parzialmente fatturato')->first()->id;
if ($ordine->stato->id == $id_stato_fatt || $ordine->stato->id == $id_stato_parz_fatt) { if ($ddt->stato->id == $id_stato_fatt || $ddt->stato->id == $id_stato_parz_fatt) {
echo ' echo '
{[ "type": "select", "label": "'.tr('Stato').'", "name": "idstatoddt", "required": 1, "values": "query=SELECT `dt_statiddt`.*, `dt_statiddt_lang`.`title` as descrizione, `colore` AS _bgcolor_ FROM `dt_statiddt` LEFT JOIN `dt_statiddt_lang` ON (`dt_statiddt`.`id` = `dt_statiddt_lang`.`id_record` AND `dt_statiddt_lang`.`id_lang`= '.prepare(Models\Locale::getDefault()->id).') ORDER BY `title`", "value": "$idstatoddt$", "extra": "readonly", "class": "unblockable" ]}'; {[ "type": "select", "label": "'.tr('Stato').'", "name": "idstatoddt", "required": 1, "values": "query=SELECT `dt_statiddt`.*, `dt_statiddt_lang`.`title` as descrizione, `colore` AS _bgcolor_ FROM `dt_statiddt` LEFT JOIN `dt_statiddt_lang` ON (`dt_statiddt`.`id` = `dt_statiddt_lang`.`id_record` AND `dt_statiddt_lang`.`id_lang`= '.prepare(Models\Locale::getDefault()->id).') ORDER BY `title`", "value": "$idstatoddt$", "extra": "readonly", "class": "unblockable" ]}';
} else { } else {

View File

@ -50,7 +50,7 @@ $id_anagrafica = $documento_finale->idanagrafica;
echo ' echo '
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
{[ "type": "select", "label": "'.tr('Ddt').'", "name": "id_documento", "values": "query=SELECT `dt_ddt`.`id`, CONCAT(\'DDT num. \', IF(`numero_esterno` != \'\', `numero_esterno`, `numero`), \' del \', DATE_FORMAT(`data`, \'%d-%m-%Y\'), \' [\', `dt_statiddt_lang`.`title`, \']\') AS descrizione FROM `dt_ddt` LEFT JOIN `dt_causalet` ON `dt_causalet`.`id` = `dt_ddt`.`idcausalet` INNER JOIN `dt_statiddt` ON `dt_ddt`.`idstatoddt` = `dt_statiddt`.`id` LEFT JOIN `dt_statiddt_lang` ON (`dt_statiddt`.`id` = `dt_statiddt_lang`.`id_record` AND `dt_statiddt_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `dt_tipiddt` ON `dt_ddt`.`idtipoddt` = `dt_tipiddt`.`id` INNER JOIN `dt_righe_ddt ON `dt_ddt`.`id` = `dt_righe_ddt`.`idddt` WHERE `idanagrafica`='.prepare($id_anagrafica).' AND `dt_statiddt_lang`.`title` IN("Evaso", "Parzialmente evaso", "Parzialmente fatturato") AND `dt_tipiddt`.`dir`='.prepare($dir).' AND `dt_causalet`.`is_importabile` = 1 AND (`dt_righe_ddt`.`qta` - `dt_righe_ddt`.`qta_evasa`) > 0 ORDER BY `data` DESC, `numero` DESC" ]} {[ "type": "select", "label": "'.tr('Ddt').'", "name": "id_documento", "values": "query=SELECT `dt_ddt`.`id`, CONCAT(\'DDT num. \', IF(`numero_esterno` != \'\', `numero_esterno`, `numero`), \' del \', DATE_FORMAT(`data`, \'%d-%m-%Y\'), \' [\', `dt_statiddt_lang`.`title`, \']\') AS descrizione FROM `dt_ddt` LEFT JOIN `dt_causalet` ON `dt_causalet`.`id` = `dt_ddt`.`idcausalet` INNER JOIN `dt_statiddt` ON `dt_ddt`.`idstatoddt` = `dt_statiddt`.`id` LEFT JOIN `dt_statiddt_lang` ON (`dt_statiddt`.`id` = `dt_statiddt_lang`.`id_record` AND `dt_statiddt_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `dt_tipiddt` ON `dt_ddt`.`idtipoddt` = `dt_tipiddt`.`id` INNER JOIN `dt_righe_ddt` ON `dt_ddt`.`id` = `dt_righe_ddt`.`idddt` WHERE `idanagrafica`='.prepare($id_anagrafica).' AND `dt_statiddt_lang`.`title` IN(\'Evaso\', \'Parzialmente evaso\', \'Parzialmente fatturato\') AND `dt_tipiddt`.`dir`='.prepare($dir).' AND `dt_causalet`.`is_importabile` = 1 AND (`dt_righe_ddt`.`qta` - `dt_righe_ddt`.`qta_evasa`) > 0 GROUP BY `dt_ddt`.`id` ORDER BY `data` DESC, `numero` DESC" ]}
</div> </div>
</div> </div>

View File

@ -50,6 +50,7 @@ for ($i = intval(date('Y')) - 1; $i <= intval(date('Y')) + 10; ++$i) {
echo ' </select> echo ' </select>
</div> </div>
</div> </div>
<br>
<div class="div-month row">'; <div class="div-month row">';
for ($i = 1; $i <= 12; ++$i) { for ($i = 1; $i <= 12; ++$i) {
$btnType = ($i == date('m')) ? 'btn-primary' : ''; $btnType = ($i == date('m')) ? 'btn-primary' : '';
@ -243,11 +244,11 @@ function update_month(currentMonth, currentYear) {
$div.html(""); $div.html("");
for (var i=1; i<=12; i++) { for (var i=1; i<=12; i++) {
$template.find("a").attr("data-month", i); $template.find("a").attr("data-month", i);
$template.find(".text").html("<small>" + mesi[i] + "</small>"); $template.find(".text").html(mesi[i]);
if (typeof data[i] === "undefined") { if (typeof data[i] === "undefined") {
$template.find(".text-count").html("<small>(0)</small>"); $template.find(".text-count").html("(0)");
} else { } else {
$template.find(".text-count").html("<small>(" + data[i] + ")</small>"); $template.find(".text-count").html("(" + data[i] + ")");
} }
if (i == parseInt(currentMonth)) { if (i == parseInt(currentMonth)) {
$template.find("a").addClass("btn-primary"); $template.find("a").addClass("btn-primary");