diff --git a/vendor/model/FinancialMovements.class.php b/vendor/model/FinancialMovements.class.php
index f2d3e85..0627195 100644
--- a/vendor/model/FinancialMovements.class.php
+++ b/vendor/model/FinancialMovements.class.php
@@ -693,7 +693,14 @@ class FinancialMovements
}
/** Lista todos os egistros do banco com ou sem paginação*/
- public function All(int $companyId, int $start, int $max, string $search, string $type, int $status, string $dateStart, string $dateEnd)
+ public function All(int $companyId,
+ int $start,
+ int $max,
+ string $search,
+ string $type,
+ int $status,
+ string $dateStart,
+ string $dateEnd)
{
/** Parametros de entrada */
$this->companyId = $companyId;
@@ -722,6 +729,8 @@ class FinancialMovements
fm.movement_date_paid,
fm.reference as movement_reference,
fm.status,
+ fm.movement_value_registration_tariff,
+ fm.movement_value_settlement_tariff,
c.reference,
c.cns,
c.name_fantasy,
diff --git a/vendor/print/financial_movements/financial_movements_datagrid.php b/vendor/print/financial_movements/financial_movements_datagrid.php
index 60d2108..2ccd0cb 100644
--- a/vendor/print/financial_movements/financial_movements_datagrid.php
+++ b/vendor/print/financial_movements/financial_movements_datagrid.php
@@ -128,9 +128,10 @@ try{
$header .= ' | VENCIMENTO | ';
$header .= ' PAGAMENTO | ';
$header .= ' DESCRIÇÃO | ';
- $header .= ' CLIENTE | ';
+ $header .= ' CNS | ';
$header .= ' VALOR R$ | ';
- $header .= ' MORA R$ | ';
+ $header .= ' MULTA R$ | ';
+ $header .= ' TAXAS R$ | ';
$header .= ' TOTAL R$ | ';
$header .= ' ';
$header .= ' ';
@@ -170,10 +171,11 @@ try{
$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->name_fantasy.' | ';
+ $body .= ' '.$Result->cns.' | ';
$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, 2, ',', '.') : number_format($Result->movement_value, 2, ',', '.')).' | ';
+ $body .= ' '.( isset($Result->movement_value_fees) ? number_format($Result->movement_value_fees, 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 .= ' ';
$i++;