Changeset 427

Timestamp:

Oct 10, 2012, 8:46:02 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Další chybné použití tabulky UserCustomerRel vedlo k chybě při zobrazení financí uživatele, který má právo platícího klienta, ale nemá vazbu na tabulu Member.

Location:

trunk

Files:

• finance/user_state.php (modified) (2 diffs)
• global.php (modified) (2 diffs)
• index.php (modified) (1 diff)

trunk/finance/user_state.php

@@ -22 +22 @@
       if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
       $UserId = $this->System->Modules['User']->User['Id'];
-      $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id=(SELECT Customer FROM UserCustomerRel WHERE User='.$UserId.' LIMIT 1))');
-      $Subject = $DbResult->fetch_assoc();
+      $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$UserId.' LIMIT 1');
+      if($DbResult->num_rows > 0)
+      {
+        $CustomerUserRel = $DbResult->fetch_assoc();
+        $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id='.$CustomerUserRel['Customer'].')');
+        $Subject = $DbResult->fetch_assoc();
+      } else return($this->SystemMessage('Chyba', 'Nejste zákazníkem'));
     }
     
@@ -42 +47 @@
     $FinanceYearSelected = $DbResult->fetch_assoc();
     $YearWhere = ' WHERE (Time >= "'.$FinanceYearSelected['DateStart'].'") AND (Time <= "'.$FinanceYearSelected['DateEnd'].'")';
-
-    
+   
     
     // Year list

trunk/global.php

@@ -413 +413 @@
   }
   $QueryItems['all'] = '1';
-  if($PageCount > 1) $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
+  if($PageCount > 1) $Result.= ' <a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
   
   $Result = '<div style="text-align: center">'.$Result.'</div>';
@@ -470 +470 @@
   ));
 }
+
 function GetRemoteAddress()
 {

trunk/index.php

@@ -231 +231 @@
       {
         $UserOptions = new Form('MemberOptions');
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
-        $DbRow = $DbResult->fetch_array();
-        foreach($UserOptions->Definition['Items'] as $Index => $Item)
-        {
-          $UserOptions->Values[$Index] = $DbRow[$Index];
-        }
-        $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
-        $Output .= $UserOptions->ShowEditForm();
+        $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->Modules['User']->User['Id']);
+        if($DbResult->num_rows > 0)
+        {
+          $CustomerUserRel = $DbResult->fetch_assoc();
+          $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, '.
+            'Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, '.
+            'Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
+           'ON Subject.Id = Member.Subject WHERE Member.Id='.$CustomerUserRel['Customer']);        
+          $DbRow = $DbResult->fetch_array();
+          foreach($UserOptions->Definition['Items'] as $Index => $Item)
+          {
+            $UserOptions->Values[$Index] = $DbRow[$Index];
+          }
+          $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
+          $Output .= $UserOptions->ShowEditForm();
+        } else $Output .= $this->SystemMessage('Chyba', 'Nejste zákazníkem');
       } else
       if($_GET['Action'] == 'MemberOptionsSave')