Changeset 688

Timestamp:

Sep 7, 2014, 2:48:21 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: Spotřeba se dále bude zákazníkům evidovat jako samostatná přiřazená služba namísto pevného vkládání položky a dopočtu z tabulky "Placení zákazníků".

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/Finance/UserState.php (modified) (4 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 687; // Subversion revision
-$DatabaseRevision = 679; // SQL structure revision
+$Revision = 688; // Subversion revision
+$DatabaseRevision = 688; // SQL structure revision
 $ReleaseTime = strtotime('2014-09-07');

trunk/Common/Setup/Updates.php

@@ -885 +885 @@
 }
 
+function UpdateTo688($Manager)
+{
+        // Convert monthly plus payment for consumption to regular service
+  $DbResult = $Manager->Execute('SELECT `MonthlyPlus`, `Member` FROM `MemberPayment` WHERE `MonthlyPlus` > 0');
+  while($DbResult->num_rows > 0)
+  {
+        $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute("INSERT INTO `Service` (`Id` ,`Name` ,`Category` ,`Price` ,`VAT`) ".
+      "VALUES (NULL , 'Spotřeba energie', 3, -".$DbRow['MonthlyPlus'].", 2);");
+    $ServiceId = $Manager->Database->insert_id;
+    $Manager->Execute("INSERT INTO `ServiceCustomerRel` (`Id` ,`Service` ,`Customer`) ".
+      "VALUES (NULL , ".$ServiceId.', '.$DbRow['Member'].");");
+  }
+}
+
 class Updates
 {
@@ -933 +948 @@
       676 => array('Revision' => 678, 'Function' => 'UpdateTo678'),
       678 => array('Revision' => 679, 'Function' => 'UpdateTo679'),
+      679 => array('Revision' => 688, 'Function' => 'UpdateTo688'),
     ));
   }

trunk/Modules/Finance/Manage.php

@@ -162 +162 @@
             'Quantity' => $Period['MonthCount'], 'VAT' => $this->System->Modules['Finance']->GetVATByType($Service['VAT']));
           $MonthlyTotal += $Service['Price'];
-        }
-        if($Member['MonthlyPlus'] != 0)
-        {
-          $InvoiceItems[] = array('Description' => 'Spotřeba energie', 'Price' => -$Member['MonthlyPlus'],
-            'Quantity' => $Period['MonthCount'], 'VAT' => $this->System->Modules['Finance']->GetVATByType(VAT_TYPE_BASE));
-          $MonthlyTotal -= $Member['MonthlyPlus'];
         }
         $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];

trunk/Modules/Finance/UserState.php

@@ -6 +6 @@
   var $ShortTitle = 'Stav financí';
   var $ParentClass = 'PageFinance';
+
+  function ShowFinanceOperation($Subject)
+  {
+        $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, File, BillCode, NULL AS PeriodFrom, NULL AS PeriodTo '.
+          'FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
+                '(SELECT (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoice=FinanceInvoice.Id) AS Text, '.
+                'Time, -Value as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
+
+    $Output = '<div style="text-align:center">Výpis finančních operací</div>';
+        $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$UserOperationTableQuery.'');
+        $DbRow = $DbResult->fetch_row();
+        $PageList = GetPageList($DbRow[0]);
+
+        $Output .= $PageList['Output'];
+        $Output .= '<table class="WideTable" style="font-size: small;">';
+
+        $TableColumns = array(
+                        array('Name' => 'Time', 'Title' => 'Datum'),
+                        array('Name' => 'Description', 'Title' => 'Popis'),
+                        array('Name' => 'Value', 'Title' => 'Částka [Kč]'),
+                        array('Name' => 'Period', 'Title' => 'Období'),
+                        array('Name' => 'Bill', 'Title' => 'Doklad'),
+        );
+        $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
+        $Output .= $Order['Output'];
+
+        $Query = 'SELECT * FROM '.$UserOperationTableQuery.' '.$Order['SQL'].$PageList['SQLLimit'];
+
+        $DbResult = $this->Database->query($Query);
+    $SumValue = 0;
+        while($Row = $DbResult->fetch_assoc())
+        {
+                if($Row['Value'] == -0) $Row['Value'] = 0;
+                if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
+                if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
+                if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillCode'].'</a>';
+                else $Invoice = NotBlank($Row['BillCode']);
+                if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
+                else $Period = '&nbsp;';
+                $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
+                                '<td style="text-align: left;">'.$Row['Text'].'</td>'.
+                                '<td style="text-align: right;">'.round($Row['Value'], 2).'</td>'.
+                                '<td>'.$Period.'</td>'.
+                                '<td>'.$Invoice.'</td></tr>';
+                $SumValue = $SumValue + $Row['Value'];
+        }
+        $Output .= '</table>';
+        $Output .= $PageList['Output'];
+        return($Output);
+  }
 
   function Show()
@@ -30 +80 @@
       } else return($this->SystemMessage('Chyba', 'Nejste zákazníkem'));
     }
-    
+
     if(!array_key_exists('show', $_GET)) $_GET['show'] = '';
-    $DbResult = $this->Database->query('SELECT Member.*, MemberPayment.MonthlyPlus AS MonthlyPlus '.
+    $DbResult = $this->Database->query('SELECT Member.* '.
       'FROM Member LEFT JOIN MemberPayment ON MemberPayment.Member=Member.Id WHERE Member.Subject='.$Subject['Id']);
-    if($DbResult->num_rows == 0) 
+    if($DbResult->num_rows == 0)
     {
-      return($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));      
+      return($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));
     }
     $Member = $DbResult->fetch_assoc();
     $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';
 
-    if(array_key_exists('year', $_GET))
-    {
-      $DbResult = $this->Database->query('SELECT * FROM FinanceYear WHERE Id='.addslashes($_GET['year'] * 1));
-    } else 
-    {
-      $DbResult = $this->Database->query('SELECT * FROM FinanceYear ORDER BY Year DESC LIMIT 1');
-    }
-    $FinanceYearSelected = $DbResult->fetch_assoc();
-    $YearWhere = ' WHERE (Time >= "'.$FinanceYearSelected['DateStart'].'") AND (Time <= "'.$FinanceYearSelected['DateEnd'].'")';
-   
-    // Year list
-    if(array_key_exists('Subject', $_GET)) $SubjectParam = '&amp;Subject='.($_GET['Subject'] * 1);
-      else $SubjectParam = '';
-    $Output .= 'Roky: ';
-    $DbResult = $this->Database->query('SELECT * FROM FinanceYear WHERE Year >= '.
-      substr($Member['MembershipDate'], 0, strpos($Member['MembershipDate'], '-')));
-    while($FinanceYear = $DbResult->fetch_assoc())
-    {
-      $Year = '<a href="?year='.$FinanceYear['Id'].$SubjectParam.'">'.$FinanceYear['Year'].'</a> ';
-      if($FinanceYear['Id'] == $FinanceYearSelected['Id']) $Output .= '<strong>'.$Year.'</strong>';
-        else $Output .= $Year;
-    }
-    $Output .= '<br/><br/>';   
-    
-    // Account state    
+    // Account state
     $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, File, BillCode, NULL AS PeriodFrom, NULL AS PeriodTo '.
       'FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
@@ -73 +99 @@
     $DbRow = $DbResult->fetch_array();
     $Total = $DbRow['Total'];
-    $Output .= 'Stav účtu: <strong>'.round($Total, 2).' Kč</strong<br /><br /><br/>';
-    
+    $Output .= 'Stav účtu: <strong>'.round($Total, 2).' Kč</strong><br /><br />';
+
     // Tabulka operaci
-    $Output .= 'Výpis operací pro subjekt '.$Subject['Name'].':<br />';
-    $Output .= '<table style="font-size: smaller;" class="WideTable"><tr>'.
-    '<th>Datum</th><th>Popis</th><th>Částka</th><th>Období</th><th>Doklad</th></tr>';
-    $Operations = array();
-    $DbResult = $this->Database->query('SELECT T1.* FROM '.$UserOperationTableQuery.$YearWhere);
-    while($DbRow = $DbResult->fetch_array())
-      $Operations[] = $DbRow;
-    $SumValue = 0;
-    foreach($Operations as $Row)
-    {
-      if($Row['Value'] == -0) $Row['Value'] = 0;
-      if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
-      if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
-      if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillCode'].'</a>'; 
-        else $Invoice = NotBlank($Row['BillCode']);
-      if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
-        else $Period = '&nbsp;';
-      $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
-      '<td style="text-align: left;">'.$Row['Text'].'</td>'.
-      '<td style="text-align: right;">'.round($Row['Value'], 2).'</td>'.
-      '<td style="text-align: center;">'.$Period.'</td>'.
-      '<td style="text-align: center;">'.$Invoice.'</td></tr>';
-      $SumValue = $SumValue + $Row['Value'];
-    }
-    $Output .= '<tr><td style="text-align: right;" colspan="2"><strong>Celkem za rok</strong></td>'.
-    '<td style="text-align: right;"><strong>'.round($SumValue, 2).'</strong></td>'.
-    '<td style="text-align: center;">&nbsp;</td>'.
-    '<td style="text-align: center;">&nbsp;</td></tr>';
-    
-    $Output .= '</table>';
+    $Output .= $this->ShowFinanceOperation($Subject);
+
     $Output .= '</td><td valign="top">';
 
-    $Output .= 'Variabilní symbol pro platby: <strong>'.$Subject['Id'].'</strong><br><br>';
+    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
+                'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
+                'WHERE (FinanceBankAccount.`Subject`='.$this->System->Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
+    $SubjectFromAccount = $DbResult->fetch_assoc();
+    $Account = $SubjectFromAccount['NumberFull'];
+
+    $Output .= 'Účet pro platby: <strong>'.$Account.'</strong><br/>';
+    $Output .= 'Variabilní symbol pro platby: <strong>'.$Subject['Id'].'</strong><br/>';
+    $Output .= 'Subjekt: <strong>'.$Subject['Name'].'</strong><br/>';
+    $Output .= '<br/>';
 
     $Total = 0;
@@ -121 +128 @@
       $Total += $DbRow['Price'];
     }
-    
-    if($Member['MonthlyPlus'] != 0)
-    {
-      $Output .= '<tr><td>Příjem za spotřebu</td><td>'.(-$Member['MonthlyPlus']).'</td></tr>';
-      $Total -= $Member['MonthlyPlus'];
-    }
+
     $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Total.'</strong></td></tr></table>';
     //echo('Tarif pro příští měsíc: '.$Tarify[$Row2['inet_tarif_next']]['name'].'<br><br>');
     $Output .= '<br />';
-    
-    if($Member['MonthlyPlus'] != 0)
-    {
-      $Output .= 'Měsíční příjem za spotřebu zařízení umístěných u uživatele:<br>';
-      $Output .= '<table class="WideTable"><tr><th>Název zařízení</th><th>Spotřeba [W]</th><th>Příjem [Kč]</th></tr>';
-      $DbResult = $this->Database->query('SELECT Product.Name AS Name, Product.Consumption AS Consumption '.
-        'FROM StockItem JOIN Product ON Product.Id = StockItem.Product '.
-        'WHERE (StockItem.Location='.$Member['Id'].') AND (StockItem.TimeElimination IS NULL)');
-      $TotalW = 0;
-      $TotalPrice = 0;
-      while($Row = $DbResult->fetch_assoc())
-      {
-        $Output .= '<tr><td>'.$Row['Name'].'</td><td>'.$Row['Consumption'].'</td><td>'.$this->System->Modules['Finance']->W2Kc($Row['Consumption']).'</td></tr>';
-        $TotalW += $Row['Consumption'];
-        $TotalPrice += $this->System->Modules['Finance']->W2Kc($Row['Consumption']);
-      }
-      $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$TotalW.'</strong></td><td><strong>'.$TotalPrice.'</strong></td></tr>';
-      $Output .= '</table>';
-  }
+
     $Output .= '</td></tr></table>';
     return($Output);