smishchuk/payg-report-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json.cfm fix

Browse Source
This commit is contained in:
smishchuk
2026-08-17 13:29:02 +03:00
parent 91b6687220
commit f9caae3045
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.cfc
+1 -1
View File
@@ -108,7 +108,7 @@
<!--- global settings ---> <!--- global settings --->
<cfset request.RECORDS_PER_PAGE=500/> <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#/> <cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
<cfset request.STAND=getStand()/> <cfset request.STAND=getStand()/>
json.cfm
+6 -4
View File
@@ -95,8 +95,8 @@ function gaussianRound(numeric number, numeric precision = 0) {
,"codeMetered"="#m_code#" ,"codeMetered"="#m_code#"
,"component"="#component#" ,"component"="#component#"
,"unit"="#unit#" ,"unit"="#unit#"
,"freeTier"="#free_tier#" ,"freeTier"=#isNumeric(free_tier) ? free_tier : 0#
,"price"="#gaussianRound(discounted_price,2)#" ,"price"=#isNumeric(discounted_price) ? gaussianRound(discounted_price,2) : javaCast("null",0)#
,"details"=[] ,"details"=[]
]/> ]/>
@@ -116,8 +116,10 @@ function gaussianRound(numeric number, numeric precision = 0) {
</cfoutput><!--- dimension_1 ---> </cfoutput><!--- dimension_1 --->
<!--- считаем, что free_tier NOT NULL (вместо NULL 0) ---> <!--- считаем, что 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 freeTier = isNumeric(free_tier) ? free_tier : 0/>
<cfset var cost_dimension_1 = precisionEvaluate("gaussianRound(payable_metric_dimension_1*gaussianRound(discounted_price, 2), 2)")/> <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 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)#/> <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)#/>