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

Add external billing id on enterprises #12980

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fa91082
Add external_billing_id field on enterprises table
pacodelaluna Nov 13, 2024
2d34ea0
Add new field on enterprise admin form
pacodelaluna Nov 13, 2024
df50a93
Deal with translations
pacodelaluna Nov 16, 2024
c196acb
Handle the async action for entreprises sells field changes
pacodelaluna Nov 25, 2024
49b89d6
Move admin_only tab upper
pacodelaluna Nov 25, 2024
a16f5b2
Add unit tests for admin entreprises changes
pacodelaluna Nov 25, 2024
27fcf76
Add external_billing_id field on revenues_by_hub report
pacodelaluna Nov 28, 2024
ce7f041
Repair field placeholder translation
pacodelaluna Nov 28, 2024
d270dda
Repair specs
pacodelaluna Nov 28, 2024
dc07e5a
Put back permalink fields on primary details panel
pacodelaluna Dec 22, 2024
3d9793b
Fix spec
pacodelaluna Dec 22, 2024
77ba7e0
Add spinner
pacodelaluna Dec 23, 2024
7d37fcd
Use params value only if present
pacodelaluna Dec 26, 2024
0511fc2
Do explicit save in specs when switching tabs
pacodelaluna Dec 26, 2024
129ceac
Revert "Do explicit save in specs when switching tabs"
pacodelaluna Jan 5, 2025
a6990d3
Revert "Use params value only if present"
pacodelaluna Jan 5, 2025
905f535
Revert "Add spinner"
pacodelaluna Jan 5, 2025
980c510
Revert "Fix spec"
pacodelaluna Jan 5, 2025
47b3310
Revert "Put back permalink fields on primary details panel"
pacodelaluna Jan 5, 2025
ba7db00
Remove Admin Only tab logic
pacodelaluna Jan 5, 2025
3bcca1e
Isolate into an Admin Only section
pacodelaluna Jan 6, 2025
104a6f0
Improve specs
pacodelaluna Jan 8, 2025
a15874d
Merge branch 'master' into add-external-billing-id-on-enterprises
pacodelaluna Jan 8, 2025
33f7d8d
Fix specs
pacodelaluna Jan 8, 2025
363640c
Re-instate check for external_billing_id
dacook Jan 9, 2025
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
9 changes: 0 additions & 9 deletions spec/serializers/api/admin/enterprise_serializer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,4 @@
end
end
end

context "when there is a external billing id" do
let(:enterprise) { create(:distributor_enterprise, external_billing_id: 'INV123456') }

it "includes URLs of image versions" do
serializer = Api::Admin::EnterpriseSerializer.new(enterprise)
expect(serializer.as_json[:external_billing_id]).to eq('INV123456')
end
end
dacook marked this conversation as resolved.
Show resolved Hide resolved
end
8 changes: 4 additions & 4 deletions spec/system/admin/reports/revenues_by_hub_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
tax_rate_name: "Tax 1"
)
end
let(:distributor1) { create(:enterprise, name: "Hub 1", owner:) }
let(:distributor1) { create(:enterprise, name: "Hub 1", owner:, external_billing_id: 'INV1234') }
let(:distributor2) { create(:enterprise, name: "Hub 2", owner:) }
let(:distributor3) { create(:enterprise, name: "Hub 3", owner:) }
let(:distributor3) { create(:enterprise, name: "Hub 3", owner:, external_billing_id: 'INV4321') }
let(:owner) { create(:user, email: '[email protected]') }
let(:order_cycle) { create(:simple_order_cycle) }
let(:product) { create(:product) }
Expand Down Expand Up @@ -87,7 +87,7 @@
"Hub 1",
order.distributor.id,
"none",
"none",
"INV1234",
"none",
"none",
"none",
dacook marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -131,7 +131,7 @@
"Hub 3",
order_with_voucher_tax_excluded.distributor.id,
"none",
"none",
"INV4321",
"none",
"none",
"none",
Expand Down
Loading