From 80e2e284b0f81c6bf10c7a1cbc7640b163bfbf2b Mon Sep 17 00:00:00 2001 From: Kenio de Souza Date: Wed, 27 Aug 2025 07:55:18 -0300 Subject: [PATCH] =?UTF-8?q?Atualizando=20consolida=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.json | 5 ++++- .../financial_consolidations_save.php | 9 ++++++++- vendor/model/FinancialMovements.class.php | 17 +++++++++++++++-- vendor/model/Main.class.php | 18 ++++++++++++++++++ 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/config/config.json b/config/config.json index a8b29c2..8921042 100644 --- a/config/config.json +++ b/config/config.json @@ -65,7 +65,10 @@ "rateioNomeTitular" : "ORIUS DESENVOLVIMENTO DE SOFTWARE E TECNOLOGIA LTDA", "rateioCodigoFinalidadeTed" : "10", "rateioCodigoTipoContaDestinoTed" : "CC", - "rateioQuantidadeDiasFloat" : 1 + "rateioQuantidadeDiasFloat" : 1, + "value_registration_tariff": 0.60, + "value_settlement_tariff": 2.20 + }, "datagrid" : {"rows": 20, "pagination": 10}, diff --git a/vendor/action/financial_consolidations/financial_consolidations_save.php b/vendor/action/financial_consolidations/financial_consolidations_save.php index 841cc3f..aa46c49 100644 --- a/vendor/action/financial_consolidations/financial_consolidations_save.php +++ b/vendor/action/financial_consolidations/financial_consolidations_save.php @@ -252,7 +252,14 @@ try{ for($j=0; $jupdateConsolidatedItem($financialMovementsId[$j], $financialConsolidationsId, $Main->MoeadDB($acrescimos[$j]), $Main->MoeadDB($valor_pago[$j]), $Main->DataDB($data_ocorrencia[$j]), $status[$j])){ + if($FinancialMovements->updateConsolidatedItem($financialMovementsId[$j], + $financialConsolidationsId, + $Main->MoeadDB($acrescimos[$j]), + $Main->MoeadDB($valor_pago[$j]), + $Main->DataDB($data_ocorrencia[$j]), + $status[$j], + $Main->getValueRegistrationTariff(), + $Main->getValueSettlementTariff())){ /** Contabiliza os itens consolidados */ $sumUpdate++; diff --git a/vendor/model/FinancialMovements.class.php b/vendor/model/FinancialMovements.class.php index 286d09e..791d11e 100644 --- a/vendor/model/FinancialMovements.class.php +++ b/vendor/model/FinancialMovements.class.php @@ -1282,7 +1282,14 @@ class FinancialMovements } /** Atualiza a consolidação do item */ - public function updateConsolidatedItem(int $financialMovementsId, int $financialConsolidationsId, ? float $movementValueFees, float $movementValuePaid, string $movementDatePaid, string $note) + public function updateConsolidatedItem(int $financialMovementsId, + int $financialConsolidationsId, + ? float $movementValueFees, + float $movementValuePaid, + string $movementDatePaid, + string $note, + ? float $valueRegistrationTariff, + ? float $valueSettlementTariff) { /** Parametros de entrada */ $this->financialMovementsId = $financialMovementsId; @@ -1291,6 +1298,8 @@ class FinancialMovements $this->movementValuePaid = $movementValuePaid; $this->movementDatePaid = $movementDatePaid; $this->note = $note; + $this->valueRegistrationTariff = $valueRegistrationTariff; + $this->valueSettlementTariff = $valueSettlementTariff; /** Consulta SQL */ $this->sql = 'update financial_movements set financial_consolidations_id = :financial_consolidations_id, @@ -1298,7 +1307,9 @@ class FinancialMovements movement_value_paid = :movement_value_paid, movement_date_paid = :movement_date_paid, note = :note, - status = 2 + status = 2, + movement_value_registration_tariff = :movement_value_registration_tariff, + movement_value_settlement_tariff = :movement_value_settlement_tariff where financial_movements_id = :financial_movements_id '; /** Preparo o sql para receber os valores */ @@ -1311,6 +1322,8 @@ class FinancialMovements $this->stmt->bindParam('movement_date_paid', $this->movementDatePaid); $this->stmt->bindParam('note', $this->note); $this->stmt->bindParam('financial_movements_id', $this->financialMovementsId); + $this->stmt->bindParam('movement_value_registration_tariff', $this->valueRegistrationTariff); + $this->stmt->bindParam('movement_value_settlement_tariff', $this->valueSettlementTariff); /** Executo o SQL */ return $this->stmt->execute(); diff --git a/vendor/model/Main.class.php b/vendor/model/Main.class.php index b0e3564..c6852a7 100644 --- a/vendor/model/Main.class.php +++ b/vendor/model/Main.class.php @@ -55,6 +55,8 @@ class Main private $interval = null; private $month = null; private $liberation = null; + private $valueRegistrationTariff = null; + private $valueSettlementTariff = null; function __construct() @@ -68,12 +70,28 @@ class Main $this->secondKey = $this->config->{'app'}->{'security'}->{'second_key'}; $this->hash = $this->config->{'app'}->{'security'}->{'hash'}; $this->liberation = $this->config->{'app'}->{'security'}->{'liberation'}; + + /** Informações de taxa(s) de boleto */ + $this->valueRegistrationTariff = $this->config->{'app'}->{'ticket'}->{'value_registration_tariff'}; + $this->valueSettlementTariff = $this->config->{'app'}->{'ticket'}->{'value_settlement_tariff'}; /** Parametro do tempo de sessão do usuário */ $this->sessionTime = $this->config->{'app'}->{'session_time'}; } + /** Retorna o valor da taxa de registro de boleto */ + public function getValueRegistrationTariff() + { + return $this->valueRegistrationTariff; + } + + /** Retorna o valor da taxa de liquidação de boleto */ + public function getValueSettlementTariff() + { + return $this->valueSettlementTariff; + } + /** Retorna o metodo de criptografia */ private function getMethod() {