Browse Source

correctifs tableau decli

feature/export_comptable
Fab 4 years ago
parent
commit
48707c8e56
7 changed files with 68 additions and 36 deletions
  1. +1
    -0
      ShopBundle/Form/Backend/ProductFamily/ProductType.php
  2. +1
    -0
      ShopBundle/Model/Product.php
  3. +36
    -31
      ShopBundle/Resources/public/css/backend/custom.css
  4. +17
    -0
      ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js
  5. +5
    -0
      ShopBundle/Resources/public/sass/backend/custom.scss
  6. +5
    -2
      ShopBundle/Resources/views/backend/productfamily/macros.html.twig
  7. +3
    -3
      ShopBundle/Resources/views/backend/productfamily/panel_products.html.twig

+ 1
- 0
ShopBundle/Form/Backend/ProductFamily/ProductType.php View File

)); ));


$builder->add('position', HiddenType::class); $builder->add('position', HiddenType::class);
$builder->add('status', HiddenType::class);
$builder->add('exportTitle', TextType::class, array( $builder->add('exportTitle', TextType::class, array(
'required' =>false 'required' =>false
)); ));

+ 1
- 0
ShopBundle/Model/Product.php View File

{ {
use SortableTrait; use SortableTrait;
use ProductPropertyTrait; use ProductPropertyTrait;
use StatusTrait;


/** /**
* @Gedmo\Blameable(on="create") * @Gedmo\Blameable(on="create")

+ 36
- 31
ShopBundle/Resources/public/css/backend/custom.css View File

} }


/* ORDER */ /* ORDER */
/* line 229, ../../sass/backend/custom.scss */
/* line 231, ../../sass/backend/custom.scss */
.table-order-summary { .table-order-summary {
width: 100%; width: 100%;
} }


/* line 232, ../../sass/backend/custom.scss */
/* line 234, ../../sass/backend/custom.scss */
.order-product-item.redelivery { .order-product-item.redelivery {
background: rgba(18, 104, 253, 0.38) !important; background: rgba(18, 104, 253, 0.38) !important;
} }
/*.select2-container--bootstrap .select2-selection{max-width: none;}*/ /*.select2-container--bootstrap .select2-selection{max-width: none;}*/
/*.order-product-item{margin: 15px 0; padding: 0;}*/ /*.order-product-item{margin: 15px 0; padding: 0;}*/
/* Product */ /* Product */
/* line 237, ../../sass/backend/custom.scss */
/* line 239, ../../sass/backend/custom.scss */
.product-form-modal { .product-form-modal {
display: none; display: none;
} }


/* line 238, ../../sass/backend/custom.scss */
/* line 240, ../../sass/backend/custom.scss */
.product-form.modal .form-check-label { .product-form.modal .form-check-label {
font-style: italic; font-style: italic;
color: #666; color: #666;
text-align: left; text-align: left;
} }


/* line 239, ../../sass/backend/custom.scss */
/* line 241, ../../sass/backend/custom.scss */
.products-collection-table .inherited { .products-collection-table .inherited {
color: #888; color: #888;
font-style: italic; font-style: italic;
font-weight: initial; font-weight: initial;
} }


/* line 240, ../../sass/backend/custom.scss */
/* line 242, ../../sass/backend/custom.scss */
.products-collection-table td { .products-collection-table td {
position: relative; position: relative;
} }


/* line 241, ../../sass/backend/custom.scss */
/* line 243, ../../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 { .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; padding-left: 0.35rem;
} }


/* line 242, ../../sass/backend/custom.scss */
/* line 244, ../../sass/backend/custom.scss */
.products-collection-table .btn-empty-field { .products-collection-table .btn-empty-field {
position: absolute; position: absolute;
right: 3px; right: 3px;
padding: 0px; padding: 0px;
} }


/* line 243, ../../sass/backend/custom.scss */
/* line 245, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table { #lc-product-family-edit .products-collection-table {
table-layout: fixed; table-layout: fixed;
/* background-clip: padding-box;*/ /* background-clip: padding-box;*/
border-collapse: collapse; border-collapse: collapse;
} }


/* line 244, ../../sass/backend/custom.scss */
/* line 246, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table th { #lc-product-family-edit .products-collection-table th {
font-size: 13px; font-size: 13px;
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
border-bottom: 2px solid #dee2e6; border-bottom: 2px solid #dee2e6;
} }


/* line 245, ../../sass/backend/custom.scss */
/* line 247, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table tfoot th { #lc-product-family-edit .products-collection-table tfoot th {
border-top: 2px solid #dee2e6; border-top: 2px solid #dee2e6;
} }


/* line 246, ../../sass/backend/custom.scss */
/* line 248, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table th span { #lc-product-family-edit .products-collection-table th span {
white-space: initial; white-space: initial;
} }


/* line 247, ../../sass/backend/custom.scss */
/* line 249, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table th:last-child { #lc-product-family-edit .products-collection-table th:last-child {
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
} }


/* line 248, ../../sass/backend/custom.scss */
/* line 250, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td { #lc-product-family-edit .products-collection-table td {
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
text-align: center; text-align: center;
border-bottom: 1px solid #dee2e6; border-bottom: 1px solid #dee2e6;
} }


/* line 249, ../../sass/backend/custom.scss */
/* line 251, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td:last-child { #lc-product-family-edit .products-collection-table td:last-child {
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
white-space: nowrap; white-space: nowrap;
} }


/* line 250, ../../sass/backend/custom.scss */
/* line 252, ../../sass/backend/custom.scss */
#lc-product-family-edit .btn-add-product { #lc-product-family-edit .btn-add-product {
margin: 20px 0; margin: 20px 0;
float: right; float: right;
} }


/* line 251, ../../sass/backend/custom.scss */
/* line 253, ../../sass/backend/custom.scss */
#lc-product-family-edit .inherited { #lc-product-family-edit .inherited {
color: #888; color: #888;
font-style: italic; font-style: italic;
font-weight: initial; font-weight: initial;
} }


/* line 252, ../../sass/backend/custom.scss */
/* line 254, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td .value { #lc-product-family-edit .products-collection-table td .value {
min-width: 80%; min-width: 80%;
margin: auto; margin: auto;
cursor: pointer; cursor: pointer;
} }


/* line 253, ../../sass/backend/custom.scss */
/* line 255, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td .modal { #lc-product-family-edit .products-collection-table td .modal {
text-align: left; text-align: left;
} }


/* line 254, ../../sass/backend/custom.scss */
/* line 256, ../../sass/backend/custom.scss */
table.products-collection-table th.main-info, td.buyingPrice, td.multiplyingFactor, td.priceWithTax { table.products-collection-table th.main-info, td.buyingPrice, td.multiplyingFactor, td.priceWithTax {
background: #eeeeee; background: #eeeeee;
background-clip: padding-box; background-clip: padding-box;
} }


/* DeliveryZone */
/* line 258, ../../sass/backend/custom.scss */ /* line 258, ../../sass/backend/custom.scss */
table.products-collection-table tr.disabled {
opacity: 0.5;
}

/* DeliveryZone */
/* line 263, ../../sass/backend/custom.scss */
#autocomplete-cities { #autocomplete-cities {
position: relative; position: relative;
} }


/* line 262, ../../sass/backend/custom.scss */
/* line 267, ../../sass/backend/custom.scss */
#autocomplete-cities .ui-autocomplete { #autocomplete-cities .ui-autocomplete {
left: 30%; left: 30%;
top: 41px; top: 41px;
margin-left: 18px; margin-left: 18px;
} }


/* line 268, ../../sass/backend/custom.scss */
/* line 273, ../../sass/backend/custom.scss */
.head-reminders { .head-reminders {
margin-top: 15px; margin-top: 15px;
} }


/* TABLEAU DE BORD */ /* TABLEAU DE BORD */
/* line 271, ../../sass/backend/custom.scss */
/* line 276, ../../sass/backend/custom.scss */
.todo-list > li { .todo-list > li {
position: relative; position: relative;
} }


/* line 272, ../../sass/backend/custom.scss */
/* line 277, ../../sass/backend/custom.scss */
.todo-list > li .text { .todo-list > li .text {
margin-left: 30px; margin-left: 30px;
} }


/* line 273, ../../sass/backend/custom.scss */
/* line 278, ../../sass/backend/custom.scss */
.todo-list > li .tools { .todo-list > li .tools {
position: absolute; position: absolute;
top: 4px; top: 4px;
right: 15px; right: 15px;
} }


/* line 275, ../../sass/backend/custom.scss */
/* line 280, ../../sass/backend/custom.scss */
#addTicketMessageForm { #addTicketMessageForm {
margin-top: 30px; margin-top: 30px;
border-top: 2px dotted #eee; border-top: 2px dotted #eee;
padding-top: 30px; padding-top: 30px;
} }


/* line 277, ../../sass/backend/custom.scss */
/* line 282, ../../sass/backend/custom.scss */
#dashboard .list-btn-statistic { #dashboard .list-btn-statistic {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
} }


/* line 278, ../../sass/backend/custom.scss */
/* line 283, ../../sass/backend/custom.scss */
#dashboard .btn-statistic { #dashboard .btn-statistic {
width: 120px; width: 120px;
height: 70px; height: 70px;
line-height: 1rem; line-height: 1rem;
} }


/* line 279, ../../sass/backend/custom.scss */
/* line 284, ../../sass/backend/custom.scss */
#dashboard .btn-statistic small { #dashboard .btn-statistic small {
margin-bottom: 10px; margin-bottom: 10px;
display: block; display: block;
} }


/* line 280, ../../sass/backend/custom.scss */
/* line 285, ../../sass/backend/custom.scss */
#dashboard .btn-statistic .value { #dashboard .btn-statistic .value {
display: block; display: block;
} }

+ 17
- 0
ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js View File

this.title = toPlainText(this.title) this.title = toPlainText(this.title)
this.title = toPlainText(this.title) this.title = toPlainText(this.title)
this.title = toPlainText(this.title); this.title = toPlainText(this.title);

this.$nextTick(function () {
log(this.status);
if (this.status == 0) {
$(this.$el).addClass('disabled');
}
});
//METHOD //METHOD

//this.updateProductForm(); //this.updateProductForm();
//this.updateProductView(); //this.updateProductView();
}, },
methods: { methods: {
changeStatus:function(){
if(this.status ==1) {
this.status = 0;
$(this.$el).addClass('disabled');
}else{
this.status = 1;
$(this.$el).removeClass('disabled');
}
},
decode(str){ decode(str){
var textArea = document.createElement('textarea'); var textArea = document.createElement('textarea');
textArea.innerText = str; textArea.innerText = str;

+ 5
- 0
ShopBundle/Resources/public/sass/backend/custom.scss View File

.field-price .input-group.priceByRefUnitWithTax input,.field-price .input-group.priceByRefUnitWithTax .input-group-text{font-weight: bold; border-color: #222 } .field-price .input-group.priceByRefUnitWithTax input,.field-price .input-group.priceByRefUnitWithTax .input-group-text{font-weight: bold; border-color: #222 }
.input-group.multiplyingFactor input,.input-group.multiplyingFactor .input-group-text{font-weight: bold; border-color: #222 } .input-group.multiplyingFactor input,.input-group.multiplyingFactor .input-group-text{font-weight: bold; border-color: #222 }




/* ORDER */ /* ORDER */


.table-order-summary{width: 100%;} .table-order-summary{width: 100%;}
#lc-product-family-edit .products-collection-table td .modal {text-align: left;} #lc-product-family-edit .products-collection-table td .modal {text-align: left;}
table.products-collection-table th.main-info, td.buyingPrice, td.multiplyingFactor, td.priceWithTax{background: #eeeeee; background-clip: padding-box} table.products-collection-table th.main-info, td.buyingPrice, td.multiplyingFactor, td.priceWithTax{background: #eeeeee; background-clip: padding-box}


table.products-collection-table tr.disabled{opacity: 0.5}


/* DeliveryZone */ /* DeliveryZone */


#autocomplete-cities { #autocomplete-cities {

+ 5
- 2
ShopBundle/Resources/views/backend/productfamily/macros.html.twig View File

{{ _self.total_order_product(totalProductOrdered) }} {{ _self.total_order_product(totalProductOrdered) }}


</td> </td>
<td colspan="2">
<td colspan="3">
<button type="button" class="btn-sm btn-info" @click="modalProductForm()"> <button type="button" class="btn-sm btn-info" @click="modalProductForm()">
<i class="fa fa-edit"></i> <i class="fa fa-edit"></i>
</button> </button>
<button type="button" class="btn-sm btn-info" @click="changeStatus()">
<i class="fa fa-check-square"></i>
</button>
<button type="button" class="btn-remove-product btn-sm btn-danger" @click="deleteProductForm()"> <button type="button" class="btn-remove-product btn-sm btn-danger" @click="deleteProductForm()">
<i class="fa fa-trash"></i> <i class="fa fa-trash"></i>
</button> </button>
{{ form_widget(product.position, {'attr' : {'class': "field-position", "v-model" : 'position'}}) }} {{ form_widget(product.position, {'attr' : {'class': "field-position", "v-model" : 'position'}}) }}
{{ form_widget(product.status, {'attr' : {"v-model" : 'status'}}) }}




<div class="modal fade show" :id="'modal-extends-product-'+keyForm"> <div class="modal fade show" :id="'modal-extends-product-'+keyForm">
<button type="button" class="btn btn-info float-right" data-dismiss="modal">Ok</button> <button type="button" class="btn btn-info float-right" data-dismiss="modal">Ok</button>
</div> </div>
</div> </div>
<!-- /.modal-content -->
</div> </div>
</div> </div>



+ 3
- 3
ShopBundle/Resources/views/backend/productfamily/panel_products.html.twig View File

Semaine / Commandés Semaine / Commandés
</th> </th>


<th colspan="2" class="">
<th colspan="3" class="">
Action Action
</th> </th>
</tr> </tr>
v-show="behaviorCountStock== '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT') }}' || behaviorCountStock== '{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE') }}'"> 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> </th>


<th colspan="2" class="">
<th colspan="3" class="">


</th> </th>
</tfoot> </tfoot>
{% for keyForm,i in sortableProductsField %} {% for keyForm,i in sortableProductsField %}
{% set product = form.products[i] %} {% set product = form.products[i] %}



window.productForm[{{ keyForm }}] = { window.productForm[{{ keyForm }}] = {
{% if product.vars.value.status is defined %}status: parseInt({{ product.vars.value.status }}),{% endif %}
{% if product.vars.value.position %}position: "{{ product.vars.value.position }}",{% endif %} {% if product.vars.value.position %}position: "{{ product.vars.value.position }}",{% endif %}
{% if product.vars.value.title %}title: "{{ product.vars.value.title }}",{% endif %} {% if product.vars.value.title %}title: "{{ product.vars.value.title }}",{% endif %}
{% if product.vars.value.quantity %}quantity: "{{ product.vars.value.quantity }}",{% endif %} {% if product.vars.value.quantity %}quantity: "{{ product.vars.value.quantity }}",{% endif %}

Loading…
Cancel
Save