Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -359,6 +359,17 @@ class DistributionController extends BackendController
                                 $tiller = new Tiller();
                                 $json['tiller_is_synchro'] = (int)$tiller->isSynchro($date);
                         }
+
+                        // abonnements manquants
+                        $arraySubscriptions = Subscription::searchByDate($date);
+                        $json['missing_subscriptions'] = [] ;
+                        foreach ($arraySubscriptions as $subscription) {
+                                if (!$subscription->hasOrderAlreadyExist($ordersArrayObject)) {
+                                        $json['missing_subscriptions'][] = [
+                                                'username' => $subscription->getUsername()
+                                        ] ;
+                                }
+                        }
                 }
 
                 return $json;

backend/views/distribution/index.php

@@ -274,6 +274,13 @@ $this->setPageTitle('Distributions') ;
                             <div class="clr"></div>
                     </div>
 
+                <div class="alert alert-danger" v-if="missingSubscriptions.length > 0">
+                    {{ missingSubscriptions.length }} abonnement<template v-if="missingSubscriptions.length > 1">s</template> manquant<template v-if="missingSubscriptions.length > 1">s</template> :
+                    <ul>
+                        <li v-for="subscription in missingSubscriptions">{{ subscription.username }}</li>
+                    </ul>
+                </div>
+
                 <table class="table table-condensed table-bordered table-hover" v-if="countOrdersByPointSale[idActivePointSale] > 0 || (idActivePointSale == 0 && orders.length > 0)">
                         <thead>
                                 <tr>

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

@@ -75,6 +75,7 @@ var app = new Vue({
         tillerIsSynchro: false,
         checkboxSelectAllOrders: false,
         messageGenerateDeliveryNoteDisplayed: false,
+        missingSubscriptions: false,
         calendar: {
             mode: 'single',
             attrs: [],
@@ -155,7 +156,7 @@ var app = new Vue({
                     app.initCountActiveProducts() ;
                     app.meansPayment = response.data.means_payment ;
                     app.oneDistributionWeekActive = response.data.one_distribution_week_active ;
-                    
+                    app.missingSubscriptions = response.data.missing_subscriptions ;
                     app.countOrders = 0 ;
                     if(response.data.orders) {
                         app.orders = JSON.parse(JSON.stringify(response.data.orders)) ;

common/models/Subscription.php

@@ -476,5 +476,14 @@ class Subscription extends ActiveRecordCommon
                 }
         }
 
+        public function getUsername()
+        {
+                if($this->user) {
+                        return $this->user->getUsername() ;
+                }
+
+                return $this->username ;
+        }
+
 
 }