[3.0] cleanup proposal stuff and fix serialization of Doctrine collections

src/CoreShop/Bundle/CoreBundle/Maintenance/ProposalExpireTask.php → src/CoreShop/Bundle/CoreBundle/Maintenance/OrderExpireTask.php

@@ -14,21 +14,21 @@
 
 namespace CoreShop\Bundle\CoreBundle\Maintenance;
 
-use CoreShop\Bundle\OrderBundle\Expiration\ProposalExpirationInterface;
+use CoreShop\Bundle\OrderBundle\Expiration\OrderExpirationInterface;
 use CoreShop\Component\Core\Configuration\ConfigurationServiceInterface;
 use Pimcore\Maintenance\TaskInterface;
 
-final class ProposalExpireTask implements TaskInterface
+final class OrderExpireTask implements TaskInterface
 {
     private ConfigurationServiceInterface $configurationService;
-    private ProposalExpirationInterface $proposalExpiration;
+    private OrderExpirationInterface $proposalExpiration;
     private string $type;
     private int $days;
     private array $params;
 
     public function __construct(
         ConfigurationServiceInterface $configurationService,
-        ProposalExpirationInterface $proposalExpiration,
+        OrderExpirationInterface $proposalExpiration,
         string $type,
         int $days = 0,
         array $params = []

src/CoreShop/Bundle/CoreBundle/Resources/config/services/order.yml

@@ -25,7 +25,7 @@ services:
             - '@CoreShop\Component\Core\Order\Transformer\OrderItemToShipmentItemTransformer.inner'
 
     coreshop.maintenance.cart.expire_task:
-        class: CoreShop\Bundle\CoreBundle\Maintenance\ProposalExpireTask
+        class: CoreShop\Bundle\CoreBundle\Maintenance\OrderExpireTask
         arguments:
             - '@CoreShop\Component\Core\Configuration\ConfigurationServiceInterface'
             - '@CoreShop\Bundle\OrderBundle\Expiration\CartExpiration'
@@ -36,7 +36,7 @@ services:
             - { name: pimcore.maintenance.task, type: coreshop_expire_carts }
 
     coreshop.maintenance.order.expire_task:
-        class: CoreShop\Bundle\CoreBundle\Maintenance\ProposalExpireTask
+        class: CoreShop\Bundle\CoreBundle\Maintenance\OrderExpireTask
         arguments:
             - '@CoreShop\Component\Core\Configuration\ConfigurationServiceInterface'
             - '@CoreShop\Bundle\OrderBundle\Expiration\OrderExpiration'

src/CoreShop/Bundle/IndexBundle/Resources/config/serializer/Model.Filter.yml

@@ -29,9 +29,9 @@ CoreShop\Component\Index\Model\Filter:
             groups: [Detailed]
         preConditions:
             expose: true
-            type: array
+            type: ArrayCollection
             groups: [Detailed]
         conditions:
             expose: true
-            type: array
+            type: ArrayCollection
             groups: [Detailed]

src/CoreShop/Bundle/NotificationBundle/Resources/config/serializer/Model.NotificationRule.yml

@@ -25,9 +25,9 @@ CoreShop\Component\Notification\Model\NotificationRule:
             groups: [Detailed]
         conditions:
             expose: true
-            type: array
+            type: ArrayCollection
             groups: [Detailed]
         actions:
             expose: true
-            type: array
-            groups: [Detailed]
+            type: ArrayCollection
+            groups: [Detailed]

src/CoreShop/Bundle/OrderBundle/Command/CartExpireCommand.php

@@ -14,19 +14,19 @@
 
 namespace CoreShop\Bundle\OrderBundle\Command;
 
-use CoreShop\Bundle\OrderBundle\Expiration\ProposalExpirationInterface;
+use CoreShop\Bundle\OrderBundle\Expiration\OrderExpirationInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 final class CartExpireCommand extends Command
 {
-    protected ProposalExpirationInterface $cartExpiration;
+    protected OrderExpirationInterface $cartExpiration;
     protected int $days;
     protected array $params;
 
-    public function __construct(ProposalExpirationInterface $cartExpiration, int $days = 0, array $params = [])
+    public function __construct(OrderExpirationInterface $cartExpiration, int $days = 0, array $params = [])
     {
         $this->cartExpiration = $cartExpiration;
         $this->days = $days;

src/CoreShop/Bundle/OrderBundle/Command/OrderExpireCommand.php

@@ -14,18 +14,18 @@
 
 namespace CoreShop\Bundle\OrderBundle\Command;
 
-use CoreShop\Bundle\OrderBundle\Expiration\ProposalExpirationInterface;
+use CoreShop\Bundle\OrderBundle\Expiration\OrderExpirationInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 final class OrderExpireCommand extends Command
 {
-    protected ProposalExpirationInterface $orderExpiration;
+    protected OrderExpirationInterface $orderExpiration;
     protected int $days;
 
-    public function __construct(ProposalExpirationInterface $orderExpiration, int $days = 0)
+    public function __construct(OrderExpirationInterface $orderExpiration, int $days = 0)
     {
         parent::__construct();
 

src/CoreShop/Bundle/OrderBundle/Expiration/CartExpiration.php

@@ -16,7 +16,7 @@
 
 use CoreShop\Component\Order\Repository\OrderRepositoryInterface;
 
-final class CartExpiration implements ProposalExpirationInterface
+final class CartExpiration implements OrderExpirationInterface
 {
     private OrderRepositoryInterface $cartRepository;
 

src/CoreShop/Bundle/OrderBundle/Expiration/OrderExpiration.php

@@ -20,7 +20,7 @@
 use CoreShop\Component\Order\Repository\OrderRepositoryInterface;
 use Pimcore\Model\DataObject\Concrete;
 
-final class OrderExpiration implements ProposalExpirationInterface
+final class OrderExpiration implements OrderExpirationInterface
 {
     private OrderRepositoryInterface $orderRepository;
     private StateMachineApplier $stateMachineApplier;

src/CoreShop/Bundle/OrderBundle/Expiration/ProposalExpirationInterface.php → src/CoreShop/Bundle/OrderBundle/Expiration/OrderExpirationInterface.php

@@ -14,7 +14,7 @@
 
 namespace CoreShop\Bundle\OrderBundle\Expiration;
 
-interface ProposalExpirationInterface
+interface OrderExpirationInterface
 {
     /**
      * @param int   $days

src/CoreShop/Bundle/OrderBundle/Resources/config/serializer/Model.Order.yml

@@ -7,6 +7,31 @@ CoreShop\Component\Order\Model\Order:
             exp: object.getToken()
             type: string
             groups: [List, Detailed]
+        saleState:
+            serialized_name: saleState
+            exp: object.getSaleState()
+            type: string
+            groups: [List, Detailed]
+        orderState:
+            serialized_name: orderState
+            exp: object.getOrderState()
+            type: string
+            groups: [List, Detailed]
+        shippingState:
+            serialized_name: shippingState
+            exp: object.getShippingState()
+            type: string
+            groups: [Detailed]
+        invoiceState:
+            serialized_name: invoiceState
+            exp: object.getInvoiceState()
+            type: string
+            groups: [Detailed]
+        paymentState:
+            serialized_name: paymentState
+            exp: object.getPaymentState()
+            type: string
+            groups: [Detailed]
         paymentProvider:
             serialized_name: paymentProvider
             exp: object.getPaymentProvider()
@@ -35,6 +60,11 @@ CoreShop\Component\Order\Model\Order:
             exp: object.getPriceRuleItems()
             type: array
             groups: [Detailed]
+        paymentTotal:
+            serialized_name: paymentTotal
+            exp: object.getPaymentTotal()
+            type: integer
+            groups: [Detailed]
         totalTax:
             serialized_name: totalTax
             exp: object.getTotalTax()
@@ -155,6 +185,11 @@ CoreShop\Component\Order\Model\Order:
             exp: object.getOrderNumber()
             type: string
             groups: [Detailed]
+        orderDate:
+            serialized_name: orderDate
+            exp: object.getOrderDate()
+            type: DateTime
+            groups: [Detailed]
         shippingAddress:
             serialized_name: shippingAddress
             exp: object.getShippingAddress()