Merge branch 'develop'

Generator/OrderReferenceGenerator.php

@@ -29,7 +29,6 @@ class OrderReferenceGenerator
                 if ($this->orderShopSolver->isValid($complementaryOrder)) $complementaryIndex++;
             }
             $orderShop = $complementaryOrder->getMainOrderShop();
-
         }
 
         switch ($orderShop->getSection()->getCycleType()) {
@@ -50,18 +49,19 @@ class OrderReferenceGenerator
                 break;
         }
 
-        if($complementaryIndex){
+        if($complementaryIndex) {
             $reference = $reference.'C'.$this->numberPad($complementaryIndex, 1);
         }
 
         return $reference;
-
     }
 
     public function buildReferenceCycleDay(OrderShopInterface $orderShop): string
     {
         return $this->getPrefixReference($orderShop) .
-                'C' . $this->numberPad($orderShop->getCycleId(), 3);
+                'J' . $orderShop->getDistribution()->getCycleNumber() .
+                'C' . $this->numberPad($orderShop->getCycleId(), 3) .
+                'A' . $this->formatYear($orderShop->getDistribution()->getYear());
     }
 
     public function buildReferenceCycleWeek(OrderShopInterface $orderShop): string

Repository/Order/OrderProductStore.php

@@ -39,17 +39,6 @@ class OrderProductStore extends AbstractStore
         return $query;
     }
 
-    // findGiftVouchersByOrder
-    public function getGiftVouchersByOrder(OrderShopInterface $orderShop): array
-    {
-        $query = $this->createQuery();
-        $query
-                ->filterByOrderShop($orderShop)
-                ->filterIsGiftVoucherActive();
-
-        return $query->find();
-    }
-
     // findOrderProductsInCartsByProduct
     public function getInCartsByProduct(ProductInterface $product, $query = null): array
     {