Skip to content

Commit 241c210

Browse files
author
Shaun Kutch
committed
Added close view
Updated Receipt class
1 parent 63a6874 commit 241c210

File tree

10 files changed

+64
-47
lines changed

10 files changed

+64
-47
lines changed

‎application/.DS_Store‎

0 Bytes
Binary file not shown.

‎application/config/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
|
109109
*/
110110

111-
$autoload['model'] = array('Appconfig','Sync_items','Person','Customer','Employee','Module','Item', 'Item_taxes', 'Sale', 'Sale_suspended', 'Supplier','Inventory','Receiving','Giftcard', 'Item_kit', 'Item_kit_items','receipt');
111+
$autoload['model'] = array('Appconfig','Sync_items','Person','Customer','Employee','Module','Item', 'Item_taxes', 'Sale', 'Sale_suspended', 'Supplier','Inventory','Receiving','Giftcard', 'Item_kit', 'Item_kit_items','Receipt');
112112

113113

114114
/*

‎application/controllers/home.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Home extends Secure_area
44
{
55
function __construct()
66
{
7-
parent::__construct();
7+
parent::__construct();
88
}
99

1010
function index()
@@ -14,7 +14,15 @@ function index()
1414

1515
function logout()
1616
{
17-
$this->Employee->logout();
17+
$this->load->model('reports/Detailed_sales');
18+
19+
$start_date = date('Y-m-d') . " 00:00:00";
20+
$end_date = date('Y-m-d H:i:s');
21+
22+
$data['sales_totals'] = $this->Detailed_sales->getTypeSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date));
23+
24+
$this->load->view("close", $data);
25+
//$this->Employee->logout();
1826
}
1927
}
2028
?>

‎application/controllers/sales.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ function complete()
221221
$this->load->view("sales/receipt",$data);
222222
$this->sale_lib->clear_all();
223223

224+
$this->Receipt->print_receipt($data);
225+
224226
//Sync sales to the remote server
225227
$this->Sync_items->sync_sales();
226228
}

‎application/models/receipt.php‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,74 @@
22
class Receipt extends CI_Model
33
{
44

5+
private $receipt_path;
6+
57
function __construct()
68
{
9+
$this->receipt_path = APPPATH.'/tmp/receipt.txt';
710
$this->load->helper('printer_helper');
811
$this->load->helper('file');
912
}
1013

11-
function print_receipt($id, $products, $totals, $tenders)
14+
function print_receipt($data)
1215
{
1316
$today = date("F j, Y, g:i a");
1417

1518
$message = init();
1619
$message .= center();
1720
$message .= header_style();
18-
$message .= "Fairytale";
19-
$message .= new_line();
21+
$message .= $this->Appconfig->get('company');
2022
$message .= reset_styles();
21-
$message .= "Fashion Boutique";
22-
$message .= new_line();
2323
$message .= new_line();
24-
$message .= "www.fairytale-boutique.com";
2524
$message .= new_line();
26-
$message .= "319 East 2nd st. Suite #114";
25+
$message .= $this->Appconfig->get('website');
2726
$message .= new_line();
28-
$message .="Los Angeles, CA 90012";
27+
$message .= $this->Appconfig->get('address');
2928
$message .= new_line();
30-
$message .= "(213) 680-1032";
29+
$message .= $this->Appconfig->get('phone');
3130
$message .= new_line();
3231
$message .= new_line();
3332
$message .= $today;
3433
$message .= new_line();
3534
$message .= new_line();
36-
$message .= "Sale #".$id;
35+
$message .= "Sale #".$data['sale_id'];
3736
$message .= new_line();
3837
$message .= new_line();
3938
$message .= left();
4039

41-
foreach($products as $product)
40+
foreach($data['cart'] as $product)
4241
{
4342
$message .= $product["name"] . " ";
44-
$message .= "$".$product["price"] . " x" . $product["qty"];
43+
$message .= to_currency($product["price"]) . " x" . $product["quantity"];
4544
$message .= new_line();
45+
if($product['discount'] > 0)
46+
{
47+
$message .= "Discount: ". $product['discount'] . "%";
48+
}
4649
}
4750
$message .= new_line();
48-
$message .= "Sub Total: $". $totals['subtotal'];
49-
if($totals['discount'] > 0)
51+
$message .= "Sub Total: ". to_currency($data['subtotal']);
52+
$message .= new_line();
53+
foreach($data['taxes'] as $tax)
5054
{
51-
$message .= new_line();
52-
$message .= "Discount: ". $totals['discount'];
55+
$message .= "Tax: ". to_currency($tax);
5356
}
5457
$message .= new_line();
55-
$message .= "Tax: $". $totals['tax'];
56-
$message .= new_line();
5758
$message .= "=======================";
5859
$message .= new_line();
5960
$message .= total_style();
60-
$message .= "Total: $". $totals['total'];
61+
$message .= "Total: ". to_currency($data['total']);
6162
$message .= reset_styles();
6263
$message .= new_line();
6364
$message .= new_line();
64-
foreach($tenders as $tender)
65+
foreach($data['payments'] as $payment)
6566
{
66-
$message .= ucfirst($tender['type']) . ": ";
67-
$message .= "$".$tender['amount'];
67+
$message .= ucfirst($payment['payment_type']) . ": ";
68+
$message .= to_currency($payment['payment_amount']);
6869
$message .= new_line();
6970
}
7071
$message .= new_line();
71-
$message .= "Change: $". $totals['change'];
72+
$message .= "Change: ". $data['amount_change'];
7273
$message .= new_line();
7374
$message .= new_line();
7475
$message .= new_line();
@@ -79,24 +80,24 @@ function print_receipt($id, $products, $totals, $tenders)
7980
$message .= new_line();
8081
$message .= new_line();
8182

82-
writereceipt($message);
83-
//sendreceipt();
83+
$this->write_receipt($message);
84+
//$this->send_receipt($receipt_path);
8485
}
8586

8687

87-
function writereceipt($message)
88+
function write_receipt($message)
8889
{
89-
if (!write_file('./tmp/receipt.txt', $message))
90+
if (!write_file($this->receipt_path, $message))
9091
{
9192
log_message('error', 'Unable to write the file');
9293
}else{
9394
log_message('info', 'File written!');
9495
}
9596
}
9697

97-
function sendreceipt()
98+
function send_receipt($path)
9899
{
99-
shell_exec("cat /var/www/pos/temp/receipt.txt > /dev/usb/lp0");
100+
shell_exec("cat ".$this->receipt_path." > /dev/usb/lp0");
100101
}
101102
}
102103
?>

‎application/models/reports/detailed_sales.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,16 @@ public function getSummaryData(array $inputs)
6464

6565
return $this->db->get()->row_array();
6666
}
67+
68+
public function getTypeSummaryData($inputs)
69+
{
70+
$this->db->select('sales_payments.payment_type, sum(phppos_sales_payments.payment_amount) as total');
71+
$this->db->from('sales');
72+
$this->db->join('sales_payments', 'sales_payments.sale_id = sales.sale_id');
73+
$this->db->where('sale_time BETWEEN "'. $inputs['start_date']. '" and "'. $inputs['end_date'].'"');
74+
$this->db->group_by('payment_type');
75+
76+
return $this->db->get()->result_array();
77+
}
6778
}
6879
?>

‎application/models/sync.php‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎application/tmp/.DS_Store‎

6 KB
Binary file not shown.

‎application/tmp/receipt.txt‎

311 Bytes
Binary file not shown.

‎application/views/close.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php $this->load->view("partial/header"); ?>
2+
<div class="panel panel-default">
3+
<div class="panel-heading">Daily Totals</div>
4+
<ul class="list-group">
5+
<?php foreach($sales_totals as $sales_total) { ?>
6+
<li class="list-group-item"><?php echo $sales_total['payment_type']. ': '.to_currency($sales_total['total']); ?></li>
7+
<?php }?>
8+
</ul>
9+
</div>
10+
<?php $this->load->view("partial/footer"); ?>

0 commit comments

Comments
 (0)