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

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

Browse Source 
Thelia 203 beta
This commit is contained in:
Julien
2014-08-05 08:36:30 +02:00
parent 6640abc7b6 8b685e1818
commit 1bbf34e8a2
5 changed files with 141 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -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

2
core/lib/Thelia/Core/Thelia.php
View File

@@ -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()
{

2
core/lib/Thelia/Install/Update.php
View File

@@ -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)

4
setup/insert.sql
View File

@@ -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()),

191
setup/update/2.0.3.sql → setup/update/2.0.3-beta.sql
View File

@@ -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
@@ -363,13 +364,13 @@ DROP TABLE IF EXISTS `import_category`;
CREATE TABLE `import_category`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`position` INTEGER NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`)
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`position` INTEGER NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`)
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
@@ -380,13 +381,13 @@ DROP TABLE IF EXISTS `export_category`;
CREATE TABLE `export_category`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`position` INTEGER NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`)
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`position` INTEGER NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`)
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
@@ -397,21 +398,21 @@ DROP TABLE IF EXISTS `import`;
CREATE TABLE `import`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`import_category_id` INTEGER NOT NULL,
`position` INTEGER NOT NULL,
`handle_class` LONGTEXT NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`),
INDEX `idx_import_import_category_id` (`import_category_id`),
CONSTRAINT `fk_import_import_category_id`
FOREIGN KEY (`import_category_id`)
REFERENCES `import_category` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`import_category_id` INTEGER NOT NULL,
`position` INTEGER NOT NULL,
`handle_class` LONGTEXT NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`),
INDEX `idx_import_import_category_id` (`import_category_id`),
CONSTRAINT `fk_import_import_category_id`
FOREIGN KEY (`import_category_id`)
REFERENCES `import_category` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
@@ -422,21 +423,97 @@ DROP TABLE IF EXISTS `export`;
CREATE TABLE `export`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`export_category_id` INTEGER NOT NULL,
`position` INTEGER NOT NULL,
`handle_class` LONGTEXT NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`),
INDEX `idx_export_export_category_id` (`export_category_id`),
CONSTRAINT `fk_export_export_category_id`
FOREIGN KEY (`export_category_id`)
REFERENCES `export_category` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE
`id` INTEGER NOT NULL AUTO_INCREMENT,
`ref` VARCHAR(255) NOT NULL,
`export_category_id` INTEGER NOT NULL,
`position` INTEGER NOT NULL,
`handle_class` LONGTEXT NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
UNIQUE INDEX `ref_UNIQUE` (`ref`),
INDEX `idx_export_export_category_id` (`export_category_id`),
CONSTRAINT `fk_export_export_category_id`
FOREIGN KEY (`export_category_id`)
REFERENCES `export_category` (`id`)
ON UPDATE RESTRICT
ON DELETE CASCADE
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
-- 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;