[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16565] minor fixes
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16565] minor fixes |
|
Date: |
Mon, 10 Apr 2017 08:05:51 -0400 (EDT) |
Revision: 16565
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16565
Author: sigurdne
Date: 2017-04-10 08:05:51 -0400 (Mon, 10 Apr 2017)
Log Message:
-----------
minor fixes
Modified Paths:
--------------
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uibudget.inc.php
trunk/property/inc/cron/default/oppdater_betalte_faktura_BK.php
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
trunk/setup/manageheader.php
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2017-04-08 22:36:21 UTC
(rev 16564)
+++ trunk/property/inc/class.soworkorder.inc.php 2017-04-10 12:05:51 UTC
(rev 16565)
@@ -1964,8 +1964,7 @@
$continuous = false;
$cached_info = phpgwapi_cache::system_get('property',
"budget_order_{$order_id}");
-
- if ($cached_info)
+ if ($cached_info && is_array($cached_info))
{
return $cached_info;
}
Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php 2017-04-08 22:36:21 UTC (rev
16564)
+++ trunk/property/inc/class.uibudget.inc.php 2017-04-10 12:05:51 UTC (rev
16565)
@@ -516,7 +516,7 @@
if ($acl_add)
{
$data['datatable']['new_item'] =
self::link(array(
- 'menuaction' =>
'property.uiasync.edit'
+ 'menuaction' =>
'property.uibudget.edit'
));
}
Modified: trunk/property/inc/cron/default/oppdater_betalte_faktura_BK.php
===================================================================
--- trunk/property/inc/cron/default/oppdater_betalte_faktura_BK.php
2017-04-08 22:36:21 UTC (rev 16564)
+++ trunk/property/inc/cron/default/oppdater_betalte_faktura_BK.php
2017-04-10 12:05:51 UTC (rev 16565)
@@ -55,6 +55,7 @@
function execute()
{
+ $start = time();
//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
@@ -66,6 +67,7 @@
if ($this->debug)
{
}
+ set_time_limit(2000);
try
{
@@ -75,8 +77,31 @@
{
$this->receipt['error'][] = array('msg' =>
$e->getMessage());
}
+
+ $msg = 'Tidsbruk: ' . (time() - $start) . ' sekunder';
+ $this->cron_log($msg, $cron);
+ echo "$msg\n";
+ $this->receipt['message'][] = array('msg' => $msg);
+
}
+ function cron_log( $receipt = '' )
+ {
+
+ $insert_values = array(
+ $this->cron,
+ date($this->db->datetime_format()),
+ $this->function_name,
+ $receipt
+ );
+
+ $insert_values =
$this->db->validate_insert($insert_values);
+
+ $sql = "INSERT INTO fm_cron_log
(cron,cron_date,process,message) "
+ . "VALUES ($insert_values)";
+ $this->db->query($sql, __LINE__, __FILE__);
+ }
+
private function update_order()
{
$config = CreateObject('phpgwapi.config',
'property')->read();
@@ -107,9 +132,12 @@
{
if(!$this->check_payment($voucher['voucher_id']))
{
+ $this->receipt['error'][] = array('msg'
=> "{$voucher['voucher_id']} er ikke betalt");
continue;
}
+ $this->receipt['message'][] = array('msg' =>
"{$voucher['voucher_id']} er betalt");
+
$ok = false;
$order_type =
$socommon->get_order_type($voucher['order_id']);
switch ($order_type)
@@ -143,7 +171,8 @@
if($ok)
{
- $vouchers_ok = $voucher;
+ $vouchers_ok[] = $voucher;
+ // $i = 60;
}
}
@@ -153,6 +182,7 @@
$cols = array_keys($metadata);
foreach ($vouchers_ok as $voucher)
{
+ $this->db->transaction_begin();
$value_set = array();
$this->db->query("SELECT * FROM fm_ecobilag
WHERE external_voucher_id= '{$voucher['voucher_id']}'", __LINE__, __FILE__);
$this->db->next_record();
@@ -161,18 +191,22 @@
$value_set[$col] = $this->db->f($col);
}
$value_set['filnavn'] = date('d.m.Y-H:i:s',
phpgwapi_datetime::user_localtime());
+ $value_set['ordrebelop'] = $value_set['belop'];
+ unset($value_set['pre_transfer']);
$_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__);
+ $this->db->transaction_commit();
+ $this->receipt['message'][] = array('msg' =>
"{$voucher['voucher_id']} er overført til historikk");
}
}
function check_payment( $voucher_id )
{
- //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/tjeneste?id=88010
- $url = $this->soap_url;
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/utlignetfaktura?bilagsNr=917039148
+ $url =
"{$this->soap_url}/utlignetfaktura?bilagsNr={$voucher_id}";
$username = $this->soap_username; //'portico';
$password = $this->soap_password;
//'BgPor790gfol';
@@ -187,11 +221,15 @@
$result = curl_exec($ch);
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ if(!$httpCode)
+ {
+ throw new Exception("No connection: {$url}");
+ }
curl_close($ch);
$result = json_decode($result, true);
- return false;
+ return $result;
}
Modified:
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
===================================================================
---
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
2017-04-08 22:36:21 UTC (rev 16564)
+++
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
2017-04-10 12:05:51 UTC (rev 16565)
@@ -108,6 +108,15 @@
throw new Exception("Ordrenummer
'{$values['order_id']}' er utenfor serien:<br/>" . __FILE__ . '<br/>linje:' .
__LINE__);
}
+ if($this->ordered_amount)
+ {
+ $quantity =
$received_amount/$this->ordered_amount;
+ }
+ else //should not happen, but just in case...
+ {
+ $quantity = 0.8;
+ }
+
$param = array(
'voucher_type' => $voucher_type,
'order_id' => $values['order_id'],
@@ -114,7 +123,7 @@
'lines' => array(
array(
'UnitCode' => 'STK',
- 'Quantity' =>
($received_amount/$this->ordered_amount),
+ 'Quantity' => $quantity,
)
)
);
Modified: trunk/setup/manageheader.php
===================================================================
--- trunk/setup/manageheader.php 2017-04-08 22:36:21 UTC (rev 16564)
+++ trunk/setup/manageheader.php 2017-04-10 12:05:51 UTC (rev 16565)
@@ -390,6 +390,14 @@
$detected .= '<li class="warn">' . lang('you
may need imagick for image manipulation') . "</li>\n";
}
+ if(function_exists('curl_init'))
+ {
+ $detected .= '<li>' . lang('You appear to have
curl enabled') . "</li>\n";
+ }
+ else
+ {
+ $detected .= '<li class="warn">' . lang('you
may need curl for integration capabilities') . "</li>\n";
+ }
/* Not currently supported
if (extension_loaded('odbc') ||
function_exists('odbc_connect'))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16565] minor fixes,
sigurdne <=