| '.$differenceOfAmountsDesciption.' | +
|---|
| '.$differenceOfAmounts .' | +
| "; + $html .= ' | ';
if ($fieldModel->isSummary()) {
$sum = 0;
foreach ($inventoryRows as $inventoryRow) {
diff --git a/app/TextParser/ProductsTableDescription.php b/app/TextParser/ProductsTableDescription.php
index a4faec1be340..18dcbe9ffeca 100644
--- a/app/TextParser/ProductsTableDescription.php
+++ b/app/TextParser/ProductsTableDescription.php
@@ -7,8 +7,8 @@
*
* @package TextParser
*
- * @copyright YetiForce Sp. z o.o
- * @license YetiForce Public License 4.0 (licenses/LicenseEN.txt or yetiforce.com)
+ * @copyright YetiForce S.A.
+ * @license YetiForce Public License 6.5 (licenses/LicenseEN.txt or yetiforce.com)
* @author Tomasz Kur
' . $key . '% |
- ' . \CurrencyField::convertToUserFormat($tax, null, true) . ' ' . $currencyData['currency_symbol'] . ' |
+ ' . \CurrencyField::convertToUserFormat($tax, null, true) . ' ' . $currencySymbol . ' |
' . \App\Language::translate('LBL_AMOUNT', $this->textParser->moduleName) . ' / ' . \App\Language::translate('LBL_AMOUNT', $this->textParser->moduleName, \App\Language::DEFAULT_LANG) . ' |
- ' . \CurrencyField::convertToUserFormat($taxAmount, null, true) . ' ' . $currencyData['currency_symbol'] . ' |
+ ' . \CurrencyField::convertToUserFormat($taxAmount, null, true) . ' ' . $currencySymbol . ' |
' . \App\Language::translate(($verify['message'] ?? 'LBL_YETIFORCE_SHOP_PRODUCT_CANCELED'), 'Settings::YetiForce') . ' '; - } - } + self::$productCache = []; + $this->success = false; + try { + $client = new ApiClient(); + $client->send(self::URL . '/' . \App\Version::get() . '/products', 'GET'); + $this->error = $client->getError(); + if (!$this->error && 200 === $client->getStatusCode() && !\App\Json::isEmpty($client->getResponseBody())) { + $this->setProducts(\App\Json::decode($client->getResponseBody())); + $this->success = true; } - } else { - foreach (self::getProducts() as $product) { - $verify = $product->verify(); - if (!$verify['status']) { - $products .= \App\Language::translate($product->getLabel(), 'Settings::YetiForce'); - if ($onlyNames) { - $products .= ','; - } else { - $products .= ' ' . \App\Language::translate(($verify['message'] ?? 'LBL_YETIFORCE_SHOP_PRODUCT_CANCELED'), 'Settings::YetiForce') . ' '; - } - } + } catch (\Throwable $e) { + $this->success = false; + $this->error = $e->getMessage(); + \App\Log::error($e->getMessage(), __METHOD__); + } + } + + /** + * Get product by ID. + * + * @param string $productId + * + * @return void + */ + public function loadProduct(string $productId) + { + $this->success = false; + try { + $client = new ApiClient(); + $client->send(self::URL . '/' . \App\Version::get() . "/products/{$productId}", 'GET'); + $this->error = $client->getError(); + if (!$this->error && 200 === $client->getStatusCode() && !\App\Json::isEmpty($client->getResponseBody())) { + $this->setProducts([\App\Json::decode($client->getResponseBody())]); + $this->success = true; } + } catch (\Throwable $e) { + $this->success = false; + $this->error = $e->getMessage(); + \App\Log::error($e->getMessage(), __METHOD__); } - return rtrim($products, ' ,'); } /** - * Generate cache. + * Get products. + * + * @param string $name + * @param string $section + * @param string $productId + * + * @return Shop\AbstractBaseProduct */ - public static function generateCache(): void + public static function getProduct(string $name, string $productId = ''): ?Shop\AbstractBaseProduct { - $content = []; - foreach (self::getProducts() as $product) { - $verify = $product->verify(); - if ($verify['status']) { - unset($verify['message']); + if (empty(self::$productCache[$name])) { + if ($productId) { + (new self())->loadProduct($productId); + } else { + (new self())->load(); } - $content['products'][$product->getLabel()] = $verify; } - $content['key'] = md5(json_encode($content['products'])); - \App\Utils::saveToFile(ROOT_DIRECTORY . '/app_data/shopCache.php', $content, 'Modifying this file will breach the licence terms!!!', 0, true); + + return self::$productCache[$name] ?? null; } /** - * Get from cache. + * Get product class. * - * @return array + * @param string $name + * + * @return string */ - public static function getFromCache(): array + private static function getProductClass(string $name): string { - $content = []; - if (\file_exists(ROOT_DIRECTORY . '/app_data/shopCache.php')) { - $content = include ROOT_DIRECTORY . '/app_data/shopCache.php'; + $className = '\\App\\YetiForce\\Shop\\Product\\' . $name; + if (!class_exists($className)) { + $className = '\\App\\YetiForce\\Shop\\Product\\YetiForceBase'; } - if (empty($content['products']) || ($content['key'] ?? '') !== md5(json_encode($content['products']))) { - $content['products'] = []; + return $className; + } + + /** + * Set Products to cache. + * + * @param array $products + * + * @return void + */ + private function setProducts(array $products) + { + foreach ($products as $productData) { + $name = $productData['name'] ?? ''; + $className = self::getProductClass($name); + if (!empty($productData['packages']) && ($product = $className::fromArray($productData)) && $product->isAvailable()) { + self::$productCache[$product->getName()] = $product; + } } - return $content['products']; } } diff --git a/app/YetiForce/Shop/AbstractBaseProduct.php b/app/YetiForce/Shop/AbstractBaseProduct.php index f547457a5857..66043123fbcf 100644 --- a/app/YetiForce/Shop/AbstractBaseProduct.php +++ b/app/YetiForce/Shop/AbstractBaseProduct.php @@ -1,13 +1,14 @@ + * @author Klaudia Łozowska
-
-
- {/if}
- {\App\Language::translate('LBL_MAIL_CONTENT', $LANG_MODULE_NAME)}
+ {\App\Language::translate('LBL_MAIL_HEADERS', $LANG_MODULE_NAME)}
-
- {\App\Language::translate('LBL_MAIL_HEADERS', $LANG_MODULE_NAME)}
- {\App\Purifier::encodeHtml(trim($RECORD->get('header')))}
+ {\App\Purifier::encodeHtml(trim($RECORD->get('header')))}
-
-
+
+
{/strip}
diff --git a/layouts/basic/components/MailMessageAnalysisModalHeader.tpl b/layouts/basic/components/MailMessageAnalysisModalHeader.tpl
index 7aa809d2b45b..67fc19211cc2 100644
--- a/layouts/basic/components/MailMessageAnalysisModalHeader.tpl
+++ b/layouts/basic/components/MailMessageAnalysisModalHeader.tpl
@@ -1,51 +1,53 @@
-{**}
+{**}
{strip}
-
-modalData key=KEY item=VALUE} data-{$KEY}="{$VALUE}"{/foreach}>
-
-
- {foreach item=MODEL from=$MODAL_CSS}
-
- {/foreach}
- {foreach item=MODEL from=$MODAL_SCRIPTS}
-
- {/foreach}
-
-
- - {if $MODAL_VIEW->modalIcon} - - {/if} - {$MODAL_TITLE} -- - - {\App\Language::translate('LBL_MAIL_SENDER', $LANG_MODULE_NAME)}: - {if $VERIFY_SENDER['status']} - {\App\Language::translate('LBL_CORRECT', $LANG_MODULE_NAME)} - {else} - {\App\Language::translate('LBL_INCORRECT', $LANG_MODULE_NAME)} + +modalData key=KEY item=VALUE} data-{$KEY}="{$VALUE}" {/foreach}>
+
+
+
{/strip}
diff --git a/layouts/basic/components/MediaModal.tpl b/layouts/basic/components/MediaModal.tpl
new file mode 100644
index 000000000000..fc8f89d790a6
--- /dev/null
+++ b/layouts/basic/components/MediaModal.tpl
@@ -0,0 +1,102 @@
+{**}
+{strip}
+
+
+
+
+{/strip}
diff --git a/layouts/basic/components/YetiForceDetailModal.tpl b/layouts/basic/components/YetiForceDetailModal.tpl
new file mode 100644
index 000000000000..919fc3fd3859
--- /dev/null
+++ b/layouts/basic/components/YetiForceDetailModal.tpl
@@ -0,0 +1,96 @@
+{**}
+{strip}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {foreach from=$ICONS item=item name=icons}
+
+
+ {if !empty($FIELD_MODEL)}
+ {assign var=FIELD_INFO value=\App\Purifier::encodeHtml(\App\Json::encode($FIELD_MODEL->getFieldInfo()))}
+
+
+ {/if}
+
+
+ {foreach from=$IMAGES item=item name=images}
+
+
+
+
+{/strip}
diff --git a/layouts/basic/modules/Accounts/AccountHierarchy.tpl b/layouts/basic/modules/Accounts/AccountHierarchy.tpl
index 64dda0229e63..b850a1344505 100644
--- a/layouts/basic/modules/Accounts/AccountHierarchy.tpl
+++ b/layouts/basic/modules/Accounts/AccountHierarchy.tpl
@@ -6,7 +6,7 @@
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
-* Contributor(s): YetiForce.com
+* Contributor(s): YetiForce S.A.
********************************************************************************/
-->*}
{strip}
@@ -26,23 +26,23 @@
+ +
Copyright © YetiForce S.A. All rights reserved. +The Program is provided AS IS, without warranty. Licensed under + + YetiForce Public License 6.5 + . + +YetiForce is based on two systems - VtigerCRM and SugarCRM.
+
+
+ + License + + YetiForce Public License 6.5 + + ++ WWW + + https://yetiforce.com + + ++ Code + + https://github.com/YetiForceCompany/YetiForceCRM + + ++ Documentation + + https://doc.yetiforce.com + + ++ Issues + + https://github.com/YetiForceCompany/YetiForceCRM/issues + + +
-
- {include file=\App\Layout::getTemplatePath('dashboards/WidgetHeaderTitle.tpl', $MODULE_NAME)}
- {include file=\App\Layout::getTemplatePath('dashboards/WidgetHeaderButtons.tpl', $MODULE_NAME)}
-
- -
-
-
-
-
-
-
+{**}
+{strip}
+
-
+
-
+ {include file=\App\Layout::getTemplatePath('dashboards/WidgetHeaderTitle.tpl', $MODULE_NAME)}
+ {include file=\App\Layout::getTemplatePath('dashboards/WidgetHeaderButtons.tpl', $MODULE_NAME)}
+
+ +
+
-
+
+
+
-
+
+
+
+
+
+
+ {include file=\App\Layout::getTemplatePath('dashboards/SelectAccessibleTemplate.tpl', $MODULE_NAME)}
- {include file=\App\Layout::getTemplatePath('dashboards/SelectAccessibleTemplate.tpl', $MODULE_NAME)}
-
- {include file=\App\Layout::getTemplatePath('dashboards/DashBoardWidgetContents.tpl', $MODULE_NAME)}
-
+
+ {include file=\App\Layout::getTemplatePath('dashboards/DashBoardWidgetContents.tpl', $MODULE_NAME)}
+
+{/strip}
diff --git a/layouts/basic/modules/Accounts/dashboards/NeglectedAccounts.tpl b/layouts/basic/modules/Accounts/dashboards/NeglectedAccounts.tpl
index ef556fd41ada..d22aed16df7d 100644
--- a/layouts/basic/modules/Accounts/dashboards/NeglectedAccounts.tpl
+++ b/layouts/basic/modules/Accounts/dashboards/NeglectedAccounts.tpl
@@ -1,33 +1,33 @@
-{**}
-
-
- {include file=\App\Layout::getTemplatePath('dashboards/WidgetHeaderTitle.tpl', $MODULE_NAME)}
-
- {if \App\Privilege::isPermitted($MODULE_NAME, 'CreateView')}
-
- {/if} - {foreach from=$ACCOUNTS key=RECORD_ID item=ACCOUNTS_MODEL} + {/if} + {foreach from=$ACCOUNTS key=RECORD_ID item=ACCOUNTS_MODEL}
{if \App\Privilege::isPermitted($MODULE_NAME, 'DetailView', $RECORD_ID)}
- {\App\Purifier::encodeHtml($ACCOUNTS_MODEL['accountname'])}
+ {$ACCOUNTS_MODEL->getDisplayValue('accountname')}
{else}
- {\App\Purifier::encodeHtml($ACCOUNTS_MODEL['accountname'])}
+ {$ACCOUNTS_MODEL->getDisplayValue('accountname')}
{/if}
- {$ACCOUNTS_MODEL['owner']}
+ {$ACCOUNTS_MODEL->getDisplayValue('assigned_user_id')}
- {if is_null($ACCOUNTS_MODEL['crmactivity'])}
+ {if is_null($ACCOUNTS_MODEL->get('crmactivity'))}
-
{else}
- {$ACCOUNTS_MODEL['crmactivity']}
+ {$ACCOUNTS_MODEL->getDisplayValue('crmactivity')}
{/if}
-
- {include file=\App\Layout::getTemplatePath('dashboards/WidgetHeaderTitle.tpl', $MODULE_NAME)}
-
- {if \App\Privilege::isPermitted($MODULE_NAME, 'CreateView')}
- | |||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
} "YetiForceCRM"){kind=logo}
+