From 20e593e43773d840e2b4c818edeffd68ce234880 Mon Sep 17 00:00:00 2001
From: paulcortez <pbeldia@outlook.com>
Date: Fri, 27 Dec 2024 13:20:35 +0800
Subject: [PATCH] Added description to SSG's request

Added description to SSG's request
---
 application/controllers/Executive_view.php | 2 +-
 application/models/StoreTransaction.php    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Executive_view.php b/application/controllers/Executive_view.php
index ccf1273..95467a0 100644
--- a/application/controllers/Executive_view.php
+++ b/application/controllers/Executive_view.php
@@ -50,7 +50,7 @@ class Executive_view extends CI_controller
         $result = $this->StoreTransaction->getStoreTransactionSummaryByTransDate($transDate);
 
         foreach($result->result() as $row)
-            $data["htmlTableList"] .= '<tr><td>'.$row->brCode.'</td><td>'.number_format($row->TotalSales, 2).'</td><td><a class="btn btn-default" href="http://host2048.temp.domains/~karatwor/applications/webFunctions/cimsReports/salesReport.php?keyrequest=4c674b4c417766106df70e7a0b93ef67&transID=' . $row->brCode . $transDate . '&brCode=' . $row->brCode . '&transDate=' . $this->input->get("transDate", true) . '" target="_blank">View</a></td><td><a class="btn btn-default" href="http://host2048.temp.domains/~karatwor/applications/webFunctions/cimsReports/inventoryReport.php?keyrequest=4c674b4c417766106df70e7a0b93ef67&transID=' . $row->brCode . $transDate . '&brCode=' . $row->brCode . '&transDate=' . $this->input->get("transDate", true) . '" target="_blank">View</a></td></tr>';
+            $data["htmlTableList"] .= '<tr><td>'.$row->brCode.' - '.$row->brDesc.'</td><td>'.number_format($row->TotalSales, 2).'</td><td><a class="btn btn-default" href="http://host2048.temp.domains/~karatwor/applications/webFunctions/cimsReports/salesReport.php?keyrequest=4c674b4c417766106df70e7a0b93ef67&transID=' . $row->brCode . $transDate . '&brCode=' . $row->brCode . '&transDate=' . $this->input->get("transDate", true) . '" target="_blank">View</a></td><td><a class="btn btn-default" href="http://host2048.temp.domains/~karatwor/applications/webFunctions/cimsReports/inventoryReport.php?keyrequest=4c674b4c417766106df70e7a0b93ef67&transID=' . $row->brCode . $transDate . '&brCode=' . $row->brCode . '&transDate=' . $this->input->get("transDate", true) . '" target="_blank">View</a></td></tr>';
 
         $this->load->view('executiveview/dashboard', $data);
     }
diff --git a/application/models/StoreTransaction.php b/application/models/StoreTransaction.php
index 761cb47..1059835 100644
--- a/application/models/StoreTransaction.php
+++ b/application/models/StoreTransaction.php
@@ -39,7 +39,8 @@ class StoreTransaction extends CI_Model
 
     public function getStoreTransactionSummaryByTransDate($transDate)
     {
-        $this->db->select("recordID, transID, brCode, (cash + checque + dollar + ccard) AS TotalSales, preparedBy, remarks");
+        $this->db->select("storetransaction.recordID, storetransaction.transID, storetransaction.brCode, branch.brDesc, (storetransaction.cash + storetransaction.checque + storetransaction.dollar + storetransaction.ccard) AS TotalSales, storetransaction.preparedBy, storetransaction.remarks");
+        $this->db->join('branch', 'branch.brCode = storetransaction.brCode');
         $this->db->like('transID', $transDate, 'before');
         return $this->db->get('storetransaction');
     }