Browse Source

Update plugin code from 1.11.x

jmontoyaa 8 years ago
parent
commit
78748e18a8

+ 5 - 0
plugin/buycourses/lang/es.php

@@ -147,3 +147,8 @@ $strings['ServiceSaleInfo'] = "Información del servicio";
 $strings['ListOfServicesOnSale'] = "Lista de servicios a la venta";
 $strings['AdditionalInfo'] = "Información adicional";
 $strings['PleaseSelectTheCorrectInfoToApplyTheService'] = "Porfavor Seleccione la información correcta para aplicar el servicio";
+$strings['SubscriptionToServiceXSuccessful'] = "La subscripción al servicio %s ha sido satisfactoria";
+$strings['culqi_enable'] = "Habilitar Culqi";
+$strings['CulqiConfig'] = "Configuración de CULQI:";
+$strings['InfoCulqiCredentials'] = "Para obtener las credenciales es necesario crearse una cuenta en Culqi e ingresar en modo desarrollo, copiar el código de comercio que se encuentra en su panel de control, luego ingresar al apartado de API Keys y generar la Key correspondiente para copiarla aquí";
+$strings['CommerceCode'] = "Codigo de comercio";

+ 3 - 3
plugin/buycourses/src/index.buycourses.php

@@ -10,12 +10,12 @@ $plugin = BuyCoursesPlugin::create();
 $guess_enable = $plugin->get('unregistered_users_enable');
 $userInfo = api_get_user_info();
 
-if ($guess_enable == 'true' || isset($userInfo)) {
+if ($guess_enable == 'true' || !empty($userInfo)) {
     // If the user is NOT an administrator, redirect it to course/session buy list
-    if (!api_is_platform_admin()) {
+    /*if (!api_is_platform_admin()) {
         header('Location: src/course_panel.php');
         exit;
-    }
+    }*/
 
     $htmlHeadXtra[] = api_get_css('plugins/buycourses/css/style.css');
     $tpl = new Template();

+ 19 - 1
plugin/buycourses/view/paymentsetup.html.twig

@@ -89,4 +89,22 @@
         </div>
     </div>
 {% endif %}
-{% endautoescape %}
+
+{% if culqi_enable == "true" %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{{ 'CulqiConfig'|get_plugin_lang('BuyCoursesPlugin') }}</h3>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-5">
+                    <p>{{ 'InfoCulqiCredentials'|get_plugin_lang('BuyCoursesPlugin') }}</p>
+                </div>
+                <div class="col-md-7">
+                    {{ culqi_form }}
+                </div>
+            </div>
+        </div>
+    </div>
+{% endif %}
+{% endautoescape  %}

+ 6 - 2
plugin/courselegal/CourseLegalPlugin.php

@@ -50,7 +50,7 @@ class CourseLegalPlugin extends Plugin
             $link = Display::url(
                 $this->get_lang('CourseLegal'),
                 $url,
-                array('class' => 'btn')
+                array('class' => 'btn btn-default')
             );
         }
 
@@ -354,7 +354,9 @@ class CourseLegalPlugin extends Plugin
 
         $legalData = $this->getData($courseId, $sessionId);
         $coursePath = api_get_path(SYS_COURSE_PATH).$course['directory'].'/courselegal';
-        $uploadResult = $coursePath.'/'.$legalData['filename'];
+        if (!empty($legalData)) {
+            $uploadResult = $coursePath.'/'.$legalData['filename'];
+        }
 
         if (!is_dir($coursePath)) {
             mkdir($coursePath, api_get_permissions_for_new_directories());
@@ -395,8 +397,10 @@ class CourseLegalPlugin extends Plugin
         $conditions['filename'] = $fileName;
 
         if (empty($legalData)) {
+            Display::addFlash(Display::return_message(get_lang('Saved')));
             $id = Database::insert($table, $conditions);
         } else {
+            Display::addFlash(Display::return_message(get_lang('Updated')));
             $id = $legalData['id'];
 
             $updateParams = array(