Changeset 458

Timestamp:

Nov 5, 2012, 8:11:04 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Generování nových plateb.

Location:

trunk/finance

Files:

• finance.php (modified) (1 diff)
• manage.php (modified) (2 diffs)

trunk/finance/finance.php

@@ -1 +1 @@
 <?php
+
+define('TARIFF_FREE', 7);
 
 class Finance extends Module

trunk/finance/manage.php

@@ -301 +301 @@
 
     // Celkovy prehled
-    $DbResult = $this->Database->query('SELECT SUM(Product.Price) AS Price FROM StockItem '.
+    $DbResult = $this->Database->query('SELECT SUM(Product.SellPrice) AS Price FROM StockItem '.
       'JOIN Product ON StockItem.Product = Product.Id WHERE (StockItem.TimeElimination IS NULL) AND (StockItem.Segment IS NOT NULL)');
     $Row = $DbResult->fetch_row();
@@ -353 +353 @@
         $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
         $PayPerPeriod = $Member['MonthlyTotal'] * $Period['MonthCount'];
-        if(($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']) and ($Member['InternetTariffCurrentMonth'] != 6) and ($PayPerPeriod > 0) and
+        if(($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']) and ($Member['InternetTariffCurrentMonth'] != TARIFF_FREE) and ($PayPerPeriod > 0) and
         ($Member['Blocked'] == 0))
         {