浏览代码

Vente au kilo : adaptation résumé commandes (index backend, mes commandes frontend etc.)

refactoring
父节点
当前提交
cf33a86af0
共有 4 个文件被更改,包括 45 次插入31 次删除
  1. +35
    -26
      backend/views/site/index.php
  2. +8
    -4
      backend/web/css/screen.css
  3. +1
    -0
      backend/web/sass/site/_index.scss
  4. +1
    -1
      common/models/Order.php

+ 35
- 26
backend/views/site/index.php 查看文件

@@ -92,34 +92,43 @@ $this->title = 'Tableau de bord';
<?php endif; ?>
<div id="distributions">
<!-- distributions -->
<?php if(count($distributionsArray)): ?>
<?php foreach($distributionsArray as $distribution): ?>
<div class="col-md-4 col-sm-12 col-xs-12">
<div class="info-box">
<span class="info-box-icon bg-green date">
<span class="day"><?= strftime('%A', strtotime($distribution->date)) ?></span>
<span class="num"><?= date('d', strtotime($distribution->date)) ?></span>
<span class="month"><?= strftime('%B', strtotime($distribution->date)) ?></span>
</span>
<div class="info-box-content">
<span class="info-box-text">
<?php if(count($distribution->order)): ?>
<strong><?= count($distribution->order); ?></strong> COMMANDES
<?php else: ?>
AUCUNE COMMANDE
<?php endif; ?>
</span>
<span class="info-box-number"></span>
<div class="buttons">
<?= Html::a('<span class="fa fa-eye"></span>', ['distribution/index', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?>
<?php if(count($distribution->order)): ?><?= Html::a('<span class="fa fa-download"></span>', ['distribution/report', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?><?php endif; ?>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
Prochaines distributions
</h3>
</div>
<div class="panel-body">
<!-- distributions -->
<?php if(count($distributionsArray)): ?>
<?php foreach($distributionsArray as $distribution): ?>
<div class="col-md-4 col-sm-12 col-xs-12">
<div class="info-box">
<span class="info-box-icon bg-green date">
<span class="day"><?= strftime('%A', strtotime($distribution->date)) ?></span>
<span class="num"><?= date('d', strtotime($distribution->date)) ?></span>
<span class="month"><?= strftime('%B', strtotime($distribution->date)) ?></span>
</span>
<div class="info-box-content">
<span class="info-box-text">
<?php if(count($distribution->order)): ?>
<strong><?= count($distribution->order); ?></strong> COMMANDES
<?php else: ?>
AUCUNE COMMANDE
<?php endif; ?>
</span>
<span class="info-box-number"></span>
<div class="buttons">
<?= Html::a('<span class="fa fa-eye"></span>', ['distribution/index', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?>
<?php if(count($distribution->order)): ?><?= Html::a('<span class="fa fa-download"></span>', ['distribution/report', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?><?php endif; ?>
</div>
</div>
</div>
</div>
</div>
</div>
<?php endforeach; ?>
<?php endif; ?>
<?php endforeach; ?>
<?php endif; ?>
</div>
</div>
</div>
<div class="clr"></div>

+ 8
- 4
backend/web/css/screen.css 查看文件

@@ -1683,24 +1683,28 @@ body.login-page .login-box .login-box-body a:hover {
color: #ff8c1a;
}

/* line 5, ../sass/site/_index.scss */
/* line 4, ../sass/site/_index.scss */
.site-index #distributions .info-box {
border: solid 1px #e0e0e0;
}
/* line 6, ../sass/site/_index.scss */
.site-index #distributions .info-box .date {
text-transform: uppercase;
font-size: 12px;
line-height: 20px;
padding-top: 10px;
}
/* line 11, ../sass/site/_index.scss */
/* line 12, ../sass/site/_index.scss */
.site-index #distributions .info-box .date span {
display: block;
}
/* line 17, ../sass/site/_index.scss */
/* line 18, ../sass/site/_index.scss */
.site-index #distributions .info-box .date .num {
font-size: 30px;
padding-top: 5px;
padding-bottom: 5px;
}
/* line 29, ../sass/site/_index.scss */
/* line 30, ../sass/site/_index.scss */
.site-index #distributions .info-box-content .buttons {
margin-top: 10px;
}

+ 1
- 0
backend/web/sass/site/_index.scss 查看文件

@@ -2,6 +2,7 @@
.site-index {
#distributions {
.info-box {
border: solid 1px #e0e0e0 ;
.date {
text-transform: uppercase ;
font-size: 12px ;

+ 1
- 1
common/models/Order.php 查看文件

@@ -379,7 +379,7 @@ class Order extends ActiveRecordCommon
$i = 0;
foreach ($this->productOrder as $p) {
if (isset($p->product)) {
$html .= $p->quantity . ' x ' . Html::encode($p->product->name);
$html .= Html::encode($p->product->name) .' ('. $p->quantity .'&nbsp;'.Product::strUnit($p->unit, true, true).')';
if (++$i != $count) {
$html .= '<br />';
}

正在加载...
取消
保存