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

068 bugfix

Browse Source
This commit is contained in:
smishchuk
2026-08-07 00:50:58 +03:00
parent 5cc71b6587
commit 8a38241d71
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.cfc
+1 -1
View File
@@ -87,7 +87,7 @@
<!--- global settings ---> <!--- global settings --->
<cfset request.RECORDS_PER_PAGE=500/> <cfset request.RECORDS_PER_PAGE=500/>
<cfset request.APP_VERSION="0.00.067"/> <cfset request.APP_VERSION="0.00.068"/>
<cfset request.STAND=getStand()/> <cfset request.STAND=getStand()/>
<cflock scope="application" type="readonly" timeout=3> <cflock scope="application" type="readonly" timeout=3>
crm2cloud.cfm
+8
View File
@@ -142,6 +142,9 @@ AS (
,round(sum(c.cnt * o.cnt)) AS quantity ,round(sum(c.cnt * o.cnt)) AS quantity
,count(*) AS lines ,count(*) AS lines
,STRING_AGG(DISTINCT c.code, ', ' ORDER BY c.code) AS codes ,STRING_AGG(DISTINCT c.code, ', ' ORDER BY c.code) AS codes
,e.end_customer_wz
,e.end_customer_uid
,e.end_customer_name
FROM stair o FROM stair o
JOIN elma.companies z ON o._companies = z.__id JOIN elma.companies z ON o._companies = z.__id
--LEFT JOIN component c on (c.__id = ANY (o.params)) --LEFT JOIN component c on (c.__id = ANY (o.params))
@@ -156,6 +159,9 @@ AS (
GROUP BY z.id_klienta GROUP BY z.id_klienta
,z.__id ,z.__id
,z.__name ,z.__name
,e.end_customer_wz
,e.end_customer_uid
,e.end_customer_name
) )
------------------------------ ------------------------------
,sold_cpu AS ( ,sold_cpu AS (
@@ -279,6 +285,8 @@ select
<d:field title="WZ Elma">r.wz as wz_sold</d:field> <d:field title="WZ Elma">r.wz as wz_sold</d:field>
<d:field title="Клиент">r.client as client_sold</d:field> <d:field title="Клиент">r.client as client_sold</d:field>
<d:field title="Конечник">r.end_customer_wz</d:field> <d:field title="Конечник">r.end_customer_wz</d:field>
<d:field title="Конечник">r.end_customer_uid</d:field>
<d:field title="Конечник">r.end_customer_name</d:field>
<d:field>r.company_uid</d:field> <d:field>r.company_uid</d:field>
<d:field title="WZ Cloud">a.wz as wz_alloc</d:field> <d:field title="WZ Cloud">a.wz as wz_alloc</d:field>
<d:field title="Manager">u.manager</d:field> <d:field title="Manager">u.manager</d:field>