079 bug fixes
This commit is contained in:
+1
-1
@@ -87,7 +87,7 @@
|
||||
|
||||
<!--- global settings --->
|
||||
<!--- *************************************************************************************************** --->
|
||||
<cfset request.APP_VERSION="0.00.078"/> <!--- *********************************************************** --->
|
||||
<cfset request.APP_VERSION="0.00.079"/> <!--- *********************************************************** --->
|
||||
<!--- *************************************************************************************************** --->
|
||||
<cfset request.STAND=getStand()/>
|
||||
<cfset request.RECORDS_PER_PAGE=500/>
|
||||
|
||||
@@ -413,10 +413,10 @@ from qS3Vol
|
||||
</cfif>
|
||||
|
||||
union all
|
||||
select wz, code || '.vol', get as raw_metric, get_10k as metric, '10k' as unit, bucket as dimension1
|
||||
select wz, code || '.get', get as raw_metric, get_10k as metric, '10k' as unit, bucket as dimension1
|
||||
from qS3OpsTrf
|
||||
<cfif len(code)>
|
||||
where code || '.vol' like <cfqueryparam cfsqltype="cf_sql_varchar" value="%#code#%"/>
|
||||
where code || '.get' like <cfqueryparam cfsqltype="cf_sql_varchar" value="%#code#%"/>
|
||||
</cfif>
|
||||
|
||||
union all
|
||||
@@ -487,10 +487,10 @@ SELECT
|
||||
<d:field title="Артикул по специф.">s.code as s_code</d:field><!--- содержит суффикс типа тарификации --->
|
||||
<d:field title="SKU code по специф.">s.sku_code as sku_code</d:field><!--- без суффикса --->
|
||||
<d:field title="Артикул по метрикам">m.code as m_code</d:field><!--- без суффикса --->
|
||||
<d:field title="Кол-во компонента по спец.">s.component_quantity</d:field>
|
||||
<d:field title="Кол-во сервиса по спец.">s.service_quantity</d:field>
|
||||
<d:field title="Скидка на сервис">s.service_discount</d:field>
|
||||
<d:field title="Free Tier">coalesce(s.free_tier,0) as free_tier</d:field>
|
||||
<d:field title="Кол-во компонента по спец." cfSqlType="CF_SQL_NUMERIC">s.component_quantity</d:field>
|
||||
<d:field title="Кол-во сервиса по спец." cfSqlType="CF_SQL_NUMERIC">s.service_quantity</d:field>
|
||||
<d:field title="Скидка на сервис" cfSqlType="CF_SQL_NUMERIC">s.service_discount</d:field>
|
||||
<d:field title="Free Tier" cfSqlType="CF_SQL_NUMERIC">coalesce(s.free_tier,0) as free_tier</d:field>
|
||||
<d:field>m.dimension1</d:field>
|
||||
<d:field title="Тип по спец.">s.type</d:field>
|
||||
<d:field title="Ед.изм.">m.unit</d:field>
|
||||
@@ -583,7 +583,7 @@ ORDER BY coalesce(coalesce(c.wz, m.wz), s.wz), coalesce(s.code, m.code)
|
||||
по <input type="text" name="dt_finish" value="#dateFormat(dt_finish,'YYYY-MM-DD')#"/>
|
||||
Только PAYG <input type="checkbox" name="only_articles_in_spec" value="1"<cfif only_articles_in_spec> checked</cfif>/>
|
||||
WZ <input type="text" name="wz" value="#wz#"/>по вхождению, с регистром
|
||||
Код <input type="text" name="code" value="#code#"/>>по вхождению
|
||||
Код <input type="text" name="code" value="#code#"/>по вхождению
|
||||
<input type="submit" style="cursor:pointer;"/>
|
||||
<input type="submit" name="DEBUG" value="DEBUG" style="cursor:pointer;"/><!--- #dateFormat( input, "yyyy-mm-dd" )#T#timeFormat( input, "HH:mm:ss.lXX" )# --->
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user