Changeset 786 for trunk/Modules/Finance/Manage.php

Timestamp:

Jan 11, 2016, 12:06:08 AM (9 years ago)

Author:

chronos

Message:

• Modified: Now billing period for invoice generation is calculated as aligned to year boundary and if period is not complete then only valid months are used.
• Removed: ToDo list and list of task and bugs is available in Trac web system.
• Modified: BillingPeriodNext was replaced by more general ChangeAction in Member table.
• Added: Log new monthly finance recalculation report to log table.

File:

• trunk/Modules/Finance/Manage.php (modified) (13 diffs)

trunk/Modules/Finance/Manage.php

@@ -39 +39 @@
   }
 
+  /* Get first day and last day of given billing period. Periods are aligned with year start/end. */
   function GetBillingPeriod($Period)
   {
+    $Time = time();
+    $Year = date('Y', $Time);
+
     $MonthCount = $this->System->Modules['Finance']->BillingPeriods[$Period]['MonthCount'];
-    $PeriodFrom = mktime(0, 0, 0, date('n'), 1, date('Y'));
-    $PeriodTo = mktime(0, 0, 0, date('n') + $MonthCount - 1, date('t', mktime(0, 0, 0, date('n') + $MonthCount - 1, 1, date('Y'))) , date('Y'));
+    if($MonthCount <= 0) return(array('From' => NULL, 'To' => NULL, 'MonthCount' => 0));
+    $MonthCurrent = date('n', $Time);
+
+    /* Get start and end of aligned period */
+    $MonthFrom = floor(($MonthCurrent - 1) / $MonthCount) + 1;
+    $MonthTo = $MonthFrom + $MonthCount - 1;
+
+    /* Use period from current month to end month so months before current month are cut out */
+    $MonthCount = $MonthTo - $MonthCurrent + 1;
+    $MonthFrom = $MonthCurrent;
+
+    /* Get first and last day of period */
+    $PeriodFrom = mktime(0, 0, 0, $MonthFrom, 1, $Year);
+    $PeriodTo = mktime(0, 0, 0, $MonthTo, date('t', mktime(0, 0, 0, $MonthTo, 1, $Year)), $Year);
+
     return(array('From' => $PeriodFrom, 'To' => $PeriodTo, 'MonthCount' => $MonthCount));
   }
@@ -59 +76 @@
       'FROM `MemberPayment` JOIN `Member` ON `Member`.`Id`=`MemberPayment`.`Member` JOIN `Subject` '.
       'ON `Subject`.`Id`=`Member`.`Subject` LEFT JOIN `FinanceBillingPeriod` ON '.
-      '`FinanceBillingPeriod`.`Id`=`Member`.`BillingPeriodNext` WHERE (`Member`.`Blocked` = 0)'.
-      'AND (`Member`.`BillingPeriodNext` > 1) AND (`MemberPayment`.`MonthlyTotal` != 0)';
+      '`FinanceBillingPeriod`.`Id`=`Member`.`BillingPeriod` WHERE (`Member`.`Blocked` = 0)'.
+      'AND (`Member`.`BillingPeriod` > 1) AND (`MemberPayment`.`MonthlyTotal` != 0)';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$SQL.') AS T');
@@ -133 +150 @@
     $Output = '';
 
-    // Generuj účetní položky
+    // Produce accounting items
     $DbResult = $this->Database->query('SELECT `Member`.*, `MemberPayment`.`MonthlyTotal` AS `MonthlyTotal`, '.
       'UNIX_TIMESTAMP(`Member`.`BillingPeriodLastDate`) AS `BillingPeriodLastUnixTime`, `Subject`.`Name` AS `SubjectName`,'.
@@ -142 +159 @@
     {
       $Output .= $Member['SubjectName'].': ';
-      $Period = $this->GetBillingPeriod($Member['BillingPeriodNext']);
-      if($Period['From'] > $Member['BillingPeriodLastUnixTime'])
-      {
-        $this->Database->update('Member', 'Id='.$Member['Id'],
-          array('BillingPeriod' => $Member['BillingPeriodNext']));
-        $Member['BillingPeriod'] = $Member['BillingPeriodNext'];
-      }
       $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
+
+      /* Check if need to produce new invoice for customer */
       if(($Period['MonthCount'] > 0) and ($Member['Blocked'] == 0) and
         ($Period['From'] > $Member['BillingPeriodLastUnixTime']))
@@ -170 +182 @@
         // TODO: In case of negative invoice it is not sufficient to reverse invoicing direction
         // Other subject should invoice only positive items. Negative items should be somehow removed.
-        if($MonthlyTotal >= 0) {
+        if($MonthlyTotal >= 0)
+        {
           $InvoiceGroupId = INVOICE_GROUP_OUT;
         } else {
@@ -178 +191 @@
         // Load invoice group
         $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoiceGroup');
-        foreach($InvoiceItems as $Index => $Item) {
+        foreach($InvoiceItems as $Index => $Item)
+        {
           $InvoiceItems[$Index]['Price'] = $Item['Price'] * $FinanceGroup['ValueSign'];
         }
@@ -191 +205 @@
 
           $Output .= $this->SendPaymentEmail($Member['Id']);
-        } else $Output .= '<br />';
-        $this->Database->update('Member', 'Id='.$Member['Id'],
+        }
+        /* Update last billing day */
+        $this->Database->update('Member', '`Id`='.$Member['Id'],
           array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
-      } else $Output .= '<br />';
+      }
+      $Output .= '<br />';
     }
     return($Output);
@@ -233 +249 @@
   function ProcessTableUpdates()
   {
+    // Update customers
+    $Output = 'Měním zákazníky...<br>';
+    $this->TableUpdateChanges('Member');
+
     // Update finance charge
     $Output = 'Měním aktuální parametry sítě...<br>';
@@ -288 +308 @@
     if($MonthCurrent != $MonthLast)
     {
-      $Output .= 'Odečítám měsíční poplatek...<br />';
+      $Output .= 'Odečítám pravidelný poplatek...<br />';
       $Output .= $this->ProduceInvoices();
 
@@ -302 +322 @@
 
       $Finance->RecalculateMemberPayment();
-      //CreateMonthlyOverallBill();
-      //$Finance->RecalculateUsersFinance();
 
       // Restart traffic shaping
@@ -309 +327 @@
       //flush();
       //$this->GenerateBills();
+      $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'ProcessMonthlyPayment', $Output);
     }
     return($Output);
@@ -332 +351 @@
     $MainSubject = $DbResult->fetch_assoc();
 
-    $Period = $this->GetBillingPeriod($Member['BillingPeriodNext']);
+    $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
 
     $DbResult = $this->Database->query('SELECT `FinanceBankAccount`.*, '.
@@ -382 +401 @@
       $Output = '';
     } else $Output = 'Uživatel '.$User['Name'].' nemá email.';
+    return $Output;
   }