[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14683] tts: alter modified date on payment update
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14683] tts: alter modified date on payment update |
|
Date: |
Wed, 27 Jan 2016 12:22:26 +0000 |
Revision: 14683
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14683
Author: sigurdne
Date: 2016-01-27 12:22:20 +0000 (Wed, 27 Jan 2016)
Log Message:
-----------
tts: alter modified date on payment update
Modified Paths:
--------------
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
Modified:
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
---
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2016-01-27 12:02:22 UTC (rev 14682)
+++
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2016-01-27 12:22:20 UTC (rev 14683)
@@ -1,42 +1,41 @@
<?php
/**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage import
- * @version $Id$
- */
-
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package property
+ * @subpackage import
+ * @version $Id$
+ */
/**
* Filteret importerer rapporter fra Agresso som grunnlag for
oppdatering av øknomi og status på meldings_bestilling.
* @package property
*/
-
include_class('property', 'cron_parent', 'inc/cron/');
- class import_oppdatering_av_bestilling_fra_agresso_bkb extends
property_cron_parent
+ class import_oppdatering_av_bestilling_fra_agresso_bkb extends
property_cron_parent
{
- var $function_name =
'import_oppdatering_av_bestilling_fra_agresso_bkb';
+
+ var $function_name =
'import_oppdatering_av_bestilling_fra_agresso_bkb';
var $debug = true;
protected $updated_tickects = array();
protected $updated_tickects_per_file = array();
@@ -48,12 +47,12 @@
$this->function_name = get_class($this);
$this->sub_location = lang('ticket');
- $this->function_msg = 'Importer rapport fra Agresso
for oppdatering av meldinger';
+ $this->function_msg = 'Importer rapport fra Agresso for
oppdatering av meldinger';
- $this->sotts =
CreateObject('property.sotts');
- $this->config =
CreateObject('admin.soconfig',$GLOBALS['phpgw']->locations->get_id('property',
'.invoice'));
- $this->send =
CreateObject('phpgwapi.send');
- $this->historylog =
CreateObject('property.historylog','tts');
+ $this->sotts = CreateObject('property.sotts');
+ $this->config = CreateObject('admin.soconfig',
$GLOBALS['phpgw']->locations->get_id('property', '.invoice'));
+ $this->send = CreateObject('phpgwapi.send');
+ $this->historylog = CreateObject('property.historylog',
'tts');
}
public function execute()
@@ -62,27 +61,27 @@
$dirname =
$this->config->config_data['import']['local_path'];
// prevent path traversal
- if ( preg_match('/\./', $dirname)
- || !is_dir($dirname) )
+ if(preg_match('/\./', $dirname)
+ || !is_dir($dirname))
{
return array();
}
$file_list = array();
$dir = new DirectoryIterator($dirname);
- if ( is_object($dir) )
+ if(is_object($dir))
{
- foreach ( $dir as $file )
+ foreach($dir as $file)
{
- if ( $file->isDot()
- || !$file->isFile()
- || !$file->isReadable()
- || strcasecmp( end( explode(
".", $file->getPathname() ) ), 'csv' ) != 0 )
- {
+ if($file->isDot()
+ || !$file->isFile()
+ || !$file->isReadable()
+ || strcasecmp(end(explode(".",
$file->getPathname())), 'csv') != 0)
+ {
continue;
}
- $file_list[] = (string)
"{$dirname}/{$file}";
+ $file_list[] =
(string)"{$dirname}/{$file}";
}
}
@@ -92,7 +91,7 @@
{
$this->db->transaction_begin();
- if ($this->debug)
+ if($this->debug)
{
_debug_array("Start import
file: $file");
}
@@ -100,14 +99,14 @@
$this->updated_tickects_per_file =
array();
$ok = $this->import($file);
- if ($ok)
+ if($ok)
{
// move file
$_file = basename($file);
$movefrom =
"{$dirname}/{$_file}";
$moveto =
"{$dirname}/archive/{$_file}";
- if( is_file($moveto) )
+ if(is_file($moveto))
{
@unlink($moveto);//in
case of duplicates
}
@@ -121,7 +120,7 @@
else
{
$this->db->transaction_commit();
- $this->updated_tickects
= array_merge($this->updated_tickects,$this->updated_tickects_per_file);
+ $this->updated_tickects
= array_merge($this->updated_tickects, $this->updated_tickects_per_file);
}
}
else
@@ -131,11 +130,10 @@
}
}
- if (!$this->debug)
+ if(!$this->debug)
{
$this->alert_assigned();
}
-
}
else
{
@@ -147,23 +145,23 @@
protected function get_files()
{
- $server =
$this->config->config_data['common']['host'];
- $user =
$this->config->config_data['common']['user'];
- $password =
$this->config->config_data['common']['password'];
- $directory_remote =
rtrim($this->config->config_data['import']['remote_basedir'],'/');
- $directory_local =
rtrim($this->config->config_data['import']['local_path'],'/');
+ $server = $this->config->config_data['common']['host'];
+ $user = $this->config->config_data['common']['user'];
+ $password =
$this->config->config_data['common']['password'];
+ $directory_remote =
rtrim($this->config->config_data['import']['remote_basedir'], '/');
+ $directory_local =
rtrim($this->config->config_data['import']['local_path'], '/');
try
{
$connection = ftp_connect($server);
}
- catch (Exception $e)
+ catch(Exception $e)
{
$this->receipt['error'][] = array('msg' =>
$e->getMessage());
}
// try to authenticate with username root, password
secretpassword
- if(!ftp_login($connection,$user,$password))
+ if(!ftp_login($connection, $user, $password))
{
echo "fail: unable to authenticate\n";
}
@@ -172,7 +170,7 @@
// allright, we're in!
echo "okay: logged in...<br/>";
- if (!ftp_chdir($connection, $directory_remote))
+ if(!ftp_chdir($connection, $directory_remote))
{
echo ("Change Dir Failed:
$dir<BR>\r\n");
return false;
@@ -182,21 +180,21 @@
$files = array();
echo "Scanning {$directory_remote}<br/>";
- $files = ftp_nlist($connection,'.');
+ $files = ftp_nlist($connection, '.');
- if ($this->debug)
+ if($this->debug)
{
_debug_array($files);
}
foreach($files as $file_name)
{
- if ($this->debug)
+ if($this->debug)
{
-
_debug_array('preg_match("/csv$/i",'. $file_name . ': ' . preg_match('/csv$/i',
$file_name));
+
_debug_array('preg_match("/csv$/i",' . $file_name . ': ' .
preg_match('/csv$/i', $file_name));
}
- if( preg_match('/csv$/i', $file_name) )
+ if(preg_match('/csv$/i', $file_name))
{
$file_remote = $file_name;
$file_local =
"{$directory_local}/{$file_name}";
@@ -232,15 +230,15 @@
$file_name = basename($file);
- $fp = fopen($file,'rb');
+ $fp = fopen($file, 'rb');
- while (($data = fgetcsv($fp, 1000, ";")) !== false &&
$ok == true )
+ while(($data = fgetcsv($fp, 1000, ";")) !== false &&
$ok == true)
{
- if( preg_match('/^PENGER/i', $file_name) )
+ if(preg_match('/^PENGER/i', $file_name))
{
$ok = $this->update_amount($data);
}
- else if( preg_match('/^STATUS/i', $file_name) )
+ else if(preg_match('/^STATUS/i', $file_name))
{
$ok = true;
if(trim($data[2]))//check for order_id
@@ -263,52 +261,53 @@
}
//prosjektnummer;prosjektstatus;bestillingsnummer;beløp
- $agresso_prosjekt = trim($data[0]);
- $prosjektstatus = trim($data[1]);
- $order_id = trim($data[2]);
- $diff_actual_cost = (float)trim($data[3]);
+ $agresso_prosjekt = trim($data[0]);
+ $prosjektstatus = trim($data[1]);
+ $order_id = trim($data[2]);
+ $diff_actual_cost = (float)trim($data[3]);
- $this->db->query("SELECT id FROM fm_tts_tickets WHERE
order_id= '{$order_id}'",__LINE__,__FILE__);
+ $this->db->query("SELECT id FROM fm_tts_tickets WHERE
order_id= '{$order_id}'", __LINE__, __FILE__);
$this->db->next_record();
- $id = $this->db->f('id');
+ $id = $this->db->f('id');
if(!$id)
{
- $this->receipt['error'][] = array('msg'
=>"Oppdatere beløp for agresso prosjekt {$agresso_prosjekt}: fant ikke
bestillingen, hopper over: {$order_id}");
+ $this->receipt['error'][] = array('msg' =>
"Oppdatere beløp for agresso prosjekt {$agresso_prosjekt}: fant ikke
bestillingen, hopper over: {$order_id}");
return false;
}
- $this->db->query("SELECT sum(amount) AS actual_cost
FROM fm_tts_payments WHERE ticket_id = {$id}", __LINE__,__FILE__);
+ $this->db->query("SELECT sum(amount) AS actual_cost
FROM fm_tts_payments WHERE ticket_id = {$id}", __LINE__, __FILE__);
$this->db->next_record();
$old_actual_cost = (float)$this->db->f('actual_cost');
$new_actual_cost = $old_actual_cost + $diff_actual_cost;
$value_set_cost = array
- (
- 'ticket_id' => $id,
- 'amount' => $diff_actual_cost,
- 'period' => date('Ym'),
- 'remark' => 'Oppdatert fra Agresso',
- 'created_on'=> time(),
- 'created_by'=> -1
+ (
+ 'ticket_id' => $id,
+ 'amount' => $diff_actual_cost,
+ 'period' => date('Ym'),
+ 'remark' => 'Oppdatert fra Agresso',
+ 'created_on' => time(),
+ 'created_by' => -1
);
$cols_cost = implode(',', array_keys($value_set_cost));
- $values_cost =
$this->db->validate_insert(array_values($value_set_cost));
+ $values_cost =
$this->db->validate_insert(array_values($value_set_cost));
$this->db->query("INSERT INTO fm_tts_payments
({$cols_cost}) VALUES ({$values_cost})");
- $this->receipt['message'][] = array('msg' =>"Oppdaterer
melding #{$id} for agresso prosjekt {$agresso_prosjekt}: gammelt beløp:
{$old_actual_cost}, nytt beløp: {$new_actual_cost}");
- $this->historylog->add('AC',$id, $new_actual_cost ,
$old_actual_cost);
+ $this->receipt['message'][] = array('msg' =>
"Oppdaterer melding #{$id} for agresso prosjekt {$agresso_prosjekt}: gammelt
beløp: {$old_actual_cost}, nytt beløp: {$new_actual_cost}");
+ $this->historylog->add('AC', $id, $new_actual_cost,
$old_actual_cost);
$value_set = array
- (
- 'agresso_prosjekt' => $agresso_prosjekt,
- 'actual_cost' => $new_actual_cost,
- 'actual_cost_year' => date('Y')
+ (
+ 'agresso_prosjekt' => $agresso_prosjekt,
+ 'actual_cost' => $new_actual_cost,
+ 'actual_cost_year' => date('Y'),
+ 'modified_date' => time()
);
- $value_set =
$this->db->validate_update($value_set);
- $ok = $this->db->query("UPDATE fm_tts_tickets SET
$value_set WHERE id={$id}",__LINE__,__FILE__);
+ $value_set = $this->db->validate_update($value_set);
+ $ok = $this->db->query("UPDATE fm_tts_tickets SET
$value_set WHERE id={$id}", __LINE__, __FILE__);
if($ok)
{
@@ -321,36 +320,36 @@
private function update_status($data)
{
- $agresso_prosjekt = trim($data[0]);
- $prosjektstatus = trim($data[1]);
- $order_id = trim($data[2]);
+ $agresso_prosjekt = trim($data[0]);
+ $prosjektstatus = trim($data[1]);
+ $order_id = trim($data[2]);
$id = false;
if($order_id)
{
- $this->db->query("SELECT id FROM fm_tts_tickets
WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
+ $this->db->query("SELECT id FROM fm_tts_tickets
WHERE order_id= '{$order_id}'", __LINE__, __FILE__);
$this->db->next_record();
- $id = $this->db->f('id');
+ $id = $this->db->f('id');
}
if(!$id)
{
- $this->receipt['error'][] = array('msg'
=>"Oppdatere status: fant ikke bestillingen for agresso prosjekt
{$agresso_prosjekt}");
+ $this->receipt['error'][] = array('msg' =>
"Oppdatere status: fant ikke bestillingen for agresso prosjekt
{$agresso_prosjekt}");
return false;
}
- $this->db->query("UPDATE fm_tts_tickets SET
agresso_prosjekt = '{$agresso_prosjekt}' WHERE id={$id}",__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_tts_tickets SET
agresso_prosjekt = '{$agresso_prosjekt}' WHERE id={$id}", __LINE__, __FILE__);
$ok = true;
if(preg_match('/(^C|^P)/i', $prosjektstatus))
{
$ticket = array
- (
+ (
'status' => 'C8' //Avsluttet og
fakturert (C)
);
- if( $this->sotts->update_status($ticket,$id))
+ if($this->sotts->update_status($ticket, $id))
{
$this->updated_tickects_per_file[$id] =
true;
}
@@ -364,18 +363,18 @@
$updated_tickects = array_keys($this->updated_tickects);
- foreach ($updated_tickects as $id)
+ foreach($updated_tickects as $id)
{
- $this->db->query("SELECT assignedto FROM
fm_tts_tickets WHERE id= '{$id}'",__LINE__,__FILE__);
+ $this->db->query("SELECT assignedto FROM
fm_tts_tickets WHERE id= '{$id}'", __LINE__, __FILE__);
$this->db->next_record();
- $assignedto = $this->db->f('assignedto');
+ $assignedto = $this->db->f('assignedto');
$this->send_notification($assignedto, $id);
}
}
private function send_notification($assignedto = 0, $id = 0)
{
- if
(!isset($GLOBALS['phpgw_info']['server']['smtp_server']) ||
!$GLOBALS['phpgw_info']['server']['smtp_server'])
+
if(!isset($GLOBALS['phpgw_info']['server']['smtp_server']) ||
!$GLOBALS['phpgw_info']['server']['smtp_server'])
{
return;
}
@@ -386,12 +385,13 @@
$prefs = $bocommon->create_preferences('property',
$assignedto);
if(isset($prefs['email']) && $prefs['email'])
{
- $body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uitts.view', 'id' => $id),false,true).'">' . lang('Ticket').' #' .$id
.'</a>'."\n";
+ $body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uitts.view',
+ 'id' => $id), false, true) . '">' .
lang('Ticket') . ' #' . $id . '</a>' . "\n";
try
{
- $rc =
$this->send->msg('email',$prefs['email'], $subject, stripslashes($body), '',
'', '',$from,'','html');
+ $rc = $this->send->msg('email',
$prefs['email'], $subject, stripslashes($body), '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch(phpmailerException $e)
{
$this->receipt['error'][] = array('msg'
=> $e->getMessage());
}
@@ -400,7 +400,7 @@
private function send_error_messages_as_email()
{
- if
(!isset($GLOBALS['phpgw_info']['server']['smtp_server']) ||
!$GLOBALS['phpgw_info']['server']['smtp_server'])
+
if(!isset($GLOBALS['phpgw_info']['server']['smtp_server']) ||
!$GLOBALS['phpgw_info']['server']['smtp_server'])
{
return;
}
@@ -419,12 +419,12 @@
$body = implode("<br/>", $errors);
try
{
- $rc = $this->send->msg('email',$to,
$subject, $body, '', $cc, '',$from,'','html');
+ $rc = $this->send->msg('email', $to,
$subject, $body, '', $cc, '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch(phpmailerException $e)
{
$this->receipt['error'][] = array('msg'
=> $e->getMessage());
}
}
}
- }
+ }
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14683] tts: alter modified date on payment update,
Sigurd Nes <=