diff --git a/vendor/print/financial_movements/financial_movements_datagrid.php b/vendor/print/financial_movements/financial_movements_datagrid.php
index 89ba180..3b24ef3 100644
--- a/vendor/print/financial_movements/financial_movements_datagrid.php
+++ b/vendor/print/financial_movements/financial_movements_datagrid.php
@@ -111,9 +111,12 @@ try{
$header .= ' MOVIMENTAÇÕES FINANCEIRAS / ';
/** Verifica o tipo */
- if($FinancialMovementsValidate->getType() == 'E'){
+ if ($FinancialMovementsValidate->getStatusSearch() == 3) {
- $header .= 'ENTRADAS';
+
+ }elseif($FinancialMovementsValidate->getType() == 'E'){
+
+ $header .= 'NOTAS EMITIDAS';
}elseif($FinancialMovementsValidate->getType() == 'S'){
@@ -131,70 +134,67 @@ try{
$header .= ' ';
$header .= ' ';
- $header .= ' ';
+ $header .= ' ';
- /** Verifica o tipo da impressão */
- switch($FinancialMovementsValidate->getType()){
+ /** Verifica se o status */
+ if($FinancialMovementsValidate->getStatusSearch() == 3){
- case 'E':
+ $header .= '
';
+ $header .= ' ';
+ $header .= ' | ';
+ $header .= ' REFERÊNCIA | ';
+ $header .= ' PAGAMENTO | ';
+ $header .= ' DESCRIÇÃO | ';
+ $header .= ' OBSERVAÇÃO | ';
+ $header .= ' TOTAL | ';
+ $header .= '
';
+ $header .= '
';
+
+ } else {
+
+ /** Verifica o tipo da impressão */
+ switch($FinancialMovementsValidate->getType()){
- $header .= ' ';
- $header .= ' ';
- $header .= ' | ';
- $header .= ' REFERÊNCIA | ';
- $header .= ' VENCIMENTO | ';
- $header .= ' PAGAMENTO | ';
- $header .= ' DESCRIÇÃO | ';
- $header .= ' CNS | ';
- $header .= ' OBSERVAÇÃO | ';
- $header .= ' VALOR | ';
- $header .= ' MULTA | ';
- $header .= ' TAXAS | ';
- $header .= ' TOTAL | ';
- $header .= '
';
- $header .= '
';
-
- break;
-
-
- case 'S':
-
-
- $header .= ' ';
- $header .= ' ';
- $header .= ' | ';
- $header .= ' VENCIMENTO | ';
- $header .= ' PAGAMENTO | ';
- $header .= ' DESCRIÇÃO | ';
- $header .= ' OBSERVAÇÃO | ';
- $header .= ' VALOR | ';
- $header .= ' MULTA | ';
- $header .= ' TOTAL | ';
- $header .= '
';
- $header .= '
';
-
- break;
-
- default:
-
- /** Verifica se o status */
- if($FinancialMovementsValidate->getStatusSearch() == 3){
+ case 'E':
$header .= ' ';
$header .= ' ';
$header .= ' | ';
$header .= ' REFERÊNCIA | ';
+ $header .= ' VENCIMENTO | ';
+ $header .= ' PAGAMENTO | ';
+ $header .= ' DESCRIÇÃO | ';
+ $header .= ' CNS | ';
+ $header .= ' OBSERVAÇÃO | ';
+ $header .= ' VALOR | ';
+ $header .= ' MULTA | ';
+ $header .= ' TAXAS | ';
+ $header .= ' TOTAL | ';
+ $header .= '
';
+ $header .= '
';
+
+ break;
+
+
+ case 'S':
+
+
+ $header .= ' ';
+ $header .= ' ';
+ $header .= ' | ';
+ $header .= ' VENCIMENTO | ';
$header .= ' PAGAMENTO | ';
$header .= ' DESCRIÇÃO | ';
$header .= ' OBSERVAÇÃO | ';
+ $header .= ' VALOR | ';
+ $header .= ' MULTA | ';
$header .= ' TOTAL | ';
$header .= '
';
- $header .= '
';
-
- }
+ $header .= ' ';
- break;
+ break;
+ }
}
@@ -224,96 +224,94 @@ try{
$FinancialMovementsValidate->getType(),
$FinancialMovementsValidate->getStatusSearch(),
$FinancialMovementsValidate->getDateStart(),
- $FinancialMovementsValidate->getDateEnd());
+ $FinancialMovementsValidate->getDateEnd());
+
+ /** Verifica se o status */
+ if($FinancialMovementsValidate->getStatusSearch() == 3){
- /** Verifica o tipo da impressão */
- switch($FinancialMovementsValidate->getType()){
-
-
- case 'E':
+ foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){
- foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){
-
- /** 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->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 .= '
';
-
- /** Contabiliza o total geral */
- $totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
- }
-
- break;
-
- case 'S':
-
- foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){
-
- /** 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 .= ' '.( 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_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 .= '
';
-
- /** Contabiliza o total geral */
- $totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
- }
+ /** 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 .= ' '.(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 .= ' '.( isset($Result->note) ? $Result->note : '' ).' | ';
+ $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 .= '
';
- break;
+ /** Contabiliza o total geral */
+ $totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
+ }
+
+ } else {
- default:
-
- /** Verifica se o status */
- if($FinancialMovementsValidate->getStatusSearch() == 3){
+ /** Verifica o tipo da impressão */
+ switch($FinancialMovementsValidate->getType()){
+
+
+ case 'E':
foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){
/** 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 .= ' '.$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 .= ' '.( isset($Result->note) ? $Result->note : '' ).' | ';
+ $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 .= ' ';
/** Contabiliza o total geral */
$totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
- }
- }
+ }
- break;
+ break;
+ case 'S':
+
+ foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){
+
+ /** 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 .= ' '.( 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_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 .= '
';
+
+ /** Contabiliza o total geral */
+ $totalGeneral += isset($Result->movement_value_paid) ? $Result->movement_value_paid : $Result->movement_value;
+ }
+
+
+ break;
+
+ }
}