[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17068] property: ticket order
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17068] property: ticket order |
|
Date: |
Tue, 12 Sep 2017 13:03:46 -0400 (EDT) |
Revision: 17068
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17068
Author: sigurdne
Date: 2017-09-12 13:03:45 -0400 (Tue, 12 Sep 2017)
Log Message:
-----------
property: ticket order
Modified Paths:
--------------
trunk/property/inc/class.uitts.inc.php
trunk/property/templates/base/config.tpl
trunk/property/templates/base/contact_form.xsl
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-09-12 14:11:12 UTC (rev
17067)
+++ trunk/property/inc/class.uitts.inc.php 2017-09-12 17:03:45 UTC (rev
17068)
@@ -3629,6 +3629,10 @@
{
$organisation =
$this->bo->config->config_data['org_name'];
}
+ if (isset($this->bo->config->config_data['department']))
+ {
+ $department =
$this->bo->config->config_data['department'];
+ }
$on_behalf_of_assigned =
phpgw::get_var('on_behalf_of_assigned', 'bool');
if ($on_behalf_of_assigned &&
isset($ticket['assignedto_name']))
@@ -3648,16 +3652,16 @@
$user_name =
$GLOBALS['phpgw_info']['user']['fullname'];
}
$ressursnr =
$GLOBALS['phpgw_info']['user']['preferences']['property']['ressursnr'];
- $location = lang('Address') . ":
{$ticket['address']}<br>";
+ $location = $ticket['address'];
$address_element =
$this->bo->get_address_element($ticket['location_code']);
foreach ($address_element as $address_entry)
{
- $location .= "{$address_entry['text']}:
{$address_entry['value']} <br>";
+ $location .= " <br/>{$address_entry['text']}:
{$address_entry['value']}";
}
- $location = rtrim($location, '<br>');
+ // $location = rtrim($location, '<br/>');
$order_description = $ticket['order_descr'];
@@ -3750,36 +3754,37 @@
$date = $GLOBALS['phpgw']->common->show_date(time(),
$dateformat);
- $body = "<table><tr>";
- $body .= "<td valign='top'>{$organisation}<br/>Org.nr:
{$this->bo->config->config_data['org_unit_id']}</td>";
- $body .= "<td valign='top'>" . lang('order id') .
"<br/><b>{$ticket['order_id']}</b></td>";
+ $lang_order = lang('order');
+ $lang_from = lang('from');
+ $body = "<table style='width: 800px;'><tr>";
+ $body .= "<td valign='top'>{$lang_order}:
{$order_id}</td>";
+ $body .= "<td valign='top'>" . lang('date') .
":{$date}</td>";
+ $body .= "</tr>";
$body .= "<tr>";
- $body .= "<td valign='top'>" . lang('vendor') .
"<br/>" . $this->_get_vendor_name($ticket['vendor_id']) . "</td>";
- $body .= "<td>" . lang('delivery address') .
"<br/>{$location}</td>";
+ $body .= "<td valign='top'>{$lang_from}:
{$organisation}<br/>"
+ . "{$department}<br/>"
+ . "Org.nr:
{$this->bo->config->config_data['org_unit_id']}"
+ . "</td>";
+ $body .= "<td valign='top'>v/Saksbehandler:
{$user_name}<br/>"
+ . "Ressursnr.: {$ressursnr}<br/>"
+ . "</td>";
$body .= "</tr>";
$body .= "<tr>";
- $body .= "<td valign='top'>";
- $body .= lang('date') . ":{$date}<br/>";
- $body .= lang('dimb') . ": {$ticket['ecodimb']}<br/>";
- $body .= lang('from') . ":
{$user_name}<br/>{$user_phone}<br/>{$user_email}<br/>";
- $body .= "</td>";
+ $body .= "<td colspan=2>" . lang('delivery address') .
"<br/>{$location}</td>";
+ $body .= "</tr>";
+ $body .= "<tr>";
+ $body .= "<td valign='top'>" . lang('to') . ":<br/>" .
$this->_get_vendor_name($ticket['vendor_id']) . "</td>";
+ $body .= "<td valign='top'>" . lang('invoice address')
. ":<br/>{$this->bo->config->config_data['invoice_address']}</td>";
- $body .= "<td valign='top'>" . lang('invoice address')
. "<br/>{$this->bo->config->config_data['invoice_address']}</td>";
+ $body .= "</tr></table>";
if($ticket['order_deadline'])
{
- $body .= "<tr><td>";
- $body .= lang('deadline');
- $body .= "</td>";
- $body .= "<td>";
- $body .= "<b>{$ticket['order_deadline']}</b>";
- $body .= "</td></tr>";
+ $body .= "<br/><br/><b>" . lang('deadline') .
'</b>';
+ $body .= "<br/>" . $ticket['order_deadline'];
}
- $body .= "</tr></table><br/>";
-
-
- $body .= nl2br(str_replace(array
+ $body .= '<br/>'. nl2br(str_replace(array
(
'__vendor_name__',
'__organisation__',
Modified: trunk/property/templates/base/config.tpl
===================================================================
--- trunk/property/templates/base/config.tpl 2017-09-12 14:11:12 UTC (rev
17067)
+++ trunk/property/templates/base/config.tpl 2017-09-12 17:03:45 UTC (rev
17068)
@@ -17,6 +17,10 @@
<td><input name="newsettings[org_name]"
value="{value_org_name}"></td>
</tr>
<tr>
+ <td>{lang_department}:</td>
+ <td><input name="newsettings[department]"
value="{value_department}"></td>
+ </tr>
+ <tr>
<td>{lang_org_unit_id}:</td>
<td><input name="newsettings[org_unit_id]"
value="{value_org_unit_id}"></td>
</tr>
Modified: trunk/property/templates/base/contact_form.xsl
===================================================================
--- trunk/property/templates/base/contact_form.xsl 2017-09-12 14:11:12 UTC
(rev 17067)
+++ trunk/property/templates/base/contact_form.xsl 2017-09-12 17:03:45 UTC
(rev 17068)
@@ -1,46 +1,59 @@
<!-- $Id$ -->
<xsl:template name="contact_form">
- <xsl:apply-templates select="contact_data"/>
+ <xsl:apply-templates select="contact_data"/>
</xsl:template>
<!-- New template-->
<xsl:template match="contact_data">
- <script type="text/javascript">
- function <xsl:value-of select="field"/>_contact_lookup()
- {
- TINY.box.show({iframe:'<xsl:value-of select="contact_link"/>',
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
- }
- </script>
+ <script type="text/javascript">
+ function <xsl:value-of select="field"/>_contact_lookup()
+ {
+ TINY.box.show({iframe:'<xsl:value-of
select="contact_link"/>',
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
+ }
+ function <xsl:value-of select="field"/>_contact_clear(field)
+ {
+ $("#" + field).val('');
+ $("#" + field + "_name").val('');
+ $("#" + field + "_contact_tel").html('');
+ $("#" + field + "_contact_email").html('');
+ $("#" + field + "_clear_contact").prop("checked",
false);
+ }
+ </script>
<div class="pure-control-group">
<label for='contact'>
- <a
href="javascript:{field}_contact_lookup()" title="{lang_select_contact_help}">
- <xsl:value-of
select="lang_contact"/>
- </a>
- </label>
+ <a href="javascript:{field}_contact_lookup()"
title="{lang_select_contact_help}">
+ <xsl:value-of select="lang_contact"/>
+ </a>
+ </label>
<div class="pure-custom">
- <input type="hidden" name="{field}"
value="{value_contact_id}"></input>
- <input size="30"
type="text" name="{field}_name" value="{value_contact_name}"
onClick="{field}_contact_lookup();" readonly="readonly">
- <xsl:attribute
name="title">
-
<xsl:value-of select="lang_select_contact_help"/>
- </xsl:attribute>
- </input>
- <xsl:choose>
- <xsl:when
test="value_contact_tel!=''">
- <div>
-
<xsl:value-of select="value_contact_tel"/>
+ <input type="hidden" id="{field}" name="{field}"
value="{value_contact_id}"></input>
+ <input size="30" type="text" id="{field}_name"
name="{field}_name" value="{value_contact_name}"
onClick="{field}_contact_lookup();" readonly="readonly">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_select_contact_help"/>
+ </xsl:attribute>
+ </input>
+ <xsl:choose>
+ <xsl:when test="value_contact_tel!=''">
+ <div id="{field}_contact_tel">
+ <xsl:value-of
select="value_contact_tel"/>
</div>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="value_contact_email!=''">
- <div>
- <a
href="mailto:{value_contact_email}";>
-
<xsl:value-of select="value_contact_email"/>
- </a>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="value_contact_email!=''">
+ <div id="{field}_contact_email">
+ <a
href="mailto:{value_contact_email}";>
+ <xsl:value-of
select="value_contact_email"/>
+ </a>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
</div>
+ <input type="checkbox" id="{field}_clear_contact"
name="clear_contact" value="0" onClick="{field}_contact_clear('{field}');"
readonly="readonly">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'clear contact')"/>
+ </xsl:attribute>
+ </input>
</div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17068] property: ticket order,
sigurdne <=