use original columns instead of the converted_xxx columns

Author: reshmabidikar

reports/chargebacks_daily/v_report_chargebacks_daily.ddl

@@ -3,7 +3,7 @@ select
   ac.tenant_record_id
 , date_format(ac.created_date,'%Y-%m-%d') as day
 , ac.currency
-, sum(ac.converted_amount) as count
+, sum(ac.amount) as count
 from
   analytics_payment_chargebacks ac
 where 1=1

reports/conversion-total-dollar-amount/README.md

@@ -32,7 +32,7 @@ curl -v \
 |6| 2025-01-01 |ANNUAL|200|
 |1| 2025-04-01 |MONTHLY|30|
 
-Here `day` represents the first day of the month representing that subscription's conversion month. So if the subscription converts from TRIAL to EVERGREEN phase on `2025-04-15`, the day will be `2025-04-01`. The first row in the above table means that in the month of June, a revenue of `$30` was generated when `WEEKLY` subscriptions moved out of `TRIAL`.
+Here `day` represents the first day of the month representing that subscription's conversion month. So if the subscription converts from TRIAL to EVERGREEN phase on `2025-04-15`, the `day` value will be `2025-04-01`. The first row in the above table indicates that in the month of June, a revenue of `$30` was generated when `WEEKLY` subscriptions moved out of `TRIAL` phase.
 
 ## Report UI:
 

reports/invoice_item_adjustments_daily/v_report_invoice_item_adjustments_daily.ddl

@@ -3,7 +3,7 @@ select
   aiia.tenant_record_id
 , aiia.currency
 , date_format(aiia.created_date,'%Y-%m-%d') as day
-, sum(aiia.converted_amount) as count
+, sum(aiia.amount) as count
 from
   analytics_invoice_item_adjustments aiia
 where 1=1

reports/invoices_balance_daily/v_report_invoices_balance_daily.ddl

@@ -3,7 +3,7 @@ select
   ai.tenant_record_id
 , ai.currency
 , date_format(ai.created_date,'%Y-%m-%d') as day
-, sum(ai.converted_balance) as count
+, sum(ai.balance) as count
 from
   analytics_invoices ai
 where 1=1

reports/invoices_daily/v_report_invoices_daily.ddl

@@ -3,7 +3,7 @@ select
   ai.tenant_record_id
 , date_format(ai.created_date,'%Y-%m-%d') as day
 , ai.currency
-, sum(ai.converted_original_amount_charged) as count
+, sum(ai.original_amount_charged) as count
 from
   analytics_invoices ai
 where 1=1

reports/mrr/README.md

@@ -24,17 +24,17 @@ curl -v \
 
 ## Sample Data
 
-| tenant_record_id | product | day        | count  |
-| ---------------- | ------- | ---------- |--------|
-| 24               | Pistol  | 2025-01-05 | 150.00 |
-| 24               | Rifle   | 2025-01-05 | 200.00 |
-| 24               | ALL     | 2025-01-05 | 350.00 |
-| 24               | Pistol  | 2025-01-06 | 150.00 |
-| 24               | ALL     | 2025-01-06 | 150.00 |
+| tenant_record_id | currency | product       | day        | count    |
+|------------------|----------|---------------|------------|----------|
+| 1                | USD      | Pistol        | 2025-08-07 | 224.6292 |
+| 1                | USD      | Blowdart      | 2025-08-07 | 29.9500  |
+| 1                | EUR      | Knife         | 2025-08-07 | 29.9500  |
+| 1                | USD      | Assault-Rifle | 2025-08-07 | 499.9958 |
+| 2                | USD      | Pistol        | 2025-08-07 | 100.0000 |
+| 2                | USD      | All           | 2025-08-07 | 100.0000 |
 
 
-TODO: - add currency to view??
-// The first row in the above table indicates that on the date `2025-01-05`, the MRR for the `Pistol` product was $150 for `tenant_record_id=1`.
+The first row in the above table indicates that on the date `2025-08-07`, the MRR for the `Pistol` product was $150 for `tenant_record_id=1`.
 
 ## Report UI:
 

reports/mrr/v_report_mrr_daily.ddl

@@ -1,9 +1,10 @@
 create or replace view v_report_mrr_daily as
 select
   ast.tenant_record_id
+, ast.next_currency as currency
 , ifnull(ast.next_product_name, ast.prev_product_name) as product
 , date_format(cal.d,'%Y-%m-%d') as day
-, sum(ast.converted_next_mrr) as count
+, sum(ast.next_mrr) as count
 from
   calendar cal
   left join analytics_subscription_transitions ast on cast(date_format(ast.next_start_date, '%Y-%m-%d') as date) <= cast(date_format(cal.d, '%Y-%m-%d') as date)
@@ -13,12 +14,13 @@ where 1=1
   and ast.report_group='default'
   and ast.next_service='entitlement-service'
   and ifnull(ast.next_mrr, 0) > 0
-group by 1,2,3
+group by 1,2,3,4
 union select
   ast.tenant_record_id
+, ast.next_currency as currency
 , 'ALL' as product
 , date_format(cal.d,'%Y-%m-%d') as day
-, sum(ast.converted_next_mrr) as count
+, sum(ast.next_mrr) as count
 from
   calendar cal
   left join analytics_subscription_transitions ast on cast(date_format(ast.next_start_date, '%Y-%m-%d') as date) <= cast(date_format(cal.d, '%Y-%m-%d') as date)
@@ -28,5 +30,5 @@ where 1=1
   and ast.report_group='default'
   and ast.next_service='entitlement-service'
   and ifnull(ast.next_mrr, 0) > 0
-group by 1,2,3
-;
+group by 1,2,3,4
+;

reports/payments_total_daily/v_report_payments_total_daily.ddl

@@ -3,13 +3,13 @@ select
   tenant_record_id,
   date_format(created_date,'%Y-%m-%d') as day,
   currency,
-  sum(ifnull(converted_amount, 0)) as count
+  sum(ifnull(amount, 0)) as count
 from (
     select
       ac.tenant_record_id,
       ac.created_date,
       ac.currency,
-      ac.converted_amount
+      ac.amount
     from analytics_payment_captures ac
     where ac.payment_transaction_status = 'SUCCESS'
       and ac.report_group='default'
@@ -20,7 +20,7 @@ from (
       ap.tenant_record_id,
       ap.created_date,
       ap.currency,
-      ap.converted_amount
+      ap.amount
     from analytics_payment_purchases ap
     where ap.payment_transaction_status = 'SUCCESS'
       and ap.report_group='default'

reports/refunds_total_daily/v_report_refunds_total_daily.ddl

@@ -3,7 +3,7 @@ select
   ar.tenant_record_id
 , date_format(ar.created_date,'%Y-%m-%d') as day
 , ar.currency as currency
-, sum(abs(ar.converted_invoice_amount_refunded)) as count
+, sum(abs(ar.invoice_amount_refunded)) as count
 from
   analytics_payment_refunds ar
 where 1=1