Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#8344] Fix rendering invoices view #8345

Merged
merged 4 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/models/alaveteli_pro/invoice.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def open?
end

def paid?
status == 'paid'
status == 'paid' && amount_paid > 0
end

# attributes
Expand All @@ -20,10 +20,11 @@ def date

# charge
def charge
@charge ||= Stripe::Charge.retrieve(__getobj__.charge)
charge_id = __getobj__.charge
@charge ||= Stripe::Charge.retrieve(charge_id) if charge_id
end

delegate :receipt_url, to: :charge
delegate :receipt_url, to: :charge, allow_nil: true

private

Expand Down
2 changes: 2 additions & 0 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Highlighted Features

* Fix rendering invoices page when there are discounted Pro subscription (Graeme
Porteous)
* Drop support for Ruby 3.0 (Graeme Porteous)
* Allow projects owners to publish datasets (Graeme Porteous)
* Add comment deletion (Helen Cross, Graeme Porteous, Gareth Rees)
Expand Down
86 changes: 86 additions & 0 deletions spec/models/alaveteli_pro/invoice_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
require 'spec_helper'

RSpec.describe AlaveteliPro::Invoice, type: :model do
let(:invoice) { AlaveteliPro::Invoice.new(stripe_invoice) }

let(:stripe_invoice) do
double('Stripe::Invoice',
status: 'open', charge: 'ch_123', date: 1722211200, amount_paid: 0)
end

let(:stripe_charge) do
double('Stripe::Charge', receipt_url: 'http://example.com/receipt')
end

before do
allow(Stripe::Charge).
to receive(:retrieve).with('ch_123').and_return(stripe_charge)
end

describe '#open?' do
it 'returns true when the status is open' do
expect(invoice).to be_open
end

it 'returns false when the status is not open' do
allow(stripe_invoice).to receive(:status).and_return('paid')
expect(invoice).not_to be_open
end
end

describe '#paid?' do
it 'returns true when the status is paid and an amount has been paid' do
allow(stripe_invoice).to receive(:status).and_return('paid')
allow(stripe_invoice).to receive(:amount_paid).and_return(1000)
expect(invoice).to be_paid
end

it 'returns false when 100% discounted' do
allow(stripe_invoice).to receive(:status).and_return('paid')
expect(invoice).not_to be_paid
end

it 'returns false when the status is not paid' do
allow(stripe_invoice).to receive(:amount_paid).and_return(1000)
expect(invoice).not_to be_paid
end
end

describe '#date' do
it 'returns a date object for the invoice' do
with_env_tz 'UTC' do
expect(invoice.date).to eq(Date.new(2024, 7, 29))
end
end
end

describe '#charge' do
it 'returns a Stripe::Charge object' do
expect(invoice.charge).to eq(stripe_charge)
end

it 'memoizes the Stripe::Charge object' do
expect(Stripe::Charge).to receive(:retrieve).once.with('ch_123')
2.times { invoice.charge }
end
end

describe '#receipt_url' do
it 'delegates receipt_url to the charge' do
expect(invoice.receipt_url).to eq('http://example.com/receipt')
end

it 'returns nil when there is no charge' do
allow(stripe_invoice).to receive(:charge).and_return(nil)
expect(invoice.receipt_url).to be_nil
end
end

describe '#method_missing' do
it 'forwards missing methods to the original object' do
allow(stripe_invoice).
to receive(:some_missing_method).and_return('result')
expect(invoice.some_missing_method).to eq('result')
end
end
end
Loading