From 20560a123992b6af6aa55f4cd36ccedbd3327173 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Tue, 8 Sep 2015 17:46:52 -0500 Subject: [PATCH] Improve course list on sale - refs #7768 --- .../src/buy_course_plugin.class.php | 18 +-- plugin/buycourses/src/list.php | 18 --- plugin/buycourses/view/list.tpl | 124 +++++++----------- 3 files changed, 52 insertions(+), 108 deletions(-) diff --git a/plugin/buycourses/src/buy_course_plugin.class.php b/plugin/buycourses/src/buy_course_plugin.class.php index 13ad9febb9..9e90058a19 100644 --- a/plugin/buycourses/src/buy_course_plugin.class.php +++ b/plugin/buycourses/src/buy_course_plugin.class.php @@ -455,22 +455,8 @@ class BuyCoursesPlugin extends Plugin continue; } - $sessionData = [ - 'id' => $session->getId(), - 'name' => $session->getName(), - 'dates' => SessionManager::parseSessionDates([ - 'display_start_date' => $session->getDisplayStartDate(), - 'display_end_date' => $session->getDisplayEndDate(), - 'access_start_date' => $session->getAccessStartDate(), - 'access_end_date' => $session->getAccessEndDate(), - 'coach_access_start_date' => $session->getCoachAccessStartDate(), - 'coach_access_end_date' => $session->getCoachAccessEndDate() - ]), - 'price' => $item['price'], - 'currency' => $item['iso_code'], - 'courses' => [], - 'enrolled' => $this->getUserStatusForSession(api_get_user_id(), $session) - ]; + $sessionData = $this->getSessionInfo($session->getId()); + $sessionData['enrolled'] = $this->getUserStatusForSession(api_get_user_id(), $session); foreach ($sessionCourses as $sessionCourse) { $course = $sessionCourse->getCourse(); diff --git a/plugin/buycourses/src/list.php b/plugin/buycourses/src/list.php index 19049dcd05..28c6b24026 100644 --- a/plugin/buycourses/src/list.php +++ b/plugin/buycourses/src/list.php @@ -21,24 +21,6 @@ if (api_is_platform_admin()) { $templateName = $plugin->get_lang('CourseListOnSale'); $tpl = new Template($templateName); -if (isset($_SESSION['bc_success'])) { - $tpl->assign('rmessage', 'YES'); - if ($_SESSION['bc_success'] == true) { - $message = sprintf($plugin->get_lang($_SESSION['bc_message']), $_SESSION['bc_url']); - unset($_SESSION['bc_url']); - $tpl->assign('class', 'confirmation-message'); - } else { - $message = $plugin->get_lang($_SESSION['bc_message']); - $tpl->assign('class', 'warning-message'); - } - $tpl->assign('responseMessage', $message); - unset($_SESSION['bc_success']); - unset($_SESSION['bc_message']); - -} else { - $tpl->assign('rmessage', 'NO'); -} - $courseList = $plugin->getCatalogCourseList(); $sessionList = []; $currency = $plugin->getSelectedCurrency(); diff --git a/plugin/buycourses/view/list.tpl b/plugin/buycourses/view/list.tpl index 540ae12583..d2361fcf66 100644 --- a/plugin/buycourses/view/list.tpl +++ b/plugin/buycourses/view/list.tpl @@ -49,43 +49,26 @@
- {% if rmessage == "YES" %} -
- {{ responseMessage }} -
- {% endif %} - {% for course in courses %} -
-
-
- - {{ course.title }} - -
-
- - {{ course.title }} - -
-
    - {% for teacher in course.teachers %} -
  • {{ teacher }}
    • - {% endfor %} -
-

+

+
+ {{ course.title }} +
+

+ {{ course.title }} +

+
    + {% for teacher in course.teachers %} +
  • {{ teacher }}
    • + {% endfor %} +
{% if course.enrolled == "YES" %} - {{ 'TheUserIsAlreadyRegisteredInTheCourse'|get_plugin_lang('BuyCoursesPlugin') }} +

{{ 'TheUserIsAlreadyRegisteredInTheCourse'|get_plugin_lang('BuyCoursesPlugin') }}

+ {% elseif course.enrolled == "TMP" %} +

{{ 'WaitingToReceiveThePayment'|get_plugin_lang('BuyCoursesPlugin') }}

{% endif %} - {% if course.enrolled == "TMP" %} - {{ 'WaitingToReceiveThePayment'|get_plugin_lang('BuyCoursesPlugin') }} - {% endif %} -

-

- {{ course.currency }} {{ course.price }} -

-
-
+

{{ course.currency }} {{ course.price }}

+
{{ 'Description'|get_lang }} @@ -95,8 +78,6 @@ {% endif %}
- -
@@ -136,48 +117,43 @@
-
- {% if rmessage == "YES" %} -
- {{ responseMessage }} -
- {% endif %} - -
- {% for session in sessions %} -
-
-
-

{{ session.name }}

-

{{ session.dates.display }}

-

{{ session.currency }} {{ session.price }}

- -
- {% for course in session.courses %} -
{{ course.title }}
- {% for coach in course.coaches %} -
{{ coach }}
- {% endfor %} - {% endfor %} -
- -

- {% if session.enrolled == "YES" %} - {{ 'TheUserIsAlreadyRegisteredInTheSession'|get_plugin_lang('BuyCoursesPlugin') }} - {% elseif session.enrolled == "NO" %} - - {{ 'Buy'|get_plugin_lang('BuyCoursesPlugin') }} - - {% elseif session.enrolled == "TMP" %} - {{ 'WaitingToReceiveThePayment'|get_plugin_lang('BuyCoursesPlugin') }} + {% for session in sessions %} +

+
+ {{ session.name }} +
+

{{ session.name }}

+

{{ session.dates.display }}

+

{{ session.currency }} {{ session.price }}

+
    + {% for course in session.courses %} +
  • + {{ course.title }} + {% if course.coaches|length %} +
      + {% for coach in course.coaches %} +
    • {{ coach }}
      • + {% endfor %} +
    {% endif %} -

    -
+ + {% endfor %} + +
+ {% if session.enrolled == "YES" %} + {{ 'TheUserIsAlreadyRegisteredInTheSession'|get_plugin_lang('BuyCoursesPlugin') }} + {% elseif session.enrolled == "NO" %} + + {{ 'Buy'|get_plugin_lang('BuyCoursesPlugin') }} + + {% elseif session.enrolled == "TMP" %} + {{ 'WaitingToReceiveThePayment'|get_plugin_lang('BuyCoursesPlugin') }} + {% endif %}
- {% endfor %} +
-
+ {% endfor %}
{% endif %}