Merge branch 'dev'

backend/views/distribution/index.php

@@ -282,6 +282,10 @@ $this->setPageTitle('Distributions') ;
                     </ul>
                 </div>
 
+                <div class="alert alert-danger" v-if="distribution && !distribution.active && orders && orders.length > 0">
+                    Attention, ce jour de distribution n'est pas activé et vous avez quand même des commandes enregistrées.
+                </div>
+
                 <table class="table table-condensed table-bordered table-hover" v-if="countOrdersByPointSale[idActivePointSale] > 0 || (idActivePointSale == 0 && orders.length > 0)">
                         <thead>
                                 <tr>

common/models/Subscription.php

@@ -178,7 +178,7 @@ class Subscription extends ActiveRecordCommon
                         'distribution.date' => date('Y-m-d', strtotime($date))
                 ]);
 
-                if ($distribution && count($this->productSubscription) && $this->id_point_sale) {
+                if ($distribution && $distribution->active && count($this->productSubscription) && $this->id_point_sale) {
                         // commande
                         $order = new Order;
                         if (strlen($this->username)) {

frontend/views/site/contact.php

@@ -57,7 +57,7 @@ $this->params['breadcrumbs'][] = $this->title;
     <div class="row">
         <div class="col-lg-5">
             
-            <h2>par téléphone</h2>
+            <!--<h2>par téléphone</h2>
             <p id="contact-phone">
                 Guillaume Bourgeois<br />
                 <span class="glyphicon glyphicon-phone"></span> 06 84 59 71 79
@@ -65,7 +65,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 <br /><br />
                 Fabien Normand<br />
                 <span class="glyphicon glyphicon-phone"></span> 07 81 99 97 01
-            </p>
+            </p>-->
             
             <h2>Par email</h2>
             <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>

producer/views/order/order.php

@@ -142,17 +142,18 @@ $producer = GlobalParam::getCurrentProducer() ;
                             </div>
                             <div id="calendar">
                                 <v-calendar
-                                    is-inline
-                                    is-double-paned
-                                    is-expanded
-                                    v-model="date"
-                                    mode="single"
-                                    firstDayOfWeek="1"
-                                    :formats="calendar.formats"
-                                    :theme-styles="calendar.themeStyles"
-                                    :attributes="calendar.attrs"
-                                    :available-dates="calendar.availableDates"
-                                    @dayclick='dayClick'>
+                                        is-inline
+                                        is-double-paned
+                                        is-expanded
+                                        v-model="date"
+                                        mode="single"
+                                        locale="fr"
+                                        :locale="{id: 'fr', firstDayOfWeek: 2, masks: { weekdays: 'WW' }}"
+                                        :formats="calendar.formats"
+                                        :theme-styles="calendar.themeStyles"
+                                        :attributes="calendar.attrs"
+                                        :available-dates="calendar.availableDates"
+                                        @dayclick='dayClick'
                                 ></v-calendar>
                             </div>
                             <?php if($producer->behavior_order_select_distribution == Producer::BEHAVIOR_ORDER_SELECT_DISTRIBUTION_LIST ): ?>