From f928ef706158132f03bdc59f95d4f25730b4ec75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20=C5=A0iman?= Date: Sun, 25 Jun 2017 15:33:15 +0200 Subject: [PATCH] Bug 17705: Fixed web installer problems This patch only fixes problems during web installation procedure Test plan: 1) Apply the patch 2) Go through all webinstaller's steps 3) No SQL errors should occur --- installer/data/mysql/kohastructure.sql | 29 +++++++++++++++-------------- installer/data/mysql/sysprefs.sql | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 3981528..5d529d4 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1362,20 +1362,6 @@ CREATE TABLE pending_offline_operations ( PRIMARY KEY (operationid) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- --- Table structure for table `pos_terminal_transactions` --- - -CREATE TABLE `pos_terminal_transactions` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `accountlines_id` int(11) NOT NULL, - `status` varchar(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'new', - `response_code` varchar(5) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, - `message_log` text CHARACTER SET utf8 COLLATE utf8_unicode_ci, - PRIMARY KEY (`id`), - KEY `accountlines_id` (`accountlines_id`), - CONSTRAINT `pos_terminal_transactions_ibfk1` FOREIGN KEY (`accountlines_id`) REFERENCES `accountlines` (`accountlines_id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -- Table structure for table `printers` @@ -2737,6 +2723,21 @@ CREATE TABLE `accountoffsets` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- +-- Table structure for table `pos_terminal_transactions` +-- + +CREATE TABLE `pos_terminal_transactions` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `accountlines_id` int(11) NOT NULL, + `status` varchar(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'new', + `response_code` varchar(5) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `message_log` text CHARACTER SET utf8 COLLATE utf8_unicode_ci, + PRIMARY KEY (`id`), + KEY `accountlines_id` (`accountlines_id`), + CONSTRAINT `pos_terminal_transactions_ibfk1` FOREIGN KEY (`accountlines_id`) REFERENCES `accountlines` (`accountlines_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -- Table structure for table `action_logs` -- diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 794a3d0..512acca 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -410,7 +410,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('PayPalSignature', '', NULL , 'Your PayPal API signature', 'Free'), ('PayPalUser', '', NULL , 'Your PayPal API username ( email address )', 'Free'), ('Persona','0','','Use Mozilla Persona for login','YesNo'), -('PosTerminalCurrencyCode', '', NULL , 'POS Terminal currency code number', 'Integer') +('PosTerminalCurrencyCode', '', NULL , 'POS Terminal currency code number', 'Integer'), ('PosTerminalIP', '', NULL , 'POS Terminal IP address', 'Free'), ('PosTerminalPort', '', NULL , 'POS Terminal port', 'Integer'), ('PrefillItem','0','','When a new item is added, should it be prefilled with last created item values?','YesNo'), -- 2.1.4