Changeset 497 for trunk/finance/finance.php

Timestamp:

Mar 3, 2013, 1:03:25 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Zobecněn proces aktualizace dat tabulek při přechodu na nové období. Nyní se používá pole Action jakožto akce přidat, změnit, odebrat a ReplaceId jakožto id položky, které se operace týká.
• Přidáno: Podpora pro uživatelské akce v seznamech v sekci Správa dat.
• Upraveno: Řešení procesu generování nových faktur a plateb zákazníků při přechodu na nové období.

File:

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

trunk/finance/finance.php

@@ -54 +54 @@
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Member` '.
         'LEFT JOIN `ServiceCustomerRel` ON `ServiceCustomerRel`.`Customer`=`Member`.`Id` '.
-        'WHERE (`ServiceCustomerRel`.`Service`='.$Index.') AND (`Member`.`BillingPeriod` > 1) AND (`Member`.`Blocked`=0)');
+        'WHERE (`ServiceCustomerRel`.`Service`='.$Index.') AND (`Member`.`BillingPeriod` > 1) '.
+        'AND (`Member`.`Blocked`=0)');
       $Row = $DbResult->fetch_row();
       $this->Tariffs[$Index]['CustomerCount'] = $Row[0];
@@ -103 +104 @@
       $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
     
-    $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE `Period`='.$Period);
+    // Period parameter is not used as it have to be determined from item replacement
+    $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE `ReplaceId` IS NULL LIMIT 1');
     $Row = $DbResult->fetch_array();
     $this->kWh = $Row['kWh'];
@@ -203 +205 @@
          'FROM `ServiceCustomerRel` LEFT JOIN '.
          '`Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` WHERE `ServiceCustomerRel`.`Customer`='.
-         $Member['Id'].' AND `ServiceCustomerRel`.`Period`=1');
+         $Member['Id'].' AND `ServiceCustomerRel`.`Action` IS NULL');
       $DbRow = $DbResult2->fetch_assoc();      
       $Monthly = 0;
@@ -259 +261 @@
         $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegment WHERE Id='.$ID);
         $Row4 = $DbResult2->fetch_array();
-        $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'], array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
+        $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'], 
+          array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
         $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'])));
+      $this->Database->update('NetworkSegment', 'Id='.$NetworkSegment['Id'], 
+        array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
     }
 
@@ -268 +272 @@
     $DbResult = $this->Database->select('Member', 'COUNT(*)');
     $Row = $DbResult->fetch_array();
-    $DbResult = $this->Database->update('NetworkSegment', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
+    $DbResult = $this->Database->update('NetworkSegment', 'Id='.$this->InternetSegmentId, 
+      array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
     $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
     return($Output);