Merge pull request #9592 from magento-gl/spartans_pr_11022025

glo71317 · web-flow · commit 96dec499651b · 2025-02-18T16:33:54.000+05:30
[Spartans] BugFixes Delivery
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -1,5 +1,5 @@
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
+# Copyright 2018 Adobe.
+# All Rights Reserved.
 
 type Mutation {
     addBundleProductsToCart(input: AddBundleProductsToCartInput @doc(description: "An input object that defines which bundle products to add to the cart.")): AddBundleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart") @doc(description: "Add one or more bundle products to the specified cart. We recommend using `addProductsToCart` instead.")
@@ -103,6 +103,7 @@ enum ShipBundleItemsEnum @doc(description: "Defines whether bundle items must be
 
 type BundleOrderItem implements OrderItemInterface @doc(description: "Defines bundle product options for `OrderItemInterface`.") {
     bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
+    parent_sku: String @doc(description: "The SKU of parent product.")
 }
 
 type BundleInvoiceItem implements InvoiceItemInterface @doc(description: "Defines bundle product options for `InvoiceItemInterface`.") {
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2017 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -15,9 +15,9 @@
         <element name="searchInput" type="input" selector="#fulltext"/>
         <element name="searchButton" type="button" selector="//*[@id='fulltext']/parent::*/button"/>
         <element name="addNewPageButton" type="button" selector="#add" timeout="30"/>
-        <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
-        <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
-        <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='View']" parameterized="true"/>
+        <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell data-action-position']//button[text()='Select']" parameterized="true"/>
+        <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell data-action-position']//a[text()='Edit']" parameterized="true"/>
+        <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell data-action-position']//a[text()='View']" parameterized="true"/>
         <element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]" timeout="60"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
@@ -27,7 +27,7 @@
         <element name="activeFilter" type="button" selector="(//div[contains(@class, 'admin__data-grid-filters-current') and contains(@class, '_show')])[1]"/>
         <element name="savePageSuccessMessage" type="text" selector=".message-success"/>
         <element name="savePageWarningMessage" type="text" selector=".message-warning"/>
-        <element name="delete" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" parameterized="true"/>
+        <element name="delete" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell data-action-position']//a[text()='Delete']" parameterized="true"/>
         <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
         <element name="pageRowCheckboxByIdentifier" type="checkbox" selector="//table[@data-role='grid']//td[count(../../..//th[./*[.='URL Key']]/preceding-sibling::th) + 1][./*[.='{{identifier}}']]/../td//input[@data-action='select-row']"  parameterized="true" />
         <element name="massActionsButton" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[contains(@class, 'action-select')]" />
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe.
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -85,4 +85,11 @@
     <type name="Magento\Quote\Model\Quote">
         <plugin name="update_customized_options" type="Magento\ConfigurableProductGraphQl\Plugin\Quote\UpdateCustomizedOptions"/>
     </type>
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\OrderItem">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="configurable" xsi:type="string">ConfigurableOrderItem</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -1,5 +1,5 @@
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
+# Copyright 2018 Adobe.
+# All Rights Reserved.
 type Mutation {
     addConfigurableProductsToCart(input: AddConfigurableProductsToCartInput @doc(description: "An input object that defines which configurable products to add to the cart.")): AddConfigurableProductsToCartOutput @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\AddConfigurableProductsToCart") @doc(description: "Add one or more configurable products to the specified cart. We recommend using `addProductsToCart` instead.")
 }
@@ -111,3 +111,7 @@ type ConfigurableProductOptionValue @doc(description: "Defines a value for a con
 type StoreConfig {
     configurable_thumbnail_source : String @doc(description: "Indicates whether the `parent` or child (`itself`) thumbnail should be used in the cart for configurable products.")
 }
+
+type ConfigurableOrderItem implements OrderItemInterface {
+    parent_sku: String @doc(description: "The SKU of parent product.")
+}
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupGridActionsSection.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2018 Adobe
+  * All Rights Reserved.
   */
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGroupGridActionsSection">
-        <element name="selectButton" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" timeout="30" parameterized="true"/>
-        <element name="deleteAction" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" timeout="30" parameterized="true"/>
+        <element name="selectButton" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell data-action-position']//button[text()='Select']" timeout="30" parameterized="true"/>
+        <element name="deleteAction" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell data-action-position']//a[text()='Delete']" timeout="30" parameterized="true"/>
         <element name="actionsMenuButton" type="text" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='{{selectItem}}']" timeout="30" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php b/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -12,6 +12,8 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * View model to get extension configuration in the template
@@ -33,20 +35,36 @@ class Configuration implements \Magento\Framework\View\Element\Block\ArgumentInt
      */
     private $getLoggedAsCustomerAdminId;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param ConfigInterface $config
      * @param HttpContext $httpContext
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
      * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
      */
     public function __construct(
         ConfigInterface $config,
         HttpContext $httpContext,
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
         ?GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId = null
     ) {
         $this->config = $config;
         $this->httpContext = $httpContext;
         $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId
             ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -68,4 +86,19 @@ private function isLoggedIn(): bool
     {
         return (bool)$this->httpContext->getValue(Context::CONTEXT_AUTH);
     }
+
+    /**
+     * Is B2b enabled
+     *
+     * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function isB2bEnabled(): bool
+    {
+        return (bool)$this->scopeConfig->getValue(
+            "btob/website_configuration/company_active",
+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
+            $this->storeManager->getStore()->getWebsiteId()
+        );
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml
@@ -1,14 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * @var \Magento\Framework\View\Element\Template $block
  * @var \Magento\Framework\Escaper $escaper
  */
-$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
+if ($block->getConfig()->isB2bEnabled()) {
+    $adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/adobe-icon.svg');
+} else {
+    $adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
+}
 ?>
 <?php if ($block->getConfig()->isEnabled()): ?>
     <div class="lac-notification-sticky"
@@ -17,7 +21,7 @@ $viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images
         <div class="lac-notification clearfix" data-bind="visible: isVisible" style="display: none">
             <div class="top-container">
                 <div class="lac-notification-icon wrapper">
-                    <img class="logo-img"  src="<?= $escaper->escapeUrl($viewFileUrl) ?>" alt="Magento" />
+                    <img class="logo-img"  src="<?= $escaper->escapeUrl($adobeFileUrl) ?>" alt="Magento" />
                 </div>
                 <div class="lac-notification-text wrapper">
                     <span data-bind="html: notificationText"></span>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/css/source/_module.less b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/css/source/_module.less
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 //
@@ -29,7 +29,7 @@
                 margin: 10px 25px 10px 10px;
 
                 .logo-img {
-                    display: block
+                    display: block;
                 }
             }
 
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/adobe-icon.svg b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/adobe-icon.svg
@@ -0,0 +1 @@
+<svg enable-background="new 0 0 240 234" viewBox="0 0 240 234" xmlns="http://www.w3.org/2000/svg" width="28" height="33"><path d="m42.5 0h155c23.5 0 42.5 19 42.5 42.5v149c0 23.5-19 42.5-42.5 42.5h-155c-23.5 0-42.5-19-42.5-42.5v-149c0-23.5 19-42.5 42.5-42.5z" fill="#ffffff"/><path d="m186.6 176h-28.5c-2.6 0-4.9-1.5-5.8-3.8l-30.9-72.4c-.6-1.3-2-1.3-2.6 0l-19.3 45.9c-.5 1.1.3 2.3 1.5 2.3h21.2c1.3 0 2.5.8 3 2l9.3 20.7c1.1 2.5-.8 5.3-3.5 5.3h-77.3c-2.5 0-4.2-2.5-3.2-4.9l49.1-117c1-2.5 3.4-4.1 6.2-4.1h28.3c2.8 0 5.3 1.7 6.2 4.1l49.5 116.9c1 2.5-.7 5-3.2 5z" fill="#fa0f00"/></svg>
diff --git a/app/code/Magento/Paypal/Controller/Transparent/Redirect.php b/app/code/Magento/Paypal/Controller/Transparent/Redirect.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All rights reserved.
  */
 namespace Magento\Paypal\Controller\Transparent;
 
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\Request\InvalidRequestException;
@@ -20,7 +21,7 @@
 /**
  * Class for redirecting the Paypal response result to Magento controller.
  */
-class Redirect extends Action implements CsrfAwareActionInterface, HttpPostActionInterface
+class Redirect extends Action implements CsrfAwareActionInterface, HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var LayoutFactory
@@ -81,6 +82,7 @@ public function validateForCsrf(RequestInterface $request): ?bool
      */
     public function execute()
     {
+        $this->mapGatewayResponse();
         $gatewayResponse = (array)$this->getRequest()->getPostValue();
         $this->logger->debug(
             ['PayPal PayflowPro redirect:' => $gatewayResponse],
@@ -94,4 +96,20 @@ public function execute()
 
         return $resultLayout;
     }
+
+    /**
+     * Fill post data with gateway response params
+     *
+     * @return void
+     */
+    private function mapGatewayResponse(): void
+    {
+        if (!empty($this->getRequest()->getPostValue())) {
+            return;
+        }
+        $gatewayResponse = $this->getRequest()->getParams();
+        if (!empty($gatewayResponse)) {
+            $this->getRequest()->setPostValue($gatewayResponse);
+        }
+    }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php b/app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe.
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -147,6 +147,8 @@ private function fetch()
                 'product_sku' => $orderItem->getSku(),
                 'product_url_key' => $associatedProduct ? $associatedProduct->getUrlKey() : null,
                 'product_type' => $orderItem->getProductType(),
+                'parent_sku' => ($orderItem->getChildrenItems() && $associatedProduct) ?
+                    $associatedProduct->getSku() : null,
                 'status' => $orderItem->getStatus(),
                 'discounts' => $this->getDiscountDetails($associatedOrder, $orderItem),
                 'product_sale_price' => [
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2018 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -19,6 +19,6 @@
         <element name="gridCellUpdated" type="text" selector="//tbody//tr//div[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
         <element name="columnHeader" type="text" selector="//thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="viewAction" type="button" selector="tr.data-row > td.data-grid-actions-cell > a.action-menu-item"/>
-        <element name="viewActionByTheme" type="button" selector="//tr[contains(@class,'data-row')]//td[1]//div[@class='data-grid-cell-content' and text()='{{theme}}']//ancestor::tr//td[@class='data-grid-actions-cell']/a[@class='action-menu-item']" parameterized="true"/>
+        <element name="viewActionByTheme" type="button" selector="//tr[contains(@class,'data-row')]//td[1]//div[@class='data-grid-cell-content' and text()='{{theme}}']//ancestor::tr//td[@class='data-grid-actions-cell data-action-position']/a[@class='action-menu-item']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 /**
@@ -25,7 +25,7 @@ define([
             rows: [],
             rowsProvider: '${ $.parentName }',
             fieldClass: {
-                'data-grid-actions-cell': true
+                'data-grid-actions-cell data-action-position': true
             },
             templates: {
                 actions: {}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe.
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -77,6 +77,10 @@ public function testGetCustomerOrderBundleProduct()
             'bundle-product-two-dropdown-options-simple1-simple2',
             $bundledItemInTheOrder['product_sku']
         );
+        $this->assertEquals(
+            'bundle-product-two-dropdown-options',
+            $bundledItemInTheOrder['parent_sku']
+        );
         $priceOfBundledItemInOrder = $bundledItemInTheOrder['product_sale_price']['value'];
         $this->assertEquals(15, $priceOfBundledItemInOrder);
         $this->assertArrayHasKey('bundle_options', $bundledItemInTheOrder);
@@ -266,6 +270,7 @@ private function getCustomerOrderQueryBundleProduct($orderNumber)
                     quantity_ordered
                     discounts{amount{value} label}
                     ... on BundleOrderItem{
+                        parent_sku
                         bundle_options{
                             __typename
                             label
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithConfigurableProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithConfigurableProductByOrderNumberTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`		`- * Copyright © Magento, Inc. All rights reserved.`
`3`		`- * See COPYING.txt for license details.`
	`2`	`+ * Copyright 2014 Adobe`
	`3`	`+ * All Rights Reserved.`
`4`	`4`	`*/`
`5`	`5`
`6`	`6`	`//`
`@@ -29,7 +29,7 @@`
`29`	`29`	`margin: 10px 25px 10px 10px;`
`30`	`30`
`31`	`31`	`.logo-img {`
`32`		`- display: block`
	`32`	`+ display: block;`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`