From f9caae3045df4c8f533c172ace6326661ea18890 Mon Sep 17 00:00:00 2001
From: unknown <smishchuk@nubes.ru>
Date: Mon, 17 Aug 2026 13:29:02 +0300
Subject: [PATCH] json.cfm fix

---
 Application.cfc |  2 +-
 json.cfm        | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index eb0baa1..665751c 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -108,7 +108,7 @@
 
 		<!--- global settings --->				
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.031"/>
+		<cfset request.APP_VERSION="0.00.032"/>
 		<cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
 		<cfset request.STAND=getStand()/>	
 		
diff --git a/json.cfm b/json.cfm
index 2bf0c4e..2900425 100644
--- a/json.cfm
+++ b/json.cfm
@@ -95,8 +95,8 @@ function gaussianRound(numeric number, numeric precision = 0) {
 							,"codeMetered"="#m_code#"
 							,"component"="#component#"
 							,"unit"="#unit#"							
-							,"freeTier"="#free_tier#"
-							,"price"="#gaussianRound(discounted_price,2)#"							
+							,"freeTier"=#isNumeric(free_tier) ? free_tier : 0#
+							,"price"=#isNumeric(discounted_price) ? gaussianRound(discounted_price,2) : javaCast("null",0)#							
 							,"details"=[]
 						]/>
 						
@@ -116,8 +116,10 @@ function gaussianRound(numeric number, numeric precision = 0) {
 						</cfoutput><!--- dimension_1 --->
 						
 						<!--- считаем, что free_tier NOT NULL (вместо NULL 0) --->
-						<cfset var payable_metric_dimension_1 = (isNumeric(accum_metric_dimension_1))? max(ceiling(accum_metric_dimension_1) - free_tier, 0):javaCast("null",0)/>
-						<cfset var cost_dimension_1 = precisionEvaluate("gaussianRound(payable_metric_dimension_1*gaussianRound(discounted_price, 2), 2)")/>
+						<cfset var freeTier = isNumeric(free_tier) ? free_tier : 0/>
+						<cfset var payable_metric_dimension_1 = isNumeric(accum_metric_dimension_1) ? max(ceiling(accum_metric_dimension_1) - freeTier, 0) : 0/>
+						<!--- кажется, payable_metric_dimension_1 гарантированно isNumeric --->
+						<cfset var cost_dimension_1 = isNumeric(discounted_price) ? precisionEvaluate("gaussianRound(payable_metric_dimension_1*gaussianRound(discounted_price, 2), 2)") : 0/>
 						<cfset accum_cost_svc = precisionEvaluate("accum_cost_svc + cost_dimension_1")/>
 						
 						<cfset "temp.component.metric"=#(accum_metric_dimension_1 NEQ 0 AND isNumeric(accum_metric_dimension_1))? round(accum_metric_dimension_1,3):javaCast("null",0)#/>