Merge branch 'dev'

producer/controllers/OrderController.php

@@ -814,7 +814,7 @@ class OrderController extends ProducerBaseController
 
                 if($distribution) {
                         $pointsSaleArray = $pointsSaleArray->joinWith(['pointSaleDistribution' => function ($query) use ($distribution) {
-                                        $query->where(['id_distribution' => $distribution->id]);
+                                        $query->where(['id_distribution' => $distribution->id, 'delivery' => 1]);
                                 }
                         ]) ;
                 }