Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop

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

@@ -370,7 +370,7 @@ table th .select2-container--default .select2-selection--single {
 }
 
 /* line 118, ../../sass/backend/custom.scss */
-.button-action .btn {
+.button-action a.float-right {
   margin-left: 10px;
 }
 

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

@@ -115,7 +115,7 @@ table th .select2-container--default .select2-selection--single{padding:0.3rem 0
 
 /* Général */
 .btn.btn-primary.action-save{float: right;}
-.button-action .btn{margin-left: 10px;}
+.button-action a.float-right{margin-left: 10px;}
 
 .input-group-text {
         padding: 0.250rem .75rem ;

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

@@ -1,4 +1,4 @@
-{#{{ dump(action) }}#}
+
 <a class="btn {{ is_dropdown|default(false) ? 'dropdown-item' }} {{ action.css_class|default('btn-default') }}" data-toggle="tooltip"
    title="{{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id }), domain = translation_domain) }}"
    href="{{ action_href }}" target="{{ action.target }}">

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

@@ -1,7 +1,22 @@
 {% if value is defined and value is not null %}
-    {% if item.getBehaviorPrice() == constant("Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE") %}
-        {{ value }} pièce{% if value > 1 %}s{% endif %}
-    {% elseif item.getBehaviorPrice() == constant("Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_REFERENCE_UNIT") %}
-        {{ value }} {{ item.getUnit().getUnit() }}
+    {% if value > 0 %}
+        {% set badge_class = 'badge-success' %}
+    {% else %}
+        {% set badge_class = 'badge-danger' %}
+    {% endif %}
+    <span class="badge {{ badge_class }}">
+        {% if item.getBehaviorCountStock() == constant("Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE") %}
+            {{ value }} {{ item.getUnit().getUnit() }}
+        {% elseif item.getBehaviorCountStock() == constant("Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT_FAMILY") %}
+            {{ value }} pièce{% if value > 1 %}s{% endif %}
+        {% elseif item.getBehaviorCountStock() == constant("Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT") %}
+            {{ item.getAvailableQuantityInherited() }} pièce{% if value > 1 %}s{% endif %} (déclinaisons)
+        {% endif %}
+    </span>
+{% else %}
+    {% if item.getBehaviorCountStock() == constant("Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_UNLIMITED") %}
+        <span class="badge badge-success">Illimité</span>
+    {% else %}
+        <span class="badge badge-danger">Pas de stock</span>
     {% endif %}
 {% endif %}

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

@@ -41,6 +41,10 @@
             {{ dump(_default_title) }}
             {{ (_entity_config.list.title is defined ? _entity_config.list.title|trans(_trans_parameters) : _default_title)|raw }}#}
         {% endif %}
+
+        {% if app.request.get('action') == 'listChildren' and app.request.get('entity') == 'ProductCategory' %}
+            : {{ entity.title }}
+        {% endif %}
     {% endapply %}
 {% endblock %}
 
@@ -99,12 +103,19 @@
                                 </a>
 
                                 {% if _entity_config['list']['edit_position'] is defined %}
-                                    <a class="float-right btn btn-success action-sort"
+                                    <a class="float-right btn-sm btn-success action-sort"
                                        href="{{ path('easyadmin', _request_parameters|merge({ action: 'sort' })) }}"
                                        target="{{ _action.target }}">
                                         <i class="fa fa-sort"></i> Modifier position
                                     </a>
                                 {% endif %}
+
+                                {% if app.request.get('action') == 'listChildren' and app.request.get('entity') == 'ProductCategory' %}
+                                    <a class="float-right btn-sm btn-primary" href="{{ path('easyadmin', {action: 'list', entity: 'ProductCategory'}) }}">
+                                        <i class="fa fa-chevron-left"></i> Retour à la catégorie parente
+                                    </a>
+                                {% endif %}
+
                             </div>
                         {% endblock new_action %}
                     {% endif %}

ShopBundle/Resources/views/backend/productcategory/action_list_children.html.twig

@@ -0,0 +1,7 @@
+{% if item.getChildrens()|length > 0 %}
+    <a class="btn {{ is_dropdown|default(false) ? 'dropdown-item' }} {{ action.css_class|default('btn-default') }}" data-toggle="tooltip"
+       title="{{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id }), domain = translation_domain) }}"
+       href="{{ action_href }}" target="{{ action.target }}">
+        {%- if action.icon %}<i class="fa fa-fw fa-{{ action.icon }}"></i> {% endif -%}
+    </a>
+{% endif %}