Browse Source

[backend] Affichage des commentaires des utilisateurs dans la liste des commandes

dev
Guillaume Bourgeois 5 years ago
parent
commit
34b2325fc9
3 changed files with 33 additions and 20 deletions
  1. +6
    -1
      backend/views/distribution/index.php
  2. +23
    -19
      backend/web/css/screen.css
  3. +4
    -0
      backend/web/sass/distribution/_index.scss

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

<td> <td>
<span v-if="order.user">{{ order.user.lastname+' '+order.user.name }}</span> <span v-if="order.user">{{ order.user.lastname+' '+order.user.name }}</span>
<span v-else>{{ order.username }}</span> <span v-else>{{ order.username }}</span>
<span v-if="order.comment && order.comment.length > 0" class="glyphicon glyphicon-comment"></span>
</td> </td>
<td v-if="idActivePointSale == 0"> <td v-if="idActivePointSale == 0">
{{ order.pointSale.name }} {{ order.pointSale.name }}
{{ order.productOrder[product.id] }} x {{ product.name }} {{ order.productOrder[product.id] }} x {{ product.name }}
</li> </li>
</ul> </ul>
</td>
<div v-if="order.comment && order.comment.length > 0" class="comment">
<strong><span class="glyphicon glyphicon-menu-right"></span> Commentaire</strong><br />
{{ order.comment }}
</div>
</td>
</tr> </tr>
</template> </template>
</tbody> </tbody>

+ 23
- 19
backend/web/css/screen.css View File

margin-left: 0px; margin-left: 0px;
padding-left: 15px; padding-left: 15px;
} }
/* line 247, ../sass/distribution/_index.scss */
/* line 240, ../sass/distribution/_index.scss */
.distribution-index #orders table tr.view .comment {
margin-top: 20px;
}
/* line 251, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products .product-ordered td { .distribution-index .modal-form-order table.table-products .product-ordered td {
background-color: #e9e9e9; background-color: #e9e9e9;
} }
/* line 251, ../sass/distribution/_index.scss */
/* line 255, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products .product-ordered input { .distribution-index .modal-form-order table.table-products .product-ordered input {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
} }
/* line 257, ../sass/distribution/_index.scss */
/* line 261, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products td.quantity { .distribution-index .modal-form-order table.table-products td.quantity {
width: 150px; width: 150px;
} }
/* line 260, ../sass/distribution/_index.scss */
/* line 264, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products td.quantity input { .distribution-index .modal-form-order table.table-products td.quantity input {
text-align: center; text-align: center;
color: gray; color: gray;
} }
/* line 266, ../sass/distribution/_index.scss */
/* line 270, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products td.quantity-remaining { .distribution-index .modal-form-order table.table-products td.quantity-remaining {
text-align: right; text-align: right;
} }
/* line 272, ../sass/distribution/_index.scss */
/* line 276, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order .actions-form button { .distribution-index .modal-form-order .actions-form button {
margin-left: 15px; margin-left: 15px;
} }
/* line 280, ../sass/distribution/_index.scss */
/* line 284, ../sass/distribution/_index.scss */
.distribution-index .modal-payment .info-box .info-box-icon { .distribution-index .modal-payment .info-box .info-box-icon {
width: 50px; width: 50px;
} }
/* line 282, ../sass/distribution/_index.scss */
/* line 286, ../sass/distribution/_index.scss */
.distribution-index .modal-payment .info-box .info-box-icon i { .distribution-index .modal-payment .info-box .info-box-icon i {
font-size: 30px; font-size: 30px;
} }
/* line 286, ../sass/distribution/_index.scss */
/* line 290, ../sass/distribution/_index.scss */
.distribution-index .modal-payment .info-box .info-box-content { .distribution-index .modal-payment .info-box .info-box-content {
margin-left: 50px; margin-left: 50px;
} }
/* line 292, ../sass/distribution/_index.scss */
/* line 296, ../sass/distribution/_index.scss */
.distribution-index .modal-mask { .distribution-index .modal-mask {
position: fixed; position: fixed;
z-index: 9998; z-index: 9998;
display: table; display: table;
transition: opacity .3s ease; transition: opacity .3s ease;
} }
/* line 304, ../sass/distribution/_index.scss */
/* line 308, ../sass/distribution/_index.scss */
.distribution-index .modal-wrapper { .distribution-index .modal-wrapper {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
} }
/* line 309, ../sass/distribution/_index.scss */
/* line 313, ../sass/distribution/_index.scss */
.distribution-index .modal-container { .distribution-index .modal-container {
width: 70%; width: 70%;
margin: 0px auto; margin: 0px auto;
transition: all .3s ease; transition: all .3s ease;
font-family: Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
} }
/* line 320, ../sass/distribution/_index.scss */
/* line 324, ../sass/distribution/_index.scss */
.distribution-index .modal-header { .distribution-index .modal-header {
padding-bottom: 0px; padding-bottom: 0px;
} }
/* line 322, ../sass/distribution/_index.scss */
/* line 326, ../sass/distribution/_index.scss */
.distribution-index .modal-header h3 { .distribution-index .modal-header h3 {
margin-top: 0; margin-top: 0;
color: #333; color: #333;
text-transform: uppercase; text-transform: uppercase;
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 330, ../sass/distribution/_index.scss */
/* line 334, ../sass/distribution/_index.scss */
.distribution-index .modal-body { .distribution-index .modal-body {
margin: 20px 0; margin: 20px 0;
max-height: 300px; max-height: 300px;
height: 300px; height: 300px;
overflow-y: scroll; overflow-y: scroll;
} }
/* line 337, ../sass/distribution/_index.scss */
/* line 341, ../sass/distribution/_index.scss */
.distribution-index .modal-default-button { .distribution-index .modal-default-button {
float: right; float: right;
} }
/* line 350, ../sass/distribution/_index.scss */
/* line 354, ../sass/distribution/_index.scss */
.distribution-index .modal-enter { .distribution-index .modal-enter {
opacity: 0; opacity: 0;
} }
/* line 354, ../sass/distribution/_index.scss */
/* line 358, ../sass/distribution/_index.scss */
.distribution-index .modal-leave-active { .distribution-index .modal-leave-active {
opacity: 0; opacity: 0;
} }
/* line 358, ../sass/distribution/_index.scss */
/* line 362, ../sass/distribution/_index.scss */
.distribution-index .modal-enter .modal-container, .distribution-index .modal-enter .modal-container,
.distribution-index .modal-leave-active .modal-container { .distribution-index .modal-leave-active .modal-container {
-webkit-transform: scale(1.1); -webkit-transform: scale(1.1);

+ 4
- 0
backend/web/sass/distribution/_index.scss View File

} }
} }
.comment {
margin-top: 20px ;
}
} }
} }
} }

Loading…
Cancel
Save