Ajustando relatorio de movimentações
This commit is contained in:
parent
23e838eb4e
commit
290a2f4705
2 changed files with 13 additions and 2 deletions
1
vendor/model/FinancialMovements.class.php
vendored
1
vendor/model/FinancialMovements.class.php
vendored
|
|
@ -731,6 +731,7 @@ class FinancialMovements
|
|||
fm.status,
|
||||
fm.movement_value_registration_tariff,
|
||||
fm.movement_value_settlement_tariff,
|
||||
fm.note,
|
||||
c.reference,
|
||||
c.cns,
|
||||
c.name_fantasy,
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ try{
|
|||
$totalOutputsPaid = '0.00';
|
||||
$totalEntriesPaid = '0.00';
|
||||
$header = null;
|
||||
$totalFees = '0.00';
|
||||
|
||||
/** Verifica se existe consulta informada para validar os campos */
|
||||
|
||||
|
|
@ -129,6 +130,7 @@ try{
|
|||
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 90px">PAGAMENTO</td>';
|
||||
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center">DESCRIÇÃO</td>';
|
||||
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center">CNS</td>';
|
||||
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center">Observação</td>';
|
||||
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">VALOR R$</td>';
|
||||
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">MULTA R$</td>';
|
||||
$header .= ' <td style="color: #FFF; padding: 4px; text-align: center; width: 60px">TAXAS R$</td>';
|
||||
|
|
@ -166,14 +168,20 @@ try{
|
|||
|
||||
foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){
|
||||
|
||||
|
||||
/** Calcula o total de taxas */
|
||||
$totalFees += $Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff;
|
||||
|
||||
|
||||
$body .= ' <tr style="'.($i % 2 == 0 ? 'background-color: #f2f2f2;' : '').'">';
|
||||
$body .= ' <td style="text-align: center; width: 90px">'.$Result->movement_reference.'</td>';
|
||||
$body .= ' <td style="text-align: center; width: 90px">'.date('d/m/Y', strtotime($Result->movement_date_scheduled)).'</td>';
|
||||
$body .= ' <td style="text-align: center; width: '.($FinancialMovementsValidate->getStatusSearch() == 1 ? '120' : '90').'px">'.(isset($Result->movement_date_paid) ? date('d/m/Y', strtotime($Result->movement_date_paid)) : ($Main->CheckDay($Result->movement_date_scheduled) > 1 ? $Main->diffDate($Result->movement_date_scheduled, date('Y-m-d')).' dia(s) de atraso' : '')).'</td>';
|
||||
$body .= ' <td style="text-align: left">'.$Result->description.'</td>';
|
||||
$body .= ' <td style="text-align: left">'.$Result->cns.'</td>';
|
||||
$body .= ' <td style="text-align: left">'.( isset($Result->note) ? $Result->note : '' ).'</td>';
|
||||
$body .= ' <td style="text-align: right; width: 60px">'.number_format($Result->movement_value, 2, ',', '.').'</td>';
|
||||
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_fees) ? number_format($Result->movement_value_fees, 2, ',', '.') : '').'</td>';
|
||||
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_paid) ? number_format(($Result->movement_value_paid-$Result->movement_value), 2, ',', '.') : '').'</td>';
|
||||
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_registration_tariff) ? number_format($Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff, 2, ',', '.') : '').'</td>';
|
||||
$body .= ' <td style="text-align: right; width: 60px">'.( isset($Result->movement_value_paid) ? number_format(($Result->movement_value_paid+($Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff)), 2, ',', '.') : number_format($Result->movement_value, 2, ',', '.')).'</td>';
|
||||
$body .= ' </tr>';
|
||||
|
|
@ -187,7 +195,9 @@ try{
|
|||
$body .= '</table>';
|
||||
|
||||
$body .= '<br/>';
|
||||
$body .= 'Total Geral R$ '.number_format($totalGeneral, 2, ',', '.');
|
||||
$body .= 'Total R$ '.number_format($totalGeneral, 2, ',', '.').'<br/>';
|
||||
$body .= 'Total Taxas R$ '.number_format($totalFees, 2, ',', '.').'<br/>';
|
||||
$body .= 'Total Geral R$ '.number_format(($totalGeneral-$totalFees), 2, ',', '.').'<br/>';
|
||||
|
||||
/** Acrescenta os dados ao corpo do relatório */
|
||||
$mpdf->WriteHTML($body);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue