Merge branch 'dev'

producer/controllers/OrderController.php

@@ -193,8 +193,10 @@ class OrderController extends ProducerBaseController
             $order = Order::find()
                     ->where('id_distribution = :id_distribution')
                     ->andWhere('id_user = :id_user')
+                    ->andWhere('id_point_sale = :id_point_sale')
                     ->params([
                                      ':id_distribution' => $posts['Order']['id_distribution'],
+                                     ':id_point_sale' => $posts['Order']['id_point_sale'],
                                      ':id_user' => $user ? $user->id : null
                              ])
                     ->one();