UPGRADE.md

@@ -213,9 +213,27 @@ In this document you will find a changelog of the important changes related to t
     * `sOrder::sGetOrderNumber()`
     * `Shopware_Components_Document::saveDocument()`
 * HttpCache: Added possibility to add multiple, comma separated proxy URLs
+* Removed `landingPageTeaser` and `landingPageBlock` fields from emotion shopping worlds.
+* Removed unnecessary method `getCampaignByCategoryQuery()` from `Models/Emotion/Repository.php`.
+* Removed template blocks for campaign boxes corresponding to the removed emotion fields.
+    * `frontend_index_left_campaigns_top`
+    * `frontend_index_left_campaigns_middle`
+    * `frontend_index_left_campaigns_bottom`
+    * `frontend_blog_index_campaign_top`
+    * `frontend_blog_index_campaign_middle`
+    * `frontend_blog_index_campaign_bottom`
+* Removed unnecessary template file for campaign boxes `frontend/campaign/box.tpl`.
+* Removed third party jQuery plugin dependency `masonry`.
+* Deprecated `initMasonryGrid` method and `plugin/swEmotion/onInitMasonryGrid` event in `jquery.emotion.js`
+* Removed shopping world mode `masonry`. The fallback is the new mode `fluid`.
+* Replaced old LESS mixin `createColumnSizes` for new grid mixins `createGrid` and `createColumns` in `_components/emotion.less`.
+* Added new blocks to `widgets/emotion/index.tpl` for better overriding of the configuration.
+    * `widgets/emotion/index/config`
+    * `widgets/emotion/index/attributes`
+    * `widgets/emotion/index/element/config`
 
 ## 5.1.5
-* The smarty variable `sCategoryInfo` in Listing and Blog controllers is now deprecated and will be removed soon. Use `sCategoryContent` instead, it's a drop in replacement.
+* The smarty variable `sCategoryInfo` in Listing and Blog controllers is now deprecated and will be removed soon. Use `sCategoryContent` instead, it's a drop in replacement. 
 
 ## 5.1.4
 * Customer logout will now regenerate the session id and clear the customers basket.

_sql/demo/latest.sql

@@ -6284,18 +6284,18 @@ INSERT INTO `s_emarketing_voucher_codes` (`id`, `voucherID`, `userID`, `code`, `
 (100, 4, NULL, '23A7CBA5', 0);
 
 TRUNCATE TABLE `s_emotion`;
-INSERT INTO `s_emotion` (`id`, `active`, `name`, `cols`, `cell_height`, `article_height`, `rows`, `valid_from`, `valid_to`, `userID`, `show_listing`, `is_landingpage`, `landingpage_block`, `landingpage_teaser`, `seo_title`, `seo_keywords`, `seo_description`, `create_date`, `modified`, `grid_id`, `template_id`, `device`, `fullscreen`, `mode`, `position`, `parent_id`) VALUES
-(1,	1,	'Meine Startseite',	4,	185,	2,	20,	NULL,	NULL,	55,	0,	0,	'',	'',	'',	'',	'',	'2012-08-29 08:41:30',	'2012-08-31 11:04:08',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(2,	1,	'Genusswelten',	3,	185,	2,	20,	NULL,	NULL,	57,	0,	0,	'',	'',	'',	'',	'',	'2012-08-29 10:17:44',	'2012-08-31 11:32:22',	1,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(3,	1,	'Freizeitwelten',	3,	185,	2,	20,	NULL,	NULL,	51,	0,	0,	'',	'',	'',	'',	'',	'2012-08-30 10:01:28',	'2012-08-30 17:17:59',	1,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(4,	1,	'Wohnwelten',	3,	185,	2,	20,	NULL,	NULL,	51,	0,	0,	'',	'',	'',	'',	'',	'2012-08-30 10:25:14',	'2012-08-31 11:59:00',	1,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(5,	1,	'Stop The Water While Using Me',	4,	185,	2,	20,	NULL,	NULL,	60,	0,	1,	'leftMiddle',	'media/image/testbild.jpg',	'',	'',	'',	'2012-08-30 14:19:51',	'2012-08-30 16:12:15',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(6,	1,	'The Deli Garage',	4,	185,	2,	20,	NULL,	NULL,	57,	0,	1,	'leftMiddle',	'media/image/testbild.jpg',	'',	'',	'',	'2012-08-30 15:25:01',	'2012-08-31 12:10:33',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(7,	1,	'Sommerwelten',	4,	185,	2,	20,	NULL,	NULL,	51,	0,	0,	'',	'',	'',	'',	'',	'2012-08-30 17:20:14',	'2012-08-31 12:36:20',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(8,	1,	'Beispiele',	4,	185,	2,	20,	NULL,	NULL,	59,	0,	0,	'',	'',	'',	'',	'',	'2012-08-30 17:55:11',	'2012-08-31 11:46:27',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(9,	1,	'Passend für Ihren Sommerurlaub',	4,	185,	2,	20,	NULL,	NULL,	57,	0,	1,	'leftMiddle',	'',	'',	'',	'',	'2012-08-30 18:21:14',	'2012-08-31 11:01:16',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(10,	1,	'English',	4,	185,	2,	20,	NULL,	NULL,	53,	0,	0,	'',	'',	'',	'',	'',	'2012-08-31 08:45:10',	'2012-08-31 12:35:55',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL),
-(12,	1,	'in Kürze verfügbar',	4,	185,	2,	20,	NULL,	NULL,	52,	0,	0,	'',	'',	'',	'',	'',	'2012-08-31 09:50:53',	'2012-08-31 11:57:10',	2,	1,	'0,1,2,3,4',	0,	'masonry',	1,	NULL);
+INSERT INTO `s_emotion` (`id`, `active`, `name`, `cols`, `cell_spacing`, `cell_height`, `article_height`, `rows`, `valid_from`, `valid_to`, `userID`, `show_listing`, `is_landingpage`, `seo_title`, `seo_keywords`, `seo_description`, `create_date`, `modified`, `template_id`, `device`, `fullscreen`, `mode`, `position`, `parent_id`) VALUES
+(1, 1, 'Meine Startseite', 4, 10, 185, 2, 20, NULL, NULL, 55, 0, 0, '', '', '', '2012-08-29 08:41:30', '2012-08-31 11:04:08', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(2, 1, 'Genusswelten', 3, 10, 185, 2, 20, NULL, NULL, 57, 0, 0, '', '', '', '2012-08-29 10:17:44', '2012-08-31 11:32:22', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(3, 1, 'Freizeitwelten', 3, 10, 185, 2, 20, NULL, NULL, 51, 0, 0, '', '', '', '2012-08-30 10:01:28', '2012-08-30 17:17:59', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(4, 1, 'Wohnwelten', 3, 10, 185, 2, 20, NULL, NULL, 51, 0, 0, '', '', '', '2012-08-30 10:25:14', '2012-08-31 11:59:00', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(5, 1, 'Stop The Water While Using Me', 4, 10, 185, 2, 20, NULL, NULL, 60, 0, 1, '', '', '', '2012-08-30 14:19:51', '2012-08-30 16:12:15', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(6, 1, 'The Deli Garage', 4, 10, 185, 2, 20, NULL, NULL, 57, 0, 1, '', '', '', '2012-08-30 15:25:01', '2012-08-31 12:10:33', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(7, 1, 'Sommerwelten', 4, 10, 185, 2, 20, NULL, NULL, 51, 0, 0, '', '', '', '2012-08-30 17:20:14', '2012-08-31 12:36:20', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(8, 1, 'Beispiele', 4, 10, 185, 2, 20, NULL, NULL, 59, 0, 0, '', '', '', '2012-08-30 17:55:11', '2012-08-31 11:46:27', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(9, 1, 'Passend für Ihren Sommerurlaub', 4, 10, 185, 2, 20, NULL, NULL, 57, 0, 1, '', '', '', '2012-08-30 18:21:14', '2012-08-31 11:01:16', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(10, 1, 'English', 4, 10, 185, 2, 20, NULL, NULL, 53, 0, 0, '', '', '', '2012-08-31 08:45:10', '2012-08-31 12:35:55', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL),
+(12, 1, 'in Kürze verfügbar', 4, 10, 185, 2, 20, NULL, NULL, 52, 0, 0, '', '', '', '2012-08-31 09:50:53', '2012-08-31 11:57:10', 1, '0,1,2,3,4', 0, 'masonry', 1, NULL);
 
 TRUNCATE TABLE `s_emotion_attributes`;
 TRUNCATE TABLE `s_emotion_categories`;
@@ -6626,12 +6626,6 @@ INSERT INTO `s_emotion_element_value` (`id`, `emotionID`, `elementID`, `componen
 (4259, 7, 1511, 4, 8, 'selected_article'),
 (4260, 7, 1512, 6, 12, '3');
 
-TRUNCATE TABLE `s_emotion_grid`;
-INSERT INTO `s_emotion_grid` (`id`, `name`, `cols`, `rows`, `cell_height`, `article_height`, `gutter`) VALUES
-(1, '3-Spaltig', 3, 20, 185, 2, 10),
-(2, '4-Spaltig', 4, 20, 185, 2, 10);
-
-
 TRUNCATE TABLE `s_emotion_templates`;
 INSERT INTO `s_emotion_templates` (`id`, `name`, `file`) VALUES
 (1, 'Standard', 'index.tpl');
@@ -10369,4 +10363,9 @@ INSERT INTO `s_user_addresses` (`id`, `user_id`, `company`, `department`, `salut
 (1, 1, 'Muster GmbH', NULL, 'mr', 'Max', 'Mustermann', 'Musterstr. 55', '55555', 'Musterhausen', '05555 / 555555', 2, 3, NULL),
 (2, 2, 'B2B', 'Einkauf', 'mr', 'Händler', 'Kundengruppe-Netto', 'Musterweg 1', '55555', 'Musterstadt', '012345 / 6789', 2, 3, NULL),
 (3, 1, 'shopware AG', NULL, 'mr', 'Max', 'Mustermann', 'Mustermannstraße 92', '48624', 'Schöppingen', NULL, 2, NULL, NULL),
-(4, 2, 'B2B', 'Einkauf', 'mr', 'Händler', 'Kundengruppe-Netto', 'Musterweg 1', '00000', 'Musterstadt', NULL, 2, 3, NULL);
+(4, 2, 'B2B', 'Einkauf', 'mr', 'Händler', 'Kundengruppe-Netto', 'Musterweg 1', '00000', 'Musterstadt', NULL, 2, 3, NULL);
+
+TRUNCATE s_emotion_shops;
+INSERT INTO `s_emotion_shops` (`id`, `emotion_id`, `shop_id`) VALUES
+(1, 5, 1),
+(2, 9, 1);

_sql/migrations/725-remove-emotion-grids.php

@@ -0,0 +1,30 @@
+<?php
+
+class Migrations_Migration725 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $this->addSql("ALTER TABLE `s_emotion` ADD `cell_spacing` INT NOT NULL AFTER `cols`");
+
+        $sql = <<<'EOD'
+UPDATE `s_emotion` AS e
+INNER JOIN s_emotion_grid AS eg
+ON e.grid_id = eg.id SET
+e.cols = eg.cols,
+e.rows = eg.rows,
+e.cell_spacing = eg.gutter,
+e.cell_height = eg.cell_height,
+e.article_height = eg.article_height
+EOD;
+
+        $this->addSql($sql);
+
+        $this->addSql("ALTER TABLE `s_emotion` DROP `grid_id`");
+
+        $this->addSql("DROP TABLE IF EXISTS s_emotion_grid");
+    }
+}

_sql/migrations/726-remove-landingpage-teaser.php

@@ -0,0 +1,13 @@
+<?php
+
+class Migrations_Migration726 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $this->addSql("ALTER TABLE `s_emotion` DROP `landingpage_block`, DROP `landingpage_teaser`");
+    }
+}

_sql/migrations/727-add-translatable-field-with-data.php

@@ -0,0 +1,44 @@
+<?php
+
+class Migrations_Migration727 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $translatables = [
+            ['name' => 'article_slider_title',      'componentID' => 11],
+            ['name' => 'title',                     'componentID' => 3],
+            ['name' => 'link',                      'componentID' => 3],
+            ['name' => 'banner_slider_title',       'componentID' => 7],
+            ['name' => 'javascript',                'componentID' => 13],
+            ['name' => 'smarty',                    'componentID' => 13],
+            ['name' => 'manufacturer_slider_title', 'componentID' => 10],
+            ['name' => 'iframe_url',                'componentID' => 9],
+            ['name' => 'cms_title',                 'componentID' => 2],
+            ['name' => 'text',                      'componentID' => 2],
+            ['name' => 'video_id',                  'componentID' => 8],
+        ];
+
+        $sql = "ALTER TABLE `s_library_component_field` ADD translatable INT(1) NOT NULL DEFAULT 0 AFTER `allow_blank`";
+        $statement = $this->connection->prepare($sql);
+        $statement->execute();
+
+        $sql = <<<EOD
+UPDATE `s_library_component_field`
+    SET `translatable` = 1
+    WHERE `name` = :name
+    AND `componentID` = :componentID
+EOD;
+        $statement = $this->connection->prepare($sql);
+
+        foreach ($translatables as $translatable) {
+            $statement->execute([
+                ':name' => $translatable['name'],
+                ':componentID' => $translatable['componentID'],
+            ]);
+        }
+    }
+}

_sql/migrations/728-new-emotion-shop-association.php

@@ -0,0 +1,22 @@
+<?php
+
+class Migrations_Migration728 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $sql = <<<'EOD'
+CREATE TABLE IF NOT EXISTS `s_emotion_shops` (
+  `id` INT(11) NOT NULL AUTO_INCREMENT ,
+  `emotion_id` INT(11) NOT NULL ,
+  `shop_id` INT(11) NOT NULL ,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;
+EOD;
+
+        $this->addSql($sql);
+    }
+}

_sql/migrations/729-migrate-old-emotion-relation.php

@@ -0,0 +1,35 @@
+<?php
+
+class Migrations_Migration729 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $statement = $this->connection->query("SELECT id, category_id FROM s_core_shops");
+        $shopCategories = $statement->fetchAll(PDO::FETCH_KEY_PAIR);
+
+        $sql = <<<EOD
+INSERT IGNORE INTO s_emotion_shops (shop_id, emotion_id)
+SELECT :shopId as shop_id,
+       ec.emotion_id as emotion_id
+FROM s_emotion_categories ec
+    INNER JOIN s_emotion e
+        ON e.id = ec.emotion_id
+        AND e.is_landingpage = 1
+    INNER JOIN s_categories c
+        ON c.id = ec.category_id
+        AND (c.path LIKE :path OR c.id = :categoryId)
+
+EOD;
+
+        $statement = $this->connection->prepare($sql);
+
+        foreach ($shopCategories as $shopId => $category) {
+            $path = '%|'.$category.'|%';
+            $statement->execute([':path' => $path, ':categoryId' => $category, ':shopId' => $shopId]);
+        }
+    }
+}

_sql/migrations/730-add-article-widget-categorie-selection.php

@@ -0,0 +1,29 @@
+<?php
+
+class Migrations_Migration730 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $sql = <<<'EOD'
+UPDATE `s_library_component_field` as `field`
+SET `position` = 9
+WHERE `field`.`name` = 'article'
+AND `field`.`componentID` = 4
+EOD;
+
+        $this->addSql($sql);
+
+        $sql = <<<'EOD'
+INSERT INTO `s_library_component_field`
+  (`componentID`, `name`, `x_type`, `field_label`, `allow_blank`, `translatable`, `position`)
+  VALUES ('4', 'article_category', 'emotion-components-fields-category-selection', 'Kategorie', '1', '0', '9');
+EOD;
+
+        $this->addSql($sql);
+
+    }
+}

_sql/migrations/731-add-emotion-element-viewport.php

@@ -0,0 +1,28 @@
+<?php
+
+class Migrations_Migration731 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $sql = <<<SQL
+CREATE TABLE IF NOT EXISTS `s_emotion_element_viewports` (
+    `id` INT(11) NOT NULL AUTO_INCREMENT,
+    `elementID` INT(11) NOT NULL,
+    `emotionID` INT(11) NOT NULL,
+    `alias` VARCHAR(255) COLLATE utf8_unicode_ci NOT NULL,
+    `start_row` INT(11) NOT NULL,
+    `start_col` INT(11) NOT NULL,
+    `end_row` INT(11) NOT NULL,
+    `end_col` INT(11) NOT NULL,
+    `visible` INT(1) NOT NULL DEFAULT 1,
+    PRIMARY KEY (`id`)) ENGINE = InnoDB
+    DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SQL;
+
+        $this->addSql($sql);
+    }
+}

_sql/migrations/732-fixed-iframe-widget-xtype.php

@@ -0,0 +1,17 @@
+<?php
+
+class Migrations_Migration732 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $sql = <<<SQL
+UPDATE `s_library_component` SET `x_type` = 'emotion-components-iframe' WHERE `name` = 'iFrame-Element'
+SQL;
+
+        $this->addSql($sql);
+    }
+}

_sql/migrations/733-migrate-emotion-widget-settings.php

@@ -0,0 +1,33 @@
+<?php
+
+class Migrations_Migration733 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $viewports = [ 'xs', 's', 'm', 'l', 'xl' ];
+
+        $sql = <<<EOD
+INSERT IGNORE INTO s_emotion_element_viewports (elementID, emotionID, alias, start_row, start_col, end_row, end_col, visible)
+SELECT
+    id as elementID,
+    emotionID,
+    :viewport,
+    start_row,
+    start_col,
+    end_row,
+    end_col,
+    1 as visible
+FROM s_emotion_element
+EOD;
+
+        $statement = $this->connection->prepare($sql);
+
+        foreach($viewports as $viewport) {
+            $statement->execute([':viewport' => $viewport]);
+        }
+    }
+}

_sql/migrations/734-new-border-setting-for-emotion-widgets.php

@@ -0,0 +1,36 @@
+<?php
+
+class Migrations_Migration734 extends Shopware\Components\Migrations\AbstractMigration
+{
+    /**
+     * @param string $modus
+     * @return void
+     */
+    public function up($modus)
+    {
+        $components = [
+            'emotion-components-article',
+            'emotion-components-article-slider',
+            'emotion-components-manufacturer-slider'
+        ];
+
+        $sql = <<<'EOD'
+INSERT IGNORE INTO s_library_component_field
+(componentID, name, x_type, allow_blank, position)
+SELECT
+    id as componentID,
+    'no_border' as name,
+    'checkbox' as x_type,
+    1 as allow_blank,
+    90 as position
+FROM s_library_component
+WHERE x_type = :xtype
+EOD;
+
+        $statement = $this->connection->prepare($sql);
+
+        foreach($components as $component) {
+            $statement->execute([':xtype' => $component]);
+        }
+    }
+}

engine/Shopware/Bundle/MediaBundle/GarbageCollectorFactory.php

@@ -88,7 +88,6 @@ private function getDefaultMediaPositions()
             new MediaPosition('s_emotion_element_value', 'value', 'path'),
             new MediaPosition('s_emotion_element_value', 'value', 'path', MediaPosition::PARSE_JSON),
             new MediaPosition('s_emotion_element_value', 'value', 'path', MediaPosition::PARSE_HTML),
-            new MediaPosition('s_emotion', 'landingpage_teaser', 'path'),
             new MediaPosition('s_articles_downloads', 'filename', 'path'),
             new MediaPosition('s_articles_supplier', 'img', 'path'),
             new MediaPosition('s_core_templates_config_values', 'value', 'path', MediaPosition::PARSE_SERIALIZE),