Changeset 968 for trunk

Timestamp:

Apr 12, 2024, 9:43:27 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: Improved content of email with finance account state.
• Added: Customer IS action to generate finance email into email queue.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/Finance/FinanceModels.php (modified) (2 diffs)
• Modules/Finance/Import.php (modified) (2 diffs)
• Modules/Finance/Manage.php (modified) (8 diffs)
• Modules/Finance/Trade.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 967; // Subversion revision
+$Revision = 968; // Subversion revision
 $DatabaseRevision = 967; // SQL structure revision
-$ReleaseTime = strtotime('2024-03-06');
+$ReleaseTime = strtotime('2024-04-12');

trunk/Modules/Customer/Customer.php

@@ -46 +46 @@
       'ItemActions' => array(
         array('Caption' => 'Klientská sekce', 'URL' => '/finance/platby/?i=#RowId'),
+        array('Caption' => 'Email s vyúčtováním do fronty', 'URL' => '/finance/sprava/?Operation=SendPaymentEmail&i=#RowId'),
       ),
     ));

trunk/Modules/Finance/Finance.php

@@ -42 +42 @@
     $this->System->RegisterPage(['finance', 'platby'], 'PageFinanceUserState');
     $this->System->RegisterPage(['finance', 'import'], 'PageFinanceImportPayment');
-    $this->System->RegisterPage(['finance', 'zivnost'], 'PageFinanceTaxFiling');
+    $this->System->RegisterPage(['finance', 'zivnost'], 'PageFinanceTaxFiling');    
 
     $this->System->FormManager->RegisterClass('FinanceOperation', array(

trunk/Modules/Finance/FinanceModels.php

@@ -40 +40 @@
     $DbResult = $this->Database->query('SELECT * FROM `FinanceBillingPeriod`');
     while ($BillingPeriod = $DbResult->fetch_assoc())
+    {
       $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
+    }
 
     // Period parameter is not used as it have to be determined from item replacement
@@ -65 +67 @@
 
     $DbResult = $this->Database->query('SELECT SUM(`MemberPayment`.`MonthlyInternet`) AS `MonthlyInternet`, '.
-        'SUM(`MemberPayment`.`MonthlyTotal`) AS `MonthlyTotal` '.
-        'FROM `MemberPayment` JOIN `Member` ON `Member`.`Id`=`MemberPayment`.`Member` WHERE `Member`.`Blocked`=0');
+      'SUM(`MemberPayment`.`MonthlyTotal`) AS `MonthlyTotal` '.
+      'FROM `MemberPayment` JOIN `Member` ON `Member`.`Id`=`MemberPayment`.`Member` WHERE `Member`.`Blocked`=0');
     $Row = $DbResult->fetch_assoc();
     $this->TotalInternetPaid = $Row['MonthlyInternet'];

trunk/Modules/Finance/Import.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->itle = 'Import plateb';
+    $this->Title = 'Import plateb';
     $this->ParentClass = 'PageFinance';
   }
@@ -68 +68 @@
       array_shift($Data);
       $Automatic = '';
-      $Manual = '';
       $Output = '<form action="?Operation=insert" method="post">';
       $I = 0;

trunk/Modules/Finance/Manage.php

@@ -37 +37 @@
       case 'RegenerateOperation':
         $Output = $this->GenerateOperation('AND (Id='.$_GET['i'].')');
+        break;
+      case 'SendPaymentEmail':
+        $Output = $this->SendPaymentEmail($_GET['i']);
         break;
       default:
@@ -171 +174 @@
       $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
 
-      /* Check if need to produce new invoice for customer */
+      // Check if need to produce new invoice for customer
       if (($Period['MonthCount'] > 0) and ($Member['Blocked'] == 0) and
         ($Period['From'] > $Member['BillingPeriodLastUnixTime']))
@@ -195 +198 @@
         {
           $InvoiceGroupId = INVOICE_GROUP_OUT;
-        } else {
+        } else
+        {
           $InvoiceGroupId = INVOICE_GROUP_IN;
         }
@@ -215 +219 @@
           $Output .= $this->SendPaymentEmail($Member['Id']);
         }
-        /* Update last billing day */
+        // Update last billing day
         $this->Database->update('Member', '`Id`='.$Member['Id'],
           array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
@@ -346 +350 @@
   function SendPaymentEmail(string $MemberId, string $FileId = ''): string
   {
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
+    $Finance->LoadMonthParameters(0);
+
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
     global $Config;
 
@@ -362 +370 @@
     $DbResult = $this->Database->select('Subject', '*', '`Id`='.$Config['Finance']['MainSubjectId']);
     $MainSubject = $DbResult->fetch_assoc();
+
+    $DbResult = $this->Database->select('Company', '*', '`Id`='.$Config['Finance']['MainCompanyId']);
+    $MainCompany = $DbResult->fetch_assoc();
 
     $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
@@ -374 +385 @@
     if ($User['Email'] != '')
     {
-      $Title = 'Pravidelné vyúčtování služeb';
-      $Content = 'Vyúčtovaní zákazníka <strong>'.$Subject['Name'].'</strong> zastoupeného uživatelem <strong>'.
+      $Title = 'Pravidelné vyúčtování služeb '.$MainCompany['Name'];
+      $Content = 'Dobrý den,<br/><br/>'.
+        'Zasíláme vyúčtování klienta <strong>'.$Subject['Name'].'</strong> zastoupeného uživatelem <strong>'.
         $User['Name'].'</strong> ke dni <strong>'.Core::Cast($this->System)->HumanDate(time()).'</strong>.<br/><br/>'."\n".
         'Vaše aktuální služby: ';
@@ -414 +426 @@
       'Pro aktuální informace, prohlížení elektronických dokladů a možnost změny údajů se prosím přihlaste na stránkách '.
       '<a href="https://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'">https://'.
-      $Config['Web']['Host'].$Config['Web']['RootFolder'].'</a>.<br /><br />'."\n";
-
-      $Content .= '<br />Tento email je generován automaticky. V případě zjištění nesrovnalostí napište zpět.';
+      $Config['Web']['Host'].$Config['Web']['RootFolder'].'</a>.<br/><br/>'."\n";
+
+      $Content .= '<br/>Tento email je generován automaticky. V případě zjištění nesrovnalostí prosím napište zpět.';
+      
+      $Content .= '<br/><br/>S pozdravem,<br/>'.$MainCompany['Name'].'<br/><a href="'.$MainSubject['WWW'].'">'.
+        str_replace(array('https:', '/'), '', $MainSubject['WWW']).'</a>';
+
       ModuleEmailQueue::Cast($this->System->GetModule('EmailQueue'))->AddItem($User['Name'].' <'.$User['Email'].'>', $Title, $Content,
          $Config['Web']['Admin'].' <'.$Config['Web']['AdminEmail'].'>');

trunk/Modules/Finance/Trade.php

@@ -501 +501 @@
   {
     $TimeDue = $Time + 15 * 24 * 3600; // 15 dnů
-
   }
 }