[Fmsystem-commits] [14783] rental: fix billing

[Sigurd Nes]

Revision: 14783
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14783
Author:   sigurdne
Date:     2016-02-29 19:50:49 +0000 (Mon, 29 Feb 2016)
Log Message:
-----------
rental: fix billing

Modified Paths:
--------------
    trunk/rental/inc/class.uibilling.inc.php
    trunk/rental/inc/model/class.agresso_lg04.inc.php

Modified: trunk/rental/inc/class.uibilling.inc.php
===================================================================
--- trunk/rental/inc/class.uibilling.inc.php    2016-02-29 15:18:09 UTC (rev 
14782)
+++ trunk/rental/inc/class.uibilling.inc.php    2016-02-29 19:50:49 UTC (rev 
14783)
@@ -32,7 +32,7 @@
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . 
lang('invoice_menu');
                }
 
-               private function _object_to_array( $contract )
+               private function _object_to_array( $contract , $include_billing 
= false)
                {
                        $values['old_contract_id'] = 
$contract->get_old_contract_id();
                        $values['start_date'] = 
($contract->get_contract_date()->has_start_date()) ? date($this->dateFormat, 
$contract->get_contract_date()->get_start_date()) : '';
@@ -43,12 +43,20 @@
                        $values['rented_area'] = $contract->get_rented_area();
                        if ($contract->get_bill_only_one_time())
                        {
-                               $values['bill_only_one_time'] = 
lang('only_one_time_yes') . '<input name="bill_only_one_time[]" value="' . 
$contract->get_id() . '" type="hidden"/><input name="contract[]" value="' . 
$contract->get_id() . '" type="hidden"/>';
+                               $values['bill_only_one_time'] = 
lang('only_one_time_yes');
+                               $values['old_contract_id'] .=  '<input 
name="bill_only_one_time[]" value="' . $contract->get_id() . '" type="hidden"/>'
+                                       . '<input name="contract[]" value="' . 
$contract->get_id() . '" type="hidden"/>';
                        }
                        else
                        {
                                $values['bill_only_one_time'] = 
lang('only_one_time_no');
                        }
+
+                       if($include_billing)
+                       {
+                               $values['old_contract_id'] .= '<input 
name="contract[]" value="' . $contract->get_id() . '" type="hidden"/>';
+                       }
+
                        $values['billing_start_date'] = date($this->dateFormat, 
$contract->get_billing_start_date());
                        $values['id'] = $contract->get_id();
 
@@ -366,7 +374,7 @@
 
                                                        if 
(!empty($contracts[$id]))
                                                        {
-                                                               
$array_contracts[] = $this->_object_to_array($contracts[$id]);
+                                                               
$array_contracts[] = $this->_object_to_array($contracts[$id], true);
                                                        }
                                                }
                                        }

Modified: trunk/rental/inc/model/class.agresso_lg04.inc.php
===================================================================
--- trunk/rental/inc/model/class.agresso_lg04.inc.php   2016-02-29 15:18:09 UTC 
(rev 14782)
+++ trunk/rental/inc/model/class.agresso_lg04.inc.php   2016-02-29 19:50:49 UTC 
(rev 14783)
@@ -71,6 +71,10 @@
                                $missing_billing_info[] = 'Missing payer id.';
                        }
 
+                       if(!$contract->get_billing_start_date())
+                       {
+                               $missing_billing_info[] = 'Missing start_date.';
+                       }
                        return $missing_billing_info;
                }