Added minor fixes

YetiForceCompany · Oct 31, 2023 · 1b82c99 · 1b82c99
1 parent d89251f
commit 1b82c99
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/YetiForce/Shop/AbstractBaseProduct.php b/app/YetiForce/Shop/AbstractBaseProduct.php
@@ -109,7 +109,7 @@ abstract class AbstractBaseProduct
 	 *
 	 * @var string
 	 */
-	protected string $image;
+	protected ?string $image;
 
 	/** @var bool Disabled product */
 	protected bool $disabled = false;
@@ -175,7 +175,7 @@ public static function fromArray(array $data): static
 		$self->website = $data['website'] ?? '';
 		$self->introduction = \App\Purifier::purifyByType($data['shortDescription'] ?? '', \App\Purifier::TEXT);
 		$self->description = \App\Purifier::decodeHtml(\App\Purifier::purifyByType($data['description'] ?? '', \App\Purifier::HTML));
-		$self->image = $data['image'] ?? null;
+		$self->image = $data['imageUrl'] ?? null;
 
 		$packages = [];
 		$currencyCode = \App\Fields\Currency::getDefault()['currency_code'];

diff --git a/config/version.php b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-	'appVersion' => '6.4.293',
-	'patchVersion' => '2022.08.25',
+	'appVersion' => '6.4.294',
+	'patchVersion' => '2023.08.31',
 	'lib_roundcube' => '0.3.1',
 ];
diff --git a/layouts/basic/modules/Settings/Companies/Form.tpl b/layouts/basic/modules/Settings/Companies/Form.tpl
@@ -11,7 +11,7 @@
 				{if App\Security\AdminAccess::isPermitted('Dependencies')}
 					{assign var=CREDITS_LINK value="<a target=\"_blank\" href=\"index.php?module=Dependencies&view=Credits&parent=Settings&displayLicenseModal=YetiForce\">Link</a>"}
 				{/if}
-				{App\Language::translateArgs('LBL_CONDITIONS_OF_REGISTRATION', $QUALIFIED_MODULE, $CREDITS_LINK, App\Language::translate('LBL_CHANGING_ENTITY_NAME', $QUALIFIED_MODULE))}
+				{App\Language::translateArgs('LBL_CONDITIONS_OF_REGISTRATION', $QUALIFIED_MODULE, $CREDITS_LINK, '')}
 			</span>
 		</div>
 		<div data-js="container">

diff --git a/modules/Settings/Companies/models/Record.php b/modules/Settings/Companies/models/Record.php
@@ -83,7 +83,7 @@ public function set($key, $value)
 	 */
 	public function getPreviousValue(string $fieldName = '')
 	{
-		return $fieldName ? ($this->changes[$fieldName] ?? null) : $this->changes;
+		return $fieldName ? ($this->changes[$fieldName] ?? false) : $this->changes;
 	}
 
 	/**
@@ -111,7 +111,7 @@ public function save(): void
 		$transaction = $db->beginTransaction();
 
 		try {
-			if (($changes = $this->getPreviousValue()) && (\count($changes) > 1 || !$this->getPreviousValue('email'))) {
+			if (($changes = $this->getPreviousValue()) && (\count($changes) > 1) || false === $this->getPreviousValue('email')) {
 				$registration = (new \App\YetiForce\Register());
 				$registration->setRawCompanyData($this->getData())->register();
 				if ($error = $registration->getError()) {