Plugin: BuyCourses: Fix course/session/service list #2615

Author: AngelFQC

public/main/inc/lib/CoursesAndSessionsCatalog.class.php

@@ -15,6 +15,7 @@
 use Chamilo\CoreBundle\Event\Events;
 use Chamilo\CoreBundle\Event\SessionResubscriptionEvent;
 use Chamilo\CoreBundle\Framework\Container;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr\Join;
 
 /**
@@ -727,11 +728,13 @@ public static function searchAndSortCourses(
      * @param array  $limit
      * @param bool   $returnQueryBuilder
      * @param bool   $getCount
-     *
-     * @return array|\Doctrine\ORM\Query The session list
      */
-    public static function browseSessions($date = null, $limit = [], $returnQueryBuilder = false, $getCount = false)
-    {
+    public static function browseSessions(
+        $date = null,
+        $limit = [],
+        $returnQueryBuilder = false,
+        $getCount = false
+    ): Query|array|int {
         $urlId = api_get_current_access_url_id();
         $em = Database::getManager();
         $qb = $em->createQueryBuilder();
@@ -748,9 +751,9 @@ public static function browseSessions($date = null, $limit = [], $returnQueryBui
                         ->from(AccessUrlRelSession::class, 'url')
                         ->join(Session::class, 's2')
                         ->where(
-                            $qb->expr()->eq('url.sessionId ', 's2.id')
+                            $qb->expr()->eq('url.session ', 's2.id')
                         )->andWhere(
-                            $qb->expr()->eq('url.accessUrlId ', $urlId))
+                            $qb->expr()->eq('url.url ', $urlId))
                         ->getDQL()
                 )
             )

public/plugin/BuyCourses/src/buy_course_plugin.class.php

@@ -2868,9 +2868,9 @@ private function getCourses($first, $maxResults): QueryBuilder
                             AccessUrlRelSession::class,
                             'us',
                             Join::WITH,
-                            'us.sessionId = sc.session'
+                            'us.session = sc.session'
                         )->where(
-                            $qb->expr()->eq('us.accessUrlId ', $urlId)
+                            $qb->expr()->eq('us.url ', $urlId)
                         )
                         ->getDQL()
                 )
@@ -2887,8 +2887,8 @@ private function getCourses($first, $maxResults): QueryBuilder
                         ->getDQL()
                 )
             )
-        ->setFirstResult($first)
-        ->setMaxResults($maxResults);
+            ->setFirstResult($first)
+            ->setMaxResults($maxResults);
 
         return $qb;
     }

public/plugin/BuyCourses/src/list.php

@@ -30,7 +30,7 @@
 
 $qb = $plugin->getCourseList($first, $pageSize);
 $query = $qb->getQuery();
-$courses = new Paginator($query, $fetchJoinCollection = true);
+$courses = new Paginator($query, true);
 foreach ($courses as $course) {
     $item = $plugin->getItemByProduct($course->getId(), BuyCoursesPlugin::PRODUCT_TYPE_COURSE);
     $course->buyCourseData = [];
@@ -63,6 +63,10 @@
 $tpl->assign('product_type_course', BuyCoursesPlugin::PRODUCT_TYPE_COURSE);
 $tpl->assign('product_type_session', BuyCoursesPlugin::PRODUCT_TYPE_SESSION);
 $tpl->assign('courses', $courses);
+$tpl->assign('sessions', []);
+$tpl->assign('services', []);
+$tpl->assign('session_pagination', '');
+$tpl->assign('service_pagination', '');
 $tpl->assign('course_pagination', $pagination);
 $tpl->assign('sessions_are_included', $includeSession);
 $tpl->assign('services_are_included', $includeServices);

public/plugin/BuyCourses/src/list_service.php

@@ -51,8 +51,12 @@
 $tpl->assign('sessions_are_included', $includeSession);
 $tpl->assign('services_are_included', $includeServices);
 $tpl->assign('tax_enable', $taxEnable);
+$tpl->assign('courses', []);
+$tpl->assign('sessions', []);
 $tpl->assign('services', $services);
 $tpl->assign('service_pagination', $pagination);
+$tpl->assign('course_pagination', '');
+$tpl->assign('session_pagination', '');
 
 if ($taxEnable) {
     $globalParameters = $plugin->getGlobalParameters();

public/plugin/BuyCourses/src/list_session.php

@@ -48,7 +48,7 @@
 $tpl->assign('tax_enable', $taxEnable);
 
 $query = CoursesAndSessionsCatalog::browseSessions(null, ['start' => $first, 'length' => $pageSize], true);
-$sessions = new Paginator($query, $fetchJoinCollection = true);
+$sessions = new Paginator($query, true);
 foreach ($sessions as $session) {
     $item = $plugin->getItemByProduct($session->getId(), BuyCoursesPlugin::PRODUCT_TYPE_SESSION);
     $session->buyCourseData = [];
@@ -63,8 +63,12 @@
 $url = api_get_self().'?type='.BuyCoursesPlugin::PRODUCT_TYPE_SESSION;
 $pagination = Display::getPagination($url, $currentPage, $pagesCount, $totalItems);
 
+$tpl->assign('courses', []);
+$tpl->assign('services', []);
 $tpl->assign('sessions', $sessions);
 $tpl->assign('session_pagination', $pagination);
+$tpl->assign('course_pagination', '');
+$tpl->assign('service_pagination', '');
 
 if ($taxEnable) {
     $globalParameters = $plugin->getGlobalParameters();