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

Added default values to tables.sql and regen dist files (#478)

Browse Source
This commit is contained in:
FrancescoUK
2016-06-02 12:22:37 +01:00
parent f8ef4bb570
commit 5e42684f27
9 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/login.php
View File

@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<!-- end css template tags -->

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

@@ -64,9 +64,9 @@
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![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/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=baddd589ff"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=9f6707893f"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=104339e3c2" language="javascript"></script>

5
database/database.sql
View File

@@ -65,10 +65,13 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('currency_decimals', '2'),
('tax_decimals', '2'),
('quantity_decimals', '0'),
('country_codes', 'us'),
('msg_msg', ''),
('msg_uid', ''),
('msg_src', ''),
('msg_pwd', '');
('msg_pwd', ''),
('notify_horziontal_position', 'right'),
('notify_vertical_position', 'top');
-- --------------------------------------------------------

5
database/migrate_phppos_dist.sql
View File

@@ -65,10 +65,13 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('currency_decimals', '2'),
('tax_decimals', '2'),
('quantity_decimals', '0'),
('country_codes', 'us'),
('msg_msg', ''),
('msg_uid', ''),
('msg_src', ''),
('msg_pwd', '');
('msg_pwd', ''),
('notify_horziontal_position', 'right'),
('notify_vertical_position', 'top');
-- --------------------------------------------------------

5
database/tables.sql
View File

@@ -65,10 +65,13 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('currency_decimals', '2'),
('tax_decimals', '2'),
('quantity_decimals', '0'),
('country_codes', 'us'),
('msg_msg', ''),
('msg_uid', ''),
('msg_src', ''),
('msg_pwd', '');
('msg_pwd', ''),
('notify_horziontal_position', 'right'),
('notify_vertical_position', 'top');
-- --------------------------------------------------------

4
dist/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/opensourcepos.js vendored
View File

@@ -42710,7 +42710,6 @@ $.extend($.fn, {
this.validateDelegate( ":submit", "click", function( event ) {
if ( validator.settings.submitHandler ) {
validator.submitButton = event.target;
}
// allow suppressing validation by adding a cancel class to the submit button
@@ -44431,7 +44430,7 @@ jQuery.base64 = ( function( $ ) {
hasAnimation = false,
settings = this.settings;
$('[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])').each(function() {
$('[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])').each(function() {
return offsetAmt = Math.max(offsetAmt, parseInt($(this).css(settings.placement.from)) + parseInt($(this).outerHeight()) + parseInt(settings.spacing));
});
if (this.settings.newest_on_top == true) {
@@ -44541,7 +44540,6 @@ jQuery.base64 = ( function( $ ) {
}
}
}, 600);
},
reposition: function(posX) {
var self = this,

2
templates/spacelab/views/login.php
View File

@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- end css template tags -->

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

@@ -66,10 +66,10 @@
<!--[if lte IE 8]>
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<!-- 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=baddd589ff"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=9f6707893f"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->