Merge branch '4.0' into 4.1

CHANGELOG-3.2.x.md

@@ -1,3 +1,6 @@
+# 3.2.15
+* [PayumBundle] remove payment_state processing to confirm orders by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2743
+
 # 3.2.14
 * [Pimcore] introduce LocalizedFallbackHelper by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2723
 * [Translations] add missing translations by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2721

CHANGELOG-4.0.x.md

@@ -1,3 +1,10 @@
+# 4.0.12
+
+* [PayumBundle] remove payment_state processing to confirm orders by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2743
+* [Docs] Upgrade guide: Mention emergency recovery if major version got updated without updating to latest minor version first by @BlackbitDevs in https://github.com/coreshop/CoreShop/pull/2745
+* [Core] allow multiple store-values by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2747
+* [CoreBundle] fix quantity price rules customerGroups condition by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2750
+
 ## 4.0.11
 
 * [Pimcore] use getCount() instead of getTotalCount() for BatchListing by @hethehe in https://github.com/coreshop/CoreShop/pull/2715

docs/01_Getting_Started/02_Upgrade_Guide.md

@@ -12,3 +12,7 @@ directly, you might miss migrations. Always update to the latest Minor release v
 
 This also means that if you do major updates, you will have old migrations in your Database. You can manually remove those
 if you want to keep your Migrations Table clean.
+
+If you already updated the major version and recognize that some migrations from your previous version to latest minor release version are missing, you can compare the database structure via
+`bin/console doctrine:schema:update --dump-sql`
+Please manually review the SQL statements before executing

src/CoreShop/Bundle/CoreBundle/CoreExtension/StoreValues.php

@@ -401,7 +401,7 @@ public function createDataCopy(Concrete $object, mixed $data): mixed
     public function load(Localizedfield|\Pimcore\Model\DataObject\Fieldcollection\Data\AbstractData|AbstractData|Concrete $object, array $params = []): mixed
     {
         if (isset($params['force']) && $params['force']) {
-            return $this->getProductStoreValuesRepository()->findForProduct($object);
+            return $this->getProductStoreValuesRepository()->findForObject($object, $this->getName());
         }
 
         return null;
@@ -451,14 +451,17 @@ public function save(Localizedfield|\Pimcore\Model\DataObject\Fieldcollection\Da
                     if (count($changeSet) > 0) {
                         $productStoreValue = clone $productStoreValue;
                         $productStoreValue->setProduct($object);
+                        $productStoreValue->setFieldName($this->getName());
                     }
                 } else {
                     $productStoreValue->setProduct($object);
+                    $productStoreValue->setFieldName($this->getName());
                 }
             }
 
             if (null === $productStoreValue->getProduct()) {
                 $productStoreValue->setProduct($object);
+                $productStoreValue->setFieldName($this->getName());
             }
 
             $this->getEntityManager()->persist($productStoreValue);
@@ -669,6 +672,7 @@ public function getDataFromEditmode($data, $object = null, $params = []): mixed
             if ($storeValuesEntity instanceof ProductStoreValuesInterface && $storeValuesEntity->getProduct() && $storeValuesEntity->getProduct()->getId() !== $object->getId()) {
                 $storeValuesEntity = clone $storeValuesEntity;
                 $storeValuesEntity->setProduct($object);
+                $storeValuesEntity->setFieldName($this->getName());
             }
 
             $form = $this->getFormFactory()->createNamed('', ProductStoreValuesType::class, $storeValuesEntity);
@@ -735,6 +739,7 @@ public function createNew($object, StoreInterface $store)
         $newObject = $this->getFactory()->createNew();
         $newObject->setStore($store);
         $newObject->setProduct($object);
+        $newObject->setFieldName($this->getName());
 
         return $newObject;
     }

src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStoreValuesRepository.php

@@ -23,26 +23,52 @@
 use CoreShop\Component\Core\Model\ProductStoreValuesInterface;
 use CoreShop\Component\Core\Repository\ProductStoreValuesRepositoryInterface;
 use CoreShop\Component\Store\Model\StoreInterface;
+use Pimcore\Model\DataObject\Concrete;
 
 class ProductStoreValuesRepository extends EntityRepository implements ProductStoreValuesRepositoryInterface
 {
     public function findForProduct(ProductInterface $product): array
+    {
+        if (!$product instanceof Concrete) {
+            throw new \InvalidArgumentException('Product must be instance of ' . Concrete::class);
+        }
+
+        return $this->findForObject($product, 'storeValues');
+    }
+
+    public function findForProductAndStore(ProductInterface $product, StoreInterface $store): ?ProductStoreValuesInterface
+    {
+        if (!$product instanceof Concrete) {
+            throw new \InvalidArgumentException('Product must be instance of ' . Concrete::class);
+        }
+
+        return $this->findForObjectAndStore($product, 'storeValues', $store);
+    }
+
+    public function findForObject(Concrete $product, string $fieldName): array
     {
         return $this->createQueryBuilder('o')
             ->andWhere('o.product = :product')
+            ->andWhere('o.fieldName = :fieldName')
             ->setParameter('product', $product->getId())
+            ->setParameter('fieldName', $fieldName)
             ->getQuery()
             ->getResult()
         ;
     }
 
-    public function findForProductAndStore(ProductInterface $product, StoreInterface $store): ?ProductStoreValuesInterface
-    {
+    public function findForObjectAndStore(
+        Concrete $product,
+        string $fieldName,
+        StoreInterface $store,
+    ): ?ProductStoreValuesInterface {
         return $this->createQueryBuilder('o')
             ->andWhere('o.product = :product')
+            ->andWhere('o.fieldName = :fieldName')
             ->andWhere('o.store = :store')
             ->setParameter('product', $product->getId())
             ->setParameter('store', $store)
+            ->setParameter('fieldName', $fieldName)
             ->getQuery()
             ->getOneOrNullResult()
         ;

src/CoreShop/Bundle/CoreBundle/Migrations/Version20241105123053.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * CoreShop
+ *
+ * This source file is available under two different licenses:
+ *  - GNU General Public License version 3 (GPLv3)
+ *  - CoreShop Commercial License (CCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ * @copyright  Copyright (c) CoreShop GmbH (https://www.coreshop.org)
+ * @license    https://www.coreshop.org/license     GPLv3 and CCL
+ *
+ */
+
+namespace CoreShop\Bundle\CoreBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241105123053 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        if ($schema->getTable('coreshop_product_store_values')->hasColumn('fieldName')) {
+            return;
+        }
+
+        $this->addSql('ALTER TABLE coreshop_product_store_values ADD fieldName VARCHAR(255) NOT NULL;');
+        $this->addSql('DROP INDEX product_store ON coreshop_product_store_values;');
+        $this->addSql('CREATE UNIQUE INDEX product_store ON coreshop_product_store_values (product, store, fieldName);');
+        $this->addSql("UPDATE coreshop_product_store_values SET fieldName='storeValues';");
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+    }
+}

src/CoreShop/Bundle/CoreBundle/Resources/config/doctrine/model/ProductStoreValues.orm.xml

@@ -4,13 +4,14 @@
     <mapped-superclass name="CoreShop\Component\Core\Model\ProductStoreValues"
                        table="coreshop_product_store_values">
         <unique-constraints>
-            <unique-constraint name="product_store" columns="product,store"/>
+            <unique-constraint name="product_store" columns="product,store,fieldName"/>
         </unique-constraints>
 
         <id name="id" column="id" type="integer">
             <generator strategy="AUTO"/>
         </id>
 
+        <field name="fieldName" column="fieldName" type="string"/>
         <field name="product" column="product" type="pimcoreObject"/>
         <field name="price" column="price" type="bigintInteger"/>
 

src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/productquantitypricerules/conditions/guest.js

@@ -11,4 +11,4 @@
  */
 
 pimcore.registerNS('coreshop.product_quantity_price_rules.conditions.guest');
-coreshop.product_quantity_price_rules.conditions.customerGroups = Class.create(coreshop.product.pricerule.conditions.guest, {});
+coreshop.product_quantity_price_rules.conditions.guest = Class.create(coreshop.product.pricerule.conditions.guest, {});

src/CoreShop/Bundle/PayumBundle/Action/ConfirmOrderAction.php

@@ -37,8 +37,7 @@ public function execute($request): void
         $payment = $request->getFirstModel();
         $order = $payment->getOrder();
         if ($payment->getState() === PaymentInterface::STATE_COMPLETED ||
-            $payment->getState() === PaymentInterface::STATE_AUTHORIZED ||
-            $payment->getState() === PaymentInterface::STATE_PROCESSING
+            $payment->getState() === PaymentInterface::STATE_AUTHORIZED
         ) {
             $this->stateMachineApplier->apply($order, OrderTransitions::IDENTIFIER, OrderTransitions::TRANSITION_CONFIRM);
 

src/CoreShop/Component/Core/Model/ProductStoreValues.php

@@ -32,6 +32,7 @@ class ProductStoreValues extends AbstractResource implements ProductStoreValuesI
     use StoreAwareTrait;
 
     protected ?int $id = null;
+    protected ?string $fieldName = null;
     protected int $price = 0;
     protected ?TaxRuleGroupInterface $taxRule = null;
     protected ?ProductInterface $product = null;
@@ -56,6 +57,16 @@ public function setId(int $id): void
         $this->id = $id;
     }
 
+    public function getFieldName(): ?string
+    {
+        return $this->fieldName;
+    }
+
+    public function setFieldName(?string $fieldName): void
+    {
+        $this->fieldName = $fieldName;
+    }
+
     public function getPrice(): int
     {
         return $this->price;

src/CoreShop/Component/Core/Model/ProductStoreValuesInterface.php

@@ -27,6 +27,10 @@ interface ProductStoreValuesInterface extends ResourceInterface, StoreAwareInter
 {
     public function getPrice(): int;
 
+    public function getFieldName(): ?string;
+
+    public function setFieldName(string $fieldName): void;
+
     public function setPrice(int $price);
 
     public function getProduct(): ?ProductInterface;

src/CoreShop/Component/Core/Repository/ProductStoreValuesRepositoryInterface.php

@@ -22,6 +22,7 @@
 use CoreShop\Component\Core\Model\ProductStoreValuesInterface;
 use CoreShop\Component\Resource\Repository\RepositoryInterface;
 use CoreShop\Component\Store\Model\StoreInterface;
+use Pimcore\Model\DataObject\Concrete;
 
 interface ProductStoreValuesRepositoryInterface extends RepositoryInterface
 {
@@ -31,4 +32,11 @@ interface ProductStoreValuesRepositoryInterface extends RepositoryInterface
     public function findForProduct(ProductInterface $product): array;
 
     public function findForProductAndStore(ProductInterface $product, StoreInterface $store): ?ProductStoreValuesInterface;
+
+    /**
+     * @return ProductStoreValuesInterface[]
+     */
+    public function findForObject(Concrete $product, string $fieldName): array;
+
+    public function findForObjectAndStore(Concrete $product, string $fieldName, StoreInterface $store): ?ProductStoreValuesInterface;
 }

src/CoreShop/Component/Resource/Model/TranslatableTrait.php

@@ -73,7 +73,7 @@ public function getTranslation(string $locale = null, bool $useFallbackTranslati
             return $translation;
         }
 
-        if ($useFallbackTranslation) {
+        if ($useFallbackTranslation && null !== $this->fallbackLocale) {
             $fallbackTranslation = $this->translations->get($this->fallbackLocale);
             if (null !== $fallbackTranslation) {
                 $this->translationsCache[$this->fallbackLocale] = $fallbackTranslation;