diff --git a/vendor/print/financial_movements/financial_movements_datagrid.php b/vendor/print/financial_movements/financial_movements_datagrid.php
index 87bef8e..5d8c1c5 100644
--- a/vendor/print/financial_movements/financial_movements_datagrid.php
+++ b/vendor/print/financial_movements/financial_movements_datagrid.php
@@ -236,20 +236,22 @@ try{
/** Calcula o total de taxas */
$totalFees += $Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff;
- $i++;
$body .= ' ';
$body .= ' | '.$i.' | ';
$body .= ' '.$Result->movement_reference.' | ';
+ $body .= ' '.date('d/m/Y', strtotime($Result->movement_date_scheduled)).' | ';
$body .= ' '.(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' : '')).' | ';
- $body .= ' '.$Result->description.' | ';
+ $body .= ' '.$Result->description.' | ';
+ $body .= ' '.$Result->cns.' | ';
$body .= ' '.( isset($Result->note) ? $Result->note : '' ).' | ';
$body .= ' '.number_format($Result->movement_value, 2, ',', '.').' | ';
$body .= ' '.( isset($Result->movement_value_paid) ? number_format(($Result->movement_value_paid-$Result->movement_value), 2, ',', '.') : '').' | ';
$body .= ' '.( isset($Result->movement_value_registration_tariff) ? '- '.number_format($Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff, 2, ',', '.') : '').' | ';
$body .= ' '.( 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, ',', '.')).' | ';
- $body .= '
';
+ $body .= ' ';
+ $i++;
/** Contabiliza o total geral */
$totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
@@ -263,12 +265,11 @@ try{
/** Calcula o total de taxas */
$totalFees += $Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff;
- $i++;
$body .= ' ';
$body .= ' | '.$i.' | ';
-
+ $body .= ' '.$Result->movement_reference.' | ';
$body .= ' '.date('d/m/Y', strtotime($Result->movement_date_scheduled)).' | ';
$body .= ' '.(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' : '')).' | ';
$body .= ' '.$Result->description.' | ';
@@ -276,7 +277,8 @@ try{
$body .= ' '.number_format($Result->movement_value, 2, ',', '.').' | ';
$body .= ' '.( isset($Result->movement_value_paid) ? number_format(($Result->movement_value_paid-$Result->movement_value), 2, ',', '.') : '').' | ';
$body .= ' '.( 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, ',', '.')).' | ';
- $body .= '
';
+ $body .= ' ';
+ $i++;
/** Contabiliza o total geral */
$totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
@@ -294,23 +296,22 @@ try{
/** Calcula o total de taxas */
$totalFees += $Result->movement_value_registration_tariff+$Result->movement_value_settlement_tariff;
- $i++;
$body .= ' ';
$body .= ' | '.$i.' | ';
- $body .= ' '.$Result->movement_reference.' | ';
- $body .= ' '.date('d/m/Y', strtotime($Result->movement_date_scheduled)).' | ';
+ $body .= ' '.$Result->movement_reference.' | ';
$body .= ' '.(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' : '')).' | ';
- $body .= ' '.$Result->description.' | ';
- $body .= ' '.$Result->cns.' | ';
- $body .= ' '.( isset($Result->note) ? $Result->note : '' ).' | ';
+ $body .= ' '.$Result->description.' | ';
+ $body .= ' '.( isset($Result->note) ? $Result->note : '' ).' | ';
+ $body .= ' '.number_format($Result->movement_value, 2, ',', '.').' | ';
$body .= ' '.( 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, ',', '.')).' | ';
- $body .= '
';
+ $body .= ' ';
+ $i++;
/** Contabiliza o total geral */
$totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
- }
+ }
}
break;