Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Block/Adminhtml/Logs.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ protected function _renderValue(AbstractElement $element): string

<textarea id="field_log" readonly onclick="this.setSelectionRange(0, this.value.length)" style="background: #fff; border: 1px solid #eee; border-radius: 10px; cursor: grab; color: #000; font-family: Consolas, monospace; height: 600px; opacity: 1; overflow-x: scroll; line-height: 18px; margin-top: 10px; padding: 10px; white-space: pre; width: 100%%;">$lines</textarea>
</td>
EOD;
EOD;
}
}
2 changes: 1 addition & 1 deletion Helper/CookieHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CookieHelper
public function __construct(
CookieManagerInterface $cookieManager,
CookieMetadataFactory $cookieMetadataFactory,
SessionManagerInterface $sessionManager,
SessionManagerInterface $sessionManager
) {
$this->cookieManager = $cookieManager;
$this->cookieMetadataFactory = $cookieMetadataFactory;
Expand Down
4 changes: 2 additions & 2 deletions Helper/Feed/Generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function printLines($siteId, $text)

public function escapeString($text)
{
return html_entity_decode(trim($text));
return html_entity_decode(trim($text), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, 'UTF-8');
}

public function execute()
Expand Down Expand Up @@ -250,7 +250,7 @@ public function execute()
try {
$text = [];

$text[] = ['<product id="product_'.$product->getId().'" type="' . htmlspecialchars($product->getTypeId()) . '">', 2];
$text[] = ['<product id="product_'.$product->getId().'" type="' . htmlspecialchars($product->getTypeId(), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, 'UTF-8', false) . '">', 2];

$text[] = ['<id>' . $product->getId() . '</id>', 3];

Expand Down
1 change: 1 addition & 0 deletions view/adminhtml/templates/salesfire_about.phtml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?php // phpcs:disable Internal.NoCodeFound ?>
<div style="display:flex">
<div style="background-color: #fff;width:150px;height:150px;display:flex;justify-items:center;align-items:center;"><svg class="logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 772 211" style="width: 150px;"><defs><style>.cls-1{fill:#231f20}</style></defs><title>Salesfire logoArtboard 24</title><path class="cls-1" d="M31.33,134.54l26.25-9.84c6,12.74,16.41,21.61,28.76,21.61,12.16,0,20.26-4.63,20.26-13.89,0-9.46-11.58-13.12-25.67-17.56-20.26-6.57-44.19-14.09-44.19-42.27,0-20.84,17.18-38.21,47.28-38.21,24.9,0,41.69,14.67,46.9,33.77l-26.25,8.49c-3.66-8.29-10-14.47-22.19-14.47-10.62,0-16.41,3.86-16.41,11,0,7,10.43,10.23,23,14.48,20.46,6.56,46.9,15,46.9,45,0,26.25-22.2,41.5-50.37,41.5C59.32,174.11,39.44,159.25,31.33,134.54Z"></path><path class="cls-1" d="M208.89,164.46c-4.82,5.21-11.77,9.65-24.51,9.65-20.84,0-37-10.81-37-32.43S167.78,110,187.28,110c9.64,0,16,1,21.61,3.48V108.1c0-9.26-6.37-13.89-16-13.89-11,0-21.23,3.47-31.65,10.42l-8.68-21.42c10.22-6.95,24.89-12.36,42.26-12.36,18.34,0,41.88,4.64,41.88,38.6v62.34H208.89Zm0-20.85v-8.87a57.66,57.66,0,0,0-16.79-2.32c-9.65,0-17.37,2.32-17.37,9.46,0,5.4,5.4,8.68,15.05,8.68A29.57,29.57,0,0,0,208.89,143.61Z"></path><path class="cls-1" d="M255,45.57l28-13.12V171.79H255Z"></path><path class="cls-1" d="M294.58,122.38c0-31.65,18.14-51.53,46.9-51.53,24.9,0,44.39,15.06,44.39,46.71A99.94,99.94,0,0,1,385.1,132H322c.58,13.13,9.07,18.34,19.49,18.34,9.84,0,16-3.09,22.19-10.42l16.21,16.21c-9.07,11-21.42,18-38.4,18C312.34,174.11,294.58,154.81,294.58,122.38ZM359,111c-1.35-10.42-7.14-16.41-18.72-16.41-9.84,0-16.79,6-18.14,16.41Z"></path><path class="cls-1" d="M392.63,155.39l17.94-15.25c4.06,4.05,13.51,11,23.36,11,8.1,0,13.7-2.12,13.7-7.72,0-4.83-5-7.14-16.79-11.58-22.58-7.53-34.93-15-34.93-33s16.79-28,36.67-28c17.37,0,29.33,7.72,37.05,16.41l-18.14,14.86c-7.33-6.76-12.55-8.3-18.91-8.3-6.95,0-11.58,2.12-11.58,6.37,0,4.44,9.07,8.3,19.29,10.81,14.67,4.82,32.43,11.77,32.43,32.42,0,19.69-15.63,30.69-39.57,30.69C416.94,174.11,400.73,166.77,392.63,155.39Z"></path><path class="cls-1" d="M504.56,171.79h-16.4L503,87.84H487.58l2.51-14.67h15.44L508.62,56c3.08-17,13.5-21.8,24.7-21.8,7.14,0,12.16,2.31,16.6,4.82l-2.51,13.9c-4.44-2.32-8.3-3.67-12.93-3.67-7,0-9.07,5.21-10,10.42l-2.51,13.51h21.62L541,87.84H519.42Zm58.86-98.62h16.22l-17.37,98.62H546.06Zm2.71-26.83c0-6.75,5.79-12.15,11.58-12.15a8.46,8.46,0,0,1,8.87,8.68c0,6.76-5.79,12.16-11.77,12.16A8.53,8.53,0,0,1,566.13,46.34Z"></path><path class="cls-1" d="M601.06,73.17h16.21L615,85.91c7.71-10.23,17.56-15.06,26.24-15.06,5.21,0,10,1.93,12.93,4.83l-5,15.63a20.67,20.67,0,0,0-12.74-4.24c-8.3,0-22.58,6.56-26.64,29.14l-9.84,55.58H583.69Z"></path><path class="cls-1" d="M648.34,132.61c0-34.35,20.65-61.76,50.37-61.76,20.66,0,34.36,11.58,34.36,37.25A66,66,0,0,1,729.4,129H665.13v2.5c0,17.37,7.72,27.8,21.43,27.8,7.14,0,15.05-2.71,22.58-8.5l7.72,11.58c-8.88,7.14-19.69,11.78-32.23,11.78C662.05,174.11,648.34,156.74,648.34,132.61Zm67.94-18a34.68,34.68,0,0,0,.77-8.49c-.39-16-9.84-20.65-19.3-20.65-17.18,0-26.83,13.9-30.3,29.14Z"></path></svg></div>
<div style="margin-left: 15px;">
Expand Down