Changeset 178 for trunk

Timestamp:

Mar 24, 2009, 9:00:06 PM (16 years ago)

Author:

george

Message:

• Opraveno: Zobrazování stavu účetních operací pro subjekty namísto uživatelů.

Location:

trunk

Files:

• finance/clenove.php (modified) (1 diff)
• finance/user_state.php (modified) (1 diff)
• global.php (modified) (1 diff)

trunk/finance/clenove.php

@@ -30 +30 @@
       $Tarif = $Finance->Tarify[$Row['InternetTariffCurrentMonth']]['name'];
       $PristiTarif = $Finance->Tarify[$Row['InternetTariffNextMonth']]['name'];
-      $Output .= '<tr><td>'.$Row['FullName'].'</td><td><a href="user_state.php?userid='.$Row['Id'].'">'.$Row['Name'].'</a></td>';
+      $Output .= '<tr><td>'.$Row['FullName'].'</td><td><a href="user_state.php?Subject='.$Row['Id'].'">'.$Row['Name'].'</a></td>';
       //<td align="right">'.$Row['network_device'].'</td>
       $Output .= '<td align="right">'.$Row['MonthlyTotal'].'</td><td align="right">'.$Row['Cash'].'</td><td align="center">'.$Tarif.'</td><td align="center">'.$PristiTarif.'</td></tr>';

trunk/finance/user_state.php

@@ -10 +10 @@
   function Show()
   {
+          $Finance = &$this->System->Modules['Finance'];
+          $this->System->Modules['Finance']->RecalculateTariffs(1);
+
     if(array_key_exists('old', $_GET))
-        {
-          $UserId = GetMemberByIP(GetRemoteAddress());
-        } else
-    if(array_key_exists('userid', $_GET))
-        {
-          if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
-          $UserId = $_GET['userid'];
-        } else
-        {
-          if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
+          {
+            $MemberId = GetMemberByIP(GetRemoteAddress());
+      if($MemberId != '')
+      {
+        $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Member.Id='.$MemberId.')');
+        $Subject = $DbResult->fetch_assoc();
+      } else die('Nemáte oprávnění');
+          } else
+    if(array_key_exists('Subject', $_GET))
+          {
+            if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
+      $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id='.$_GET['Subject']);
+      $Subject = $DbResult->fetch_assoc();
+    } else
+          {
+            if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
       $UserId = $this->System->Modules['User']->User['Id'];
-        }
-
-        $Finance = &$this->System->Modules['Finance'];
-        $this->System->Modules['Finance']->RecalculateTariffs(1);
+      $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id=(SELECT Member FROM User WHERE Id='.$UserId.'))');
+      $Subject = $DbResult->fetch_assoc();
+          }
+    
     if(!array_key_exists('show', $_GET)) $_GET['show'] = '';
-    $DbResult = $this->Database->query('SELECT Id FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id=(SELECT Member FROM User WHERE Id='.$UserId.'))');
-    $Subject = $DbResult->fetch_assoc();
-    $DbResult = $this->Database->query('SELECT * FROM Member LEFT JOIN MemberPayment ON MemberPayment.Member=Member.Id WHERE Member.Id=(SELECT Member FROM User WHERE User.Id='.$UserId.')');
+    $DbResult = $this->Database->query('SELECT * FROM Member LEFT JOIN MemberPayment ON MemberPayment.Member=Member.Id WHERE Member.Id='.$Subject['Id']);
     $Member = $DbResult->fetch_assoc();
     $TarifName = $Finance->Tarify[$Member['InternetTariffCurrentMonth']]['name'];
-        $TarifPrice = $Finance->Tarify[$Member['InternetTariffCurrentMonth']]['price'];
+          $TarifPrice = $Finance->Tarify[$Member['InternetTariffCurrentMonth']]['price'];
     $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';
 
     // Tabulka operaci
-    $DbResult = $this->Database->query('SELECT CONCAT(SecondName, " ", FirstName) as Name FROM User WHERE Id='.$UserId);
-    $User = $DbResult->fetch_assoc();
-    $Output .= 'Výpis operací pro účastníka '.$User['Name'].':<br>';
+    $Output .= 'Výpis operací pro subjekt '.$Subject['Name'].':<br>';
     $Output .= '<table style="font-size: smaller;" class="WideTable"><tr><th>Datum</th><th>Popis</th><th>Částka</th><th>Doklad</th></tr>';
     $Operations = array();

trunk/global.php

@@ -190 +190 @@
   global $Database;
   
-  $DbResult = $Database->query('SELECT Id FROM User WHERE (SELECT user FROM hosts WHERE IP="'.$IP.'") = User.Id');
-  $DbRow = $DbResult->fetch_assoc();
-  return($DbRow['Id']);
+  $DbResult = $Database->query('SELECT Id FROM Member WHERE (SELECT user FROM hosts WHERE IP="'.$IP.'") = Member.Id');
+  if($DbResult->num_rows > 0)
+  {
+    $DbRow = $DbResult->fetch_assoc();  
+    return($DbRow['Id']);
+  } else return('');
 }