ソースを参照

[Producer] Commande : message si pas de distributions à venir #1148

feature/souke
Guillaume Bourgeois 1年前
コミット
3d2e63ef4d
4個のファイルの変更559行の追加469行の削除
  1. +469
    -385
      producer/views/order/order.php
  2. +78
    -74
      producer/web/css/screen.css
  3. +3
    -4
      producer/web/js/vuejs/order-order.js
  4. +9
    -6
      producer/web/sass/order/_order.scss

+ 469
- 385
producer/views/order/order.php
ファイル差分が大きすぎるため省略します
ファイルの表示


+ 78
- 74
producer/web/css/screen.css ファイルの表示

@@ -1307,49 +1307,53 @@ termes.

/* line 3, ../sass/order/_order.scss */
.order-order #main #app-order-order {
display: none;
display: block;
}
/* line 6, ../sass/order/_order.scss */
.order-order #main #app-order-order h3 {
font-family: "highvoltageregular";
.order-order #main #app-order-order .wrapper {
display: none;
}
/* line 10, ../sass/order/_order.scss */
.order-order #main #app-order-order.loaded {
/* line 9, ../sass/order/_order.scss */
.order-order #main #app-order-order.loaded .wrapper {
display: block;
}
/* line 14, ../sass/order/_order.scss */
/* line 13, ../sass/order/_order.scss */
.order-order #main #app-order-order h3 {
font-family: "highvoltageregular";
}
/* line 17, ../sass/order/_order.scss */
.order-order #main #app-order-order #distribution-date, .order-order #main #app-order-order #order-distribution-date {
display: none;
}
/* line 18, ../sass/order/_order.scss */
/* line 21, ../sass/order/_order.scss */
.order-order #main #app-order-order .slide-enter-active {
transition: all .2s ease;
}
/* line 22, ../sass/order/_order.scss */
/* line 25, ../sass/order/_order.scss */
.order-order #main #app-order-order .slide-leave-active {
transition: all 0s ease;
}
/* line 25, ../sass/order/_order.scss */
/* line 28, ../sass/order/_order.scss */
.order-order #main #app-order-order .slide-enter, .order-order #main #app-order-order .slide-leave-to {
transform: translateX(10px);
opacity: 0;
}
/* line 30, ../sass/order/_order.scss */
/* line 33, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps {
margin-bottom: 20px;
}
/* line 32, ../sass/order/_order.scss */
/* line 35, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul {
height: 70px;
}
/* line 35, ../sass/order/_order.scss */
/* line 38, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li {
text-align: center;
padding-right: 8px;
padding-left: 8px;
position: relative;
}
/* line 41, ../sass/order/_order.scss */
/* line 44, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .info-step {
position: absolute;
top: 45px;
@@ -1361,26 +1365,26 @@ termes.
font-size: 17px;
font-weight: bold;
}
/* line 53, ../sass/order/_order.scss */
/* line 56, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .glyphicon-chevron-right, .order-order #main #app-order-order #steps ul li.active .glyphicon-chevron-right {
float: right;
color: gray;
position: relative;
top: 10px;
}
/* line 61, ../sass/order/_order.scss */
/* line 64, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li.first {
padding-left: 0px;
}
/* line 65, ../sass/order/_order.scss */
/* line 68, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li#step-payment {
padding-right: 0px;
}
/* line 69, ../sass/order/_order.scss */
/* line 72, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li#step-payment .btn::after, .order-order #main #app-order-order #steps ul li.first .btn::before {
display: none;
}
/* line 74, ../sass/order/_order.scss */
/* line 77, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn {
color: #333;
text-transform: uppercase;
@@ -1394,105 +1398,105 @@ termes.
border: 0px none;
text-transform: uppercase;
}
/* line 85, ../sass/order/_order.scss */
/* line 88, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn .button-content {
position: relative;
left: 8px;
}
/* line 90, ../sass/order/_order.scss */
/* line 93, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn.btn-primary {
background-color: #F39C12;
}
/* line 94, ../sass/order/_order.scss */
/* line 97, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn::after, .order-order #main #app-order-order #steps ul li .btn::before {
content: "";
position: absolute;
top: -1px;
}
/* line 100, ../sass/order/_order.scss */
/* line 103, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn::after {
right: -34px;
border: 17px solid transparent;
border-left: 17px solid #e0e0e0;
background-color: transparent;
}
/* line 107, ../sass/order/_order.scss */
/* line 110, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn::before {
left: 0px;
border: 17px solid transparent;
border-left: 17px solid white;
background-color: transparent;
}
/* line 114, ../sass/order/_order.scss */
/* line 117, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn.btn-primary::after {
border-left: 17px solid #F39C12;
}
/* line 128, ../sass/order/_order.scss */
/* line 131, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn-primary {
color: white;
}
/* line 136, ../sass/order/_order.scss */
/* line 139, ../sass/order/_order.scss */
.order-order #main #app-order-order #legend #order-date-color,
.order-order #main #app-order-order #legend #distribution-date-color {
width: 13px;
height: 13px;
display: inline-block;
}
/* line 143, ../sass/order/_order.scss */
/* line 146, ../sass/order/_order.scss */
.order-order #main #app-order-order #legend #order-date-color {
background-color: #F39C12;
}
/* line 146, ../sass/order/_order.scss */
/* line 149, ../sass/order/_order.scss */
.order-order #main #app-order-order #legend #distribution-date-color {
background-color: #5cb85c;
}
/* line 151, ../sass/order/_order.scss */
/* line 154, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar {
margin-bottom: 15px;
}
/* line 153, ../sass/order/_order.scss */
/* line 156, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-header .c-title-layout .c-title-popover .c-title-anchor .c-title[data-v-2083cb72] {
font-size: 2rem;
}
/* line 156, ../sass/order/_order.scss */
/* line 159, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-day-background {
padding: 20px;
}
/* line 161, ../sass/order/_order.scss */
/* line 164, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-day:hover .c-day-background {
background-color: #F39C12 !important;
color: white !important;
}
/* line 167, ../sass/order/_order.scss */
/* line 170, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-day-popover-content {
font-size: 1.3rem;
}
/* line 175, ../sass/order/_order.scss */
/* line 178, ../sass/order/_order.scss */
.order-order #main #app-order-order #credit-online-payment .panel .panel-heading .btn-default {
float: right;
position: relative;
top: -5px;
}
/* line 187, ../sass/order/_order.scss */
/* line 190, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-date #distributions-list .panel .btn-primary {
float: right;
}
/* line 191, ../sass/order/_order.scss */
/* line 194, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-date #distributions-list .panel .date {
font-size: 20px;
}
/* line 195, ../sass/order/_order.scss */
/* line 198, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-date #distributions-list .panel .point-sales {
color: gray;
font-size: 14px;
margin-top: 8px;
}
/* line 204, ../sass/order/_order.scss */
/* line 207, ../sass/order/_order.scss */
.order-order #main #app-order-order .block-actions {
text-align: right;
margin-top: 20px;
}
/* line 211, ../sass/order/_order.scss */
/* line 214, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.name .the-name {
font-family: "capsuularegular";
color: black;
@@ -1500,23 +1504,23 @@ termes.
line-height: 25px;
font-weight: bold;
}
/* line 219, ../sass/order/_order.scss */
/* line 222, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.name .comment {
color: gray;
}
/* line 224, ../sass/order/_order.scss */
/* line 227, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.actions {
width: 150px;
}
/* line 226, ../sass/order/_order.scss */
/* line 229, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.actions button {
width: 100%;
}
/* line 232, ../sass/order/_order.scss */
/* line 235, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale tr.selected td {
background-color: white;
}
/* line 240, ../sass/order/_order.scss */
/* line 243, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name {
font-family: "highvoltageregular";
font-size: 22px;
@@ -1524,12 +1528,12 @@ termes.
text-transform: uppercase;
padding-top: 13px;
}
/* line 247, ../sass/order/_order.scss */
/* line 250, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name .glyphicon-triangle-bottom,
.order-order #main #app-order-order table#products td.category-name .glyphicon-triangle-right {
font-size: 15px;
}
/* line 252, ../sass/order/_order.scss */
/* line 255, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name span.label {
font-family: "Arial";
font-weight: normal;
@@ -1537,17 +1541,17 @@ termes.
text-transform: none;
margin-left: 15px;
}
/* line 261, ../sass/order/_order.scss */
/* line 264, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name:hover {
cursor: pointer;
background-color: #F39C12;
color: white;
}
/* line 269, ../sass/order/_order.scss */
/* line 272, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.photo img {
width: 100px;
}
/* line 275, ../sass/order/_order.scss */
/* line 278, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.name .name {
font-family: "capsuularegular";
color: black;
@@ -1555,22 +1559,22 @@ termes.
line-height: 25px;
font-weight: bold;
}
/* line 282, ../sass/order/_order.scss */
/* line 285, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.name .other {
font-family: "capsuularegular";
color: black;
font-weight: bold;
font-size: 17px;
}
/* line 288, ../sass/order/_order.scss */
/* line 291, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.name .description {
color: gray;
}
/* line 291, ../sass/order/_order.scss */
/* line 294, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.name .recipe {
color: gray;
}
/* line 297, ../sass/order/_order.scss */
/* line 300, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .decreasing-prices {
margin-top: 10px;
font-size: 10px;
@@ -1578,34 +1582,34 @@ termes.
padding-bottom: 2px;
margin-bottom: 0px;
}
/* line 305, ../sass/order/_order.scss */
/* line 308, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li {
margin-bottom: 5px;
}
/* line 307, ../sass/order/_order.scss */
/* line 310, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li strong {
font-weight: bold;
}
/* line 315, ../sass/order/_order.scss */
/* line 318, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit, .order-order #main #app-order-order table#products .price-total {
width: 135px;
text-align: center;
}
/* line 319, ../sass/order/_order.scss */
/* line 322, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .unit, .order-order #main #app-order-order table#products .price-total .unit {
color: gray;
font-size: 13px;
}
/* line 324, ../sass/order/_order.scss */
/* line 327, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity {
width: 175px;
}
/* line 326, ../sass/order/_order.scss */
/* line 329, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity input.quantity {
text-align: center;
border-right: 0px none;
}
/* line 330, ../sass/order/_order.scss */
/* line 333, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity .input-group-addon {
padding: 5px;
padding-left: 0px;
@@ -1613,69 +1617,69 @@ termes.
border-left: 0px none;
border-right: 0px none;
}
/* line 341, ../sass/order/_order.scss */
/* line 344, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products tr.total .summary h3 {
margin-top: 0px;
font-family: "capsuularegular";
text-transform: none;
margin-bottom: 5px;
}
/* line 348, ../sass/order/_order.scss */
/* line 351, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products tr.total .summary ul {
margin-bottom: 15px;
padding-left: 20px;
font-size: 23px;
}
/* line 355, ../sass/order/_order.scss */
/* line 358, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products tr.total .summary ul li .quantity {
font-size: 18px;
}
/* line 359, ../sass/order/_order.scss */
/* line 362, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products tr.total .summary ul li .name {
font-family: "capsuularegular";
font-size: 24px;
}
/* line 363, ../sass/order/_order.scss */
/* line 366, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products tr.total .summary ul li .other {
font-family: "capsuularegular";
font-size: 18px;
}
/* line 371, ../sass/order/_order.scss */
/* line 374, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products tr.total .price-total {
font-size: 23px;
}
/* line 379, ../sass/order/_order.scss */
/* line 382, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-payment .delivery {
margin-bottom: 20px;
}
/* line 382, ../sass/order/_order.scss */
/* line 385, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-payment .delivery .delivery-home {
margin-bottom: 20px;
}
/* line 391, ../sass/order/_order.scss */
/* line 394, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-payment .comment {
margin-bottom: 20px;
}
/* line 396, ../sass/order/_order.scss */
/* line 399, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-payment .credit .info {
margin-left: 20px;
color: gray;
}
/* line 403, ../sass/order/_order.scss */
/* line 406, ../sass/order/_order.scss */
.order-order #main #app-order-order #specific-delays {
margin-top: 15px;
}
/* line 411, ../sass/order/_order.scss */
/* line 414, ../sass/order/_order.scss */
.order-order #main #app-order-order #infos {
margin-top: 30px;
}
/* line 413, ../sass/order/_order.scss */
/* line 416, ../sass/order/_order.scss */
.order-order #main #app-order-order #infos .panel-body {
padding-top: 0px;
white-space: pre-line;
}

/* line 423, ../sass/order/_order.scss */
/* line 426, ../sass/order/_order.scss */
#main #content .panel h3 {
font-family: "highvoltageregular";
margin: 0px;

+ 3
- 4
producer/web/js/vuejs/order-order.js ファイルの表示

@@ -29,6 +29,7 @@ var app = new Vue({
deliveryAddress: null,
urlLogin: '#',
calendar: {
columns: 2,
mode: 'single',
attrs: [],
availableDates: [],
@@ -86,8 +87,6 @@ var app = new Vue({
}
this.init('first') ;

this.loadingInit = false ;
},
methods: {
getDate: function() {
@@ -288,12 +287,12 @@ var app = new Vue({
}
}

app.loading = false ;

setTimeout(function() {
app.responsive();
}, 500);

app.loading = false ;
app.loadingInit = false ;
});
},


+ 9
- 6
producer/web/sass/order/_order.scss ファイルの表示

@@ -1,15 +1,18 @@

.order-order #main {
#app-order-order {
display: none ;
h3 {
font-family: "highvoltageregular" ;
display: block ;
.wrapper {
display: none;
}
&.loaded {
&.loaded .wrapper {
display: block ;
}

h3 {
font-family: "highvoltageregular" ;
}
#distribution-date, #order-distribution-date {
display: none ;

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