mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-18 21:40:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
FrancescoUK
2017-08-05 16:17:06 +01:00
parent 36177d1431
commit 3b0df85f69
12 changed files with 367 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
application/libraries/Barcode_lib.php
View File

@@ -51,23 +51,29 @@ class Barcode_lib
return $data;
}
function parse_barcode_fields(&$quantity, &$item_id_or_number_or_item_kit_or_receipt)
public function parse_barcode_fields(&$quantity, &$item_id_or_number_or_item_kit_or_receipt)
{
$barcode_formats = json_decode($this->CI->config->item('barcode_formats'));
foreach($barcode_formats as $barcode_format)
if(!empty($barcode_formats))
{
if (preg_match("/$barcode_format/", $item_id_or_number_or_item_kit_or_receipt, $matches) && sizeof($matches) > 1)
foreach($barcode_formats as $barcode_format)
{
$qtyfirst = strpos('d', $barcode_format) - strpos('w', $barcode_format) < 0;
$quantity = $matches[$qtyfirst ? 1 : 2];
if (strstr($barcode_format, '02'))
if(preg_match("/$barcode_format/", $item_id_or_number_or_item_kit_or_receipt, $matches) && sizeof($matches) > 1)
{
$quantity = $quantity / 1000;
$qtyfirst = strpos('d', $barcode_format) - strpos('w', $barcode_format) < 0;
$quantity = $matches[$qtyfirst ? 1 : 2];
if(strstr($barcode_format, '02'))
{
$quantity = $quantity / 1000;
}
$item_id_or_number_or_item_kit_or_receipt = $matches[$qtyfirst ? 2 : 1];
return;
}
$item_id_or_number_or_item_kit_or_receipt = $matches[$qtyfirst ? 2 : 1];
return TRUE;
}
}
$quantity = 1;
}

492
application/views/configs/barcode_config.php
View File

@@ -1,19 +1,19 @@
<?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 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 form-group-sm">
<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'>
<div class='col-xs-2'>
<?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 form-group-sm">
</div>
</div>
<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'>
<div class='col-xs-2'>
<?php echo form_input(array(
'max' => '100',
'min' => '10',
@@ -22,12 +22,12 @@
'id' => 'barcode_quality',
'class' => 'form-control input-sm required',
'value'=>$this->config->item('barcode_quality'))); ?>
</div>
</div>
<div class="form-group form-group-sm">
</div>
</div>
<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'>
<div class='col-xs-2'>
<?php echo form_input(array(
'step' => '5',
'max' => '350',
@@ -37,12 +37,12 @@
'id' => 'barcode_width',
'class' => 'form-control input-sm required',
'value'=>$this->config->item('barcode_width'))); ?>
</div>
</div>
</div>
</div>
<div class="form-group form-group-sm">
<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'>
<div class='col-xs-2'>
<?php echo form_input(array(
'type' => 'number',
'min' => 10,
@@ -51,250 +51,250 @@
'id' => 'barcode_height',
'class' => 'form-control input-sm required',
'value'=>$this->config->item('barcode_height'))); ?>
</div>
</div>
<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'), array('class' => 'form-control input-sm required'));
?>
</div>
<div class="col-sm-2">
<?php echo form_input(array(
'type' => 'number',
'min' => '1',
'max' => '30',
'name' => 'barcode_font_size',
'id' => 'barcode_font_size',
'class' => 'form-control input-sm required',
'value'=>$this->config->item('barcode_font_size'))); ?>
</div>
</div>
<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',
'value' => 'id',
'checked'=>$this->config->item('barcode_content') === "id")); ?>
<?php echo $this->lang->line('config_barcode_id'); ?>
</label>
<label class="radio-inline">
<?php echo form_radio(array(
'name' => 'barcode_content',
'value' => 'number',
'checked'=>$this->config->item('barcode_content') === "number")); ?>
<?php echo $this->lang->line('config_barcode_number'); ?>
</label>
&nbsp
&nbsp
<label class="checkbox-inline">
<?php echo form_checkbox(array(
'name' => 'barcode_generate_if_empty',
'value' => 'barcode_generate_if_empty',
'checked'=>$this->config->item('barcode_generate_if_empty'))); ?>
<?php echo $this->lang->line('config_barcode_generate_if_empty'); ?>
</label>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_formats'), 'barcode_formats', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-4'>
<?php
$barcode_formats = json_decode($this->config->item('barcode_formats'));
echo form_dropdown(array(
'name' => 'barcode_formats[]',
'id' => 'barcode_formats',
'options' => !empty($barcode_formats) ? array_combine($barcode_formats, $barcode_formats) : array(),
'multiple' => 'multiple',
'data-role' => 'tagsinput'));?>
</div>
</div>
<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'), array('class' => 'form-control input-sm required'));
?>
</div>
<div class="col-sm-2">
<?php echo form_input(array(
'type' => 'number',
'min' => '1',
'max' => '30',
'name' => 'barcode_font_size',
'id' => 'barcode_font_size',
'class' => 'form-control input-sm required',
'value'=>$this->config->item('barcode_font_size'))); ?>
</div>
</div>
<div class="form-group form-group-sm">
<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',
'value' => 'id',
'checked'=>$this->config->item('barcode_content') === "id")); ?>
<?php echo $this->lang->line('config_barcode_id'); ?>
</label>
<label class="radio-inline">
<?php echo form_radio(array(
'name' => 'barcode_content',
'value' => 'number',
'checked'=>$this->config->item('barcode_content') === "number")); ?>
<?php echo $this->lang->line('config_barcode_number'); ?>
</label>
&nbsp
&nbsp
<label class="checkbox-inline">
<?php echo form_checkbox(array(
'name' => 'barcode_generate_if_empty',
'value' => 'barcode_generate_if_empty',
'checked'=>$this->config->item('barcode_generate_if_empty'))); ?>
<?php echo $this->lang->line('config_barcode_generate_if_empty'); ?>
</label>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_barcode_formats'), 'barcode_formats', array('class'=>'control-label col-xs-2')); ?>
<div class='col-xs-4'>
<?php
$barcode_formats = json_decode($this->config->item('barcode_formats'));
echo form_dropdown(array(
'name' => 'barcode_formats[]',
'id' => 'barcode_formats',
'options' => !empty($barcode_formats) ? array_combine($barcode_formats, $barcode_formats) : array(),
'multiple' => 'multiple',
'data-role' => 'tagsinput'));?>
</div>
</div>
<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 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(
'not_show' => $this->lang->line('config_none'),
'name' => $this->lang->line('items_name'),
'category' => $this->lang->line('items_category'),
'cost_price' => $this->lang->line('items_cost_price'),
'unit_price' => $this->lang->line('items_unit_price'),
'company_name' => $this->lang->line('suppliers_company_name')
),
$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>
<div class='col-sm-2'>
<?php echo form_dropdown('barcode_second_row', array(
'not_show' => $this->lang->line('config_none'),
'name' => $this->lang->line('items_name'),
'category' => $this->lang->line('items_category'),
'cost_price' => $this->lang->line('items_cost_price'),
'unit_price' => $this->lang->line('items_unit_price'),
'item_code' => $this->lang->line('items_item_number'),
'company_name' => $this->lang->line('suppliers_company_name')
),
$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-2'>
<?php echo form_dropdown('barcode_third_row', array(
'not_show' => $this->lang->line('config_none'),
'name' => $this->lang->line('items_name'),
'category' => $this->lang->line('items_category'),
'cost_price' => $this->lang->line('items_cost_price'),
'unit_price' => $this->lang->line('items_unit_price'),
'item_code' => $this->lang->line('items_item_number'),
'company_name' => $this->lang->line('suppliers_company_name')
),
$this->config->item('barcode_third_row'), array('class' => 'form-control input-sm')); ?>
</div>
</div>
</div>
</div>
<div class="form-group form-group-sm">
<div class="col-sm-10">
<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(
'not_show' => $this->lang->line('config_none'),
'name' => $this->lang->line('items_name'),
'category' => $this->lang->line('items_category'),
'cost_price' => $this->lang->line('items_cost_price'),
'unit_price' => $this->lang->line('items_unit_price'),
'company_name' => $this->lang->line('suppliers_company_name')
),
$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>
<div class='col-sm-2'>
<?php echo form_dropdown('barcode_second_row', array(
'not_show' => $this->lang->line('config_none'),
'name' => $this->lang->line('items_name'),
'category' => $this->lang->line('items_category'),
'cost_price' => $this->lang->line('items_cost_price'),
'unit_price' => $this->lang->line('items_unit_price'),
'item_code' => $this->lang->line('items_item_number'),
'company_name' => $this->lang->line('suppliers_company_name')
),
$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-2'>
<?php echo form_dropdown('barcode_third_row', array(
'not_show' => $this->lang->line('config_none'),
'name' => $this->lang->line('items_name'),
'category' => $this->lang->line('items_category'),
'cost_price' => $this->lang->line('items_cost_price'),
'unit_price' => $this->lang->line('items_unit_price'),
'item_code' => $this->lang->line('items_item_number'),
'company_name' => $this->lang->line('suppliers_company_name')
),
$this->config->item('barcode_third_row'), array('class' => 'form-control input-sm')); ?>
</div>
</div>
</div>
</div>
<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'>
<div class='col-xs-2'>
<?php echo form_input(array(
'name' => 'barcode_num_in_row',
'id' => 'barcode_num_in_row',
'class' => 'form-control input-sm required',
'value'=>$this->config->item('barcode_num_in_row'))); ?>
</div>
</div>
<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 input-sm required',
'value'=>$this->config->item('barcode_page_width'))); ?>
<span class="input-group-addon input-sm">%</span>
</div>
</div>
</div>
<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 input-sm required',
'value'=>$this->config->item('barcode_page_cellspacing'))); ?>
<span class="input-group-addon input-sm">px</span>
</div>
</div>
</div>
<?php echo form_submit(array(
'name' => 'submit_form',
'id' => 'submit_form',
'value'=>$this->lang->line('common_submit'),
'class' => 'btn btn-primary btn-sm pull-right')); ?>
</fieldset>
</div>
</div>
</div>
<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 input-sm required',
'value'=>$this->config->item('barcode_page_width'))); ?>
<span class="input-group-addon input-sm">%</span>
</div>
</div>
</div>
<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 input-sm required',
'value'=>$this->config->item('barcode_page_cellspacing'))); ?>
<span class="input-group-addon input-sm">px</span>
</div>
</div>
</div>
<?php echo form_submit(array(
'name' => 'submit_form',
'id' => 'submit_form',
'value'=>$this->lang->line('common_submit'),
'class' => 'btn btn-primary btn-sm pull-right')); ?>
</fieldset>
</div>
<?php echo form_close(); ?>
<script type="text/javascript">
//validation and submit handling
$(document).ready(function()
{
$('#barcode_config_form').validate($.extend(form_support.handler, {
$('#barcode_config_form').validate($.extend(form_support.handler, {
errorLabelContainer: "#barcode_error_message_box",
errorLabelContainer: "#barcode_error_message_box",
rules:
{
barcode_width:
{
required:true,
number:true
},
barcode_height:
{
required:true,
number:true
},
barcode_quality:
{
required:true,
number:true
},
barcode_font_size:
{
required:true,
number:true
},
barcode_num_in_row:
{
required:true,
number:true
},
barcode_page_width:
{
required:true,
number:true
},
barcode_page_cellspacing:
{
required:true,
number:true
}
},
rules:
{
barcode_width:
{
required:true,
number:true
},
barcode_height:
{
required:true,
number:true
},
barcode_quality:
{
required:true,
number:true
},
barcode_font_size:
{
required:true,
number:true
},
barcode_num_in_row:
{
required:true,
number:true
},
barcode_page_width:
{
required:true,
number:true
},
barcode_page_cellspacing:
{
required:true,
number:true
}
},
messages:
{
barcode_width:
{
required:"<?php echo $this->lang->line('config_default_barcode_width_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_width_number'); ?>"
},
barcode_height:
{
required:"<?php echo $this->lang->line('config_default_barcode_height_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_height_number'); ?>"
},
barcode_quality:
{
required:"<?php echo $this->lang->line('config_default_barcode_quality_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_quality_number'); ?>"
},
barcode_font_size:
{
required:"<?php echo $this->lang->line('config_default_barcode_font_size_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_font_size_number'); ?>"
},
barcode_num_in_row:
{
required:"<?php echo $this->lang->line('config_default_barcode_num_in_row_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_num_in_row_number'); ?>"
},
barcode_page_width:
{
required:"<?php echo $this->lang->line('config_default_barcode_page_width_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_page_width_number'); ?>"
},
barcode_page_cellspacing:
{
required:"<?php echo $this->lang->line('config_default_barcode_page_cellspacing_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_page_cellspacing_number'); ?>"
}
}
}));
messages:
{
barcode_width:
{
required:"<?php echo $this->lang->line('config_default_barcode_width_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_width_number'); ?>"
},
barcode_height:
{
required:"<?php echo $this->lang->line('config_default_barcode_height_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_height_number'); ?>"
},
barcode_quality:
{
required:"<?php echo $this->lang->line('config_default_barcode_quality_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_quality_number'); ?>"
},
barcode_font_size:
{
required:"<?php echo $this->lang->line('config_default_barcode_font_size_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_font_size_number'); ?>"
},
barcode_num_in_row:
{
required:"<?php echo $this->lang->line('config_default_barcode_num_in_row_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_num_in_row_number'); ?>"
},
barcode_page_width:
{
required:"<?php echo $this->lang->line('config_default_barcode_page_width_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_page_width_number'); ?>"
},
barcode_page_cellspacing:
{
required:"<?php echo $this->lang->line('config_default_barcode_page_cellspacing_required'); ?>",
number:"<?php echo $this->lang->line('config_default_barcode_page_cellspacing_number'); ?>"
}
}
}));
});
</script>

11
application/views/configs/general_config.php
View File

@@ -85,10 +85,11 @@
'value' => 'gcaptcha_enable',
'checked' => $this->config->item('gcaptcha_enable'))); ?>
&nbsp
&nbsp
<a href="https://www.google.com/recaptcha/admin" target="_blank">
<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_gcaptcha_tooltip'); ?>"></span>
</a>
<label class="control-label">
<a href="https://www.google.com/recaptcha/admin" target="_blank">
<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_gcaptcha_tooltip'); ?>"></span>
</a>
</label>
</div>
</div>
@@ -144,7 +145,7 @@
'checked' => $this->config->item('statistics'))); ?>
&nbsp
<label class="control-label">
<span class="glyphicon glyphicon-info-sign" data-toggle="tootltip" data-placement="right" title="<?php echo $this->lang->line('config_statistics_tooltip'); ?>"></span>
<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_statistics_tooltip'); ?>"></span>
</label>
</div>
</div>

4
application/views/configs/locale_config.php
View File

@@ -100,7 +100,7 @@
</div>
<div class='col-xs-1'>
<label class="control-label">
<span class="glyphicon glyphicon-info-sign" data-toggle="tootltip" data-placement="right" title="<?php echo $this->lang->line('config_cash_decimals_tooltip'); ?>"></span>
<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_cash_decimals_tooltip'); ?>"></span>
</label>
</div>
</div>
@@ -133,7 +133,7 @@
</div>
<div class="col-xs-1">
<label class="control-label">
<a href="http://wiki.openstreetmap.org/wiki/Nominatim/Country_Codes" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tootltip" data-placement="right" title="<?php echo $this->lang->line('config_country_codes_tooltip'); ?>"></span></a>
<a href="http://wiki.openstreetmap.org/wiki/Nominatim/Country_Codes" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_country_codes_tooltip'); ?>"></span></a>
</label>
</div>
</div>

14
application/views/configs/mailchimp_config.php
View File

@@ -4,7 +4,7 @@
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="mailchimp_error_message_box" class="error_message_box"></ul>
<div class="form-group form-group-sm">
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_mailchimp_api_key'), 'mailchimp_api_key', array('class' => 'control-label col-xs-2')); ?>
<div class="col-xs-4">
<div class="input-group">
@@ -16,8 +16,10 @@
'value' => $mailchimp['api_key'])); ?>
</div>
</div>
<div class="checkbox col-xs-1">
<a href="http://eepurl.com/b9a05b" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_mailchimp_tooltip'); ?>"></span></a>
<div class="col-xs-1">
<label class="control-label">
<a href="http://eepurl.com/b9a05b" target="_blank"><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_mailchimp_tooltip'); ?>"></span></a>
</label>
</div>
</div>
@@ -26,7 +28,7 @@
<div class='col-xs-4'>
<div class="input-group">
<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
<?php echo form_dropdown('mailchimp_list_id',
<?php echo form_dropdown('mailchimp_list_id',
$mailchimp['lists'],
$mailchimp['list_id'],
array('id' => 'mailchimp_list_id', 'class' => 'form-control input-sm')); ?>
@@ -55,7 +57,7 @@ $(document).ready(function()
},
{
data: $.extend(csrf_form_base(), {
'mailchimp_api_key': $('#mailchimp_api_key').val()
'mailchimp_api_key': $('#mailchimp_api_key').val()
}),
success: function(response) {
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
@@ -79,7 +81,7 @@ $(document).ready(function()
dataType: 'json'
});
},
errorLabelContainer: '#mailchimp_error_message_box'
}));
});

4
application/views/partial/header.php
View File

@@ -72,11 +72,11 @@
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=5d27870b02"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=ed0bdc0047"/>
<link rel="stylesheet" type="text/css" href="dist/style.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=6d16c4b61e"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a705d36dce"></script>
<!-- end minjs template tags -->
<?php endif; ?>

2
bower.json
View File

@@ -26,7 +26,7 @@
"dependencies": {
"jquery-form": "~3.46.0",
"jquery-validate": "~1.13.1",
"jquery": "~1.12.4",
"jquery": "~2.1.1",
"jquery-ui": "1.11.4",
"bootstrap3-dialog": "https://github.com/nakupanda/bootstrap3-dialog.git#master",
"jasny-bootstrap": "~3.1.3",

13
database/3.0.2_to_3.1.0.sql
View File

@@ -69,8 +69,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('last_used_invoice_number', '0'),
('last_used_quote_number', '0'),
('line_sequence', '0'),
('barcode_formats' '[]'),
('dinner_table_enable','');
('dinner_table_enable', '');
--
-- Table structure for table `ospos_customer_packages`
@@ -242,10 +241,10 @@ INSERT INTO `ospos_grants` (`permission_id`, `person_id`) VALUES
UPDATE ospos_items SET receiving_quantity = 1 WHERE receiving_quantity = 0;
-- long alternate description
ALTER TABLE `ospos_sales_items`
MODIFY COLUMN `description` varchar(255) DEFAULT NULL;
-- fix tax category maintenance
DELETE FROM `ospos_tax_categories` where tax_category_id in (0, 1, 2, 3);
@@ -304,3 +303,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('gcaptcha_enable', '0'),
('gcaptcha_secret_key', ''),
('gcaptcha_site_key', '');
-- add Barcode formats
INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('barcode_formats', '[]');

8
public/css/ospos.css
View File

@@ -138,6 +138,14 @@ button.btn.dropdown-toggle.btn-sm
font-size: 13px;
}
.bootstrap-tagsinput
{
background-color: white;
color: black;
border: 2px solid #dce4ec;
box-shadow: none;
}
label.required
{
color:red;

8
public/dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

45
public/dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

104
public/license/bower.LICENSES
View File

@@ -17,16 +17,6 @@
],
"homepage": "http://nakupanda.github.io/bootstrap3-dialog/"
},
"chartist@0.9.8": {
"licenses": "UNKNOWN",
"homepage": "https://github.com/gionkunz/chartist-js"
},
"chartist-plugin-axistitle@0.1.0": {
"licenses": [
"WTF*"
],
"homepage": "https://github.com/alexstanbury/chartist-plugin-axistitle"
},
"bootswatch@3.3.7": {
"licenses": [
"MIT"
@@ -37,6 +27,16 @@
},
"homepage": "http://bootswatch.com"
},
"chartist@0.9.8": {
"licenses": "UNKNOWN",
"homepage": "https://github.com/gionkunz/chartist-js"
},
"chartist-plugin-axistitle@0.1.0": {
"licenses": [
"WTF*"
],
"homepage": "https://github.com/alexstanbury/chartist-plugin-axistitle"
},
"chartist-plugin-barlabels@0.0.5": {
"licenses": [
"WTF*"
@@ -61,16 +61,16 @@
],
"homepage": "https://github.com/Teleborder/FileSaver.js"
},
"jquery-form@3.46.0": {
"licenses": "UNKNOWN",
"homepage": "https://github.com/malsup/form"
},
"jquery@2.1.4": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/jquery/jquery-dist"
},
"jquery-form@3.46.0": {
"licenses": "UNKNOWN",
"homepage": "https://github.com/malsup/form"
},
"js-cookie@2.1.4": {
"licenses": [
"MIT"
@@ -102,6 +102,20 @@
"homepage": "https://github.com/dangrossman/bootstrap-daterangepicker",
"repository": "git+https://github.com/dangrossman/bootstrap-daterangepicker"
},
"bootstrap-table@undefined": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/wenzhixin/bootstrap-table",
"repository": "git+https://github.com/wenzhixin/bootstrap-table"
},
"bootstrap-tagsinput@0.8.0": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/TimSchlechter/bootstrap-tagsinput",
"repository": "https://github.com/timschlechter/bootstrap-tagsinput"
},
"bootstrap@3.3.7": {
"licenses": [
"MIT"
@@ -109,6 +123,13 @@
"homepage": "http://getbootstrap.com",
"repository": "git+https://github.com/twbs/bootstrap"
},
"html2canvas@0.4.1": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/niklasvh/html2canvas",
"repository": "git+ssh://git@github.com/niklasvh/html2canvas"
},
"jasny-bootstrap@3.1.3": {
"licenses": [
"Apache-2.0",
@@ -117,26 +138,12 @@
"homepage": "https://github.com/jasny/bootstrap",
"repository": "git+https://github.com/jasny/bootstrap"
},
"bootstrap-tagsinput@0.8.0": {
"jquery-validation@1.13.1": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/TimSchlechter/bootstrap-tagsinput",
"repository": "https://github.com/timschlechter/bootstrap-tagsinput"
},
"bootstrap-tokenfield@0.12.1": {
"licenses": [
"MIT"
],
"homepage": "http://sliptree.github.io/bootstrap-tokenfield/",
"repository": "https://github.com/sliptree/bootstrap-tokenfield"
},
"bootstrap-table@undefined": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/wenzhixin/bootstrap-table",
"repository": "git+https://github.com/wenzhixin/bootstrap-table"
"repository": "https://github.com/jzaefferer/jquery-validation",
"homepage": "http://jqueryvalidation.org/"
},
"remarkable-bootstrap-notify@3.1.3": {
"licenses": [
@@ -145,6 +152,13 @@
"homepage": "http://bootstrap-notify.remabledesigns.com/",
"repository": "https://github.com/mouse0270/bootstrap-notify"
},
"jspdf-autotable@2.0.14": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/simonbengtsson/jspdf-autotable",
"repository": "git+https://github.com/simonbengtsson/jsPDF-AutoTable"
},
"smalot-bootstrap-datetimepicker@2.4.4": {
"licenses": [
"Apache 2.0",
@@ -153,39 +167,11 @@
"homepage": "https://github.com/smalot/bootstrap-datetimepicker",
"repository": "https://github.com/smalot/bootstrap-datetimepicker"
},
"html2canvas@0.4.1": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/niklasvh/html2canvas",
"repository": "git+ssh://git@github.com/niklasvh/html2canvas"
},
"jspdf-autotable@2.0.14": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/simonbengtsson/jspdf-autotable",
"repository": "git+https://github.com/simonbengtsson/jsPDF-AutoTable"
},
"jquery-validation@1.13.1": {
"licenses": [
"MIT"
],
"repository": "https://github.com/jzaefferer/jquery-validation",
"homepage": "http://jqueryvalidation.org/"
},
"jquery-ui@1.11.4": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/components/jqueryui",
"repository": "https://github.com/jquery/jquery-ui"
},
"tether@1.4.0": {
"licenses": [
"MIT"
],
"homepage": "http://github.hubspot.com/tether",
"repository": "git+https://github.com/HubSpot/tether"
}
}