[Fmsystem-commits] [11991] property: add link to email from invoicehandling

[Sigurd Nes]

Revision: 11991
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11991
Author:   sigurdne
Date:     2014-05-27 19:36:23 +0000 (Tue, 27 May 2014)
Log Message:
-----------
property: add link to email from invoicehandling

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice2.inc.php
    trunk/property/js/portico/ajax_invoice.js
    trunk/property/templates/base/invoice2.xsl

Modified: trunk/property/inc/class.uiinvoice2.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice2.inc.php 2014-05-26 14:11:56 UTC (rev 
11990)
+++ trunk/property/inc/class.uiinvoice2.inc.php 2014-05-27 19:36:23 UTC (rev 
11991)
@@ -620,6 +620,7 @@
                                'td_count'                                      
        => '""',
                                'base_java_url'                                 
=> "{menuaction:'property.uiinvoice2.query'}",
                                'property_js'                                   
=> 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+                               'email_base_url'                                
=> json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'property.uiinvoice2.index'),true,true)),
                                'datatable'                                     
        => $datavalues,
                                'myColumnDefs'                                  
=> $myColumnDefs,
                                'myButtons'                                     
        => $myButtons,

Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js   2014-05-26 14:11:56 UTC (rev 
11990)
+++ trunk/property/js/portico/ajax_invoice.js   2014-05-27 19:36:23 UTC (rev 
11991)
@@ -62,6 +62,7 @@
                $("#close_order_orig").val( '' );
                $("#park_order").html( '' );
                $("#receipt").html('');
+               $("#email_link").html('');
 
                var voucher_id = $(this).val();
                var oArgs = {menuaction:'property.uiinvoice2.get_first_line'};
@@ -606,6 +607,12 @@
                                        $("#approve_as2").html( htmlString2 );
                        //              $("#approve_as").html( htmlString );
                                }
+                               var Url_email = email_base_url + '&voucher_id=' 
+ voucher[0].voucher_id;
+
+                               var email_buttons = "<input type=\"button\" 
name=\"Kopier til utklippstavle\" onClick=\"copyToClipboard('"+Url_email+"');\" 
value=\"Kopier til utklippstavle\" title=\"Kopier til utklippstavle\">";
+                               email_buttons += "<a 
href=\"mailto:?&subject=Link til faktura\" target=\"_\"><input type=\"button\" 
value=\"Åpne epost\"/></a>";
+                               $("#email_link").html(email_buttons);
+
                        }
                        else
                        {
@@ -642,6 +649,7 @@
                                $("#order_text").html( 'Bestilling' );
                                $("#invoice_id_text").html('FakturaNr');
                                $("#receipt").html('');
+                               $("#email_link").html('');
                                document.getElementById('image_content').src = 
'';
                        }
                }
@@ -710,3 +718,8 @@
 
 
 
+function copyToClipboard(text) {
+  window.prompt("Kopier til utklippstavle: Ctrl+C, Enter", text);
+ // window.open("mailto:?&subject=Link til faktura");
+ // window.close();
+}
\ No newline at end of file

Modified: trunk/property/templates/base/invoice2.xsl
===================================================================
--- trunk/property/templates/base/invoice2.xsl  2014-05-26 14:11:56 UTC (rev 
11990)
+++ trunk/property/templates/base/invoice2.xsl  2014-05-27 19:36:23 UTC (rev 
11991)
@@ -499,6 +499,13 @@
        <xsl:template xmlns:php="http://php.net/xsl"; name="approve">
                <xsl:apply-templates 
select="voucher_info/generic/approved_list"/>
                <tr class ='row_off'>
+                       <td>
+                       </td>
+                       <td>
+                               <div id = 'email_link'></div>
+                       </td>
+               </tr>
+               <tr class ='row_off'>
                        <input id="sign_orig" type="hidden" 
name="values[sign_orig]" value="{voucher_info/generic/sign_orig}"/>
                        <input id="my_initials" type="hidden" 
name="values[my_initials]" value="{voucher_info/generic/my_initials}"/>
                        <td class="th_text" align="left" valign="top" 
style="white-space: nowrap;">
@@ -506,14 +513,6 @@
                        </td>
                        <td class="th_text" valign="top" align="left">
                                <div id = "approve_as2"> </div>
-                               <!--
-                               <select id = "approve_as" 
name="values[approve]" with="40">
-                                       <xsl:attribute name="title">
-                                               <xsl:value-of 
select="php:function('lang', 'approve as')"/>
-                                       </xsl:attribute>
-                                       <xsl:apply-templates 
select="voucher_info/generic/approve_list/options"/>
-                               </select>
-                               -->
                        </td>
                </tr>
                <tr class ='row_off'>
@@ -587,6 +586,7 @@
 
                <!--  DATATABLE DEFINITIONS-->
                <script type="text/javascript">
+                       var email_base_url = <xsl:value-of 
select="//email_base_url"/>;
                        var property_js = <xsl:value-of 
select="//property_js"/>;
                        var base_java_url = <xsl:value-of 
select="//base_java_url"/>;
                        var datatable = new Array();