Changeset 507 for trunk/finance

Timestamp:

Apr 1, 2013, 7:14:59 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Generování nastavení sítě. Generování front Queue nyní pracuje s přiřazením služeb k zařízením a podsítím.
• Opraveno: Zjišťování adresáře souborů na disku dle id adresáře.

Location:

trunk/finance

Files:

• finance.php (modified) (5 diffs)
• manage.php (modified) (4 diffs)
• tarify.php (modified) (1 diff)
• user_state.php (modified) (2 diffs)
• zivnost.php (modified) (1 diff)

trunk/finance/finance.php

@@ -26 +26 @@
   var $Tariffs;
   var $ExternalSubject = 96;
-  var $MainSubject = 71;
+  var $MainSubject;
   var $BillingPeriods;
+  var $DirectoryId;
   
   function LoadTariffs()
@@ -35 +36 @@
     while($Tariff = $DbResult->fetch_array())
     {
-      $Tariff['InternetSpeedMin'] = $Tariff['InternetSpeedMin'] * 1024;
-      $Tariff['InternetSpeedMax'] = $Tariff['InternetSpeedMax'] * 1024;
+      $Tariff['InternetSpeedMin'] = $Tariff['InternetSpeedMin'] * 1000;
+      $Tariff['InternetSpeedMax'] = $Tariff['InternetSpeedMax'] * 1000;
       $this->Tariffs[$Tariff['Id']] = $Tariff;
     }  
@@ -43 +44 @@
   function RecalculateTariffs()
   {
-    $ResidualSpeed = $this->MaxSpeed * 1024;
+    $ResidualSpeed = $this->MaxSpeed * 1000;
   
     $this->LoadTariffs();
@@ -92 +93 @@
       }
       $this->Database->update('Service', 'Id='.$Tariff['Id'], 
-        array('InternetSpeedMin' => ($Tariff['InternetSpeedMin'] / 1024), 
+        array('InternetSpeedMin' => ($Tariff['InternetSpeedMin'] / 1000), 
         'CustomerCount' => $Tariff['CustomerCount']));
     }
@@ -211 +212 @@
         else $MonthlyInet = 0;
       
-      //if($Row['inet'] == 1)
       $Monthly += $MonthlyInet; 
       $Monthly -= $this->W2Kc($ConsumptionPlus); 
-      $Monthly -= $Member['Hire'];
-      //if($Row['overheads'] == 1) $Monthly += $Sprava; // + W2Kc($Consumption); 
       $Monthly = round($Monthly);
       

trunk/finance/manage.php

@@ -381 +381 @@
       }
       $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
-      if(($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']) and
-          ($Member['Blocked'] == 0))
+      if(($Period['MonthCount'] > 0) and ($Member['Blocked'] == 0) and
+        ($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']))
       {
         $InvoiceItems = array();
@@ -398 +398 @@
           $MonthlyTotal += $Service['Price'];
         }
-        if($Member['Hire'] != 0)
-        {
-          $Output .= '<tr><td>Nájem</td><td>'.(-$Member['Hire']).'</td></tr>';
-          $MonthlyTotal -= $Member['Hire'];
-        }
         if($Member['MonthlyPlus'] != 0)
         {
+          $InvoiceItems[] = array('Description' => 'Spotřeba energie', 'Price' => -$Member['MonthlyPlus'],
+            'Quantity' => $Period['MonthCount'], 'VAT' => 2);
           $MonthlyTotal -= $Member['MonthlyPlus'];
         }
@@ -610 +607 @@
     while($Row = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0));
+      $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0,
+        'Directory' => $this->System->Modules['Finance']->DirectoryId, 'Time' => 'NOW()'));
       $FileId = $this->Database->insert_id;
       $FileName = 'doklad-'.$FileId.'.pdf';
@@ -617 +615 @@
       $Bill->System = &$this->System;
       $Bill->InvoiceId = $Row['Id'];
-      $FullFileName = $this->System->Modules['File']->FilesDir.$FileName;
+      $FullFileName = $this->System->Modules['File']->GetDir($this->System->Modules['Finance']->DirectoryId).$FileName;
       $Bill->SaveToFile($FullFileName);
-      $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
-      $this->Database->update('FinanceInvoice', 'Id='.$Row['Id'], array('File' => $FileId));
-      $Output .= '.';
+      if(file_exists($FullFileName))
+      {
+        $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
+        $this->Database->update('FinanceInvoice', 'Id='.$Row['Id'], array('File' => $FileId));
+        $Output .= '.';
+      } else $Output .= 'Soubor "'.$FullFileName.'" se nepodařilo uložit.';
     }
 

trunk/finance/tarify.php

@@ -25 +25 @@
     {
       $Tariff['Aggregation'] = '1:'.round($Tariff['InternetSpeedMax'] / $Tariff['InternetSpeedMin']);
-      $Output .= '<tr><td style="color: blue;">'.$Tariff['Name'].'</td><td align="center">'.round($Tariff['InternetSpeedMin'] / 1024).'</td><td align="center" style="color: blue;">'.round($Tariff['InternetSpeedMax'] / 1024).'</td><td align="center">'.$Tariff['Aggregation'].'</td><td align="center">'.$Tariff['CustomerCount'].'</td><td align="center" style="color: blue;">'.$Tariff['Price'].'</td><td align="center">'.$Tariff['CustomerCount'] * $Tariff['Price'].'</td></tr>';
+      $Output .= '<tr><td style="color: blue;">'.$Tariff['Name'].'</td><td align="center">'.round($Tariff['InternetSpeedMin'] / 1000).'</td><td align="center" style="color: blue;">'.round($Tariff['InternetSpeedMax'] / 1000).'</td><td align="center">'.$Tariff['Aggregation'].'</td><td align="center">'.$Tariff['CustomerCount'].'</td><td align="center" style="color: blue;">'.$Tariff['Price'].'</td><td align="center">'.$Tariff['CustomerCount'] * $Tariff['Price'].'</td></tr>';
       $TotalPrice = $TotalPrice + $Tariff['Price'] * $Tariff['CustomerCount'];
       $TotalMemberCount = $TotalMemberCount + $Tariff['CustomerCount'];

trunk/finance/user_state.php

@@ -85 +85 @@
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
       if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
-      if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/FileDownload.php?id='.$Row['File']).'">'.$Row['BillCode'].'</a>'; 
+      if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillCode'].'</a>'; 
         else $Invoice = '&nbsp;';
       if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
@@ -118 +118 @@
     }
     
-    if($Member['Hire'] != 0)
-    {
-      $Output .= '<tr><td>Nájem</td><td>'.(-$Member['Hire']).'</td></tr>';
-      $Total -= $Member['Hire'];
-    }
     if($Member['MonthlyPlus'] != 0)
     {

trunk/finance/zivnost.php

@@ -8 +8 @@
   var $ShortTitle = 'Daňová evidence';
   var $ExternalSubject = 96;
-  var $MainSubject = 71;
   var $StartEvidence = 0;