From 99fabe49ac21fafaed26d92cfb97a44dd69ba4d0 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Wed, 13 Nov 2019 00:21:23 +0100
Subject: [PATCH] Minor - Improve readability of GH#3020 and GH#3021

---
 plugin/buycourses/lang/brazilian.php              |  1 +
 plugin/buycourses/lang/english.php                |  1 +
 plugin/buycourses/lang/french.php                 |  3 ++-
 plugin/buycourses/src/buy_course_plugin.class.php | 13 +++++++------
 plugin/buycourses/src/export_report.php           |  8 ++++----
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/plugin/buycourses/lang/brazilian.php b/plugin/buycourses/lang/brazilian.php
index 1bb0be6ef0..19debc6ca6 100644
--- a/plugin/buycourses/lang/brazilian.php
+++ b/plugin/buycourses/lang/brazilian.php
@@ -95,4 +95,5 @@ $strings['PaymentMethod'] = "Método de pagamento";
 $strings['SWIFT'] = "Código SWIFT";
 $strings['SWIFT_help'] = "Formato padrão de Códigos de Identificação Bancária (BIC) e serve como um identificador exclusivo de um banco ou instituição financeira";
 $strings['ExportReport'] = "Exportar Relatório de Vendas";
+$strings['OrderTime'] = "Hora do pedido";
 $strings['SelectDateRange'] = "Selecione uma data de início e uma data de término para o relatório";
diff --git a/plugin/buycourses/lang/english.php b/plugin/buycourses/lang/english.php
index 74e740d9d1..3ae8a2eb4c 100644
--- a/plugin/buycourses/lang/english.php
+++ b/plugin/buycourses/lang/english.php
@@ -191,4 +191,5 @@ $strings['ClickHereToFinish'] = "Click here to finish";
 $strings['OrderCancelled'] = "Order cancelled";
 $strings['use_currency_symbol'] = "Use currency symbol";
 $strings['ExportReport'] =  "Export Sales Report";
+$strings['OrderTime'] = "Order time";
 $strings['SelectDateRange'] = "Select a <strong>start date</strong> and <strong>end date</strong> for the report";
diff --git a/plugin/buycourses/lang/french.php b/plugin/buycourses/lang/french.php
index 423aa46acc..fe6a3040d7 100644
--- a/plugin/buycourses/lang/french.php
+++ b/plugin/buycourses/lang/french.php
@@ -160,5 +160,6 @@ $strings['BoughtBy'] = "Acheté par";
 $strings['PurchaserUser'] = "Utilisateur acheteur";
 $strings['Pending'] = "En attente";
 $strings['Names'] = "Nom";
-$strings['ExportReport'] =  "Rapport des ventes à l'exportation";
+$strings['ExportReport'] =  "Export du rapport des ventes";
+$strings['OrderTime'] = "Heure de commande";
 $strings['SelectDateRange'] = "Sélectionnez une date de début et une date de fin pour le rapport";
\ No newline at end of file
diff --git a/plugin/buycourses/src/buy_course_plugin.class.php b/plugin/buycourses/src/buy_course_plugin.class.php
index b528f3f031..94e02b325f 100644
--- a/plugin/buycourses/src/buy_course_plugin.class.php
+++ b/plugin/buycourses/src/buy_course_plugin.class.php
@@ -1281,9 +1281,10 @@ class BuyCoursesPlugin extends Plugin
     /**
      * Get the list statuses for sales.
      *
-     * @param null $dateStart
-     * @param null $dateEnd
+     * @param string $dateStart
+     * @param string $dateEnd
      * @return array
+     * @throws Exception
      */
     public function getSaleListReport($dateStart = null, $dateEnd = null)
     {
@@ -1306,9 +1307,9 @@ class BuyCoursesPlugin extends Plugin
         $textStatus = null;
         $paymentTypes = $this->getPaymentTypes();
         $productTypes = $this->getProductTypes();
-        foreach($list as $item){
+        foreach ($list as $item) {
             $statusSaleOrder = $item['status'];
-            switch ($statusSaleOrder){
+            switch ($statusSaleOrder) {
                 case 0:
                     $textStatus = $this->get_lang('SaleStatusPending');
                     break;
@@ -1350,9 +1351,9 @@ class BuyCoursesPlugin extends Plugin
         //Validation Export
         $dateStart = strtotime($dateStart);
         $dateEnd = strtotime($dateEnd);
-        foreach ($listExportTemp as $item){
+        foreach ($listExportTemp as $item) {
             $dateFilter = strtotime($item['date']);
-            if(($dateFilter >= $dateStart) && ($dateFilter <= $dateEnd)){
+            if (($dateFilter >= $dateStart) && ($dateFilter <= $dateEnd)) {
                 $listExport[] = [
                     'id' => $item['id'],
                     'status' => $item['status'],
diff --git a/plugin/buycourses/src/export_report.php b/plugin/buycourses/src/export_report.php
index ad31001d67..4e6dd1bef6 100644
--- a/plugin/buycourses/src/export_report.php
+++ b/plugin/buycourses/src/export_report.php
@@ -1,5 +1,5 @@
 <?php
-
+/* For license terms, see /license.txt */
 //Initialization
 $cidReset = true;
 
@@ -21,11 +21,11 @@ if ($form->validate()) {
     $dateStart = $reportValues['date_start'];
     $dateEnd = $reportValues['date_end'];
 
-    if($dateStart == null || $dateEnd == null){
+    if ($dateStart == null || $dateEnd == null) {
         Display::addFlash(
             Display::return_message($plugin->get_lang('SelectDateRange'),'error', false)
         );
-    } else if($dateStart>$dateEnd) {
+    } else if ($dateStart>$dateEnd) {
         Display::addFlash(
             Display::return_message(get_lang('EndDateCannotBeBeforeTheStartDate'),'error', false)
         );
@@ -34,7 +34,7 @@ if ($form->validate()) {
     }
 }
 
-if(!empty($salesStatus)){
+if (!empty($salesStatus)) {
     $archiveFile = 'export_report_sales_'.api_get_local_time();
     Export::arrayToXls($salesStatus, $archiveFile);
 }