Changeset 301 for trunk


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/finance/finance.php

    r294 r301  
    191191      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
    192192      $Monthly = round($Monthly);
    193       //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
     193      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>')
    194194     
     195      if($Member['BillingPeriodNext'] == 1)
     196      {
     197        // Inactive payer
     198        $MonthlyInet = 0;
     199        $Monthly = 0;
     200        $ConsumptionPlus = 0;
     201        $Consumption = 0;
     202      }
    195203      $this->Database->insert('MemberPayment', array('Member' => $Member['Id'], 'NetworkDevice' => $NetworkDevice, 'MonthlyInternet' => $MonthlyInet, 'MonthlyTotal' => $Monthly, 'MonthlyConsumption' => $this->W2Kc($Consumption), 'Cash' => $Cash, 'MonthlyPlus' => $this->W2Kc($ConsumptionPlus)));
    196204    }
  • trunk/system/generators/dhcp.php

    r290 r301  
    1111$Routerboard->Debug = true;
    1212
    13 $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0');
     13$DbResult = $Database->query('SELECT * FROM `NetworkSubnet`'); // WHERE `Member` = 0');
    1414while($Subnet = $DbResult->fetch_assoc())
    1515{
  • trunk/system/generators/firewall_nat.php

    r300 r301  
    107107$Items[] = array('chain' => 'dstnat', 'in-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-in', 'comment' => 'local-in');
    108108
     109/*
    109110// Route public addresses localy
    110111$DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
     
    126127
    127128// Map returned local traffic to virtual subnet
    128 $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');
    129 
     129$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');
     130*/
    130131
    131132//print_r($Items);
  • trunk/system/generators/netwatch.php

    r250 r301  
    1111$Routerboard->Debug = true;
    1212
    13 $DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Member` = 0');
     13$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet`'); // WHERE `Member` = 0');
    1414while($Router = $DbResult3->fetch_assoc())
    1515{
  • trunk/system/routerboard.php

    r261 r301  
    8989    foreach($Conditions as $Index => $Item)
    9090    {
    91       $ConditionList .= $Index.'="'.$Item.'" ';
     91      if($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
     92      else $ConditionList .= $Index.'="'.$Item.'" ';
    9293    }
    9394    $ConditionList = substr($ConditionList, 0, -1);
Note: See TracChangeset for help on using the changeset viewer.