Minor - Improve readability of GH#3020 and GH#3021

pull/3035/head
Yannick Warnier 6 years ago
parent 8aa74dd3de
commit 99fabe49ac
  1. 1
      plugin/buycourses/lang/brazilian.php
  2. 1
      plugin/buycourses/lang/english.php
  3. 3
      plugin/buycourses/lang/french.php
  4. 13
      plugin/buycourses/src/buy_course_plugin.class.php
  5. 8
      plugin/buycourses/src/export_report.php

@ -95,4 +95,5 @@ $strings['PaymentMethod'] = "Método de pagamento";
$strings['SWIFT'] = "Código SWIFT"; $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['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['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"; $strings['SelectDateRange'] = "Selecione uma data de início e uma data de término para o relatório";

@ -191,4 +191,5 @@ $strings['ClickHereToFinish'] = "Click here to finish";
$strings['OrderCancelled'] = "Order cancelled"; $strings['OrderCancelled'] = "Order cancelled";
$strings['use_currency_symbol'] = "Use currency symbol"; $strings['use_currency_symbol'] = "Use currency symbol";
$strings['ExportReport'] = "Export Sales Report"; $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"; $strings['SelectDateRange'] = "Select a <strong>start date</strong> and <strong>end date</strong> for the report";

@ -160,5 +160,6 @@ $strings['BoughtBy'] = "Acheté par";
$strings['PurchaserUser'] = "Utilisateur acheteur"; $strings['PurchaserUser'] = "Utilisateur acheteur";
$strings['Pending'] = "En attente"; $strings['Pending'] = "En attente";
$strings['Names'] = "Nom"; $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"; $strings['SelectDateRange'] = "Sélectionnez une date de début et une date de fin pour le rapport";

@ -1281,9 +1281,10 @@ class BuyCoursesPlugin extends Plugin
/** /**
* Get the list statuses for sales. * Get the list statuses for sales.
* *
* @param null $dateStart * @param string $dateStart
* @param null $dateEnd * @param string $dateEnd
* @return array * @return array
* @throws Exception
*/ */
public function getSaleListReport($dateStart = null, $dateEnd = null) public function getSaleListReport($dateStart = null, $dateEnd = null)
{ {
@ -1306,9 +1307,9 @@ class BuyCoursesPlugin extends Plugin
$textStatus = null; $textStatus = null;
$paymentTypes = $this->getPaymentTypes(); $paymentTypes = $this->getPaymentTypes();
$productTypes = $this->getProductTypes(); $productTypes = $this->getProductTypes();
foreach($list as $item){ foreach ($list as $item) {
$statusSaleOrder = $item['status']; $statusSaleOrder = $item['status'];
switch ($statusSaleOrder){ switch ($statusSaleOrder) {
case 0: case 0:
$textStatus = $this->get_lang('SaleStatusPending'); $textStatus = $this->get_lang('SaleStatusPending');
break; break;
@ -1350,9 +1351,9 @@ class BuyCoursesPlugin extends Plugin
//Validation Export //Validation Export
$dateStart = strtotime($dateStart); $dateStart = strtotime($dateStart);
$dateEnd = strtotime($dateEnd); $dateEnd = strtotime($dateEnd);
foreach ($listExportTemp as $item){ foreach ($listExportTemp as $item) {
$dateFilter = strtotime($item['date']); $dateFilter = strtotime($item['date']);
if(($dateFilter >= $dateStart) && ($dateFilter <= $dateEnd)){ if (($dateFilter >= $dateStart) && ($dateFilter <= $dateEnd)) {
$listExport[] = [ $listExport[] = [
'id' => $item['id'], 'id' => $item['id'],
'status' => $item['status'], 'status' => $item['status'],

@ -1,5 +1,5 @@
<?php <?php
/* For license terms, see /license.txt */
//Initialization //Initialization
$cidReset = true; $cidReset = true;
@ -21,11 +21,11 @@ if ($form->validate()) {
$dateStart = $reportValues['date_start']; $dateStart = $reportValues['date_start'];
$dateEnd = $reportValues['date_end']; $dateEnd = $reportValues['date_end'];
if($dateStart == null || $dateEnd == null){ if ($dateStart == null || $dateEnd == null) {
Display::addFlash( Display::addFlash(
Display::return_message($plugin->get_lang('SelectDateRange'),'error', false) Display::return_message($plugin->get_lang('SelectDateRange'),'error', false)
); );
} else if($dateStart>$dateEnd) { } else if ($dateStart>$dateEnd) {
Display::addFlash( Display::addFlash(
Display::return_message(get_lang('EndDateCannotBeBeforeTheStartDate'),'error', false) 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(); $archiveFile = 'export_report_sales_'.api_get_local_time();
Export::arrayToXls($salesStatus, $archiveFile); Export::arrayToXls($salesStatus, $archiveFile);
} }

Loading…
Cancel
Save