From 1ee479d51993cea048649021423af44218dd6ca3 Mon Sep 17 00:00:00 2001 From: gabriela Date: Wed, 30 Jan 2019 10:51:26 +0200 Subject: [PATCH 1/2] #2862:Took off email variable --- Controller/Adminhtml/Variable/Template.php | 3 +-- composer.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Controller/Adminhtml/Variable/Template.php b/Controller/Adminhtml/Variable/Template.php index 133010e..7286cef 100644 --- a/Controller/Adminhtml/Variable/Template.php +++ b/Controller/Adminhtml/Variable/Template.php @@ -16,7 +16,6 @@ use Magento\Framework\Registry; use Magento\Framework\Json\Helper\Data as JsonHelperData; use Magento\Variable\Model\Variable as VariableModel; -use Magento\Email\Model\Source\Variables as EmailVariables; use Eadesigndev\Pdfgenerator\Model\Email\VariablesFacrory; use Magento\Email\Model\BackendTemplate as EmailBackendTemplate; use Zend_Json; @@ -63,7 +62,7 @@ class Template extends Action private $variableModel; /** - * @var EmailVariables + * @var VariablesFacrory */ private $variablesFacrory; diff --git a/composer.json b/composer.json index 2053f4e..28359d8 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "magento/module-sales": "102.0.*", "magento/framework": "102.0.*", "eadesignro/module-eacore": "^0.2.10", - "mpdf/mpdf": "v7.1.*" + "mpdf/mpdf": "7.1.*" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.13.0", From 83b0d938e1d16bccc019c63bacc684dfd9b8e947 Mon Sep 17 00:00:00 2001 From: gabriela Date: Wed, 30 Jan 2019 10:52:53 +0200 Subject: [PATCH 2/2] #2862:Changed version to 1.2.8 --- composer.json | 2 +- etc/module.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 28359d8..bb8995a 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "eadesignro/module-pdfgenerator", "description": "The best pdf generator for Magento. EaDesign PDF Generator", "type": "magento2-module", - "version": "1.2.7", + "version": "1.2.8", "autoload": { "files": [ "registration.php" diff --git a/etc/module.xml b/etc/module.xml index de243b5..0b089ae 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -6,5 +6,5 @@ */ --> - +