Changeset 156 for www/finance/bills.php

Timestamp:

Feb 17, 2009, 10:00:28 PM (16 years ago)

Author:

george

Message:

• Opraveno: Některé soubory financí aktualizovány na nové rozvržení tabulek User, Member, Subject.

File:

• www/finance/bills.php (modified) (11 diffs)

www/finance/bills.php

@@ -11 +11 @@
     global $SpecificSymbol;
   
-    $DbResult = $this->Database->select('finance_bills', '*', 'id='.$BillId);
-    $Bill = $DbResult->fetch_array();
+    $DbResult = $this->Database->select('FinanceBills', '*', 'Id='.$BillId);
+    $Bill = $DbResult->fetch_assoc();
  
-    $DbResult = $this->Database->select('users', '*', 'id='.$Bill['user_id']);
-    $User = $DbResult->fetch_array();
+    $DbResult = $this->Database->select('Subject', '*', 'Id='.$Bill['Subject']);
+    $Subject = $DbResult->fetch_assoc();
 
     $Dodavka = array();
-    $DbResult = $this->Database->select('finance_bills_items', '*', 'bill_id='.$BillId);
-    while($Item = $DbResult->fetch_array())
-    {
-      $Dodavka[$Item['id']] = $Item; 
+    $DbResult = $this->Database->select('FinanceBillsItems', '*', 'Bill='.$BillId);
+    while($Item = $DbResult->fetch_assoc())
+    {
+      $Dodavka[$Item['Id']] = $Item; 
     }
   
@@ -40 +40 @@
         '</td><td valign="top">'.
         '<strong>Odběratel:</strong><br>'.
-        $User['subject_name'].'<br>'.
-        $User['street'].'<br>'.
-        $User['psc'].' '.$User['town'].'<br>';
-        if($User['ico'] != 0) $Output .= 'IČ: '.$User['ico'].'<br>';
-        if($User['dic'] != '') $Output .= 'DIČ: '.$User['dic'].'<br>';
+        $Subject['Name'].'<br>'.
+        $Subject['AddressStreet'].'<br>'.
+        $Subject['AddressPSC'].' '.$Subject['AddressTown'].'<br>';
+        if($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
+        if($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
         $Output .= 
         '</td></tr>'.
@@ -51 +51 @@
         '<strong>Platební podmínky:</strong><br>'.
         'Číslo dokladu: '.$Bill['BillCode'].'<br>'.
-        'Variabilní symbol: '.$User['id'].'<br>'.
+        'Variabilní symbol: '.$Subject['Id'].'<br>'.
         'Specifický symbol: '.$this->SpecificSymbol.'<br>'.
         'Konstantní symbol:<br>'.
@@ -57 +57 @@
         '</td><td valign="top">'.
         '<br>'.
-        'Datum vystavení: '.HumanDate($Bill['time_create']).'<br>'.
-        'Datum zdanitel. plnění: '.HumanDate($Bill['time_create']).'<br>'.
-        'Datum splatnosti: '.HumanDate($Bill['time_due']).'<br>';
-        if(($Bill['time_from'] != '0000-00-00 00:00:00') and ($Bill['time_to'] != '0000-00-00 00:00:00'))
-          $Output .= 'Fakturované období: '.HumanDate($Bill['time_from']).' - '.HumanDate($Bill['time_to']).'<br>';
+        'Datum vystavení: '.HumanDate($Bill['TimeCreate']).'<br>'.
+        'Datum zdanitel. plnění: '.HumanDate($Bill['TimeCreate']).'<br>'.
+        'Datum splatnosti: '.HumanDate($Bill['TimeDue']).'<br>';
+        if(($Bill['TimeFrom'] != '0000-00-00 00:00:00') and ($Bill['TimeTo'] != '0000-00-00 00:00:00'))
+          $Output .= 'Fakturované období: '.HumanDate($Bill['TimeFrom']).' - '.HumanDate($Bill['TimeTo']).'<br>';
         $Output .= '</td></tr>'.
         '<tr><td colspan="2">'.
@@ -73 +73 @@
         foreach($Dodavka as $Polozka)
         {
-          $Output .= '<tr><td>'.$Polozka['description'].'</td><td align="right">'.$Polozka['quantity'].'</td><td align="right">'.$Polozka['price'].'&nbsp;Kč</td><td align="right">'.($Polozka['quantity'] * $Polozka['price']).'&nbsp;Kč</td></tr>';
-          $Total += ($Polozka['quantity'] * $Polozka['price']);
+          $Output .= '<tr><td>'.$Polozka['Description'].'</td><td align="right">'.$Polozka['Quantity'].'</td><td align="right">'.$Polozka['Price'].'&nbsp;Kč</td><td align="right">'.($Polozka['Quantity'] * $Polozka['Price']).'&nbsp;Kč</td></tr>';
+          $Total += ($Polozka['Quantity'] * $Polozka['Price']);
         }
         $Output .= '<tr><th colspan="3" align="left">Celkem</th><th align="right">'.$Total.'&nbsp;Kč</th></tr>';
@@ -94 +94 @@
         '<font size="5"><strong>PŘÍJMOVÝ POKLADNÍ DOKLAD</strong></font><br><br>'.
         'Číslo dokladu: '.$Bill['BillCode'].'<br>'.
-        'Datum vystavení: '.HumanDate($Bill['time_create']).'<br>'.
+        'Datum vystavení: '.HumanDate($Bill['TimeCreate']).'<br>'.
         '</td></tr>'.
         '<tr><td colspan="2"><strong>Přijato od:</strong><br>'.
-        $User['subject_name'].'<br>'.
-        $User['street'].'<br>'.
-        $User['psc'].' '.$User['town'].'<br>';
-        if($User['ico'] != 0) $Output .= 'IČ: '.$User['ico'].'<br>';
-        if($User['dic'] != '') $Output .= 'DIČ: '.$User['dic'].'<br>';
+        $Subject['Name'].'<br>'.
+        $Subject['AddressStreet'].'<br>'.
+        $Subject['AddressPSC'].' '.$Subject['AddressTown'].'<br>';
+        if($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
+        if($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
         $Total = 0;
                 $Description = '';
         foreach($Dodavka as $Polozka)
         {
-          $Description .= $Polozka['description'].'<br>';
-          $Total += ($Polozka['quantity'] * $Polozka['price']);
+          $Description .= $Polozka['Description'].'<br>';
+          $Total += ($Polozka['Quantity'] * $Polozka['Price']);
         }
         $Output .= '</td></tr>'.
@@ -120 +120 @@
   }
 
-  function CreateBill($UserId, $Items, $TimeFrom, $TimeTo, $BillCode, $Type)
-  {
-    $this->Database->insert('finance_bills', array('time_create' => TimeToMysqlDateTime(time()), 'user_id' => $UserId, 'time_from' => TimeToMysqlDateTime($TimeFrom), 'time_to' => TimeToMysqlDateTime($TimeTo), 'time_due' => TimeToMysqlDateTime($TimeFrom + 15*24*3600), 'BillCode' => $BillCode, 'Type' => 'invoice'));
+  function CreateBill($SubjectId, $Items, $TimeFrom, $TimeTo, $BillCode, $Type)
+  {
+    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime(time()), 'Subject' => $SubjectId, 'TimeFrom' => TimeToMysqlDateTime($TimeFrom), 'TimeTo' => TimeToMysqlDateTime($TimeTo), 'TimeDue' => TimeToMysqlDateTime($TimeFrom + 15*24*3600), 'BillCode' => $BillCode, 'Type' => 'invoice'));
     $BillId = $this->Database->insert_id;
     foreach($Items as $Item)
     {
-      $this->Database->insert('finance_bills_items', array('bill_id' => $BillId, 'description' => $Item['description'], 'price' => $Item['price'], 'quantity' => $Item['quantity']));
+      $this->Database->insert('FinanceBillsItems', array('Bill' => $BillId, 'Description' => $Item['Description'], 'Price' => $Item['Price'], 'Quantity' => $Item['Quantity']));
     }
     //Header('Content-Type: application/pdf');
@@ -136 +136 @@
   } 
 
-  function CreateIncomeBill($UserId, $Description, $Price, $BillCode)
-  {
-    $this->Database->insert('finance_bills', array('time_create' => TimeToMysqlDateTime(time()), 'user_id' => $UserId, 'BillCode' => $BillCode, 'Type' => 'income'));
+  function CreateIncomeBill($SubjectId, $Description, $Price, $BillCode)
+  {
+    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime(time()), 'Subject' => $SubjectId, 'BillCode' => $BillCode, 'Type' => 'income'));
     $BillId = $this->Database->insert_id;
-    $this->Database->insert('finance_bills_items', array('bill_id' => $BillId, 'description' => $Description, 'price' => $Price, 'quantity' => 1));
+    $this->Database->insert('FinanceBillsItems', array('Bill' => $BillId, 'Description' => $Description, 'Price' => $Price, 'Quantity' => 1));
     //Header('Content-Type: application/pdf');
     $PdfData = $this->HtmlToPdf($this->GenerateBill($BillId));
@@ -206 +206 @@
       echo($Row['id']."<br>\n");
       $Time = MysqlDateToTime($Row['date']);
-      $BillId = $this->CreateBill($Row['user'], array(array('description' => 'Poplatek za připojení k síti', 'price' => (-$Row['money']), 'quantity' => 1)), $Time, $Time + (date("t", time()) - 1) * 24 * 3600);  
+      $BillId = $this->CreateBill($Row['user'], array(array('Description' => 'Poplatek za připojení k síti', 'Price' => (-$Row['money']), 'Quantity' => 1)), $Time, $Time + (date("t", time()) - 1) * 24 * 3600);  
      $this->Database->update('finance_operations', 'id='.$Row['id'], array('bill_id' => $BillId));
     }
@@ -214 +214 @@
   {
     global $Database;
-    if(array_key_exists('user', $_GET))
+    if(array_key_exists('subject', $_GET))
     {
   
-      $DbResult = $this->Database->select('finance_bills', '*', 'user_id='.$_GET['user']);
+      $DbResult = $this->Database->select('FinanceBills', '*', 'Subject='.$_GET['subject']);
       while($Item = $DbResult->fetch_array())
       {
-        echo('<a href="?bill='.$Item['id'].'">faktura '.$Item['id'].'</a> <a href="?billpdf='.$Item['id'].'">Uložené PDF</a> <a href="?billpdf2='.$Item['id'].'">Generované PDF</a> <a href="?regenerate='.$Item['id'].'">Přegenerovat</a><br>');
+        echo('<a href="?bill='.$Item['Id'].'">faktura '.$Item['Id'].'</a> <a href="?billpdf='.$Item['Id'].'">Uložené PDF</a> <a href="?billpdf2='.$Item['Id'].'">Generované PDF</a> <a href="?regenerate='.$Item['Id'].'">Přegenerovat</a><br>');
       } 
     } else
@@ -241 +241 @@
     if(array_key_exists('generate', $_GET))
     {
-      $this->CreateBill(1, array(array('description' => 'Poplatek za připojení k síti', 'price' => 1000, 'quantity' => 1)), time(), time());
+      $this->CreateBill(1, array(array('Description' => 'Poplatek za připojení k síti', 'Price' => 1000, 'Quantity' => 1)), time(), time());
     } else 
     {
       ShowHeader('Doklady', 'Doklady');
-      echo('Faktury:<br>');
-      $DbResult = $this->Database->select('users', '*, CONCAT(second_name," ", first_name)  as fullname', '1 ORDER BY fullname');
-      while($User = $DbResult->fetch_array())
+      echo('Faktury:<br />');
+      $DbResult = $this->Database->select('Subject', '*', '1 ORDER BY Name');
+      while($Subject = $DbResult->fetch_assoc())
       {
-        echo('<a href="?user='.$User['id'].'">'.$User['fullname'].'</a><br>');
+        echo('<a href="?user='.$Subject['Id'].'">'.$Subject['Name'].'</a><br />');
       }
       ShowFooter();