diff --git a/src/bill/operations/delete_credit_note.cr b/src/bill/operations/delete_credit_note.cr index e77a4bb..8976077 100644 --- a/src/bill/operations/delete_credit_note.cr +++ b/src/bill/operations/delete_credit_note.cr @@ -11,6 +11,7 @@ module Bill::DeleteCreditNote # CreditNote::DeleteOperation status.add_error Rex.t( :"operation.error.credit_note_finalized", id: credit_note.id, + reference: credit_note.reference, status: credit_note.status.to_s ) end diff --git a/src/bill/operations/delete_transaction.cr b/src/bill/operations/delete_transaction.cr index 3a71926..bbae7d8 100644 --- a/src/bill/operations/delete_transaction.cr +++ b/src/bill/operations/delete_transaction.cr @@ -11,6 +11,7 @@ module Bill::DeleteTransaction # Transaction::DeleteOperation status.add_error Rex.t( :"operation.error.transaction_finalized", id: transaction.id, + reference: transaction.reference, status: transaction.status.to_s ) end diff --git a/src/bill/operations/mixins/create_finalized_credit_note_transaction.cr b/src/bill/operations/mixins/create_finalized_credit_note_transaction.cr index 2e45626..1ff379d 100644 --- a/src/bill/operations/mixins/create_finalized_credit_note_transaction.cr +++ b/src/bill/operations/mixins/create_finalized_credit_note_transaction.cr @@ -8,6 +8,7 @@ module Bill::CreateFinalizedCreditNoteTransaction description = credit_note.description || Rex.t( :"operation.misc.credit_note_description", + credit_note_id: credit_note.id, reference: credit_note.reference ) diff --git a/src/bill/operations/mixins/create_finalized_invoice_transaction.cr b/src/bill/operations/mixins/create_finalized_invoice_transaction.cr index 36ceff2..a030875 100644 --- a/src/bill/operations/mixins/create_finalized_invoice_transaction.cr +++ b/src/bill/operations/mixins/create_finalized_invoice_transaction.cr @@ -8,6 +8,7 @@ module Bill::CreateFinalizedInvoiceTransaction description = invoice.description || Rex.t( :"operation.misc.invoice_description", + invoice_id: invoice.id, reference: invoice.reference ) diff --git a/src/bill/operations/mixins/validate_credit_note_item.cr b/src/bill/operations/mixins/validate_credit_note_item.cr index 2ebd712..3ea8248 100644 --- a/src/bill/operations/mixins/validate_credit_note_item.cr +++ b/src/bill/operations/mixins/validate_credit_note_item.cr @@ -84,9 +84,13 @@ module Bill::ValidateCreditNoteItem id.add_error Rex.t( :"operation.error.credit_exceeds_invoice", amount: current_item_amount, + amount_fmt: FractionalMoney.new(current_item_amount).to_s, amount_mu: FractionalMoney.new(current_item_amount).amount_mu, balance: balance, - balance_mu: FractionalMoney.new(balance).amount_mu + balance_fmt: FractionalMoney.new(balance).to_s, + balance_mu: FractionalMoney.new(balance).amount_mu, + currency_code: Bill.settings.currency.code, + currency_sign: Bill.settings.currency.sign ) end end diff --git a/src/bill/operations/mixins/validate_receipt.cr b/src/bill/operations/mixins/validate_receipt.cr index 7a7402a..a26a4f8 100644 --- a/src/bill/operations/mixins/validate_receipt.cr +++ b/src/bill/operations/mixins/validate_receipt.cr @@ -54,7 +54,11 @@ module Bill::ValidateReceipt amount.add_error Rex.t( :"operation.error.amount_lte_zero", - amount: value + amount: value, + amount_fmt: FractionalMoney.new(value).to_s, + amount_mu: FractionalMoney.new(value).amount_mu, + currency_code: Bill.settings.currency.code, + currency_sign: Bill.settings.currency.sign ) end end diff --git a/src/bill/operations/mixins/validate_transaction.cr b/src/bill/operations/mixins/validate_transaction.cr index 964ccc8..fae3e77 100644 --- a/src/bill/operations/mixins/validate_transaction.cr +++ b/src/bill/operations/mixins/validate_transaction.cr @@ -44,7 +44,15 @@ module Bill::ValidateTransaction private def validate_amount_not_zero amount.value.try do |value| return unless value.zero? - amount.add_error Rex.t(:"operation.error.amount_zero", amount: value) + + amount.add_error Rex.t( + :"operation.error.amount_zero", + amount: value, + amount_fmt: FractionalMoney.new(value).to_s, + amount_mu: FractionalMoney.new(value).amount_mu, + currency_code: Bill.settings.currency.code, + currency_sign: Bill.settings.currency.sign + ) end end end diff --git a/src/bill/operations/refund_payment.cr b/src/bill/operations/refund_payment.cr index f33e2b8..258c230 100644 --- a/src/bill/operations/refund_payment.cr +++ b/src/bill/operations/refund_payment.cr @@ -58,8 +58,12 @@ module Bill::RefundPayment # Transaction::SaveOperation amount.add_error Rex.t( :"operation.error.refund_exceeds_receipt", amount: value, + amount_fmt: FractionalMoney.new(value).to_s, amount_mu: FractionalMoney.new(value).amount_mu, + currency_code: Bill.settings.currency.code, + currency_sign: Bill.settings.currency.sign, receipt_amount: receipt.amount, + receipt_amount_fmt: receipt.amount_fm.to_s, receipt_amount_mu: receipt.amount_fm.amount_mu ) end diff --git a/src/bill/operations/update_credit_note.cr b/src/bill/operations/update_credit_note.cr index d5b430d..ca41948 100644 --- a/src/bill/operations/update_credit_note.cr +++ b/src/bill/operations/update_credit_note.cr @@ -26,6 +26,7 @@ module Bill::UpdateCreditNote # CreditNote::SaveOperation status.add_error Rex.t( :"operation.error.credit_note_finalized", id: credit_note.id, + reference: credit_note.reference, status: credit_note.status.to_s ) end diff --git a/src/bill/operations/update_invoice.cr b/src/bill/operations/update_invoice.cr index 6cf70d0..91b5ea2 100644 --- a/src/bill/operations/update_invoice.cr +++ b/src/bill/operations/update_invoice.cr @@ -29,6 +29,7 @@ module Bill::UpdateInvoice # Invoice::SaveOperation status.add_error Rex.t( :"operation.error.invoice_finalized", id: invoice.id, + reference: invoice.reference, status: invoice.status.to_s ) end diff --git a/src/bill/operations/update_receipt.cr b/src/bill/operations/update_receipt.cr index fa3c505..3c161bb 100644 --- a/src/bill/operations/update_receipt.cr +++ b/src/bill/operations/update_receipt.cr @@ -28,6 +28,7 @@ module Bill::UpdateReceipt # Receipt::SaveOperation status.add_error Rex.t( :"operation.error.receipt_finalized", id: receipt.id, + reference: receipt.reference, status: receipt.status.to_s ) end diff --git a/src/bill/operations/update_transaction.cr b/src/bill/operations/update_transaction.cr index 2e2cb29..ec4827e 100644 --- a/src/bill/operations/update_transaction.cr +++ b/src/bill/operations/update_transaction.cr @@ -24,6 +24,7 @@ module Bill::UpdateTransaction # Transaction::SaveOperation status.add_error Rex.t( :"operation.error.transaction_finalized", id: transaction.id, + reference: transaction.reference, status: transaction.status.to_s ) end