Merge branch 'develop'

ShopBundle/Form/Backend/User/TicketTypesNotificationType.php

@@ -35,7 +35,8 @@ class TicketTypesNotificationType extends AbstractType
                                         'field.Ticket.typeOptions.'.Ticket::TYPE_GENERAL_QUESTION => Ticket::TYPE_GENERAL_QUESTION,
                                         'field.Ticket.typeOptions.'.Ticket::TYPE_PRODUCT_ERROR=> Ticket::TYPE_PRODUCT_ERROR ,
                                         'field.Ticket.typeOptions.'.Ticket::TYPE_PRODUCT_UNAVAILABLE => Ticket::TYPE_PRODUCT_UNAVAILABLE,
-                                        'field.Ticket.typeOptions.'.Ticket::TYPE_TECHNICAL_PROBLEM => Ticket::TYPE_TECHNICAL_PROBLEM
+                                        'field.Ticket.typeOptions.'.Ticket::TYPE_TECHNICAL_PROBLEM => Ticket::TYPE_TECHNICAL_PROBLEM,
+                                        'field.Ticket.typeOptions.'.Ticket::TYPE_POULTRY_BOOKING => Ticket::TYPE_POULTRY_BOOKING
                                 ),
                                 'required' => false,
                                 'expanded' => false,

ShopBundle/Form/Frontend/TicketType.php

@@ -58,6 +58,7 @@ class TicketType extends AbstractType
                                         'field.Ticket.typeOptions.'.Ticket::TYPE_PRODUCT_UNAVAILABLE => Ticket::TYPE_PRODUCT_UNAVAILABLE,
                                         'field.Ticket.typeOptions.'.Ticket::TYPE_PRODUCT_ERROR => Ticket::TYPE_PRODUCT_ERROR,
                                         'field.Ticket.typeOptions.'.Ticket::TYPE_TECHNICAL_PROBLEM => Ticket::TYPE_TECHNICAL_PROBLEM,
+                                        'field.Ticket.typeOptions.'.Ticket::TYPE_POULTRY_BOOKING => Ticket::TYPE_POULTRY_BOOKING,
                                 ],
                                 'translation_domain' => 'lcshop',
                         ]) ;

ShopBundle/Model/Ticket.php

@@ -22,6 +22,8 @@ abstract class Ticket extends AbstractEntity implements FilterMerchantInterface
         const TYPE_PRODUCT_ERROR = 'product-error' ;
         const TYPE_TECHNICAL_PROBLEM = 'technical-problem' ;
         const TYPE_GENERAL_QUESTION = 'general-question' ;
+        const TYPE_POULTRY_BOOKING = 'poultry-booking' ;
+
 
         const TICKET_STATUS_OPEN = 'open' ;
         const TICKET_STATUS_BEING_PROCESSED = 'being-processed' ;

ShopBundle/Repository/ProductFamilyRepository.php

@@ -102,7 +102,11 @@ class ProductFamilyRepository extends BaseRepository implements DefaultRepositor
         public function findByTerms($terms, $maxResults = false)
         {
                 $query = $this->findByMerchantQuery() ;
-                $query = $this->joinRelations($query) ;
+
+                $query->leftJoin('e.productCategories', 'cat');
+                $query->addSelect('cat') ;
+
+                $query->orderBy('e.position', 'ASC');
 
                 $query->andWhere('e.status = 1');
                 $query->andWhere('e.title LIKE :terms OR cat.title LIKE :terms');

ShopBundle/Resources/public/css/backend/custom.css

@@ -862,3 +862,42 @@ table.products-collection-table tr.disabled {
 #ticket-list .btn-sm {
   display: block;
 }
+
+/* line 307, ../../sass/backend/custom.scss */
+#toast-container {
+  width: 350px;
+}
+
+/* line 308, ../../sass/backend/custom.scss */
+.toast {
+  float: right;
+}
+
+/* line 310, ../../sass/backend/custom.scss */
+#toast-container:before:hover {
+  opacity: 1;
+  cursor: pointer;
+}
+
+/* line 314, ../../sass/backend/custom.scss */
+#toast-close-all {
+  border: 0;
+  position: absolute;
+  pointer-events: auto;
+  z-index: 999999999999999999999;
+  background: #BD362F;
+  border-radius: 3px;
+  color: #fff;
+  opacity: 0.8;
+  top: 2px;
+  width: 50px;
+  height: 50px;
+  font-size: 30px;
+  left: 0px;
+  text-align: center;
+  -webkit-text-shadow: 0 1px 0 #fff;
+  text-shadow: 0 1px 0 #fff;
+  -moz-box-shadow: 0 0 12px #999;
+  -webkit-box-shadow: 0 0 12px #999;
+  box-shadow: 0 0 12px #999;
+}

ShopBundle/Resources/public/js/backend/script/default/utils.js

@@ -149,18 +149,35 @@ function userNotAllowToEdit() {
 
 
 function setFlashMessages(flashMessages){
+    var currentFlash =new Array();
     for (var type in flashMessages) {
         for (var key in flashMessages[type]) {
-            generateNotice(type, flashMessages[type][key]);
+            if(!currentFlash.includes(flashMessages[type][key])) {
+                currentFlash.push(flashMessages[type][key]);
+                generateNotice(type, flashMessages[type][key]);
+            }
         }
     }
 }
 
 function generateNotice(type, text) {
-    toastr.options.timeOut = 30000;
-    toastr.options.preventDuplicates = true;
+
+    toastr.options.timeOut = 3000;
+    toastr.options.onHidden = function() {
+        if($('#toast-container .toast').length==0)$('#toast-close-all').remove();
+    };
+    //toastr.options.preventDuplicates = true;
     toastr[type](text);
 
+    if($('#toast-close-all').length==0) {
+        $('#toast-container').prepend('<button id="toast-close-all"><i class="fa fa-times"></i></button>');
+    }
+    $('#toast-close-all').off('click');
+    $('#toast-close-all').on('click', function (){
+        toastr.remove();
+        if($('#toast-container .toast').length==0)$('#toast-close-all').remove();
+    });
+
     /*var n = noty({
         text: text,
         type: type,

ShopBundle/Resources/public/sass/backend/custom.scss

@@ -302,3 +302,33 @@ table.products-collection-table tr.disabled{opacity: 0.5}
                 display: block ;
         }
 }
+
+
+#toast-container { width: 350px;}
+.toast{float: right}
+
+#toast-container:before:hover {
+        opacity:1;
+        cursor:pointer;
+}
+#toast-close-all {
+        border:0;
+        position: absolute;
+        pointer-events: auto;
+        z-index: 999999999999999999999;
+        background: #BD362F;
+        border-radius: 3px;
+color:#fff;
+        opacity:0.8;
+        top: 2px;
+        width: 50px;
+        height: 50px;
+        font-size: 30px;
+        left: 0px;
+        text-align: center;
+        -webkit-text-shadow: 0 1px 0 #fff;
+        text-shadow: 0 1px 0 #fff;
+        -moz-box-shadow: 0 0 12px #999;
+        -webkit-box-shadow: 0 0 12px #999;
+        box-shadow: 0 0 12px #999;
+}

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -462,6 +462,7 @@ field:
             product-unavailable: Produit manquant
             product-error: Erreur sur un produit
             technical-problem: Problème techique
+            poultry-booking: Réservation volaille
         statusOptions:
             open: Ouvert
             being-processed: En cours de traitement

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

@@ -62,5 +62,5 @@
 
 {% block script_javascript %}
     {{ parent() }}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-edit.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-edit.js')|lc_cache }}"></script>
 {% endblock %}

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

@@ -23,7 +23,6 @@
               href="{{ asset('bundles/lcshop/css/backend/adminlte/plugins/select2/select2-bootstrap.min.css') }}">
         <link rel="stylesheet"
               href="{{ asset('bundles/lcshop/css/backend/adminlte/plugins/bootstrap/bootstrap-switch.min.css') }}">
-
         <!-- Theme style -->
         <link rel="stylesheet" href="{{ asset('bundles/lcshop/css/backend/adminlte/plugins/toastr/toastr.min.css') }}">
         <link rel="stylesheet" href="{{ asset('bundles/lcshop/css/backend/adminlte/adminlte.css') }}">
@@ -34,9 +33,9 @@
     {% endblock %}
 
     {% block head_custom_stylesheets %}
-        <link rel="stylesheet" href="{{ asset('bundles/lcshop/css/backend/custom.css') }}">
+        <link rel="stylesheet" href="{{ asset('bundles/lcshop/css/backend/custom.css')|lc_cache }}">
         {% for asset_css in easyadmin_config('design.assets.css') %}
-            <link rel="stylesheet" href="{{ asset(asset_css) }}">
+            <link rel="stylesheet" href="{{ asset(asset_css)|lc_cache }}">
         {% endfor %}
     {% endblock head_custom_stylesheets %}
 
@@ -252,11 +251,11 @@
         <script src="{{ asset('bundles/lcshop/js/backend/plugin/bootstrap/bootstrap-switch.min.js') }}"></script>
         <!-- AdminLTE App -->
         <script src="{{ asset('bundles/lcshop/js/backend/plugin/adminlte.min.js') }}"></script>
-        <script src="{{ asset('bundles/lcshop/js/backend/script/default/utils.js') }}"></script>
+        <script src="{{ asset('bundles/lcshop/js/backend/script/default/utils.js')|lc_cache }}"></script>
     {% endblock plugin_javascript %}
 
     {% block script_javascript %}
-        <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-common.js') }}"></script>
+        <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-common.js')|lc_cache }}"></script>
     {% endblock script_javascript %}
 
     {% block add_script_javascript %}{% endblock add_script_javascript %}

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

@@ -284,5 +284,5 @@
 
 {% block script_javascript %}
     {{ parent() }}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-list-datatable.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-list-datatable.js')|lc_cache }}"></script>
 {% endblock %}

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

@@ -435,7 +435,7 @@
 
 {% block script_javascript %}
     {{ parent() }}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-list.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-list.js')|lc_cache }}"></script>
 
 
     <script type="text/javascript">

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

@@ -40,7 +40,7 @@
 
 {% block script_javascript %}
     {{ parent() }}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-edit.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-edit.js')|lc_cache }}"></script>
 
 {#
     <script type="text/javascript">

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

@@ -127,5 +127,5 @@
 
 {% block script_javascript %}
     {{ parent() }}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-sort.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-sort.js')|lc_cache }}"></script>
 {% endblock %}

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

@@ -8,6 +8,6 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/merchant/vuejs-merchant.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/merchant/vuejs-merchant.js')|lc_cache }}"></script>
 
 {% endblock %}

ShopBundle/Resources/views/backend/order/show-cart.html.twig

@@ -98,5 +98,5 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/order/vuejs-order.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/order/vuejs-order.js')|lc_cache }}"></script>
 {% endblock %}

ShopBundle/Resources/views/backend/order/show-order.html.twig

@@ -117,5 +117,5 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/order/vuejs-order.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/order/vuejs-order.js')|lc_cache }}"></script>
 {% endblock %}

ShopBundle/Resources/views/backend/order/show.html.twig

@@ -113,5 +113,5 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/order/vuejs-order.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/order/vuejs-order.js')|lc_cache }}"></script>
 {% endblock %}

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

@@ -311,6 +311,6 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('assets/js/backend/script/productfamily/vuejs-advanced-edition-product-family.js') }}"></script>
+    <script src="{{ asset('assets/js/backend/script/productfamily/vuejs-advanced-edition-product-family.js')|lc_cache }}"></script>
 
 {% endblock %}

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

@@ -20,5 +20,5 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/productfamily/vuejs-product-family.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/productfamily/vuejs-product-family.js')|lc_cache }}"></script>
 {% endblock %}

ShopBundle/Resources/views/backend/reductioncart/edit.html.twig

@@ -18,5 +18,5 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/reductioncart/vuejs-reduction-cart.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/reductioncart/vuejs-reduction-cart.js')|lc_cache }}"></script>
 {% endblock %}

ShopBundle/Resources/views/backend/reductioncatalog/edit.html.twig

@@ -18,5 +18,5 @@
 {% block script_javascript %}
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/reductioncatalog/vuejs-reduction-catalog.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/reductioncatalog/vuejs-reduction-catalog.js')|lc_cache }}"></script>
 {% endblock %}

ShopBundle/Resources/views/backend/ticket/show.html.twig

@@ -87,6 +87,6 @@
 
 {% block script_javascript %}
     {{ parent() }}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/ticket/init-edit.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/ticket/init-edit.js')|lc_cache }}"></script>
 
 {% endblock %}

ShopBundle/Resources/views/backend/user/edit.html.twig

@@ -41,6 +41,6 @@
     {{ parent() }}
     {% include '@LcShop/backend/default/block/script-vuejs.html.twig' %}
 
-    <script src="{{ asset('bundles/lcshop/js/backend/script/user/init-edit.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/user/init-edit.js')|lc_cache }}"></script>
 
 {% endblock %}

ShopBundle/Resources/views/backend/usermerchant/show.html.twig

@@ -82,7 +82,7 @@
 
 {% block script_javascript %}
     {{ parent() }}
-    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-list.js') }}"></script>
+    <script src="{{ asset('bundles/lcshop/js/backend/script/default/init-list.js')|lc_cache }}"></script>
 {% endblock %}