Merge pull request #178 from firegento/develop

Merge develop into master

.all-contributorsrc

@@ -0,0 +1,222 @@
+{
+  "projectName": "firegento-magesetup2",
+  "projectOwner": "firegento",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": true,
+  "commitConvention": "none",
+  "contributors": [
+    {
+      "login": "kkrieger85",
+      "name": "Kevin Krieger",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/4435523?v=4",
+      "profile": "https://github.com/kkrieger85",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "frostblogNet",
+      "name": "Jens Richter",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19548641?v=4",
+      "profile": "https://frostblog.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "therouv",
+      "name": "Rouven Alexander Rieker",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/393419?v=4",
+      "profile": "https://rouven.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "demtaric",
+      "name": "demtaric",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/5658592?v=4",
+      "profile": "https://github.com/demtaric",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sprankhub",
+      "name": "Simon Sprankel",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/930199?v=4",
+      "profile": "https://www.simonsprankel.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "roman204",
+      "name": "Roman Hutterer",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/584168?v=4",
+      "profile": "https://copex.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "avstudnitz",
+      "name": "Andreas von Studnitz",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/662059?v=4",
+      "profile": "http://www.integer-net.de/agentur/andreas-von-studnitz/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dh1984",
+      "name": "Daniel",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/6348686?v=4",
+      "profile": "https://github.com/dh1984",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mautz-et-tong",
+      "name": "Andreas Mautz",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/12797503?v=4",
+      "profile": "https://webvisum.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "latenzio",
+      "name": "Latenzio Gonzales",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/8480072?v=4",
+      "profile": "https://github.com/latenzio",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "benedikt-g",
+      "name": "benedikt-g",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/29483104?v=4",
+      "profile": "https://github.com/benedikt-g",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "davidverholen",
+      "name": "David Verholen",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2813693?v=4",
+      "profile": "https://www.linkedin.com/in/david-verholen-14aa23aa/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "GordonLesti",
+      "name": "Gordon Lesti",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1677744?v=4",
+      "profile": "https://gordonlesti.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sylvainraye",
+      "name": "Sylvain Rayé",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/1337461?v=4",
+      "profile": "https://www.diglin.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "pixelhed",
+      "name": "Andre Flitsch",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/1169770?v=4",
+      "profile": "https://github.com/pixelhed",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "leptoquark1",
+      "name": "David Fecke",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/13577480?v=4",
+      "profile": "http://www.eyecook.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jwundrak",
+      "name": "Julian Wundrak",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2864042?v=4",
+      "profile": "https://github.com/jwundrak",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "arioch1984",
+      "name": "Fabio Brunelli",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/5476141?v=4",
+      "profile": "https://github.com/arioch1984",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "aliuosio",
+      "name": "Osiozekhai Aliu",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2536788?v=4",
+      "profile": "https://github.com/aliuosio",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "aeno",
+      "name": "aeno",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/598616?v=4",
+      "profile": "https://github.com/aeno",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Schrank",
+      "name": "Fabian Blechschmidt",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/379680?v=4",
+      "profile": "http://www.fabian-blechschmidt.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Kipperlenny",
+      "name": "Lennart Schreiber",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/563328?v=4",
+      "profile": "https://www.webzap.eu/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "HenKun",
+      "name": "Henning Kuntzschmann",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/18382633?v=4",
+      "profile": "https://github.com/HenKun",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7
+}

.travis.yml

@@ -13,16 +13,21 @@ env:
 matrix:
   fast_finish: true
   include:
-  - php: 7.1
-    env: MAGENTO_VERSION=2.2.0
-  - php: 7.1
-    env: MAGENTO_VERSION=2.2.*
+  # make sure it is running on the oldest supported version
   - php: 7.2
-    env: MAGENTO_VERSION=2.3.0 CODE_QUALITY=true
+    env: MAGENTO_VERSION=2.3.0
+  # fix the code quality check to a specific, but rather new version
   - php: 7.2
-    env: MAGENTO_VERSION=2.3.*
+    env: MAGENTO_VERSION=2.3.5-p1 CODE_QUALITY=true
+  # make sure it is running on the latest version
+  - php: 7.2
+    env: MAGENTO_VERSION=2.3.1 INTEGRATION_TEST=true
+  - php: 7.2
+    env: MAGENTO_VERSION=2.3.* INTEGRATION_TEST=true
+  - php: 7.3
+    env: MAGENTO_VERSION=2.3.3 INTEGRATION_TEST=true
   - php: 7.3
-    env: MAGENTO_VERSION=2.3.*
+    env: MAGENTO_VERSION=2.3.* INTEGRATION_TEST=true
 
 
 language: php

Block/Imprint/Content.php

@@ -11,9 +11,7 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * Class Content
- *
- * @package FireGento\MageSetup\Block\Imprint
+ * Block for showing imprint contents.
  */
 class Content extends \Magento\Framework\View\Element\Template
 {

Block/Imprint/Field.php

@@ -6,9 +6,7 @@
 namespace FireGento\MageSetup\Block\Imprint;
 
 /**
- * Class Field
- *
- * @package FireGento\MageSetup\Block\Imprint
+ * Block for showing imprint fields.
  */
 class Field extends \FireGento\MageSetup\Block\Imprint\Content
 {

Block/Price/Details.php

@@ -3,14 +3,13 @@
  * Copyright © 2016 FireGento e.V.
  * See LICENSE.md bundled with this module for license details.
  */
+
 namespace FireGento\MageSetup\Block\Price;
 
 use Magento\Customer\Model\ResourceModel\GroupRepository;
 
 /**
- * Class Details
- *
- * @package FireGento\MageSetup\Block\Price
+ * Block for showing price details like tax rate and delivery information.
  */
 class Details extends \Magento\Framework\View\Element\Template
 {
@@ -35,7 +34,7 @@ class Details extends \Magento\Framework\View\Element\Template
     private $groupRepository;
 
     /**
-     * @var \Magento\Tax\Model\Calculation\Proxy
+     * @var \Magento\Tax\Model\Calculation
      */
     private $taxCalculation;
 
@@ -51,7 +50,7 @@ class Details extends \Magento\Framework\View\Element\Template
      * @param \FireGento\MageSetup\Model\System\Config $magesetupConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param GroupRepository $groupRepository
-     * @param \Magento\Tax\Model\Calculation\Proxy $taxCalculation
+     * @param \Magento\Tax\Model\Calculation $taxCalculation
      * @param \Magento\Tax\Helper\Data $taxHelper
      * @param array $data
      */
@@ -60,7 +59,7 @@ public function __construct(
         \FireGento\MageSetup\Model\System\Config $magesetupConfig,
         \Magento\Customer\Model\Session $customerSession,
         GroupRepository $groupRepository,
-        \Magento\Tax\Model\Calculation\Proxy $taxCalculation,
+        \Magento\Tax\Model\Calculation $taxCalculation,
         \Magento\Tax\Helper\Data $taxHelper,
         array $data = []
     ) {
@@ -117,10 +116,13 @@ public function getPriceDisplayType()
     public function isIncludingShippingCosts()
     {
         if (!$this->getData('is_including_shipping_costs')) {
-            $this->setData('is_including_shipping_costs', $this->magesetupConfig->isIncludingShippingCosts());
+            $this->setData(
+                'is_including_shipping_costs',
+                $this->magesetupConfig->isIncludingShippingCosts()
+            );
         }
 
-        return $this->getData('is_including_shipping_costs');
+        return (bool)$this->getData('is_including_shipping_costs');
     }
 
     /**

Block/Product/Delivery.php

@@ -6,9 +6,7 @@
 namespace FireGento\MageSetup\Block\Product;
 
 /**
- * Class Delivery
- *
- * @package FireGento\MageSetup\Block\Product
+ * Block for showing delivery information.
  */
 class Delivery extends \Magento\Catalog\Block\Product\View\Description
 {

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+
+## v0.3.0
+### Fixed
+- Fix imprint blocks in mails [#149](https://github.com/firegento/firegento-magesetup2/issues/149) (thanks @sprankhub)
+- Hide tax details for grouped product [#150](https://github.com/firegento/firegento-magesetup2/issues/150) (thanks @sprankhub)
+- Fix setting of tax class ID on products (thanks @sprankhub)
+- Configure kg as weight unit during setup [#31](https://github.com/firegento/firegento-magesetup2/issues/31) (thanks @sprankhub)
+- Use delivery time label from attribute config (Note you have to configure the attribute lable in the admin area) [#124](https://github.com/firegento/firegento-magesetup2/issues/124) (thanks @sprankhub)
+- Use newer coding magento standard (thanks @sprankhub) 
+- Update English translation (thanks @sprankhub)
+- Update German translation (thanks @sprankhub)
+- Replace around with after plugin (thanks @sprankhub)
+
+### Added
+- Add all contributors and bot config (thanks @kkrieger85)
+- Add integration test (thanks @sprankhub,@BorisovskiP)
+- Add integration test to travis ci [#166](https://github.com/firegento/firegento-magesetup2/issues/166) (thanks @frostblogNet) 
+- Add unit test form blocks (thanks @frostblogNet)
+- Add integration test for visible in checkout property (thanks @sprankhub)
+
+
+### Removed
+- Remove price details from tier prices [#87](https://github.com/firegento/firegento-magesetup2/issues/87) (thanks @sprankhub)
+- Drop support for magento 2.2.x and php 7.1.x (thanks @sprankhub,@frostblogNet)
+- Remove unused Dutch translation (thanks @sprankhub)