OriusTecnologia/myadmin
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ajuste, adicionado informação de NF

Browse source
This commit is contained in:
Kenio 2025-09-23 10:35:06 -03:00
parent b55d1c1186
commit caf6a619bf
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vendor/model/FinancialMovements.class.php vendored
View file

@ -740,11 +740,12 @@ class FinancialMovements
cbc.value,
cbc.commission_date_paid,
u.name_first,
u.name_last
u.name_last,
(select count(d.documents_id) from documents d where d.financial_movements_id = fm.financial_movements_id and documents_categorys_id = 2) as nf
from financial_movements fm
left join companies c on fm.company_id = c.company_id
left join companies_budgets_commissions cbc on fm.financial_movements_id = cbc.financial_movements_id
left join users u on cbc.user_id = u.user_id
left join users u on cbc.user_id = u.user_id
where fm.movement_date_cancel is null ';
/** verifica se a consulta será pela data de pagamento */

33
vendor/view/financial_movements/financial_movements_datagrid.php vendored
View file

@ -79,7 +79,12 @@ try{
}
/** Consulta a quantidade de registros */
$NumberRecords = (int)$FinancialMovements->Count($companyId, $FinancialMovementsValidate->getSearch(), $FinancialMovementsValidate->getType(), $FinancialMovementsValidate->getStatusSearch(), $FinancialMovementsValidate->getDateStart(), $FinancialMovementsValidate->getDateEnd())->qtde;
$NumberRecords = (int)$FinancialMovements->Count($companyId,
$FinancialMovementsValidate->getSearch(),
$FinancialMovementsValidate->getType(),
$FinancialMovementsValidate->getStatusSearch(),
$FinancialMovementsValidate->getDateStart(),
$FinancialMovementsValidate->getDateEnd())->qtde;
/** Verifico a quantidade de registros localizados */
if ($NumberRecords > 0){ //Caso tenha registros cadastrados, carrego o layout
@ -221,7 +226,31 @@ try{
foreach($FinancialMovementsResult as $FinancialMovementsKey => $Result){
?>
<tr style="cursor: pointer" class="<?php echo $Result->status == 2 ? 'table-success' : ($Result->status == 3 ? 'text-decoration-line-through' : ($Main->CheckDay($Result->movement_date_scheduled) > 1 ? 'table-warning text-danger' : ''));?>">
<tr style="cursor: pointer" class="
<?php
/** Verifica se a movimentação possui nota fiscal */
if( (int)$Result->nf > 0 ){
echo 'table-info';
/** Verifica se a movimentação foi confirmada o pagamento */
} elseif($Result->status == 2){
echo 'table-success';
/** Verifica se a movimentação foi cancelada o pagamento */
} elseif($Result->status == 3){
echo 'text-decoration-line-through';
/** Verifica se a movimentação esta em atraso */
} elseif($Main->CheckDay($Result->movement_date_scheduled) > 1){
echo 'table-warning text-danger';
}
?>">
<td class="text-center" width="15">