TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml
This commit is contained in:
Etienne Roudeix
2013-09-27 10:29:51 +02:00
parent 7e3cbb6818 62ce7db882
commit 622e1ca3b6
133 changed files with 11997 additions and 2064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
install/thelia.sql
View File

@@ -1101,14 +1101,14 @@ CREATE TABLE `coupon`
`code` VARCHAR(45) NOT NULL,
`type` VARCHAR(255) NOT NULL,
`amount` FLOAT NOT NULL,
`is_used` TINYINT NOT NULL,
`is_enabled` TINYINT NOT NULL,
`is_enabled` TINYINT(1) NOT NULL,
`expiration_date` DATETIME NOT NULL,
`serialized_rules` TEXT NOT NULL,
`is_cumulative` TINYINT NOT NULL,
`is_removing_postage` TINYINT NOT NULL,
`max_usage` INTEGER NOT NULL,
`is_cumulative` TINYINT(1) NOT NULL,
`is_removing_postage` TINYINT(1) NOT NULL,
`is_available_on_special_offers` TINYINT(1) NOT NULL,
`is_used` TINYINT(1) NOT NULL,
`serialized_conditions` TEXT NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
`version` INTEGER DEFAULT 0,
@@ -2350,14 +2350,14 @@ CREATE TABLE `coupon_version`
`code` VARCHAR(45) NOT NULL,
`type` VARCHAR(255) NOT NULL,
`amount` FLOAT NOT NULL,
`is_used` TINYINT NOT NULL,
`is_enabled` TINYINT NOT NULL,
`is_enabled` TINYINT(1) NOT NULL,
`expiration_date` DATETIME NOT NULL,
`serialized_rules` TEXT NOT NULL,
`is_cumulative` TINYINT NOT NULL,
`is_removing_postage` TINYINT NOT NULL,
`max_usage` INTEGER NOT NULL,
`is_cumulative` TINYINT(1) NOT NULL,
`is_removing_postage` TINYINT(1) NOT NULL,
`is_available_on_special_offers` TINYINT(1) NOT NULL,
`is_used` TINYINT(1) NOT NULL,
`serialized_conditions` TEXT NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
`version` INTEGER DEFAULT 0 NOT NULL,