[Fmsystem-commits] [7759] property: order footer on html order

[Sigurd Nes]

Revision: 7759
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7759
Author:   sigurdne
Date:     2011-09-30 11:59:03 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
property: order footer on html order

Modified Paths:
--------------
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/templates/base/wo_hour.xsl

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2011-09-30 10:54:25 UTC (rev 
7758)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2011-09-30 11:59:03 UTC (rev 
7759)
@@ -1429,7 +1429,9 @@
                                        'values_view_order'                     
        => $values_hour,
                                        'sms_data'                              
                => $sms_data,
                                        'use_yui_table'                         
        => true,
-                                       'contact_data'                          
        => $contact_data
+                                       'contact_data'                          
        => $contact_data,
+                                       'order_footer_header'                   
=> $this->config->config_data['order_footer_header'],
+                                       'order_footer'                          
        => $this->config->config_data['order_footer']
                                );
 
                        if($send_order && !$to_email)

Modified: trunk/property/templates/base/wo_hour.xsl
===================================================================
--- trunk/property/templates/base/wo_hour.xsl   2011-09-30 10:54:25 UTC (rev 
7758)
+++ trunk/property/templates/base/wo_hour.xsl   2011-09-30 11:59:03 UTC (rev 
7759)
@@ -927,6 +927,26 @@
                                                <xsl:apply-templates 
select="sms_data"/>
                                        </xsl:when>
                                </xsl:choose>
+
+                               <xsl:choose>
+                                       <xsl:when 
test="order_footer_header!=''">
+                                               <tr>
+                                                       <td>
+                                                               <br/>
+                                                               
<h4><xsl:value-of select="order_footer_header"/></h4>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="order_footer!=''">
+                                               <tr>
+                                                       <td>
+                                                               <xsl:value-of 
select="order_footer"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
                        </table>
                </font>
        </xsl:template>
@@ -2441,6 +2461,7 @@
        <xsl:template match="sms_data">
                <tr>
                        <td>
+                               <br/>
                                <xsl:value-of select="heading"/>
                        </td>
                </tr>