Changeset 480 for trunk

Timestamp:

Feb 5, 2013, 10:25:54 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Zobrazení měsíčních plateb v tabulce pro kontrolu před jejich generováním.

Location:

trunk

Files:

• . (modified) (1 prop)
• finance/manage.php (modified) (3 diffs)
• form_classes.php (modified) (7 diffs)
• nbproject (deleted)

trunk

@@ -9 +9 @@
 .buildpath
 .settings
+nbproject

@@ -9 +9 @@
 .buildpath
 .settings
+nbproject

trunk/finance/manage.php

@@ -55 +55 @@
         $Output .= $this->System->Modules['Finance']->RecalculateMemberPayment();
         break;
-      case 'MonthlyPayment':
+      case 'ShowMonthlyPayment':
         $Output = $this->ShowMonthlyPayment();
+        break;
+      case 'ProcessMonthlyPayment':
+        $Output = $this->ProcessMonthlyPayment();
         break;
       case 'GenerateBills':
@@ -69 +72 @@
         $Output .= '<a href="?Operation=Bills">Správa dokladů</a><br />';
         $Output .= '<a href="?Operation=Recalculate">Přepočet financí</a><br />';
-        $Output .= '<a href="?Operation=MonthlyPayment">Měsíční vyúčtování</a><br />';
+        $Output .= '<a href="?Operation=ShowMonthlyPayment">Měsíční vyúčtování</a><br />';
         $Output .= '<a href="clenove.php">Seznam členů</a><br />';
         $Output .= '<a href="zivnost.php">Živnost</a><br />';
@@ -288 +291 @@
 
   function ShowMonthlyPayment()
+  {
+    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
+    $SQL = 'SELECT Member.*, MemberPayment.MonthlyTotal AS Monthly, '.
+      'MemberPayment.Cash AS Cash, '.
+      '(SELECT GROUP_CONCAT(Service.Name) FROM ServiceCustomerRel LEFT JOIN Service '.
+      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND ServiceCustomerRel.Period=1) AS ServicesNextMonth, '.
+      'UNIX_TIMESTAMP(Member.BillingPeriodLastDate) AS LastDate, Subject.Name AS SubjectName, '.
+      'FinanceBillingPeriod.Name AS BillingPeriodName '.
+      'FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member JOIN Subject '.
+      'ON Subject.Id=Member.Subject LEFT JOIN FinanceBillingPeriod ON '.
+      'FinanceBillingPeriod.Id=Member.BillingPeriodNext';
+    
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$SQL.') AS T');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);    
+
+    $Output = $PageList['Output'];
+    $Output .= '<table class="WideTable" style="font-size: small;">';
+   
+    $TableColumns = array(
+      array('Name' => 'SubjectName', 'Title' => 'Jméno'), 
+      array('Name' => 'Monthly', 'Title' => 'Platba'), 
+      array('Name' => 'Cash', 'Title' => 'Kredit'), 
+      array('Name' => 'LastDate', 'Title' => 'Poslední fakturace'), 
+      array('Name' => 'ServicesNextMonth', 'Title' => 'Služby'), 
+      array('Name' => 'BillingPeriodName', 'Title' => 'Perioda'), 
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'SubjectName', 0);
+    $Output .= $Order['Output'];
+
+    $Query = $SQL.' '.$Order['SQL'].$PageList['SQLLimit'];
+   
+    $DbResult = $this->Database->query($Query);
+    while($Row = $DbResult->fetch_assoc()) 
+    { 
+      $Output .= '<tr>'.
+      '<td>'.$Row['SubjectName'].'</td>'.
+      '<td>'.$Row['Monthly'].'</td>'.
+      '<td>'.$Row['Cash'].'</td>'.
+      '<td>'.date('j.n.Y', $Row['LastDate']).'</td>'.
+      '<td>'.$Row['ServicesNextMonth'].'</td>'.
+      '<td>'.$Row['BillingPeriodName'].'</td>'.
+      '</tr>';
+    }
+    $Output .= '</table>';
+    $Output .= $PageList['Output'];
+    $Output .= '<a href="?Operation=ProcessMonthlyPayment">Generovat faktury</a>';
+    return($Output);
+  }
+  
+  function ProcessMonthlyPayment()
   {
     if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');

trunk/form_classes.php

@@ -62 +62 @@
     ),
   ),
+  'ServiceCustomerRel' => array(
+    'Title' => 'Vztahy služba - zákazník',
+    'Table' => 'ServiceCustomerRel',
+    'Items' => array(
+      'Service' => array('Type' => 'TService', 'Caption' => 'Služba', 'Default' => ''),        
+      'Customer' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => ''),        
+      'Period' => array('Type' => 'Integer', 'Caption' => 'Období', 'Default' => ''),        
+    ),
+  ),
   'Work' => array(
     'Title' => 'Práce',
@@ -266 +275 @@
       'Price' => array('Type' => 'Integer', 'Caption' => 'Cena', 'Default' => '0', 'Suffix' => 'Kč'),
       'CustomerCount' => array('Type' => 'Integer', 'Caption' => 'Počet zákazníků', 'Default' => ''),
-      'ReplaceId' => array('Type' => 'TService', 'Caption' => 'Nahradit', 'Default' => '', 'Null' => true),
       'Public' => array('Type' => 'Boolean', 'Caption' => 'Veřejné', 'Default' => ''),
       'InternetSpeedMin' => array('Type' => 'Integer', 'Caption' => 'Min. rychlost internetu', 'Default' => '0', 'Suffix' => 'kbit/s'),
@@ -275 +283 @@
       'Storage' => array('Type' => 'Integer', 'Caption' => 'Úložiště', 'Default' => '0', 'Suffix' => 'GB'),
       'CPUCount' => array('Type' => 'Integer', 'Caption' => 'Počet jader', 'Default' => '0', 'Suffix' => ''),
+      'ReplaceId' => array('Type' => 'TService', 'Caption' => 'Nahradit', 'Default' => '', 'Null' => true),
     ),
   ),
@@ -296 +305 @@
       'Devices' => array('Type' => 'TDeviceList', 'Caption' => 'Registrovaná zařízení', 'Default' => ''),
       'UserRel' => array('Type' => 'TUserCustomerRelListCustomer', 'Caption' => 'Přiřazení uživatelé', 'Default' => ''),
+      'ServiceRel' => array('Type' => 'TServiceCustomerRelListCustomer', 'Caption' => 'Placené služby', 'Default' => ''),
     ),
   ),
@@ -637 +647 @@
     ),
   ),
+  'ServiceCategory' => array(
+    'Title' => 'Kategorie služeb',
+    'Table' => 'ServiceCategory',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'Items' => array('Type' => 'TServiceListServiceCategory', 'Caption' => 'Služby', 'Default' => ''),
+    ),
+  ),
 );
 
@@ -946 +964 @@
     'Filter' => '1',
   ),
+  'TServiceCustomerRelListCustomer' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'ServiceCustomerRel',
+    'Id' => 'Id',
+    'Ref' => 'Customer',
+    'Filter' => '1',
+  ),
   'TPermissionUserAssignmentListUser' => array(
     'Type' => 'ManyToOne',
@@ -972 +997 @@
     'Id' => 'Id',
     'Ref' => 'AssignedGroup',
+    'Filter' => '1',
+  ),
+  'TServiceListServiceCategory' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'Service',
+    'Id' => 'Id',
+    'Ref' => 'Category',
     'Filter' => '1',
   ),

@@ -9 +9 @@
 .buildpath
 .settings
+nbproject