feat(manual-payments): Fix refundable_amount_cents

getlago · Jan 31, 2025 · 2663a53 · 2663a53
1 parent e92d5f9
commit 2663a53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/invoice.rb b/app/models/invoice.rb
@@ -304,7 +304,7 @@ def refundable_amount_cents
     #   total_paid_amount_cents - credit_notes.sum("refund_amount_cents + credit_amount_cents")
     # end
 
-    amount = available_to_credit_amount_cents -
+    amount = total_paid_amount_cents - credit_notes.sum("refund_amount_cents + credit_amount_cents") -
       credits.where(before_taxes: false).sum(:amount_cents) -
       prepaid_credit_amount_cents
     amount = amount.negative? ? 0 : amount

diff --git a/app/services/payments/manual_create_service.rb b/app/services/payments/manual_create_service.rb
@@ -57,7 +57,7 @@ def invoice
     def check_preconditions
       return result.not_found_failure!(resource: "invoice") unless invoice
       return if invoice.invoice_type == "advance_charges"
-      return result.forbidden_failure! if !License.premium? && !invoice.organization.premium_integrations.include?('manual_payments')
+      return result.forbidden_failure! if !License.premium? || !invoice.organization.premium_integrations.include?('manual_payments')
       result.single_validation_failure!(error_code: "invalid_date", field: "paid_at") unless valid_paid_at?
     end