From 66602e2a008c223c4d74e9aef55fadde4bf3e779 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Tue, 26 Sep 2023 23:33:20 +0200
Subject: [PATCH] Plugin: BuyCourses: Improve display headers in sales reports

---
 .../buycourses/src/service_sales_report.php   | 20 +++++++++++++------
 plugin/buycourses/view/sales_report.tpl       |  4 ++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/plugin/buycourses/src/service_sales_report.php b/plugin/buycourses/src/service_sales_report.php
index 790fc53ed0..3d4cc6efff 100644
--- a/plugin/buycourses/src/service_sales_report.php
+++ b/plugin/buycourses/src/service_sales_report.php
@@ -53,21 +53,28 @@ $templateName = $plugin->get_lang('SalesReport');
 
 $template = new Template($templateName);
 
+$toolbar = Display::url(
+    Display::returnFontAwesomeIcon('file-excel-o').
+    get_lang('GenerateReport'),
+    api_get_path(WEB_PLUGIN_PATH).'buycourses/src/export_report.php',
+    ['class' => 'btn btn-primary']
+);
+
 if ($paypalEnable == 'true' && $commissionsEnable == 'true') {
-    $toolbar = Display::toolbarButton(
+    $toolbar .= Display::toolbarButton(
         $plugin->get_lang('PaypalPayoutCommissions'),
         api_get_path(WEB_PLUGIN_PATH).'buycourses/src/paypal_payout.php',
         'paypal',
         'primary',
         ['title' => $plugin->get_lang('PaypalPayoutCommissions')]
     );
-
-    $template->assign(
-        'actions',
-        Display::toolbarAction('toolbar', [$toolbar])
-    );
 }
 
+$template->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
+
 if ($commissionsEnable == 'true') {
     $toolbar = Display::toolbarButton(
         $plugin->get_lang('PayoutReport'),
@@ -92,4 +99,5 @@ $template->assign('sale_status_completed', BuyCoursesPlugin::SERVICE_STATUS_COMP
 $template->assign('invoicing_enable', $invoicingEnable);
 $content = $template->fetch('buycourses/view/service_sales_report.tpl');
 $template->assign('content', $content);
+$template->assign('header', $templateName);
 $template->display_one_col_template();
diff --git a/plugin/buycourses/view/sales_report.tpl b/plugin/buycourses/view/sales_report.tpl
index 28398b8578..c7c7f41991 100644
--- a/plugin/buycourses/view/sales_report.tpl
+++ b/plugin/buycourses/view/sales_report.tpl
@@ -9,6 +9,10 @@
                role="tab">{{ 'Services'|get_plugin_lang('BuyCoursesPlugin') }}</a>
         </li>
     {% endif %}
+    <li id="buy-subscriptions-tab" role="presentation">
+        <a href="subscription_sales_report.php" aria-controls="buy-subscriptions"
+           role="tab">{{ 'Subscriptions'|get_plugin_lang('BuyCoursesPlugin') }}</a>
+    </li>
 </ul>
 <br />
 <br />