YetiForceCompany / YetiForcePortal2

app/Cache.php

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 		if (static::$clearOpcache) {
 			return false;
 		}
-		register_shutdown_function(function () {
+		register_shutdown_function(function() {
 			static::resetOpcache();
 		});
 		static::$clearOpcache = true;

app/Log.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 */
 	public static function init()
 	{
-		register_shutdown_function(function () {
+		register_shutdown_function(function() {
 			static::flush();
 		});
 	}

config/csrf_config.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	{
 		//Override the default expire time of token
 		\CsrfMagic\Csrf::$expires = 259200;
-		\CsrfMagic\Csrf::$callback = function ($tokens) {
+		\CsrfMagic\Csrf::$callback = function($tokens) {
 			throw new \App\Exceptions\BadRequest('Invalid request - Response For Illegal Access');
 		};
 		$js = PUBLIC_DIRECTORY . 'vendor/yetiforce/csrf-magic/src/Csrf.min.js';

modules/Users/View/TwoFactorAuthenticationModal.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 		if (empty($response['secretKey'])) {
 			$this->authMethods = $response['authMethods'];
 		} else {
-			['authMethods' => $this->authMethods , 'secretKey' => $this->secretKey] = $response;
+			['authMethods' => $this->authMethods, 'secretKey' => $this->secretKey] = $response;
 			$this->viewer->assign('QR_CODE_HTML', $this->createQrCodeForUser());
 		}
 		$this->viewer->assign('SECRET_KEY', $this->secretKey);

app/Api.php

Spacing +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 		if (Config::$apiAllLogs || (Config::$apiErrorLogs && (isset($responseBody['error']) || empty($responseBody) || 200 !== $response->getStatusCode()))) {
 			\App\Log::info([
 				'request' => ['date' => date('Y-m-d H:i:s', $startTime), 'requestType' => strtoupper($requestType), 'method' => $method, 'headers' => $headers, 'rawBody' => $this->dataBody, 'body' => $data],
-				'response' => ['time' => round(microtime(true) - $startTime, 2), 'status' => $response->getStatusCode(), 'reasonPhrase' => $response->getReasonPhrase(), 'headers' => $response->getHeaders(),	'rawBody' => $rawResponse, 'body' => $responseBody],
+				'response' => ['time' => round(microtime(true) - $startTime, 2), 'status' => $response->getStatusCode(), 'reasonPhrase' => $response->getReasonPhrase(), 'headers' => $response->getHeaders(), 'rawBody' => $rawResponse, 'body' => $responseBody],
 			], 'Api');
 		}
 		if (isset($responseBody['error'])) {

modules/Base/FieldTypes/BaseField.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	protected $defaultOperator = 'a';
 
 	/** @var string[] Not supported field types. */
-	protected $notSupportedToEdit = ['multiCurrency', 'serverAccess', 'multiReference', 'barcode', 'changesJson', 'iban', 'token', 'currencyInventory', 'twitter', 'multiReferenceValue',  'taxes', 'recurrence', 'meetingUrl', 'reminder', 'totalTime',  'multiowner', 'userReference', 'currencyList', 'modules', 'inventoryLimit', 'multiEmail', 'multiDependField', 'smtp', 'multiDomain', 'magentoServer'];
+	protected $notSupportedToEdit = ['multiCurrency', 'serverAccess', 'multiReference', 'barcode', 'changesJson', 'iban', 'token', 'currencyInventory', 'twitter', 'multiReferenceValue', 'taxes', 'recurrence', 'meetingUrl', 'reminder', 'totalTime', 'multiowner', 'userReference', 'currencyList', 'modules', 'inventoryLimit', 'multiEmail', 'multiDependField', 'smtp', 'multiDomain', 'magentoServer'];
 
 	/**
 	 * Function to set the name of the module to which the record belongs.

app/Controller/View.php

Indentation +350 added lines, -350 removed lines

@@ -18,374 +18,374 @@
  */
 abstract class View extends Base
 {
-    /** @var \App\Viewer Viewer object. */
-    protected $viewer;
+	/** @var \App\Viewer Viewer object. */
+	protected $viewer;
 
-    /** {@inheritdoc} */
-    public function __construct(\App\Request $request)
-    {
-        parent::__construct($request);
-        $this->loadJsConfig($request);
-        $this->viewer = new \App\Viewer();
-        $this->viewer->assign('MODULE_NAME', $this->getModuleNameFromRequest($this->request));
-        $this->viewer->assign('VIEW', $this->request->getByType('view', \App\Purifier::ALNUM));
-        $this->viewer->assign('NONCE', \App\Session::get('CSP_TOKEN'));
-        $this->viewer->assign('LANGUAGE', \App\Language::getLanguage());
-        $this->viewer->assign('LANG', \App\Language::getShortLanguageName());
-        $this->viewer->assign('USER', \App\User::getUser());
-        $this->viewer->assign('ACTION_NAME', $this->request->getAction());
-    }
+	/** {@inheritdoc} */
+	public function __construct(\App\Request $request)
+	{
+		parent::__construct($request);
+		$this->loadJsConfig($request);
+		$this->viewer = new \App\Viewer();
+		$this->viewer->assign('MODULE_NAME', $this->getModuleNameFromRequest($this->request));
+		$this->viewer->assign('VIEW', $this->request->getByType('view', \App\Purifier::ALNUM));
+		$this->viewer->assign('NONCE', \App\Session::get('CSP_TOKEN'));
+		$this->viewer->assign('LANGUAGE', \App\Language::getLanguage());
+		$this->viewer->assign('LANG', \App\Language::getShortLanguageName());
+		$this->viewer->assign('USER', \App\User::getUser());
+		$this->viewer->assign('ACTION_NAME', $this->request->getAction());
+	}
 
-    /**
-     * Check permission.
-     *
-     * @throws \App\Exceptions\NoPermitted
-     *
-     * @return void
-     */
-    public function checkPermission(): void
-    {
-        $this->getModuleNameFromRequest($this->request);
-        if (!\App\User::getUser()->isPermitted($this->moduleName)) {
-            throw new \App\Exceptions\AppException('ERR_MODULE_PERMISSION_DENIED');
-        }
-    }
+	/**
+	 * Check permission.
+	 *
+	 * @throws \App\Exceptions\NoPermitted
+	 *
+	 * @return void
+	 */
+	public function checkPermission(): void
+	{
+		$this->getModuleNameFromRequest($this->request);
+		if (!\App\User::getUser()->isPermitted($this->moduleName)) {
+			throw new \App\Exceptions\AppException('ERR_MODULE_PERMISSION_DENIED');
+		}
+	}
 
-    /** {@inheritdoc} */
-    public function preProcess($display = true): void
-    {
-        if ($this->loginRequired()) {
-            $this->viewer->assign('MENU', \YF\Modules\Base\Model\Menu::getInstance($this->viewer->getTemplateVars('MODULE_NAME'))->getMenu());
-        }
-        $this->viewer->assign('PAGE_TITLE', (\Conf\Config::$siteName ?: \App\Language::translate('LBL_CUSTOMER_PORTAL')) . ' ' . $this->getPageTitle());
-        $this->viewer->assign('CSS_FILE', $this->getHeaderCss());
-        $this->viewer->assign('USER_QUICK_MENU', $this->getUserQuickMenuLinks());
-        if ($display) {
-            $this->preProcessDisplay();
-        }
-    }
+	/** {@inheritdoc} */
+	public function preProcess($display = true): void
+	{
+		if ($this->loginRequired()) {
+			$this->viewer->assign('MENU', \YF\Modules\Base\Model\Menu::getInstance($this->viewer->getTemplateVars('MODULE_NAME'))->getMenu());
+		}
+		$this->viewer->assign('PAGE_TITLE', (\Conf\Config::$siteName ?: \App\Language::translate('LBL_CUSTOMER_PORTAL')) . ' ' . $this->getPageTitle());
+		$this->viewer->assign('CSS_FILE', $this->getHeaderCss());
+		$this->viewer->assign('USER_QUICK_MENU', $this->getUserQuickMenuLinks());
+		if ($display) {
+			$this->preProcessDisplay();
+		}
+	}
 
-    /**
-     * Get page title.
-     *
-     * @return string
-     */
-    public function getPageTitle(): string
-    {
-        $title = \App\Language::translateModule($this->moduleName);
-        $pageTitle = $this->getBreadcrumbTitle();
-        if (isset($this->pageTitle)) {
-            $pageTitle = \App\Language::translate($this->pageTitle);
-        }
-        if ($pageTitle) {
-            $title .= ' - ' . $pageTitle;
-        }
-        return $title;
-    }
+	/**
+	 * Get page title.
+	 *
+	 * @return string
+	 */
+	public function getPageTitle(): string
+	{
+		$title = \App\Language::translateModule($this->moduleName);
+		$pageTitle = $this->getBreadcrumbTitle();
+		if (isset($this->pageTitle)) {
+			$pageTitle = \App\Language::translate($this->pageTitle);
+		}
+		if ($pageTitle) {
+			$title .= ' - ' . $pageTitle;
+		}
+		return $title;
+	}
 
-    /**
-     * Get breadcrumb title.
-     *
-     * @return string
-     */
-    public function getBreadcrumbTitle(): string
-    {
-        if (!empty($this->pageTitle)) {
-            return $this->pageTitle;
-        }
-        return '';
-    }
+	/**
+	 * Get breadcrumb title.
+	 *
+	 * @return string
+	 */
+	public function getBreadcrumbTitle(): string
+	{
+		if (!empty($this->pageTitle)) {
+			return $this->pageTitle;
+		}
+		return '';
+	}
 
-    /**
-     * Convert scripts path.
-     *
-     * @param array  $files
-     * @param string $fileExtension
-     *
-     * @return array
-     */
-    public function convertScripts(array $files, string $fileExtension): array
-    {
-        $scriptsInstances = [];
-        foreach ($files as $file) {
-            [$fileName, $isOptional] = array_pad($file, 2, false);
-            $path = ROOT_DIRECTORY . "/public_html/$fileName";
-            $script = new \App\Script();
-            $script->set('type', $fileExtension);
-            $minFilePath = str_replace('.' . $fileExtension, '.min.' . $fileExtension, $fileName);
-            if (\App\Config::$minScripts && file_exists(ROOT_DIRECTORY . "/public_html/$minFilePath")) {
-                $scriptsInstances[] = $script->set('src', PUBLIC_DIRECTORY . $minFilePath . self::getTime($path));
-            } elseif (file_exists($path)) {
-                $scriptsInstances[] = $script->set('src', PUBLIC_DIRECTORY . $fileName . self::getTime($path));
-            } elseif (!$isOptional) {
-                \App\Log::warning('File not found: ' . $path);
-            }
-        }
-        return $scriptsInstances;
-    }
+	/**
+	 * Convert scripts path.
+	 *
+	 * @param array  $files
+	 * @param string $fileExtension
+	 *
+	 * @return array
+	 */
+	public function convertScripts(array $files, string $fileExtension): array
+	{
+		$scriptsInstances = [];
+		foreach ($files as $file) {
+			[$fileName, $isOptional] = array_pad($file, 2, false);
+			$path = ROOT_DIRECTORY . "/public_html/$fileName";
+			$script = new \App\Script();
+			$script->set('type', $fileExtension);
+			$minFilePath = str_replace('.' . $fileExtension, '.min.' . $fileExtension, $fileName);
+			if (\App\Config::$minScripts && file_exists(ROOT_DIRECTORY . "/public_html/$minFilePath")) {
+				$scriptsInstances[] = $script->set('src', PUBLIC_DIRECTORY . $minFilePath . self::getTime($path));
+			} elseif (file_exists($path)) {
+				$scriptsInstances[] = $script->set('src', PUBLIC_DIRECTORY . $fileName . self::getTime($path));
+			} elseif (!$isOptional) {
+				\App\Log::warning('File not found: ' . $path);
+			}
+		}
+		return $scriptsInstances;
+	}
 
-    /**
-     * Gets file modification time.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    public static function getTime(string $path): string
-    {
-        $url = '';
-        if ($fs = filemtime($path)) {
-            $url = '?s=' . $fs;
-        }
-        return $url;
-    }
+	/**
+	 * Gets file modification time.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	public static function getTime(string $path): string
+	{
+		$url = '';
+		if ($fs = filemtime($path)) {
+			$url = '?s=' . $fs;
+		}
+		return $url;
+	}
 
-    /**
-     * Retrieves css styles that need to loaded in the page.
-     *
-     * @return \App\Script[]
-     */
-    public function getHeaderCss(): array
-    {
-        return $this->convertScripts([
-            ['libraries/@fortawesome/fontawesome-free/css/all.css'],
-            ['libraries/@mdi/font/css/materialdesignicons.css'],
-            ['libraries/chosen-js/chosen.css'],
-            ['libraries/bootstrap-chosen/bootstrap-chosen.css'],
-            ['libraries/jQuery-Validation-Engine/css/validationEngine.jquery.css'],
-            ['libraries/bootstrap-tabdrop/css/tabdrop.css'],
-            ['libraries/select2/dist/css/select2.css'],
-            ['libraries/datatables.net-bs4/css/dataTables.bootstrap4.css'],
-            ['libraries/datatables.net-responsive-bs4/css/responsive.bootstrap4.css'],
-            ['libraries/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css'],
-            ['libraries/bootstrap-daterangepicker/daterangepicker.css'],
-            ['libraries/clockpicker/dist/bootstrap4-clockpicker.css'],
-            ['libraries/jstree-bootstrap-theme/dist/themes/proton/style.css'],
-            ['libraries/jstree/dist/themes/default/style.css'],
-            ['libraries/@pnotify/core/dist/PNotify.css'],
-            ['libraries/@pnotify/confirm/dist/PNotifyConfirm.css'],
-            ['libraries/@pnotify/bootstrap4/dist/PNotifyBootstrap4.css'],
-            ['libraries/@pnotify/mobile/dist/PNotifyMobile.css'],
-            ['libraries/@pnotify/desktop/dist/PNotifyDesktop.css'],
-            ['libraries/jquery-ui-dist/jquery-ui.css'],
-            ['libraries/perfect-scrollbar/css/perfect-scrollbar.css'],
-            ['layouts/resources/icons/additionalIcons.css'],
-            ['layouts/resources/icons/yfm.css'],
-            ['layouts/resources/icons/yfi.css'],
-            ['layouts/' . \App\Viewer::getLayoutName() . '/skins/basic/Main.css'],
-        ], 'css');
-    }
+	/**
+	 * Retrieves css styles that need to loaded in the page.
+	 *
+	 * @return \App\Script[]
+	 */
+	public function getHeaderCss(): array
+	{
+		return $this->convertScripts([
+			['libraries/@fortawesome/fontawesome-free/css/all.css'],
+			['libraries/@mdi/font/css/materialdesignicons.css'],
+			['libraries/chosen-js/chosen.css'],
+			['libraries/bootstrap-chosen/bootstrap-chosen.css'],
+			['libraries/jQuery-Validation-Engine/css/validationEngine.jquery.css'],
+			['libraries/bootstrap-tabdrop/css/tabdrop.css'],
+			['libraries/select2/dist/css/select2.css'],
+			['libraries/datatables.net-bs4/css/dataTables.bootstrap4.css'],
+			['libraries/datatables.net-responsive-bs4/css/responsive.bootstrap4.css'],
+			['libraries/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css'],
+			['libraries/bootstrap-daterangepicker/daterangepicker.css'],
+			['libraries/clockpicker/dist/bootstrap4-clockpicker.css'],
+			['libraries/jstree-bootstrap-theme/dist/themes/proton/style.css'],
+			['libraries/jstree/dist/themes/default/style.css'],
+			['libraries/@pnotify/core/dist/PNotify.css'],
+			['libraries/@pnotify/confirm/dist/PNotifyConfirm.css'],
+			['libraries/@pnotify/bootstrap4/dist/PNotifyBootstrap4.css'],
+			['libraries/@pnotify/mobile/dist/PNotifyMobile.css'],
+			['libraries/@pnotify/desktop/dist/PNotifyDesktop.css'],
+			['libraries/jquery-ui-dist/jquery-ui.css'],
+			['libraries/perfect-scrollbar/css/perfect-scrollbar.css'],
+			['layouts/resources/icons/additionalIcons.css'],
+			['layouts/resources/icons/yfm.css'],
+			['layouts/resources/icons/yfi.css'],
+			['layouts/' . \App\Viewer::getLayoutName() . '/skins/basic/Main.css'],
+		], 'css');
+	}
 
-    /**
-     * Pre process display.
-     *
-     * @return void
-     */
-    protected function preProcessDisplay(): void
-    {
-        if (\App\Session::has('systemError')) {
-            $this->viewer->assign('ERRORS', \App\Session::get('systemError'));
-            \App\Session::unset('systemError');
-        }
-        $this->viewer->view($this->preProcessTplName(), $this->moduleName);
-    }
+	/**
+	 * Pre process display.
+	 *
+	 * @return void
+	 */
+	protected function preProcessDisplay(): void
+	{
+		if (\App\Session::has('systemError')) {
+			$this->viewer->assign('ERRORS', \App\Session::get('systemError'));
+			\App\Session::unset('systemError');
+		}
+		$this->viewer->view($this->preProcessTplName(), $this->moduleName);
+	}
 
-    /**
-     * Get preprocess tpl name.
-     *
-     * @return string
-     */
-    protected function preProcessTplName(): string
-    {
-        return 'Header.tpl';
-    }
+	/**
+	 * Get preprocess tpl name.
+	 *
+	 * @return string
+	 */
+	protected function preProcessTplName(): string
+	{
+		return 'Header.tpl';
+	}
 
-    /**
-     * Get process tpl name.
-     *
-     * @return string
-     */
-    protected function processTplName(): string
-    {
-        return $this->request->getAction() . '/Index.tpl';
-    }
+	/**
+	 * Get process tpl name.
+	 *
+	 * @return string
+	 */
+	protected function processTplName(): string
+	{
+		return $this->request->getAction() . '/Index.tpl';
+	}
 
-    /** {@inheritdoc}  */
-    protected function postProcessTplName(): string
-    {
-        return 'Footer.tpl';
-    }
+	/** {@inheritdoc}  */
+	protected function postProcessTplName(): string
+	{
+		return 'Footer.tpl';
+	}
 
-    /** {@inheritdoc} */
-    public function postProcess(): void
-    {
-        if (null === $this->viewer->getTemplateVars('SHOW_FOOTER_BAR')) {
-            $this->viewer->assign('SHOW_FOOTER_BAR', true);
-        }
-        $this->viewer->assign('JS_FILE', $this->getFooterScripts());
-        if (\App\Config::$debugApi && \App\Session::has('debugApi') && \App\Session::get('debugApi')) {
-            $this->viewer->assign('DEBUG_API', \App\Session::get('debugApi'));
-            $this->viewer->view('DebugApi.tpl', $this->moduleName);
-            \App\Session::set('debugApi', false);
-        }
-        $this->viewer->view($this->postProcessTplName(), $this->moduleName);
-    }
+	/** {@inheritdoc} */
+	public function postProcess(): void
+	{
+		if (null === $this->viewer->getTemplateVars('SHOW_FOOTER_BAR')) {
+			$this->viewer->assign('SHOW_FOOTER_BAR', true);
+		}
+		$this->viewer->assign('JS_FILE', $this->getFooterScripts());
+		if (\App\Config::$debugApi && \App\Session::has('debugApi') && \App\Session::get('debugApi')) {
+			$this->viewer->assign('DEBUG_API', \App\Session::get('debugApi'));
+			$this->viewer->view('DebugApi.tpl', $this->moduleName);
+			\App\Session::set('debugApi', false);
+		}
+		$this->viewer->view($this->postProcessTplName(), $this->moduleName);
+	}
 
-    /**
-     * Scripts.
-     *
-     * @param bool $loadForModule
-     *
-     * @return \App\Script[]
-     */
-    public function getFooterScripts(bool $loadForModule = true): array
-    {
-        $action = $this->request->getAction();
-        $languageHandlerShortName = \App\Language::getShortLanguageName();
-        $fileName = ["libraries/jQuery-Validation-Engine/js/languages/jquery.validationEngine-$languageHandlerShortName.js"];
-        if (!file_exists(ROOT_DIRECTORY . "/public_html/{$fileName[0]}")) {
-            $fileName = ['libraries/jQuery-Validation-Engine/js/languages/jquery.validationEngine-en.js'];
-        }
-        $files = [
-            ['libraries/jquery/dist/jquery.js'],
-            ['libraries/jquery.class.js/jquery.class.js'],
-            ['libraries/block-ui/jquery.blockUI.js'],
-            ['libraries/@pnotify/core/dist/PNotify.js'],
-            ['libraries/@pnotify/mobile/dist/PNotifyMobile.js'],
-            ['libraries/@pnotify/desktop/dist/PNotifyDesktop.js'],
-            ['libraries/@pnotify/confirm/dist/PNotifyConfirm.js'],
-            ['libraries/@pnotify/bootstrap4/dist/PNotifyBootstrap4.js'],
-            ['libraries/@pnotify/font-awesome5/dist/PNotifyFontAwesome5.js'],
-            ['libraries/perfect-scrollbar/dist/perfect-scrollbar.js'],
-            ['libraries/jquery-ui-dist/jquery-ui.js'],
-            ['libraries/popper.js/dist/umd/popper.js'],
-            ['vendor/ckeditor/ckeditor/ckeditor.js'],
-            ['vendor/ckeditor/ckeditor/adapters/jquery.js'],
-            ['libraries/bootstrap/dist/js/bootstrap.js'],
-            ['libraries/bootstrap-tabdrop/js/bootstrap-tabdrop.js'],
-            ['libraries/bootstrap-datepicker/dist/js/bootstrap-datepicker.js'],
-            ['libraries/moment/min/moment.min.js'],
-            ['libraries/bootstrap-daterangepicker/daterangepicker.js'],
-            ['libraries/chosen-js/chosen.jquery.js'],
-            ['libraries/select2/dist/js/select2.full.js'],
-            ['libraries/inputmask/dist/jquery.inputmask.js'],
-            ['libraries/datatables.net/js/jquery.dataTables.js'],
-            ['libraries/datatables.net-bs4/js/dataTables.bootstrap4.js'],
-            ['libraries/datatables.net-responsive/js/dataTables.responsive.js'],
-            ['libraries/datatables.net-responsive-bs4/js/responsive.bootstrap4.js'],
-            ['libraries/jQuery-Validation-Engine/js/jquery.validationEngine.js'],
-            $fileName,
-            ['libraries/jstree/dist/jstree.js'],
-            ['libraries/clockpicker/dist/bootstrap4-clockpicker.js'],
-            ['libraries/blueimp-file-upload/js/jquery.fileupload.js'],
-            ['layouts/resources/validator/BaseValidator.js'],
-            ['layouts/resources/validator/FieldValidator.js'],
-            ['layouts/resources/helper.js'],
-            ['layouts/resources/Field.js'],
-            ['layouts/resources/Connector.js'],
-            ['layouts/resources/app.js'],
-            ['layouts/resources/MultiImage.js'],
-            ['layouts/resources/Fields.js'],
-            ['layouts/resources/ProgressIndicator.js'],
-            ['layouts/' . \App\Viewer::getLayoutName() . '/modules/Base/resources/Header.js'],
-            ['layouts/' . \App\Viewer::getLayoutName() . "/modules/Base/resources/{$action}.js"],
-        ];
-        if ($loadForModule) {
-            $moduleName = $this->getModuleNameFromRequest();
-            $files[] = ['layouts/' . \App\Viewer::getLayoutName() . "/modules/{$moduleName}/resources/{$action}.js", true];
-        }
-        return $this->convertScripts($files, 'js');
-    }
+	/**
+	 * Scripts.
+	 *
+	 * @param bool $loadForModule
+	 *
+	 * @return \App\Script[]
+	 */
+	public function getFooterScripts(bool $loadForModule = true): array
+	{
+		$action = $this->request->getAction();
+		$languageHandlerShortName = \App\Language::getShortLanguageName();
+		$fileName = ["libraries/jQuery-Validation-Engine/js/languages/jquery.validationEngine-$languageHandlerShortName.js"];
+		if (!file_exists(ROOT_DIRECTORY . "/public_html/{$fileName[0]}")) {
+			$fileName = ['libraries/jQuery-Validation-Engine/js/languages/jquery.validationEngine-en.js'];
+		}
+		$files = [
+			['libraries/jquery/dist/jquery.js'],
+			['libraries/jquery.class.js/jquery.class.js'],
+			['libraries/block-ui/jquery.blockUI.js'],
+			['libraries/@pnotify/core/dist/PNotify.js'],
+			['libraries/@pnotify/mobile/dist/PNotifyMobile.js'],
+			['libraries/@pnotify/desktop/dist/PNotifyDesktop.js'],
+			['libraries/@pnotify/confirm/dist/PNotifyConfirm.js'],
+			['libraries/@pnotify/bootstrap4/dist/PNotifyBootstrap4.js'],
+			['libraries/@pnotify/font-awesome5/dist/PNotifyFontAwesome5.js'],
+			['libraries/perfect-scrollbar/dist/perfect-scrollbar.js'],
+			['libraries/jquery-ui-dist/jquery-ui.js'],
+			['libraries/popper.js/dist/umd/popper.js'],
+			['vendor/ckeditor/ckeditor/ckeditor.js'],
+			['vendor/ckeditor/ckeditor/adapters/jquery.js'],
+			['libraries/bootstrap/dist/js/bootstrap.js'],
+			['libraries/bootstrap-tabdrop/js/bootstrap-tabdrop.js'],
+			['libraries/bootstrap-datepicker/dist/js/bootstrap-datepicker.js'],
+			['libraries/moment/min/moment.min.js'],
+			['libraries/bootstrap-daterangepicker/daterangepicker.js'],
+			['libraries/chosen-js/chosen.jquery.js'],
+			['libraries/select2/dist/js/select2.full.js'],
+			['libraries/inputmask/dist/jquery.inputmask.js'],
+			['libraries/datatables.net/js/jquery.dataTables.js'],
+			['libraries/datatables.net-bs4/js/dataTables.bootstrap4.js'],
+			['libraries/datatables.net-responsive/js/dataTables.responsive.js'],
+			['libraries/datatables.net-responsive-bs4/js/responsive.bootstrap4.js'],
+			['libraries/jQuery-Validation-Engine/js/jquery.validationEngine.js'],
+			$fileName,
+			['libraries/jstree/dist/jstree.js'],
+			['libraries/clockpicker/dist/bootstrap4-clockpicker.js'],
+			['libraries/blueimp-file-upload/js/jquery.fileupload.js'],
+			['layouts/resources/validator/BaseValidator.js'],
+			['layouts/resources/validator/FieldValidator.js'],
+			['layouts/resources/helper.js'],
+			['layouts/resources/Field.js'],
+			['layouts/resources/Connector.js'],
+			['layouts/resources/app.js'],
+			['layouts/resources/MultiImage.js'],
+			['layouts/resources/Fields.js'],
+			['layouts/resources/ProgressIndicator.js'],
+			['layouts/' . \App\Viewer::getLayoutName() . '/modules/Base/resources/Header.js'],
+			['layouts/' . \App\Viewer::getLayoutName() . "/modules/Base/resources/{$action}.js"],
+		];
+		if ($loadForModule) {
+			$moduleName = $this->getModuleNameFromRequest();
+			$files[] = ['layouts/' . \App\Viewer::getLayoutName() . "/modules/{$moduleName}/resources/{$action}.js", true];
+		}
+		return $this->convertScripts($files, 'js');
+	}
 
-    /** {@inheritdoc} */
-    public function validateRequest()
-    {
-        $this->request->validateReadAccess();
-    }
+	/** {@inheritdoc} */
+	public function validateRequest()
+	{
+		$this->request->validateReadAccess();
+	}
 
-    /** {@inheritdoc} */
-    public function postProcessAjax()
-    {
-    }
+	/** {@inheritdoc} */
+	public function postProcessAjax()
+	{
+	}
 
-    /** {@inheritdoc} */
-    public function preProcessAjax()
-    {
-    }
+	/** {@inheritdoc} */
+	public function preProcessAjax()
+	{
+	}
 
-    /**
-     * Get module name from request.
-     *
-     * @return string
-     */
-    protected function getModuleNameFromRequest(): string
-    {
-        if (empty($this->moduleName)) {
-            $this->moduleName = $this->request->getModule();
-        }
-        return $this->moduleName;
-    }
+	/**
+	 * Get module name from request.
+	 *
+	 * @return string
+	 */
+	protected function getModuleNameFromRequest(): string
+	{
+		if (empty($this->moduleName)) {
+			$this->moduleName = $this->request->getModule();
+		}
+		return $this->moduleName;
+	}
 
-    /**
-     * Load js config.
-     *
-     * @param \App\Request $request
-     */
-    public function loadJsConfig(\App\Request $request): void
-    {
-        $jsEnv = [
-            'siteUrl' => \App\Utils::getPublicUrl('', true),
-            'langPrefix' => \App\Language::getLanguage(),
-            'langKey' => \App\Language::getShortLanguageName(),
-            'parentModule' => $request->getByType('parent', 2),
-        ];
-        foreach ($jsEnv as $key => $value) {
-            \App\Config::setJsEnv($key, $value);
-        }
-    }
+	/**
+	 * Load js config.
+	 *
+	 * @param \App\Request $request
+	 */
+	public function loadJsConfig(\App\Request $request): void
+	{
+		$jsEnv = [
+			'siteUrl' => \App\Utils::getPublicUrl('', true),
+			'langPrefix' => \App\Language::getLanguage(),
+			'langKey' => \App\Language::getShortLanguageName(),
+			'parentModule' => $request->getByType('parent', 2),
+		];
+		foreach ($jsEnv as $key => $value) {
+			\App\Config::setJsEnv($key, $value);
+		}
+	}
 
-    /**
-     * Get the list of user quick menu links.
-     *
-     * @return array
-     */
-    protected function getUserQuickMenuLinks(): array
-    {
-        $user = \App\User::getUser();
-        $links = [
-            [
-                'label' => 'LBL_CHANGE_PASSWORD',
-                'moduleName' => 'Users',
-                'data' => ['url' => 'index.php?module=Users&view=PasswordChangeModal'],
-                'icon' => 'yfi yfi-change-passowrd',
-                'class' => 'text-decoration-none u-fs-sm text-secondary js-show-modal d-block',
-                'btnClass' => ' ',
-                'href' => '#',
-                'showLabel' => true,
-            ],
-            [
-                'label' => 'BTN_YOUR_ACCOUNT_ACCESS_HISTORY',
-                'moduleName' => 'Users',
-                'data' => ['url' => 'index.php?module=Users&view=AccessActivityHistoryModal'],
-                'icon' => 'yfi yfi-login-history',
-                'class' => 'text-decoration-none u-fs-sm text-secondary js-show-modal d-block',
-                'btnClass' => ' ',
-                'href' => '#',
-                'showLabel' => true,
-            ],
-        ];
-        if ('PLL_PASSWORD_2FA' === $user->get('login_method') && !$user->isEmpty('authy_methods')) {
-            $links[] = [
-                'label' => 'BTN_2FA_TOTP_QR_CODE',
-                'moduleName' => 'Users',
-                'data' => ['url' => 'index.php?module=Users&view=TwoFactorAuthenticationModal'],
-                'icon' => 'fas fa-key',
-                'class' => 'text-decoration-none u-fs-sm text-secondary js-show-modal d-block',
-                'btnClass' => ' ',
-                'href' => '#',
-                'showLabel' => true,
-            ];
-        }
-        return $links;
-    }
+	/**
+	 * Get the list of user quick menu links.
+	 *
+	 * @return array
+	 */
+	protected function getUserQuickMenuLinks(): array
+	{
+		$user = \App\User::getUser();
+		$links = [
+			[
+				'label' => 'LBL_CHANGE_PASSWORD',
+				'moduleName' => 'Users',
+				'data' => ['url' => 'index.php?module=Users&view=PasswordChangeModal'],
+				'icon' => 'yfi yfi-change-passowrd',
+				'class' => 'text-decoration-none u-fs-sm text-secondary js-show-modal d-block',
+				'btnClass' => ' ',
+				'href' => '#',
+				'showLabel' => true,
+			],
+			[
+				'label' => 'BTN_YOUR_ACCOUNT_ACCESS_HISTORY',
+				'moduleName' => 'Users',
+				'data' => ['url' => 'index.php?module=Users&view=AccessActivityHistoryModal'],
+				'icon' => 'yfi yfi-login-history',
+				'class' => 'text-decoration-none u-fs-sm text-secondary js-show-modal d-block',
+				'btnClass' => ' ',
+				'href' => '#',
+				'showLabel' => true,
+			],
+		];
+		if ('PLL_PASSWORD_2FA' === $user->get('login_method') && !$user->isEmpty('authy_methods')) {
+			$links[] = [
+				'label' => 'BTN_2FA_TOTP_QR_CODE',
+				'moduleName' => 'Users',
+				'data' => ['url' => 'index.php?module=Users&view=TwoFactorAuthenticationModal'],
+				'icon' => 'fas fa-key',
+				'class' => 'text-decoration-none u-fs-sm text-secondary js-show-modal d-block',
+				'btnClass' => ' ',
+				'href' => '#',
+				'showLabel' => true,
+			];
+		}
+		return $links;
+	}
 }

modules/Products/Model/CartView.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 class CartView extends ListViewModel
 {
-	const ADDRESS_FIELDS = ['addresslevel1', 'addresslevel2', 'addresslevel3', 'addresslevel4', 'addresslevel5', 'addresslevel6',  'addresslevel7', 'addresslevel8',  'buildingnumber', 'localnumber', 'pobox'];
+	const ADDRESS_FIELDS = ['addresslevel1', 'addresslevel2', 'addresslevel3', 'addresslevel4', 'addresslevel5', 'addresslevel6', 'addresslevel7', 'addresslevel8', 'buildingnumber', 'localnumber', 'pobox'];
 
 	/** @var Shopping cart */
 	private $cart;