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

Remove tags:css task in Grunfile (css files are imported the old way

Browse Source 
again)
Fix sale delete confirmation in edit dialog
Add bower.json (still unused)
Fix autogenerated javascript load order
This commit is contained in:
jekkos
2015-03-17 16:47:49 +01:00
parent aa65593ce3
commit cae9d3b67e
9 changed files with 100 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -15,3 +15,4 @@ git-svn-diff.py
*.orig
*~
*.~
*.log

4
Gruntfile.js
View File

@@ -42,7 +42,7 @@ module.exports = function(grunt) {
absolutePath: true
},
src: [
'js/*.js',
'js/jquery*.js', 'js/*.js',
],
dest: 'application/views/partial/header.php'
},
@@ -71,6 +71,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-script-link-tags');
grunt.registerTask('default', ['tags:js', 'tags:css', 'concat', 'uglify', 'tags:minjs']);
grunt.registerTask('default', ['tags:js', 'concat', 'uglify', 'tags:minjs']);
};

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

@@ -8,28 +8,28 @@
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<?php if ($this->input->cookie('debug') == "true" || $this->input->post("debug") == "true") : ?>
<!-- start js template tags -->
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/datepicker.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-migrate-1.2.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-migrate-1.2.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/datepicker.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js" language="javascript"></script>

50
application/views/sales/form.php
View File

@@ -110,13 +110,6 @@ $(document).ready(function()
}, '<?php echo $this->lang->line("sales_invoice_number_duplicate"); ?>');
$('#date').datePicker({startDate: '01/01/1970'});
$("#sales_delete_form").submit(function()
{
if (!confirm('<?php echo $this->lang->line("sales_delete_confirmation"); ?>'))
{
return false;
}
});
var format_item = function(row)
{
@@ -189,27 +182,30 @@ $(document).ready(function()
});
$('#sales_delete_form').submit(function()
{
var id = $("input[name='sale_id']").val();
$(this).ajaxSubmit({
success:function(response)
{
tb_remove();
set_feedback(response.message,'success_message',false);
var $element = get_table_row(id).parent().parent();
$element.find("td").animate({backgroundColor:"green"},1200,"linear")
.end().animate({opacity:0},1200,"linear",function()
if (confirm('<?php echo $this->lang->line("sales_delete_confirmation"); ?>'))
{
var id = $("input[name='sale_id']").val();
$(this).ajaxSubmit({
success:function(response)
{
$element.next().remove();
$(this).remove();
//Re-init sortable table as we removed a row
update_sortable_table();
});
},
error: function(jqXHR, textStatus, errorThrown) {
set_feedback(textStatus,'error_message',true);
},
dataType:'json'
});
tb_remove();
set_feedback(response.message,'success_message',false);
var $element = get_table_row(id).parent().parent();
$element.find("td").animate({backgroundColor:"green"},1200,"linear")
.end().animate({opacity:0},1200,"linear",function()
{
$element.next().remove();
$(this).remove();
//Re-init sortable table as we removed a row
update_sortable_table();
});
},
error: function(jqXHR, textStatus, errorThrown) {
set_feedback(textStatus,'error_message',true);
},
dataType:'json'
});
}
return false;
});
});

2
application/views/sales/manage.php
View File

@@ -17,7 +17,7 @@ $(document).ready(function()
var value = $("#payment_type").val();
var $button = $("#update_invoice_numbers").parents("li");
$button.toggle(value === "1");
}
};
$("#payment_type").change(show_renumber);
show_renumber();

35
bower.json Normal file
View File

@@ -0,0 +1,35 @@
{
"name": "opensourcepos",
"version": "2.4",
"authors": [
"jekkos <jeroen.peelaerts - at - gmail.com>"
],
"description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface",
"main": "dist/ospos.js",
"keywords": [
"point-of-sale"
],
"license": "MIT",
"homepage": "https://github.com/jekkos/opensourcepos",
"private": true,
"moduleType": [
"globals"
],
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"jKey": "https://github.com/OscarGodson/jKey",
"jquery-bgiframe": "~3.0.1",
"jquery-color": "~2.1.2",
"jquery-form": "~3.46.0",
"jquery-validate": "~1.13.1",
"jquery": "1.8.3",
"swfobject": "*",
"thickbox": "~3.1.2"
}
}

6
dist/opensourcepos.js vendored
View File

@@ -14715,9 +14715,9 @@ function do_delete(url)
});
});
// for(index in response.ids) {
// update_row(response.ids[index],url.replace(/[^\/]+$/,'get_row'));
// }
for(index in response.ids) {
update_row(response.ids[index],url.replace(/[^\/]+$/,'get_row'));
}
set_feedback(response.message,'success_message',false);
}

19
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
js/manage_tables.js
View File

@@ -149,6 +149,8 @@ function enable_delete(confirm_message,none_selected_message)
if(confirm(confirm_message))
{
do_delete($(this).attr('href'));
} else {
return false;
}
}
else
@@ -182,10 +184,7 @@ function do_delete(url)
$("#sortable_table tbody tr").length > 0 && update_sortable_table();
});
});
// for(index in response.ids) {
// update_row(response.ids[index],url.replace(/[^\/]+$/,'get_row'));
// }
});
set_feedback(response.message,'success_message',false);
}