Changeset 726 for trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

Timestamp:

Jan 5, 2015, 10:01:40 PM (10 years ago)

Author:

chronos

Message:

• Modified: Added time designation for scheduled table change actions. This applies to tables Service, ServiceCustomerRel and FinanceCharge. Now time of taking effect is not determined just by customer pay period but by more generally by specified time.

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (2 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -50 +50 @@
 $InetInterface = $Config['MainRouter']['InetInterface'];
 
-$DbResult = $System->Database->select('Service', '*', '(`ReplaceId` IS NULL) AND (`Id`='.TARIFF_FREE.')');
+$DbResult = $System->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');
 if($DbResult->num_rows == 1)
 {
@@ -79 +79 @@
   $DbResult4 = $System->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` '.
     'JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
-    'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`Action` IS NULL) '.
+    'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) '.
     'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
   while($Service = $DbResult4->fetch_assoc())