[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16473] Syncromind: Merge 16464:16472 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16473] Syncromind: Merge 16464:16472 from trunk |
|
Date: |
Thu, 23 Mar 2017 14:26:58 -0400 (EDT) |
Revision: 16473
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16473
Author: sigurdne
Date: 2017-03-23 14:26:57 -0400 (Thu, 23 Mar 2017)
Log Message:
-----------
Syncromind: Merge 16464:16472 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-2_0-branch/phpgwapi/inc/auth/class.auth_.inc.php
branches/Version-2_0-branch/property/templates/base/wo_hour.index.xsl
branches/Version-2_0-branch/rental/js/rental/composite.edit.js
branches/Version-2_0-branch/rental/js/rental/composite.view.js
branches/Version-2_0-branch/setup/inc/hook_config.inc.php
Added Paths:
-----------
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-03-23 18:23:48 UTC (rev 16472)
+++ branches/Version-2_0-branch 2017-03-23 18:26:57 UTC (rev 16473)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472
\ No newline at end of property
Modified: branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-03-23 18:23:48 UTC (rev 16472)
+++ branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-03-23 18:26:57 UTC (rev 16473)
@@ -802,6 +802,13 @@
//-----------from--------
$current_prefs_user =
$this->bocommon->create_preferences('helpdesk',$GLOBALS['phpgw_info']['user']['account_id']);
+
+ if(!$current_prefs_user['email'])
+ {
+ $email_domain =
!empty($GLOBALS['phpgw_info']['server']['email_domain']) ?
$GLOBALS['phpgw_info']['server']['email_domain'] : 'bergen.kommune.no';
+ $current_prefs_user['email'] =
"{$GLOBALS['phpgw_info']['user']['account_lid'address@hidden";
+ }
+
$current_user_address =
"{$GLOBALS['phpgw_info']['user']['fullname']}<{$current_prefs_user['email']}>";
//-----------from--------
@@ -943,7 +950,7 @@
$notify_list = execMethod('property.notify.read', array
(
- 'location_id' =>
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location),
+ 'location_id' =>
$GLOBALS['phpgw']->locations->get_id('helpdesk', $this->acl_location),
'location_item_id' => $id
)
);
Modified: branches/Version-2_0-branch/phpgwapi/inc/auth/class.auth_.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/auth/class.auth_.inc.php
2017-03-23 18:23:48 UTC (rev 16472)
+++ branches/Version-2_0-branch/phpgwapi/inc/auth/class.auth_.inc.php
2017-03-23 18:26:57 UTC (rev 16473)
@@ -123,6 +123,12 @@
}
}
return $ret;
+
+ case 'BCRYPT':
+ $hash = password_hash($passwd,
PASSWORD_BCRYPT);
+ $ret = '{BCRYPT}' .
base64_encode($hash);
+ return $ret;
+
case 'MD5':
return "{MD5}" .
base64_encode(phpgwapi_common::hex2bin(md5($passwd)));
@@ -165,6 +171,12 @@
$salt = substr($hash, 63);
$hash = substr($hash, 0, 63);
return $hash === crypt($passwd, '$5$' .
$salt);
+
+ case 'BCRYPT':
+ $hash = base64_decode($hash);
+ $hash = substr($hash, 0, 60);
+ return password_verify($passwd, $hash);
+
case 'MD5':
$hash = bin2hex(base64_decode($hash));
return $hash === md5($passwd);
Copied:
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
(from rev 16472,
trunk/property/inc/cron/default/oppdater_betalte_faktura_BK.php)
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
(rev 0)
+++
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
2017-03-23 18:26:57 UTC (rev 16473)
@@ -0,0 +1,173 @@
+<?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 cron
+ * @version $Id: oppdater_betalte_faktura_BK.php 16075 2016-12-12
15:26:41Z sigurdne $
+ */
+ /**
+ * Description
+ * example cron : /usr/local/bin/php -q
/var/www/html/phpgroupware/property/inc/cron/cron.php default
oppdater_betalte_faktura_BK
+ * @package property
+ */
+ include_class('property', 'cron_parent', 'inc/cron/');
+ phpgw::import_class('phpgwapi.datetime');
+
+ class oppdater_betalte_faktura_BK extends property_cron_parent
+ {
+
+ public function __construct()
+ {
+ parent::__construct();
+
+ $this->function_name = get_class($this);
+ $this->sub_location = lang('property');
+ $this->function_msg = 'oppdater bestillinger med
grunnlag i betalte faktura';
+ }
+
+ function execute()
+ {
+
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/art
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/ansvar?id=013000
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/objekt?id=5001
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/prosjekt?id=5001
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/tjeneste?id=88010
+
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/leverandorer?leverandorNr=722920
+ if ($this->debug)
+ {
+ }
+
+ try
+ {
+ $this->update_order();
+ }
+ catch (Exception $e)
+ {
+ $this->receipt['error'][] = array('msg' =>
$e->getMessage());
+ }
+ }
+
+ private function update_order()
+ {
+ $config = CreateObject('phpgwapi.config',
'property')->read();
+ $sql = "SELECT DISTINCT pmwrkord_code,
external_voucher_id FROM fm_ecobilag";
+ $this->db->query($sql, __LINE__, __FILE__);
+ $vouchers = array();
+ while ($this->db->next_record())
+ {
+ $vouchers[] = array
+ (
+ 'order_id' =>
$this->db->f('pmwrkord_code'),
+ 'voucher_id' =>
$this->db->f('external_voucher_id')
+ );
+ }
+
+ $socommon = CreateObject('property.socommon');
+ $soworkorder = CreateObject('property.soworkorder');
+ $sotts = CreateObject('property.sotts');
+ $workorder_closed_status =
!empty($config['workorder_closed_status']) ? $config['workorder_closed_status']
: false;
+
+ if(!$workorder_closed_status)
+ {
+ throw new Exception('Order closed status not
defined');
+ }
+
+ $vouchers_ok = array();
+ foreach ($vouchers as $voucher)
+ {
+
if(!$this->check_payment($voucher['voucher_id']))
+ {
+ continue;
+ }
+
+ $ok = false;
+ $order_type =
$socommon->get_order_type($voucher['order_id']);
+ switch ($order_type)
+ {
+ case 's_agreement':
+ break;
+ case 'workorder':
+ $workorder =
$soworkorder->read_single($voucher['order_id']);
+ if($workorder['continuous'])
+ {
+ $ok = true;
+ }
+ else
+ {
+ $ok =
$soworkorder->update_status(array('order_id' => $voucher['order_id'],'status'
=> $workorder_closed_status));
+ }
+ break;
+ case 'ticket':
+ $this->db->query("SELECT id
FROM fm_tts_tickets WHERE order_id= '{$voucher['order_id']}'", __LINE__,
__FILE__);
+ $this->db->next_record();
+ $ticket_id = $this->db->f('id');
+ $ticket = array(
+ 'status' => 'C8'
//Avsluttet og fakturert (C)
+ );
+
+ $ok =
$sotts->update_status($ticket, $ticket_id);
+ break;
+ default:
+ throw new Exception('Order type
not supported');
+ }
+
+ if($ok)
+ {
+ $vouchers_ok = $voucher;
+ }
+
+ }
+ unset($voucher);
+
+ $metadata = $this->db->metadata('fm_ecobilag');
+ $cols = array_keys($metadata);
+ foreach ($vouchers_ok as $voucher)
+ {
+ $value_set = array();
+ $this->db->query("SELECT * FROM fm_ecobilag
WHERE external_voucher_id= '{$voucher['voucher_id']}'", __LINE__, __FILE__);
+ $this->db->next_record();
+ foreach ($cols as $col)
+ {
+ $value_set[$col] = $this->db->f($col);
+ }
+ $value_set['filnavn'] = date('d.m.Y-H:i:s',
phpgwapi_datetime::user_localtime());
+
+ $_cols = implode(',', array_keys($value_set));
+ $values =
$this->db->validate_insert(array_values($value_set));
+ $this->db->query("INSERT INTO fm_ecobilagoverf
({$_cols}) VALUES ({$values})", __LINE__, __FILE__);
+ $this->db->query("DELETE FROM fm_ecobilag WHERE
external_voucher_id= '{$voucher['voucher_id']}'", __LINE__, __FILE__);
+ }
+ }
+
+ function check_payment( $voucher_id )
+ {
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/tjeneste?id=88010
+
+ return false;
+
+ }
+
+ }
Modified: branches/Version-2_0-branch/property/templates/base/wo_hour.index.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/wo_hour.index.xsl
2017-03-23 18:23:48 UTC (rev 16472)
+++ branches/Version-2_0-branch/property/templates/base/wo_hour.index.xsl
2017-03-23 18:26:57 UTC (rev 16473)
@@ -330,10 +330,10 @@
});
}
},
-
'copyFlash',
-
'csvFlash',
-
'excelFlash',
-
'pdfFlash'
+
'copyHtml5',
+
'csvHtml5',
+
'excelHtml5'
+ //
'pdfFlash'
<xsl:choose>
Modified: branches/Version-2_0-branch/rental/js/rental/composite.edit.js
===================================================================
--- branches/Version-2_0-branch/rental/js/rental/composite.edit.js
2017-03-23 18:23:48 UTC (rev 16472)
+++ branches/Version-2_0-branch/rental/js/rental/composite.edit.js
2017-03-23 18:26:57 UTC (rev 16473)
@@ -75,19 +75,22 @@
function filterDataLocations(param, value)
{
- oTable1.dataTableSettings[1]['ajax']['data'][param] = value;
+// oTable1.dataTableSettings[1]['ajax']['data'][param] = value;
+ paramsTable1[param] = value;
oTable1.fnDraw();
}
function filterDataContracts(param, value)
{
- oTable2.dataTableSettings[2]['ajax']['data'][param] = value;
+// oTable2.dataTableSettings[2]['ajax']['data'][param] = value;
+ paramsTable2[param] = value;
oTable2.fnDraw();
}
function filterDataApplications(param, value)
{
- oTable3.dataTableSettings[3]['ajax']['data'][param] = value;
+// oTable3.dataTableSettings[3]['ajax']['data'][param] = value;
+ paramsTable3[param] = value;
oTable3.fnDraw();
}
Modified: branches/Version-2_0-branch/rental/js/rental/composite.view.js
===================================================================
--- branches/Version-2_0-branch/rental/js/rental/composite.view.js
2017-03-23 18:23:48 UTC (rev 16472)
+++ branches/Version-2_0-branch/rental/js/rental/composite.view.js
2017-03-23 18:26:57 UTC (rev 16473)
@@ -54,13 +54,15 @@
function filterDataContracts(param, value)
{
- oTable1.dataTableSettings[1]['ajax']['data'][param] = value;
+// oTable1.dataTableSettings[1]['ajax']['data'][param] = value;
+ paramsTable1[param] = value;
oTable1.fnDraw();
}
function filterDataApplications(param, value)
{
- oTable2.dataTableSettings[2]['ajax']['data'][param] = value;
+// oTable2.dataTableSettings[2]['ajax']['data'][param] = value;
+ paramsTable2[param] = value;
oTable2.fnDraw();
}
Modified: branches/Version-2_0-branch/setup/inc/hook_config.inc.php
===================================================================
--- branches/Version-2_0-branch/setup/inc/hook_config.inc.php 2017-03-23
18:23:48 UTC (rev 16472)
+++ branches/Version-2_0-branch/setup/inc/hook_config.inc.php 2017-03-23
18:26:57 UTC (rev 16473)
@@ -184,6 +184,7 @@
{
$hashes = array
(
+ 'BCRYPT'=> lang('Salted BCrypt - strong encryption'),
'CRYPT' => lang('Salted Crypt - strong encryption'),
'SSHA' => lang('Salted SHA1 - strong encryption'),
'SMD5' => lang('Salted MD5'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16473] Syncromind: Merge 16464:16472 from trunk,
sigurdne <=