Merge branch 'develop'

ShopBundle/Controller/Backend/NewsController.php

                 ] ;
 
                 $i = 0 ;
+
                 foreach ($users as $user) {
+                        $paramsTemplate['user'] =$user;
+
                         if(!isset($packageMessagesArray[$i])) {
                                 $packageMessagesArray[$i] = [] ;
                         }
         public function getNewsletter()
         {
                 $newsletter = $this->merchantUtils->getMerchantCurrent()->getNewsletter() ;
+
                 if($newsletter) {
                         return $newsletter ;
                 }

ShopBundle/EventSubscriber/ListEventSubscriber.php

 
 use Lc\ShopBundle\Context\FilterMerchantInterface;
 use Lc\ShopBundle\Context\FilterMultipleMerchantsInterface;
+use Lc\ShopBundle\Context\ProductFamilyInterface;
 use Lc\ShopBundle\Context\StatusInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
                 }else {*/
 
+                        if ($entityObject instanceof ProductFamilyInterface) {
+                                $paginator->nbResultsOnSale = $entityRepo->count(array('saleStatus' =>1, 'status'=> 1, 'merchant'=> $criteria['merchant']));
+                        }
+
                         if ($entityObject instanceof StatusInterface) {
 
                                 for ($status = -1; $status <= 1; $status++) {

ShopBundle/Model/ProductCategory.php

          */
         protected $productFamilies;
 
+        /**
+         * @ORM\Column(type="boolean")
+         */
+        protected $saleStatus;
+
         public function __construct()
         {
                 $this->childrens = new ArrayCollection();
 
                 return $this;
         }
+
+        public function getSaleStatus(): ?bool
+        {
+                return $this->saleStatus;
+        }
+
+        public function setSaleStatus(bool $saleStatus): self
+        {
+                $this->saleStatus = $saleStatus;
+
+                return $this;
+        }
 }

ShopBundle/Model/ProductFamily.php

         protected $behaviorPrice;
 
 
+        /**
+         * @ORM\Column(type="boolean")
+         */
+        protected $saleStatus;
+
         public function __construct()
         {
                 $this->productCategories = new ArrayCollection();
 
                 return false ;
         }
+
+        public function getSaleStatus(): ?bool
+        {
+                return $this->saleStatus;
+        }
+
+        public function setSaleStatus(bool $saleStatus): self
+        {
+                $this->saleStatus = $saleStatus;
+
+                return $this;
+        }
 }

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

             {
                 addressType: null,
                 currentSection:'general',
+                isOpenFullTime: false,
                 sectionsArray: [
                     {
                         name: 'general',
                         nameDisplay: 'Maintenance'
                     }
                 ]
-            }, window.addressValues);
+            }, window.addressValues, window.merchantPanelOrderValues);
     },
     mounted: function () {},
     methods: {

ShopBundle/Resources/translations/lcshop.fr.yaml

     nbResultsFiltered: Total d'élements filtrés
     nbResultsOnline: Total d'élements en ligne
     nbResultsOffline: Total d'élements hors ligne
-    nbResultsDeleted: Total d'élements supprimé
+    nbResultsDeleted: Total d'élements supprimés
+    nbResultsOnSale: Total de produits en vente
+    nbProductFamilyOnline: Total de produits visibles
     listChildren: Afficher les enfants
     edit: Éditer
     delete: Supprimer
         editStockNoQuantityDefault: "Le stock n'a pas été modifié pour le produit #%id% (Aucune quantité par défaut)"
 field:
     default:
+        unit: Unité
         placeholder: Choisissez une option
         deliveryPointSale: Lieu de livraison
         deliveryAvailabilty: Créneau de livraison
         id: Id
         status: Statut
+        saleStatus: En vente sur le site
         statusOptions:
             offline: <span class="badge badge-danger">Hors ligne</span>
             online: <span class="badge badge-success">En ligne</span>
             success: Succès (vert)
         warningMessage: Contenu du message d'avertissement
         newsletters: Newsletters
+        deliveryDepositoryOnly: Retrait au dépot uniquement
         isPublic: Publique
         isDepository: Dépôt
         productCategories: Catégories

ShopBundle/Resources/views/backend/default/list.html.twig

                                     <i class="fa fa-check"></i> </span>{% endif %}
                                 {% if paginator.nbResultsOffline is defined %}<span data-toggle="tooltip"
                                                                                     title="{{ "list.nbResultsOffline"|trans }}"
-                                                                                    class="badge badge-warning">{{ paginator.nbResultsOffline }}
+                                                                                    class="badge badge-danger">{{ paginator.nbResultsOffline }}
                                     <i class="fa fa-pen"></i></span>{% endif %}
                                 {% if is_granted('ROLE_SUPER_ADMIN') and paginator.nbResultsDeleted is defined %}<span
                                     data-toggle="tooltip" title="{{ "list.nbResultsDeleted"|trans }}"
-                                    class="badge badge-danger">{{ paginator.nbResultsDeleted }} <i
+                                    class="badge badge-secondary">{{ paginator.nbResultsDeleted }} <i
                                         class="fa fa-trash"></i>
                                     </span>{% endif %}
                             {% endblock %}

ShopBundle/Resources/views/backend/merchant/form.html.twig

                         <span class="glyphicon glyphicon-triangle-bottom"></span>
                         <i class="fa fa-exclamation-circle invalid-form"></i>
                     </button>
-
                 </li>
             </ul>
         </div>

ShopBundle/Resources/views/backend/merchant/panel_delivery.html.twig

 <div class="row">
     <div class="col-8">
         {{ macros.card_start('Merchant.delivery','light') }}
+
+        {% if form.merchantConfigs['delivery-depository-only'] is defined %}
+            <div class="col-12">
+                {{ form_row(form.merchantConfigs['delivery-depository-only']) }}
+            </div>
+        {% endif %}
         {% if form.merchantConfigs['image-zones'] is defined %}
             <div class="col-12">
                 {{ form_row(form.merchantConfigs['image-zones']) }}

ShopBundle/Resources/views/backend/merchant/panel_email.html.twig

         <div class="col-12">
             {{ form_row(form.merchantConfigs['email-contact']) }}
         </div>
+        {% if form.merchantConfigs['email-from-purchase-order'] is defined %}
         <div class="col-12">
             {{ form_row(form.merchantConfigs['email-from-purchase-order']) }}
         </div>
+        {% endif %}
         {% if form.merchantConfigs['purchase-order-email-content'] is defined %}
             <div class="col-12">
                 {{ form_row(form.merchantConfigs['purchase-order-email-content']) }}

ShopBundle/Resources/views/backend/merchant/panel_order.html.twig

 
 {% import '@LcShop/backend/default/block/macros.html.twig' as macros %}
 
+
+<script>
+    window.merchantPanelOrderValues = {
+        {% if form.merchantConfigs['is-open-full-time'] is defined %}isOpenFullTime: {{ form.merchantConfigs['is-open-full-time'].vars.data.value }}{% endif %}
+    };
+</script>
+
+
 <div class="row">
     <div class="col-8">
         {{ macros.card_start('Merchant.order','light') }}
         <div class="col-6">
             {{ form_row(form.merchantConfigs['maximum-order-week']) }}
         </div>
-        <div class="col-6">
+        {% if form.merchantConfigs['is-open-full-time'] is defined %}
+            <div class="col-12">
+                {% for field in form.merchantConfigs['is-open-full-time'] %}
+                    {% if field.vars.name == 'value' %}
+                        {{ form_row(field, {'attr': {"v-model" : 'isOpenFullTime'}}) }}
+                    {% else %}
+                        {{ form_row(field) }}
+                    {% endif %}
+                {% endfor %}
+            </div>
+        {% endif %}
+        {% if form.merchantConfigs['message-site-opening-background'] is defined %}
+            <div v-show="isOpenFullTime == true" class="col-6">
+                {{ form_row(form.merchantConfigs['message-site-opening-background']) }}
+            </div>
+        {% endif %}
+        {% if form.merchantConfigs['message-site-opening'] is defined %}
+            <div v-show="isOpenFullTime == true" class="col-6">
+                {{ form_row(form.merchantConfigs['message-site-opening']) }}
+            </div>
+        {% endif %}
+        <div v-show="isOpenFullTime == false" class="col-6">
             {{ form_row(form.merchantConfigs['order-open-day']) }}
         </div>
-        <div class="col-6">
+        <div v-show="isOpenFullTime == false" class="col-6">
             {{ form_row(form.merchantConfigs['order-open-time']) }}
         </div>
         {% if form.merchantConfigs['order-open-day-vip'] is defined %}
-            <div class="col-6">
+            <div v-show="isOpenFullTime == false" class="col-6">
                 {{ form_row(form.merchantConfigs['order-open-day-vip']) }}
             </div>
         {% endif %}
         {% if form.merchantConfigs['order-open-time-vip'] is defined %}
-            <div class="col-6">
+            <div v-show="isOpenFullTime == false" class="col-6">
                 {{ form_row(form.merchantConfigs['order-open-time-vip']) }}
             </div>
         {% endif %}
-        <div class="col-6">
+        <div v-show="isOpenFullTime == false" class="col-6">
             {{ form_row(form.merchantConfigs['order-close-day']) }}
         </div>
-        <div class="col-6">
+        <div v-show="isOpenFullTime == false" class="col-6">
             {{ form_row(form.merchantConfigs['order-close-time']) }}
         </div>
-        <div class="col-6">
+        <div v-show="isOpenFullTime == false" class="col-6">
             {{ form_row(form.dateBeginHoliday) }}
         </div>
-        <div class="col-6">
+        <div v-show="isOpenFullTime == false" class="col-6">
             {{ form_row(form.dateEndHoliday) }}
         </div>
         {{ macros.card_end() }}

ShopBundle/Resources/views/backend/productfamily/panel_general.html.twig

     <div class="col-12">
         {{ form_row(form.status) }}
     </div>
+    <div class="col-12">
+        {{ form_row(form.saleStatus) }}
+    </div>
     <div class="col-12">
         {{ form_row(form.supplier) }}
     </div>

ShopBundle/Services/Order/OrderUtilsStockTrait.php

                 }
         }
 
+        public function isProductSaleStatusOn(Product $product)
+        {
+                if($product->getProductFamily()->getSaleStatus()!=1) {
+                        return false ;
+                }
+
+                $allCategoriesSalesOff = true;
+                foreach ($product->getProductFamily()->getProductCategories() as $category){
+                        if($category->getParent()) {
+                                if($category->getSaleStatus() && $category->getParent()->getSaleStatus())
+                                        $allCategoriesSalesOff = false;
+                        }
+                        else {
+                                if($category->getSaleStatus()) $allCategoriesSalesOff = false;
+                        }
+                }
+                if($allCategoriesSalesOff) return false;
+
+                return true ;
+        }
 
         public function isProductAvailable(Product $product, $quantityOrder = 0, $checkCart = false, $orderShop = null)
         {
-                if ($product->getStatus() != 1 || $product->getProductFamily()->getStatus() != 1) {
+                if ($product->getStatus() != 1 || $product->getProductFamily()->getStatus() != 1 || !$this->isProductSaleStatusOn($product)) {
                         return false;
                 }
 

ShopBundle/Services/Utils.php

                 ]);
         }
 
+        public function urlEncryptData($datas){
+                $key = 'secretToken';
+                foreach ($datas as $data) {
+                        $key .= $data;
+                }
+                return md5($key);
+        }
+
+
 }