Improve code, translate some variables and modify some comments

Author: Francis Gonzales

main/inc/lib/plugin.class.php

@@ -526,6 +526,8 @@ public function addTab($tabName, $url)
     /**
      * Delete a tab to chamilo's platform
      * @param string $key
+     *
+     * @return boolean $resp Transaction response
      */
     public function deleteTab($key)
     {

plugin/buy_courses/js/funciones.js

@@ -61,12 +61,12 @@ $(document).ready(function () {
     });
 
 
-    $('#confirmar_filtro').click(function (e) {
+    $('#confirm_filter').click(function (e) {
         var vcourse = $("#course_name").attr("value");
         var pmin = $("#price_min").attr("value");
         var pmax = $("#price_max").attr("value");
         if ($("#mostrar_disponibles").attr("checked") == "checked") {
-            var vshow = "SI";
+            var vshow = "YES";
         } else {
             var vshow = "NO";
         }
@@ -102,7 +102,7 @@ $(document).ready(function () {
         var clave = $("#password").attr("value");
         var firma = $("#signature").attr("value");
         if ($("#sandbox").attr("checked") == "checked") {
-            var vsandbox = "SI";
+            var vsandbox = "YES";
         } else {
             var vsandbox = "NO";
         }
@@ -132,8 +132,9 @@ $(document).ready(function () {
     });
 
     $(".delete_account").click(function (e) {
-        var vid = $(this).parent().attr("id");
-        $.post("function.php", {tab: "delete_account", id: vid},
+        var fieldName = $(this).parent().attr("id");
+        var id = $("#id_" + fieldName).val();
+        $.post("function.php", {tab: "delete_account", id: id},
             function (data) {
                 location.reload();
             }, "json");
@@ -142,7 +143,7 @@ $(document).ready(function () {
         e.stopPropagation();
     });
 
-    $("#cancelapedido").click(function (e) {
+    $("#cancel_order").click(function (e) {
         $.post("function.php", {tab: "unset_variables"});
         window.location.replace("list.php");
     });

plugin/buy_courses/lang/spanish.php

@@ -15,24 +15,15 @@
 
 $strings['Description'] = "Descripción";
 $strings['Buy'] = "Comprar";
-$strings['Filtro_buscar'] = "Filtro de busqueda";
-$strings['Price_Maximum'] = "Precio mayor de";
-$strings['Price_Minimum'] = "Precio menor de";
 $strings['Mostrar_disponibles'] = "Mostrar cursos disponibles";
 
 $strings['paypal_enable'] = "Habilitar PayPal";
 $strings['transference_enable'] = "Habilitar transferencia";
 $strings['unregistered_users_enable'] = "Permitir usuarios sin registro en la plataforma";
-
-$strings['EnrollToCourseXSuccessful'] = "Su inscripci�n en el curso %s se ha completado.";
-$strings['ErrorContactPlatformAdmin'] = "Se ha producido un error desconocido. Por favor, p�ngase en contacto con el administrador de la plataforma.";
 $strings['Cancelacionpedido'] = "El pedido se ha cancelado.";
 $strings['AlreadyBuy'] = "Ya est� matriculado en el curso";
-$strings['Message_conf_transf'] = "Una vez confirmado, recibira un e-mail con los datos bancarios y una referencia del pedido.";
 $strings['bc_subject'] = "Confirmaci�n pedido de cursos";
-$strings['bc_tmp_registrado'] = 'Se encuentra a la espera de recibir el pago';
 
-$strings['Ref_pedido'] = 'Referencia del pedido';
 $strings['paypal'] = 'PayPal';
 $strings['confirmar_compra'] = 'Confirmar compra de curso';
 
@@ -55,3 +46,24 @@
 $strings['bc_message'] = "Estimado {{name}}. <br />En cuanto recibamos confirmaci&oacute;n de pago procederemos a dar de alta su usuario en el curso <strong>{{curso}}</strong>.<br><br><strong>No olvide indicar en el concepto de la transferencia el n&uacute;mero de referencia del pedido: <div style='display:inline;text-align:center; font-weight:bold; font-size:20px; color:#333'>{{reference}}</div></strong>";
 $strings['Categories'] = "Categorias";
 $strings['BankTransference'] = 'Transferencia Bancaria';
+$strings['EnrollToCourseXSuccessful'] = "Su inscripción en el curso %s se ha completado.";
+$strings['SearchFilter'] = "Filtro de búsqueda";
+$strings['MinimumPrice'] = "Precio menor de";
+$strings['MaximumPrice'] = "Precio mayor de";
+$strings['AvailableCourses'] = "Cursos disponibles";
+$strings['PaymentConfiguration'] = "Configuración de Pagos";
+$strings['WaitingToReceiveThePayment'] = "Se encuentra a la espera de recibir el pago";
+$strings['CurrencyType'] = "Tipo de moneda";
+$strings['SelectACurrency'] = "Seleccione una moneda";
+$strings['Sandbox'] = "Entorno de Pruebas";
+$strings['BankAccount'] = "Cuenta Bancaria";
+$strings['SubscribeUser'] = "Suscribir Usuario";
+$strings['DeleteTheOrder'] = "Eliminar el Pedido";
+$strings['ReferenceOrder'] = 'Referencia del pedido';
+$strings['UserInformation'] = 'Información del Usuario';
+$strings['OnceItIsConfirmed,YouWillReceiveAnEmailWithTheBankInformationAndAnOrderReference'] = "Una vez confirmado, recibira un e-mail con los datos bancarios y una referencia del pedido.";
+$strings['BankAccountInformation'] = 'Información de la Cuenta Bancaria';
+$strings['ConfirmOrder'] = 'Confirmar Orden';
+$strings['PaymentMethods'] = 'Métodos de pago';
+$strings['CancelOrder'] = 'Cancelar Orden';
+$strings['ErrorContactPlatformAdmin'] = "Se ha producido un error desconocido. Por favor, póngase en contacto con el administrador de la plataforma.";

plugin/buy_courses/src/ajax.php

@@ -13,7 +13,10 @@
 echo Display::tag('h2', $course_info['name']);
 echo '<br />';
 
-$sql = "SELECT * FROM $tbl_course_description WHERE c_id = " . intval($course_info['real_id']) . " AND session_id = 0 ORDER BY id";
+$sql = "SELECT * FROM $tbl_course_description
+    WHERE c_id = " . intval($course_info['real_id']) . "
+    AND session_id = 0 ORDER BY id";
+
 $result = Database::query($sql);
 if (Database::num_rows($result) > 0) {
     while ($description = Database::fetch_object($result)) {

plugin/buy_courses/src/configuration.php

@@ -9,10 +9,11 @@
 $plugin = Buy_CoursesPlugin::create();
 
 $_cid = 0;
+$templateName = $plugin->get_lang('AvailableCourses');
 $interbreadcrumb[] = array("url" => "list.php", "name" => $plugin->get_lang('CourseListOnSale'));
 $interbreadcrumb[] = array("url" => "paymentsetup.php", "name" => get_lang('Configuration'));
 
-$tpl = new Template('availableCourses');
+$tpl = new Template($templateName);
 
 $teacher = api_is_platform_admin();
 api_protect_course_script(true);

plugin/buy_courses/src/expresscheckout.php

@@ -15,25 +15,8 @@
  * The currencyCodeType and paymentType
  * are set to the selections made on the Integration Assistant
  */
-$currencyCodeType = "EUR";
 $paymentType = "Sale";
 
-/**
- * The returnURL is the location where buyers return to when a
- * payment has been succesfully authorized.
- * This is set to the value entered on the Integration Assistant
- */
-$returnURL = "http://www.nosolored.me/pluging/paypal/confirm.php";
-
-
-/**
- * The cancelURL is the location buyers are sent to when they hit the
- * cancel button during authorization of payment during the PayPal flow
- *
- * This is set to the value entered on the Integration Assistant
- */
-$cancelURL = "http://www.nosolored.me/pluging/paypal/error.php";
-
 /**
  * Calls the SetExpressCheckout API call
  * The CallShortcutExpressCheckout function is defined in the file PayPalFunctions.php,

plugin/buy_courses/src/function.php

@@ -1,6 +1,7 @@
 <?php
 
 require_once '../config.php';
+require_once 'buy_course.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'mail.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'course.lib.php';
 
@@ -96,14 +97,14 @@
 
             $tmp = Database::query($sql);
             if (Database::affected_rows() > 0) {
-                $row['enrolled'] = "SI";
+                $row['enrolled'] = "YES";
             } else {
                 $row['enrolled'] = "NO";
             }
         } else {
             $row['enrolled'] = "NO";
         }
-        //Comprobamos imagen
+        // Check img
         if (file_exists("../../../courses/" . $row['code'] . "/course-pic85x85.png")) {
             $row['course_img'] = "courses/" . $row['code'] . "/course-pic85x85.png";
         } else {
@@ -117,7 +118,7 @@
         }
 
     }
-
+    $currencyType = findCurrency();
     foreach ($aux as $course) {
         $content .= '<div class="well_border span8">';
         $content .= '<div class="row">';
@@ -131,14 +132,14 @@
         $content .= '<div class="span4">';
         $content .= '<div class="categories-course-description">';
         $content .= '<h3>' . $course['title'] . '</h3>';
-        $content .= '<h5>' . get_lang('teacher') . ': ' . $course['teacher'] . '</h5>';
+        $content .= '<h5>' . get_lang('Teacher') . ': ' . $course['teacher'] . '</h5>';
         $content .= '</div>';
         if ($course['enrolled'] == "YES") {
             $content .= '<span class="label label-info">' .  $plugin->get_lang('TheUserIsAlreadyRegistered') . '</span>';
         }
         $content .= '</div>';
         $content .= '<div class="span right">';
-        $content .= '<div class="sprice right">' . $course['price'] . ' &euro; </div>';
+        $content .= '<div class="sprice right">' . $course['price'] . ' ' . $currencyType . ' </div>';
         $content .= '<div class="cleared"></div>';
         $content .= '<div class="btn-toolbar right">';
         $content .= '<a class="ajax btn btn-primary" title="" href="' . $server . 'main/inc/ajax/course_home.ajax.php?a=show_course_information&code=' . $course['code'] . '">' . get_lang('Description') . '</a>&nbsp;';
@@ -210,7 +211,8 @@
 
 if ($_REQUEST['tab'] == 'delete_account') {
     $_REQUEST['id'] = intval($_REQUEST['id']);
-    $id = substr($_REQUEST['id'], 6);
+    $id = $_REQUEST['id'];
+
     $sql = "DELETE FROM $tableBuyCourseTransference WHERE id='" . $id . "';";
     $res = Database::query($sql);
     if (!res) {

plugin/buy_courses/src/index.buycourses.php

@@ -8,25 +8,18 @@
 
 if ($guess_enable == "true" || isset($_SESSION['_user'])) {
     $title = $plugin->get_lang('CourseListOnSale');
+    $templateName = $plugin->get_lang('BuyCourses');
 
-    echo '<div class="well sidebar-nav static">';
-    echo '<h4>' . $title . '</h4>';
-    echo '<ul class="nav nav-list">';
-    echo '<li>';
-    echo '<a href="src/list.php">' . $plugin->get_lang('BuyCourses') . '</a>';
-    echo '</li>';
-    if (api_is_platform_admin()) {
-        echo '<li>';
-        echo '<a href="src/configuration.php">' . $plugin->get_lang('ConfigurationOfCoursesAndPrices') . '</a>';
-        echo '</li>';
-        echo '<li>';
-        echo '<a href="src/paymentsetup.php">' . $plugin->get_lang('ConfigurationOfPayments') . '</a>';
-        echo '</li>';
-        echo '<li>';
-        echo '<a href="src/pending_orders.php">' . $plugin->get_lang('OrdersPendingOfPayment') . '</a>';
-        echo '</li>';
-    }
-    echo '</ul>';
-    echo '</div>';
+    $tpl = new Template($templateName);
+    $tpl->assign('isAdmin', api_is_platform_admin());
+    $tpl->assign('title', $title);
+    $tpl->assign('BuyCourses', $templateName);
+    $tpl->assign('ConfigurationOfCoursesAndPrices', $plugin->get_lang('ConfigurationOfCoursesAndPrices'));
+    $tpl->assign('ConfigurationOfPayments', $plugin->get_lang('ConfigurationOfPayments'));
+    $tpl->assign('OrdersPendingOfPayment', $plugin->get_lang('OrdersPendingOfPayment'));
+    $listing_tpl = 'buy_courses/view/index.tpl';
+    $content = $tpl->fetch($listing_tpl);
+    $tpl->assign('content', $content);
+    $tpl->display_one_col_template();
 }
 

plugin/buy_courses/src/index.php

@@ -0,0 +1 @@
+<?php

plugin/buy_courses/src/inscription.php

@@ -13,7 +13,7 @@
 if (!empty($_POST['language'])) { //quick hack to adapt the registration form result to the selected registration language
     $_GET['language'] = $_POST['language'];
 }
-require_once '../../main/inc/global.inc.php';
+require_once '../config.php';
 require_once api_get_path(CONFIGURATION_PATH) . 'profile.conf.php';
 require_once api_get_path(LIBRARY_PATH) . 'mail.lib.inc.php';