[Fmsystem-commits] [7093] added "one time price items" to pdf contract

[Lars Hopland Nestås]

Revision: 7093
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7093
Author:   larshn
Date:     2011-03-09 07:45:39 +0000 (Wed, 09 Mar 2011)
Log Message:
-----------
added "one time price items" to pdf contract

Modified Paths:
--------------
    
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
    
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig.php

Modified: 
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
===================================================================
--- 
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
 2011-03-08 21:30:03 UTC (rev 7092)
+++ 
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_hybler.php
 2011-03-09 07:45:39 UTC (rev 7093)
@@ -38,6 +38,11 @@
 if(isset($_POST['checkb_HR'])){?><input type="hidden" name="checkb_HR_hidden"  
/><?php }
 if(isset($_POST['checkb_payroll_office'])){?><input type="hidden" 
name="checkb_payroll_office_hidden"  /><?php }
 
+$termin_name = str_replace("lig", "", $contract->get_term_id_title());
+$termin_name = str_replace("vis", "", $termin_name);
+
+
+
 ?>
 
 <div class="two_column">
@@ -89,28 +94,58 @@
 </dl>
 </div>
 
+<?php if(sizeof($one_time_price_items)>0){ ?>
 <div class="one_column">
 
-<table>
+<table border="0">
+<tr><td><strong>Engangsbeløp</strong></td></tr>
 <?php
-foreach ($price_items as $item)
+foreach ($one_time_price_items as $item)
 {
        ?>
        <tr>
-               <td width="70%"><?php echo $item->get_title();?></td>
-               <td>Kr.:</td>
-               <td align="right" width="15%"><?php  echo $valuta_prefix; ?> 
&nbsp; <?php echo number_format($item->get_total_price()/12,2,',',' '); ?> 
&nbsp; <?php  echo $valuta_suffix; ?></td>
-               <td>Pr.mnd.</td>
+               <td><?php echo $item->get_title();?>: <?php echo 
$item->get_count();?> stk. &aacute  kr. <?php  echo $valuta_prefix; ?> &nbsp; 
<?php echo number_format($item->get_price(),2,',',' '); ?> &nbsp; <?php  echo 
$valuta_suffix; ?> </td>
+               
+               
+               <td align="right">Kr.: <?php  echo $valuta_prefix; ?> &nbsp; 
<?php echo number_format($item->get_total_price(),2,',',' '); ?> &nbsp; <?php  
echo $valuta_suffix; ?></td>
        </tr>
 
-       <?php
+       <?php   
 }
 ?>
 </table>
 </div>
+<?php }
 
+?>
 
+
+<?php if(sizeof($termin_price_items)>0){ ?>
 <div class="one_column">
+
+<table border="0">
+<tr><td><strong>Fastbeløp pr. <?php echo  strtolower($termin_name);?> 
</strong></td></tr>
+<?php
+
+foreach ($termin_price_items as $item)
+
+{
+       ?>
+       <tr>
+               <td ><?php echo $item->get_title();?></td>
+               
+               <td align="right"> Kr.:<?php  echo $valuta_prefix; 
?>&nbsp;<?php echo number_format(($item->get_total_price()/12)*$months,2,',',' 
'); ?>&nbsp;<?php  echo $valuta_suffix; ?>&nbsp;Pr.&nbsp;<?php echo 
strtolower($termin_name)?></td>
+               
+       </tr>
+
+       <?php
+}
+?>
+</table>
+</div>
+<?php }?>
+
+<div class="one_column">
 <p>Merknader: <strong>Boligen (hybelen) skal ved flytting være ryddet og 
rengjort.</strong></p>
 <?php if (isset($_POST['preview']) )
 {

Modified: 
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig.php
===================================================================
--- 
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig.php
  2011-03-08 21:30:03 UTC (rev 7092)
+++ 
thirdparty/PE_custom/NLSH/rental/templates/base/pdf/rental_contract_form_personalbolig.php
  2011-03-09 07:45:39 UTC (rev 7093)
@@ -52,6 +52,10 @@
 if(isset($_POST['checkb_remarks3'])){?><input type="hidden" 
name="checkb_remarks3_hidden"  /><?php }
 if(isset($_POST['checkb_remarks4'])){?><input type="hidden" 
name="checkb_remarks4_hidden"  /><?php }
 
+$termin_name = str_replace("lig", "", $contract->get_term_id_title());
+$termin_name = str_replace("vis", "", $termin_name);
+
+
 ?>
 
 
@@ -196,9 +200,9 @@
 <?php
 foreach ($price_items as $item)
 {
-       if($item->get_title()=="Leie"){
+       if($item->get_title()=="Utleie"){
                ?>
-<p>Leien er ved kontraktsinngåelse fastsatt til kr <?php  echo $valuta_prefix; 
?> &nbsp; <?php echo number_format($item->get_total_price()/12,2,',',' '); ?> 
&nbsp; <?php  echo $valuta_suffix; ?> pr. måned.</p>
+<p>Leien er ved kontraktsinngåelse fastsatt til kr <?php  echo $valuta_prefix; 
?> &nbsp; <?php echo 
number_format(($item->get_total_price()/12)*$months,2,',',' '); ?> &nbsp; <?php 
 echo $valuta_suffix; ?> pr. <?php echo  strtolower($termin_name);?></p>
                <?php
        }
 }?>
@@ -219,13 +223,13 @@
                        $on_account = true;
                        ?>
        <dt><input type="checkbox" disabled="disabled" checked="checked" /></dt>
-       <dd><?php echo $item->get_title();?>: kr  <?php  echo $valuta_prefix; 
?> &nbsp; <?php echo number_format($item->get_total_price()/12,2,',',' '); ?> 
&nbsp; <?php  echo $valuta_suffix; ?> pr. måned.</dd>
+       <dd><?php echo $item->get_title();?>: kr  <?php  echo $valuta_prefix; 
?> &nbsp; <?php echo 
number_format(($item->get_total_price()/12)*$months,2,',',' '); ?> &nbsp; <?php 
 echo $valuta_suffix; ?> pr. <?php echo  strtolower($termin_name);?></dd>
        <?php
                }
        }
        if(!$on_account){
                ?>
-               <dt><input type="checkbox" name="checkb_electricity" <?php echo 
$disabled; if(isset($_POST['checkb_electricity']) || 
isset($_POST['checkb_electricity_hidden'])) {echo 'checked="checked"';}?> 
/></dt>
+               <dt><input type="checkbox" name="checkb_electricity" <?php  
if(isset($_POST['checkb_electricity']) || 
isset($_POST['checkb_electricity_hidden'])) {echo 'checked="checked"';}?> 
/></dt>
        <dd>Leier tegner eget strømabonnement</dd>
                <?php
        }
@@ -234,24 +238,42 @@
 </dl>
 
 <dl class="section_header">
-       <dt>9.</dt>
-       <dd>Andre tillegg</dd>
+       <dt>9 a)</dt>
+       <dd>Andre tillegg - Fastbeløp pr. <?php echo  
strtolower($termin_name);?></dd>
 </dl>
 
 <dl class="checkbox_list">
 <?php
-foreach ($price_items as $item)
+foreach ($termin_price_items as $item)
 {
-       if(!($item->get_title()=="Leie" || $item->get_title()=="Strøm")){
+       if(!($item->get_title()=="Utleie" || $item->get_title()=="Strøm")){
                ?>
        <dt><input type="checkbox" disabled="disabled" checked="checked"/></dt>
-       <dd><?php echo $item->get_title();?>: kr <?php  echo $valuta_prefix; ?> 
&nbsp; <?php echo number_format($item->get_total_price()/12,2,',',' '); ?> 
&nbsp; <?php  echo $valuta_suffix; ?> pr. måned.</dd>
+       <dd><?php echo $item->get_title();?>: kr <?php  echo $valuta_prefix; ?> 
&nbsp; <?php echo number_format(($item->get_total_price()/12)*$months,2,',',' 
'); ?> &nbsp; <?php  echo $valuta_suffix; ?> pr. <?php echo  
strtolower($termin_name);?></dd>
        <?php
        }
 }?>
 </dl>
 
 <dl class="section_header">
+       <dt>9 b)</dt>
+       <dd>Andre tillegg - Engangsbeløp</dd>
+</dl>
+
+<dl class="checkbox_list">
+<?php
+foreach ($one_time_price_items as $item)
+{
+       if(!($item->get_title()=="Utleie" || $item->get_title()=="Strøm")){
+               ?>
+       <dt><input type="checkbox" disabled="disabled" checked="checked"/></dt>
+       <dd><?php echo $item->get_title();?>: kr <?php  echo $valuta_prefix; ?> 
&nbsp; <?php echo number_format($item->get_total_price(),2,',',' '); ?> &nbsp; 
<?php  echo $valuta_suffix; ?></dd>
+       <?php
+       }
+}?>
+</dl>
+
+<dl class="section_header">
        <dt>10.</dt>
        <dd>Leiebetaling</dd>
 </dl>