upgrade to stable

CHANGELOG.md

@@ -66,7 +66,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - `oneup_flysystem` removed
     - removed usages of inherited `OrderItem` classes
     - warm up the production cache before generating error pages
-
+- [#39 - Upgrade to stable version 7.0.0](https://github.com/shopsys/demoshop/pull/39)
+    - phing target build-demo is improved
+    - translations from previous changes are fixed
+    - promocode naming is unified
+    - datafixtures were copied into ShopBundle\Datafixture namespace
+    - datafixture services were registrered in Resources/config/services/commands.yml and Resources/config/services/data_fixtures.yml
+    - custom MailTemplates were merged
+    - base directory for data fixture files were changed in paths.yml
+    - MoneyType is integrated into project
+    - default image sizes were implemented for individual devices width
+
 ### Fixed
 - [#8 - Category now has second description attribute that is displayed on the product list page above the product list](https://github.com/shopsys/demoshop/pull/8)
     - GoogleFeedItemFactory: removed unused imports

app/Resources/ShopsysProductFeedGoogleBundle/views/feed.xml.twig

@@ -14,7 +14,7 @@
                     <g:image_link>{{ item.imageLink }}</g:image_link>
                 {% endif -%}
                 <g:availability>{{ item.availability }}</g:availability>
-                <g:price>{{ item.price.priceWithVat|number_format(2, '.', '') }} {{ item.currency.code }}</g:price>
+                <g:price>{{ item.price.priceWithVat|moneyFormat(2) }} {{ item.currency.code }}</g:price>
                 {%  if item.brand is not null -%}
                     <g:brand>{{ item.brand }}</g:brand>
                 {% endif -%}

app/config/packages/doctrine.yml

@@ -11,6 +11,8 @@ doctrine:
         # initialization phase (during DIC service creation) for auto-detecting version from the server.
         # See \Doctrine\DBAL\Connection::getDatabasePlatformVersion().
         server_version: "%database_server_version%"
+        types:
+            money: \Shopsys\FrameworkBundle\Component\Doctrine\MoneyType
 
     orm:
         auto_generate_proxy_classes: false

app/config/paths.yml

@@ -3,7 +3,7 @@ parameters:
     shopsys.css_version_filepath: '%shopsys.web_dir%/assets/cssVersion'
     shopsys.data_fixtures.resource_customers_filepath: '%shopsys.data_fixtures.resources_dir%/demo-data-customers.csv'
     shopsys.data_fixtures.resource_products_filepath: '%shopsys.data_fixtures.resources_dir%/demo-data-products.csv'
-    shopsys.data_fixtures.resources_dir: '%shopsys.framework.root_dir%/src/DataFixtures/resources'
+    shopsys.data_fixtures.resources_dir: '%shopsys.root_dir%/src/Shopsys/ShopBundle/DataFixtures/resources'
     shopsys.default_db_schema_filepath: '%shopsys.framework.resources_dir%/database/schema.sql'
     shopsys.domain_config_filepath: '%kernel.root_dir%/config/domains.yml'
     shopsys.domain_images_dir: '/web%shopsys.domain_images_url_prefix%'

build.xml

@@ -55,7 +55,7 @@
     <target name="build-deploy-part-1-db-independent" depends="clean,redis-check,clean-redis,composer,npm,dirs-create,assets" description="First part of application build for production preserving your DB (can be run without maintenance page)."/>
     <target name="build-deploy-part-2-db-dependent" depends="db-migrations,create-domains-data,generate-friendly-urls,replace-domains-urls,grunt,error-pages-generate,warmup" description="Second part of application build for production preserving your DB (must be run with maintenance page when containing DB migrations)."/>
     <target name="build-new" depends="wipe,redis-check,clean-redis,composer,npm,dirs-create,assets,db-rebuild,grunt,error-pages-generate,warmup,product-search-create-structure" description="Builds application for production with clean DB (with base data only)."/>
-    <target name="build-demo" depends="wipe,redis-check,clean-redis,composer,npm,dirs-create,assets,db-demo,grunt,error-pages-generate,warmup,product-search-recreate-structure" description="Builds application for production with clean demo DB."/>
+    <target name="build-demo" depends="wipe,redis-check,clean-redis,composer,npm,dirs-create,assets,db-demo,grunt,error-pages-generate,warmup,product-search-recreate-structure,product-search-export-products" description="Builds application for production with clean demo DB."/>
     <target name="db-demo" depends="db-wipe-public-schema,db-import-basic-structure,db-migrations,create-domains-data,db-fixtures-demo,load-plugin-demo-data,generate-friendly-urls,replace-domains-urls" description="Creates DB and fills it with demo data"/>
     <target name="db-rebuild" depends="db-wipe-public-schema,db-import-basic-structure,db-migrations,create-domains-data,generate-friendly-urls,replace-domains-urls" description="Drops all data in database and creates a new one with base data only."/>
     <target name="product-search-recreate-structure" depends="product-search-delete-structure,product-search-create-structure" description="Recreates structure for searching via elasticsearch (deletes existing structure and creates new one)" />

composer.json

@@ -67,15 +67,15 @@
         "sensio/framework-extra-bundle": "^3.0.29",
         "sensio/generator-bundle": "^3.1.7",
         "shopsys/doctrine-orm": "^2.6.3",
-        "shopsys/migrations": "v7.0.0-beta6",
-        "shopsys/form-types-bundle": "v7.0.0-beta6",
-        "shopsys/framework": "v7.0.0-beta6",
-        "shopsys/plugin-interface": "v7.0.0-beta6",
+        "shopsys/migrations": "v7.0.0",
+        "shopsys/form-types-bundle": "v7.0.0",
+        "shopsys/framework": "v7.0.0",
+        "shopsys/plugin-interface": "v7.0.0",
         "shopsys/postgres-search-bundle": "0.1",
-        "shopsys/product-feed-heureka": "v7.0.0-beta6",
-        "shopsys/product-feed-heureka-delivery": "v7.0.0-beta6",
-        "shopsys/product-feed-zbozi": "v7.0.0-beta6",
-        "shopsys/product-feed-google": "v7.0.0-beta6",
+        "shopsys/product-feed-heureka": "v7.0.0",
+        "shopsys/product-feed-heureka-delivery": "v7.0.0",
+        "shopsys/product-feed-zbozi": "v7.0.0",
+        "shopsys/product-feed-google": "v7.0.0",
         "snc/redis-bundle": "^2.1.8",
         "stof/doctrine-extensions-bundle": "^1.3.0",
         "symfony/assetic-bundle": "^2.8.2",
@@ -95,8 +95,8 @@
         "codeception/codeception": "^2.5.0",
         "phpstan/phpstan": "^0.11",
         "phpunit/phpunit": "^7.0",
-        "shopsys/coding-standards": "v7.0.0-beta6",
-        "shopsys/http-smoke-testing": "v7.0.0-beta6"
+        "shopsys/coding-standards": "v7.0.0",
+        "shopsys/http-smoke-testing": "v7.0.0"
     },
     "conflict": {
         "symfony/dependency-injection": "3.4.15|3.4.16"