Merge pull request #564 from bibich/thelia-203-beta

Thelia 203 beta

CHANGELOG.md

@@ -1,4 +1,4 @@
-#2.0.3
+#2.0.3-beta
 - New coupon type: Free product if selected products are in the cart.
 - New feature: Product Brands / Suppliers management
 - New 'brand' loop and substitution. product, image and document loop have been updated.
@@ -14,8 +14,7 @@
 - Default front office template:
      - Display enhancement
      - Optimization of the uses of Thelia loops to gain performances and consistency
-     - Optimization for SEO : meta description fallback, ti>>>>>>> Updated Changelog
-tle on category page, ...
+     - Optimization for SEO : meta description fallback, title on category page, ...
      - new PSE layout in product page, attributes are separated
      - Support of 'check-available-stock' config variable
      - Terms and conditions agreement is now in the order process

core/lib/Thelia/Core/Thelia.php

@@ -47,7 +47,7 @@ use Thelia\Model\ModuleQuery;
 class Thelia extends Kernel
 {
 
-    const THELIA_VERSION = '2.0.2';
+    const THELIA_VERSION = '2.0.3-beta';
 
     public function init()
     {

core/lib/Thelia/Install/Update.php

@@ -34,6 +34,8 @@ class Update
         '5' => '2.0.0',
         '6' => '2.0.1',
         '7' => '2.0.2',
+        '8' => '2.0.3-beta',
+
     );
 
     protected function isLatestVersion($version)

setup/insert.sql

@@ -49,8 +49,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('thelia_version','2.0.2', 1, 1, NOW(), NOW()),
 ('thelia_major_version','2', 1, 1, NOW(), NOW()),
 ('thelia_minus_version','0', 1, 1, NOW(), NOW()),
-('thelia_release_version','2', 1, 1, NOW(), NOW()),
-('thelia_extra_version','', 1, 1, NOW(), NOW()),
+('thelia_release_version','3', 1, 1, NOW(), NOW()),
+('thelia_extra_version','beta', 1, 1, NOW(), NOW()),
 ('front_cart_country_cookie_name','fcccn', 1, 1, NOW(), NOW()),
 ('front_cart_country_cookie_expires','2592000', 1, 1, NOW(), NOW()),
 ('sitemap_ttl','7200', 1, 1, NOW(), NOW()),

setup/update/2.0.3-beta.sql

@@ -4,7 +4,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 
 UPDATE `config` SET `value`='2.0.3' WHERE `name`='thelia_version';
 UPDATE `config` SET `value`='3' WHERE `name`='thelia_release_version';
-UPDATE `config` SET `value`='' WHERE `name`='thelia_extra_version';
+UPDATE `config` SET `value`='beta' WHERE `name`='thelia_extra_version';
 
 INSERT INTO `config` (`name`, `value`, `secured`, `hidden`,  `created_at`, `updated_at`) VALUES
 ('store_description', '', 0, 0, NOW(), NOW());
@@ -153,24 +153,25 @@ ALTER TABLE `coupon_version` ADD `version_created_by` VARCHAR(100) AFTER `versio
 # Add coupon_customer_count table
 # -------------------------------
 
-CREATE TABLE `coupon_customer_count`
-(
-  `coupon_id` INTEGER NOT NULL,
-  `customer_id` INTEGER NOT NULL,
-  `count` INTEGER DEFAULT 0 NOT NULL,
-  INDEX `fk_coupon_customer_customer_id_idx` (`customer_id`),
-  INDEX `fk_coupon_customer_coupon_id_idx` (`coupon_id`),
-  CONSTRAINT `fk_coupon_customer_customer_id`
+ALTER TABLE `coupon_customer_count`
+    DROP FOREIGN KEY `fk_coupon_customer_customer_id`;
+
+ALTER TABLE `coupon_customer_count`
+    DROP FOREIGN KEY `fk_coupon_customer_coupon_id`;
+
+ALTER TABLE `coupon_customer_count`
+  ADD CONSTRAINT `fk_coupon_customer_customer_id`
   FOREIGN KEY (`customer_id`)
   REFERENCES `customer` (`id`)
     ON UPDATE RESTRICT
-    ON DELETE CASCADE,
-  CONSTRAINT `fk_coupon_customer_coupon_id`
+    ON DELETE CASCADE;
+
+ALTER TABLE `coupon_customer_count`
+  ADD CONSTRAINT `fk_coupon_customer_coupon_id`
   FOREIGN KEY (`coupon_id`)
   REFERENCES `coupon` (`id`)
     ON UPDATE RESTRICT
-    ON DELETE CASCADE
-) ENGINE=InnoDB;
+    ON DELETE CASCADE;
 
 # ---------------------------------------------------------------------
 # Add Brand tables and related resources
@@ -441,6 +442,82 @@ CREATE TABLE `export`
 
 
 
+-- ---------------------------------------------------------------------
+-- import_category_i18n
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `import_category_i18n`;
+
+CREATE TABLE `import_category_i18n`
+(
+    `id` INTEGER NOT NULL,
+    `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
+    `title` VARCHAR(255) NOT NULL,
+    PRIMARY KEY (`id`,`locale`),
+    CONSTRAINT `import_category_i18n_FK_1`
+        FOREIGN KEY (`id`)
+        REFERENCES `import_category` (`id`)
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+-- ---------------------------------------------------------------------
+-- export_category_i18n
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `export_category_i18n`;
+
+CREATE TABLE `export_category_i18n`
+(
+    `id` INTEGER NOT NULL,
+    `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
+    `title` VARCHAR(255) NOT NULL,
+    PRIMARY KEY (`id`,`locale`),
+    CONSTRAINT `export_category_i18n_FK_1`
+        FOREIGN KEY (`id`)
+        REFERENCES `export_category` (`id`)
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+-- ---------------------------------------------------------------------
+-- import_i18n
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `import_i18n`;
+
+CREATE TABLE `import_i18n`
+(
+    `id` INTEGER NOT NULL,
+    `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
+    `title` VARCHAR(255) NOT NULL,
+    `description` LONGTEXT,
+    PRIMARY KEY (`id`,`locale`),
+    CONSTRAINT `import_i18n_FK_1`
+        FOREIGN KEY (`id`)
+        REFERENCES `import` (`id`)
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+-- ---------------------------------------------------------------------
+-- export_i18n
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `export_i18n`;
+
+CREATE TABLE `export_i18n`
+(
+    `id` INTEGER NOT NULL,
+    `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
+    `title` VARCHAR(255) NOT NULL,
+    `description` LONGTEXT,
+    PRIMARY KEY (`id`,`locale`),
+    CONSTRAINT `export_i18n_FK_1`
+        FOREIGN KEY (`id`)
+        REFERENCES `export` (`id`)
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+
+
 INSERT INTO `config`(`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
 ('form_firewall_bruteforce_time_to_wait', '10', 0, 0, NOW(), NOW()),
 ('form_firewall_time_to_wait', '60', 0, 0, NOW(), NOW()),