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

019 some version navigation

Browse Source
This commit is contained in:
msyu
2025-08-29 23:46:53 +03:00
parent 791a652a9b
commit db421e12fd
4 changed files with 255 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deal.cfm
+9 -7
View File
@@ -76,7 +76,7 @@
left outer join elma.companies k on (d._companies=k.__id)
left outer join elma.comp_users_ext c on (d._owner=c.__id)
left outer join s on (d.__status_status=s.status_id)
where d.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id#/>
where d.__id=<cfqueryparam cfsqltype="cf_sql_other" value=#d.__id# null=#!isValid("guid",d.__id)#/>
</cfquery>
@@ -157,7 +157,7 @@
,g.date_of_aggrement
from elma.additional_agreements a
join elma.aggrements g on (a.contract_uid=g.__id)
where a.deal_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#"/>
where a.deal_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid("guid",d.__id)#/>
</cfquery>
<cfloop query=#qAgreement#>
<a href="additional_agreement.cfm?__id=#__id#&#tr.fwx#" title="доп.соглашение">#__name#</a>
@@ -242,7 +242,7 @@
) as param_cnt
from elma.deals_services siv
left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement))
where <cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#"/>=ANY(siv.deal)
where <cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid("guid",d.__id)#/>=ANY(siv.deal)
and siv.is_actual
order by version::int
</cfquery>
@@ -255,11 +255,12 @@
<table class="worktable">
<thead>
<tr>
<th>__id</th>
<th>__index</th>
<!--- <th>__name</th> --->
<th>user_description</th>
<th>Кол-во</th>
<th>Скидка%</th>
<th width="5%">Сумма</th>
<th>abstractive_service_code</th>
<th>modifier_code</th>
<th>is_actual</th>
@@ -273,7 +274,7 @@
<th width="5%">date_end</th>
<th>is_easy</th>
<th>Компонентов</th>
<th width="5%">Сумма</th>
<!--- <th>additional_agreement_uid</th> --->
<th>additional_agreement</th>
</tr>
@@ -281,11 +282,12 @@
<cfoutput query="qService">
<tr>
<td class="c"><a href="deal_service.cfm?__id=#__id#&#tr.fwx#">#__id#</a></td>
<td class="c"><a href="deal_service.cfm?__id=#__id#&#tr.fwx#" title="__id">#__index#</a></td>
<!--- <td class="c">#__name#</td> --->
<td class="c">#user_description#</td>
<td class="c">#cnt#</td>
<td class="c">#discount#</td>
<td class="r">#nFmt(line_cost)#</td>
<td class="c">#abstractive_service_code#</td>
<td class="c">#modifier_code#</td>
<td class="c">#is_actual#</td>
@@ -299,7 +301,7 @@
<td class="c">#dateFormat(date_end,'YYYY-MM-DD')#</td>
<td class="c"><cfif is_easy GT 0>Простая<cfelseif is_easy EQ 0>Композитная<cfelse>is_easy=#is_easy#</cfif></td>
<td class="c">#param_cnt#</td>
<td class="r">#nFmt(line_cost)#</td>
<!--- <td class="c">#additional_agreement_uid#</td> --->
<td class="c"><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>
</tr>