loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-01-19 10:40:33 +01:00
Code Issues Releases Activity

Merge branch 'master' of https://github.com/devcode-it/openstamanager

Browse Source
This commit is contained in:
MatteoPistorello 2022-07-07 17:28:23 +02:00
commit 2f8327a497
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -315,7 +315,7 @@ function hotkeys() {
function chartjs() {
return gulp.src([
config.nodeDirectory + '/chart.js/dist/Chart.min.js',
config.nodeDirectory + '/chart.js/dist/chart.min.js',
])
.pipe(flatten())
.pipe(gulp.dest(config.production + '/' + config.paths.js + '/chartjs'));

2
modules/statistiche/edit.php
View File

@ -22,7 +22,7 @@ include_once __DIR__.'/../../core.php';
use Modules\Statistiche\Stats;
echo '
<script src="'.base_path().'/assets/dist/js/chartjs/Chart.min.js"></script>
<script src="'.base_path().'/assets/dist/js/chartjs/chart.min.js"></script>
<script src="'.$structure->fileurl('js/functions.js').'"></script>
<script src="'.$structure->fileurl('js/calendar.js').'"></script>
<script src="'.$structure->fileurl('js/manager.js').'"></script>

4
modules/stato_servizi/edit.php
View File

@ -155,8 +155,8 @@ if (Services::isEnabled()) {
echo '
<tr class="'.($scadenza->lessThan(Carbon::now()) ? 'danger' : ($scadenza->lessThan($limite_scadenze) ? 'warning' : '')).'">
<td>'.$servizio['name'].'</td>
<td>'.(($servizio['credits'] < 100 && $servizio['credits'] !== null) ? '<b><i class="fa fa-icon fa-warning text-warning" ></i> ' : '').(($servizio['credits'] !== null) ? $servizio['credits'] : '-').(($servizio['credits'] < 100 && $servizio['credits'] !== null) ? '</b>' : '').'</td>
<td>'.((Carbon::now()->diffInDays($scadenza, false) < $days && $scadenza) ? '<b><i class="fa fa-icon fa-warning text-warning" ></i> ' : '').dateFormat($scadenza).' ('.$scadenza->diffForHumans().')'.((Carbon::now()->diffInDays($scadenza, false) < $days && $scadenza) ? '</b>' : '').'</td>
<td>'.(($servizio['credits'] < 100 && $servizio['credits'] !== null) ? '<b><i class="fa fa-warning text-warning" ></i> ' : '').(($servizio['credits'] !== null) ? $servizio['credits'] : '-').(($servizio['credits'] < 100 && $servizio['credits'] !== null) ? '</b>' : '').'</td>
<td>'.((Carbon::now()->diffInDays($scadenza, false) < $days && $scadenza) ? '<b><i class="fa fa-warning text-warning" ></i> ' : '').dateFormat($scadenza).' ('.$scadenza->diffForHumans().')'.((Carbon::now()->diffInDays($scadenza, false) < $days && $scadenza) ? '</b>' : '').'</td>
</tr>';
}

2
modules/stato_servizi/widgets/spazio_utilizzato.php
View File

@ -22,7 +22,7 @@ include_once __DIR__.'/../../../core.php';
$module = Modules::get('Stato dei servizi');
echo '
<script src="'.base_path().'/assets/dist/js/chartjs/Chart.min.js"></script>';
<script src="'.base_path().'/assets/dist/js/chartjs/chart.min.js"></script>';
// Operazioni JavaScript
echo '

7
plugins/exportFE/src/FatturaElettronica.php
View File

@ -1582,8 +1582,13 @@ class FatturaElettronica
$co_pagamenti = $database->fetchOne('SELECT * FROM `co_pagamenti` WHERE `id` = '.prepare($documento['idpagamento']));
/**
* TP01 - A Rate
* TP02 - Unica Soluzione
* TP03 - Anticipato
*/
$result = [
'CondizioniPagamento' => ($co_pagamenti['prc'] == 100) ? 'TP02' : 'TP01',
'CondizioniPagamento' => ($co_pagamenti['prc'] < 100) ? 'TP01' : 'TP02',
];
$co_scadenziario = $database->fetchArray('SELECT * FROM `co_scadenziario` WHERE `iddocumento` = '.prepare($documento['id']));