Explorar el Código

correctifs tableau decli

feature/export_comptable
Fab hace 4 años
padre
commit
48707c8e56
Se han modificado 7 ficheros con 68 adiciones y 36 borrados
  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 Ver fichero

@@ -120,6 +120,7 @@ class ProductType extends AbstractType
));

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

+ 1
- 0
ShopBundle/Model/Product.php Ver fichero

@@ -20,6 +20,7 @@ abstract class Product extends AbstractEntity implements SortableInterface, Prod
{
use SortableTrait;
use ProductPropertyTrait;
use StatusTrait;

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

+ 36
- 31
ShopBundle/Resources/public/css/backend/custom.css Ver fichero

@@ -598,12 +598,12 @@ table th .select2-container--default .select2-selection--single {
}

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

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

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

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

/* line 240, ../../sass/backend/custom.scss */
/* line 242, ../../sass/backend/custom.scss */
.products-collection-table td {
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 {
padding-left: 0.35rem;
}

/* line 242, ../../sass/backend/custom.scss */
/* line 244, ../../sass/backend/custom.scss */
.products-collection-table .btn-empty-field {
position: absolute;
right: 3px;
@@ -649,14 +649,14 @@ table th .select2-container--default .select2-selection--single {
padding: 0px;
}

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

/* line 244, ../../sass/backend/custom.scss */
/* line 246, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table th {
font-size: 13px;
border-left: 1px solid #dee2e6;
@@ -665,22 +665,22 @@ table th .select2-container--default .select2-selection--single {
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 {
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 {
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 {
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 {
border-left: 1px solid #dee2e6;
text-align: center;
@@ -688,26 +688,26 @@ table th .select2-container--default .select2-selection--single {
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 {
border-right: 1px solid #dee2e6;
white-space: nowrap;
}

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

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

/* line 252, ../../sass/backend/custom.scss */
/* line 254, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td .value {
min-width: 80%;
margin: auto;
@@ -715,68 +715,73 @@ table th .select2-container--default .select2-selection--single {
cursor: pointer;
}

/* line 253, ../../sass/backend/custom.scss */
/* line 255, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td .modal {
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 {
background: #eeeeee;
background-clip: padding-box;
}

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

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

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

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

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

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

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

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

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

/* line 278, ../../sass/backend/custom.scss */
/* line 283, ../../sass/backend/custom.scss */
#dashboard .btn-statistic {
width: 120px;
height: 70px;
@@ -785,13 +790,13 @@ table.products-collection-table th.main-info, td.buyingPrice, td.multiplyingFact
line-height: 1rem;
}

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

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

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

@@ -203,11 +203,28 @@ $(window).on('load', function () {
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

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

+ 5
- 0
ShopBundle/Resources/public/sass/backend/custom.scss Ver fichero

@@ -224,6 +224,8 @@ table th .select2-container--default .select2-selection--single{padding:0.3rem 0
.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 }



/* ORDER */

.table-order-summary{width: 100%;}
@@ -253,6 +255,9 @@ table th .select2-container--default .select2-selection--single{padding:0.3rem 0
#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 tr.disabled{opacity: 0.5}


/* DeliveryZone */

#autocomplete-cities {

+ 5
- 2
ShopBundle/Resources/views/backend/productfamily/macros.html.twig Ver fichero

@@ -89,14 +89,18 @@
{{ _self.total_order_product(totalProductOrdered) }}

</td>
<td colspan="2">
<td colspan="3">
<button type="button" class="btn-sm btn-info" @click="modalProductForm()">
<i class="fa fa-edit"></i>
</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()">
<i class="fa fa-trash"></i>
</button>
{{ 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">
@@ -122,7 +126,6 @@
<button type="button" class="btn btn-info float-right" data-dismiss="modal">Ok</button>
</div>
</div>
<!-- /.modal-content -->
</div>
</div>


+ 3
- 3
ShopBundle/Resources/views/backend/productfamily/panel_products.html.twig Ver fichero

@@ -80,7 +80,7 @@
Semaine / Commandés
</th>

<th colspan="2" class="">
<th colspan="3" class="">
Action
</th>
</tr>
@@ -163,7 +163,7 @@
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 colspan="2" class="">
<th colspan="3" class="">

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


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.title %}title: "{{ product.vars.value.title }}",{% endif %}
{% if product.vars.value.quantity %}quantity: "{{ product.vars.value.quantity }}",{% endif %}

Cargando…
Cancelar
Guardar