[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15678] property: order handling
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15678] property: order handling |
|
Date: |
Thu, 15 Sep 2016 14:04:01 +0000 (UTC) |
Revision: 15678
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15678
Author: sigurdne
Date: 2016-09-15 14:04:01 +0000 (Thu, 15 Sep 2016)
Log Message:
-----------
property: order handling
Modified Paths:
--------------
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
trunk/property/js/portico/tts.view.js
trunk/property/js/portico/workorder.edit.js
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/tts.xsl
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/inc/class.botts.inc.php 2016-09-15 14:04:01 UTC (rev
15678)
@@ -1750,7 +1750,7 @@
return $values;
}
- public function receive_order( $id, $received_percent )
+ public function receive_order( $id, $received_amount )
{
$receive_order = true; // used as trigger within the
custom function
$acl_location = $this->acl_location;
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2016-09-15 13:19:20 UTC
(rev 15677)
+++ trunk/property/inc/class.boworkorder.inc.php 2016-09-15 14:04:01 UTC
(rev 15678)
@@ -1008,7 +1008,7 @@
}
}
- public function receive_order( $id, $received_percent )
+ public function receive_order( $id, $received_amount )
{
$receive_order = true; // used as trigger within the
custom function
$acl_location = '.project.workorder';
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/inc/class.sotts.inc.php 2016-09-15 14:04:01 UTC (rev
15678)
@@ -844,7 +844,7 @@
$ticket['modified_date'] =
$this->db->f('modified_date');
$ticket['order_sent'] =
$this->db->f('order_sent');
$ticket['order_received'] =
$this->db->f('order_received');
- $ticket['order_received_percent'] =
$this->db->f('order_received_percent');
+ $ticket['order_received_amount'] =
$this->db->f('order_received_amount');
$user_id = (int)$this->db->f('user_id');
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2016-09-15 13:19:20 UTC
(rev 15677)
+++ trunk/property/inc/class.soworkorder.inc.php 2016-09-15 14:04:01 UTC
(rev 15678)
@@ -986,7 +986,7 @@
'order_dim1' =>
$this->db->f('order_dim1'),
'order_sent' =>
$this->db->f('order_sent'),
'order_received' =>
$this->db->f('order_received'),
- 'order_received_percent' =>
$this->db->f('order_received_percent')
+ 'order_received_amount' =>
$this->db->f('order_received_amount')
);
$sql = "SELECT periodization_id,"
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/inc/class.uitts.inc.php 2016-09-15 14:04:01 UTC (rev
15678)
@@ -2902,9 +2902,9 @@
'preview_html' =>
"javascript:preview_html($id)",
'preview_pdf' => "javascript:preview_pdf($id)",
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
- 'value_order_sent' =>
$ticket['order_sent'],
+ 'value_order_sent' =>
!!$ticket['order_sent'],
'value_order_received' =>
$ticket['order_received'] ?
$GLOBALS['phpgw']->common->show_date($ticket['order_received']) : '[ DD/MM/YYYY
- H:i ]',
- 'value_order_received_percent' => (int)
$ticket['order_received_percent']
+ 'value_order_received_amount' => (int)
$ticket['order_received_amount']
);
phpgwapi_jquery::load_widget('numberformat');
@@ -3153,8 +3153,8 @@
}
$id = phpgw::get_var('id', 'int');
- $received_percent = phpgw::get_var('received_percent',
'int');
- return $this->bo->receive_order($id, $received_percent);
+ $received_amount = phpgw::get_var('received_amount',
'float');
+ return $this->bo->receive_order($id, $received_amount);
}
private function _get_eco_service_name( $id )
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2016-09-15 13:19:20 UTC
(rev 15677)
+++ trunk/property/inc/class.uiworkorder.inc.php 2016-09-15 14:04:01 UTC
(rev 15678)
@@ -2375,7 +2375,7 @@
'order_dim1_list' => $order_dim1_list,
'value_order_sent' =>
$values['order_sent'],
'value_order_received' =>
$values['order_received'] ?
$GLOBALS['phpgw']->common->show_date($values['order_received']) : '[ DD/MM/YYYY
- H:i ]',
- 'value_order_received_percent' => (int)
$values['order_received_percent']
+ 'value_order_received_amount' => (int)
$values['order_received_amount']
);
$appname = lang('Workorder');
@@ -2900,8 +2900,8 @@
}
$id = phpgw::get_var('id', 'int');
- $received_percent = phpgw::get_var('received_percent',
'int');
- return $this->bo->receive_order($id, $received_percent);
+ $received_amount = phpgw::get_var('received_amount',
'float');
+ return $this->bo->receive_order($id, $received_amount);
}
private function _get_eco_service_name( $id )
Modified:
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
===================================================================
---
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
2016-09-15 13:19:20 UTC (rev 15677)
+++
trunk/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
2016-09-15 14:04:01 UTC (rev 15678)
@@ -38,7 +38,7 @@
if (isset($id) && $id && isset($acl_location) && $acl_location &&
isset($receive_order) && $receive_order)
{
$exporter_varemottak = new
lag_agresso_varemottak($acl_location, $id);
- $result = $exporter_varemottak->transfer($id,
$received_percent);
+ $result = $exporter_varemottak->transfer($id, $received_amount);
}
class lag_agresso_varemottak
@@ -63,7 +63,7 @@
}
}
- public function transfer( $id, $received_percent )
+ public function transfer( $id, $received_amount )
{
$values = $this->values;
// _debug_array($values);die();
@@ -73,28 +73,28 @@
'lines' => array(
array(
'UnitCode' => 'STK',
- 'Quantity' =>
($received_percent / 100),
+ 'Quantity' =>
($received_amount),
)
)
);
$exporter_varemottak = new
BkBygg_exporter_varemottak_til_Agresso(array('order_id' =>
$values['order_id']));
$exporter_varemottak->create_transfer_xml($param);
- $exporter_varemottak->output();
+ // $exporter_varemottak->output();
$export_ok = true;
// die();
// $export_ok = $exporter_varemottak->transfer();
if ($export_ok)
{
- $this->log_transfer( $id, $received_percent );
+ $this->log_transfer( $id, $received_amount );
}
return $export_ok;
}
- private function log_transfer( $id, $received_percent )
+ private function log_transfer( $id, $received_amount )
{
$id = (int)$id;
- $received_percent = (int)$received_percent;
+ $received_amount = (int)$received_amount;
switch ($this->acl_location)
{
case '.ticket':
@@ -106,9 +106,9 @@
$table = 'fm_workorder';
break;
}
- $historylog->add('RM', $id, "Varemottak
({$received_percent} %) overført til agresso");
+ $historylog->add('RM', $id, "Varemottak:
{$received_amount} overført til agresso");
$now = time();
- $GLOBALS['phpgw']->db->query("UPDATE {$table} SET
order_received = {$now}, order_received_percent = {$received_percent} WHERE id
= {$id}");
+ $GLOBALS['phpgw']->db->query("UPDATE {$table} SET
order_received = {$now}, order_received_amount = {$received_amount} WHERE id =
{$id}");
}
}
Modified: trunk/property/js/portico/tts.view.js
===================================================================
--- trunk/property/js/portico/tts.view.js 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/js/portico/tts.view.js 2016-09-15 14:04:01 UTC (rev
15678)
@@ -316,7 +316,7 @@
var oArgs = {
menuaction: 'property.uitts.receive_order',
id: order_id,
- received_percent: $("#slider-range-min").slider("value")
+ received_amount: $("#order_received_amount").val()
};
var strURL = phpGWLink('index.php', oArgs, true);
$.ajax({
@@ -332,6 +332,7 @@
{
msg = 'OK';
$("#order_received_time").html(data['time']);
+
$("#current_received_amount").html($("#order_received_amount").val());
}
else
{
@@ -349,22 +350,6 @@
});
}
-$(function ()
-{
- $("#slider-range-min").slider({
- range: "min",
- value: $("#value_order_received_percent").val() || 0,
- min: 0,
- max: 100,
- step: 10,
- slide: function (event, ui)
- {
- $("#order_received_percent").val(ui.value + " %");
- }
- });
- $("#order_received_percent").val($("#slider-range-min").slider("value")
+ " %");
-});
-
var ecodimb_selection = "";
$(window).load(function ()
@@ -402,6 +387,8 @@
}
var total_amount = Number(amount) + Number($('#budget').val());
+ $("#order_received_amount").val(total_amount);
+
var oArgs = {menuaction: 'property.uitts.check_purchase_right',
ecodimb: ecodimb, amount: total_amount};
var requestUrl = phpGWLink('index.php', oArgs, true);
var htmlString = "";
Modified: trunk/property/js/portico/workorder.edit.js
===================================================================
--- trunk/property/js/portico/workorder.edit.js 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/js/portico/workorder.edit.js 2016-09-15 14:04:01 UTC (rev
15678)
@@ -39,7 +39,7 @@
var oArgs = {
menuaction: 'property.uiworkorder.receive_order',
id: workorder_id,
- received_percent: $("#slider-range-min").slider("value")
+ received_amount: $("#order_received_amount").val()
};
var strURL = phpGWLink('index.php', oArgs, true);
$.ajax({
@@ -391,17 +391,4 @@
// parent.hide_popupBox();
});
- $("#slider-range-min").slider({
- range: "min",
- value: $("#value_order_received_percent").val() || 0,
- min: 0,
- max: 100,
- step: 10,
- slide: function (event, ui)
- {
- $("#order_received_percent").val(ui.value + " %");
- }
- });
- $("#order_received_percent").val($("#slider-range-min").slider("value")
+ " %");
-
});
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2016-09-15 13:19:20 UTC (rev 15677)
+++ trunk/property/setup/setup.inc.php 2016-09-15 14:04:01 UTC (rev 15678)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.704';
+ $setup_info['property']['version'] = '0.9.17.705';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/setup/tables_current.inc.php 2016-09-15 14:04:01 UTC (rev
15678)
@@ -605,7 +605,7 @@
'order_dim1' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'order_sent' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'order_received' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
- 'order_received_percent' => array('type' =>
'int', 'precision' => 2, 'nullable' => True),
+ 'order_received_amount' => array('type' =>
'decimal', 'precision' => '20', 'scale' => '2', 'nullable' => True, 'default'
=> '0.00'),
),
'pk' => array('id'),
'fk' => array(),
@@ -1167,7 +1167,7 @@
'modified_date' => array('type' => 'int',
'precision' => '4', 'nullable' => True),
'order_sent' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'order_received' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
- 'order_received_percent' => array('type' =>
'int', 'precision' => 2, 'nullable' => True),
+ 'order_received_amount' => array('type' =>
'decimal', 'precision' => '20', 'scale' => '2', 'nullable' => True, 'default'
=> '0.00'),
),
'pk' => array('id'),
'ix' => array(),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/setup/tables_update.inc.php 2016-09-15 14:04:01 UTC (rev
15678)
@@ -9270,3 +9270,42 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.704 to 0.9.17.705
+ *
+ */
+ $test[] = '0.9.17.704';
+
+ function property_upgrade0_9_17_704()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->DropColumn('fm_workorder',
array(), 'order_received_percent');
+ $GLOBALS['phpgw_setup']->oProc->DropColumn('fm_tts_tickets',
array(), 'order_received_percent');
+
+
+ $GLOBALS['phpgw_setup']->oProc->AddColumn("fm_workorder",
'order_received_amount', array(
+ 'type' => 'decimal',
+ 'precision' => '20',
+ 'scale' => '2',
+ 'nullable' => True,
+ 'default' => '0.00'
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->AddColumn("fm_tts_tickets",
'order_received_amount', array(
+ 'type' => 'decimal',
+ 'precision' => '20',
+ 'scale' => '2',
+ 'nullable' => True,
+ 'default' => '0.00'
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.705';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/templates/base/tts.xsl 2016-09-15 14:04:01 UTC (rev
15678)
@@ -1074,12 +1074,21 @@
</xsl:attribute>
</xsl:if>
</input>
-
<div id="order_received_time" class="pure-custom">
-
<xsl:value-of select="value_order_received"/>
-
<div id="slider-range-min"></div>
+
<div class="pure-custom">
+
<table>
+
<tr>
+
<td id="order_received_time">
+
<xsl:value-of select="value_order_received"/>
+
</td>
+
</tr>
+
<tr>
+
<td align="right" id ="current_received_amount">
+
<xsl:value-of
select="value_order_received_amount"/>
+
</td>
+
</tr>
+
</table>
</div>
-
<input class="pure-custom" type="text" id="order_received_percent"
readonly="readonly" size="6"/>
-
<input type="hidden" id="value_order_received_percent"
value="{value_order_received_percent}"/>
+
<input class="pure-custom" type="text" id="order_received_amount" size="6"/>
</div>
<div
class="pure-control-group">
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2016-09-15 13:19:20 UTC (rev
15677)
+++ trunk/property/templates/base/workorder.xsl 2016-09-15 14:04:01 UTC (rev
15678)
@@ -994,11 +994,21 @@
</xsl:if>
</input>
<div
id="order_received_time" class="pure-custom">
-
<xsl:value-of select="value_order_received"/>
- <div
id="slider-range-min"></div>
+ <table>
+
<tr>
+
<td>
+
+
<xsl:value-of select="value_order_received"/>
+
</td>
+
</tr>
+
<tr>
+
<td align="right">
+
<xsl:value-of select="value_order_received_amount"/>
+
</td>
+
</tr>
+ </table>
</div>
- <input
class="pure-custom" type="text" id="order_received_percent" readonly="readonly"
size="6"/>
- <input
type="hidden" id="value_order_received_percent"
value="{value_order_received_percent}"/>
+ <input
class="pure-custom" type="text" id="order_received_amount" size="6"/>
</div>
</xsl:when>
</xsl:choose>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15678] property: order handling,
sigurdne <=