54309 Script Loading issue for onoffice-captchacontrol.min.js when form is placed in the footer

plugin/Form.php

@@ -645,6 +645,18 @@ public function getFormId()
 	}
 
 
+	/**
+	 *
+	 * @return string
+	 *
+	 */
+
+	public function getFormType()
+	{
+		return esc_html($this->getDataFormConfiguration()->getFormType());
+	}
+
+
 	/**
 	 *
 	 * @return bool

plugin/ScriptLoader/IncludeFileModel.php

@@ -55,6 +55,8 @@ class IncludeFileModel
     /** @var string */
 	private $_loadAsynchronous = '';
 
+	/** @var bool */
+	private $_loadBeforeRenderingTemplate = false;
 
 	/**
 	 *
@@ -175,4 +177,25 @@ public function setLoadAsynchronous(string $loadAsynchronous): self
 		$this->_loadAsynchronous = $loadAsynchronous;
 		return $this;
 	}
+
+	/**
+	 * @return bool
+	 */
+	public function getLoadBeforeRenderingTemplate(): bool
+	{
+		return $this->_loadBeforeRenderingTemplate;
+	}
+
+	/**
+	 *
+	 * @param bool $loadBeforeRenderingTemplate
+	 * @return $this
+	 *
+	 */
+
+	 public function setLoadBeforeRenderingTemplate(bool $loadBeforeRenderingTemplate): self
+	 {
+		 $this->_loadBeforeRenderingTemplate = $loadBeforeRenderingTemplate;
+		 return $this;
+	 }
 }

plugin/ScriptLoader/ScriptLoaderGeneric.php

@@ -60,11 +60,14 @@ public function enqueue()
 	{
 		/* @var $pIncludeModel IncludeFileModel */
 		foreach ($this->getModelByType(IncludeFileModel::TYPE_SCRIPT) as $pIncludeModel) {
-			wp_enqueue_script($pIncludeModel->getIdentifier());
-			wp_script_add_data($pIncludeModel->getIdentifier(), $pIncludeModel->getLoadAsynchronous(), true);
+			if ($pIncludeModel->getLoadBeforeRenderingTemplate()){
+                wp_enqueue_script($pIncludeModel->getIdentifier());
+			}
 		}
 		foreach ($this->getModelByType(IncludeFileModel::TYPE_STYLE) as $pIncludeModel) {
-			wp_enqueue_style($pIncludeModel->getIdentifier());
+			if ($pIncludeModel->getLoadBeforeRenderingTemplate()){
+                wp_enqueue_style($pIncludeModel->getIdentifier());
+			}
 		}
 	}
 
@@ -78,7 +81,8 @@ public function register()
 		/* @var $pIncludeModel IncludeFileModel */
 		foreach ($this->getModelByType(IncludeFileModel::TYPE_SCRIPT) as $pIncludeModel) {
 			wp_register_script($pIncludeModel->getIdentifier(), $pIncludeModel->getFilePath(),
-				$pIncludeModel->getDependencies(), false, $pIncludeModel->getLoadInFooter());
+				$pIncludeModel->getDependencies(), false, array('strategy' => $pIncludeModel->getLoadAsynchronous(), 'in_footer' => $pIncludeModel->getLoadInFooter()));
+			$this->_pConfiguration->localizeScript($pIncludeModel->getIdentifier());
 		}
 		foreach ($this->getModelByType(IncludeFileModel::TYPE_STYLE) as $pIncludeModel) {
 			wp_register_style($pIncludeModel->getIdentifier(), $pIncludeModel->getFilePath(),

plugin/ScriptLoader/ScriptLoaderGenericConfiguration.php

@@ -36,4 +36,11 @@ interface ScriptLoaderGenericConfiguration
 	 */
 
 	public function getScriptLoaderGenericConfiguration(): array;
+
+	/**
+	 * @param string $scriptIdentifier
+	 * @return void
+	 */
+
+	public function localizeScript(string $scriptIdentifier);
 }