Merge branch 'dev'

backend/views/distribution/index.php

@@ -57,6 +57,7 @@ $this->setPageTitle('Distributions') ;
                     is-expanded
                     v-model="date"
                     popover-visibility="hidden"
+                    firstDayOfWeek="1"
                     :mode="calendar.mode"
                     :formats="calendar.formats"
                     :theme-styles="calendar.themeStyles"
@@ -124,6 +125,11 @@ $this->setPageTitle('Distributions') ;
                                 </tbody>
                             </table>
                         </div>
+                        <div slot="footer">
+                            <div class="actions-form">
+                                <button class="modal-default-button btn btn-default" @click="closeModalProducts">Fermer</button>
+                            </div>
+                        </div>
                     </modal>
                     
                     <div class="col-md-6">
@@ -238,6 +244,7 @@ $this->setPageTitle('Distributions') ;
                                 <td>
                                     <span v-if="order.user">{{ order.user.lastname+' '+order.user.name }}</span>
                                     <span v-else>{{ order.username }}</span>
+                                    <span v-if="order.comment && order.comment.length > 0" class="glyphicon glyphicon-comment"></span>
                                 </td>
                                 <td v-if="idActivePointSale == 0">
                                     {{ order.pointSale.name }}
@@ -377,7 +384,11 @@ $this->setPageTitle('Distributions') ;
                                             {{ order.productOrder[product.id] }} x {{ product.name }}
                                         </li>
                                     </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>
                         </template>
                     </tbody>

backend/web/css/screen.css

@@ -1824,45 +1824,49 @@ termes.
   margin-left: 0px;
   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 {
   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 {
   font-size: 16px;
   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 {
   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 {
   text-align: center;
   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 {
   text-align: right;
 }
-/* line 272, ../sass/distribution/_index.scss */
+/* line 276, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 280, ../sass/distribution/_index.scss */
+/* line 284, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 282, ../sass/distribution/_index.scss */
+/* line 286, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 286, ../sass/distribution/_index.scss */
+/* line 290, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }
-/* line 292, ../sass/distribution/_index.scss */
+/* line 296, ../sass/distribution/_index.scss */
 .distribution-index .modal-mask {
   position: fixed;
   z-index: 9998;
@@ -1874,12 +1878,12 @@ termes.
   display: table;
   transition: opacity .3s ease;
 }
-/* line 304, ../sass/distribution/_index.scss */
+/* line 308, ../sass/distribution/_index.scss */
 .distribution-index .modal-wrapper {
   display: table-cell;
   vertical-align: middle;
 }
-/* line 309, ../sass/distribution/_index.scss */
+/* line 313, ../sass/distribution/_index.scss */
 .distribution-index .modal-container {
   width: 70%;
   margin: 0px auto;
@@ -1890,37 +1894,37 @@ termes.
   transition: all .3s ease;
   font-family: Helvetica, Arial, sans-serif;
 }
-/* line 320, ../sass/distribution/_index.scss */
+/* line 324, ../sass/distribution/_index.scss */
 .distribution-index .modal-header {
   padding-bottom: 0px;
 }
-/* line 322, ../sass/distribution/_index.scss */
+/* line 326, ../sass/distribution/_index.scss */
 .distribution-index .modal-header h3 {
   margin-top: 0;
   color: #333;
   text-transform: uppercase;
   margin-bottom: 0px;
 }
-/* line 330, ../sass/distribution/_index.scss */
+/* line 334, ../sass/distribution/_index.scss */
 .distribution-index .modal-body {
   margin: 20px 0;
   max-height: 300px;
   height: 300px;
   overflow-y: scroll;
 }
-/* line 337, ../sass/distribution/_index.scss */
+/* line 341, ../sass/distribution/_index.scss */
 .distribution-index .modal-default-button {
   float: right;
 }
-/* line 350, ../sass/distribution/_index.scss */
+/* line 354, ../sass/distribution/_index.scss */
 .distribution-index .modal-enter {
   opacity: 0;
 }
-/* line 354, ../sass/distribution/_index.scss */
+/* line 358, ../sass/distribution/_index.scss */
 .distribution-index .modal-leave-active {
   opacity: 0;
 }
-/* line 358, ../sass/distribution/_index.scss */
+/* line 362, ../sass/distribution/_index.scss */
 .distribution-index .modal-enter .modal-container,
 .distribution-index .modal-leave-active .modal-container {
   -webkit-transform: scale(1.1);

backend/web/js/vuejs/distribution-index.js

@@ -332,6 +332,10 @@ var app = new Vue({
                 this.idOrderView = currentIdOrderView ;
             }
             
+        },
+        closeModalProducts: function() {
+            this.showModalProducts = false ;
+            this.init(this.idActivePointSale) ;
         }
     },
 });

backend/web/sass/distribution/_index.scss

@@ -236,6 +236,10 @@ termes.
                         
                     }
                 }
+                
+                .comment {
+                    margin-top: 20px ;
+                }
             }
         }
     }

producer/views/order/order.php

@@ -54,28 +54,28 @@ $this->setTitle('Commander') ;
             <div id="steps">
                 <ul>
                     <li id="step-date" :class="'col-md-3 '+((step == 'date') ? 'active' : '')">
-                        <div class="info-step" v-if="dateFormat">
-                            {{ dateFormat }}
-                        </div>
                         <button @click="changeStep('date')" :class="'btn '+ (step == 'date' ? 'btn-primary' : 'btn-default')">
                             <span class="button-content"><span class="glyphicon glyphicon-time"></span> Date</span></span>
                         </button>
+                        <div class="info-step" v-if="dateFormat">
+                            {{ dateFormat }}
+                        </div>
                     </li>
                     <li id="step-point-sale" :class="'col-md-3 '+((step == 'point-sale') ? 'active ' : '')">
-                        <div class="info-step" v-if="pointSaleActive">
-                            {{ pointSaleActive.name }}
-                        </div>
                         <button @click="changeStep('point-sale')" :class="'btn '+ (step == 'point-sale' ? 'btn-primary' : 'btn-default')" :disabled="step == 'date'">
                             <span class="button-content"><span class="glyphicon glyphicon-map-marker"></span> Points de vente</span>
                         </button>
+                        <div class="info-step" v-if="pointSaleActive">
+                            {{ pointSaleActive.name }}
+                        </div>
                     </li>
                     <li id="step-products" :class="'col-md-3 '+((step == 'products') ? 'active ' : '')">
-                        <div class="info-step" v-if="oneProductOrdered()">
-                            {{ countProductOrdered() }} produit{{ (countProductOrdered() > 1) ? 's' : '' }}
-                        </div>
                         <button @click="changeStep('products')" :class="'btn '+ (step == 'products' ? 'btn-primary' : 'btn-default')" :disabled="step == 'date' || step == 'point-sale'">
                             <span class="button-content"><span class="glyphicon glyphicon-th-list"></span> Produits</span>
                         </button>
+                        <div class="info-step" v-if="oneProductOrdered()">
+                            {{ countProductOrdered() }} produit{{ (countProductOrdered() > 1) ? 's' : '' }}
+                        </div>
                     </li>
                     <li id="step-payment" :class="'col-md-3 '+((step == 'payment') ? 'active' : '')">
                         <button @click="changeStep('payment')" :class="'btn '+ (step == 'payment' ? 'btn-primary' : 'btn-default')" :disabled="step == 'date' || step == 'point-sale' || step == 'products'">
@@ -106,6 +106,7 @@ $this->setTitle('Commander') ;
                                     is-expanded
                                     v-model="date"
                                     mode="single"
+                                    firstDayOfWeek="1"
                                     :formats="calendar.formats"
                                     :theme-styles="calendar.themeStyles"
                                     :attributes="calendar.attrs"

producer/web/css/screen.css

@@ -1269,43 +1269,47 @@ termes.
 }
 /* line 29, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul {
-  margin-top: 30px;
+  height: 70px;
 }
-/* line 31, ../sass/order/_order.scss */
+/* line 32, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li {
   text-align: center;
   padding-right: 8px;
   padding-left: 8px;
   position: relative;
 }
-/* line 37, ../sass/order/_order.scss */
+/* line 38, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .info-step {
   position: absolute;
-  top: -30px;
+  top: 45px;
   left: 0px;
   width: 100%;
   text-transform: normal;
+  color: #FF7F00;
+  font-family: "capsuularegular";
+  font-size: 17px;
+  font-weight: bold;
 }
-/* line 45, ../sass/order/_order.scss */
+/* line 50, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .glyphicon-chevron-right, .order-order #app-order-order #steps ul li.active .glyphicon-chevron-right {
   float: right;
   color: gray;
   position: relative;
   top: 10px;
 }
-/* line 53, ../sass/order/_order.scss */
+/* line 58, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li#step-date {
   padding-left: 0px;
 }
-/* line 57, ../sass/order/_order.scss */
+/* line 62, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li#step-payment {
   padding-right: 0px;
 }
-/* line 61, ../sass/order/_order.scss */
+/* line 66, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li#step-payment .btn::after, .order-order #app-order-order #steps ul li#step-date .btn::before {
   display: none;
 }
-/* line 66, ../sass/order/_order.scss */
+/* line 71, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn {
   color: #333;
   text-transform: uppercase;
@@ -1319,154 +1323,154 @@ termes.
   border: 0px none;
   text-transform: uppercase;
 }
-/* line 77, ../sass/order/_order.scss */
+/* line 82, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn .button-content {
   position: relative;
   left: 8px;
 }
-/* line 82, ../sass/order/_order.scss */
+/* line 87, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn.btn-primary {
   background-color: #FF7F00;
 }
-/* line 86, ../sass/order/_order.scss */
+/* line 91, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn::after, .order-order #app-order-order #steps ul li .btn::before {
   content: "";
   position: absolute;
   top: -1px;
 }
-/* line 92, ../sass/order/_order.scss */
+/* line 97, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn::after {
   right: -34px;
   border: 17px solid transparent;
   border-left: 17px solid #e0e0e0;
   background-color: transparent;
 }
-/* line 99, ../sass/order/_order.scss */
+/* line 104, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn::before {
   left: 0px;
   border: 17px solid transparent;
   border-left: 17px solid white;
   background-color: transparent;
 }
-/* line 106, ../sass/order/_order.scss */
+/* line 111, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn.btn-primary::after {
   border-left: 17px solid #FF7F00;
 }
-/* line 120, ../sass/order/_order.scss */
+/* line 125, ../sass/order/_order.scss */
 .order-order #app-order-order #steps ul li .btn-primary {
   color: white;
 }
-/* line 128, ../sass/order/_order.scss */
+/* line 133, ../sass/order/_order.scss */
 .order-order #app-order-order #legend #order-date-color,
 .order-order #app-order-order #legend #distribution-date-color {
   width: 13px;
   height: 13px;
   display: inline-block;
 }
-/* line 135, ../sass/order/_order.scss */
+/* line 140, ../sass/order/_order.scss */
 .order-order #app-order-order #legend #order-date-color {
   background-color: #FF7F00;
 }
-/* line 138, ../sass/order/_order.scss */
+/* line 143, ../sass/order/_order.scss */
 .order-order #app-order-order #legend #distribution-date-color {
   background-color: #5cb85c;
 }
-/* line 143, ../sass/order/_order.scss */
+/* line 148, ../sass/order/_order.scss */
 .order-order #app-order-order #calendar {
   margin-bottom: 15px;
 }
-/* line 145, ../sass/order/_order.scss */
+/* line 150, ../sass/order/_order.scss */
 .order-order #app-order-order #calendar .c-header .c-title-layout .c-title-popover .c-title-anchor .c-title[data-v-2083cb72] {
   font-size: 2rem;
 }
-/* line 148, ../sass/order/_order.scss */
+/* line 153, ../sass/order/_order.scss */
 .order-order #app-order-order #calendar .c-day-background {
   padding: 20px;
 }
-/* line 153, ../sass/order/_order.scss */
+/* line 158, ../sass/order/_order.scss */
 .order-order #app-order-order #calendar .c-day:hover .c-day-background {
   background-color: #FF7F00 !important;
   color: white !important;
 }
-/* line 159, ../sass/order/_order.scss */
+/* line 164, ../sass/order/_order.scss */
 .order-order #app-order-order #calendar .c-day-popover-content {
   font-size: 1.3rem;
 }
-/* line 164, ../sass/order/_order.scss */
+/* line 169, ../sass/order/_order.scss */
 .order-order #app-order-order .block-actions {
   text-align: right;
   margin-top: 20px;
 }
-/* line 171, ../sass/order/_order.scss */
+/* line 176, ../sass/order/_order.scss */
 .order-order #app-order-order table#points-sale td.name .the-name {
   font-family: "capsuularegular";
   color: black;
   font-size: 20px;
   line-height: 25px;
 }
-/* line 179, ../sass/order/_order.scss */
+/* line 184, ../sass/order/_order.scss */
 .order-order #app-order-order table#points-sale td.actions {
   width: 150px;
 }
-/* line 181, ../sass/order/_order.scss */
+/* line 186, ../sass/order/_order.scss */
 .order-order #app-order-order table#points-sale td.actions button {
   width: 100%;
 }
-/* line 187, ../sass/order/_order.scss */
+/* line 192, ../sass/order/_order.scss */
 .order-order #app-order-order table#points-sale tr.selected td {
   background-color: white;
 }
-/* line 195, ../sass/order/_order.scss */
+/* line 200, ../sass/order/_order.scss */
 .order-order #app-order-order table#products td.photo img {
   width: 100px;
 }
-/* line 201, ../sass/order/_order.scss */
+/* line 206, ../sass/order/_order.scss */
 .order-order #app-order-order table#products td.name .name {
   font-family: "capsuularegular";
   color: black;
   font-size: 20px;
   line-height: 25px;
 }
-/* line 207, ../sass/order/_order.scss */
+/* line 212, ../sass/order/_order.scss */
 .order-order #app-order-order table#products td.name .other {
   font-size: 14px;
   color: #333;
 }
-/* line 211, ../sass/order/_order.scss */
+/* line 216, ../sass/order/_order.scss */
 .order-order #app-order-order table#products td.name .recipe {
   color: gray;
 }
-/* line 215, ../sass/order/_order.scss */
+/* line 220, ../sass/order/_order.scss */
 .order-order #app-order-order table#products .price-unit, .order-order #app-order-order table#products .price-total {
   width: 100px;
   text-align: center;
 }
-/* line 219, ../sass/order/_order.scss */
+/* line 224, ../sass/order/_order.scss */
 .order-order #app-order-order table#products .td-quantity {
   width: 150px;
 }
-/* line 221, ../sass/order/_order.scss */
+/* line 226, ../sass/order/_order.scss */
 .order-order #app-order-order table#products .td-quantity input.quantity {
   text-align: center;
 }
-/* line 227, ../sass/order/_order.scss */
+/* line 232, ../sass/order/_order.scss */
 .order-order #app-order-order table#products tr.total .price-total {
   font-size: 23px;
 }
-/* line 234, ../sass/order/_order.scss */
+/* line 239, ../sass/order/_order.scss */
 .order-order #app-order-order #content-step-payment .credit {
   margin-top: 20px;
 }
-/* line 237, ../sass/order/_order.scss */
+/* line 242, ../sass/order/_order.scss */
 .order-order #app-order-order #content-step-payment .credit .info {
   margin-left: 20px;
   color: gray;
 }
-/* line 244, ../sass/order/_order.scss */
+/* line 249, ../sass/order/_order.scss */
 .order-order #app-order-order #infos {
   margin-top: 30px;
 }
-/* line 246, ../sass/order/_order.scss */
+/* line 251, ../sass/order/_order.scss */
 .order-order #app-order-order #infos .panel-body {
   padding-top: 0px;
   white-space: pre-line;

producer/web/js/vuejs/order-order.js

@@ -204,7 +204,6 @@ var app = new Vue({
                 this.dateFormat = ('0' + this.date.getDate()).slice(-2)+ '/'
                         + ('0' + (this.date.getMonth() +1)).slice(-2) + '/'
                         + this.date.getFullYear() ;
-                this.init() ;
                 this.changeStep('point-sale') ;
             }
         },

producer/web/sass/order/_order.scss

@@ -27,7 +27,8 @@
         #steps {
             margin-bottom: 20px ;
             ul {
-                margin-top: 30px ;
+                height: 70px ;
+                
                 li {
                     text-align: center ;
                     padding-right: 8px ;
@@ -36,10 +37,14 @@
                     
                     .info-step {
                         position: absolute ;
-                        top: -30px ;
+                        top: 45px ;
                         left: 0px ;
                         width: 100% ;
                         text-transform: normal ;
+                        color: $color1 ;
+                        font-family: 'capsuularegular' ;
+                        font-size: 17px ;
+                        font-weight: bold ;
                     }
                     
                     .glyphicon-chevron-right,