Skip to content

Commit

Permalink
Merge pull request #75 from EaDesgin/feature/2862-Took-off-emailvariable
Browse files Browse the repository at this point in the history
#2862:Took off email variable
  • Loading branch information
mardeleanu authored Jan 30, 2019
2 parents 883cf69 + 83b0d93 commit 4b6e935
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions Controller/Adminhtml/Variable/Template.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -63,7 +62,7 @@ class Template extends Action
private $variableModel;

/**
* @var EmailVariables
* @var VariablesFacrory
*/
private $variablesFacrory;

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Eadesigndev_Pdfgenerator" setup_version="1.2.7"/>
<module name="Eadesigndev_Pdfgenerator" setup_version="1.2.8"/>
</config>

0 comments on commit 4b6e935

Please sign in to comment.