Changeset 882 for trunk

Timestamp:

Sep 8, 2020, 5:00:04 PM (4 years ago)

Author:

chronos

Message:

• Fixed: New monthly payment was not working after upgrade of to new SQL server.

Location:

trunk

Files:

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

trunk/Application/UpdateTrace.php

@@ -2123 +2123 @@
   $Manager->Execute('ALTER TABLE `User` CHANGE `LastIpAddress` `LastIpAddress` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT "";');
   $Manager->Execute('ALTER TABLE `Log` CHANGE `IPAddress` `IPAddress` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
+}
+
+function UpdateTo882($Manager)
+{
+  $Manager->Execute('ALTER TABLE `FinanceMonthlyOverall` CHANGE `Investment` `Investment` INT(11) NOT NULL DEFAULT "0";');
 }
 
@@ -2227 +2232 @@
       870 => array('Revision' => 878, 'Function' => 'UpdateTo878'),
       878 => array('Revision' => 880, 'Function' => 'UpdateTo880'),
+      880 => array('Revision' => 882, 'Function' => 'UpdateTo882'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 881; // Subversion revision
-$DatabaseRevision = 880; // SQL structure revision
-$ReleaseTime = strtotime('2020-09-04');
+$Revision = 882; // Subversion revision
+$DatabaseRevision = 882; // SQL structure revision
+$ReleaseTime = strtotime('2020-09-08');

trunk/Modules/EmailQueue/EmailQueue.php

@@ -77 +77 @@
   {
     $Values = array('To' => $To,
-      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()',
+      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 'Headers' => '',
       'From' => $From);
     if ($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;

trunk/Modules/Finance/Manage.php

@@ -291 +291 @@
     $DateParts = explode('-', $Overall['Date']);
     $MonthLast = $DateParts[1];
+    $YearLast = $DateParts[0];
     $MonthCurrent = date('m') + 0;
+    $YearCurrent = date('Y') + 0;
 
     $Output .= $Finance->RecalculateMemberPayment();
@@ -311 +313 @@
     // Zkontrolovat odečtení měsíčního poplatku
     $Output .= 'Kontrola odečtení poplatků: Poslední měsíc-'.$MonthLast.' Aktuální měsíc-'.$MonthCurrent."\n";
-    if ($MonthCurrent != $MonthLast)
+    if (($MonthCurrent != $MonthLast) or ($YearCurrent != $YearLast))
     {
       $Output .= 'Odečítám pravidelný poplatek...'."\n";