diff --git a/application/controllers/Pages.php b/application/controllers/Pages.php index 29e49c3..d068737 100644 --- a/application/controllers/Pages.php +++ b/application/controllers/Pages.php @@ -1665,8 +1665,8 @@ class Pages extends CI_controller } } } - - $this->stockinnew(); + + redirect('/stockinnew/transDate?transDate='.$this->input->get("transDate", true), 'refresh'); } public function stockinmaintenancenew() @@ -1923,6 +1923,34 @@ class Pages extends CI_controller $this->load->view('pages/salesnew', $data); } + public function salesnew_() + { + if(!$this->isLogged()) + redirect('login', 'refresh'); + + $this->load->model("Sales"); + $this->load->model("Category"); + + $data["selectedDate"] = date('m/d/Y'); + if($this->input->get("transDate", true) != null) + $data["selectedDate"] = $this->input->get("transDate", true); + + $transID = $this->generateTransID($data["selectedDate"]); + $result = $this->Sales->getSalesByTransID($transID); + $data["htmlTableList"] = ""; + + foreach($result->result() as $row) + $data["htmlTableList"] .= ''.$row->invoiceNum.''.$row->catCode.''.$row->modelno.''.$row->custName.''.$row->qty.''.$row->price.'
Cash: '.$row->cash.'
Dollar: '.$row->dollar.'
C Card: '.$row->creditCard.'
Check: '.$row->checque.'
Bank Share: '.$row->bankshare.'
Tax Optn: '.$row->wTaxOption.'
W/Tax: '.$row->withholdingtax.'
Down: '.$row->layawayDP.'
Bal: '.$row->layawayBal.'
S Pay:'.$row->layawaySP.'
Full: '.$row->layawayFP.''.$row->misc.''.$row->transType.''.$row->remarks.''.$row->transDate.''.$row->validated.''; + + $data["htmlCategoryList"] = ""; + $result = $this->Category->getAllCategoryCodeAndDesc(); + + foreach($result->result() as $row) + $data["htmlCategoryList"] .= ''; + + $this->load->view('pages/salesnew_', $data); + } + public function addSalesNew() { $this->load->model("Sales");