mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-08 08:57:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

update tablesorter to 2.25.7, regenerate dist files even to fix database.sql

Browse Source
This commit is contained in:
FrancescoUK
2016-04-03 19:33:09 +01:00
parent fc6c9f6d57
commit c981bc7daa
8 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,11 +61,11 @@
<!-- 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/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=c8934fe7a7"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b02e114127"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=57fd58af7d" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=8d98a84d84" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

6
database/database.sql
View File

@@ -203,7 +203,7 @@ CREATE TABLE `ospos_items` (
CREATE TABLE `ospos_items_taxes` (
`item_id` int(10) NOT NULL,
`name` varchar(255) NOT NULL,
`percent` decimal(15,2) NOT NULL,
`percent` decimal(15,3) NOT NULL,
PRIMARY KEY (`item_id`,`name`,`percent`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -528,7 +528,7 @@ CREATE TABLE `ospos_sales_items_taxes` (
`item_id` int(10) NOT NULL,
`line` int(3) NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL,
`percent` decimal(15,2) NOT NULL,
`percent` decimal(15,3) NOT NULL,
PRIMARY KEY (`sale_id`,`item_id`,`line`,`name`,`percent`),
KEY `sale_id` (`sale_id`),
KEY `item_id` (`item_id`)
@@ -619,7 +619,7 @@ CREATE TABLE `ospos_sales_suspended_items_taxes` (
`item_id` int(10) NOT NULL,
`line` int(3) NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL,
`percent` decimal(15,2) NOT NULL,
`percent` decimal(15,3) NOT NULL,
PRIMARY KEY (`sale_id`,`item_id`,`line`,`name`,`percent`),
KEY `item_id` (`item_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

6
database/migrate_phppos_dist.sql
View File

@@ -203,7 +203,7 @@ CREATE TABLE `ospos_items` (
CREATE TABLE `ospos_items_taxes` (
`item_id` int(10) NOT NULL,
`name` varchar(255) NOT NULL,
`percent` decimal(15,2) NOT NULL,
`percent` decimal(15,3) NOT NULL,
PRIMARY KEY (`item_id`,`name`,`percent`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -528,7 +528,7 @@ CREATE TABLE `ospos_sales_items_taxes` (
`item_id` int(10) NOT NULL,
`line` int(3) NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL,
`percent` decimal(15,2) NOT NULL,
`percent` decimal(15,3) NOT NULL,
PRIMARY KEY (`sale_id`,`item_id`,`line`,`name`,`percent`),
KEY `sale_id` (`sale_id`),
KEY `item_id` (`item_id`)
@@ -619,7 +619,7 @@ CREATE TABLE `ospos_sales_suspended_items_taxes` (
`item_id` int(10) NOT NULL,
`line` int(3) NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL,
`percent` decimal(15,2) NOT NULL,
`percent` decimal(15,3) NOT NULL,
PRIMARY KEY (`sale_id`,`item_id`,`line`,`name`,`percent`),
KEY `item_id` (`item_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

31
dist/opensourcepos.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -63,12 +63,12 @@
<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/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=c8934fe7a7"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b02e114127"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- 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=57fd58af7d" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=8d98a84d84" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

2
test/receiving_quantity.js
View File

@@ -13,7 +13,7 @@ describe("test receiving quantity", function() {
receiving_quantity: 2
};
it("should be able to creaate item with receiving quantity", function(done) {
it("should be able to create item with receiving quantity", function(done) {
return ospos.create_item(this.browser, item).then(done, done);
});