akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'feature/stripe_v2' into feature/stripe_v2_fe

Browse Source
This commit is contained in:
Sivin Varghese
2025-11-06 16:34:03 +05:30
committed by GitHub
parent 797714f5aa fb86b1354a
commit ce4d52926c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enterprise/app/services/enterprise/billing/create_stripe_customer_service.rb
+1 -1
View File
@@ -67,7 +67,7 @@ class Enterprise::Billing::CreateStripeCustomerService
attributes = { attributes = {
stripe_customer_id: customer_id, stripe_customer_id: customer_id,
stripe_billing_version: 'v2' stripe_billing_version: '2'
} }
if hacker_plan_config&.value.present? if hacker_plan_config&.value.present?
spec/enterprise/services/enterprise/billing/create_stripe_customer_service_spec.rb
+2 -2
View File
@@ -54,7 +54,7 @@ describe Enterprise::Billing::CreateStripeCustomerService do
expect(Stripe::Customer).to have_received(:create).with({ name: account.name, email: admin1.email }) expect(Stripe::Customer).to have_received(:create).with({ name: account.name, email: admin1.email })
expect(account.reload.custom_attributes).to include( expect(account.reload.custom_attributes).to include(
'stripe_customer_id' => 'cus_random_number', 'stripe_customer_id' => 'cus_random_number',
'stripe_billing_version' => 'v2', 'stripe_billing_version' => '2',
'stripe_pricing_plan_id' => 'bpp_hacker_123', 'stripe_pricing_plan_id' => 'bpp_hacker_123',
'plan_name' => 'Hacker', 'plan_name' => 'Hacker',
'subscribed_quantity' => 2 'subscribed_quantity' => 2
@@ -79,7 +79,7 @@ describe Enterprise::Billing::CreateStripeCustomerService do
expect(Stripe::Customer).not_to have_received(:create) expect(Stripe::Customer).not_to have_received(:create)
expect(account.reload.custom_attributes).to include( expect(account.reload.custom_attributes).to include(
'stripe_customer_id' => 'cus_existing_v2', 'stripe_customer_id' => 'cus_existing_v2',
'stripe_billing_version' => 'v2', 'stripe_billing_version' => '2',
'stripe_pricing_plan_id' => 'bpp_hacker_123', 'stripe_pricing_plan_id' => 'bpp_hacker_123',
'plan_name' => 'Hacker', 'plan_name' => 'Hacker',
'subscribed_quantity' => 2 'subscribed_quantity' => 2
spec/enterprise/services/enterprise/billing/v2/usage_reporter_service_spec.rb
+1 -1
View File
@@ -1,7 +1,7 @@
require 'rails_helper' require 'rails_helper'
describe Enterprise::Billing::V2::UsageReporterService do describe Enterprise::Billing::V2::UsageReporterService do
let(:account) { create(:account, custom_attributes: { 'stripe_billing_version' => 2, 'stripe_customer_id' => 'cus_123' }) } let(:account) { create(:account, custom_attributes: { 'stripe_billing_version' => '2', 'stripe_customer_id' => 'cus_123' }) }
let(:service) { described_class.new(account: account) } let(:service) { described_class.new(account: account) }
describe '#report' do describe '#report' do