diff --git a/application/controllers/Pages.php b/application/controllers/Pages.php index d068737..e165e62 100644 --- a/application/controllers/Pages.php +++ b/application/controllers/Pages.php @@ -1923,32 +1923,24 @@ class Pages extends CI_controller $this->load->view('pages/salesnew', $data); } - public function salesnew_() + public function salesNewWithCustomer() { 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(); + $result = $this->Category->getAllCategoryCodeAndDesc(); foreach($result->result() as $row) $data["htmlCategoryList"] .= ''; - $this->load->view('pages/salesnew_', $data); + $this->load->view('pages/salesnewwithcustomer', $data); } public function addSalesNew() diff --git a/application/views/pages/salesnew.php b/application/views/pages/salesnew.php index 1e4342b..91b21d4 100644 --- a/application/views/pages/salesnew.php +++ b/application/views/pages/salesnew.php @@ -251,7 +251,7 @@
- + @@ -297,6 +297,7 @@
+ Add Sales with Customer Record
diff --git a/application/views/pages/salesnew_.php b/application/views/pages/salesnew_.php deleted file mode 100644 index dc2049d..0000000 --- a/application/views/pages/salesnew_.php +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - AdminKW | Sales - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - load->view('pages/topnav'); ?> - -
- - - load->view('pages/leftnav'); ?> - - -
- -
-

- Sales - it all starts here -

-
    -
  1. Home
    2. -
  2. Examples
    3. -
  3. Blank page
    4. -
-
- - -
- - -
- -

Opppppps!

- -
- - -
-
-
-
-
-
-  Click Set Date after changing the transaction date. -
-
- -
- - - - -
- -
-
-
-
-
-
- - -
-
-

Transasction Result for date

-
-
-
-
-
- - - - - - - - - - - - - - - - - -
InvoiceCatCodeModelNoCustomerQtyPricePaymentTax InfoLayawayMiscTrans TypeRemarksDateValidated
-
-
-
-
-
- -
-
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/views/pages/salesnewwithcustomer.php b/application/views/pages/salesnewwithcustomer.php new file mode 100644 index 0000000..2b4d352 --- /dev/null +++ b/application/views/pages/salesnewwithcustomer.php @@ -0,0 +1,357 @@ + + + + + + AdminKW | Email Sending + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + load->view('pages/topnav'); ?> + +
+ + + load->view('pages/leftnav'); ?> + + +
+ +
+

+ Add Sales + it all starts here +

+
    +
  1. Home
    2. +
  2. Sales Transaction
    3. +
  3. New Sales
    4. +
+
+ + +
+
+
+
+
+
+
+ +
+
+ +
+ + + + +
+ +
+
+
+
+
+
+ + + + + + input->get("transDate", true) != null) + { + ?> +
+
+

New Sales for date

+
+
+
+
+
+ + +
+
+
+
+ +
+ + + + +
+
+
+
+
+
+
+ + +
+
+
+

Item Information

+

Enter item information. Value inside Item Price field is a price of an item after discount.

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+

Customer Payment

+

Enter the amount paid by the customer in various mode of payment. Leave field as zero (0) if not applicable.

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ (Applicable with Layaway only) + +
+
+
+

Bank and Tax Information

+

Enter bank share and withholding tax information.

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+ + Back to Sales +
+
+ +
+
+ Back to Sales +
+
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + +