Changeset 301 for trunk

Timestamp:

Dec 31, 2010, 4:56:19 PM (14 years ago)

Author:

george

Message:

• Opraveno: Součet měsíčních příjmů je správně bez plateb, kde uživatelé mají žádné platební období.

Location:

trunk

Files:

• finance/finance.php (modified) (1 diff)
• system/generators/dhcp.php (modified) (1 diff)
• system/generators/firewall_nat.php (modified) (2 diffs)
• system/generators/netwatch.php (modified) (1 diff)
• system/routerboard.php (modified) (1 diff)

trunk/finance/finance.php

@@ -191 +191 @@
       //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
       $Monthly = round($Monthly);
-      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
+      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>')
       
+      if($Member['BillingPeriodNext'] == 1)
+      {
+        // Inactive payer
+        $MonthlyInet = 0;
+        $Monthly = 0;
+        $ConsumptionPlus = 0;
+        $Consumption = 0;
+      }
       $this->Database->insert('MemberPayment', array('Member' => $Member['Id'], 'NetworkDevice' => $NetworkDevice, 'MonthlyInternet' => $MonthlyInet, 'MonthlyTotal' => $Monthly, 'MonthlyConsumption' => $this->W2Kc($Consumption), 'Cash' => $Cash, 'MonthlyPlus' => $this->W2Kc($ConsumptionPlus)));
     }

trunk/system/generators/dhcp.php

@@ -11 +11 @@
 $Routerboard->Debug = true;
 
-$DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0');
+$DbResult = $Database->query('SELECT * FROM `NetworkSubnet`'); // WHERE `Member` = 0');
 while($Subnet = $DbResult->fetch_assoc())
 {

trunk/system/generators/firewall_nat.php

@@ -107 +107 @@
 $Items[] = array('chain' => 'dstnat', 'in-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-in', 'comment' => 'local-in');
 
+/*
 // Route public addresses localy
 $DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
@@ -126 +127 @@
 
 // Map returned local traffic to virtual subnet
-$Items[] = array('chain' => 'local-out', 'src-address' => '10.145.0.0/16', 'action' => 'netmap',  'to-addresses' => '10.45.0.0-10.45.255.255', 'comment' => 'map-local');
-
+$Items[] = array('chain' => 'local-out', 'src-address' => '10.145.0.0/16', 'dst-address' => '10.145.0.0/16', 'action' => 'netmap',  'to-addresses' => '10.45.0.0-10.45.255.255', 'comment' => 'map-local');
+*/
 
 //print_r($Items);

trunk/system/generators/netwatch.php

@@ -11 +11 @@
 $Routerboard->Debug = true;
 
-$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Member` = 0');
+$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet`'); // WHERE `Member` = 0');
 while($Router = $DbResult3->fetch_assoc())
 {

trunk/system/routerboard.php

@@ -89 +89 @@
     foreach($Conditions as $Index => $Item)
     {
-      $ConditionList .= $Index.'="'.$Item.'" ';
+      if($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
+      else $ConditionList .= $Index.'="'.$Item.'" ';
     }
     $ConditionList = substr($ConditionList, 0, -1);