Merge branch '2.2'

coreshop · Jun 9, 2022 · ff4aceb · ff4aceb
2 parents 8142408 + 100b1b3
commit ff4aceb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/CHANGELOG-2.2.x.md b/CHANGELOG-2.2.x.md
@@ -1,5 +1,22 @@
 # Within 2.2
 
+## 2.2.14
+ - Bugs: 
+   - [ProductQuantityPriceRules] remove variable variables sign (https://github.com/coreshop/CoreShop/pull/1991)
+
+## 2.2.13
+ - Bugs:
+   - [ResourceBundle] fix ResourceSettingsController getConfigAction (https://github.com/coreshop/CoreShop/pull/1981)
+
+## 2.2.12
+ - Bugs:
+   - [FrontendBundle] Fix "Invoice Address is Shipping Address" in checkout address step (https://github.com/coreshop/CoreShop/pull/1823)
+   - [OrderBundle] cart context returns latest cart even if multiple found (https://github.com/coreshop/CoreShop/pull/1837)
+   - [FrontendBundle] Password reset: Clearer form labels (https://github.com/coreshop/CoreShop/pull/1855)
+   - [ResourceBundle] Fatal error when saving object with product-specific prices -> EntityMerger got object of wrong class (https://github.com/coreshop/CoreShop/pull/1864)
+   - [ProductBundle] Add isEqual() for product-specific price (https://github.com/coreshop/CoreShop/pull/1844)
+   - [Pimcore] Fix delete icons in Pimcore backend (https://github.com/coreshop/CoreShop/pull/1885)
+
 ## 2.2.11
  - Bugs:
    - [CoreExtensions] refactor how Doctrine Entities are cloned (https://github.com/coreshop/CoreShop/pull/1770)

diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php
@@ -155,6 +155,9 @@ protected function registerPimcoreResources($applicationName, $bundleResources,
             $globalPermissions = [];
 
             if ($container->hasParameter($applicationParameter)) {
+                /**
+                 * @var array $applicationPermissions
+                 */
                 $applicationPermissions = $container->getParameter($applicationParameter);
             }
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Resources/public/pimcore/js/object/objectMultihref.js b/src/CoreShop/Bundle/ResourceBundle/Resources/public/pimcore/js/object/objectMultihref.js
@@ -86,7 +86,7 @@ coreshop.object.objectMultihref = Class.create(pimcore.object.tags.manyToManyObj
                 items: [
                     {
                         tooltip: t('remove'),
-                        icon: 'pimcore_icon_delete',
+                        iconCls: 'pimcore_icon_delete',
                         handler: function (grid, rowIndex) {
                             grid.getStore().removeAt(rowIndex);
                         }.bind(this)