diff --git a/Application.cfc b/Application.cfc index 665751c..7058d61 100644 --- a/Application.cfc +++ b/Application.cfc @@ -108,7 +108,7 @@ - + diff --git a/mod/compute_payg.cfm b/mod/compute_payg.cfm index db28e17..52d67f1 100644 --- a/mod/compute_payg.cfm +++ b/mod/compute_payg.cfm @@ -417,7 +417,7 @@ from a s.code as s_code m.code as m_code s.service_code - s.sku_code + s.sku_code s.svc s.component m.unit @@ -486,7 +486,7 @@ from a s_code m_code - s_code as code + coalesce(sku_code, m_code) as code service_code sku_code svc diff --git a/payg.cfm b/payg.cfm index 847324b..d73a4bf 100644 --- a/payg.cfm +++ b/payg.cfm @@ -197,7 +197,7 @@ S3 операции и трафик: #currentRow# - #dimension_1_name# + #dimension_1_name# #dimension_1# #dateFormat(dt_billed_from,"YYYY-MM-DD")# #dateFormat(dt_billed_to,"YYYY-MM-DD")# @@ -225,7 +225,7 @@ S3 операции и трафик: - Итого #code# (#m_code#): + Итого #code# (#m_code#): #round(final_metric_dimension_1,3)# #free_tier# #max(final_metric_dimension_1 - free_tier, 0)#