Changeset 788

Timestamp:

Jan 15, 2016, 10:54:40 PM (9 years ago)

Author:

chronos

Message:

• Modified: Allow to view and edit multiple customerers per user.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (6 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 786; // Subversion revision
+$Revision = 788; // Subversion revision
 $DatabaseRevision = 785; // SQL structure revision
-$ReleaseTime = strtotime('2016-01-09');
+$ReleaseTime = strtotime('2016-01-15');

trunk/Modules/Customer/Customer.php

@@ -24 +24 @@
         'ResponsibleUser' => array('Type' => 'TUser', 'Caption' => 'Zodpovědný uživatel', 'Default' => ''),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
-        'FamilyMemberCount' => array('Type' => 'String', 'Caption' => 'Osob v domácnosti', 'Default' => '0', 'Suffix' => 'osob'),
+        'FamilyMemberCount' => array('Type' => 'String', 'Caption' => 'Bydlících osob', 'Default' => '0', 'Suffix' => 'osob'),
         'MembershipDate' => array('Type' => 'Date', 'Caption' => 'Datum členství', 'Default' => ''),
         'BillingPeriod' => array('Type' => 'TFinanceBillingPeriod', 'Caption' => 'Fakturační období aktuální', 'Default' => ''),

trunk/Modules/Portal/Portal.php

@@ -28 +28 @@
     $this->System->RegisterPage('', 'PagePortal');
     $this->System->FormManager->RegisterClass('MemberOptions', array(
-      'Title' => 'Nastavení domácnosti',
+      'Title' => 'Nastavení zákazníka',
       'SQL' => '(SELECT Member.Id, Member.FamilyMemberCount, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject)',
       'Table' => 'MemberOptions',
@@ -39 +39 @@
         'IC' => array('Type' => 'String', 'Caption' => 'IČ', 'Default' => ''),
         'DIC' => array('Type' => 'String', 'Caption' => 'DIČ', 'Default' => ''),
-        'FamilyMemberCount' => array('Type' => 'Integer', 'Caption' => 'Počet osob v domácnosti', 'Default' => '', 'Suffix' => 'osob'),
+        'FamilyMemberCount' => array('Type' => 'Integer', 'Caption' => 'Počet bydlících osob', 'Default' => '', 'Suffix' => 'osob'),
       ),
     ));
@@ -116 +116 @@
     $Output = '<a href="'.$this->System->Link('/user/?Action=UserOptions').'">Profil</a><br />';
     if($this->System->User->CheckPermission('Finance', 'MemberOptions'))
-      $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Domácnost</a><br />';
+      $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Fakturační adresa</a><br />';
     if($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
       $Output .= '<a href="'.$this->System->Link('/finance/platby/').'">Finance</a><br />';
@@ -147 +147 @@
   {
     $Output = '<span style="font-size: smaller;">';
-    $DbResult = $this->Database->query('SELECT NetworkDevice.Name FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE (NetworkDeviceType.ShowOnline = 1) AND (NetworkDevice.Online = 1) ORDER BY NetworkDevice.Name');
+    $DbResult = $this->Database->query('SELECT `NetworkDevice`.`Name` FROM `NetworkDevice` '.
+      'LEFT JOIN `NetworkDeviceType` ON `NetworkDeviceType`.`Id` = `NetworkDevice`.`Type` '.
+      'WHERE (`NetworkDeviceType`.`ShowOnline` = 1) AND (`NetworkDevice`.`Online` = 1) ORDER BY `NetworkDevice`.`Name`');
     while($Device = $DbResult->fetch_array())
     {
@@ -188 +190 @@
       if($Action == 'MemberOptions')
       {
-        $Form = new Form($this->System->FormManager);
-        $Form->SetClass('MemberOptions');
-        $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->User->User['Id']);
-        if($DbResult->num_rows > 0)
+        $DbResult = $this->Database->query('SELECT `Customer` FROM `UserCustomerRel` '.
+          'WHERE `User`='.$this->System->User->User['Id']);
+        while($CustomerUserRel = $DbResult->fetch_assoc())
         {
-          $CustomerUserRel = $DbResult->fetch_assoc();
-          $DbResult = $this->Database->query('SELECT Member.Id, '.
-            'Member.FamilyMemberCount, Subject.Name, Subject.AddressStreet, '.
-            'Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
-           'ON Subject.Id = Member.Subject WHERE Member.Id='.$CustomerUserRel['Customer']);
-          $DbRow = $DbResult->fetch_array();
+          $DbResult2 = $this->Database->query('SELECT `Member`.`Id`, '.
+            '`Member`.`FamilyMemberCount`, `Subject`.`Name`, `Subject`.`AddressStreet`, '.
+            '`Subject`.`AddressTown`, `Subject`.`AddressPSC`, `Subject`.`AddressCountry`, '.
+            '`Subject`.`IC`, `Subject`.`DIC` FROM `Member` JOIN `Subject` '.
+           'ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Id`='.$CustomerUserRel['Customer']);
+          $Form = new Form($this->System->FormManager);
+          $Form->SetClass('MemberOptions');
+          $DbRow = $DbResult2->fetch_array();
           foreach($Form->Definition['Items'] as $Index => $Item)
           {
             $Form->Values[$Index] = $DbRow[$Index];
           }
-          $Form->OnSubmit = '?Action=MemberOptionsSave';
+          $Form->OnSubmit = '?Action=MemberOptionsSave&amp;Id='.$CustomerUserRel['Customer'];
           $Output .= $Form->ShowEditForm();
-        } else $Output .= $this->SystemMessage('Chyba', 'Nejste zákazníkem');
+        }
       } else
       if($Action == 'MemberOptionsSave')
@@ -224 +227 @@
           'AddressPSC' => $Form->Values['AddressPSC'], 'IC' => $Form->Values['IC'],
           'DIC' => $Form->Values['DIC']));
-        $Output .= $this->SystemMessage('Nastavení', 'Nastavení domácnosti uloženo.');
-        $this->System->ModuleManager->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno',
+        $Output .= $this->SystemMessage('Nastavení', 'Nastavení zákazníka uloženo.');
+        $this->System->ModuleManager->Modules['Log']->NewRecord('Member+Subject', 'Nastavení zákazníka/subjektu změněno',
           $Form->Values['Name']);
         $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, '.