[Fmsystem-commits] [16767] more on eventplanner

[sigurdne]

Revision: 16767
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16767
Author:   sigurdne
Date:     2017-05-22 13:42:23 -0400 (Mon, 22 May 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.bobooking.inc.php
    trunk/eventplanner/inc/model/class.customer.inc.php
    trunk/eventplanner/setup/phpgw_no.lang
    trunk/eventplanner/templates/base/config.tpl

Modified: trunk/eventplanner/inc/class.bobooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.bobooking.inc.php      2017-05-22 15:40:35 UTC 
(rev 16766)
+++ trunk/eventplanner/inc/class.bobooking.inc.php      2017-05-22 17:42:23 UTC 
(rev 16767)
@@ -94,6 +94,7 @@
                        $config = CreateObject('phpgwapi.config', 
'eventplanner')->read();
 //                     _debug_array($booking);
 
+                       $customer_name  =$booking->customer_name;
                        $customer_contact_name = 
$booking->customer_contact_name;
                        $customer_contact_email = 
$booking->customer_contact_email;
                        $customer_contact_phone = 
$booking->customer_contact_phone;
@@ -107,8 +108,9 @@
                        $calendar = 
createObject('eventplanner.bocalendar')->read_single($calendar_id, true, 
$relaxe_acl = true);
                        $application = 
createObject('eventplanner.boapplication')->read_single($calendar->application_id,
 true, $relaxe_acl = true);
 //                     _debug_array($application);
+//                     _debug_array($application);
 
-
+                       $vendor_name = $application->vendor_name;
                        $vendor_contact_name = $application->contact_name;
                        $vendor_contact_email = $application->contact_email;
                        $vendor_contact_phone = $application->contact_phone;
@@ -115,10 +117,9 @@
                        $vendor_receipt_text = 
!empty($config['vendor_receipt_text']) ? $config['vendor_receipt_text'] : null;
                        $customer_receipt_text = 
!empty($config['customer_receipt_text']) ? $config['customer_receipt_text'] : 
null;
 
+                       $subject = !empty($config['receipt_subject']) ? 
$config['receipt_subject'] : $event_title;
                        $event_title = $application->title;
 
-                       $subject = $event_title;
-
                        $send = CreateObject('phpgwapi.send');
 
                        $lang_when = lang('when');
@@ -165,6 +166,13 @@
                                                        <b>{$lang_vendor}</b>
                                                </td>
                                                <td>
+                                                       {$vendor_name}
+                                               </td>
+                                       </tr>
+                                       <tr>
+                                               <td>
+                                               </td>
+                                               <td>
                                                        {$vendor_contact_name}
                                                </td>
                                        </tr>
@@ -194,6 +202,13 @@
                                                        <b>{$lang_customer}</b>
                                                </td>
                                                <td>
+                                                       {$customer_name}
+                                               </td>
+                                       </tr>
+                                       <tr>
+                                               <td>
+                                               </td>
+                                               <td>
                                                        {$customer_contact_name}
                                                </td>
                                        </tr>
@@ -254,7 +269,8 @@
 </html>
 HTML;
 
-                       /**
+//echo $content; die();
+               /**
                         * Vendor
                         */
                        $cc = $customer_contact_email;

Modified: trunk/eventplanner/inc/model/class.customer.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.customer.inc.php 2017-05-22 15:40:35 UTC 
(rev 16766)
+++ trunk/eventplanner/inc/model/class.customer.inc.php 2017-05-22 17:42:23 UTC 
(rev 16767)
@@ -223,6 +223,12 @@
                                        'query' => true,
                                        'sf_validator' => 
createObject('booking.sfValidatorNorwegianOrganizationNumber', array(), 
array('invalid' => '%field% is invalid')),
                                        'label' => 'organization number'
+                                       ),
+                                       'max_events' => array(
+                                               'action'=> 0,
+                                               'type' => 'int',
+                                               'query' => false,
+                                               'label' => 'maximum number of 
events',
                                        )
                        );
 

Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang      2017-05-22 15:40:35 UTC (rev 
16766)
+++ trunk/eventplanner/setup/phpgw_no.lang      2017-05-22 17:42:23 UTC (rev 
16767)
@@ -131,4 +131,5 @@
 when   eventplanner    no      Når
 where  eventplanner    no      Hvor
 vendor receipt text    eventplanner    no      utøvernotat ved kvittering
-customer receipt text  eventplanner    no      Mottakerstednotat ved kvittering
\ No newline at end of file
+customer receipt text  eventplanner    no      Mottakerstednotat ved kvittering
+receipt subject        eventplanner    no      Kvitteringsoverskrift
\ No newline at end of file

Modified: trunk/eventplanner/templates/base/config.tpl
===================================================================
--- trunk/eventplanner/templates/base/config.tpl        2017-05-22 15:40:35 UTC 
(rev 16766)
+++ trunk/eventplanner/templates/base/config.tpl        2017-05-22 17:42:23 UTC 
(rev 16767)
@@ -21,6 +21,12 @@
                        </td>
                </tr>
                <tr>
+                       <td>{lang_receipt_subject}:</td>
+                       <td>
+                               <input type="text" 
name="newsettings[receipt_subject]" value="{value_receipt_subject}">
+                       </td>
+               </tr>
+               <tr>
                        <td>{lang_vendor_receipt_text}:</td>
                        <td>
                                <textarea  
name="newsettings[vendor_receipt_text]">{value_vendor_receipt_text}</textarea>