Changeset 156 for www/finance/manage.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/manage.php (modified) (13 diffs)

www/finance/manage.php

@@ -63 +63 @@
   {
     $Output = '';
-    if(array_key_exists('user', $_GET))
-    {
-      $DbResult = $this->Database->select('finance_bills', '*', 'user_id='.$_GET['user']);
+    if(array_key_exists('subject', $_GET))
+    {
+      $DbResult = $this->Database->select('FinanceBills', '*', 'Subject='.$_GET['subject']);
       while($Item = $DbResult->fetch_array())
       {
-        $Output .= '<a href="?Operation=Bills&amp;bill='.$Item['id'].'">faktura '.$Item['id'].'</a> <a href="?Operation=Bills&amp;billpdf='.$Item['id'].'">Uložené PDF</a> <a href="?Operation=Bills&amp;billpdf2='.$Item['id'].'">Generované PDF</a> <a href="?Operation=Bills&amp;regenerate='.$Item['id'].'">Přegenerovat</a><br />';
+        $Output .= '<a href="?Operation=Bills&amp;bill='.$Item['Id'].'">faktura '.$Item['Id'].'</a> <a href="?Operation=Bills&amp;billpdf='.$Item['Id'].'">Uložené PDF</a> <a href="?Operation=Bills&amp;billpdf2='.$Item['Id'].'">Generované PDF</a> <a href="?Operation=Bills&amp;regenerate='.$Item['Id'].'">Přegenerovat</a><br />';
       }
     } else
@@ -89 +89 @@
     if(array_key_exists('generate', $_GET))
     {
-      $Output .= $this->System->Modules['Bill']->CreateBill(1, array(array('description' => 'Poplatek za připojení k síti', 'price' => 1000, 'quantity' => 1)), time(), time());
+      $Output .= $this->System->Modules['Bill']->CreateBill(1, array(array('Description' => 'Poplatek za připojení k síti', 'Price' => 1000, 'Quantity' => 1)), time(), time());
     } else 
     {
       //ShowHeader('Faktury', 'Faktury');
       $Output .= 'Faktury:<br />';
-      $DbResult = $this->Database->select('users', '*, CONCAT(second_name," ", first_name)  as fullname', '1 ORDER BY fullname');
-      while($User = $DbResult->fetch_array())
-      {
-        $Output .= '<a href="?Operation=Bills&amp;user='.$User['id'].'">'.$User['fullname'].'</a><br />';
+      $DbResult = $this->Database->select('Subject', '*', '1 ORDER BY Name');
+      while($Subject = $DbResult->fetch_array())
+      {
+        $Output .= '<a href="?Operation=Bills&amp;subject='.$Subject['Id'].'">'.$Subject['Name'].'</a><br />';
       }
       //ShowFooter();
@@ -133 +133 @@
     if($TimePayment != '') $TimePayment = TimeToMysqlDateTime($TimePayment);
     $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($Time), 'TimeDue' => TimeToMysqlDateTime($Time + 3600*24*15), 'TimePayment' => $TimePayment, 'Value' => $Value, 'Bill' => $BillId));
-    $Output = $this->Database->LastQuery.'<br />';
+    $Output = '.'; //$this->Database->LastQuery.'<br />';
     $LastInsertTime = $Time;
     $this->CheckAdvancesAndLiabilities($Subject);
@@ -227 +227 @@
   function ImportOldData()
   {
-    global $InvoiceGenerator;
-
     $Output = '';
     $this->Database->query('TRUNCATE TABLE FinanceCashFlow');
@@ -239 +237 @@
 
     // Transfer finance before era
-    $DbResult = $this->Database->query('SELECT * FROM users WHERE role=2');
-    while($User = $DbResult->fetch_array())
-    {
-      $DbResult2 = $this->Database->query('SELECT SUM(money) FROM finance_operations WHERE user='.$User['id'].' AND date < "2007-12-01"');
-      $Row = $DbResult2->fetch_array();
+    $DbResult = $this->Database->query('SELECT * FROM Subject');
+    while($Subject = $DbResult->fetch_assoc())
+    {
+      $DbResult2 = $this->Database->query('SELECT SUM(money) FROM finance_operations WHERE user='.$Subject['Id'].' AND date < "2007-12-01"');
+      $Row = $DbResult2->fetch_row();
       $TotalAdvance = $Row[0];
       //echo($User['second_name'].' '.$User['first_name'].' '.$TotalAdvance.'<br>');
@@ -249 +247 @@
       if($TotalAdvance > 0) 
       {
-        $this->InsertMoney($User['id'], $TotalAdvance, 0, 1, mktime(0, 0, 0, 12, 1, 2007), 'Přijatá záloha (z období před daňovou evidencí)');
+        $this->InsertMoney($Subject['Id'], $TotalAdvance, 0, 1, mktime(0, 0, 0, 12, 1, 2007), 'Přijatá záloha (z období před daňovou evidencí)');
       }
       // Dluh
       if($TotalAdvance < 0) 
       {
-        $this->InsertLiability($User['id'], (-$Row[0]), mktime(0, 0, 0, 12, 1, 2007), 0, 'Připojení k síti (z období před daňovou evidencí)');
+        $this->InsertLiability($Subject['Id'], (-$Row[0]), mktime(0, 0, 0, 12, 1, 2007), 0, 'Připojení k síti (z období před daňovou evidencí)');
         //echo($Database->LastQuery.'<br>');
       }
@@ -263 +261 @@
     //  while($User = $DbResult->fetch_array())
     //  {
-    $DbResult2 = $this->Database->query('SELECT finance_operations.*, users.role as role FROM finance_operations JOIN users ON users.id = finance_operations.user WHERE finance_operations.date >= "2007-12-01"');
-    while($Operation = $DbResult2->fetch_array())
+    $DbResult2 = $this->Database->query('SELECT finance_operations.* FROM finance_operations JOIN Subject ON Subject.Id = finance_operations.user WHERE finance_operations.date >= "2007-12-01"');
+    while($Operation = $DbResult2->fetch_assoc())
     {
       //echo($Operation['comment'].'<br>');
@@ -288 +286 @@
       } else
       {
-        $DbResult = $this->Database->query('SELECT role FROM users WHERE id='.$Operation['user']);
+        $DbResult = $this->Database->query('SELECT Id FROM Subject WHERE Id='.$Operation['user']);
         while($User = $DbResult->fetch_array())
         $this->InsertLiability($Operation['user'], -$Operation['money'], MysqlDateToTime($Operation['date']), $Operation['bill_id'], $Operation['comment'], MysqlDateToTime($Operation['date']));
         $Output .= $Operation['user'].' '.$Operation['comment'].' '.MysqlDateToTime($Operation['date']).'<br />';
 
-        if(($Operation['role'] == 2))
-        {
+//        if(($Operation['role'] == 2))
+       // {
           $Output .= 'A';
           $this->Database->insert('FinanceAdvances', array('Subject' => $Operation['user'], 'Value' => $Operation['money'], 'TimeCreation' => MysqlDateToTime($Operation['date']), 'CashFlowId' => 0, 'Direction' => 'In'));
           $this->CheckAdvancesAndLiabilities($Operation['user']);
-        } else InsertMoney($Operation['user'], $Operation['money'], 0, 1, MysqlDateToTime($Operation['date']), $Operation['comment']);
+        //} else InsertMoney($Operation['user'], $Operation['money'], 0, 1, MysqlDateToTime($Operation['date']), $Operation['comment']);
       }
     }
@@ -314 +312 @@
     {
       //$Database->insert('FinanceSmallAsset', array());
-      $Items[] = array('description' => $Device['name'], 'quantity' => $Device['count'], 'price' => 0); //$Device['price']); 
+      $Items[] = array('Description' => $Device['name'], 'Quantity' => $Device['count'], 'Price' => 0); //$Device['price']); 
       $LastId = $Device['id'];
       $TotalPrice += $Device['price'] * $Device['count'];
@@ -320 +318 @@
     }
     //print_r($Items);
-    $BillId = $InvoiceGenerator->CreateBill($Subject, $Items, $Time, $Time);
+    $BillId = $this->System->Modules['Bill']->CreateBill($Subject, $Items, $Time, $Time);
     $DbResult = $this->Database->query('UPDATE network_devices SET TimeEnlistment = "'.TimeToMysqlDateTime($Time).'" WHERE used <> 0 AND date < "'.TimeToMysqlDateTime($Time).'" AND (id <> 73) AND (id <= '.$LastId.')');
     //echo($Database->error);
@@ -336 +334 @@
     {
       // $Database->insert('FinanceSmallAsset', array());
-      $Items[] = array('description' => $Device['name'], 'quantity' => $Device['count'], 'price' => 0); //$Device['price']);
+      $Items[] = array('Description' => $Device['name'], 'Quantity' => $Device['count'], 'Price' => 0); //$Device['price']);
       $TotalPrice += $Device['price'] * $Device['count'];
     }
     //print_r($Items);
-    $BillId = $InvoiceGenerator->CreateBill($Subject, $Items, $Time, $Time);
+    $BillId = $this->System->Modules['Bill']->CreateBill($Subject, $Items, $Time, $Time);
     $DbResult = $this->Database->query('UPDATE network_devices SET TimeEnlistment = "'.TimeToMysqlDateTime($Time).'" WHERE used <> 0 AND date < "'.TimeToMysqlDateTime($Time).'" AND (id > '.$LastId.')');
     $this->InsertLiability($Subject, 0, $Time, $BillId, 'Nákup infrastruktury', $Time);
@@ -354 +352 @@
   function ConvertPDFDataToFiles()
   {
-    $DbResult = $this->Database->query('SELECT * FROM finance_bills');
+    $DbResult = $this->Database->query('SELECT * FROM FinanceBills');
     while($Bill = $DbResult->fetch_array())
     {
@@ -366 +364 @@
     global $Database, $InvoiceGenerator;
 
-    $DbResult = $this->Database->query('SELECT * FROM finance_bills');
+    $DbResult = $this->Database->query('SELECT * FROM FinanceBills');
     while($Bill = $DbResult->fetch_array())
     {