countValidOrderShopsByDeliveryAvailability

ShopBundle/Repository/OrderShopRepository.php

@@ -2,6 +2,8 @@
 
 namespace Lc\ShopBundle\Repository;
 
+use App\Entity\DeliveryAvailabilityPointSale;
+use App\Entity\DeliveryAvailabilityZone;
 use Doctrine\ORM\QueryBuilder;
 use Lc\ShopBundle\Context\DefaultRepositoryInterface;
 use Lc\ShopBundle\Context\OrderShopInterface;
@@ -181,6 +183,21 @@ class OrderShopRepository extends BaseRepository implements DefaultRepositoryInt
                         $query->andWhere('pointSale.isDepository = 1');
                 }
 
+                if (isset($params['deliveryAvailability'])) {
+                        $deliveryAvailability = $params['deliveryAvailability'] ;
+
+                        $isDeliveryAvailabilityZone = ($deliveryAvailability instanceof DeliveryAvailabilityZone) ? true : false;
+                        $isDeliveryAvailabilityPointSale = ($deliveryAvailability instanceof DeliveryAvailabilityPointSale) ? true : false;
+
+                        if($isDeliveryAvailabilityZone) {
+                                $query->innerJoin('e.deliveryAvailabilityZone','deliveryAvailabilityZone') ;
+                        }
+
+                        if($isDeliveryAvailabilityPointSale) {
+                                $query->innerJoin('e.deliveryAvailabilityPointSale','deliveryAvailabilityPointSale') ;
+                        }
+                }
+
                 if (isset($params['orderBy'])) {
                         $query->orderBy('e.' . $params['orderBy'], isset($params['orderByDirection']) ? $params['orderByDirection'] : 'DESC');
                 } else {

ShopBundle/Resources/views/backend/default/list-fields/field_price.html.twig

@@ -1 +1 @@
-{{ priceUtils.getPriceWithTax(item) }}
+{{ priceUtils.getPriceWithTax(item)|format_price|raw }}

ShopBundle/Resources/views/backend/default/list-fields/field_total.html.twig

@@ -1 +1 @@
-{{ priceUtils.getTotalWithTax(item) }}
+{{ priceUtils.getTotalWithTax(item)|format_price|raw }}