Changeset 498 for trunk/finance/manage.php

Timestamp:

Mar 3, 2013, 6:02:17 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Přepracováno generování PDF dokladů. Nyní pro každý typ dokladu se definuje samostatná třída odvozená ze třídy Bill. Údaje se načítají přímo ze zdrojových tabulek namísto vytváření duplicitních dat v tabulce FinanceBills. Doklady jsou identifikovány jako soubor dle tabulky File.
• Upraveno: Fronta emailů a seznam síťových služeb lze nyní upravovat přímo ze sekce Správa dat.

File:

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

trunk/finance/manage.php

@@ -357 +357 @@
     
     // Generuj účetní položky
-    $DbResult = $this->Database->query('SELECT Member.*, MemberPayment.MonthlyTotal, UNIX_TIMESTAMP(Member.BillingPeriodLastDate), Subject.Name AS SubjectName FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member JOIN Subject ON Subject.Id=Member.Subject');
+    $DbResult = $this->Database->query('SELECT Member.*, MemberPayment.MonthlyTotal AS MonthlyTotal, '.
+      'UNIX_TIMESTAMP(Member.BillingPeriodLastDate), Subject.Name AS SubjectName,'.
+      'MemberPayment.MonthlyPlus AS MonthlyPlus '.
+      'FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member '.
+      'JOIN Subject ON Subject.Id=Member.Subject');
     while($Member = $DbResult->fetch_assoc())
     {
@@ -365 +369 @@
       {
         $this->Database->update('Member', 'Id='.$Member['Id'],
-            array('BillingPeriod' => $Member['BillingPeriodNext']));
+          array('BillingPeriod' => $Member['BillingPeriodNext']));
         $Member['BillingPeriod'] = $Member['BillingPeriodNext'];
       }
@@ -374 +378 @@
         $InvoiceItems = array();
         $MonthlyTotal = 0;
-        $DbResult2 = $this->Database->query('SELECT Service.* FROM ServiceCustomerRel LEFT JOIN Service '.
-          'ON Service.Id=ServiceCustomerRel.Service WHERE (ServiceCustomerRel.Customer='.
-          $Member['Id'].') AND (ServiceCustomerRel.Action IS NULL)');
+        $DbResult2 = $this->Database->query('SELECT Service.*, FinanceVAT.Value AS VAT '.
+          'FROM ServiceCustomerRel LEFT JOIN Service '.
+          'ON Service.Id=ServiceCustomerRel.Service '.
+          'LEFT JOIN FinanceVAT ON FinanceVAT.Id=Service.VAT '.
+          'WHERE (ServiceCustomerRel.Customer='.
+          $Member['Id'].') AND (ServiceCustomerRel.Action IS NULL) ');
         while($Service = $DbResult2->fetch_assoc())
         {
           $InvoiceItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'],
-              'Quantity' => $Period['MonthCount'], 'VAT' => 21);
+            'Quantity' => $Period['MonthCount'], 'VAT' => $Service['VAT']);
           $MonthlyTotal += $Service['Price'];
         }
@@ -396 +403 @@
         $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
         $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
-        $this->InsertInvoice($Member['Subject'], 'NOW()', 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)', 
+        $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS, 
           $InvoiceItems, INVOICE_OUT_DOC_LINE, $Period['From'], $Period['To']);
     
         $Output .= $this->SendPaymentEmail($Member['Id']);
-        $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
+        $this->Database->update('Member', 'Id='.$Member['Id'], 
+          array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
       } else $Output .= '<br />';
     }  
@@ -491 +499 @@
     {
       $Output .= 'Odečítám měsíční poplatek...<br />';
-      $this->ProduceInvoices();    
+      $Output .= $this->ProduceInvoices();    
       
       // Update finance charge
@@ -498 +506 @@
 
       $Output .= 'Přidávám měsíční přehled...<br />';
+      $DbResult = $this->Database->query('SELECT * FROM FinanceCharge WHERE Action IS NULL LIMIT 1');
+      $Charge = $DbResult->fetch_assoc();
       $this->Database->insert('FinanceMonthlyOverall', array('Date' => 'NOW()', 
         'Money' => $Finance->Internet, 'kWh' => $Finance->kWh, 
@@ -553 +563 @@
         'Váše aktuální služby: ';
       $DbResult = $this->Database->query('SELECT GROUP_CONCAT(Service.Name) AS Name FROM ServiceCustomerRel LEFT JOIN Service '.
-      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer='.$Member['Id'].' AND ServiceCustomerRel.Period=0');
-        $Service = $DbRow->fetch_assoc();
+        'ON Service.Id=ServiceCustomerRel.Service WHERE (ServiceCustomerRel.Customer='.$Member['Id'].') '.
+        'AND ServiceCustomerRel.Action IS NULL');
+      $Service = $DbResult->fetch_assoc();
       $Content .= '<strong>'.$Service['Name'].'</strong><br />'."\n".
         'Vaše platební období: <strong>'.$this->System->Modules['Finance']->BillingPeriods[$Member['BillingPeriod']]['Name'].'</strong><br />'."\n".
@@ -563 +574 @@
       $Content .= 'Nové finanční operace:<br/>'.
         '<table style="margin-left: auto; margin-right: auto; border-style: solid; border-width: 1px; border-collapse: collapse;"><tr><th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Čas</th><th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center;; font-weight: bold;">Popis</th><th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center;; font-weight: bold;">Částka [Kč]</th></tr>'."\n";
-      //$Member['BillingPeriodLastDate'] = '2009-04-01';
-      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT Text, Time, Value AS Value, Bill FROM FinanceOperation WHERE (Subject='.$Member['Subject'].')) UNION ALL '.
-      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceInvoice WHERE (Subject='.$Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
+      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT Text, Time, Value AS Value, File FROM FinanceOperation WHERE (Subject='.$Member['Subject'].')) UNION ALL '.
+      '(SELECT Text, TimeCreation as Time, -Value as Value, File FROM FinanceInvoice WHERE (Subject='.$Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())
       {
@@ -584 +594 @@
   function GenerateBills()
   {
+    $Output = '';
+    
     // FinanceInvoice
-    $DbResult = $this->Database->query('SELECT * FROM FinanceInvoice WHERE (BillCode <> "") AND (Value != 0) AND (Bill = 0)');
+    $DbResult = $this->Database->query('SELECT * FROM `FinanceInvoice` WHERE (`BillCode` <> "") '.
+      'AND (`Value` != 0) AND (`File` IS NULL)');
     while($Row = $DbResult->fetch_assoc())
     {
-      $BillId = $this->System->Modules['Bill']->CreateBill($Row['Subject'], 
-        array(array('Description' => $Row['Text'], 'Price' => $Row['Value'], 'Quantity' => 1)), 
-        MysqlDateTimeToTime($Row['TimeCreation']), MysqlDateTimeToTime($Row['TimeDue']), 
-        $Row['BillCode'], 'invoice', MysqlDateToTime($Row['PeriodFrom']), MysqlDateToTime($Row['PeriodTo']));
-      $this->Database->update('FinanceInvoice', 'Id='.$Row['Id'], array('Bill' => $BillId));
-      echo('.');
+      $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0));
+      $FileId = $this->Database->insert_id;
+      $FileName = 'doklad-'.$FileId.'.pdf';
+      $Bill = new BillInvoice();
+      $Bill->Database = &$this->System->Database;
+      $Bill->System = &$this->System;
+      $Bill->InvoiceId = $Row['Id'];
+      $FullFileName = $this->System->FilesDir.$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 .= '.';
     }
 
     // FinanceOperations
+    return($Output);
   }
 }