Changeset 444

Timestamp:

Oct 14, 2012, 10:27:19 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Chyby při přepočítávání financí.

File:

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

trunk/finance/finance.php

@@ -170 +170 @@
       $Cash = $Cash[0];
     
-      $DbResult2 = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE (User='.$Member['Id'].') AND (used = 1)');
+      $DbResult2 = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE (User='.$Member['Id'].') AND (Used = 1)');
       $ConsumptionPlus = $DbResult2->fetch_row();
       $ConsumptionPlus = $ConsumptionPlus[0];
@@ -176 +176 @@
       $NetworkDevice = 0;
       $Consumption = 0;
-      $ID = $Member['NetworkSegment'];
-      while($ID != '')
-      {
-        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegment` WHERE `Id`='.$ID);
+      $Id = $Member['NetworkSegment'];
+      while(($Id != '') and ($Id != 0))
+      {
+        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegment` WHERE `Id`='.$Id);
         $Device = $DbResult2->fetch_assoc();
+        //print_r($Device);
+        //echo($Id.': '.$NetworkDevice.', '.$Device['Price'].', '.$Device['Users']."<br/>\n");
         $NetworkDevice += $Device['Price'] / $Device['Users'];
         $Consumption += $Device['Consumption'] / $Device['UsersOverheads'];
         //echo($ID.' '.$InternetSegment.' '.$InternetSegmentId.' '.$Row['inet_hw'].' '.$Price.'<br>');
-        $ID = $Device['Parent'];
+        $Id = $Device['Parent'];
       }
     
@@ -206 +208 @@
         $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)));
+      $this->Database->insert('MemberPayment', array('Member' => $Member['Id'], 
+        'NetworkDevice' => $NetworkDevice, 'MonthlyInternet' => $MonthlyInet, 
+        'MonthlyTotal' => $Monthly, 'MonthlyConsumption' => $this->W2Kc($Consumption), 
+        'Cash' => $Cash, 'MonthlyPlus' => $this->W2Kc($ConsumptionPlus)));
     }
     $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');  
@@ -238 +243 @@
         $Row4 = $DbResult2->fetch_array();
         $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'], array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
-        $ID = $Row4['parent'];
+        $ID = $Row4['Parent'];
       }
       $this->Database->update('NetworkSegment', 'Id='.$NetworkSegment['Id'], array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));