http://www.atutor.ca/atutor/mantis/view.php?id=2999

http://www.atutor.ca/atutor/mantis/view.php?id=3000

diff --git a/mods/ecomm/index_instructor.php b/mods/ecomm/index_instructor.php
index 1c30c3e..96787a8 100644 (file)
--- a/mods/ecomm/index_instructor.php
+++ b/mods/ecomm/index_instructor.php
@@ -61,33 +61,21 @@ require (AT_INCLUDE_PATH.'header.inc.php');
 </form>\r
 \r
 <?php\r
-$sql2 = "SELECT  P.course_id,  P.member_id,  f.course_fee, f.auto_approve , m.login, m.first_name, m.last_name from ".TABLE_PREFIX."payments AS P, ".TABLE_PREFIX."ec_course_fees AS f, ".TABLE_PREFIX."members AS m WHERE f.course_id = '$_SESSION[course_id]' AND P.course_id = '$_SESSION[course_id]' AND P.member_id = m.member_id GROUP BY m.login, m.first_name, m.last_name";\r
-\r
+$sql2 = "SELECT  P.member_id,  P.amount, M.login FROM ".TABLE_PREFIX."payments AS P INNER JOIN ".TABLE_PREFIX."members M USING (member_id) WHERE P.course_id=$_SESSION[course_id] AND P.approved=1";\r
 $result = mysql_query($sql2,$db);\r
 if (mysql_num_rows($result)) { ?>\r
        <table class="data static" summary="" border="1">\r
        <tr>\r
-               <th scope="col"><?php echo _AT('ec_student_name'); ?></th>\r
+               <th scope="col"><?php echo _AT('login_name'); ?></th>\r
                <th scope="col"><?php echo _AT('ec_payment_made'); ?></th>\r
-               <th scope="col"><?php echo _AT('ec_enroll_approved'); ?></th>\r
+               <th scope="col"><?php echo _AT('enrolled'); ?></th>\r
        </tr>\r
        <?php\r
-               while($row = mysql_fetch_assoc($result2)){\r
-                       echo '<tr><td>'.$row['first_name'].' '.$row['last_name'].' ('.$row['login'].')</td>';\r
-                       \r
-                       $sql3 = "SELECT amount from ".TABLE_PREFIX."ec_shop WHERE course_id = '$row[course_id]' AND member_id = '$row[member_id]'";\r
-                       $result3 = mysql_query($sql3,$db);\r
-               \r
-                       $amount_paid = '';\r
-                       while($row3 = mysql_fetch_assoc($result3)){\r
-                               //$amount_paid = $amount_paid.'+'.$row3['amount'];\r
-                               $amount_paid = $amount_paid+$row3['amount'];\r
-                       }\r
-                       if($amount_paid != 0){\r
-                               echo '<td>'.$amount_paid.'</td>';\r
-                       }else{\r
-                               echo '<td>0</td>';\r
-                       }       \r
+               while($row = mysql_fetch_assoc($result)){\r
+                       echo '<tr>';\r
+                       echo '<td>'.$row['login'].'</td>';\r
+       \r
+                       echo '<td align="right">'.$_config['ec_currency_symbol'].number_format($row['amount'],2).' '.$_config['ec_currency'].'</td>';\r
                        \r
                        $sql4 = "SELECT * from ".TABLE_PREFIX."course_enrollment WHERE course_id = '$_SESSION[course_id]' AND member_id = '$row[member_id]'";\r
                        if($result4 = mysql_query($sql4, $db)){\r
@@ -112,5 +100,4 @@ if (mysql_num_rows($result)) { ?>
        $msg->printInfos('EC_NO_STUDENTS_ENROLLED');\r
 }\r
 \r
-\r
 require (AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file