CREATE TABLE ProductOptionCombinations (`CombinationId` int(11) NOT NULL auto_increment, `ProductId` int(11) NOT NULL default '0', `Combination` text NOT NULL, `CombinationCRC` int(11) NOT NULL default '0', `PriceType` tinyint(1) default NULL, `Price` float default NULL, `WeightType` tinyint(1) default NULL, `Weight` float default NULL, `Availability` tinyint(1) default NULL, `Priority` int(11) NOT NULL default '0', PRIMARY KEY  (`CombinationId`));
CREATE TABLE ProductOptions (`ProductOptionId` int(11) NOT NULL auto_increment, `ProductId` int(11) NOT NULL default '0', `Name` varchar(255) NOT NULL default '', `OptionType` tinyint(4) default NULL, `Required` tinyint(4) NOT NULL default '0', `Listable` tinyint(4) NOT NULL default '0', `Priority` int(11) NOT NULL default '0', `Values` text, `Prices` text, `PriceTypes` text, PRIMARY KEY  (`ProductOptionId`), KEY `ProductId` (`ProductId`,`Priority`));

ALTER TABLE Orders ADD ProcessingFee DOUBLE NULL DEFAULT '0.00', ADD `ShippingTaxable` TINYINT( 1 ) NOT NULL DEFAULT '0', ADD `ProcessingTaxable` TINYINT( 1 ) NOT NULL DEFAULT '0';
UPDATE Orders SET ShippingTaxable = 1, ProcessingTaxable = 0 WHERE VAT > 0;

ALTER TABLE PaymentTypes ADD ProcessingFee DOUBLE NOT NULL DEFAULT '0.00';

ALTER TABLE OrderItems ADD OptionsSalt INT(11) NULL DEFAULT '0';
ALTER TABLE Products ADD OptionsSelectionMode TINYINT(4) NULL DEFAULT '0', ADD `HasRequiredOptions` TINYINT( 1 ) NOT NULL DEFAULT '0';

ALTER TABLE TaxZones ADD `ApplyToShipping` TINYINT( 1 ) NOT NULL DEFAULT '0', ADD `ApplyToProcessing` TINYINT( 1 ) NOT NULL DEFAULT '0';
UPDATE TaxZones SET ApplyToShipping = 1, ApplyToProcessing = 1;

UPDATE ItemTypes SET Prefix = 'p' WHERE SourceTable = 'Products';

INSERT INTO ImportScripts (is_string_id,is_Module,is_script,is_label,is_field_prefix,is_requred_fields,is_enabled,is_type) VALUES ('', 'In-Commerce', '', 'Products from CSV file [In-Commerce]', '', '', 1, 'csv');

UPDATE ConfigurationValues SET VariableValue = ROUND( VariableValue /24 /60 /60 ) WHERE VariableName = 'Comm_AffiliateCookieDuration';

UPDATE Modules SET Version = '1.0.5' WHERE Name = 'In-Commerce';