[Backend] Evol déclinaisons

ShopBundle/Model/ProductFamily.php

          */
         protected $productsType;
 
+        /**
+         * @ORM\Column(type="boolean", nullable=true)
+         */
+        protected $productsQuantityAsTitle;
+
         /**
          * @ORM\Column(type="string", length=255, nullable=true)
          */
                 return $this;
         }
 
+        public function getProductsQuantityAsTitle(): ?bool
+        {
+                return $this->productsQuantityAsTitle;
+        }
+
+        public function setProductsQuantityAsTitle(bool $productsQuantityAsTitle): self
+        {
+                $this->productsQuantityAsTitle = $productsQuantityAsTitle;
+
+                return $this;
+        }
+
         public function getProductsType(): ?string
         {
                 return $this->productsType;

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

   border-top: 1px solid #dee2e6;
   text-align: center;
   border-bottom: 2px solid #dee2e6;
+  position: relative;
 }
 
 /* line 252, ../../sass/backend/custom.scss */

ShopBundle/Resources/public/js/backend/script/default/vuejs-mixins.js

                     if (this.behaviorPriceValue == 'by-piece') {
                         this.setBuyingPriceByRefUnit();
                         this.setBuyingPriceByRefUnitWithTax();
-                        log('ncihe');
                         this.setPriceByRefUnit();
                         this.setPriceByRefUnitWithTax();
                     } else if (this.behaviorPriceValue == 'by-reference-unit') {

ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js

 
             this.$nextTick(function () {
 
-                log(this.status);
                 if (this.status == 0) {
                     $(this.$el).addClass('disabled');
                 }
                     if (field == 'unitInherited') {
                         $('select[data-ref="' + field + '"]').eq(y).focus();
                     } else {
-                        $('input[data-ref="' + field + '"]').eq(y).focus();
-
+                        log('blop');
+                        $('input[data-ref="' + field + '"]').eq(y).focus().select();
                     }
                 });
 
                 var app = this;
                 $(this.$el).find('input, select').off('keydown');
                 $(this.$el).find('input, select').on('keydown', function (e) {
-                    if (e.keyCode == 13 || e.keyCode == 9) e.preventDefault();
+                    if (e.keyCode == 13 || e.keyCode == 9 || e.keyCode ==40 || e.keyCode==38) e.preventDefault();
 
                     //ENTRER
                     if (e.keyCode == 13) {
                     if (e.shiftKey && e.keyCode == 9) {
                         e.preventDefault();
                         $prevField = $(this).parents('td').prevAll('td:visible').first().find('input, select');
-                        log($prevField);
                         if($prevField.length == 0){
                             $prevField = $(this).parents('td').prevAll('td:visible').first().prevAll('td:visible').first().find('input, select');
 
                         'supplierTaxRateValue': this.$refs.productUnitPrice.supplierTaxRateValue,
                         'marginProfit': this.$refs.productUnitPrice.marginProfit,
                         'marginProfitPercent': this.$refs.productUnitPrice.marginProfitPercent,
-
+                        'productsQuantityAsTitle': this.productsQuantityAsTitle,
                         /*'taxRate': this.$refs.productUnitPrice.taxRate,
                         'supplierTaxRate': this.$refs.productUnitPrice.supplierTaxRate,
                         */
                         'supplierTaxRate': null,
                         'multiplyingFactor': null,
                         'taxRateValue': null,
+                        'productsQuantityAsTitle': null,
                         'propertyExpirationDate': this.propertyExpirationDate,
                         'behaviorExpirationDate': this.behaviorExpirationDate
                     };
                     propertyNoveltyExpirationDateActive: false,
                     propertyNoveltyExpirationDate:null,
                     activeProducts: false,
-
+                    productsQuantityAsTitle: false,
                     formProducts: {},
                     currentSection: 'general',
                     sectionsArray: [
                     }
                 }
             },
+            emptyProductsField: function (fieldName){
+                if (confirm('Êtes-vous sur de cette action ?')) {
+                    for (i = 0; i < this.$refs.productForm.length; i++) {
+                        this.$refs.productForm[i][fieldName] = null;
+                    }
+                }
+            },
             getUnitReference: function () {
                 if (typeof this.$refs.productUnitPrice !== 'undefined') {
                     return this.$refs.productUnitPrice.unitReference;

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

 .card-body.p-0 .products-collection-table tbody > tr > td:first-of-type, .card-body.p-0 .products-collection-table tbody > tr > th:first-of-type, .card-body.p-0 .products-collection-table thead > tr > td:first-of-type, .card-body.p-0 .products-collection-table thead > tr > th:first-of-type{padding-left: 0.35rem;}
 .products-collection-table .btn-empty-field{position: absolute; right: 3px; font-size: 0.7rem; top: 5px; padding: 0px;}
 #lc-product-family-edit .products-collection-table {table-layout:fixed;/* background-clip: padding-box;*/ border-collapse: collapse;}
-#lc-product-family-edit .products-collection-table th{font-size:13px; border-left: 1px solid #dee2e6; border-top: 1px solid #dee2e6; text-align: center; border-bottom: 2px solid #dee2e6;}
+#lc-product-family-edit .products-collection-table th{font-size:13px; border-left: 1px solid #dee2e6; border-top: 1px solid #dee2e6; text-align: center; border-bottom: 2px solid #dee2e6; position: relative;}
 #lc-product-family-edit .products-collection-table tfoot th{border-top: 2px solid #dee2e6;}
 #lc-product-family-edit .products-collection-table th span {white-space: initial;}
 #lc-product-family-edit .products-collection-table th:last-child{border-right: 1px solid #dee2e6;}

ShopBundle/Resources/translations/lcshop.fr.yaml

         propertyAlcoholLevel: Degré d'alcool
         displayPriceUnitRef: Afficher le prix par unité de référence
         behaviorPrice: Travailler avec des tarifs
+        productsQuantityAsTitle: Titre équivalent à quantité
         behaviorPriceOptions:
             by-piece: À la pièce
             by-reference-unit: Par unité de référence

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

                 {% if formValues.behaviorExpirationDate %}behaviorExpirationDate: "{{ formValues.behaviorExpirationDate }}",{% endif %}
                 {% if formValues.propertyExpirationDate %}propertyExpirationDate: "{{ formValues.propertyExpirationDate }}",{% endif %}
                 {% if formValues.activeProducts %}activeProducts: "{{ formValues.activeProducts }}",{% endif %}
+                {% if formValues.productsQuantityAsTitle %}productsQuantityAsTitle: {{ formValues.productsQuantityAsTitle }},{% endif %}
 
             };
             multiplyingFactor = "{{ form.multiplyingFactor.vars.value }}"

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

                 #new
             {% endif %} <br/>
             {% verbatim %}{{keyForm}}{% endverbatim %}<i class="fa fa-fw fa-sort"></i></td>
-        {{ _self.product_field(4, product.title, 'title') }}
+        {{ _self.product_field(4, product.title, 'title', false, "",'v-show="productFamily.productsQuantityAsTitle == false"' ) }}
         {{ _self.product_field(2, product.quantity, 'quantity') }}
         {{ _self.product_field(2, product.unit, 'unit', 'unitWording') }}
         {{ _self.product_field(3, product.buyingPriceByRefUnit, 'buyingPriceByRefUnit',false, '€', 'v-show="productFamily.behaviorPrice == \'' ~ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_REFERENCE_UNIT') ~ '\'"') }}

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

 {% import '@LcShop/backend/productfamily/macros.html.twig' as product_family_macros %}
 {% trans_default_domain 'lcshop' %}
 
-{#{% import _self as formMacros %}#}
+{# {% import _self as formMacros %} #}
 <div class="row">
     {{ macros.startCard(12, 'ProductFamily.products', 'light', true) }}
 
         <tr>
             <th>
             </th>
-            <th colspan="4" class="string">
+            <th colspan="4" class="string"  v-show="productsQuantityAsTitle == false">
                 Titre
+                <button v-on:click="emptyProductsField('title');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="2" class="string ">
                 Quantité
+                <button v-on:click="emptyProductsField('quantity');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="2" class="quantity">
                 Unité
+                <button v-on:click="emptyProductsField('unit');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th v-show="getBehaviorPrice() == '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_REFERENCE_UNIT') }}'"
                 colspan="3" class="buyingPriceByRefUnit ">
                 PA HT / ${ getUnitReference() }
+                <button v-on:click="emptyProductsField('buyingPriceByRefUnit');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th v-show="getBehaviorPrice() == '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_REFERENCE_UNIT') }}'"
                 colspan="3" class="priceByRefUnit">
                 PA TTC / ${ getUnitReference() }
+                <button v-on:click="emptyProductsField('buyingPriceByRefUnitWithTax');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
 
             <th colspan="3" class="price main-info">
                 PA HT
+                <button v-show="productFamily.behaviorPrice == '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'"  v-on:click="emptyProductsField('buyingPrice');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="3" class="price"
                 v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'">
                 PA TTC
+                <button v-on:click="emptyProductsField('buyingPriceWithTax');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="3" class="main-info">
                 Coef
+                <button v-on:click="emptyProductsField('multiplyingFactor');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
 
 
             <th v-show="getBehaviorPrice() == '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_REFERENCE_UNIT') }}'"
                 colspan="3" class="">
                 PV HT / ${ getUnitReference() }
+                <button v-on:click="emptyProductsField('priceByRefUnit');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th v-show="getBehaviorPrice() == '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_REFERENCE_UNIT') }}'"
                 colspan="3" class="price">
                 PV TTC / ${ getUnitReference() }
+                <button v-on:click="emptyProductsField('priceByRefUnitWithTax');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
 
             <th colspan="3" class="price">
-                {# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'">#}
+                {# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'"> #}
                 PV HT
+                <button v-show="productFamily.behaviorPrice == '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'" v-on:click="emptyProductsField('price');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="3" class="price main-info">
                 PV TTC
+                <button v-show="productFamily.behaviorPrice == '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'"  v-on:click="emptyProductsField('priceWithTax');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="2">
                 Marge HT
             <th colspan="2" class=""
                 v-show="behaviorExpirationDate== '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_EXPIRATION_DATE_BY_PRODUCT') }}'">
                 <span style="text-transform: uppercase"> ${typeExpirationDate}</span>
+                <button v-on:click="emptyProductsField('propertyExpirationDate');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="2"
                 v-show="behaviorCountStock== '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT') }}'">
                 Stock
+                <button v-on:click="emptyProductsField('availableQuantity');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="2"
                 v-show="behaviorCountStock== '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT') }}' && behaviorStockWeek!= '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_STOCK_WEEK_NON_RENEWABLE') }}'">
                 Stock par défaut
+                <button v-on:click="emptyProductsField('availableQuantityDefault');"
+                        class="btn btn-empty-field" type="button"><i class="fa fa-undo"></i></button>
             </th>
             <th colspan="2"
                 v-show="behaviorCountStock== '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT') }}' || behaviorCountStock== '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE') }}'">
         <th>
             Rappel
         </th>
-        <th colspan="4" class="string">
+        <th colspan="4" class="string" v-show="productsQuantityAsTitle == false">
             ${title}
+
         </th>
         <th colspan="2" class="string ">
             ${productFamily.quantity}
         </th>
 
         <th colspan="3" class="price">
-            {# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'">#}
+            {# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'"> #}
             ${productFamily.price}
         </th>
         <th colspan="3" class="price main-info">
         </tfoot>
     </table>
 
-    <button type="button" class="add_tag_link btn-add-product btn btn-default" @click="addProductForm"><span
-                class="fa fa-plus"></span> Ajouter une déclinaison
-    </button>
-    <p>
-        <strong>Aide à l'utilisation - Raccourci clavier</strong>
-    <ul>
-        <li><strong>TAB</strong> : Champ suivant</li>
-        <li><strong>SHIFT + TAB</strong> : Champ précédent</li>
-        <li><strong>FLÈCHE BAS</strong> : Déclinaison suivante</li>
-        <li><strong>FLÈCHE HAUT</strong> : Déclinaison précédente</li>
-        <li><strong>SHIFT + [+]</strong> : Ajout d'une nouvelle déclinaison</li>
-    </ul>
-    </p>
-
-    <div class="clearfix"></div>
+
+        <div class="col-12">
+            <button type="button" class="add_tag_link btn-add-product btn btn-default" @click="addProductForm"><span
+                        class="fa fa-plus"></span> Ajouter une déclinaison
+            </button>
+
+            {{ form_row(form.productsQuantityAsTitle, {"attr":{'v-model' : 'productsQuantityAsTitle'}}) }}
+            <p>
+                <strong>Aide à l'utilisation - Raccourci clavier</strong>
+            <ul>
+                <li><strong>TAB</strong> : Champ suivant</li>
+                <li><strong>SHIFT + TAB</strong> : Champ précédent</li>
+                <li><strong>FLÈCHE BAS</strong> : Déclinaison suivante</li>
+                <li><strong>FLÈCHE HAUT</strong> : Déclinaison précédente</li>
+                <li><strong>SHIFT + [+]</strong> : Ajout d'une nouvelle déclinaison</li>
+            </ul>
+            </p>
+        </div>
+
+        <div class="clearfix"></div>
 
     {{ macros.endCard() }}
 </div>
     {% for keyForm,i in sortableProductsField %}
     {% set product = form.products[i] %}
 
-    {#{% if product.vars.value.status >= 0  and (product.vars.value.originProduct is null or product.vars.value.originProduct == false) %}#}
+    {# {% if product.vars.value.status >= 0  and (product.vars.value.originProduct is null or product.vars.value.originProduct == false) %} #}
     window.productForm[{{ keyForm }}] = {
         {% if product.vars.value.originProduct is defined %}originProduct: parseInt({{ product.vars.value.originProduct }}),{% endif %}
         {% if product.vars.value.status is defined %}status: parseInt({{ product.vars.value.status }}),{% endif %}
         {% if product.vars.value.availableQuantity %}availableQuantity: parseInt({{ product.vars.value.availableQuantity }}),{% endif %}
         {% if product.vars.value.availableQuantityDefault %}availableQuantityDefault: parseInt({{ product.vars.value.availableQuantityDefault }}),{% endif %}
         {% if product.vars.value.propertyExpirationDate %}propertyExpirationDate: "{{ product.vars.value.propertyExpirationDate }}",{% endif %}
-        {#{% if product.vars.value.expirationDate %}expirationDate: "{{ product.vars.value.expirationDate|date('d/m/Y') }}"{% endif %}#}
+        {# {% if product.vars.value.expirationDate %}expirationDate: "{{ product.vars.value.expirationDate|date('d/m/Y') }}"{% endif %} #}
     };
     window.formProductTemplate[{{ keyForm }}] = '{{ product_family_macros.product_row(product, totalProductOrdered[product.vars.value.id])|replace({"\n":' ', "\r":' ', "'" : "\\'"})|raw }}';
-    {#{% endif %}#}
+    {# {% endif %} #}
     {% endfor %}
 
 </script>

ShopBundle/Services/ProductFamilyUtils.php

                         $entity->addProduct($originProduct);
 
                         foreach ($entity->getProducts() as $product) {
+                                if($entity->getProductsQuantityAsTitle() && $product->getStatus()>=1){
+                                        $product->setTitle($product->getQuantityInherited().$product->getUnitInherited()->getWording());
+                                }
+
                                 $product->setProductFamily($entity);
                                 $this->em->persist($product);
                                 $entity->addProduct($product);