Changeset 692

Timestamp:

Sep 11, 2014, 11:34:08 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: Výpočet zůstatku pro email s vyúčtováním.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (2 diffs)
• Modules/News/ImportZdechovCzRecords.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 691; // Subversion revision
+$Revision = 692; // Subversion revision
 $DatabaseRevision = 688; // SQL structure revision
-$ReleaseTime = strtotime('2014-09-07');
+$ReleaseTime = strtotime('2014-09-11');

trunk/Modules/Finance/Manage.php

@@ -320 +320 @@
     $MainSubject = $DbResult->fetch_assoc();
 
+    $Period = $this->GetBillingPeriod($Member['BillingPeriodNext']);
+
     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
       'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
@@ -337 +339 @@
       $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".
+        'Pravidelná platba za období: <strong>'.($MemberPayment['MonthlyTotal'] * $Period['MonthCount']).' Kč</strong><br />'."\n".
         'Bankovní účet: <strong>'.$MainSubjectAccount['NumberFull'].'</strong><br/>'."\n".
         'Variabilní symbol: <strong>'.$Member['Subject'].'</strong><br/>'."\n".
-        'Stav vašeho účtu: <strong>'.($MemberPayment['Cash'] - $MemberPayment['MonthlyTotal']).' Kč</strong><br /><br />'."\n";
+        'Stav vašeho účtu: <strong>'.($MemberPayment['Cash'] - $MemberPayment['MonthlyTotal'] * $Period['MonthCount']).' Kč</strong><br /><br />'."\n";
       $Content .= 'Nové finanční operace:<br/>'.
         '<table style="margin-left: auto; margin-right: auto; border-style: solid; border-width: 1px; border-collapse: collapse;">'.

trunk/Modules/News/ImportZdechovCzRecords.php

@@ -22 +22 @@
   $Date = substr($Content, 0, strpos($Content, '<'));
   $DateParts = explode('.', $Date);
-  $Date = $DateParts[2].'-'.$DateParts[1].'-'.$DateParts[0];
+  if(count($DateParts) >= 3)
+    $Date = $DateParts[2].'-'.$DateParts[1].'-'.$DateParts[0];
+      else break;
   $Content = substr($Content, strpos($Content, $StartLink) + strlen($StartLink));
   $Link = substr($Content, 0, strpos($Content, '"'));