Changeset 939
- Timestamp:
- Aug 2, 2022, 9:26:10 AM (2 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Application/UpdateTrace.php
r934 r939 2217 2217 $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="other-users" WHERE `Description`="Ostatní"'); 2218 2218 $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="customers" WHERE `Description`="Zákazníci"'); 2219 } 2220 2221 function UpdateTo939(UpdateManager $Manager): void 2222 { 2223 $Manager->Execute('ALTER TABLE `Member` ADD `PaymentEmailTime` DATETIME NULL DEFAULT NULL AFTER `Contract`;'); 2224 $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 1 MONTH) WHERE BillingPeriod=2 AND BillingPeriodLastDate<>"0000-00-00"'); 2225 $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 3 MONTH) WHERE BillingPeriod=3 AND BillingPeriodLastDate<>"0000-00-00"'); 2226 $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 6 MONTH) WHERE BillingPeriod=4 AND BillingPeriodLastDate<>"0000-00-00"'); 2227 $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 12 MONTH) WHERE BillingPeriod=5 AND BillingPeriodLastDate<>"0000-00-00"'); 2228 $Manager->Execute('ALTER TABLE `UserOnline` ENGINE = InnoDB;'); 2219 2229 } 2220 2230 … … 2328 2338 911 => array('Revision' => 921, 'Function' => 'UpdateTo921'), 2329 2339 921 => array('Revision' => 933, 'Function' => 'UpdateTo933'), 2340 933 => array('Revision' => 939, 'Function' => 'UpdateTo939'), 2330 2341 ); 2331 2342 } -
trunk/Application/Version.php
r934 r939 1 1 <?php 2 2 3 $Revision = 93 3; // Subversion revision4 $DatabaseRevision = 93 3; // SQL structure revision5 $ReleaseTime = strtotime('2022-0 5-11');3 $Revision = 939; // Subversion revision 4 $DatabaseRevision = 939; // SQL structure revision 5 $ReleaseTime = strtotime('2022-08-01'); -
trunk/Modules/Customer/Customer.php
r914 r939 39 39 'Consumption' => array('Type' => 'TCustomerStockSerialNumber', 'Caption' => 'Spotřeba zařízení', 'Default' => ''), 40 40 'Contract' => array('Type' => 'TContract', 'Caption' => 'Smlouva', 'Default' => '', 'Null' => true), 41 'PaymentEmailTime' => array('Type' => 'DateTime', 'Caption' => 'Čas platebního emailu', 'Default' => 'NOW()', 'Null' => true, 'NotInList' => true), 41 42 'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true), 42 43 '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), 93 94 'CustomerRel' => array('Type' => 'TServiceCustomerRelListService', 'Caption' => 'Placení zákazníky', 'Default' => ''), 95 'TvRel' => array('Type' => 'TServiceTvRelListService', 'Caption' => 'TV kanály', 'Default' => ''), 94 96 ), 95 97 )); … … 194 196 'Type' => 'ManyToOne', 195 197 'Table' => 'ServiceCustomerRel', 198 'Id' => 'Id', 199 'Ref' => 'Service', 200 'Filter' => '1', 201 )); 202 $this->System->FormManager->RegisterFormType('TServiceTvRelListService', array( 203 'Type' => 'ManyToOne', 204 'Table' => 'ServiceTvRel', 196 205 'Id' => 'Id', 197 206 'Ref' => 'Service', … … 338 347 $Desc->AddBoolean('Blocked'); 339 348 $Desc->AddInteger('PayDay'); 349 $Desc->AddDateTime('PaymentEmailTime'); 340 350 $Desc->AddChangeAction(); 341 351 return $Desc; -
trunk/Modules/Finance/Manage.php
r916 r939 393 393 '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Popis</th>'. 394 394 '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Částka [Kč]</th></tr>'."\n"; 395 if ($Member['PaymentEmailTime'] <> 'NULL') 396 { 397 $Where = ' WHERE (`T1`.`Time` > "'.$Member['PaymentEmailTime'].'")'; 398 } else 399 { 400 $Where = ''; 401 } 395 402 $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '. 396 403 '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ", ") FROM `FinanceInvoiceItem` '. 397 404 'WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, '. 398 '`Time`, -`Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='. 399 $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")'); 405 '`Time`, -`Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.$Member['Subject'].')) ORDER BY `Time` DESC) AS `T1`'.$Where); 400 406 while ($DbRow = $DbResult->fetch_assoc()) 401 407 { … … 413 419 ModuleEmailQueue::Cast($this->System->GetModule('EmailQueue'))->AddItem($User['Name'].' <'.$User['Email'].'>', $Title, $Content, 414 420 $Config['Web']['Admin'].' <'.$Config['Web']['AdminEmail'].'>'); 415 $Output = ''; 421 $this->Database->update('Member', 'Id='.$Member['Id'], array('PaymentEmailTime' => 'NOW()')); 422 $Output = ''; 416 423 } else $Output = 'Uživatel '.$User['Name'].' nemá email.'; 417 424 return $Output;
Note:
See TracChangeset
for help on using the changeset viewer.