This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vendor/amasty/label/Setup/UpgradeSchema.php b/vendor/amasty/label/Setup/UpgradeSchema.php | |
index f1d749a..2504a2d 100644 | |
--- a/vendor/amasty/label/Setup/UpgradeSchema.php | |
+++ b/vendor/amasty/label/Setup/UpgradeSchema.php | |
@@ -81,10 +81,10 @@ class UpgradeSchema implements UpgradeSchemaInterface | |
if (version_compare($context->getVersion(), '1.6.0', '<')) { | |
$this->createIndexTable($setup); | |
} | |
- if (version_compare($context->getVersion(), '1.7.0', '<')) { | |
+ /*if (version_compare($context->getVersion(), '1.7.0', '<')) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vendor/magento/framework/App/View/Deployment/Version.php b/vendor/magento/framework/App/View/Deployment/Version.php | |
index 05c8e39f524658b559ad7d3df37d598c443c12ef..f28c42cd2751caa14716efffe5a757f9988200f7 100644 | |
--- a/vendor/magento/framework/App/View/Deployment/Version.php | |
+++ b/vendor/magento/framework/App/View/Deployment/Version.php | |
@@ -84,10 +84,7 @@ | |
ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION | |
) | |
) { | |
- $this->getLogger()->critical('Can not load static content version.'); | |
- throw new \UnexpectedValueException( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vendor/magento/framework/Data/AbstractSearchResult.php b/vendor/magento/framework/Data/AbstractSearchResult.php | |
index 05c8e39f524658b559ad7d3df37d598c443c12ef..f28c42cd2751caa14716efffe5a757f9988200f7 100644 | |
--- a/vendor/magento/framework/Data/AbstractSearchResult.php | |
+++ b/vendor/magento/framework/Data/AbstractSearchResult.php | |
@@ -265,11 +265,6 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search | |
{ | |
$itemId = $this->getItemId($item); | |
if ($itemId !== null) { | |
- if (isset($this->data['items'][$itemId])) { | |
- throw new \Exception( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: vendor/magento/module-quote/Model/QuoteManagement.php | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/vendor/magento/module-quote/Model/QuoteManagement.php (date 1568972641000) | |
+++ src/vendor/magento/module-quote/Model/QuoteManagement.php (date 1568972665300) | |
@@ -543,7 +543,7 @@ | |
} | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: vendor/magento/module-page-cache/Model/App/FrontController/BuiltinPlugin.php | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/vendor/magento/module-page-cache/Model/App/FrontController/BuiltinPlugin.php (date 1568877775000) | |
+++ src/vendor/magento/module-page-cache/Model/App/FrontController/BuiltinPlugin.php (date 1568877794582) | |
@@ -69,7 +69,7 @@ | |
return $proceed($request); | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: vendor/magento/module-sales/Block/Adminhtml/Items/AbstractItems.php | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- src/vendor/magento/module-sales/Block/Adminhtml/Items/AbstractItems.php (date 1567588428000) | |
+++ src/vendor/magento/module-sales/Block/Adminhtml/Items/AbstractItems.php (date 1567588442526) | |
@@ -85,7 +85,7 @@ | |
{ | |
foreach ($blocks as $blockName) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php | |
index 8386fb8..a287df6 100644 | |
--- a/app/code/core/Mage/Core/Model/Session/Abstract.php | |
+++ b/app/code/core/Mage/Core/Model/Session/Abstract.php | |
@@ -564,6 +564,8 @@ class Mage_Core_Model_Session_Abstract extends Mage_Core_Model_Session_Abstract_ | |
*/ | |
public function renewSession() | |
{ | |
+ return $this; | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contain the downloaded SOAP WSDL, you can copy paste it from /soap/?wsdl_list |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
$userData = array("username" => "xxx", "password" => "xxx"); | |
$domain = "https://www.example.com"; | |
$orderId = "159053"; | |
//$orderId = "?searchCriteria[filter_groups][0][filters][0][field]=entity_id&searchCriteria[filter_groups][0][filters][0][value]=150526"; | |
$ch = curl_init("{$domain}/index.php/rest/V1/integration/admin/token"); | |
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); | |
curl_setopt($ch, CURLOPT_USERPWD, "test:test"); | |
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($userData)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(SUBSTITUE(A2;"\n";"");")";"");"(";"");":";"");"/";"");"î";"i");"ê";"e");".";"");",";"");"à";"a");"Ø";"");"è";"e");"é";"e");"'";"");"-";"_");" ";"_") |
NewerOlder