magento · peterjaap · May 13, 2022
diff --git a/patches/commerce/MC-35984_2.4.0.patch b/patches/commerce/MC-35984_2.4.0.patch
@@ -33,4 +33,3 @@ diff -Nuar a/vendor/magento/module-rma/Block/Adminhtml/Rma/Edit/Tab/General/Ship
 +        $data['carrierHelper'] = $carrierHelper ?? ObjectManager::getInstance()->get(Carrier::class);
          parent::__construct($context, $registry, $data);
      }
-
diff --git a/patches/commerce/MDVA-29636_2.3.4.patch b/patches/commerce/MDVA-29636_2.3.4.patch
@@ -868,5 +868,3 @@ index cf66deba0cf..0eb2dc4b0f0 100644
                  </arguments>
                  <block class="Magento\Catalog\Block\Product\ProductList\Item\Container" name="upsell.product.addto" as="addto">
                      <block class="Magento\Wishlist\Block\Catalog\Product\ProductList\Item\AddTo\Wishlist"
-
-
diff --git a/patches/commerce/MDVA-36464_1.2.0-p1_v4.patch b/patches/commerce/MDVA-36464_1.2.0-p1_v4.patch
@@ -60,4 +60,3 @@ index 369ae3458e..7d1bca3555 100644
 +        <plugin name="purchaseOrderDisableCommunications" type="Magento\PurchaseOrder\Model\Plugin\DisableCommunicationsForPurchaseOrders" />
 +    </type>
  </config>
-
diff --git a/patches/commerce/MDVA-39546_2.4.2.patch b/patches/commerce/MDVA-39546_2.4.2.patch
@@ -50,5 +50,3 @@ index b18f125dcdb..a9b4404dad3 100644
 +            if ($update !== null && $update->getId()) {
                  return $this->resultRedirectFactory->create()->setPath('*/*/edit', ['id' => $update->getId()]);
              }
-
-
diff --git a/patches/commerce/MDVA-39713_2.3.3.patch b/patches/commerce/MDVA-39713_2.3.3.patch
@@ -147,4 +147,3 @@ index 3be0dab0ba01..66add0f097e8 100644
              );
          }
      }
-
diff --git a/patches/commerce/MDVA-40207_1.3.1-p1.patch b/patches/commerce/MDVA-40207_1.3.1-p1.patch
@@ -115,4 +115,3 @@ index badcb3fb8ad..4a043be3ddc 100644
 +                qtyElement.prop('readonly', false);
              }
          },
-
diff --git a/patches/commerce/MDVA-42645_2.4.3.patch b/patches/commerce/MDVA-42645_2.4.3.patch
@@ -145,4 +145,3 @@ index 85feb942d6f..6c4b7e95ee1 100644
          $rewardPointsCeilCompensation = 1;
          $availableBalance = $reward->getPointsEquivalent(
              (float) $creditmemo->getBaseCustomerBalanceReturnMax() + $rewardPointsCeilCompensation
-
diff --git a/patches/commerce/MDVA-42855_2.4.3-p1.patch b/patches/commerce/MDVA-42855_2.4.3-p1.patch
@@ -78,4 +78,3 @@ index 7f0de541d7e1..bffe396a12c1 100644
          } else {
              $quoteShippingAddressData = $shippingAddress->getData();
              $billingAddressData = $billingAddress->getData();
-
diff --git a/patches/commerce/MDVA-43232_2.4.2-p1.patch b/patches/commerce/MDVA-43232_2.4.2-p1.patch
@@ -133,4 +133,3 @@ index bf81a6fdc75..3055a478345 100644
                  $colls
              );
          } else {
-
diff --git a/patches/commerce/MDVA-43348_2.4.2.patch b/patches/commerce/MDVA-43348_2.4.2.patch
@@ -12,4 +12,3 @@ index 7fd1021c81e..fb9ddf2e173 100644
 
          return $customOptions;
      }
-
diff --git a/patches/os/MC-42528_2.4.3.patch b/patches/os/MC-42528_2.4.3.patch
@@ -287,4 +287,3 @@ index a1d13e5d353df..1203a441653a5 100644
 +                $node['children_count'] = 0;
              }
          }
-
diff --git a/patches/os/MDVA-30186_2.3.4.patch b/patches/os/MDVA-30186_2.3.4.patch
@@ -160,4 +160,3 @@ index e550de9cb03..8361fbb0bf9 100644
      }
  }
 +
-
diff --git a/patches/os/MDVA-30357_2.3.3.patch b/patches/os/MDVA-30357_2.3.3.patch
@@ -70,4 +70,3 @@ index af5d58c9653..5cf439e9318 100644
 +                $this->appEmulation->stopEnvironmentEmulation();
              }
          }
-
diff --git a/patches/os/MDVA-30862_2.3.4.patch b/patches/os/MDVA-30862_2.3.4.patch
@@ -29,4 +29,3 @@ index 118a3e053bd..5786f92a56b 100644
 +                $date->setTimezone($timezone);
                  break;
          }
-
diff --git a/patches/os/MDVA-30977_2.3.4.patch b/patches/os/MDVA-30977_2.3.4.patch
@@ -108,4 +108,3 @@ index af3625f6dcc..d02f33e51f3 100644
 +            $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
          }
      }
-
diff --git a/patches/os/MDVA-30977_2.3.5-p1.patch b/patches/os/MDVA-30977_2.3.5-p1.patch
@@ -270,4 +270,3 @@ index 29a9f3a1f41..b7b939fadc2 100644
                  }
                  if ($indexerConfig['shared_index']) {
                      $sharedIndexesComplete[] = $indexerConfig['shared_index'];
-
diff --git a/patches/os/MDVA-31343_2.3.5-p2.patch b/patches/os/MDVA-31343_2.3.5-p2.patch
@@ -30,4 +30,3 @@ index 118a3e053bd..5786f92a56b 100644
                  break;
          }
 
-
diff --git a/patches/os/MDVA-34012_2.3.5-p2.patch b/patches/os/MDVA-34012_2.3.5-p2.patch
@@ -78,4 +78,3 @@ index e3edc4a0dc4..b310f6e6877 100644
 +        $columns['product_id'] = $this->getProductIdFieldName();
          return $columns;
      }
-
diff --git a/patches/os/MDVA-34948_2.4.0-p1.patch b/patches/os/MDVA-34948_2.4.0-p1.patch
@@ -141,4 +141,3 @@ index 612d8541281..ae777a6701c 100644
 +        }
 +    }
  }
-
diff --git a/patches/os/MDVA-35984_1.2.2.patch b/patches/os/MDVA-35984_1.2.2.patch
@@ -603,4 +603,3 @@ index 72f57475943..a815864095a 100644
 +            $this->decrementSourceItem->execute($sourceItemDecrementData);
          }
      }
-
diff --git a/patches/os/MDVA-36138_2.3.4.patch b/patches/os/MDVA-36138_2.3.4.patch
@@ -63,4 +63,3 @@ index 0965c4a472c..e80b0f89b19 100644
 +        if (!$this->hasFreeMethodWeight($request)) {
              return;
          }
-
diff --git a/patches/os/MDVA-36464_2.4.0-p1_v4.patch b/patches/os/MDVA-36464_2.4.0-p1_v4.patch
@@ -330,4 +330,3 @@ index fe68555d9f7..a599101f715 100644
              $transport = [
                  'order' => $order,
                  'order_id' => $order->getId(),
-
diff --git a/patches/os/MDVA-37068_2.3.5-p2.patch b/patches/os/MDVA-37068_2.3.5-p2.patch
@@ -105,4 +105,3 @@ index 877aec3..7a0d10a 100644
 +        }
          return $quoteDetails;
      }
-
diff --git a/patches/os/MDVA-37068_2.3.5-p2_v2.patch b/patches/os/MDVA-37068_2.3.5-p2_v2.patch
@@ -117,4 +117,3 @@ index 877aec37bdd6..7a0d10ac1506 100644
 +        }
          return $quoteDetails;
      }
-
diff --git a/patches/os/MDVA-37364_2.4.2.patch b/patches/os/MDVA-37364_2.4.2.patch
@@ -10,4 +10,3 @@ index 88959cda749..29a589b20f7 100644
 +            if (!_.isUndefined(this.timezone) && moment.tz.zone(this.timezone) !== null) {
                  date = date.tz(this.timezone);
              }
-
diff --git a/patches/os/MDVA-37751_2.4.1.patch b/patches/os/MDVA-37751_2.4.1.patch
@@ -15,4 +15,3 @@ index 87cb0df7b0d..19e2886a9f7 100644
 +            $payment->setParentTransactionId($vaultPaymentToken->getGatewayToken());
          }
          parent::capture($payment, $amount);
-
diff --git a/patches/os/MDVA-37897_2.4.1.patch b/patches/os/MDVA-37897_2.4.1.patch
@@ -10,4 +10,3 @@ index 570b8f541b7..06dcc45095f 100644
 +            $resultRedirect->setUrl($this->_url->getCurrentUrl());
              return $resultRedirect;
          }
-
diff --git a/patches/os/MDVA-38270_2.4.2-p1.patch b/patches/os/MDVA-38270_2.4.2-p1.patch
@@ -11,4 +11,3 @@ index ab3ace45f33..d767cfd32cd 100644
 +            'model' => $order
          ];
      }
-
diff --git a/patches/os/MDVA-38481_2.3.6_v2.patch b/patches/os/MDVA-38481_2.3.6_v2.patch
@@ -70,4 +70,3 @@ index 2948994cf0b..08d49b18a83 100644
          return [
              'cart' => [
                  'model' => $cart,
-
diff --git a/patches/os/MDVA-38608_2.3.2-p2_v2.patch b/patches/os/MDVA-38608_2.3.2-p2_v2.patch
@@ -18,4 +18,3 @@ index f99f8c50a7f..9258d2a4703 100644
 +        }
 +    }
  }
-
diff --git a/patches/os/MDVA-38626_2.4.2.patch b/patches/os/MDVA-38626_2.4.2.patch
@@ -45,4 +45,3 @@ index 9ea451a213a..0bda87ded5d 100644
 +            <argument name="sessionTransparent" xsi:type="object">Magento\Checkout\Model\Session</argument>
          </arguments>
      </type>
-
diff --git a/patches/os/MDVA-38626_2.4.3.patch b/patches/os/MDVA-38626_2.4.3.patch
@@ -45,4 +45,3 @@ index 9ea451a213a..0bda87ded5d 100644
 +            <argument name="sessionTransparent" xsi:type="object">Magento\Checkout\Model\Session</argument>
          </arguments>
      </type>
-
diff --git a/patches/os/MDVA-38852_2.3.3.patch b/patches/os/MDVA-38852_2.3.3.patch
@@ -184,4 +184,3 @@ index b3f1aca50df..9c0657ce17f 100644
          "constraint": {
              "PRIMARY": true,
              "EAV_ATTRIBUTE_ENTITY_TYPE_ID_EAV_ENTITY_TYPE_ENTITY_TYPE_ID": true,
-
diff --git a/patches/os/MDVA-39993_1.1.5.patch b/patches/os/MDVA-39993_1.1.5.patch
@@ -100,4 +100,3 @@ index a2d267bc0be..58922cf6688 100644
              try {
                  $productId = (int)$this->getProductIdsBySkus->execute([$sku])[$sku];
              } catch (NoSuchEntityException $e) {
-
diff --git a/patches/os/MDVA-39993_1.2.0.patch b/patches/os/MDVA-39993_1.2.0.patch
@@ -100,5 +100,3 @@ index a2d267bc0be..58922cf6688 100644
              try {
                  $productId = (int)$this->getProductIdsBySkus->execute([$sku])[$sku];
              } catch (NoSuchEntityException $e) {
-
-
diff --git a/patches/os/MDVA-39993_1.2.2.patch b/patches/os/MDVA-39993_1.2.2.patch
@@ -101,4 +101,3 @@ index b4cd49e7bcc..cdf13dc1bfd 100644
          $productIds = [];
          foreach ($sourceItems as $sourceItem) {
              $sku = $sourceItem->getSku();
-
diff --git a/patches/os/MDVA-40488_1.2.3.patch b/patches/os/MDVA-40488_1.2.3.patch
@@ -390,4 +390,3 @@ index 93313cc5fbc8..9e1ad0985299 100644
          </arguments>
      </type>
      <type name="Magento\CatalogInventory\Api\StockRegistryInterface">
-
diff --git a/patches/os/MDVA-40747_1.2.2_v2.patch b/patches/os/MDVA-40747_1.2.2_v2.patch
@@ -21,4 +21,3 @@ index 93132f07eca..d688d89063b 100755
 +                $status = 1;
              }
              $sourceItem->setStatus($status);
-
diff --git a/patches/os/MDVA-41229_2.3.2-p1.patch b/patches/os/MDVA-41229_2.3.2-p1.patch
@@ -25,4 +25,3 @@ index 2571c0385dab..b98776d97ef6 100644
 
              return images;
          },
-
diff --git a/patches/os/MDVA-41229_2.4.3-p1.patch b/patches/os/MDVA-41229_2.4.3-p1.patch
@@ -25,4 +25,3 @@ index 84389083447a..4bd494156054 100644
 
              return images;
          },
-
diff --git a/patches/os/MDVA-41238_1.1.6.patch b/patches/os/MDVA-41238_1.1.6.patch
@@ -601,4 +601,3 @@ index 72f57475943..a815864095a 100644
 +            $this->decrementSourceItem->execute($sourceItemDecrementData);
          }
      }
-
diff --git a/patches/os/MDVA-41547_2.4.3.patch b/patches/os/MDVA-41547_2.4.3.patch
@@ -10,4 +10,3 @@ index e212f33a35d..a1d13e5d353 100644
 +                $tree = $this->mergeCategoriesTrees($tree, $currentLevelTree);
              }
          }
-
diff --git a/patches/os/MDVA-41597_2.4.2-p1.patch b/patches/os/MDVA-41597_2.4.2-p1.patch
@@ -10,4 +10,3 @@ index 19706e114d1d..fa8b669a1bdd 100644
 +        if (empty($this->productIds) || array_key_exists(end($this->productIds), $this->attributeMap)) {
              return $this->attributeMap;
          }
-
diff --git a/patches/os/MDVA-41628_2.4.2-p1.patch b/patches/os/MDVA-41628_2.4.2-p1.patch
@@ -101,4 +101,3 @@ index b8fd974c5da..653882f7a28 100644
      }
 
      /**
-
diff --git a/patches/os/MDVA-42410_2.4.2.patch b/patches/os/MDVA-42410_2.4.2.patch
@@ -191,4 +191,3 @@ index f65a2b964fb..e209ea04a60 100644
          $currencyCode = $this->getCurrentCurrencyCode();
 
          $this->addColumn(
-
diff --git a/patches/os/MDVA-42689_EE_2.4.3.patch b/patches/os/MDVA-42689_EE_2.4.3.patch
@@ -55,4 +55,3 @@ index 00bf88675e75..9452aa535b0c 100644
      }
 
      /**
-
diff --git a/patches/os/MDVA-42790_2.4.3-p1_v2.patch b/patches/os/MDVA-42790_2.4.3-p1_v2.patch
@@ -238,4 +238,3 @@ index b3c50015d9d..b72bd8c4415 100644
 +        $this->scopeOverriddenValue->clearAttributesValues(ProductInterface::class, $product);
          return parent::_afterSave($product);
      }
-
diff --git a/patches/os/MDVA-42950_2.4.1-p1.patch b/patches/os/MDVA-42950_2.4.1-p1.patch
@@ -17,4 +17,3 @@ index aead9510434..1fd7523a237 100644
              videoRegister.register('youtube');
 
              element = document.createElement('script');
-
diff --git a/patches/os/MDVA-43414_1.1.6.patch b/patches/os/MDVA-43414_1.1.6.patch
@@ -11,4 +11,3 @@ index cebf1e8cdac..aac82dbd99e 100644
              if ($isSalable != $currentStatus && $currentStatus !== null) {
                  $data[$sku] = $isSalable;
              }
-
diff --git a/patches/os/MDVA-43726_2.4.2-p2.patch b/patches/os/MDVA-43726_2.4.2-p2.patch
@@ -10,5 +10,3 @@ index 944710773123..f4d397a25fb7 100644
 +                if (!isset($validationByWebsite[$websiteId]) || $validationByWebsite[$websiteId] === null) {
                      continue;
                  }
-
-
diff --git a/patches/os/MDVA-43731_2.4.3.patch b/patches/os/MDVA-43731_2.4.3.patch
@@ -249,4 +249,3 @@ index d589498cdaa..dc01d529362 100644
      /**
       * Init resource data
       *
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,3 @@ diff -Nuar a/vendor/magento/module-rma/Block/Adminhtml/Rma/Edit/Tab/General/Ship
		+ $data['carrierHelper'] = $carrierHelper ?? ObjectManager::getInstance()->get(Carrier::class);
		parent::__construct($context, $registry, $data);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -868,5 +868,3 @@ index cf66deba0cf..0eb2dc4b0f0 100644
		</arguments>
		<block class="Magento\Catalog\Block\Product\ProductList\Item\Container" name="upsell.product.addto" as="addto">
		<block class="Magento\Wishlist\Block\Catalog\Product\ProductList\Item\AddTo\Wishlist"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,3 @@ index 369ae3458e..7d1bca3555 100644
		+ <plugin name="purchaseOrderDisableCommunications" type="Magento\PurchaseOrder\Model\Plugin\DisableCommunicationsForPurchaseOrders" />
		+ </type>
		</config>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,5 +50,3 @@ index b18f125dcdb..a9b4404dad3 100644
		+ if ($update !== null && $update->getId()) {
		return $this->resultRedirectFactory->create()->setPath('//edit', ['id' => $update->getId()]);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -147,4 +147,3 @@ index 3be0dab0ba01..66add0f097e8 100644
		);
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -115,4 +115,3 @@ index badcb3fb8ad..4a043be3ddc 100644
		+ qtyElement.prop('readonly', false);
		}
		},
Original file line number	Diff line number	Diff line change
Expand Up		@@ -145,4 +145,3 @@ index 85feb942d6f..6c4b7e95ee1 100644
		$rewardPointsCeilCompensation = 1;
		$availableBalance = $reward->getPointsEquivalent(
		(float) $creditmemo->getBaseCustomerBalanceReturnMax() + $rewardPointsCeilCompensation
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,4 +78,3 @@ index 7f0de541d7e1..bffe396a12c1 100644
		} else {
		$quoteShippingAddressData = $shippingAddress->getData();
		$billingAddressData = $billingAddress->getData();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -133,4 +133,3 @@ index bf81a6fdc75..3055a478345 100644
		$colls
		);
		} else {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ index 7fd1021c81e..fb9ddf2e173 100644

		return $customOptions;
		}