mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-05-19 22:10:44 -04:00
Extend alternate item description to 255 characters.
This commit is contained in:
committed by
FrancescoUK
parent
3f0a53933c
commit
cb31ebb06e
@@ -635,7 +635,7 @@ class Sale extends CI_Model
|
||||
'sale_id' => $sale_id,
|
||||
'item_id' => $item['item_id'],
|
||||
'line' => $item['line'],
|
||||
'description' => character_limiter($item['description'], 30),
|
||||
'description' => character_limiter($item['description'], 255),
|
||||
'serialnumber' => character_limiter($item['serialnumber'], 30),
|
||||
'quantity_purchased'=> $item['quantity'],
|
||||
'discount_percent' => $item['discount'],
|
||||
|
||||
@@ -57,10 +57,10 @@ $(document).ready(function()
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div id="logo">
|
||||
<?php
|
||||
<div id="logo">
|
||||
<?php
|
||||
if($this->Appconfig->get('company_logo') != '')
|
||||
{
|
||||
{
|
||||
?>
|
||||
<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />
|
||||
<?php
|
||||
@@ -69,31 +69,31 @@ $(document).ready(function()
|
||||
<div> </div>
|
||||
<?php
|
||||
if ($this->Appconfig->get('receipt_show_company_name'))
|
||||
{
|
||||
?>
|
||||
{
|
||||
?>
|
||||
<div id="company_name"><?php echo $this->config->item('company'); ?></div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="block2">
|
||||
<textarea id="company-title" rows="5" cols="35"><?php echo $company_info ?></textarea>
|
||||
<table id="meta">
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $invoice_number; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $transaction_date; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo to_currency($total); ?></textarea></td>
|
||||
</tr>
|
||||
</table>
|
||||
<textarea id="company-title" rows="5" cols="35"><?php echo $company_info ?></textarea>
|
||||
<table id="meta">
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $invoice_number; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $transaction_date; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo to_currency($total); ?></textarea></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<table id="items">
|
||||
@@ -111,18 +111,24 @@ $(document).ready(function()
|
||||
?>
|
||||
<tr class="item-row">
|
||||
<td><?php echo $item['item_number']; ?></td>
|
||||
<td class="item-name"><textarea rows="4" cols="6"><?php echo ($item['is_serialized'] || $item['allow_alt_description']) && !empty($item['description']) ? $item['description'] : $item['name']; ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo to_quantity_decimals($item['quantity']); ?></textarea></td>
|
||||
<td class="item-name"><textarea rows="4" cols="6"><?php echo $item['name']; ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo to_quantity_decimals($item['quantity']); ?></textarea>
|
||||
</td>
|
||||
<td><textarea rows="4" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo $item['discount'] .'%'; ?></textarea></td>
|
||||
<td style='border-right: solid 1px; text-align:right;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo $item['discount'] . '%'; ?></textarea></td>
|
||||
<td style='border-right: solid 1px; text-align:right;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="item-row">
|
||||
<td></td>
|
||||
<td class="item-name"><textarea cols="6"><?php echo $item['description']; ?></textarea></td>
|
||||
<td style='text-align:center;' colspan="4"><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
|
||||
<?php if($item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']))
|
||||
{
|
||||
?>
|
||||
<tr class="item-row" >
|
||||
<td ></td >
|
||||
<td class="item-description" colspan = "4" ><textarea cols = "6" ><?php echo $item['description']; ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
@@ -159,33 +165,33 @@ $(document).ready(function()
|
||||
$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
|
||||
$splitpayment = explode(':', $payment['payment_type']);
|
||||
$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $splitpayment[0]; ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $splitpayment[0]; ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
if(isset($cur_giftcard_value) && $show_giftcard_remainder)
|
||||
{
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $this->lang->line('sales_giftcard_balance'); ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></textarea></td>
|
||||
</tr>
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $this->lang->line('sales_giftcard_balance'); ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
if(!empty($payments))
|
||||
{
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"> <textarea rows="5" cols="6"><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="change"><?php echo to_currency($amount_change); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"> <textarea rows="5" cols="6"><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="change"><?php echo to_currency($amount_change); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -193,10 +199,10 @@ $(document).ready(function()
|
||||
|
||||
<div id="terms">
|
||||
<div id="sale_return_policy">
|
||||
<h5>
|
||||
<textarea rows="5" cols="6"><?php echo nl2br($this->config->item('payment_message')); ?></textarea>
|
||||
<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments'). ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></textarea>
|
||||
</h5>
|
||||
<h5>
|
||||
<textarea rows="5" cols="6"><?php echo nl2br($this->config->item('payment_message')); ?></textarea>
|
||||
<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments'). ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></textarea>
|
||||
</h5>
|
||||
<?php echo nl2br($this->config->item('return_policy')); ?>
|
||||
</div>
|
||||
<div id='barcode'>
|
||||
|
||||
@@ -9,177 +9,199 @@ if (isset($error_message))
|
||||
?>
|
||||
|
||||
<?php if(!empty($customer_email)): ?>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function()
|
||||
{
|
||||
var send_email = function()
|
||||
{
|
||||
$.get('<?php echo site_url() . "/sales/send_quote/" . $sale_id_num; ?>',
|
||||
function(response)
|
||||
{
|
||||
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
|
||||
}, 'json'
|
||||
);
|
||||
};
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function()
|
||||
{
|
||||
var send_email = function()
|
||||
{
|
||||
$.get('<?php echo site_url() . "/sales/send_quote/" . $sale_id_num; ?>',
|
||||
function(response)
|
||||
{
|
||||
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
|
||||
}, 'json'
|
||||
);
|
||||
};
|
||||
|
||||
$("#show_email_button").click(send_email);
|
||||
$("#show_email_button").click(send_email);
|
||||
|
||||
<?php if(!empty($email_receipt)): ?>
|
||||
send_email();
|
||||
send_email();
|
||||
<?php endif; ?>
|
||||
});
|
||||
</script>
|
||||
});
|
||||
</script>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'invoice_printer')); ?>
|
||||
|
||||
<div class="print_hide" id="control_buttons" style="text-align:right">
|
||||
<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print"> </span>' . $this->lang->line('common_print'); ?></div></a>
|
||||
<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo '<span class="glyphicon glyphicon-print"> </span>' . $this->lang->line('common_print'); ?></div></a>
|
||||
<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", '<span class="glyphicon glyphicon-print"> </span>' . $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
|
||||
<?php if(isset($customer_email) && !empty($customer_email)): ?>
|
||||
<a href="javascript:void(0);"><div class="btn btn-info btn-sm", id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope"> </span>' . $this->lang->line('sales_send_quote'); ?></div></a>
|
||||
<a href="javascript:void(0);"><div class="btn btn-info btn-sm", id="show_email_button"><?php echo '<span class="glyphicon glyphicon-envelope"> </span>' . $this->lang->line('sales_send_quote'); ?></div></a>
|
||||
<?php endif; ?>
|
||||
<?php echo anchor("sales", '<span class="glyphicon glyphicon-shopping-cart"> </span>' . $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
|
||||
<?php echo anchor("sales/discard_quote", '<span class="glyphicon glyphicon-remove"> </span>' . $this->lang->line('sales_discard_quote'), array('class'=>'btn btn-danger btn-sm', 'id'=>'discard_quote_button')); ?>
|
||||
<?php echo anchor("sales/discard_quote", '<span class="glyphicon glyphicon-remove"> </span>' . $this->lang->line('sales_discard_quote'), array('class'=>'btn btn-danger btn-sm', 'id'=>'discard_quote_button')); ?>
|
||||
</div>
|
||||
|
||||
<div id="page-wrap">
|
||||
<div id="header"><?php echo $this->lang->line('sales_quote'); ?></div>
|
||||
<div id="block1">
|
||||
<div id="customer-title">
|
||||
<div id="header"><?php echo $this->lang->line('sales_quote'); ?></div>
|
||||
<div id="block1">
|
||||
<div id="customer-title">
|
||||
<?php
|
||||
if(isset($customer))
|
||||
{
|
||||
?>
|
||||
<textarea id="customer" rows="5" cols="6"><?php echo $customer_info ?></textarea>
|
||||
<?php
|
||||
<textarea id="customer" rows="5" cols="6"><?php echo $customer_info ?></textarea>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="logo">
|
||||
<div id="logo">
|
||||
<?php
|
||||
if($this->Appconfig->get('company_logo') != '')
|
||||
{
|
||||
?>
|
||||
<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />
|
||||
<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<div> </div>
|
||||
<div> </div>
|
||||
<?php
|
||||
if ($this->Appconfig->get('receipt_show_company_name'))
|
||||
{
|
||||
?>
|
||||
{
|
||||
?>
|
||||
<div id="company_name"><?php echo $this->config->item('company'); ?></div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="block2">
|
||||
<textarea id="company-title" rows="5" cols="35"><?php echo $company_info ?></textarea>
|
||||
<table id="meta">
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_quote_number');?> </td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $quote_number; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $transaction_date; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo to_currency($total); ?></textarea></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div id="block2">
|
||||
<textarea id="company-title" rows="5" cols="35"><?php echo $company_info ?></textarea>
|
||||
<table id="meta">
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_quote_number');?> </td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $quote_number; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo $transaction_date; ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
|
||||
<td><textarea rows="5" cols="6"><?php echo to_currency($total); ?></textarea></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<table id="items">
|
||||
<tr>
|
||||
<th><?php echo $this->lang->line('sales_item_number'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_item_name'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_quantity'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_price'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_discount'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_total'); ?></th>
|
||||
</tr>
|
||||
<table id="items">
|
||||
<tr>
|
||||
<th><?php echo $this->lang->line('sales_item_number'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_item_name'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_quantity'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_price'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_discount'); ?></th>
|
||||
<th><?php echo $this->lang->line('sales_total'); ?></th>
|
||||
</tr>
|
||||
<?php
|
||||
foreach($cart as $line=>$item)
|
||||
{
|
||||
?>
|
||||
<tr class="item-row">
|
||||
<td><?php echo $item['item_number']; ?></td>
|
||||
<td class="item-name"><textarea rows="4" cols="6"><?php echo $item['name']; ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo to_quantity_decimals($item['quantity']); ?></textarea></td>
|
||||
<td><textarea rows="4" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo $item['discount'] . '%'; ?></textarea></td>
|
||||
<td style='border-right: solid 1px; text-align:right;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea></td>
|
||||
</tr>
|
||||
|
||||
<?php if($item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']))
|
||||
{
|
||||
?>
|
||||
<tr class="item-row">
|
||||
<td><?php echo $item['item_number']; ?></td>
|
||||
<td class="item-name"><textarea rows="4" cols="6"><?php echo ($item['is_serialized'] || $item['allow_alt_description']) && !empty($item['description']) ? $item['description'] : $item['name']; ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo to_quantity_decimals($item['quantity']); ?></textarea></td>
|
||||
<td><textarea rows="4" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
|
||||
<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo $item['discount'] .'%'; ?></textarea></td>
|
||||
<td style='border-right: solid 1px; text-align:right;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea></td>
|
||||
</tr>
|
||||
<tr class="item-row">
|
||||
<td></td>
|
||||
<td class="item-name"><textarea cols="6"><?php echo $item['description']; ?></textarea></td>
|
||||
<td style='text-align:center;' colspan="4"><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
<tr class="item-row">
|
||||
<td></td>
|
||||
<td class="item-name"><textarea cols="6"><?php echo $item['description']; ?></textarea></td>
|
||||
<td style='text-align:center;' colspan="4"><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td class="blank" colspan="6" align="center"><?php echo ' '; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" class="blank-bottom"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $this->lang->line('sales_sub_total'); ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="subtotal"><?php echo to_currency($subtotal); ?></textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="blank" colspan="6" align="center"><?php echo ' '; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" class="blank-bottom"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $this->lang->line('sales_sub_total'); ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="subtotal"><?php echo to_currency($subtotal); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
foreach($taxes as $tax_group_index=>$sales_tax)
|
||||
{
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $sales_tax['tax_group']; ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="taxes"><?php echo to_currency_tax($sales_tax['sale_tax_amount']); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $sales_tax['tax_group']; ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="taxes"><?php echo to_currency_tax($sales_tax['sale_tax_amount']); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $this->lang->line('sales_total'); ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="total"><?php echo to_currency($total); ?></textarea></td>
|
||||
</tr>
|
||||
</table>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $this->lang->line('sales_total'); ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="total"><?php echo to_currency($total); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
$only_sale_check = FALSE;
|
||||
$show_giftcard_remainder = FALSE;
|
||||
foreach($payments as $payment_id=>$payment)
|
||||
{
|
||||
$only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
|
||||
$splitpayment = explode(':', $payment['payment_type']);
|
||||
$show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3" class="blank"> </td>
|
||||
<td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $splitpayment[0]; ?></textarea></td>
|
||||
<td class="total-value"><textarea rows="5" cols="6" id="paid"><?php echo to_currency( $payment['payment_amount'] ); ?></textarea></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(window).on("load", function()
|
||||
{
|
||||
// install firefox addon in order to use this plugin
|
||||
if (window.jsPrintSetup)
|
||||
{
|
||||
$(window).on("load", function()
|
||||
{
|
||||
// install firefox addon in order to use this plugin
|
||||
if (window.jsPrintSetup)
|
||||
{
|
||||
<?php if (!$this->Appconfig->get('print_header'))
|
||||
{
|
||||
?>
|
||||
// set page header
|
||||
jsPrintSetup.setOption('headerStrLeft', '');
|
||||
jsPrintSetup.setOption('headerStrCenter', '');
|
||||
jsPrintSetup.setOption('headerStrRight', '');
|
||||
// set page header
|
||||
jsPrintSetup.setOption('headerStrLeft', '');
|
||||
jsPrintSetup.setOption('headerStrCenter', '');
|
||||
jsPrintSetup.setOption('headerStrRight', '');
|
||||
<?php
|
||||
}
|
||||
if (!$this->Appconfig->get('print_footer'))
|
||||
{
|
||||
?>
|
||||
// set empty page footer
|
||||
jsPrintSetup.setOption('footerStrLeft', '');
|
||||
jsPrintSetup.setOption('footerStrCenter', '');
|
||||
jsPrintSetup.setOption('footerStrRight', '');
|
||||
// set empty page footer
|
||||
jsPrintSetup.setOption('footerStrLeft', '');
|
||||
jsPrintSetup.setOption('footerStrCenter', '');
|
||||
jsPrintSetup.setOption('footerStrRight', '');
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<?php $this->load->view("partial/footer"); ?>
|
||||
|
||||
@@ -244,7 +244,12 @@ INSERT INTO `ospos_grants` (`permission_id`, `person_id`) VALUES
|
||||
|
||||
UPDATE ospos_items SET receiving_quantity = 1 WHERE receiving_quantity = 0;
|
||||
|
||||
-- fix tax category maintenance
|
||||
-- long alternate description
|
||||
|
||||
ALTER TABLE `ospos_sales_items`
|
||||
MODIFY COLUMN `description` varchar(255) DEFAULT NULL;
|
||||
|
||||
-- fix tax category maintenance
|
||||
|
||||
ALTER TABLE `ospos_tax_categories`
|
||||
MODIFY COLUMN `tax_category_id` int(10) NOT NULL AUTO_INCREMENT;
|
||||
|
||||
@@ -562,7 +562,7 @@ CREATE TABLE `ospos_sales` (
|
||||
CREATE TABLE `ospos_sales_items` (
|
||||
`sale_id` int(10) NOT NULL DEFAULT '0',
|
||||
`item_id` int(10) NOT NULL DEFAULT '0',
|
||||
`description` varchar(30) DEFAULT NULL,
|
||||
`description` varchar(255) DEFAULT NULL,
|
||||
`serialnumber` varchar(30) DEFAULT NULL,
|
||||
`line` int(3) NOT NULL DEFAULT '0',
|
||||
`quantity_purchased` decimal(15,3) NOT NULL DEFAULT '0',
|
||||
|
||||
@@ -562,7 +562,7 @@ CREATE TABLE `ospos_sales` (
|
||||
CREATE TABLE `ospos_sales_items` (
|
||||
`sale_id` int(10) NOT NULL DEFAULT '0',
|
||||
`item_id` int(10) NOT NULL DEFAULT '0',
|
||||
`description` varchar(30) DEFAULT NULL,
|
||||
`description` varchar(255) DEFAULT NULL,
|
||||
`serialnumber` varchar(30) DEFAULT NULL,
|
||||
`line` int(3) NOT NULL DEFAULT '0',
|
||||
`quantity_purchased` decimal(15,3) NOT NULL DEFAULT '0',
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
/* first row */
|
||||
#logo { text-align: right; margin-top: 15px; float: left; position: relative; border: 1px solid #fff; max-height: 150px; overflow: hidden; }
|
||||
#logo img { max-height: 150px; max-width: 150px; }
|
||||
#logo img { max-height: 150px; max-width: 270px; }
|
||||
/*#logo:hover, #logo.edit { border: 1px solid #000; margin-top: 0px; max-height: 125px; }*/
|
||||
#logoctr { display: none; }
|
||||
#logo:hover #logoctr, #logo.edit #logoctr { display: block; text-align: right; line-height: 25px; background: #eee; padding: 0 5px; }
|
||||
@@ -43,6 +43,7 @@
|
||||
#items tr.item-row td { border: 0; vertical-align: top; }
|
||||
#items td.description { width: 300px; }
|
||||
#items td.item-name { width: 175px; }
|
||||
#items td.item-description textarea { height: auto; width: 100%; }
|
||||
#items td.description textarea, #items td.item-name textarea { width: 100%; }
|
||||
#items td.total-line { border-right: 0; text-align: right; }
|
||||
#items td.total-value { border-left: 0; padding: 10px; }
|
||||
|
||||
14
public/dist/opensourcepos.min.css
vendored
14
public/dist/opensourcepos.min.css
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user