victor/Reem-Notas
SHA256
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Adição do botão de entrega manual

Browse Source
This commit is contained in:
victor
2026-06-25 11:35:41 -03:00
parent 022aac2616
commit 0c5b5bcbe6
22 changed files with 615 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/pdf/relatorio_financeiro_consolidacao_pdf.rb
View File

@@ -11,7 +11,7 @@ module Pdf
def initialize(consolidacao:)
super()
@consolidacao = consolidacao
@motoristas = consolidacao.consolidacao_motoristas.order(:motorista_nome)
@motoristas = consolidacao.consolidacao_motoristas.ativos.order(:motorista_nome)
@entregas = consolidacao.consolidacao_entregas
end

6
app/services/pdf/relatorio_motorista_pdf.rb
View File

@@ -34,9 +34,9 @@ module Pdf
original = e.entrega_original
linhas << [
(i + 1).to_s,
original&.vehicle.presence || '—',
original ? "NF #{original.numero_nf}" : '—',
original ? original.address.to_s : '—',
original&.vehicle.presence || (e.manual? ? 'manual' : '—'),
original ? "NF #{original.numero_nf}" : (e.nf_manual.present? ? "NF #{e.nf_manual}" : '—'),
original ? original.address.to_s : (e.obs_manual.presence || '—'),
e.tipo_cor[:label],
(e.desconto? ? '-' : '') + moeda(e.valor_aplicado)
]