Changeset 939 for trunk

Timestamp:

Aug 2, 2022, 9:26:10 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Incorrectly used member date BillingPeriodLastDate for determining new payments log for payment notification email.

Location:

trunk

Files:

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

trunk/Application/UpdateTrace.php

@@ -2217 +2217 @@
   $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="other-users" WHERE `Description`="Ostatní"');
   $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="customers" WHERE `Description`="Zákazníci"');
+}
+
+function UpdateTo939(UpdateManager $Manager): void
+{  
+  $Manager->Execute('ALTER TABLE `Member` ADD `PaymentEmailTime` DATETIME NULL DEFAULT NULL AFTER `Contract`;');
+  $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 1 MONTH) WHERE BillingPeriod=2 AND BillingPeriodLastDate<>"0000-00-00"');
+  $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 3 MONTH) WHERE BillingPeriod=3 AND BillingPeriodLastDate<>"0000-00-00"');
+  $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 6 MONTH) WHERE BillingPeriod=4 AND BillingPeriodLastDate<>"0000-00-00"');
+  $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 12 MONTH) WHERE BillingPeriod=5 AND BillingPeriodLastDate<>"0000-00-00"');
+  $Manager->Execute('ALTER TABLE `UserOnline` ENGINE = InnoDB;');
 }
 
@@ -2328 +2338 @@
       911 => array('Revision' => 921, 'Function' => 'UpdateTo921'),
       921 => array('Revision' => 933, 'Function' => 'UpdateTo933'),
+      933 => array('Revision' => 939, 'Function' => 'UpdateTo939'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 933; // Subversion revision
-$DatabaseRevision = 933; // SQL structure revision
-$ReleaseTime = strtotime('2022-05-11');
+$Revision = 939; // Subversion revision
+$DatabaseRevision = 939; // SQL structure revision
+$ReleaseTime = strtotime('2022-08-01');

trunk/Modules/Customer/Customer.php

@@ -39 +39 @@
         'Consumption' => array('Type' => 'TCustomerStockSerialNumber', 'Caption' => 'Spotřeba zařízení', 'Default' => ''),
         'Contract' => array('Type' => 'TContract', 'Caption' => 'Smlouva', 'Default' => '', 'Null' => true),
+        'PaymentEmailTime' => array('Type' => 'DateTime', 'Caption' => 'Čas platebního emailu', 'Default' => 'NOW()', 'Null' => true, 'NotInList' => true),
         'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true),
         'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),
@@ -92 +93 @@
         'ChangeReplaceId' => array('Type' => 'TService', 'Caption' => 'Změna - položka', 'Default' => '', 'Null' => true),
         'CustomerRel' => array('Type' => 'TServiceCustomerRelListService', 'Caption' => 'Placení zákazníky', 'Default' => ''),
+        'TvRel' => array('Type' => 'TServiceTvRelListService', 'Caption' => 'TV kanály', 'Default' => ''),
       ),
     ));
@@ -194 +196 @@
       'Type' => 'ManyToOne',
       'Table' => 'ServiceCustomerRel',
+      'Id' => 'Id',
+      'Ref' => 'Service',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TServiceTvRelListService', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'ServiceTvRel',
       'Id' => 'Id',
       'Ref' => 'Service',
@@ -338 +347 @@
     $Desc->AddBoolean('Blocked');
     $Desc->AddInteger('PayDay');
+    $Desc->AddDateTime('PaymentEmailTime');
     $Desc->AddChangeAction();
     return $Desc;

trunk/Modules/Finance/Manage.php

@@ -393 +393 @@
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Popis</th>'.
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Částka [Kč]</th></tr>'."\n";
+      if ($Member['PaymentEmailTime'] <> 'NULL')
+      {
+        $Where = ' WHERE (`T1`.`Time` > "'.$Member['PaymentEmailTime'].'")';
+      } else 
+      {
+        $Where = '';
+      }
       $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
         '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ", ") FROM `FinanceInvoiceItem` '.
         'WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, '.
-        '`Time`, -`Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
-        $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")');
+        '`Time`, -`Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.$Member['Subject'].')) ORDER BY `Time` DESC) AS `T1`'.$Where);
       while ($DbRow = $DbResult->fetch_assoc())
       {
@@ -413 +419 @@
       ModuleEmailQueue::Cast($this->System->GetModule('EmailQueue'))->AddItem($User['Name'].' <'.$User['Email'].'>', $Title, $Content,
          $Config['Web']['Admin'].' <'.$Config['Web']['AdminEmail'].'>');
-      $Output = '';
+      $this->Database->update('Member', 'Id='.$Member['Id'], array('PaymentEmailTime' => 'NOW()'));
+      $Output = '';      
     } else $Output = 'Uživatel '.$User['Name'].' nemá email.';
     return $Output;