Changeset 479 for trunk/finance/manage.php

Timestamp:

Feb 5, 2013, 9:45:44 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Tabulka pro přiřazení více služeb jednomu zákazníkovi. Původní data jsou převedena do nové struktury. Tabulka Service je společná pro všechny typy služeb a pro každou službu se zobrazí nebo vyplní pouze určité použitelné sloupce.
• Opraveno: Korekce názvů modulů na názvy začínající slovem Module.

File:

• trunk/finance/manage.php (modified) (3 diffs)

trunk/finance/manage.php

@@ -355 +355 @@
         if($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)'])
         {
-          $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriod' => $Member['BillingPeriodNext'], 'InternetTariffCurrentMonth' => $Member['InternetTariffNextMonth']));
+          $this->Database->update('Member', 'Id='.$Member['Id'], 
+            array('BillingPeriod' => $Member['BillingPeriodNext']));
           $Member['BillingPeriod'] = $Member['BillingPeriodNext'];
-          $Member['InternetTariffCurrentMonth'] = $Member['InternetTariffNextMonth'];
         }
         $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
-        $PayPerPeriod = $Member['MonthlyTotal'] * $Period['MonthCount'];
         if(($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']) and ($Member['InternetTariffCurrentMonth'] != TARIFF_FREE) and ($PayPerPeriod > 0) and
         ($Member['Blocked'] == 0))
         {
-          //echo($Mesic.'%'.$MonthCount.'='.($Mesic % $MonthCount).' ');                  
+          $BillItems = array();
+          $MonthlyTotal = 0;
+          $DbResult2 = $this->Database->query('(SELECT Service.* FROM ServiceCustomerRel LEFT JOIN Service '.
+            'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer='.$Member['Id'].') AND (ServiceCustomerRel.Period=0)');
+          while($Service = $DbResult2->fetch_assoc())
+          {
+            $BillItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'], 
+            'Quantity' => $Period['MonthCount']);
+            $MonthlyTotal += $ServicePrice['Price'];
+            $this->Database->update('ServiceCustomerRel', 'Id=');  
+          }
+          if($Member['Hire'] != 0)
+          {
+            $Output .= '<tr><td>Nájem</td><td>'.(-$Member['Hire']).'</td></tr>';
+            $MonthlyTotal -= $Member['Hire'];
+          }
+          if($Member['MonthlyPlus'] != 0)
+          {
+            $MonthlyTotal -= $Member['MonthlyPlus'];
+          }
+          $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];
+    
+//echo($Mesic.'%'.$MonthCount.'='.($Mesic % $MonthCount).' ');                  
           $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
-          $Output .= $TimePeriodText.': '.$Member['MonthlyTotal'].' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
-          $BillCode = $Finance->GetNextDocumentLineNumber(6); // Faktury vydané
+          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
+          $BillCode = $Finance->GetNextDocumentLineNumber(INVOICE_OUT_DOC_LINE); 
           $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], 
-            array(array('Description' => 'Připojení k Internetu', 'Price' => $PayPerPeriod, 
-            'Quantity' => 1)), time(), time() + 3600 * 24 * 15, $BillCode, $Period['From'], $Period['To']);
+            $BillItems, time(), time() + 3600 * 24 * INVOICE_DUE_DAYS, $BillCode, $Period['From'], $Period['To']);
           $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 
             'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 
-            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 
-            'Text' => 'Připojení k Internetu za období '.$TimePeriodText, 
+            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)', 
+            'Text' => 'Vyúčtování služeb za období '.$TimePeriodText, 
             'Bill' => $BillId, 'BillCode' => $BillCode));
           $Output .= $this->SendPaymentEmail($Member['Id']);
@@ -392 +412 @@
       $this->Database->insert('FinanceMonthlyOverall', array('Date' => 'NOW()', 'Money' => $Finance->Internet, 'kWh' => $Finance->kWh, 'Administration' => $Finance->Sprava, 'AdministrationTotal' => $SpravaCelkem, 'ConsumptionTotal' => $TotalConsumptionCost, 'TotalPaid' => $Finance->TotalPaid, 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice'], 'MemberCount' => $Finance->InternetUsers));
 
-      // Update tarrifs
+      // Update services
       $Output .= 'Měním aktuální tarify....<br>';
-      $DbResult = $this->Database->select('FinanceTariff', '*', '`ReplaceId` IS NOT NULL');
-      while($Tariff = $DbResult->fetch_array())
+      $DbResult = $this->Database->select('Service', '*', '`ReplaceId` IS NOT NULL');
+      while($Service = $DbResult->fetch_array())
       {
-        $this->Database->update('FinanceTariff', 'Id='.$Tariff['ReplaceId'], array('Name' => $Tariff['Name'], 
-          'UploadAsymmetry' => $Tariff['UploadAsymmetry'], 'MemberCount' => $Tariff['MemberCount'], 
-          'Group' => $Tariff['Group'], 'SpeedMin' => $Tariff['SpeedMin'], 
-          'SpeedMax' => $Tariff['SpeedMax'], 'Price' => $Tariff['Price']));
+        $Service['Id'] = $Service['ReplaceId'];
+        $Service['ReplaceId'] = '';
+        $this->Database->update('Service', 'Id='.$Service['ReplaceId'], $Service);
       }
-      $this->Database->delete('FinanceTariff', '`ReplaceId` IS NOT NULL');
+      $this->Database->delete('Service', '`ReplaceId` IS NOT NULL');
 
       $Finance->RecalculateMemberPayment();
@@ -429 +448 @@
     $DbResult = $this->Database->select('User', '*', 'Id='.$Member['ResponsibleUser']);    
     $User = $DbResult->fetch_assoc();
+    
+    $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Config['Finance']['MainSubjectId']);
+    $MainSubject = $DbResult->fetch_assoc();  
+    
+    $DbResult = $this->Database->select('FinanceBankAccount', '*', '(`Subject`='.
+      $Config['Finance']['MainSubjectId'].') AND (`Use`=1)');
+    $MainSubjectAccount = $DbResult->fetch_assoc();
         
     if($User['Email'] != '')
     {
       $Title = 'Pravidelné vyúčtování služeb';
-      $Content = 'Vyúčtovaní subjektu <strong>'.$Subject['Name'].'</strong> zastoupeného uživatelem <strong>'.$User['Name'].'</strong> ke dni <strong>'.$this->System->HumanDate(time()).'</strong>.<br /><br />'."\n".
-        'Váš aktuální tarif: <strong>'.$this->System->Modules['Finance']->Tariffs[$Member['InternetTariffCurrentMonth']]['Name'].' '.$this->System->AddPrefixMultipliers($this->System->Modules['Finance']->Tariffs[$Member['InternetTariffCurrentMonth']]['SpeedMax'], 'bit/s', 3, 'Binary').'</strong><br />'."\n".
+      $Content = 'Vyúčtovaní zákazníka <strong>'.$Subject['Name'].'</strong> zastoupeného uživatelem <strong>'.$User['Name'].'</strong> ke dni <strong>'.$this->System->HumanDate(time()).'</strong>.<br /><br />'."\n".
+        'Váše aktuální služby: ';
+      $DbResult = $this->Database->query('SELECT GROUP_CONCAT(Service.Name) AS Name FROM ServiceCustomerRel LEFT JOIN Service '.
+      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer='.$Member['Id'].' AND ServiceCustomerRel.Period=0');
+        $Service = $DbRow->fetch_assoc();
+      $Content .= '<strong>'.$Service['Name'].'</strong><br />'."\n".
         'Vaše platební období: <strong>'.$this->System->Modules['Finance']->BillingPeriods[$Member['BillingPeriod']]['Name'].'</strong><br />'."\n".
         'Pravidelná platba za období: <strong>'.$MemberPayment['MonthlyTotal'].' Kč</strong><br />'."\n".
-        'Bankovní účet: <strong>2600134781 / 2010</strong> (EUR Slovensko 2600134781 / 8330, Fio banka)<br/>'."\n".
+        'Bankovní účet: <strong>'.$MainSubjectAccount['Number'].'<br/>'."\n".
         'Variabilní symbol: <strong>'.$Member['Subject'].'</strong><br/>'."\n".
         'Stav vašeho účtu: <strong>'.($MemberPayment['Cash'] - $MemberPayment['MonthlyTotal']).' Kč</strong><br /><br />'."\n";