Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…

…nto PR-2020-07-21
magento · Jul 22, 2020 · 0afb093 · 0afb093
2 parents d5d4b31 + bc9e5cf
commit 0afb093
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 355 deletions.
diff --git a/app/code/Magento/CatalogRuleGraphQl/README.md b/app/code/Magento/CatalogRuleGraphQl/README.md
@@ -0,0 +1,3 @@
+# CatalogRuleGraphQl
+
+The *Magento_CatalogRuleGraphQl* module applies catalog rules to products for GraphQL requests.
diff --git a/app/code/Magento/CatalogRuleGraphQl/composer.json b/app/code/Magento/CatalogRuleGraphQl/composer.json
@@ -0,0 +1,24 @@
+{
+  "name": "magento/module-catalog-rule-graph-ql",
+  "description": "N/A",
+  "type": "magento2-module",
+  "require": {
+    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "magento/framework": "*"
+  },
+  "suggest": {
+    "magento/module-catalog-rule": "*"
+  },
+  "license": [
+    "OSL-3.0",
+    "AFL-3.0"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Magento\\CatalogRuleGraphQl\\": ""
+    }
+  }
+}
diff --git a/app/code/Magento/CatalogRuleGraphQl/etc/graphql/events.xml b/app/code/Magento/CatalogRuleGraphQl/etc/graphql/events.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="catalog_product_get_final_price">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Observer\ProcessFrontFinalPriceObserver" />
+    </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Observer\PrepareCatalogProductCollectionPricesObserver" />
+    </event>
+</config>
diff --git a/app/code/Magento/CatalogRuleGraphQl/etc/module.xml b/app/code/Magento/CatalogRuleGraphQl/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_CatalogRuleGraphQl" />
+</config>
diff --git a/app/code/Magento/CatalogRuleGraphQl/registration.php b/app/code/Magento/CatalogRuleGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogRuleGraphQl', __DIR__);
diff --git a/composer.json b/composer.json
@@ -133,6 +133,7 @@
         "magento/module-catalog-inventory": "*",
         "magento/module-catalog-inventory-graph-ql": "*",
         "magento/module-catalog-rule": "*",
+        "magento/module-catalog-rule-graph-ql": "*",
         "magento/module-catalog-rule-configurable": "*",
         "magento/module-catalog-search": "*",
         "magento/module-catalog-url-rewrite": "*",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# CatalogRuleGraphQl

		The Magento_CatalogRuleGraphQl module applies catalog rules to products for GraphQL requests.