Changeset 497 for trunk/finance/clenove.php

Timestamp:

Mar 3, 2013, 1:03:25 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Zobecněn proces aktualizace dat tabulek při přechodu na nové období. Nyní se používá pole Action jakožto akce přidat, změnit, odebrat a ReplaceId jakožto id položky, které se operace týká.
• Přidáno: Podpora pro uživatelské akce v seznamech v sekci Správa dat.
• Upraveno: Řešení procesu generování nových faktur a plateb zákazníků při přechodu na nové období.

File:

• trunk/finance/clenove.php (modified) (4 diffs)

trunk/finance/clenove.php

@@ -17 +17 @@
       'Subject.Name, NetworkDevice, '.
       '(SELECT GROUP_CONCAT(Service.Name) FROM ServiceCustomerRel LEFT JOIN Service '.
-      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND ServiceCustomerRel.Period=0) AS ServicesCurrentMonth, '.
-      '(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, '.
+      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND '.
+      'ServiceCustomerRel.Action IS NULL) AS ServicesCurrentMonth, '.
+      //'(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, '.
       'User.Name AS FullName FROM MemberPayment LEFT JOIN Member ON '.
       'Member.Id=MemberPayment.Member LEFT JOIN Subject ON Subject.Id=Member.Subject '.
@@ -36 +38 @@
       array('Name' => 'Cash', 'Title' => 'Stav účtu [Kč]'), 
       array('Name' => 'ServicesCurrentMonth', 'Title' => 'Běžící tarif'), 
-      array('Name' => 'ServicesNextMonth', 'Title' => 'Příští tarif'), 
+      //array('Name' => 'ServicesNextMonth', 'Title' => 'Příští tarif'), 
       array('Name' => 'Note', 'Title' => 'Poznámky'), 
       array('Name' => 'WWW', 'Title' => 'WWW'), 
@@ -55 +57 @@
       if($Row['Cash'] < 0) $Row['Cash'] = '<span style="color: red;">'.$Row['Cash'].'</span>';
       $Tarif = $Row['ServicesCurrentMonth'];
-      $PristiTarif = $Row['ServicesNextMonth'];
+      //$PristiTarif = $Row['ServicesNextMonth'];
       $Output .= '<tr><td>'.$Row['FullName'].'</td><td><a href="user_state.php?Subject='.$Row['Id'].'">'.$Row['Name'].'</a></td>';
       //<td align="right">'.$Row['network_device'].'</td>
-      $Output .= '<td align="right">'.$Row['MonthlyTotal'].'</td><td align="right">'.$Row['Cash'].'</td><td align="center">'.$Tarif.'</td><td align="center">'.$PristiTarif.'</td><td>'.$Row['Note'].'</td><td>'.$Row['WWW'].'</td></tr>';
+      $Output .= '<td align="right">'.$Row['MonthlyTotal'].'</td><td align="right">'.$Row['Cash'].'</td>'.
+      '<td align="center">'.$Tarif.'</td>'.
+      //'<td align="center">'.$PristiTarif.'</td>'.
+      '<td>'.$Row['Note'].'</td><td>'.$Row['WWW'].'</td></tr>';
       $TotalDevice += $Row['NetworkDevice'];
       $TotalMonth += ($Row['MonthlyTotal']);
@@ -64 +69 @@
     $Output .= '<tr><td><strong>Celkem</strong></td><td>&nbsp;</td>';
     //<td align="right"><strong>'.$TotalDevice.'</strong></td>
-    $Output .= '<td align="right"><strong>'.$TotalMonth.'</strong></td><td align="right"><strong>'.$TotalCash.'</strong></td><td align="right">&nbsp;</td><td align="right">&nbsp;</td><td align="right">&nbsp;</td><td align="right">&nbsp;</td></tr>';
+    $Output .= '<td align="right"><strong>'.$TotalMonth.'</strong></td>'.
+    '<td align="right"><strong>'.$TotalCash.'</strong></td><td align="right">&nbsp;</td>'.
+    //'<td align="right">&nbsp;</td>'.
+    '<td align="right">&nbsp;</td><td align="right">&nbsp;</td></tr>';
     $Output .= '</table>';
     $Output .= $PageList['Output'];