Merge branch 'develop'

ShopBundle/Model/OrderShop.php

@@ -73,7 +73,7 @@ abstract class OrderShop extends AbstractEntity implements FilterMerchantInterfa
         protected $orderPayments;
 
         /**
-         * @ORM\OneToMany(targetEntity="Lc\ShopBundle\Context\OrderProductInterface", mappedBy="orderShop", cascade={"persist", "remove"}, orphanRemoval=true)
+         * @ORM\OneToMany(targetEntity="Lc\ShopBundle\Context\OrderProductInterface", mappedBy="orderShop", cascade={"persist", "remove"}, orphanRemoval=true, fetch="EAGER")
          */
         protected $orderProducts;
 

ShopBundle/Repository/OrderShopRepository.php

@@ -313,20 +313,5 @@ class OrderShopRepository extends BaseRepository implements DefaultRepositoryInt
         }
 
 
-        public function countValidOrderProductsOfWeekByProduct($weekNumber, $productId)
-        {
-                $query = $this->findByMerchantQuery();
-                $query = $this->filterOrderValid($query);
-                $query->andWhere('e.weekNumber = :weekNumber');
-                $query->setParameter('weekNumber', $weekNumber);
-                $query->leftJoin('e.orderProducts', 'orderProduct');
-                $query->andWhere('orderProduct.product = :product');
-                $query->setParameter('product', $productId);
-                $query->select('SUM(orderProduct.quantityOrder) as quantity');
-
-                $result = $query->getQuery()->getOneOrNullResult();
 
-                return $result['quantity'];
-
-        }
 }

ShopBundle/Resources/public/js/backend/script/order/vuejs-order.js

@@ -115,7 +115,7 @@ appOrder = new Vue({
             }
         },
         preventFormSubmit: function (){
-            $(document).keypress(function(e) {
+            $('#lc-order-edit').keypress(function(e) {
                 if (e.which == 13) {
                     e.preventDefault();
                 }