mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-25 09:38:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI

Browse Source 
Conflicts:
	application/views/partial/header.php
	application/views/receivings/receiving.php
	application/views/sales/register.php
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
This commit is contained in:
jekkos committed 2016-02-27 18:55:44 +01:00
2 parents 7769334372 d7ff9bed1a
commit fd87c59492
24 files changed
+5629 -2896
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Gruntfile.js
+2 -2
View File
@@ -11,7 +11,7 @@ module.exports = function(grunt) {
bower_concat: {
all: {
mainFiles: {
'bootswatch-dist': ['js/bootstrap.js']
'bootswatch-dist': ['bootstrap/dist/js/bootstrap.js']
},
dest: {
'js': 'dist/opensourcepos_bower.js',
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
},
files: {
'bootstrap.min.css': 'bootswatch-dist/css/bootstrap.min.css'
},
}
}
},
cssmin: {
application/controllers/Config.php
+1 -5
View File
@@ -14,7 +14,6 @@ class Config extends Secure_area
$data['stock_locations'] = $this->Stock_location->get_all()->result_array();
$data['support_barcode'] = $this->barcode_lib->get_list_barcodes();
$this->load->view("configs/manage", $data);
$this->_remove_duplicate_cookies();
}
function save()
@@ -62,7 +61,6 @@ class Config extends Secure_area
$message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully');
$message = $upload_success ? $message : $this->upload->display_errors();
echo json_encode(array('success'=>$success,'message'=>$message));
$this->_remove_duplicate_cookies();
}
function save_locale()
@@ -81,8 +79,7 @@ class Config extends Secure_area
$result = $this->Appconfig->batch_save( $batch_save_data );
$success = $result ? true : false;
echo json_encode(array('success'=>$success, 'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')));
$this->_remove_duplicate_cookies();
}
}
function stock_locations()
{
@@ -127,7 +124,6 @@ class Config extends Secure_area
}
$success = $this->db->trans_complete();
echo json_encode(array('success'=>$success,'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully')));
$this->_remove_duplicate_cookies();
}
function save_barcode()
application/controllers/Item_kits.php
-3
View File
@@ -42,7 +42,6 @@ class Item_kits extends Secure_area implements iData_controller
$data['manage_table'] = get_item_kits_manage_table($item_kits, $this);
$this->load->view('item_kits/manage', $data);
$this->_remove_duplicate_cookies();
}
/*
@@ -65,7 +64,6 @@ class Item_kits extends Secure_area implements iData_controller
}
$data_rows = get_item_kits_manage_table_data_rows($item_kits, $this);
$this->_remove_duplicate_cookies();
echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
}
@@ -88,7 +86,6 @@ class Item_kits extends Secure_area implements iData_controller
$item_kit = $this->add_totals_to_item_kit($this->Item_kit->get_info($item_kit_id));
echo (get_item_kit_data_row($item_kit, $this));
$this->_remove_duplicate_cookies();
}
function view($item_kit_id=-1)
application/controllers/Items.php
+1 -4
View File
@@ -38,7 +38,6 @@ class Items extends Secure_area implements iData_controller
$this->load->view('items/manage', $data);
$this->_remove_duplicate_cookies();
}
function find_item_info()
@@ -83,8 +82,7 @@ class Items extends Secure_area implements iData_controller
$data_rows = get_items_manage_table_data_rows($items, $this);
// do not move this line to be after the json_encode otherwise the searhc function won't work!!
$this->_remove_duplicate_cookies();
echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
}
@@ -265,7 +263,6 @@ class Items extends Secure_area implements iData_controller
echo $data_row;
$this->_remove_duplicate_cookies();
}
function view($item_id=-1)
application/controllers/Receivings.php
-3
View File
@@ -225,7 +225,6 @@ class Receivings extends Secure_area
$this->load->view("receivings/receipt",$data);
$this->receiving_lib->clear_all();
}
$this->_remove_duplicate_cookies();
}
private function _substitute_variable($text, $variable, $object, $function)
@@ -320,7 +319,6 @@ class Receivings extends Secure_area
$data['print_after_sale'] = FALSE;
$this->load->view("receivings/receipt",$data);
$this->receiving_lib->clear_all();
$this->_remove_duplicate_cookies();
}
private function _reload($data=array())
@@ -361,7 +359,6 @@ class Receivings extends Secure_area
$data['invoice_number_enabled']=$this->receiving_lib->is_invoice_number_enabled();
$data['print_after_sale']=$this->receiving_lib->is_print_after_sale();
$this->load->view("receivings/receiving",$data);
$this->_remove_duplicate_cookies();
}
function save($receiving_id)
application/controllers/Sales.php
+39 -50
View File
@@ -65,7 +65,6 @@ class Sales extends Secure_area
$this->load->view($data['controller_name'] . '/manage', $data);
}
$this->_remove_duplicate_cookies();
}
function get_row()
@@ -120,8 +119,7 @@ class Sales extends Secure_area
$payment_summary = get_sales_manage_payments_summary($payments, $sales, $this);
// do not move this line to be after the json_encode otherwise the search function won't work!!
$this->_remove_duplicate_cookies();
echo json_encode(array('total_rows' => $total_rows, 'rows' => $sale_rows, 'pagination' => $links, 'payment_summary' => $payment_summary));
}
@@ -211,11 +209,11 @@ class Sales extends Secure_area
function add_payment()
{
$data = array();
$this->form_validation->set_rules( 'amount_tendered', 'lang:sales_amount_tendered', 'trim|required|numeric' );
$this->form_validation->set_rules('amount_tendered', 'lang:sales_amount_tendered', 'trim|required|numeric');
if ( $this->form_validation->run() == FALSE )
{
if ( $this->input->post( 'payment_type' ) == $this->lang->line( 'sales_gift_card' ) )
if ( $this->input->post('payment_type') == $this->lang->line('sales_gift_card') )
{
$data['error']=$this->lang->line('sales_must_enter_numeric_giftcard');
}
@@ -229,34 +227,34 @@ class Sales extends Secure_area
return;
}
$payment_type = $this->input->post( 'payment_type' );
if ( $payment_type == $this->lang->line( 'sales_giftcard' ) )
$payment_type = $this->input->post('payment_type');
if ( $payment_type == $this->lang->line('sales_giftcard') )
{
$payments = $this->sale_lib->get_payments();
$payment_type = $this->input->post( 'payment_type' ) . ':' . $payment_amount = $this->input->post( 'amount_tendered' );
$current_payments_with_giftcard = isset( $payments[$payment_type] ) ? $payments[$payment_type]['payment_amount'] : 0;
$cur_giftcard_value = $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ) ) - $current_payments_with_giftcard;
$payment_type = $this->input->post('payment_type') . ':' . $payment_amount = $this->input->post('amount_tendered');
$current_payments_with_giftcard = isset($payments[$payment_type]) ? $payments[$payment_type]['payment_amount'] : 0;
$cur_giftcard_value = $this->Giftcard->get_giftcard_value($this->input->post('amount_tendered')) - $current_payments_with_giftcard;
if ( $cur_giftcard_value <= 0 )
{
$data['error'] = $this->lang->line('giftcards_remaining_balance', $this->input->post( 'amount_tendered' ), to_currency( $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ))));
$data['error'] = $this->lang->line('giftcards_remaining_balance', $this->input->post('amount_tendered'), to_currency( $this->Giftcard->get_giftcard_value( $this->input->post('amount_tendered'))));
$this->_reload( $data );
return;
}
$new_giftcard_value = $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ) ) - $this->sale_lib->get_amount_due( );
$new_giftcard_value = $this->Giftcard->get_giftcard_value( $this->input->post('amount_tendered') ) - $this->sale_lib->get_amount_due();
$new_giftcard_value = ( $new_giftcard_value >= 0 ) ? $new_giftcard_value : 0;
$this->sale_lib->set_giftcard_remainder($new_giftcard_value);
$data['warning'] = $this->lang->line('giftcards_remaining_balance', $this->input->post( 'amount_tendered' ), to_currency( $new_giftcard_value, TRUE ));
$payment_amount = min( $this->sale_lib->get_amount_due( ), $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ) ) );
$data['warning'] = $this->lang->line('giftcards_remaining_balance', $this->input->post('amount_tendered'), to_currency( $new_giftcard_value, TRUE ));
$payment_amount = min( $this->sale_lib->get_amount_due( ), $this->Giftcard->get_giftcard_value( $this->input->post('amount_tendered') ) );
}
else
{
$payment_amount = $this->input->post( 'amount_tendered' );
$payment_amount = $this->input->post('amount_tendered');
}
if( !$this->sale_lib->add_payment( $payment_type, $payment_amount ) )
{
$data['error']='Unable to Add Payment! Please try again!';
$data['error'] = 'Unable to Add Payment! Please try again!';
}
$this->_reload($data);
@@ -275,7 +273,7 @@ class Sales extends Secure_area
$mode = $this->sale_lib->get_mode();
$item_id_or_number_or_item_kit_or_receipt = $this->input->post('item');
$quantity = ($mode=="return") ? -1 : 1;
$quantity = ($mode == "return") ? -1 : 1;
$item_location = $this->sale_lib->get_sale_location();
if($mode == 'return' && $this->sale_lib->is_valid_receipt($item_id_or_number_or_item_kit_or_receipt))
@@ -423,7 +421,7 @@ class Sales extends Secure_area
$this->email->subject($this->lang->line('sales_receipt'));
if ($this->config->item('use_invoice_template') && $this->sale_lib->is_invoice_number_enabled())
{
$data['image_prefix']="";
$data['image_prefix'] = "";
$filename = $this->_invoice_email_pdf($data);
$this->email->attach($filename);
$text = $this->config->item('invoice_email_message');
@@ -434,7 +432,7 @@ class Sales extends Secure_area
}
else
{
$this->email->message($this->load->view("sales/receipt_email",$data, true));
$this->email->message($this->load->view("sales/receipt_email", $data, true));
}
$this->email->send();
}
@@ -452,7 +450,6 @@ class Sales extends Secure_area
$this->sale_lib->clear_all();
}
$this->_remove_duplicate_cookies();
}
private function _invoice_email_pdf($data)
@@ -474,7 +471,6 @@ class Sales extends Secure_area
$sale_data['image_prefix'] = base_url();
$this->load->view('sales/invoice_email', $sale_data);
$this->sale_lib->clear_all();
$this->_remove_duplicate_cookies();
}
function send_invoice($sale_id)
@@ -497,13 +493,8 @@ class Sales extends Secure_area
$result = $this->email->send();
$message = $this->lang->line($result ? 'sales_invoice_sent' : 'sales_invoice_unsent') . ' ' . $sale_data["customer_email"];
}
echo json_encode(array(
'success'=>$result,
'message'=>$message,
'id'=>$sale_id)
);
echo json_encode(array('success'=>$result, 'message'=>$message, 'id'=>$sale_id));
$this->sale_lib->clear_all();
$this->_remove_duplicate_cookies();
}
private function _substitute_variable($text, $variable, $object, $function)
@@ -521,16 +512,17 @@ class Sales extends Secure_area
private function _substitute_customer($text, $cust_info)
{
// substitute customer info
$customer_id=$this->sale_lib->get_customer();
if($customer_id!=-1 && $cust_info!='')
$customer_id = $this->sale_lib->get_customer();
if($customer_id != -1 && $cust_info != '')
{
$text=str_replace('$CU',$cust_info->first_name . ' ' . $cust_info->last_name,$text);
$text = str_replace('$CU',$cust_info->first_name . ' ' . $cust_info->last_name,$text);
$words = preg_split("/\s+/", trim($cust_info->first_name . ' ' . $cust_info->last_name));
$acronym = "";
foreach ($words as $w) {
foreach ($words as $w)
{
$acronym .= $w[0];
}
$text=str_replace('$CI',$acronym,$text);
$text = str_replace('$CI',$acronym,$text);
}
return $text;
@@ -538,11 +530,11 @@ class Sales extends Secure_area
private function _substitute_variables($text, $cust_info)
{
$text=$this->_substitute_variable($text, '$YCO', $this->Sale, 'get_invoice_number_for_year');
$text=$this->_substitute_variable($text, '$CO', $this->Sale , 'get_invoice_count');
$text=$this->_substitute_variable($text, '$SCO', $this->Sale_suspended, 'get_invoice_count');
$text=strftime($text);
$text=$this->_substitute_customer($text, $cust_info);
$text = $this->_substitute_variable($text, '$YCO', $this->Sale, 'get_invoice_number_for_year');
$text = $this->_substitute_variable($text, '$CO', $this->Sale , 'get_invoice_count');
$text = $this->_substitute_variable($text, '$SCO', $this->Sale_suspended, 'get_invoice_count');
$text = strftime($text);
$text = $this->_substitute_customer($text, $cust_info);
return $text;
}
@@ -580,7 +572,7 @@ class Sales extends Secure_area
$emp_info = $this->Employee->get_info($employee_id);
$data['amount_change'] = $this->sale_lib->get_amount_due() * -1;
$data['amount_due'] = $this->sale_lib->get_amount_due();
$data['employee'] = $emp_info->first_name.' '.$emp_info->last_name;
$data['employee'] = $emp_info->first_name . ' ' . $emp_info->last_name;
if($customer_id != -1)
{
@@ -625,7 +617,6 @@ class Sales extends Secure_area
$data = $this->_load_sale_data($sale_id);
$this->load->view("sales/receipt",$data);
$this->sale_lib->clear_all();
$this->_remove_duplicate_cookies();
}
function invoice($sale_id, $sale_info='')
@@ -637,7 +628,6 @@ class Sales extends Secure_area
$this->load->view("sales/invoice", $sale_info);
$this->sale_lib->clear_all();
$this->_remove_duplicate_cookies();
}
function edit($sale_id)
@@ -661,13 +651,13 @@ class Sales extends Secure_area
function delete($sale_id = -1, $update_inventory=TRUE)
{
$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
$sale_ids= $sale_id == -1 ? $this->input->post('ids') : array($sale_id);
$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
$sale_ids = $sale_id == -1 ? $this->input->post('ids') : array($sale_id);
if($this->Sale->delete_list($sale_ids, $employee_id, $update_inventory))
{
echo json_encode(array('success'=>true,'message'=>$this->lang->line('sales_successfully_deleted').' '.
count($sale_ids).' '.$this->lang->line('sales_one_or_multiple'),'ids'=>$sale_ids));
echo json_encode(array('success'=>true, 'message'=>$this->lang->line('sales_successfully_deleted').' '.
count($sale_ids).' '.$this->lang->line('sales_one_or_multiple'), 'ids'=>$sale_ids));
}
else
{
@@ -689,7 +679,7 @@ class Sales extends Secure_area
if ($this->Sale->update($sale_data, $sale_id))
{
echo json_encode(array('success'=>true, 'message'=>$this->lang->line('sales_successfully_updated'), 'id'=>$sale_id));
echo json_encode(array('success'=>true, 'message'=>$this->lang->line('sales_successfully_updated'), 'id'=>$sale_id));
}
else
{
@@ -750,7 +740,7 @@ class Sales extends Secure_area
if($customer_id != -1)
{
$cust_info = $this->Customer->get_info($customer_id);
$data['customer'] = $cust_info->first_name.' '.$cust_info->last_name;
$data['customer'] = $cust_info->first_name . ' ' . $cust_info->last_name;
$data['customer_email'] = $cust_info->email;
}
$data['invoice_number'] = $this->_substitute_invoice_number($cust_info);
@@ -758,9 +748,8 @@ class Sales extends Secure_area
$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
$data['payments_cover_total'] = $this->_payments_cover_total();
$this->load->view("sales/register",$data);
$this->load->view("sales/register", $data);
$this->_remove_duplicate_cookies();
}
function cancel_sale()
@@ -776,7 +765,7 @@ class Sales extends Secure_area
$data['taxes'] = $this->sale_lib->get_taxes();
$data['total'] = $this->sale_lib->get_total();
$data['receipt_title'] = $this->lang->line('sales_receipt');
$data['transaction_time'] = date($this->config->item('dateformat').' '.$this->config->item('timeformat'));
$data['transaction_time'] = date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'));
$customer_id = $this->sale_lib->get_customer();
$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
$comment = $this->sale_lib->get_comment();
@@ -810,7 +799,7 @@ class Sales extends Secure_area
}
//SAVE sale to database
$data['sale_id'] = 'POS '.$this->Sale_suspended->save($data['cart'], $customer_id, $employee_id, $comment, $invoice_number, $data['payments']);
$data['sale_id'] = 'POS ' . $this->Sale_suspended->save($data['cart'], $customer_id, $employee_id, $comment, $invoice_number, $data['payments']);
if ($data['sale_id'] == 'POS -1')
{
$data['error_message'] = $this->lang->line('sales_transaction_failed');
application/controllers/Secure_area.php
-52
View File
@@ -61,57 +61,5 @@ class Secure_area extends CI_Controller
return $this->pagination->create_links();
}
function _remove_duplicate_cookies ()
{
//php < 5.3 doesn't have header remove so this function will fatal error otherwise
if (function_exists('header_remove'))
{
$CI = &get_instance();
// clean up all the cookies that are set...
$headers = headers_list();
$cookies_to_output = array ();
$header_session_cookie = '';
$session_cookie_name = $CI->config->item('sess_cookie_name');
foreach ($headers as $header)
{
list ($header_type, $data) = explode (':', $header, 2);
$header_type = trim ($header_type);
$data = trim ($data);
if (strtolower ($header_type) == 'set-cookie')
{
header_remove ('Set-Cookie');
$cookie_value = current(explode (';', $data));
list ($key, $val) = explode ('=', $cookie_value);
$key = trim ($key);
if ($key == $session_cookie_name)
{
// OVERWRITE IT (yes! do it!)
$header_session_cookie = $data;
continue;
}
else
{
// Not a session related cookie, add it as normal. Might be a CSRF or some other cookie we are setting
$cookies_to_output[] = array ('header_type' => $header_type, 'data' => $data);
}
}
}
if ( ! empty ($header_session_cookie))
{
$cookies_to_output[] = array ('header_type' => 'Set-Cookie', 'data' => $header_session_cookie);
}
foreach ($cookies_to_output as $cookie)
{
header ("{$cookie['header_type']}: {$cookie['data']}", false);
}
}
}
}
?>
application/models/Item.php
+1 -1
View File
@@ -682,7 +682,7 @@ class Item extends CI_Model
{
if($old_price === null)
{
$item_info = $this->get_info($item['item_id']);
$item_info = $this->get_info($item_id);
$old_price = $item_info->cost_price;
}
application/views/configs/barcode_config.php
+39 -39
View File
@@ -1,20 +1,20 @@
<div id="page_title"><?php echo $this->lang->line('config_barcode_configuration'); ?></div>
<?php echo form_open('config/save_barcode/',array('id'=>'barcode_config_form', 'class' => 'form-horizontal')); ?>
<?php echo form_open('config/save_barcode/', array('id'=>'barcode_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="barcode_error_message_box" class="error_message_box"></ul>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_type'), 'barcode_type',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_type'), 'barcode_type', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_dropdown('barcode_type', $support_barcode, $this->config->item('barcode_type'), "class='form-control'");?>
<?php echo form_dropdown('barcode_type', $support_barcode, $this->config->item('barcode_type'), array('class'=>'form-control input-sm'));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_quality'), 'barcode_quality',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_quality'), 'barcode_quality', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'max'=>'100',
@@ -22,13 +22,13 @@
'type'=>'number',
'name'=>'barcode_quality',
'id'=>'barcode_quality',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('barcode_quality')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_width'), 'barcode_width',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_width'), 'barcode_width', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'step'=>'5',
@@ -37,13 +37,13 @@
'type'=>'number',
'name'=>'barcode_width',
'id'=>'barcode_width',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('barcode_width')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_height'), 'barcode_height',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_height'), 'barcode_height', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'type' => 'number',
@@ -51,17 +51,17 @@
'max' => 120,
'name'=>'barcode_height',
'id'=>'barcode_height',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('barcode_height')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_font'), 'barcode_font',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_font'), 'barcode_font', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-sm-2'>
<?php echo form_dropdown('barcode_font',
$this->barcode_lib->listfonts("fonts"),
$this->config->item('barcode_font'), "class='form-control'");
$this->barcode_lib->listfonts("fonts"),
$this->config->item('barcode_font'), array('class'=>'form-control input-sm'));
?>
</div>
<div class="col-sm-2">
@@ -71,14 +71,14 @@
'max' => '30',
'name'=>'barcode_font_size',
'id'=>'barcode_font_size',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('barcode_font_size')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_content'), 'barcode_content',array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-6'>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_content'), 'barcode_content', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-8'>
<label class="radio-inline">
<?php echo form_radio(array(
'name'=>'barcode_content',
@@ -103,10 +103,10 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_layout'), 'barcode_layout',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_layout'), 'barcode_layout', array('class'=>'control-label col-xs-2')); ?>
<div class="col-sm-10">
<div class="form-group row">
<div class="form-group form-group-sm row">
<label class="control-label col-sm-1"><?php echo $this->lang->line('config_barcode_first_row').' '; ?></label>
<div class='col-sm-2'>
<?php echo form_dropdown('barcode_first_row', array(
@@ -117,7 +117,7 @@
'unit_price' => 'Unit price',
'company_name' => 'Company Name'
),
$this->config->item('barcode_first_row'), "class='form-control'");
$this->config->item('barcode_first_row'), array('class'=>'form-control input-sm'));
?>
</div>
<label class="control-label col-sm-1"><?php echo $this->lang->line('config_barcode_second_row').' '; ?></label>
@@ -131,11 +131,11 @@
'item_code' => 'Item code',
'company_name' => 'Company Name'
),
$this->config->item('barcode_second_row'), "class='form-control'");
$this->config->item('barcode_second_row'), array('class'=>'form-control input-sm'));
?>
</div>
<label class="control-label col-sm-1"><?php echo $this->lang->line('config_barcode_third_row').' '; ?></label>
<div class='col-sm-3'>
<div class='col-sm-2'>
<?php echo form_dropdown('barcode_third_row', array(
'not_show' => 'Not show',
'name' => 'Name',
@@ -145,48 +145,48 @@
'item_code' => 'Item code',
'company_name' => 'Company Name'
),
$this->config->item('barcode_third_row'), "class='form-control'");
$this->config->item('barcode_third_row'), array('class'=>'form-control input-sm'));
?>
</div>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_number_in_row'), 'barcode_num_in_row',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_number_in_row'), 'barcode_num_in_row', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'barcode_num_in_row',
'id'=>'barcode_num_in_row',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('barcode_num_in_row')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_page_width'), 'barcode_page_width',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_page_width'), 'barcode_page_width', array('class'=>'control-label col-xs-2 required')); ?>
<div class="col-sm-2">
<div class='input-group'>
<?php echo form_input(array(
'name'=>'barcode_page_width',
'id'=>'barcode_page_width',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('barcode_page_width')));?>
<span class="input-group-addon">%</span>
<span class="input-group-addon input-sm">%</span>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_barcode_page_cellspacing'), 'barcode_page_cellspacing',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_page_cellspacing'), 'barcode_page_cellspacing', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-sm-2'>
<div class="input-group">
<?php echo form_input(array(
'name'=>'barcode_page_cellspacing',
'id'=>'barcode_page_cellspacing',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('barcode_page_cellspacing')));?>
<span class="input-group-addon">px</span>
<span class="input-group-addon input-sm">px</span>
</div>
</div>
</div>
application/views/configs/general_config.php
+102 -99
View File
@@ -1,148 +1,151 @@
<div id="page_title"><?php echo $this->lang->line('config_general_configuration'); ?></div>
<?php echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
<?php echo form_open('config/save/', array('id'=>'config_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="error_message_box" class="error_message_box"></ul>
<div class="form-group">
<?php echo form_label($this->lang->line('config_company'), 'company', array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_company'), 'company', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-6'>
<?php echo form_input(array(
'name'=>'company',
'id'=>'company',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('company')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_company_logo'), 'company_logo', array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_company_logo'), 'company_logo', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-6'>
<div class="fileinput fileinput-new" data-provides="fileinput">
<div class="fileinput-new thumbnail" style="width: 200px; height: 200px;">
<img data-src="holder.js/100%x100%" alt="<?php echo $this->lang->line('config_company_logo'); ?>" src="<?php if($this->Appconfig->get('company_logo') != '') echo base_url('uploads/' . $this->Appconfig->get('company_logo')); else echo ''; ?>" style="max-height: 100%; max-width: 100%;">
<img data-src="holder.js/100%x100%" alt="<?php echo $this->lang->line('config_company_logo'); ?>"
src="<?php if($this->Appconfig->get('company_logo') != '') echo base_url('uploads/' . $this->Appconfig->get('company_logo')); else echo ''; ?>"
style="max-height: 100%; max-width: 100%;">
</div>
<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 200px;"></div>
<div>
<span class="btn btn-default btn-sm btn-file">
<span class="fileinput-new"><?php echo $this->lang->line("config_company_select_image"); ?></span>
<span class="fileinput-exists"><?php echo $this->lang->line("config_company_change_image"); ?></span><input type="file" name="company_logo"></span>
<span class="fileinput-exists"><?php echo $this->lang->line("config_company_change_image"); ?></span>
<input type="file" name="company_logo">
</span>
<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("config_company_remove_image"); ?></a>
</div>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_address'), 'address', array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_address'), 'address', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-6'>
<?php echo form_textarea(array(
'name'=>'address',
'id'=>'address',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('address')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_website'), 'website',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_website'), 'website', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-6'>
<?php echo form_input(array(
'name'=>'website',
'id'=>'website',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('website')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('common_email'), 'email',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('common_email'), 'email', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-6'>
<?php echo form_input(array(
'name'=>'email',
'id'=>'email',
'type'=>'email',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('email')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_phone'), 'phone',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_phone'), 'phone', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-6'>
<?php echo form_input(array(
'name'=>'phone',
'id'=>'phone',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('phone')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_fax'), 'fax',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_fax'), 'fax', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-6'>
<?php echo form_input(array(
'name'=>'fax',
'id'=>'fax',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('fax')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('common_return_policy'), 'return_policy',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('common_return_policy'), 'return_policy', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-6'>
<?php echo form_textarea(array(
'name'=>'return_policy',
'id'=>'return_policy',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('return_policy')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_default_tax_rate_1'), 'default_tax_1_rate',array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-sm-2'>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_default_tax_rate_1'), 'default_tax_1_rate', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'default_tax_1_name',
'id'=>'default_tax_1_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('default_tax_1_name')!==FALSE ? $this->config->item('default_tax_1_name') : $this->lang->line('items_sales_tax_1')));?>
</div>
<div class="col-sm-1 input-group">
<div class="col-xs-1 input-group">
<?php echo form_input(array(
'name'=>'default_tax_1_rate',
'id'=>'default_tax_1_rate',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('default_tax_1_rate')));?>
<span class="input-group-addon">%</span>
<span class="input-group-addon input-sm">%</span>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_default_tax_rate_2'), 'default_tax_1_rate',array('class'=>'control-label col-xs-2')); ?>
<div class='col-sm-2'>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_default_tax_rate_2'), 'default_tax_1_rate', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'default_tax_2_name',
'id'=>'default_tax_2_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('default_tax_2_name')!==FALSE ? $this->config->item('default_tax_2_name') : $this->lang->line('items_sales_tax_2')));?>
</div>
<div class="col-sm-1 input-group">
<div class="col-xs-1 input-group">
<?php echo form_input(array(
'name'=>'default_tax_2_rate',
'id'=>'default_tax_2_rate',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('default_tax_2_rate')));?>
<span class="input-group-addon">%</span>
<span class="input-group-addon input-sm">%</span>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_tax_included'), 'tax_included',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_tax_included'), 'tax_included', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_checkbox(array(
'name'=>'tax_included',
@@ -152,47 +155,47 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_default_sales_discount'), 'default_sales_discount',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_default_sales_discount'), 'default_sales_discount', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<div class="input-group">
<?php echo form_input(array(
'name'=>'default_sales_discount',
'id'=>'default_sales_discount',
'class'=>'form-control',
'type'=>'number',
'min'=>0,
'max'=>100,
'value'=>$this->config->item('default_sales_discount')));?>
<span class="input-group-addon">%</span>
</div>
<?php echo form_input(array(
'name'=>'default_sales_discount',
'id'=>'default_sales_discount',
'class'=>'form-control input-sm',
'type'=>'number',
'min'=>0,
'max'=>100,
'value'=>$this->config->item('default_sales_discount')));?>
<span class="input-group-addon input-sm">%</span>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_sales_invoice_format'), 'sales_invoice_format',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_sales_invoice_format'), 'sales_invoice_format', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'sales_invoice_format',
'id'=>'sales_invoice_format',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('sales_invoice_format'))); ?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_recv_invoice_format'), 'recv_invoice_format',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_recv_invoice_format'), 'recv_invoice_format', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'recv_invoice_format',
'id'=>'recv_invoice_format',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('recv_invoice_format'))); ?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_receiving_calculate_average_price'), 'receiving_calculate_average_price',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_receiving_calculate_average_price'), 'receiving_calculate_average_price', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-1'>
<?php echo form_checkbox(array(
'name'=>'receiving_calculate_average_price',
@@ -202,13 +205,13 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_lines_per_page'), 'lines_per_page',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_lines_per_page'), 'lines_per_page', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'lines_per_page',
'id'=>'lines_per_page',
'class'=>'form-control',
'class'=>'form-control input-sm',
'type'=>'number',
'min'=>10,
'max'=>1000,
@@ -216,119 +219,119 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom1'), 'config_custom1',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom1'), 'config_custom1', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom1_name',
'id'=>'custom1_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom1_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom2'), 'config_custom2',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom2'), 'config_custom2', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom2_name',
'id'=>'custom2_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom2_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom3'), 'config_custom3',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom3'), 'config_custom3', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom3_name',
'id'=>'custom3_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom3_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom4'), 'config_custom4',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom4'), 'config_custom4', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom4_name',
'id'=>'custom4_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom4_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom5'), 'config_custom5',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom5'), 'config_custom5', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom5_name',
'id'=>'custom5_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom5_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom6'), 'config_custom6',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom6'), 'config_custom6', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom6_name',
'id'=>'custom6_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom6_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom7'), 'config_custom7',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom7'), 'config_custom7', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom7_name',
'id'=>'custom7_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom7_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom8'), 'config_custom8',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom8'), 'config_custom8', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom8_name',
'id'=>'custom8_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom8_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom9'), 'config_custom9',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom9'), 'config_custom9', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom9_name',
'id'=>'custom9_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom9_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_custom10'), 'config_custom10',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_custom10'), 'config_custom10', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_input(array(
'name'=>'custom10_name',
'id'=>'custom10_name',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('custom10_name')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_backup_database'), 'config_backup_database',array('class'=>'control-label col-xs-2')); ?>
<div class="col-xs-2">
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_backup_database'), 'config_backup_database', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<div id="backup_db" class="btn btn-default btn-sm">
<span style="top:22%;"><?php echo $this->lang->line('config_backup_button'); ?></span>
</div>
application/views/configs/locale_config.php
+61 -60
View File
@@ -1,84 +1,81 @@
<div id="page_title"><?php echo $this->lang->line('config_locale_configuration'); ?></div>
<?php echo form_open('config/save_locale/',array('id'=>'locale_config_form', 'class'=>'form-horizontal')); ?>
<?php echo form_open('config/save_locale/', array('id'=>'locale_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="error_message_box" class="error_message_box"></ul>
<div class="form-group">
<?php echo form_label($this->lang->line('config_currency_symbol'), 'currency_symbol',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_currency_symbol'), 'currency_symbol', array('class'=>'control-label col-xs-2')); ?>
<div class='col-sm-1'>
<?php echo form_input(array(
'name'=>'currency_symbol',
'id'=>'currency_symbol',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('currency_symbol')));?>
</div>
<div class='checkbox col-sm-2'>
<label>
<?php
echo form_checkbox(array(
<?php echo form_checkbox(array(
'name'=>'currency_side',
'id'=>'currency_side',
'value'=>'currency_side',
'checked'=>$this->config->item('currency_side')));?><?php echo $this->lang->line('config_currency_side');?>
'checked'=>$this->config->item('currency_side')));?>
<?php echo $this->lang->line('config_currency_side');?>
</label>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_number_format'), 'number_format',array('class'=>'control-label col-xs-2')); ?>
<div class="col-sm-10">
<div class="form-group row">
<label class="control-label col-sm-2"><?php echo $this->lang->line('config_thousands_separator'); ?></label>
<div class='col-sm-2'>
<?php echo form_dropdown('thousands_separator', array(
'&apos;' => '&apos; (apostrophe)',
',' => ', (comma)',
'.' => '. (dot)',
'' => '(none)'
),
$this->config->item('thousands_separator'), "class='form-control'");
?>
</div>
<label class="control-label col-sm-1"><?php echo $this->lang->line('config_decimal_point'); ?></label>
<div class="col-sm-2">
<?php echo form_dropdown('decimal_point', array(
'.' => '. (dot)',
',' => ', (comma)'
),
$this->config->item('decimal_point'), "class='form-control'");
?>
</div>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_language'), 'language',array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-6'>
<?php echo form_dropdown('language', array(
'en' => 'English',
'es' => 'Spanish',
'ru' => 'Russian',
'nl-BE' => 'Dutch (Belgium)',
'de-CH' => 'German (Swiss)',
'zh' => 'Chinese',
'id' => 'Indonesian',
'fr' => 'French',
'th' => 'Thai',
'tr' => 'Turkish'
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_decimal_point'), 'language', array('class'=>'control-label col-xs-2')); ?>
<div class='col-sm-2'>
<?php echo form_dropdown('decimal_point', array(
'.' => '. (dot)',
',' => ', (comma)'
),
$this->config->item('language'), "class='form-control'");
$this->config->item('decimal_point'), array('class'=>'form-control input-sm'));
?>
</div>
</div>
<div class="form-group">
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_thousands_separator'), 'language', array('class'=>'control-label col-xs-2')); ?>
<div class='col-sm-2'>
<?php echo form_dropdown('thousands_separator', array(
'&apos;' => '&apos; (apostrophe)',
',' => ', (comma)',
'.' => '. (dot)',
'' => '(none)'
),
$this->config->item('thousands_separator'), array('class'=>'form-control input-sm'));
?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_language'), 'language', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-4'>
<?php echo form_dropdown('language', array(
'en' => 'English',
'es' => 'Spanish',
'ru' => 'Russian',
'nl-BE' => 'Dutch (Belgium)',
'de-CH' => 'German (Swiss)',
'zh' => 'Chinese',
'id' => 'Indonesian',
'fr' => 'French',
'th' => 'Thai',
'tr' => 'Turkish'
),
$this->config->item('language'), array('class'=>'form-control input-sm'));
?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_timezone'), 'timezone',array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-6'>
<div class='col-xs-4'>
<?php echo form_dropdown('timezone',
array(
'Pacific/Midway'=>'(GMT-11:00) Midway Island, Samoa',
@@ -172,12 +169,13 @@
'Pacific/Chatham'=>'(GMT+12:45) Chatham Islands',
'Pacific/Tongatapu'=>'(GMT+13:00) Nuku\'alofa',
'Pacific/Kiritimati'=>'(GMT+14:00) Kiritimati'
), $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get(), "class='form-control'");
),
$this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get(), array('class'=>'form-control input-sm'));
?>
</div>
</div>
<div class="form-group">
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_datetimeformat'), 'datetimeformat', array('class'=>'control-label col-xs-2')); ?>
<div class='col-sm-2'>
<?php echo form_dropdown('dateformat', array(
@@ -187,16 +185,18 @@
'Y/m/d' => 'yyyy/mm/dd',
'd/m/y' => 'dd/mm/yy',
'm/d/y' => 'mm/dd/yy',
'y/m/d' => 'yy/mm/dd'),
$this->config->item('dateformat'), "class='form-control'");
'y/m/d' => 'yy/mm/dd'
),
$this->config->item('dateformat'), array('class'=>'form-control input-sm'));
?>
</div>
<div class='col-sm-2'>
<?php echo form_dropdown('timeformat', array(
'H:i:s' => 'hh:mm:ss (24h)',
'h:i:s a' => 'hh:mm:ss am/pm',
'h:i:s A' => 'hh:mm:ss AM/PM'),
$this->config->item('timeformat'), "class='form-control'");
'h:i:s A' => 'hh:mm:ss AM/PM'
),
$this->config->item('timeformat'), array('class'=>'form-control input-sm'));
?>
</div>
</div>
@@ -206,7 +206,8 @@
'name'=>'submit_form',
'id'=>'submit_form',
'value'=>$this->lang->line('common_submit'),
'class'=>'btn btn-primary btn-sm pull-right')
'class'=>'btn btn-primary btn-sm pull-right'
)
);
?>
</fieldset>
application/views/configs/receipt_config.php
+39 -39
View File
@@ -1,13 +1,13 @@
<div id="page_title"><?php echo $this->lang->line('config_receipt_configuration'); ?></div>
<?php echo form_open('config/save_receipt/',array('id'=>'receipt_config_form', 'class'=>'form-horizontal')); ?>
<?php echo form_open('config/save_receipt/', array('id'=>'receipt_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="receipt_error_message_box" class="error_message_box"></ul>
<div class="form-group">
<?php echo form_label($this->lang->line('config_use_invoice_template'), 'use_invoice_template',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_use_invoice_template'), 'use_invoice_template', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-1'>
<?php echo form_checkbox(array(
'name'=>'use_invoice_template',
@@ -17,30 +17,30 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_invoice_default_comments'), 'invoice_default_comments',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_invoice_default_comments'), 'invoice_default_comments', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-5'>
<?php echo form_textarea(array(
'name'=>'invoice_default_comments',
'id'=>'invoice_default_comments',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('invoice_default_comments')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_invoice_email_message'), 'invoice_email_message',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_invoice_email_message'), 'invoice_email_message', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-5'>
<?php echo form_textarea(array(
'name'=>'invoice_email_message',
'id'=>'invoice_email_message',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('invoice_email_message')));?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_receipt_show_taxes'), 'receipt_show_taxes',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_receipt_show_taxes'), 'receipt_show_taxes', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-1'>
<?php echo form_checkbox(array(
'name'=>'receipt_show_taxes',
@@ -50,8 +50,8 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_show_total_discount'), 'show_total_discount',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_show_total_discount'), 'show_total_discount', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-1'>
<?php echo form_checkbox(array(
'name'=>'show_total_discount',
@@ -61,8 +61,8 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_print_silently'), 'print_silently',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_print_silently'), 'print_silently', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-1'>
<?php echo form_checkbox(array(
'name'=>'print_silently',
@@ -72,8 +72,8 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_print_header'), 'print_header',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_print_header'), 'print_header', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-1'>
<?php echo form_checkbox(array(
'name'=>'print_header',
@@ -83,8 +83,8 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_print_footer'), 'print_footer',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_print_footer'), 'print_footer', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-1'>
<?php echo form_checkbox(array(
'name'=>'print_footer',
@@ -94,8 +94,8 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_receipt_printer'), 'config_receipt_printer',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_receipt_printer'), 'config_receipt_printer', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_dropdown(
'receipt_printer',
@@ -104,15 +104,15 @@
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_invoice_printer'), 'config_invoice_printer',array('class'=>'control-label col-xs-2')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_invoice_printer'), 'config_invoice_printer', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_dropdown('invoice_printer', array(), ' ','id="invoice_printer" class="form-control"');?>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_print_top_margin'), 'print_top_margin',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_print_top_margin'), 'print_top_margin', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<div class="input-group">
<?php echo form_input(array(
@@ -121,15 +121,15 @@
'max'=>'20',
'name'=>'print_top_margin',
'id'=>'print_top_margin',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('print_top_margin')));?>
<span class="input-group-addon">px</span>
<span class="input-group-addon input-sm">px</span>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_print_left_margin'), 'print_left_margin',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_print_left_margin'), 'print_left_margin', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<div class="input-group">
<?php echo form_input(array(
@@ -138,15 +138,15 @@
'max'=>'20',
'name'=>'print_left_margin',
'id'=>'print_left_margin',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('print_left_margin')));?>
<span class="input-group-addon">px</span>
<span class="input-group-addon input-sm">px</span>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_print_bottom_margin'), 'print_bottom_margin',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_print_bottom_margin'), 'print_bottom_margin', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<div class="input-group">
<?php echo form_input(array(
@@ -155,15 +155,15 @@
'max'=>'20',
'name'=>'print_bottom_margin',
'id'=>'print_bottom_margin',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('print_bottom_margin')));?>
<span class="input-group-addon">px</span>
<span class="input-group-addon input-sm">px</span>
</div>
</div>
</div>
<div class="form-group">
<?php echo form_label($this->lang->line('config_print_right_margin'), 'print_right_margin',array('class'=>'control-label col-xs-2 required')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_print_right_margin'), 'print_right_margin', array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<div class="input-group">
<?php echo form_input(array(
@@ -172,9 +172,9 @@
'max'=>'20',
'name'=>'print_right_margin',
'id'=>'print_right_margin',
'class'=>'form-control',
'class'=>'form-control input-sm',
'value'=>$this->config->item('print_right_margin')));?>
<span class="input-group-addon">px</span>
<span class="input-group-addon input-sm">px</span>
</div>
</div>
</div>
application/views/configs/stock_config.php
+2 -2
View File
@@ -1,6 +1,6 @@
<div id="page_title"><?php echo $this->lang->line('config_location_configuration'); ?></div>
<?php echo form_open('config/save_locations/',array('id'=>'location_config_form', 'class'=>'form-horizontal')); ?>
<?php echo form_open('config/save_locations/', array('id'=>'location_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
@@ -50,7 +50,7 @@ $(document).ready(function()
var new_block = block.insertAfter($(this).parent());
var new_block_id = 'stock_location_' + ++id;
$(new_block).find('label').html("<?php echo $this->lang->line('config_stock_location'); ?> " + ++location_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2');
$(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control').val('');
$(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val('');
hide_show_remove();
};
application/views/partial/header.php
+5 -2
View File
@@ -14,6 +14,7 @@
<link rel="stylesheet" href="bower_components/smalot-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
<link rel="stylesheet" href="bower_components/bootstrap-select/dist/css/bootstrap-select.css" />
<link rel="stylesheet" href="bower_components/bootstrap-table/src/bootstrap-table.css" />
<link rel="stylesheet" href="bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
@@ -44,6 +45,8 @@
<script src="bower_components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script src="bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
<script src="bower_components/bootstrap-table/src/bootstrap-table.js"></script>
<script src="bower_components/moment/moment.js"></script>
<script src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
@@ -62,10 +65,10 @@
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=5fec5e7eed"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1d6d6ab1bf"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=feafb77ba5" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=823dd80c20" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
application/views/partial/stock_locations.php
+27 -20
View File
@@ -1,20 +1,27 @@
<?php $i = 0; ?>
<?php foreach($stock_locations as $location => $location_data ) { ?>
<?php $location_id = $location_data['location_id']; ?>
<?php $location_name = $location_data['location_name']; ?>
<div class="form-group" style="<?php echo $location_data['deleted'] ? 'display:none;' : 'display:block;' ?>">
<?php echo form_label($this->lang->line('config_stock_location').' ' .++$i, 'stock_location_'.$i ,array('class'=>'required control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php $form_data = array(
'name'=>'stock_location_'.$location_id,
'id'=>'stock_location_'.$location_id,
'class'=>'stock_location valid_chars required form-control',
'value'=>$location_name);
$location_data['deleted'] && $form_data['disabled'] = 'disabled';
echo form_input($form_data);
?>
</div>
<img class="add_stock_location" src="<?php echo base_url('images/plus.png'); ?>" />
<img class="remove_stock_location" src="<?php echo base_url('images/minus.png'); ?>" />
</div>
<?php } ?>
<?php
$i = 0;
foreach($stock_locations as $location => $location_data)
{
$location_id = $location_data['location_id'];
$location_name = $location_data['location_name'];
?>
<div class="form-group form-group-sm" style="<?php echo $location_data['deleted'] ? 'display:none;' : 'display:block;' ?>">
<?php echo form_label($this->lang->line('config_stock_location') . ' ' . ++$i, 'stock_location_' . $i, array('class'=>'control-label col-xs-2 required')); ?>
<div class='col-xs-2'>
<?php $form_data = array(
'name'=>'stock_location_' . $location_id,
'id'=>'stock_location_' . $location_id,
'class'=>'stock_location valid_chars form-control input-sm required',
'value'=>$location_name
);
$location_data['deleted'] && $form_data['disabled'] = 'disabled';
echo form_input($form_data);
?>
</div>
<img class="add_stock_location" src="<?php echo base_url('images/plus.png'); ?>" />
<img class="remove_stock_location" src="<?php echo base_url('images/minus.png'); ?>" />
</div>
<?php
}
?>
application/views/receivings/receiving.php
+48 -34
View File
@@ -10,47 +10,61 @@ if (isset($error))
?>
<div id="register_wrapper">
<?php echo form_open("receivings/change_mode", array('id'=>'mode_form')); ?>
<label><?php echo $this->lang->line('recvs_mode') ?></label>
<?php
echo form_dropdown('mode', $modes, $mode, 'onchange="$(\'#mode_form\').submit();"');
if ($show_stock_locations)
{
echo $this->lang->line('recvs_stock_source');
echo form_dropdown('stock_source', $stock_locations, $stock_source, 'onchange="$(\'#mode_form\').submit();"');
<?php echo form_open("receivings/change_mode", array('id'=>'mode_form', 'class'=>'form-horizontal panel panel-default')); ?>
<div class="panel-body form-group-sm">
<label class='col-sm-2 control-label'><?php echo $this->lang->line('recvs_mode'); ?></label>
<div class="col-sm-2">
<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</div>
if($mode=='requisition')
<?php
if ($show_stock_locations)
{
echo $this->lang->line('recvs_stock_destination');
echo form_dropdown('stock_destination', $stock_locations, $stock_destination, 'onchange="$(\'#mode_form\').submit();"');
}
}
?>
<?php echo form_close(); ?>
<?php echo form_open("receivings/add",array('id'=>'add_item_form')); ?>
<label id="item_label" for="item">
?>
<label class='col-sm-2 control-label'><?php echo $this->lang->line('recvs_stock_source'); ?></label>
<div class="col-sm-2">
<?php echo form_dropdown('stock_source', $stock_locations, $stock_source, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</div>
<?php
if($mode=='requisition')
{
?>
<label class='col-sm-2 control-label'><?php echo $this->lang->line('recvs_stock_destination'); ?></label>
<div class="col-sm-2">
<?php echo form_dropdown('stock_destination', $stock_locations, $stock_destination, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</div>
<?php
if($mode=='receive' or $mode=='requisition')
{
echo $this->lang->line('recvs_find_or_scan_item');
}
else
{
echo $this->lang->line('recvs_find_or_scan_item_or_receipt');
}
}
?>
</label>
<?php
echo form_input(array('name'=>'item','id'=>'item','size'=>'40'));
echo anchor("items/view/-1/width:450", $this->lang->line('sales_new_item'),
array('class'=>'btn btn-info btn-sm pull-right modal-dlg modal-btn-submit modal-btn-new', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item')));
?>
</div>
<?php echo form_close(); ?>
<?php echo form_open("receivings/add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
<div class="panel-body form-group-sm">
<label id="item_label" for="item", class='col-sm-2 control-label'>
<?php
if($mode=='receive' or $mode=='requisition')
{
echo $this->lang->line('recvs_find_or_scan_item');
}
else
{
echo $this->lang->line('recvs_find_or_scan_item_or_receipt');
}
?>
</label>
<div class="col-sm-6">
<?php echo form_input(array('name'=>'item', 'id'=>'item', 'class'=>'form-control input-sm', 'tabindex'=>'1')); ?>
</div>
<?php echo anchor("items/view/-1", $this->lang->line('sales_new_item'),
array('class'=>'btn btn-info btn-sm pull-right modal-dlg modal-btn-submit modal-btn-new', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item'))); ?>
</div>
<?php echo form_close(); ?>
<!-- Receiving Items List -->
<table id="register">
application/views/sales/register.php
+41 -30
View File
@@ -20,36 +20,48 @@ if (isset($success))
?>
<div id="register_wrapper">
<?php echo form_open("sales/change_mode", array('id'=>'mode_form')); ?>
<label id="mode_label"><?php echo $this->lang->line('sales_mode') ?></label>
<?php
echo form_dropdown('mode', $modes, $mode, 'onchange="$(\'#mode_form\').submit();"');
<?php echo form_open("sales/change_mode", array('id'=>'mode_form', 'class'=>'form-horizontal panel panel-default')); ?>
<div class="panel-body form-group-sm">
<label class='col-sm-2 control-label'><?php echo $this->lang->line('sales_mode'); ?></label>
<div class="col-sm-2">
<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</div>
if (count($stock_locations) > 1)
{
echo $this->lang->line('sales_stock_location');
echo form_dropdown('stock_location', $stock_locations, $stock_location, 'onchange="$(\'#mode_form\').submit();"');
}
<?php
if (count($stock_locations) > 1)
{
?>
<label class='col-sm-2 control-label'><?php echo $this->lang->line('sales_stock_location'); ?></label>
<div class="col-sm-2">
<?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</div>
<?php
}
?>
echo anchor("sales/suspended", $this->lang->line('sales_suspended_sales'),
array('class'=>'btn btn-default btn-sm pull-right modal-dlg none', 'id'=>'show_suspended_sales_button', 'title'=>$this->lang->line('sales_suspended_sales')));
if ($this->Employee->has_grant('reports_sales', $this->session->userdata('person_id')))
{
echo anchor("sales/manage", $this->lang->line('sales_takings'),
array('class'=>'btn btn-primary btn-sm pull-right', 'id'=>'sales_takings_button', 'title'=>$this->lang->line('sales_takings')));
}
?>
<?php anchor("sales/suspended", $this->lang->line('sales_suspended_sales'),
array('class'=>'btn btn-default btn-sm pull-right modal-dlg none', 'id'=>'show_suspended_sales_button', 'title'=>$this->lang->line('sales_suspended_sales'))); ?>
<?php
if ($this->Employee->has_grant('reports_sales', $this->session->userdata('person_id')))
{
echo anchor("sales/manage", $this->lang->line('sales_takings'),
array('class'=>'btn btn-primary btn-sm pull-right', 'id'=>'sales_takings_button', 'title'=>$this->lang->line('sales_takings')));
}
?>
</div>
<?php echo form_close(); ?>
<?php echo form_open("sales/add", array('id'=>'add_item_form')); ?>
<label id="item_label" for="item"><?php echo $this->lang->line('sales_find_or_scan_item_or_receipt'); ?></label>
<?php
echo form_input(array('name'=>'item', 'id'=>'item', 'size'=>'40', 'tabindex'=>'1'));
<?php echo form_open("sales/add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
<div class="panel-body form-group-sm">
<label id="item_label" for="item", class='col-sm-2 control-label'><?php echo $this->lang->line('sales_find_or_scan_item_or_receipt'); ?></label>
<div class="col-sm-6">
<?php echo form_input(array('name'=>'item', 'id'=>'item', 'class'=>'form-control input-sm', 'tabindex'=>'1')); ?>
</div>
echo anchor("items/view/-1", $this->lang->line('sales_new_item'),
array('class'=>'btn btn-info btn-sm pull-right modal-dlg modal-btn-new modal-btn-submit', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item')));
?>
<?php anchor("items/view/-1", $this->lang->line('sales_new_item'),
array('class'=>'btn btn-info btn-sm pull-right modal-dlg modal-btn-new modal-btn-submit', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item'))); ?>
</div>
<?php echo form_close(); ?>
<!-- Sale Items List -->
@@ -265,7 +277,7 @@ if (isset($success))
?>
<div id="finish_sale">
<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'value'=>$comment, 'rows'=>'4', 'cols'=>'23'));?>
<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'value'=>$comment, 'rows'=>'4', 'cols'=>'23')); ?>
<br />
<br />
<?php
@@ -286,7 +298,7 @@ if (isset($success))
}
?>
</div>
<?php
<?php
echo form_close();
}
?>
@@ -451,8 +463,7 @@ $(document).ready(function()
var clear_fields = function()
{
if ($(this).val().match("<?php echo $this->lang->line('sales_start_typing_item_name') . '|' .
$this->lang->line('sales_start_typing_customer_name'); ?>"))
if ($(this).val().match("<?php echo $this->lang->line('sales_start_typing_item_name') . '|' . $this->lang->line('sales_start_typing_customer_name'); ?>"))
{
$(this).val('');
}
@@ -552,7 +563,7 @@ $(document).ready(function()
}
});
$( "#finish_sale_button" ).keypress(function( event ) {
$("#finish_sale_button").keypress(function( event ) {
if ( event.which == 13 ) {
if (confirm('<?php echo $this->lang->line("sales_confirm_finish_sale"); ?>'))
{
bower.json
+3 -2
View File
@@ -29,7 +29,7 @@
"jquery-color": "~2.1.2",
"jquery-form": "~3.46.0",
"jquery-validate": "~1.13.1",
"jquery": "~1.12.0",
"jquery": "~1.12.1",
"jquery-ui": "1.11.4",
"swfobject": "*",
"tablesorter": "jquery.tablesorter#^2.20.1",
@@ -38,7 +38,8 @@
"bootswatch-dist": "3.3.6-flatly",
"smalot-bootstrap-datetimepicker": "^2.3.8",
"bootstrap-select": "^1.10.0",
"bootstrap-table": "^1.10.1"
"bootstrap-table": "^1.10.1",
"bootstrap-daterangepicker": "^2.1.18"
},
"overrides": {
"bootswatch-dist": {
css/register.css
+10 -32
View File
@@ -7,32 +7,17 @@
#mode_form, #add_item_form
{
position: relative;
width: 100%;
padding: 10px 5px 10px 5px;
margin: 0;
}
#mode_form .panel-body, #add_item_form .panel-body
{
padding: 10px;
}
#mode_form
{
background-color: #DDD;
padding-bottom: 15px;
}
#mode_form label
{
font-weight: bold;
margin: 0px 5px 0px 5px;
}
#sales_takings_button, #show_suspended_sales_button, #new_item_button
{
position: relative;
bottom: 4px;
}
#sales_takings_button
{
margin-right: 5px;
}
#add_item_form
@@ -40,21 +25,14 @@
background-color: #BBB;
}
#add_item_form input
#item_label
{
border: 1px solid #CCC;
padding: 2px;
padding-top: 0;
}
#add_item_form label
#sales_takings_button
{
font-weight: bold;
margin: 0px 5px 0px 5px;
}
#customer_label
{
font-weight: bold;
margin-right: 5px;
}
#register
css/tables.css
-4
View File
@@ -3,8 +3,6 @@
background-color: transparent;
height: 30px;
position: relative;
//background-color: #EEEEEE;
}
#search_filter_section
@@ -13,8 +11,6 @@
margin-bottom: 10px;
background-color: transparent;
position: relative;
//background-color: #EEEEEE;
}
#table_action_header
dist/opensourcepos.js
Vendored
+5166 -2382
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.css
Vendored
+4 -4
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.js
Vendored
+33 -25
View File
File diff suppressed because one or more lines are too long.
templates/spacelab/views/partial/header.php
+5 -2
View File
@@ -14,6 +14,7 @@
<link rel="stylesheet" href="../bower_components/smalot-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
<link rel="stylesheet" href="../bower_components/bootstrap-select/dist/css/bootstrap-select.css" />
<link rel="stylesheet" href="../bower_components/bootstrap-table/src/bootstrap-table.css" />
<link rel="stylesheet" href="../bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
@@ -44,6 +45,8 @@
<script src="../bower_components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script src="../bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
<script src="../bower_components/bootstrap-table/src/bootstrap-table.js"></script>
<script src="../bower_components/moment/moment.js"></script>
<script src="../bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
@@ -62,11 +65,11 @@
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=5fec5e7eed"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1d6d6ab1bf"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=feafb77ba5" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=823dd80c20" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>