Merge branch 'release/1.1.0'

Author: ma4nn

.gitignore

@@ -0,0 +1,2 @@
+.idea
+vendor/

LICENSE.txt

@@ -1,18 +1,40 @@
-# Matomo.
-
-Matomo Module based on adrianspeyer/Piwik-for-Magento
-
-## Installation
-
-### Modgit: [https://github.com/jreinke/modgit](https://github.com/jreinke/modgit)
-
-    $ cd /path/to/magento
-    $ modgit init
-    $ modgit add installments https://github.com/contardi/installments.git
-
-### Manual:
-
-- Download [latest version](https://github.com/contardi/matomo-magento/archive/master.zip) .
-- Unzip copy and paste the files.
-- Clear all caches.
-
+Matomo Extension for Magento 1
+==============================
+
+Facts
+-----
+- extension key: `Matomo_Analytics`
+
+Description
+-----------
+This extension for Magento 1 adds the Matomo analytics tracking to your shop.
+It is based on the original implementation by `adrianspeyer/Piwik-for-Magento`.
+
+Requirements
+------------
+- PHP >= 7.4.x
+
+Installation Instructions
+-------------------------
+```
+composer require vianetz/matomo-magento1
+```
+
+Support
+-------
+If you have any issues or suggestions with this extension, please create a new Github issue.
+
+Credits
+-------
+- https://github.com/contardi/matomo-magento
+- https://github.com/adrianspeyer/Piwik-for-Magento
+
+Contribution
+------------
+Please feel free to contribute.
+
+License
+-------
+[GNU GENERAL PUBLIC LICENSE](http://www.gnu.org/licenses/gpl-3.0.txt)
+
+This Magento Extension uses Semantic Versioning - please find more information at http://semver.org.

README.md

@@ -1,12 +1,32 @@
 {
-  "name": "contardi/matomo-magento",
+  "name": "vianetz/matomo-magento1",
   "type": "magento-module",
-  "license": "GPL-3.0",
-  "description": "This is a GPL released Extension that allows you to get your Magento Ecommerce Transaction data in your Matomo install, based on Adrian Spencer Module",
+  "license": "GPL-3.0-or-later",
+  "description": "A Magento 1 extension that allows you to get ecommerce transaction data into Matomo analytics.",
+  "require-dev": {
+    "roave/security-advisories": "dev-master",
+    "magento/marketplace-eqp": ">=4.0"
+  },
   "authors": [
+    {
+      "name": "Adrian Speyer",
+      "email": "[email protected]"
+    },
     {
       "name": "Thiago Contardi",
       "email": "[email protected]"
+    },
+    {
+      "name": "Christoph Massmann",
+      "email": "[email protected]",
+      "homepage": "https://www.vianetz.com",
+      "role": "Developer"
+    }
+  ],
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://repo.magento.com/"
     }
   ]
 }

composer.json

@@ -0,0 +1,6 @@
+app/code/community/Matomo/Analytics                             app/code/community/Matomo/Analytics
+app/etc/modules/Matomo_Analytics.xml                            app/etc/modules/Matomo_Analytics.xml
+app/design/frontend/base/default/template/matomoanalytics       app/design/frontend/base/default/template/matomoanalytics
+app/design/frontend/base/default/layout/matomoanalytics.xml     app/design/frontend/base/default/layout/matomoanalytics.xml
+app/locale/en_US/Matomo_Analytics.csv                           app/locale/en_US/Matomo_Analytics.csv
+app/locale/pt_BR/Matomo_Analytics.csv                           app/locale/pt_BR/Matomo_Analytics.csv

modman

@@ -10,7 +10,6 @@
  *
  */
 
-
 class Matomo_Analytics_Model_Observer
 {
     /**
@@ -27,7 +26,7 @@ public function setMatomoAnalyticsOnOrderSuccessPageView(Varien_Event_Observer $
                 return;
             }
 
-            $block = Mage::app()->getFrontController()->getAction()->getLayout()->getBlock('matomo.scripts');
+            $block = Mage::app()->getFrontController()->getAction()->getLayout()->getBlock('matomo_script');
             if ($block) {
                 $block->setOrderIds($orderIds);
             }