浏览代码

Merge branch 'dev'

prodstable
Guillaume 3 年前
父节点
当前提交
0ca5dfe376
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. +2
    -2
      producer/views/order/order.php
  2. +1
    -1
      producer/views/site/index.php

+ 2
- 2
producer/views/order/order.php 查看文件

@@ -236,12 +236,12 @@ $producer = GlobalParam::getCurrentProducer() ;
<span class="other">
<span v-if="product.description.length">/</span>
<span class="description">{{ product.description }}</span>
<span v-if="product.unit == 'piece' && product.weight">({{ product.weight }}g)</span>
<span v-if="product.weight">({{ product.weight }}g)</span>
</span>
<span v-if="product.quantity_max > 0 && ((product.quantity_form / product.coefficient_unit == product.quantity_remaining) || ((product.quantity_remaining * product.coefficient_unit) - product.quantity_form) < product.step)" class="label label-danger">
Épuisé
</span>
<div class="recipe" v-if="product.recipe.length">{{ product.recipe }}</div>
<div class="recipe" v-if="product.recipe.length">{{ product.recipe }}</div>
</td>
<td class="price-unit">
<template v-if="product.price_with_tax > 0">{{ formatPrice(product.price_with_tax) }}<br /><span class="unit">{{ product.wording_unit }}</span></template>

+ 1
- 1
producer/views/site/index.php 查看文件

@@ -174,7 +174,7 @@ $this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
$columnsProducts[] = [
'attribute' => 'weight',
'value' => function($model) {
if($model->unit == 'piece' && strlen($model->weight)) {
if(strlen($model->weight)) {
return $model->weight.' g' ;
}
return '' ;

正在加载...
取消
保存