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

094 reformatting

Browse Source
This commit is contained in:
smishchuk
2026-10-20 14:31:35 +03:00
parent 7d13814797
commit e00bbba5c0
2 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.cfc
+1 -1
View File
@@ -89,7 +89,7 @@
<!--- global settings ---> <!--- global settings --->
<!--- *************************************************************************************************** ---> <!--- *************************************************************************************************** --->
<cfset request.APP_VERSION="0.00.093"/> <!--- *********************************************************** ---> <cfset request.APP_VERSION="0.00.094"/> <!--- *********************************************************** --->
<!--- *************************************************************************************************** ---> <!--- *************************************************************************************************** --->
<cfset request.STAND=getStand()/> <cfset request.STAND=getStand()/>
<cfset request.RECORDS_PER_PAGE=500/> <cfset request.RECORDS_PER_PAGE=500/>
payg.cfm
+37 -40
View File
@@ -726,32 +726,32 @@ S3 операции и трафик: <b<cfif datediff("h",qS3OpsTrfAge.dt_load,
<th width="3%">Цена &#8381; со скид., с НДС</th> <th width="3%">Цена &#8381; со скид., с НДС</th>
<th width="3%">Стоимость &#8381; с НДС</th> <th width="3%">Стоимость &#8381; с НДС</th>
<td width="3%">&nbsp;&nbsp;&nbsp;</td> <td width="10%">Сделка</td>
<td width="3%">Конечник</td>
<td width="10%">Компонент</td> <td width="10%">Компонент</td>
<td width="15%">Польз. наим.</td> <td width="15%">Польз. наим.</td>
<td width="3%">GPL с НДС</td> <!--- <td width="3%">GPL с НДС</td>
<td width="3%">Скидка%</td> <td width="3%">Скидка%</td> --->
<td width="3%">Дата НОУ</td> <td width="3%">Дата НОУ</td>
<td width="3%">Дата КОУ</td> <td width="3%">Дата КОУ</td>
<td width="5%">Ключ строки</td> <!--- <td width="5%">Ключ строки</td> --->
<td width="3%">Сырая метрика</td> <td width="3%">Сырая метрика</td>
<td width="3%">Приведен&shy;ная метрика</td> <td width="3%">Приведен&shy;ная метрика</td>
<td width="3%">Цена &#8381; до ск. с НДС</td> <td width="3%">Цена &#8381; до ск. с НДС</td>
<td width="3%">Цена &#8381; co ск. с НДС без окр.</td> <td width="3%">Цена &#8381; co ск. с НДС без окр.</td>
<td width="3%">Service Quantity</td> <td width="3%">Кол-во сервиса</td>
<td width="3%">Service Discount</td> <td width="3%">Скидка на сервис</td>
<td width="3%">Component Quantity</td> <td width="3%">Кол-во комп-та</td>
<td width="3%">Component Discount</td> <td width="3%">Скидка на комп-т %</td>
<td width="5%">Договор</td> <!--- <td width="5%">Договор</td>
<td width="10%">Допник</td> <td width="10%">Допник</td> --->
<td width="10%">Сделка</td>
<td width="3%">Конечник</td>
</thead> </thead>
<cfoutput query="qCharge" group="wz"> <cfoutput query="qCharge" group="wz">
@@ -775,11 +775,11 @@ S3 операции и трафик: <b<cfif datediff("h",qS3OpsTrfAge.dt_load,
<cfoutput group="code"> <cfoutput group="code">
<cfoutput group="serviceStart"> <cfoutput group="serviceStart">
<cfset accum_metric_svc += isNumeric(metric) ? metric : 0/> <cfset accum_metric_svc += isNumeric(metric) ? metric : 0/>
<cfset accum_metric_dimension_1 = 0/> <cfset accum_metric_dimension_1 = 0/>
<cfset accum_metric_dimension_1_all = 0/><!--- не различая PAYG/FIX ---> <cfset accum_metric_dimension_1_all = 0/><!--- не различая PAYG/FIX --->
<cfset current_price=0/> <cfset current_price=0/>
<cfoutput><!--- dimensions ---> <cfoutput><!--- dimensions --->
<cfif type EQ 3> <cfif type EQ 3>
<cfset accum_metric_dimension_1 += isNumeric(metric) ? metric : 0/> <cfset accum_metric_dimension_1 += isNumeric(metric) ? metric : 0/>
@@ -804,35 +804,34 @@ S3 операции и трафик: <b<cfif datediff("h",qS3OpsTrfAge.dt_load,
<span style="color:red">ORPHAN: Only in Metrics</span> <span style="color:red">ORPHAN: Only in Metrics</span>
<cfelse> <cfelse>
<span style="color:red">Other Discrepancy</span> <span style="color:red">Other Discrepancy</span>
</cfif><!--- </cfif>
-- Key matches 1:1, but numeric values differ
WHEN occurrences_in_a = 1 AND occurrences_in_b = 1 AND amount_a != amount_b
THEN 'KEY MATCH / AMOUNT MISMATCH' --->
</td> </td>
<td>#abstract_service#<cfif len(modifier)>: #modifier#</cfif></a></td> <td>#abstract_service#<cfif len(modifier)>: #modifier#</cfif></a></td>
<td><div<cfif type EQ 3> style="background:lightgreen;color:black;"</cfif>>#s_code#</div></td> <td><div<cfif type EQ 3> style="background:lightgreen;color:black;"</cfif>>#s_code#</div></td>
<td class=<cfif type EQ 3 AND component_quantity NEQ 1>"err r"<cfelse>"r"</cfif>>#component_quantity#</td> <td class=<cfif type EQ 3 AND component_quantity NEQ 1>"err r"<cfelse>"r"</cfif>>#component_quantity#</td>
<td>#m_code#</td> <td>#m_code#</td>
<td>#dimension1#</td> <td>#dimension1#</td>
<td class="r" style="font-size:110%; padding:0 1em;">#request.roundSafe(metric,3)#</td>
<td class="r">#free_tier#</td> <td class="r" style="padding:0 1em;">#request.roundSafe(metric,3)#</td>
<td></td> <td class="r"><!--- #free_tier# ---></td>
<td></td>
<td style="font-size:90%;">#unit# <cfif len(ed_izm)>[#ed_izm#]</cfif></td><!--- #len(unit)?unit:'['& ed_izm &']'# ---> <td style="font-size:90%;">#unit# <cfif len(ed_izm)>[#ed_izm#]</cfif></td><!--- #len(unit)?unit:'['& ed_izm &']'# --->
<td class="r">#gaussianRound(discounted_price,2)#</td> <td class="r">#gaussianRound(discounted_price,2)#</td>
<td class="r"></td> <td class="r"></td>
<td></td> <td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal#</a></td>
<td>#WZE#</td>
<td>#component#</td> <td>#component#</td>
<td>#user_description#</td> <td>#user_description#</td>
<td class="r">#gaussianRoundSafe(price,2)#</td> <!--- <td class="r">#gaussianRoundSafe(price,2)#</td>
<td class="r">#component_discount#</td> <td class="r">#component_discount#</td> --->
<td class="r">#dateFormat(serviceStart,'YYYY-MM-DD')#</td> <td class="r">#dateFormat(serviceStart,'YYYY-MM-DD')#</td>
<td class="r">#dateFormat(serviceEnd,'YYYY-MM-DD')#</td> <td class="r">#dateFormat(serviceEnd,'YYYY-MM-DD')#</td>
<td class="r">#line_key#</td> <!--- <td class="r">#line_key#</td> --->
<td class="r" style="color:##bbb">#request.roundSafe(raw_metric,3)#</td> <td class="r" style="color:##bbb">#request.roundSafe(raw_metric,3)#</td>
<td class="r">#request.roundSafe(metric,3)#</td> <td class="r">#request.roundSafe(metric,3)#</td>
@@ -844,26 +843,25 @@ S3 операции и трафик: <b<cfif datediff("h",qS3OpsTrfAge.dt_load,
<td class="r">#component_quantity#</td> <td class="r">#component_quantity#</td>
<td class="r">#component_discount#</td> <td class="r">#component_discount#</td>
<td><a href="contract.cfm?__id=#contract_uid#&#tr.fwx#">#contract#</a></td> <!--- <td><a href="contract.cfm?__id=#contract_uid#&#tr.fwx#">#contract#</a></td>
<td><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td> <td><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td> --->
<td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal#</a></td>
<td>#WZE#</td>
</tr> </tr>
</cfoutput> </cfoutput><!--- /dimensions --->
<cfset final_metric_dimension_1 = ceiling(accum_metric_dimension_1)/> <cfset final_metric_dimension_1 = ceiling(accum_metric_dimension_1)/>
<cfset final_metric_dimension_1_all = ceiling(accum_metric_dimension_1_all)/> <cfset final_metric_dimension_1_all = ceiling(accum_metric_dimension_1_all)/>
<cfset cost_dimension_1 = precisionEvaluate("gaussianRound(max(final_metric_dimension_1 - free_tier, 0)*current_price, 2)")/> <cfset cost_dimension_1 = precisionEvaluate("gaussianRound(max(final_metric_dimension_1 - free_tier, 0)*current_price, 2)")/>
<cfset accum_cost_svc = precisionEvaluate("accum_cost_svc + cost_dimension_1")/><!--- простое сложение дает ошибку округления и лишние знаки, но и precisionEvaluate не выглядит слишком надежным ---> <cfset accum_cost_svc = precisionEvaluate("accum_cost_svc + cost_dimension_1")/><!--- простое сложение дает ошибку округления и лишние знаки, но и precisionEvaluate не выглядит слишком надежным --->
<tr> <tr>
<td colspan="4"></td> <td colspan="5"></td>
<td colspan="2" class="b r">Итого #code#:</td> <td colspan="2" class="b r">Итого #code#:</td>
<td class="b r" style="font-size:110%; padding:0 1em;"><!--- #accum_metric_dimension_1# ---><cfif final_metric_dimension_1 NEQ 0 AND isNumeric(final_metric_dimension_1)>#round(final_metric_dimension_1,3)#</cfif></td> <td class="b r" style="padding:0 1em;"><!--- #accum_metric_dimension_1# ---><cfif final_metric_dimension_1 NEQ 0 AND isNumeric(final_metric_dimension_1)>#round(final_metric_dimension_1,3)#</cfif></td>
<td class="b r">#free_tier#</td> <td class="b r">#free_tier#</td>
<td class="b r" style="font-size:120%; padding:0 1em;"><cfif final_metric_dimension_1 NEQ 0 AND isNumeric(final_metric_dimension_1)>#max(ceiling(final_metric_dimension_1) - free_tier, 0)#</cfif></td> <td class="b r" style="padding:0 1em;"><cfif final_metric_dimension_1 NEQ 0 AND isNumeric(final_metric_dimension_1)>#max(ceiling(final_metric_dimension_1) - free_tier, 0)#</cfif></td>
<td class="b c">#unit# <cfif len(ed_izm)>[#ed_izm#]</cfif></td> <td class="b c">#unit# <cfif len(ed_izm)>[#ed_izm#]</cfif></td>
<td class="b r">#current_price#</td> <td class="b r">#current_price#</td>
<td class="b r">#gaussianRoundSafe(cost_dimension_1,2)#</td> <td class="b r">#gaussianRoundSafe(cost_dimension_1,2)#</td>
<td></td>
<td colspan="8"></td> <td colspan="8"></td>
<td class="b r" title="сумма корректна, если нет замножения строк из-за наличия PAYG и FIX по одному артикулу">#request.roundSafe(accum_metric_dimension_1_all,3)#<!--- #final_metric_dimension_1_all# ---></td> <td class="b r" title="сумма корректна, если нет замножения строк из-за наличия PAYG и FIX по одному артикулу">#request.roundSafe(accum_metric_dimension_1_all,3)#<!--- #final_metric_dimension_1_all# ---></td>
<td colspan="100"></td> <td colspan="100"></td>
@@ -873,9 +871,8 @@ S3 операции и трафик: <b<cfif datediff("h",qS3OpsTrfAge.dt_load,
<tr> <tr>
<td bgcolor="##eee" style="border-bottom:2px solid gray;"></td> <td bgcolor="##eee" style="border-bottom:2px solid gray;"></td>
<td bgcolor="##eee" colspan="10" class="r b" style="border-bottom:2px solid gray;">Итого <a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#:</td> <td bgcolor="##eee" colspan="11" class="r b" style="border-bottom:2px solid gray;">Итого <a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#:</td>
<td bgcolor="##eee" class="r b nw" style="border-bottom:2px solid gray; font-size:130%;">#accum_cost_svc#</td> <td bgcolor="##eee" class="r b nw" style="border-bottom:2px solid gray;">#accum_cost_svc#</td>
<td bgcolor="##eee" style="border-bottom:2px solid gray;"></td>
<td bgcolor="##eee" colspan="99" style="border-bottom:2px solid gray;"></td> <td bgcolor="##eee" colspan="99" style="border-bottom:2px solid gray;"></td>
</tr > </tr >
</cfoutput><!--- wz ---> </cfoutput><!--- wz --->