Changeset 508 for trunk/finance

Timestamp:

Apr 1, 2013, 8:36:27 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Negenerovat faktury pokud fakturovaná částka je nula.
• Přidáno: Zobrazení akcí při prohlížení položek správy dat.
• Přidáno: V tabulce Subjektů se nyní zobrazují související platby.

Location:

trunk/finance

Files:

• manage.php (modified) (2 diffs)
• user_state.php (modified) (3 diffs)

trunk/finance/manage.php

@@ -320 +320 @@
       'ON Subject.Id=Member.Subject LEFT JOIN FinanceBillingPeriod ON '.
       'FinanceBillingPeriod.Id=Member.BillingPeriodNext WHERE (Member.Blocked = 0)'.
-      'AND (Member.BillingPeriodNext > 1)';
+      'AND (Member.BillingPeriodNext > 1) AND (MemberPayment.MonthlyTotal != 0)';
     
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$SQL.') AS T');
@@ -404 +404 @@
           $MonthlyTotal -= $Member['MonthlyPlus'];
         }
-        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];
-    
-        $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
-        $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
-        $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']);
+        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];  
+        if($PayPerPeriod != 0)
+        {
+          $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
+          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
+          $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']);
+        } else $Output .= '<br />';
         $this->Database->update('Member', 'Id='.$Member['Id'], 
           array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));

trunk/finance/user_state.php

@@ -69 +69 @@
     $DbRow = $DbResult->fetch_array();
     $Total = $DbRow['Total'];
-    $Output .= 'Stav účtu: <strong>'.$Total.' Kč</strong<br /><br /><br/>';
+    $Output .= 'Stav účtu: <strong>'.round($Total, 2).' Kč</strong<br /><br /><br/>';
     
     // Tabulka operaci
@@ -91 +91 @@
       $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
       '<td style="text-align: left;">'.$Row['Text'].'</td>'.
-      '<td style="text-align: right;">'.$Row['Value'].'</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>';
@@ -97 +97 @@
     }
     $Output .= '<tr><td style="text-align: right;" colspan="2"><strong>Celkem za rok</strong></td>'.
-    '<td style="text-align: right;"><strong>'.$SumValue.'</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>';