瀏覽代碼

Labels de qualité

develop
Guillaume 2 年之前
父節點
當前提交
8a5ff3fcb2
共有 6 個文件被更改,包括 779 次插入759 次删除
  1. +4
    -4
      ShopBundle/Controller/Backend/ProductFamilyController.php
  2. +766
    -746
      ShopBundle/Model/ProductFamily.php
  3. +3
    -3
      ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js
  4. +1
    -1
      ShopBundle/Resources/translations/lcshop.fr.yaml
  5. +2
    -2
      ShopBundle/Resources/views/backend/productfamily/form.html.twig
  6. +3
    -3
      ShopBundle/Resources/views/backend/productfamily/panel_property.html.twig

+ 4
- 4
ShopBundle/Controller/Backend/ProductFamilyController.php 查看文件



$formBuilder->add('propertyOrganicLabel', ChoiceType::class, array( $formBuilder->add('propertyOrganicLabel', ChoiceType::class, array(
'choices' => array( 'choices' => array(
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_AB => ProductFamily::PROPERTY_ORGANIC_LABEL_AB,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_NP => ProductFamily::PROPERTY_ORGANIC_LABEL_NP,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_HVE => ProductFamily::PROPERTY_ORGANIC_LABEL_HVE,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR => ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR
'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_AB => ProductFamily::QUALITY_LABEL_AB,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_NP => ProductFamily::QUALITY_LABEL_NP,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_HVE => ProductFamily::QUALITY_LABEL_HVE,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_TVVR => ProductFamily::QUALITY_LABEL_TVVR
), ),
'translation_domain' => 'lcshop', 'translation_domain' => 'lcshop',
'multiple' => false, 'multiple' => false,

+ 766
- 746
ShopBundle/Model/ProductFamily.php
文件差異過大導致無法顯示
查看文件


+ 3
- 3
ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js 查看文件

typeExpirationDate: null, typeExpirationDate: null,
behaviorExpirationDate: null, behaviorExpirationDate: null,
propertyAllergens: null, propertyAllergens: null,
propertyOrganicLabelActive: false,
propertyQualityLabelActive: false,
propertyOrganicLabel: null, propertyOrganicLabel: null,
propertyNoveltyExpirationDateActive: false, propertyNoveltyExpirationDateActive: false,
propertyNoveltyExpirationDate:null, propertyNoveltyExpirationDate:null,
this.propertyNoveltyExpirationDate = null; this.propertyNoveltyExpirationDate = null;
} }
}, },
propertyOrganicLabelActive: function () {
if(!this.propertyOrganicLabelActive){
propertyQualityLabelActive: function () {
if(!this.propertyQualityLabelActive){
this.propertyOrganicLabel = null; this.propertyOrganicLabel = null;
$(this.$refs['propertyOrganicLabel']).val('').trigger('change'); $(this.$refs['propertyOrganicLabel']).val('').trigger('change');
} }

+ 1
- 1
ShopBundle/Resources/translations/lcshop.fr.yaml 查看文件

differentSupplierTaxRate: TVA différente pour le producteur differentSupplierTaxRate: TVA différente pour le producteur
supplierTaxRate: TVA du producteur supplierTaxRate: TVA du producteur
propertyNoveltyExpirationDateActive: Marquer le produit comme "nouveauté" jusqu'au propertyNoveltyExpirationDateActive: Marquer le produit comme "nouveauté" jusqu'au
propertyOrganicLabelActive: Marquer le produit comme "labellisé"
propertyQualityLabelActive: Marquer le produit comme "labellisé"
propertyLargeVolume: Marquer le produit comme "gros volume" propertyLargeVolume: Marquer le produit comme "gros volume"
propertyCharacteristics: Caractéristiques propertyCharacteristics: Caractéristiques
propertyPackaging: Conditionnement propertyPackaging: Conditionnement

+ 2
- 2
ShopBundle/Resources/views/backend/productfamily/form.html.twig 查看文件

{% if form.behaviorStockWeek.vars.value %}behaviorStockWeek: "{{ form.behaviorStockWeek.vars.value }}",{% endif %} {% if form.behaviorStockWeek.vars.value %}behaviorStockWeek: "{{ form.behaviorStockWeek.vars.value }}",{% endif %}
{% if formValues.availableQuantity %}availableQuantity: "{{ formValues.availableQuantity }}",{% endif %} {% if formValues.availableQuantity %}availableQuantity: "{{ formValues.availableQuantity }}",{% endif %}
{% if formValues.availableQuantityDefault %}availableQuantityDefault: "{{ formValues.availableQuantityDefault }}",{% endif %} {% if formValues.availableQuantityDefault %}availableQuantityDefault: "{{ formValues.availableQuantityDefault }}",{% endif %}
{% if formValues.propertyOrganicLabel %}propertyOrganicLabelActive: true,{% endif %}
{% if formValues.propertyOrganicLabel %}propertyOrganicLabel: "{{ formValues.propertyOrganicLabel }}",{% endif %}
{% if formValues.qualityLabels %}propertyQualityLabelActive: true,{% endif %}
{% if formValues.qualityLabels %}qualityLabels: "",{% endif %}


{% if formValues.propertyNoveltyExpirationDate %}propertyNoveltyExpirationDateActive: true,{% endif %} {% if formValues.propertyNoveltyExpirationDate %}propertyNoveltyExpirationDateActive: true,{% endif %}
{% if formValues.propertyNoveltyExpirationDate %}propertyNoveltyExpirationDate: "{{ formValues.propertyNoveltyExpirationDate|date('Y-m-d') }}",{% endif %} {% if formValues.propertyNoveltyExpirationDate %}propertyNoveltyExpirationDate: "{{ formValues.propertyNoveltyExpirationDate|date('Y-m-d') }}",{% endif %}

+ 3
- 3
ShopBundle/Resources/views/backend/productfamily/panel_property.html.twig 查看文件

</td> </td>
</tr> </tr>
<tr> <tr>
<td>{{ form_widget(form.propertyOrganicLabelActive, {"attr" : {'v-model' : 'propertyOrganicLabelActive' } }) }}</td>
<td>{{ form_widget(form.propertyQualityLabelActive, {"attr" : {'v-model' : 'propertyQualityLabelActive' } }) }}</td>
<td> <td>
<div class="form-widget" v-show="propertyOrganicLabelActive == true">
{{ form_widget(form.propertyOrganicLabel, {"attr" : {'v-model' : 'propertyOrganicLabel', 'ref': 'propertyOrganicLabel'}}) }}
<div class="form-widget" v-show="propertyQualityLabelActive == true">
{{ form_widget(form.qualityLabels) }}
</div> </div>
</td> </td>
</tr> </tr>

Loading…
取消
儲存