[Fmsystem-commits] [7584] property: configurable request for email receipts at orders

[Sigurd Nes]

Revision: 7584
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7584
Author:   sigurdne
Date:     2011-09-14 08:50:46 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
property: configurable request for email receipts at orders

Modified Paths:
--------------
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/inc/hook_settings.inc.php
    trunk/property/setup/phpgw_no.lang
    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-13 13:45:08 UTC (rev 
7583)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2011-09-14 08:50:46 UTC (rev 
7584)
@@ -1198,6 +1198,8 @@
                        $print                  = phpgw::get_var('print', 
'bool');
                        $sent_ok                = phpgw::get_var('print', 
'bool');
                        $send_as_pdf    = phpgw::get_var('send_as_pdf', 'bool');
+                       $email_receipt  = phpgw::get_var('email_receipt', 
'bool');
+                       
 
                        if($update_email)
                        {
@@ -1544,7 +1546,7 @@
                                        {
                                                $GLOBALS['phpgw']->send = 
CreateObject('phpgwapi.send');
                                        }
-                                       $rcpt = 
$GLOBALS['phpgw']->send->msg('email', $to_email, $subject, $body, '', $cc, 
$bcc, $from_email, $from_name, 'html', '', $attachments, true);
+                                       $rcpt = 
$GLOBALS['phpgw']->send->msg('email', $to_email, $subject, $body, '', $cc, 
$bcc, $from_email, $from_name, 'html', '', $attachments, $email_receipt);
                                }
                                else
                                {
@@ -1699,6 +1701,7 @@
                                        'lang_to_email_address_statustext'      
=> lang('The address to which this order will be sendt'),
                                        'to_email'                              
                        => $to_email,
                                        'email_list'                            
                => $email_list,
+                                       'requst_email_receipt'                  
        => 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['request_order_email_rcpt'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['request_order_email_rcpt']==1
 ? 1 : 0,
                                        'lang_select_email'                     
                => lang('Select email'),
                                        'send_order_action'                     
                => $GLOBALS['phpgw']->link('/index.php',array(
                                                                                
                                                'menuaction'    => 
'property.uiwo_hour.view',

Modified: trunk/property/inc/hook_settings.inc.php
===================================================================
--- trunk/property/inc/hook_settings.inc.php    2011-09-13 13:45:08 UTC (rev 
7583)
+++ trunk/property/inc/hook_settings.inc.php    2011-09-14 08:50:46 UTC (rev 
7584)
@@ -196,6 +196,7 @@
 
        create_select_box('Send order receipt as email 
','order_email_rcpt',$yes_and_no,'Send the order as BCC to the user');
        create_select_box('Notify owner of project/order on 
change','notify_project_owner',$yes_and_no,'By email');
+       create_select_box('request an email 
receipt','request_order_email_rcpt',$yes_and_no,'request a confirmation email 
when your email is opened by the recipient');
 
        $default_start_page =array
        (

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2011-09-13 13:45:08 UTC (rev 7583)
+++ trunk/property/setup/phpgw_no.lang  2011-09-14 08:50:46 UTC (rev 7584)
@@ -1306,6 +1306,8 @@
 request        property        no      Behov
 project.request        property        no      Behov
 request attributes     property        no      Behov::attributter
+request an email receipt       property        no      Be om kvittering
+request a confirmation email when your email is opened by the recipient        
property        no      Be om epost som kvittering når mottaker åpner eposten.
 request %1 has been edited     property        no      anmodning %1 er oppdater
 request %1 has been saved      property        no      anmodning %1 er lagret
 request budget property        no      Budsjett for tiltak

Modified: trunk/property/templates/base/wo_hour.xsl
===================================================================
--- trunk/property/templates/base/wo_hour.xsl   2011-09-13 13:45:08 UTC (rev 
7583)
+++ trunk/property/templates/base/wo_hour.xsl   2011-09-14 08:50:46 UTC (rev 
7584)
@@ -429,6 +429,21 @@
                                                                                
        </tr>
                                                                                
        <tr>
                                                                                
                <td class="th_text"  align="left">
+                                                                               
                        <xsl:value-of select="php:function('lang', 'request an 
email receipt')" />
+                                                                               
                </td>
+                                                                               
                <td  align="left">
+                                                                               
                        <input type="checkbox" name="email_receipt" 
value="true">
+                                                                               
                                <xsl:attribute name="title">
+                                                                               
                                        <xsl:value-of 
select="php:function('lang', 'request a confirmation email when your email is 
opened by the recipient')" />
+                                                                               
                                </xsl:attribute>
+                                                                               
                                <xsl:if test="requst_email_receipt != 0">
+                                                                               
                                        <xsl:attribute name="checked" 
value="checked" />
+                                                                               
                                </xsl:if>
+                                                                               
                        </input>
+                                                                               
                </td>
+                                                                               
        </tr>
+                                                                               
        <tr>
+                                                                               
                <td class="th_text"  align="left">
                                                                                
                        <xsl:value-of select="lang_update_email"/>
                                                                                
                </td>
                                                                                
                <td  align="left">