|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [17078] property: more on order layout |
| Date: | Fri, 15 Sep 2017 05:06:54 -0400 (EDT) |
Revision: 17078
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17078
Author: sigurdne
Date: 2017-09-15 05:06:53 -0400 (Fri, 15 Sep 2017)
Log Message:
-----------
property: more on order layout
Modified Paths:
--------------
trunk/property/inc/class.soagreement.inc.php
trunk/property/inc/class.sotts.inc.php
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.soagreement.inc.php
===================================================================
--- trunk/property/inc/class.soagreement.inc.php 2017-09-14 19:11:55 UTC
(rev 17077)
+++ trunk/property/inc/class.soagreement.inc.php 2017-09-15 09:06:53 UTC
(rev 17078)
@@ -1193,9 +1193,13 @@
return $this->db->f('descr', true);
}
- function get_vendor_contract ( $vendor_id )
+ function get_vendor_contract ( $vendor_id = 0)
{
$vendor_id = (int)$vendor_id;
+ if(!$vendor_id)
+ {
+ return array();
+ }
$this->db->query("SELECT contract_id, name FROM
fm_agreement WHERE status = 'active' AND contract_id IS NOT NULL AND vendor_id
= {$vendor_id}", __LINE__, __FILE__);
$values = array();
while ($this->db->next_record())
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2017-09-14 19:11:55 UTC (rev
17077)
+++ trunk/property/inc/class.sotts.inc.php 2017-09-15 09:06:53 UTC (rev
17078)
@@ -1745,6 +1745,8 @@
$value_set['branch_id'] = $ticket['branch_id'];
$value_set['tax_code'] = $ticket['tax_code'];
$value_set['continuous'] =
$ticket['continuous'];
+ $value_set['order_deadline'] =
$ticket['order_deadline'];// delete value if empty
+ $value_set['order_deadline2'] =
$ticket['order_deadline2'];// delete value if empty
if(!empty($ticket['order_deadline']))
{
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2017-09-14 19:11:55 UTC (rev
17077)
+++ trunk/property/templates/base/tts.xsl 2017-09-15 09:06:53 UTC (rev
17078)
@@ -1024,34 +1024,51 @@
</div>
<div
class="pure-control-group">
+
<xsl:variable name="lang_period">
+
<xsl:value-of select="php:function('lang', 'period')"/>
+
</xsl:variable>
<label>
<xsl:value-of select="php:function('lang', 'cost estimate')"/>
</label>
-
<input class="pure-input-1-2" id="field_budget" type="text"
name="values[budget]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Enter the
budget')"/>
-
</xsl:attribute>
-
</input>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
-
<xsl:variable name="lang_period">
-
<xsl:value-of select="php:function('lang', 'period')"/>
-
</xsl:variable>
+
<table class="pure-table pure-u-md-1-2">
+
<thead>
+
<tr>
+
<th>
+
<xsl:value-of select="php:function('lang',
'Enter the budget')"/>
+
<xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
+
</th>
+
<th>
+
<xsl:value-of select='$lang_period'/>
+
</th>
+
</tr>
+
</thead>
+
<tbody>
+
<tr>
+
<td>
-
<select name="values[budget_period]">
-
<xsl:attribute name="title">
-
<xsl:value-of select='$lang_period'/>
-
</xsl:attribute>
-
<xsl:apply-templates select="year_list/options"/>
-
</select>
-
-
<xsl:text> </xsl:text> [ <xsl:value-of select='$lang_period'/> ]
+
<input id="field_budget" type="text"
name="values[budget]">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'Enter the budget')"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
<td>
+
<select name="values[budget_period]"
style="width: 14em;">
+
<xsl:attribute name="title">
+
<xsl:value-of
select='$lang_period'/>
+
</xsl:attribute>
+
<xsl:apply-templates
select="year_list/options"/>
+
</select>
+
</td>
+
</tr>
+
</tbody>
+
</table>
</div>
<div
class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'budget')"/>
</label>
-
-
<div class = 'pure-u-md-1-3'>
+
<div class = 'pure-u-md-1-2'>
<!--div id="paging_4"> </div>
<div class="pure-table" id="datatable-container_4"/-->
<xsl:for-each select="datatable_def">
@@ -1070,31 +1087,46 @@
</div>
</div>
-
-
-
<div
class="pure-control-group">
+
<xsl:variable name="lang_period">
+
<xsl:value-of select="php:function('lang', 'period')"/>
+
</xsl:variable>
<label>
<xsl:value-of select="php:function('lang', 'payment')"/>
</label>
-
<input type="text" name="values[actual_cost]">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Enter actual
cost')"/>
-
</xsl:attribute>
-
</input>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
-
<xsl:variable name="lang_period">
-
<xsl:value-of select="php:function('lang', 'period')"/>
-
</xsl:variable>
+
<table class="pure-table pure-u-md-1-2">
+
<thead>
+
<tr>
+
<th>
+
<xsl:value-of select="php:function('lang',
'Enter actual cost')"/>
+
<xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
-
<select name="values[actual_cost_period]" class="pure-input-1-2">
-
<xsl:attribute name="title">
-
<xsl:value-of select='$lang_period'/>
-
</xsl:attribute>
-
<xsl:apply-templates select="period_list/options"/>
-
</select>
-
-
<xsl:text> </xsl:text> [ <xsl:value-of select='$lang_period'/> ]
+
</th>
+
<th>
+
<xsl:value-of select='$lang_period'/>
+
</th>
+
</tr>
+
</thead>
+
<tbody>
+
<tr>
+
<td>
+
<input type="text" name="values[actual_cost]">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'Enter actual cost')"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
<td>
+
<select name="values[actual_cost_period]"
style="width: 14em;">
+
<xsl:attribute name="title">
+
<xsl:value-of
select='$lang_period'/>
+
</xsl:attribute>
+
<xsl:apply-templates
select="period_list/options"/>
+
</select>
+
</td>
+
</tr>
+
</tbody>
+
</table>
</div>
<div
class="pure-control-group">
<label>
@@ -1101,7 +1133,7 @@
<xsl:value-of select="php:function('lang', 'actual cost')"/>
</label>
-
<div class = 'pure-u-md-1-3'>
+
<div class = 'pure-u-md-1-2'>
<!--div id="paging_4"> </div>
<div class="pure-table" id="datatable-container_4"/-->
<xsl:for-each select="datatable_def">
@@ -1135,51 +1167,53 @@
<xsl:value-of select="php:function('lang', 'send order')"/>
</label>
<table class="pure-table pure-u-md-1-2">
-
<tr>
-
<td valign = 'top'>
-
<select name="values[send_order_format]">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'format')"/>
-
</xsl:attribute>
-
<option value="html">
-
<xsl:text>HTML</xsl:text>
-
</option>
-
<option value="pdf">
-
<xsl:text>PDF</xsl:text>
-
</option>
-
</select>
-
</td>
-
<td>
-
<!--div id="paging_3"/>
-
<div class="pure-table" id="datatable-container_3"/-->
-
<xsl:for-each select="datatable_def">
-
<xsl:if test="container =
'datatable-container_3'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param
name="container" select ='container'/>
-
<xsl:with-param
name="requestUrl" select ='requestUrl'/>
-
<xsl:with-param
name="ColumnDefs" select ='ColumnDefs'/>
-
<xsl:with-param name="data"
select ='data'/>
-
<xsl:with-param
name="tabletools" select ='tabletools' />
-
<xsl:with-param name="config"
select ='config'/>
-
</xsl:call-template>
-
</xsl:if>
-
</xsl:for-each>
-
</td>
-
</tr>
-
<tr>
-
<td valign="top">
-
<label>
-
<xsl:value-of select="php:function('lang',
'extra mail address')"/>
-
</label>
-
</td>
-
<td>
-
<input type="text" name="values[vendor_email][]"
value="{value_extra_mail_address}">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'The order will also be sent to this one')"/>
-
</xsl:attribute>
-
</input>
-
</td>
-
</tr>
+
<thead>
+
<tr>
+
<th>
+
<select name="values[send_order_format]">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'format')"/>
+
</xsl:attribute>
+
<option value="html">
+
<xsl:text>HTML</xsl:text>
+
</option>
+
<option value="pdf">
+
<xsl:text>PDF</xsl:text>
+
</option>
+
</select>
+
</th>
+
</tr>
+
</thead>
+
<tbody>
+
<tr>
+
<td>
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container =
'datatable-container_3'">
+
<xsl:call-template
name="table_setup">
+
<xsl:with-param
name="container" select ='container'/>
+
<xsl:with-param
name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param
name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param
name="data" select ='data'/>
+
<xsl:with-param
name="tabletools" select ='tabletools' />
+
<xsl:with-param
name="config" select ='config'/>
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+
</td>
+
</tr>
+
<tr>
+
<td>
+
<label>
+
<xsl:value-of
select="php:function('lang', 'extra mail address')"/>
+
</label>
+
<input type="text"
name="values[vendor_email][]" value="{value_extra_mail_address}">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'The order will also be sent to this one')"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
</tr>
+
</tbody>
</table>
</div>
| [Prev in Thread] | Current Thread | [Next in Thread] |