Browse Source

Merge branch 'develop'

master
Guillaume Bourgeois 4 months ago
parent
commit
bd6eeb7b3f
2 changed files with 3 additions and 2 deletions
  1. +2
    -1
      backend/controllers/DistributionController.php
  2. +1
    -1
      backend/views/distribution/index.php

+ 2
- 1
backend/controllers/DistributionController.php View File

return [ return [
'credit' => $producer->credit, 'credit' => $producer->credit,
'tiller' => $producer->tiller, 'tiller' => $producer->tiller,
'option_distribution_export_orders_grid_pdf' => $producer->option_distribution_export_orders_grid_pdf
'option_distribution_export_orders_grid_pdf' => $producer->option_distribution_export_orders_grid_pdf,
'feature_product_accessory_enabled' => $this->getFeatureModule()->getChecker()->isEnabled(Feature::ALIAS_PRODUCT_ACCESSORY)
]; ];
} }



+ 1
- 1
backend/views/distribution/index.php View File

<input type="text" class="form-control quantity-max" placeholder="&infin;" :data-id-product="product.id" v-model="getProductDistribution(product).quantity_max" @keyup="productQuantityMaxChange" /> <input type="text" class="form-control quantity-max" placeholder="&infin;" :data-id-product="product.id" v-model="getProductDistribution(product).quantity_max" @keyup="productQuantityMaxChange" />
<span class="input-group-addon">{{ labelUnitReference(product.unit) }}</span> <span class="input-group-addon">{{ labelUnitReference(product.unit) }}</span>
</div> </div>
<div class="limit-quantity-accessories" v-if="!showLoading && product.quantity_max && (getProductDistribution(product).quantity_max > product.quantity_max || !getProductDistribution(product).quantity_max)">
<div class="limit-quantity-accessories" v-if="producer.feature_product_accessory_enabled && !showLoading && product.quantity_max && (getProductDistribution(product).quantity_max > product.quantity_max || !getProductDistribution(product).quantity_max)">
<span class="glyphicon glyphicon-warning-sign"></span> Limitation accessoires : <span class="glyphicon glyphicon-warning-sign"></span> Limitation accessoires :
<strong>{{ product.quantity_max }} {{ labelUnitReference(product.unit) }}</strong> <strong>{{ product.quantity_max }} {{ labelUnitReference(product.unit) }}</strong>
</div> </div>

Loading…
Cancel
Save