Skip to content

add DRAFTED status #40

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 25, 2024
Merged

add DRAFTED status #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e413e05
add DRAFTED status
bedrock-adam Nov 25, 2024
2b28070
pass build
bedrock-adam Nov 25, 2024
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
6 changes: 3 additions & 3 deletions lib/accountify/invoice.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module Invoice
extend self

module Status
DRAFT = 'draft'
DRAFTED = 'drafted'
ISSUED = 'issued'
PAID = 'paid'
VOIDED = 'voided'
Expand Down Expand Up @@ -33,7 +33,7 @@ def draft(user_id:, tenant_id:,
tenant_id: tenant_id,
organisation_id: organisation_id,
contact_id: contact_id,
status: Status::DRAFT,
status: Status::DRAFTED,
currency_code: currency_code,
due_date: due_date,
sub_total_amount: line_items.sum do |line_item|
Expand Down Expand Up @@ -156,7 +156,7 @@ def update(user_id:, tenant_id:, id:,
organisation_id: organisation.id,
updated_at: current_utc_time,
contact_id: contact.id,
status: Status::DRAFT,
status: Status::DRAFTED,
due_date: due_date,
sub_total_amount: line_items.sum do |line_item|
BigDecimal(line_item[:unit_amount][:amount]) * line_item[:quantity].to_i
Expand Down
4 changes: 2 additions & 2 deletions lib/accountify/invoice_status_summary.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def generate(tenant_id:, organisation_id:, time: ::Time)
tenant_id: tenant_id,
organisation_id: organisation_id,
generated_at: current_utc_time,
drafted_count: grouped_invoices[Invoice::Status::DRAFT] || 0,
drafted_count: grouped_invoices[Invoice::Status::DRAFTED] || 0,
issued_count: grouped_invoices[Invoice::Status::ISSUED] || 0,
paid_count: grouped_invoices[Invoice::Status::PAID] || 0,
voided_count: grouped_invoices[Invoice::Status::VOIDED] || 0)
Expand All @@ -42,7 +42,7 @@ def regenerate(tenant_id:, organisation_id:,

summary.update!(
generated_at: current_utc_time,
drafted_count: grouped_invoices[Invoice::Status::DRAFT] || 0,
drafted_count: grouped_invoices[Invoice::Status::DRAFTED] || 0,
issued_count: grouped_invoices[Invoice::Status::ISSUED] || 0,
paid_count: grouped_invoices[Invoice::Status::PAID] || 0,
voided_count: grouped_invoices[Invoice::Status::VOIDED] || 0)
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/accountify/invoice_controller/delete_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Accountify
organisation_id: organisation.id,
contact_id: contact.id,
currency_code: "AUD",
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
due_date: current_date + 30.days,
sub_total_amount: BigDecimal("600.00"),
sub_total_currency_code: "AUD",
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/accountify/invoice_controller/find_by_id_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module Accountify
organisation_id: organisation.id,
contact_id: contact.id,
currency_code: "AUD",
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
due_date: current_date + 30.days,
sub_total_amount: BigDecimal("600.00"),
sub_total_currency_code: "AUD",
Expand Down Expand Up @@ -72,7 +72,7 @@ module Accountify
"amount" => "400.0",
"currency_code" => "AUD" } } ],
"organisation_id" => organisation.id,
"status" => "draft",
"status" => "drafted",
"sub_total" => {
"amount" => "600.0",
"currency_code" => "AUD" },
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/accountify/invoice_controller/issue_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Accountify
organisation_id: organisation.id,
contact_id: contact.id,
currency_code: "AUD",
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
due_date: current_date + 30.days,
sub_total_amount: BigDecimal("600.00"),
sub_total_currency_code: "AUD",
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/accountify/invoice_controller/update_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module Accountify
organisation_id: organisation_1.id,
contact_id: contact_1.id,
currency_code: "AUD",
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
due_date: current_date + 30.days,
sub_total_amount: BigDecimal("600.00"),
sub_total_currency_code: "AUD",
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/accountify/invoice_controller/void_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module Accountify
organisation_id: organisation.id,
contact_id: contact.id,
currency_code: "AUD",
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
due_date: current_date + 30.days,
sub_total_amount: BigDecimal("600.00"),
sub_total_currency_code: "AUD",
Expand Down
4 changes: 2 additions & 2 deletions spec/factories/accountify_invoices.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
sub_total_amount { BigDecimal("100.00") }
sub_total_currency_code { "AUD" }

trait :draft do
status { "draft" }
trait :drafted do
status { "drafted" }
end

trait :approved do
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/accountify/invoice/delete_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Accountify
contact_id: contact.id,
currency_code: "AUD",
due_date: current_date + 30.days,
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
sub_total_amount: BigDecimal("1800.00"),
sub_total_currency_code: "AUD"
).id
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/accountify/invoice/draft_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module Accountify
expect(invoice_model).to have_attributes(
organisation_id: organisation.id,
contact_id: contact.id,
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
currency_code: "AUD",
due_date: current_date + 30.days,
line_items: match_array([
Expand All @@ -76,7 +76,7 @@ module Accountify
'id' => invoice[:id],
'organisation_id' => organisation.id,
'contact_id' => contact.id,
'status' => Invoice::Status::DRAFT,
'status' => Invoice::Status::DRAFTED,
'currency_code' => "AUD",
'due_date' => (current_date + 30.days ).to_s,
'line_items' => [{
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/accountify/invoice/find_by_id_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Accountify
contact_id: contact.id,
currency_code: "AUD",
due_date: current_date + 30.days,
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
sub_total_amount: BigDecimal("1800.00"),
sub_total_currency_code: "AUD"
).id
Expand Down Expand Up @@ -60,7 +60,7 @@ module Accountify
id: id,
organisation_id: organisation.id,
contact_id: contact.id,
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
currency_code: "AUD",
due_date: (current_date + 30.days).to_s,
line_items: [{
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/accountify/invoice/issue_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Accountify
contact_id: contact.id,
currency_code: "AUD",
due_date: current_date + 30.days,
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
sub_total_amount: BigDecimal("1800.00"),
sub_total_currency_code: "AUD"
).id
Expand Down
6 changes: 3 additions & 3 deletions spec/lib/accountify/invoice/update_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module Accountify
organisation_id: organisation_1.id,
contact_id: contact_1.id,
currency_code: "AUD",
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
due_date: current_date + 30.days,
sub_total_amount: BigDecimal("600.00"),
sub_total_currency_code: "AUD"
Expand Down Expand Up @@ -96,7 +96,7 @@ module Accountify
expect(invoice_model).to have_attributes(
organisation_id: organisation_2.id,
contact_id: contact_2.id,
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
currency_code: "AUD",
due_date: current_date + 14.days,
line_items: match_array([
Expand All @@ -120,7 +120,7 @@ module Accountify
'id' => id,
'contact_id' => contact_2.id,
'organisation_id' => organisation_2.id,
'status' => Invoice::Status::DRAFT,
'status' => Invoice::Status::DRAFTED,
'currency_code' => "AUD",
'due_date' => (current_date + 14.days).to_s,
'line_items' => [{
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/accountify/invoice/void_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Accountify
contact_id: contact.id,
currency_code: "AUD",
due_date: current_date + 30.days,
status: Invoice::Status::DRAFT,
status: Invoice::Status::DRAFTED,
sub_total_amount: BigDecimal("1800.00"),
sub_total_currency_code: "AUD"
).id
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/accountify/invoice_status_summary/generate_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module Accountify
tenant_id: tenant_id,
organisation_id: organisation_id,
contact_id: contact.id,
status: Invoice::Status::DRAFT)
status: Invoice::Status::DRAFTED)
end

let!(:issued_invoice) do
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/accountify/invoice_status_summary/regenerate_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module Accountify
tenant_id: tenant_id,
organisation_id: organisation_id,
contact_id: contact.id,
status: Invoice::Status::DRAFT)
status: Invoice::Status::DRAFTED)
end

let!(:issued_invoice) do
Expand Down
Loading