[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13765] edit rule for incoming SMS
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13765] edit rule for incoming SMS |
Date: |
Mon, 24 Aug 2015 12:01:11 +0000 |
Revision: 13765
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13765
Author: sigurdne
Date: 2015-08-24 12:01:11 +0000 (Mon, 24 Aug 2015)
Log Message:
-----------
edit rule for incoming SMS
Modified Paths:
--------------
trunk/sms/bin/default/config_STATUS_log
trunk/sms/bin/default/set_workorder_status.php
Modified: trunk/sms/bin/default/config_STATUS_log
===================================================================
--- trunk/sms/bin/default/config_STATUS_log 2015-08-24 10:56:27 UTC (rev
13764)
+++ trunk/sms/bin/default/config_STATUS_log 2015-08-24 12:01:11 UTC (rev
13765)
@@ -24,6 +24,4 @@
(
'menuaction' => 'property.uiworkorder.view',
'id' => $param[0]
- );
-
-?>
+ );
\ No newline at end of file
Modified: trunk/sms/bin/default/set_workorder_status.php
===================================================================
--- trunk/sms/bin/default/set_workorder_status.php 2015-08-24 10:56:27 UTC
(rev 13764)
+++ trunk/sms/bin/default/set_workorder_status.php 2015-08-24 12:01:11 UTC
(rev 13765)
@@ -57,7 +57,44 @@
}
}
-
execMethod('property.soworkorder.check_project_status',$workorder_id);
+//
execMethod('property.soworkorder.check_project_status',$workorder_id);
+
+ $project_status_on_last_order_closed = 'utført';
+
+ $this->db->query("SELECT count(id) AS
orders_at_project FROM fm_workorder WHERE project_id= {$project_id}", __LINE__,
__FILE__);
+ $this->db->next_record();
+ $orders_at_project = (int)
$this->db->f('orders_at_project');
+
+ $this->db->query("SELECT count(fm_workorder.id)
AS closed_orders_at_project"
+ . " FROM fm_workorder"
+ . " {$this->join} fm_workorder_status ON
(fm_workorder.status = fm_workorder_status.id)"
+ . " WHERE project_id= {$project_id}"
+ . " AND (fm_workorder_status.closed = 1 OR
fm_workorder_status.delivered = 1)", __LINE__, __FILE__);
+
+ $this->db->next_record();
+ $closed_orders_at_project = (int)
$this->db->f('closed_orders_at_project');
+
+ $this->db->query("SELECT
fm_project_status.closed AS closed_project, fm_project.status as old_status"
+ . " FROM fm_project"
+ . " {$this->join} fm_project_status ON
(fm_project.status = fm_project_status.id)"
+ . " WHERE fm_project.id= {$project_id}",
__LINE__, __FILE__);
+
+ $this->db->next_record();
+ $closed_project =
!!$this->db->f('closed_project');
+ $old_status =
$this->db->f('old_status');
+
+ if($status == 'utført'
+ && $orders_at_project ==
$closed_orders_at_project
+ && $old_status !=
$project_status_on_last_order_closed)
+ {
+ $this->db->query("UPDATE fm_project SET
status = '{$project_status_on_last_order_closed}' WHERE id= {$project_id}",
__LINE__, __FILE__);
+
+ $historylog_project =
CreateObject('property.historylog', 'project');
+
+ $historylog_project->add('S',
$project_id, $project_status_on_last_order_closed, $old_status);
+ $historylog_project->add('RM',
$project_id, 'Status endret ved at siste bestilling er satt til utført');
+ }
+
$command_output = 'success';
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13765] edit rule for incoming SMS,
Sigurd Nes <=