[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12208] bkbooking: stavanger update message after com
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [12208] bkbooking: stavanger update message after comment in application |
|
Date: |
Mon, 20 Oct 2014 12:10:08 +0000 |
Revision: 12208
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12208
Author: kjell
Date: 2014-10-20 12:10:07 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
bkbooking: stavanger update message after comment in application
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.boapplication.inc.php
branches/stavangerkommune/booking/inc/class.boevent.inc.php
branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
branches/stavangerkommune/booking/templates/base/mail_settings.xsl
branches/stavangerkommune/bookingfrontend/inc/class.uiapplication.inc.php
Modified: branches/stavangerkommune/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boapplication.inc.php
2014-10-20 08:32:09 UTC (rev 12207)
+++ branches/stavangerkommune/booking/inc/class.boapplication.inc.php
2014-10-20 12:10:07 UTC (rev 12208)
@@ -6,6 +6,8 @@
function __construct()
{
parent::__construct();
+ $this->activity_bo = CreateObject('booking.boactivity');
+ $this->organization_bo = CreateObject('booking.boorganization');
$this->so = CreateObject('booking.soapplication');
}
@@ -54,8 +56,7 @@
}
$body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån er
".lang($application['status']);
- $body .=
'</p><pre>'.$config->config_data['application_mail_pending'].' <a
href="'.$link.'">Link til '.$config->config_data
-['application_mail_systemname'].': søknad #'.$application['id'].'</a></pre>';
+ $body .=
'</p><pre>'.$config->config_data['application_mail_pending'].' <a
href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></pre>';
$body .= "<pre>Godkjent: ".$adates."</pre>";
$body .= "<pre>Avvist: ".$rdates."</pre>";
@@ -90,7 +91,12 @@
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
- }
+ } else {
+ $subject =
$config->config_data['application_comment_mail_subject'];
+ $body =
"<pre><p>".$config->config_data['application_comment_added_mail']."</p>";
+ $body .= '<p>Kommentar fra saksbehandler:<br
/>'.$application['comment'].'</p></pre>';
+ $body .= '<p><a href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></p>';
+ }
$body .=
"<p>".$config->config_data['application_mail_signature']."</p>";
try
@@ -102,8 +108,62 @@
// TODO: Inform user if something goes wrong
}
}
-
- /**
+
+ /**
+ * @ Send message about comment on application to case officer.
+ */
+ function send_admin_notification($application, $message = null)
+ {
+ if (!(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server']))
+ return;
+ $send = CreateObject('phpgwapi.send');
+
+ $config = CreateObject('phpgwapi.config', 'booking');
+ $config->read();
+
+ $from = isset($config->config_data['email_sender']) &&
$config->config_data['email_sender'] ? $config->config_data['email_sender'] :
"noreply<address@hidden'phpgw_info']['server']['hostname']}>";
+
+ $external_site_address =
isset($config->config_data['external_site_address']) &&
$config->config_data['external_site_address'] ?
$config->config_data['external_site_address'] :
$GLOBALS['phpgw_info']['server']['webserver_url'];
+
+ $subject =
$config->config_data['application_comment_mail_subject_caseofficer'];
+
+ $mailadresses = $config->config_data['emails'];
+ $mailadresses = explode("\n", $mailadresses);
+
+ $link = $external_site_address .
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
+
+ $activity =
$this->activity_bo->read_single($application['activity_id']);
+
+ if (strlen($application['customer_organization_number']) == 9) {
+ $orgid =
$this->organization_bo->so->get_orgid($application['customer_organization_number']);
+ $organization = $this->organization_bo->read_single($orgid);
+ $body = '<b>Kommentar fra ' . $organization['name'] . '</b><br
/>' . $message . '<br /><br/>';
+ } else {
+ $body = '<b>Kommentar fra
'.$application['contact_name'].'</b><br />'.$message.'<br /><br/>';
+ }
+
+ $body .= '<b>Bygg: </b>'.$application['building_name'].'<br />';
+ $body .= '<b>Aktivitet: </b>'.$activity['name'].'<br /><br />';
+ $body .= '<b>Kontaktperson:</b>
'.$application['contact_name'].'<br />';
+ $body .= '<b>Epost:</b> '.$application['contact_email'].'<br />';
+ $body .= '<b>Telefon:</b> '.$application['contact_phone'].'<br
/><br />';
+ $body .= '<a href="'.$link.'">Lenke til søknad</a><br /><br />';
+
+ foreach ($mailadresses as $adr)
+ {
+ try
+ {
+ $send->msg('email', $adr, $subject, $body, '', '', '',
$from, '', 'html');
+ }
+ catch (phpmailerException $e)
+ {
+ // TODO: Inform user if something goes wrong
+ }
+ }
+ }
+
+
+ /**
* Returns an array of application ids from applications
assocciated with buildings
* which the given user has access to
*
Modified: branches/stavangerkommune/booking/inc/class.boevent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boevent.inc.php 2014-10-20
08:32:09 UTC (rev 12207)
+++ branches/stavangerkommune/booking/inc/class.boevent.inc.php 2014-10-20
12:10:07 UTC (rev 12208)
@@ -213,9 +213,6 @@
$body .= ' - <a href="'.$link.'">'.lang('Check calendar').'</a></p>';
$body .=
"<p>".$config->config_data['application_mail_signature']."</p>";
-
-
- print_r($body);
foreach ($mailadresses as $adr)
{
try
Modified: branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2014-10-20 08:32:09 UTC (rev 12207)
+++ branches/stavangerkommune/booking/inc/class.uiapplication.inc.php
2014-10-20 12:10:07 UTC (rev 12208)
@@ -791,9 +791,9 @@
$notify = true;
}
- $update AND $receipt =
$this->bo->update($application);
- $notify AND
$this->bo->send_notification($application);
-
+ $update AND $receipt = $this->bo->update($application);
+ $notify AND $this->bo->send_notification($application);
+
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id'=>$application['id']));
}
Modified: branches/stavangerkommune/booking/templates/base/mail_settings.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/mail_settings.xsl
2014-10-20 08:32:09 UTC (rev 12207)
+++ branches/stavangerkommune/booking/templates/base/mail_settings.xsl
2014-10-20 12:10:07 UTC (rev 12208)
@@ -10,6 +10,9 @@
<form action="" method="POST">
+ <dl class="form">
+ <dt class="heading"><xsl:value-of select="php:function('lang',
'Application email settings')"/></dt>
+ </dl>
<dl class="form-col">
<dt><label for="field_application_mail_systemname"><xsl:value-of
select="php:function('lang', 'System name')"/></label></dt>
<dd>
@@ -48,6 +51,28 @@
</dl>
+ <div class="clr"/>
+ <dl class="form">
+ <dt class="heading"><xsl:value-of select="php:function('lang',
'Application comment email settings')"/></dt>
+
+ <dt><label
for="field_application_comment_mail_subject_caseofficer"><xsl:value-of
select="php:function('lang', 'Subject caseofficer')"/></label></dt>
+ <dd>
+ <input id="field_application_comment_mail_subject_caseofficer"
name="application_comment_mail_subject_caseofficer" type="text" size="50">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/application_comment_mail_subject_caseofficer"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label
for="field_application_comment_mail_subject"><xsl:value-of
select="php:function('lang', 'Subject')"/></label></dt>
+ <dd>
+ <input id="field_application_comment_mail_subject"
name="application_comment_mail_subject" type="text" size="50">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/application_comment_mail_subject"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label
for="field_application_comment_added_mail"><xsl:value-of
select="php:function('lang', 'Mail text for comment added')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_comment_added_mail"
class="full-width settings" name="application_comment_added_mail"
type="text"><xsl:value-of
select="config_data/application_comment_added_mail"/></textarea>
+ </dd>
+ </dl>
+
<div class="form-buttons">
<input type="submit">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
Modified:
branches/stavangerkommune/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uiapplication.inc.php
2014-10-20 08:32:09 UTC (rev 12207)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uiapplication.inc.php
2014-10-20 12:10:07 UTC (rev 12208)
@@ -25,6 +25,8 @@
$this->add_comment($application,
$_POST['comment']);
$this->set_display_in_dashboard($application,
true, array('force' => true));
$application['frontend_modified'] = 'now';
+ $this->bo->send_admin_notification($application,
$_POST['comment']);
+
$receipt = $this->bo->update($application);
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id'=>$application['id'],
'secret'=>$application['secret']));
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12208] bkbooking: stavanger update message after comment in application,
Kjell Arne Espedal <=