Merge branch 'dev'

backend/controllers/CronController.php

@@ -72,7 +72,12 @@ class CronController extends BackendController
                                         [
                                                 'allow' => true,
                                                 'roles' => ['?'],
-                                        ]
+                                        ],
+                                        [
+                                                'actions' => ['pay-orders'],
+                                                'allow' => true,
+                                                'roles' => ['@']
+                                        ],
                                 ],
                         ],
                 ];
@@ -110,6 +115,23 @@ class CronController extends BackendController
 
         }
 
+        public function actionPayOrders($date)
+        {
+                \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+
+                if(strlen($date)) {
+                        $this->actionProcessOrders('64ac0bdab7e9f5e48c4d991ec5201d57', $date) ;
+                }
+
+                return [
+                        'return' => 'success',
+                        'alert' => [
+                                'type' => 'success',
+                                'message' => 'Commandes payées.'
+                        ]
+                ] ;
+        }
+
         /**
          * Routine quotidienne concernant les commandes : paiement et envoi d'un
          * récap aux producteurs.

backend/controllers/DocumentController.php

@@ -129,10 +129,6 @@ class DocumentController extends BackendController
                         throw new NotFoundHttpException('Le document n\'a pas été trouvé.');
                 }
 
-                if ($model->isStatusValid()) {
-                        return $this->redirect(['download', 'id' => $id]) ;
-                }
-
                 if ($model && $model->load(Yii::$app->request->post()) && $model->save()) {
                         Yii::$app->getSession()->setFlash('success', $this->getFlashMessage('update', $model));
                 }

backend/views/distribution/index.php

@@ -259,6 +259,7 @@ $this->setPageTitle('Distributions') ;
                                             <button v-if="tillerIsSynchro" id="btn-tiller"  class="btn btn-success btn-xs" disabled><span class="glyphicon glyphicon-refresh"></span> Synchronisé avec Tiller</button>
                                             <button v-else id="btn-tiller" class="btn btn-xs btn-default" @click="synchroTiller"><span class="glyphicon glyphicon-refresh"></span> Synchroniser avec Tiller</button>
                                     </template>
+                                    <button v-if="producer.credit" id="btn-pay-orders" class="btn btn-default btn-xs" @click="payOrders"><span class="glyphicon glyphicon-euro"></span> Payer les commandes</button>
                                     <button id="btn-add-order" @click="openModalFormOrderCreate" class="btn btn-xs btn-primary"><span class="glyphicon glyphicon-plus"></span> Ajouter une commande</button>
                             </div>
                             <div class="left">

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

@@ -506,6 +506,16 @@ var app = new Vue({
         },
         deliveryNoteExist: function(idPointSale) {
             return typeof this.deliveryNotes[this.idActivePointSale] != 'undefined' ;
+        },
+        payOrders: function() {
+            var app = this ;
+            axios.get(UrlManager.getBaseUrlAbsolute()+"cron/pay-orders",{params: {
+                    date: app.getDate()
+                }})
+                .then(function(response) {
+                    appAlerts.alertResponse(response) ;
+                    app.init(app.idActivePointSale) ;
+                }) ;
         }
     },
 });