diff --git a/src/main/java/com/unicenta/pos/forms/AppLocal.java b/src/main/java/com/unicenta/pos/forms/AppLocal.java index 5729fbf..28fb5b4 100644 --- a/src/main/java/com/unicenta/pos/forms/AppLocal.java +++ b/src/main/java/com/unicenta/pos/forms/AppLocal.java @@ -30,7 +30,7 @@ public class AppLocal { public static final String APP_NAME = "uniCenta oPOS"; public static final String APP_ID = "unicentaopos"; - public static final String APP_VERSION = "5.0"; + public static final String APP_VERSION = "5.0.1"; private static final LocaleResources m_resources; diff --git a/src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql b/src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql new file mode 100644 index 0000000..b82820f --- /dev/null +++ b/src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql @@ -0,0 +1,7 @@ +UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount'; + +UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount'; + +UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy'; + +UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{}; \ No newline at end of file diff --git a/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql b/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql index c6ee72d..ee87d92 100644 --- a/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql +++ b/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql @@ -1,61 +1,11 @@ --- CLEAR THE DECKS -DELETE FROM sharedtickets; - --- Switch OFF table foreign key relationships -set foreign_key_checks = 0; - --- RECREATE applications table -DROP TABLE `applications`; -CREATE TABLE IF NOT EXISTS `applications` ( - `id` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `version` varchar(255) NOT NULL, - `instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY ( `id` ) -) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact; - - --- SYSTEM -DELETE FROM resources WHERE name = 'script.posapps'; - - -DELETE FROM resources WHERE id = '0'; -DELETE FROM resources WHERE id = '00'; -INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt}); - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons'; +UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount'; COMMIT; -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket'; +UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount'; COMMIT; -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close'; +UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy'; COMMIT; -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated'; -COMMIT; - --- ROLES -DELETE FROM roles WHERE id = '0'; -INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} ); -DELETE FROM roles WHERE id = '1'; -INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} ); -DELETE FROM roles WHERE id = '2'; -INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} ); - - --- Switch ON table foreign key relationships -set foreign_key_checks = 1; - -INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{}); - +UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{}; COMMIT; \ No newline at end of file diff --git a/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql b/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql index 9dcafbf..ee92fe5 100644 --- a/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql +++ b/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql @@ -1,49 +1,3 @@ --- CLEAR THE DECKS -DELETE FROM sharedtickets; - --- Switch OFF table foreign key relationships -set foreign_key_checks = 0; - --- RECREATE applications table -DROP TABLE `applications`; -CREATE TABLE IF NOT EXISTS `applications` ( - `id` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `version` varchar(255) NOT NULL, - `instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY ( `id` ) -) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact; - - --- SYSTEM -DELETE FROM resources WHERE name = 'script.posapps'; - - -DELETE FROM resources WHERE id = '0'; -DELETE FROM resources WHERE id = '00'; -INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt}); - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated'; -COMMIT; - UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount'; COMMIT; @@ -53,18 +7,5 @@ COMMIT; UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy'; COMMIT; --- ROLES -DELETE FROM roles WHERE id = '0'; -INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} ); -DELETE FROM roles WHERE id = '1'; -INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} ); -DELETE FROM roles WHERE id = '2'; -INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} ); - - --- Switch ON table foreign key relationships -set foreign_key_checks = 1; - -INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{}); - +UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_NAME{}; COMMIT; \ No newline at end of file diff --git a/src/main/resources/pos_messages.properties b/src/main/resources/pos_messages.properties index 20f6884..79ef3ef 100644 --- a/src/main/resources/pos_messages.properties +++ b/src/main/resources/pos_messages.properties @@ -881,7 +881,7 @@ message.email=Desktop email app' not found message.emptycustomer=Customer cannot be empty message.emptynumber=Number cannot be empty message.enterbuyprice=Enter new Buy Price -message.eolupdate=

Version 5.0 Upgrade!


Your current database version is {0}


For version 4.6.4 click YES

For any other version click NO and get to 4.6.4 first

+message.eolupdate=

Version 5.0.1 Upgrade!


Your current database version is {0}


For version 5.0 click YES

For any other version click NO and get to 5.0 first

message.ibuttonassign=
Get the iButton ID
Place iButton onto the reader then click OK message.ibuttonnotassign=
The iButton used is not yet assigned to anyone message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.