ソースを参照

Distributions : placement bouton "Ajouter une commande"

dev
コミット
410d84bc01
3個のファイルの変更41行の追加32行の削除
  1. +1
    -1
      backend/views/distribution/index.php
  2. +36
    -30
      backend/web/css/screen.css
  3. +4
    -1
      backend/web/sass/distribution/_index.scss

+ 1
- 1
backend/views/distribution/index.php ファイルの表示

@@ -201,7 +201,7 @@ $this->setPageTitle('Distributions') ;
<h3 class="panel-title">Commandes <label class="label label-success" v-if="orders.length">{{ orders.length }}</label><label class="label label-danger" v-else>0</label></h3>
</div>
<div class="panel-body">
<button id="btn-add-order" @click="showModalFormOrderCreate = true" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Ajouter une commande</button>
<button id="btn-add-order" @click="showModalFormOrderCreate = true" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-plus"></span> Ajouter une commande</button>
<order-form
v-if="showModalFormOrderCreate"
:date="date"

+ 36
- 30
backend/web/css/screen.css ファイルの表示

@@ -1731,35 +1731,41 @@ termes.
.distribution-index #modal-products table.table td.quantity-max input {
text-align: center;
}
/* line 178, ../sass/distribution/_index.scss */
/* line 177, ../sass/distribution/_index.scss */
.distribution-index #orders {
position: relative;
}
/* line 179, ../sass/distribution/_index.scss */
.distribution-index #orders #btn-add-order {
float: right;
position: absolute;
top: 9px;
right: 10px;
}
/* line 182, ../sass/distribution/_index.scss */
/* line 185, ../sass/distribution/_index.scss */
.distribution-index #orders #wrapper-nav-points-sale {
margin-bottom: 10px;
}
/* line 185, ../sass/distribution/_index.scss */
/* line 188, ../sass/distribution/_index.scss */
.distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale {
margin: 0px;
padding: 0px;
list-style-type: none;
}
/* line 190, ../sass/distribution/_index.scss */
/* line 193, ../sass/distribution/_index.scss */
.distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li {
float: left;
margin-right: 10px;
margin-bottom: 10px;
}
/* line 195, ../sass/distribution/_index.scss */
/* line 198, ../sass/distribution/_index.scss */
.distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a {
position: relative;
}
/* line 199, ../sass/distribution/_index.scss */
/* line 202, ../sass/distribution/_index.scss */
.distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a.btn-primary .glyphicon {
display: block;
}
/* line 204, ../sass/distribution/_index.scss */
/* line 207, ../sass/distribution/_index.scss */
.distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a .glyphicon {
display: none;
position: absolute;
@@ -1770,7 +1776,7 @@ termes.
color: #FF7F00;
position: absolute;
}
/* line 215, ../sass/distribution/_index.scss */
/* line 218, ../sass/distribution/_index.scss */
.distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a .label {
background-color: white;
border: solid 1px #e0e0e0;
@@ -1778,57 +1784,57 @@ termes.
-webkit-border-radius: 10px;
border-radius: 10px;
}
/* line 228, ../sass/distribution/_index.scss */
/* line 231, ../sass/distribution/_index.scss */
.distribution-index #orders table td.column-actions {
text-align: right;
width: 200px;
}
/* line 232, ../sass/distribution/_index.scss */
/* line 235, ../sass/distribution/_index.scss */
.distribution-index #orders table td.column-actions .modal-form-order,
.distribution-index #orders table td.column-actions .modal-payment {
text-align: left;
}
/* line 239, ../sass/distribution/_index.scss */
/* line 242, ../sass/distribution/_index.scss */
.distribution-index #orders table tr.view ul {
list-style-type: none;
margin-left: 0px;
padding-left: 15px;
}
/* line 255, ../sass/distribution/_index.scss */
/* line 258, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products .product-ordered td {
background-color: #e9e9e9;
}
/* line 259, ../sass/distribution/_index.scss */
/* line 262, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products .product-ordered input {
font-size: 16px;
font-weight: bold;
}
/* line 265, ../sass/distribution/_index.scss */
/* line 268, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products td.quantity {
width: 150px;
}
/* line 268, ../sass/distribution/_index.scss */
/* line 271, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products td.quantity input {
text-align: center;
color: gray;
}
/* line 274, ../sass/distribution/_index.scss */
/* line 277, ../sass/distribution/_index.scss */
.distribution-index .modal-form-order table.table-products td.quantity-remaining {
text-align: right;
}
/* line 282, ../sass/distribution/_index.scss */
/* line 285, ../sass/distribution/_index.scss */
.distribution-index .modal-payment .info-box .info-box-icon {
width: 50px;
}
/* line 284, ../sass/distribution/_index.scss */
/* line 287, ../sass/distribution/_index.scss */
.distribution-index .modal-payment .info-box .info-box-icon i {
font-size: 30px;
}
/* line 288, ../sass/distribution/_index.scss */
/* line 291, ../sass/distribution/_index.scss */
.distribution-index .modal-payment .info-box .info-box-content {
margin-left: 50px;
}
/* line 294, ../sass/distribution/_index.scss */
/* line 297, ../sass/distribution/_index.scss */
.distribution-index .modal-mask {
position: fixed;
z-index: 9998;
@@ -1840,12 +1846,12 @@ termes.
display: table;
transition: opacity .3s ease;
}
/* line 306, ../sass/distribution/_index.scss */
/* line 309, ../sass/distribution/_index.scss */
.distribution-index .modal-wrapper {
display: table-cell;
vertical-align: middle;
}
/* line 311, ../sass/distribution/_index.scss */
/* line 314, ../sass/distribution/_index.scss */
.distribution-index .modal-container {
width: 70%;
margin: 0px auto;
@@ -1856,37 +1862,37 @@ termes.
transition: all .3s ease;
font-family: Helvetica, Arial, sans-serif;
}
/* line 322, ../sass/distribution/_index.scss */
/* line 325, ../sass/distribution/_index.scss */
.distribution-index .modal-header {
padding-bottom: 0px;
}
/* line 324, ../sass/distribution/_index.scss */
/* line 327, ../sass/distribution/_index.scss */
.distribution-index .modal-header h3 {
margin-top: 0;
color: #333;
text-transform: uppercase;
margin-bottom: 0px;
}
/* line 332, ../sass/distribution/_index.scss */
/* line 335, ../sass/distribution/_index.scss */
.distribution-index .modal-body {
margin: 20px 0;
max-height: 300px;
height: 300px;
overflow-y: scroll;
}
/* line 339, ../sass/distribution/_index.scss */
/* line 342, ../sass/distribution/_index.scss */
.distribution-index .modal-default-button {
float: right;
}
/* line 352, ../sass/distribution/_index.scss */
/* line 355, ../sass/distribution/_index.scss */
.distribution-index .modal-enter {
opacity: 0;
}
/* line 356, ../sass/distribution/_index.scss */
/* line 359, ../sass/distribution/_index.scss */
.distribution-index .modal-leave-active {
opacity: 0;
}
/* line 360, ../sass/distribution/_index.scss */
/* line 363, ../sass/distribution/_index.scss */
.distribution-index .modal-enter .modal-container,
.distribution-index .modal-leave-active .modal-container {
-webkit-transform: scale(1.1);

+ 4
- 1
backend/web/sass/distribution/_index.scss ファイルの表示

@@ -175,8 +175,11 @@ termes.
}
#orders {
position: relative ;
#btn-add-order {
float: right ;
position: absolute ;
top: 9px ;
right: 10px ;
}
#wrapper-nav-points-sale {

読み込み中…
キャンセル
保存