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"] .= ''.$row->brCode.''.number_format($row->TotalSales, 2).'ViewView'; + $data["htmlTableList"] .= ''.$row->brCode.' - '.$row->brDesc.''.number_format($row->TotalSales, 2).'ViewView'; $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'); }