[Fmsystem-commits] [13977] Rental: Backport from Syncomind-branch

[Sigurd Nes]

Revision: 13977
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13977
Author:   sigurdne
Date:     2015-09-21 08:20:17 +0000 (Mon, 21 Sep 2015)
Log Message:
-----------
Rental: Backport from Syncomind-branch

Modified Paths:
--------------
    trunk/rental/inc/class.soadjustment.inc.php
    trunk/rental/inc/class.soprice_item.inc.php
    trunk/rental/inc/class.uiprice_item.inc.php
    trunk/rental/inc/model/class.adjustment.inc.php

Modified: trunk/rental/inc/class.soadjustment.inc.php
===================================================================
--- trunk/rental/inc/class.soadjustment.inc.php 2015-09-20 19:21:53 UTC (rev 
13976)
+++ trunk/rental/inc/class.soadjustment.inc.php 2015-09-21 08:20:17 UTC (rev 
13977)
@@ -38,14 +38,16 @@
                        $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
                        $filter_clauses[] = "{$this->get_id_field_name()} = 
{$id}";
                }
-               
-               if(isset($filters['manual_adjustment']))
-               {
-                       $clauses[] = "is_manual";
-               }
                else
                {
-                       $clauses[] = "NOT is_manual";
+                       if(isset($filters['manual_adjustment']))
+                       {
+                               $clauses[] = "is_manual";
+                       }
+                       else
+                       {
+                               $clauses[] = "NOT is_manual";
+                       }
                }
                
                if(count($filter_clauses))
@@ -143,14 +145,15 @@
                        $adjustment->get_percent(),
                        $adjustment->get_interval(),
                        $adjustment->get_adjustment_date(),
-                       '\''.$adjustment->get_adjustment_type().'\'',
+                       $adjustment->get_adjustment_type(),
                        ($adjustment->is_manual() ? "true" : "false"),
                        ($adjustment->is_executed() ? "true" : "false"),
                         ($adjustment->is_extra_adjustment() ? "true" : 
"false"),
                        $adjustment->get_year()
                );
 
-               $query ="INSERT INTO rental_adjustment (" . join(',', $cols) . 
") VALUES (" . join(',', $values) . ")";
+               $values_insert = $this->db->validate_insert($values);
+               $query ="INSERT INTO rental_adjustment (" . join(',', $cols) . 
") VALUES ({$values_insert})";
                $result = $this->db->query($query);
 
                $adjustment_id = 
$this->db->get_last_insert_id('rental_adjustment', 'id');

Modified: trunk/rental/inc/class.soprice_item.inc.php
===================================================================
--- trunk/rental/inc/class.soprice_item.inc.php 2015-09-20 19:21:53 UTC (rev 
13976)
+++ trunk/rental/inc/class.soprice_item.inc.php 2015-09-21 08:20:17 UTC (rev 
13977)
@@ -519,31 +519,39 @@
        
        function adjust_contract_price_items(int $price_item_id, $new_price)
        {
-               $q_contract_price_items = "SELECT * from 
rental_contract_price_item where price_item_id=$price_item_id";
+               $this->db->transaction_begin();
+               $number_affected = 0;
+               $db2 = clone($this->db);
+               $q_contract_price_items = "SELECT * FROM 
rental_contract_price_item WHERE price_item_id={$price_item_id}";
                $this->db->query($q_contract_price_items);
-               while($this->db->next_record()){
+               while($this->db->next_record())
+               {
                        $total_price = 0.00;
-                       $curr_id = $this->db->f('id');
-                       $is_area = 
$this->unmarshal($this->db->f('is_area'),'bool');
-                       if($is_area){
-                               $area = 
$this->unmarshal($this->db->f('area'),'float');
+                       $curr_id         = $this->db->f('id');
+                       $is_area         = 
$this->unmarshal($this->db->f('is_area'), 'bool');
+                       if($is_area)
+                       {
+                               $area            = 
$this->unmarshal($this->db->f('area'), 'float');
                                $total_price = $area * $new_price;
                        }
-                       else{
-                               $count = 
$this->unmarshal($this->db->f('count'),'int');
+                       else
+                       {
+                               $count           = 
$this->unmarshal($this->db->f('count'), 'int');
                                $total_price = $count * $new_price;
                        }
-                       $query="UPDATE rental_contract_price_item SET 
price=$new_price, total_price=$total_price WHERE id=$curr_id";
-                       $this->db->query($query);
+                       $query = "UPDATE rental_contract_price_item SET 
price=$new_price, total_price=$total_price WHERE id=$curr_id";
+                       $db2->query($query);
+
+                       $number_affected ++;
                }
-               
-               $query2 = "SELECT count(*) as count FROM 
rental_contract_price_item WHERE price_item_id=$price_item_id";
-               $this->db->query($query2);
-               if($this->db->next_record()){
-                       return $this->db->f('count');
+
+               if($this->db->transaction_commit())
+               {
+                       return $number_affected;
                }
-               else{
+               else
+               {
                        return 0;
                }
        }
-}
\ No newline at end of file
+}

Modified: trunk/rental/inc/class.uiprice_item.inc.php
===================================================================
--- trunk/rental/inc/class.uiprice_item.inc.php 2015-09-20 19:21:53 UTC (rev 
13976)
+++ trunk/rental/inc/class.uiprice_item.inc.php 2015-09-21 08:20:17 UTC (rev 
13977)
@@ -357,7 +357,9 @@
                                $adjustment = new rental_adjustment();
                                
$adjustment->set_price_item_id($price_item->get_id());
                                $adjustment->set_new_price($new_price);
+                               $adjustment->set_year(date('Y'));
                                $adjustment->set_percent(0);
+                               $adjustment->set_interval(0);
                                
$adjustment->set_responsibility_id($price_item->get_responsibility_id());
                                $adjustment->set_is_manual(true);
                                $adjustment->set_adjustment_date(time());

Modified: trunk/rental/inc/model/class.adjustment.inc.php
===================================================================
--- trunk/rental/inc/model/class.adjustment.inc.php     2015-09-20 19:21:53 UTC 
(rev 13976)
+++ trunk/rental/inc/model/class.adjustment.inc.php     2015-09-21 08:20:17 UTC 
(rev 13977)
@@ -163,6 +163,7 @@
                        'id' => $this->get_id(),
                        'price_item_id' => $this->get_price_item_id(),
                        'responsibility_title' => 
lang(rental_socontract::get_instance()->get_responsibility_title($this->get_responsibility_id())),
+                       'responsibility_id' => $this->get_responsibility_id(),
                        'new_price' => $this->get_new_price(),
                        'percent' => $this->get_percent(),
                        'interval' => $this->get_interval(),
@@ -174,4 +175,4 @@
                );
        }
 }
-?>
\ No newline at end of file
+?>