Changeset 507 for trunk/finance/manage.php

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.

File:

• trunk/finance/manage.php (modified) (4 diffs)

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.';
     }