mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-11 15:36:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only accept .csv for import excel functionality (#116)

Browse Source 
Enable enter key to submit form by default (as before)
This commit is contained in:
jekkos
2016-03-01 18:01:53 +01:00
parent 45da78bbde
commit d433866e39
7 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/customers/excel_import.php
View File

@@ -12,7 +12,7 @@
<div class='col-xs-12'>
<div class="fileinput fileinput-new input-group" data-provides="fileinput">
<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line("common_import_select_file"); ?></span><span class="fileinput-exists"><?php echo $this->lang->line("common_import_change_file"); ?></span><input type="file" id="file_path" name="file_path"></span>
<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line("common_import_select_file"); ?></span><span class="fileinput-exists"><?php echo $this->lang->line("common_import_change_file"); ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("common_import_remove_file"); ?></a>
</div>
</div>

2
application/views/items/excel_import.php
View File

@@ -12,7 +12,7 @@
<div class='col-xs-12'>
<div class="fileinput fileinput-new input-group" data-provides="fileinput">
<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line("common_import_select_file"); ?></span><span class="fileinput-exists"><?php echo $this->lang->line("common_import_change_file"); ?></span><input type="file" id="file_path" name="file_path"></span>
<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line("common_import_select_file"); ?></span><span class="fileinput-exists"><?php echo $this->lang->line("common_import_change_file"); ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("common_import_remove_file"); ?></a>
</div>
</div>

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

@@ -68,7 +68,7 @@
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=f940457590"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=3bf78bd284" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=906f616faa" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

4
dist/opensourcepos.js vendored
View File

@@ -52161,10 +52161,12 @@ dialog_support = (function() {
var btn_class = className.split("modal-btn-");
if (btn_class && btn_class.length > 1) {
var btn_name = btn_class[1];
var is_submit = btn_name == 'submit';
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
cssClass: btn_name == 'submit' ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
cssClass: is_submit ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
hotkey: is_submit ? 13 : undefined, // Enter.
action: submit(btn_name)
});
}

4
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
js/manage_tables.js
View File

@@ -424,10 +424,12 @@ dialog_support = (function() {
var btn_class = className.split("modal-btn-");
if (btn_class && btn_class.length > 1) {
var btn_name = btn_class[1];
var is_submit = btn_name == 'submit';
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
cssClass: btn_name == 'submit' ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
cssClass: is_submit ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
hotkey: is_submit ? 13 : undefined, // Enter.
action: submit(btn_name)
});
}

2
templates/spacelab/views/partial/header.php
View File

@@ -69,7 +69,7 @@
<!-- 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=3bf78bd284" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=906f616faa" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>