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
--- view/frontend/web/js/block-submit-on-send.orig.js 2020-11-19 12:44:54.544000000 +0100 | |
+++ view/frontend/web/js/block-submit-on-send.js 2020-11-19 12:45:18.409967078 +0100 | |
@@ -14,9 +14,15 @@ | |
dataForm.submit(function () { | |
$(this).find(':submit').attr('disabled', 'disabled'); | |
+ | |
+ if (this.isValid === false) { | |
+ $(this).find(':submit').prop('disabled', false); | |
+ } |
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
--- a/Block/Product/ProductsList.php | |
+++ b/Block/Product/ProductsList.php | |
@@ -8,6 +8,7 @@ | |
use Magento\Catalog\Api\CategoryRepositoryInterface; | |
use Magento\Catalog\Block\Product\AbstractProduct; | |
+use Magento\Catalog\Block\Product\Context; | |
use Magento\Catalog\Block\Product\Widget\Html\Pager; | |
use Magento\Catalog\Model\Product; | |
use Magento\Catalog\Model\Product\Visibility; |
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
--- Model/Config.php 2020-04-23 08:56:42.000000000 +0200 | |
+++ Model/Config.php 2020-05-15 16:28:16.337488649 +0200 | |
@@ -822,6 +822,10 @@ | |
$fullAttributeData = array_key_exists('is_required', $attributeData); | |
if ($existsFullAttribute || (!$existsFullAttribute && !$fullAttributeData)) { | |
+ $scopeIsRequired = $attributeData['scope_is_required'] ?? null; | |
+ if ($scopeIsRequired !== null) { | |
+ $attribute->setData('scope_is_required', $scopeIsRequired); | |
+ } |
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
--- etc/schema.orig.graphqls 2020-01-10 06:20:38.000000000 +0100 | |
+++ etc/schema.graphqls 2020-04-10 18:07:05.630098596 +0200 | |
@@ -197,7 +197,7 @@ | |
} | |
interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") { | |
- url: String @doc(description: "The URL of the product image or video.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGallery\\Url") | |
+ url(width: Int, height: Int): String @doc(description: "The URL of the product image or video.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGallery\\Url") | |
label: String @doc(description: "The label of the product image or video.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGallery\\Label") | |
} |
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
--- view/base/web/js/form/element/date.orig.js 2019-09-19 12:30:58.000000000 +0200 | |
+++ view/base/web/js/form/element/date.js 2020-03-17 11:51:49.691288844 +0100 | |
@@ -111,21 +111,19 @@ | |
* Prepares and sets date/time value that will be displayed | |
* in the input field. | |
* | |
- * @param {String} value | |
+ * @inheritDoc | |
*/ | |
- onValueChange: function (value) { |
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
--- a/Plugin/Block/Topmenu.php | |
+++ b/Plugin/Block/Topmenu.php | |
@@ -193,4 +193,21 @@ protected function getCategoryTree($storeId, $rootId) | |
return $collection; | |
} | |
+ | |
+ /** | |
+ * Add active | |
+ * |
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
#!/bin/bash | |
bin/magento module:status | \ | |
grep -E '(Magento_(Adobe|Inventory|Braintree|Signifyd|Fedex|Marketplace|Authorizenet.*|.*GraphQl.*|.*Analytics)|Temando_|Amazon_|Dotdigitalgroup_|Vertex_|Klarna_)' | \ | |
grep -v Magento_GoogleAnalytics | \ | |
xargs bin/magento module:disable | |
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/Process/Queue.php b/Process/Queue.php | |
index d8089457ce5b..21de61a6a8e1 100644 | |
--- a/Process/Queue.php | |
+++ b/Process/Queue.php | |
@@ -8,9 +8,9 @@ | |
use Magento\Deploy\Package\Package; | |
use Magento\Deploy\Service\DeployPackage; | |
use Magento\Framework\App\ResourceConnection; | |
-use Psr\Log\LoggerInterface; | |
use Magento\Framework\App\State as AppState; |
NewerOlder