Merge pull request #53 from enupal/develop

Develop

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Enupal Snapshot Changelog
 
+## 2.0.1 - 2022.06.03
+### Fixed
+- Fixed issue when retrieving variables on footer and headers ([#52])
+
+[#52]: https://github.com/enupal/snapshot/issues/52
+
 ## 2.0.0 - 2022.05.21
 
 ### Added

composer.json

@@ -2,7 +2,7 @@
   "name": "enupal/snapshot",
   "description": "PDF or Image generation from a Url or HTML page",
   "type": "craft-plugin",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "keywords": [
     "craft",
     "cms",
@@ -15,7 +15,7 @@
   "support": {
     "email": "[email protected]",
     "issues": "https://github.com/enupal/snapshot/issues",
-    "docs": "https://enupal.com/craft-plugins/enupal-snapshot/docs"
+    "docs": "https://docs.enupal.com/enupal-snapshot/"
   },
   "authors": [
     {

src/contracts/SnappyPdf.php

@@ -60,6 +60,8 @@ protected function getGenerator(): GeneratorInterface
      */
     public function displayHtml($html, $settings = null)
     {
+        Snapshot::$app->snapshots::addVariables($settings['variables'] ?? []);
+
         $settingsModel = $this->populateSettings($settings);
 
         $response = $this->_generatePdf($html, $settingsModel);
@@ -154,17 +156,13 @@ public function getDefaultOptions($options = [])
         ];
 
         if (isset($options['header-html'])) {
-            $variables = $settings['variables'] ?? [];
-
-            $html = Craft::$app->getView()->renderTemplate($options['header-html'], $variables);
+            $html = Craft::$app->getView()->renderTemplate($options['header-html'], Snapshot::$app->snapshots->getFieldVariables());
 
             $options['header-html'] = $html;
         }
 
         if (isset($options['footer-html'])) {
-            $variables = $settings['variables'] ?? [];
-
-            $html = Craft::$app->getView()->renderTemplate($options['footer-html'], $variables);
+            $html = Craft::$app->getView()->renderTemplate($options['footer-html'], Snapshot::$app->snapshots->getFieldVariables());
 
             $options['footer-html'] = $html;
         }