Merge branch 'main' into stvnrlly-paperless-api

This commit is contained in:
stvnrlly
2023-02-06 12:28:10 -05:00
87 changed files with 2484 additions and 2087 deletions

View File

@@ -168,7 +168,7 @@ def test_create_nightly_billing_for_day_sms_rate_multiplier(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='mmg',
sent_by='sns',
international=False,
rate_multiplier=1.0,
billable_units=1,
@@ -177,7 +177,7 @@ def test_create_nightly_billing_for_day_sms_rate_multiplier(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='mmg',
sent_by='sns',
international=False,
rate_multiplier=second_rate,
billable_units=1,
@@ -212,7 +212,7 @@ def test_create_nightly_billing_for_day_different_templates(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='mmg',
sent_by='sns',
international=False,
rate_multiplier=1.0,
billable_units=1,
@@ -221,7 +221,7 @@ def test_create_nightly_billing_for_day_different_templates(
created_at=yesterday,
template=sample_email_template,
status='delivered',
sent_by='ses',
sent_by='sns',
international=False,
rate_multiplier=0,
billable_units=0,
@@ -260,7 +260,7 @@ def test_create_nightly_billing_for_day_different_sent_by(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='mmg',
sent_by='sns',
international=False,
rate_multiplier=1.0,
billable_units=1,
@@ -269,7 +269,7 @@ def test_create_nightly_billing_for_day_different_sent_by(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='firetext',
sent_by='sns',
international=False,
rate_multiplier=1.0,
billable_units=1,