Merge branch 'dev'

producer/controllers/OrderController.php

@@ -760,8 +760,11 @@ class OrderController extends ProducerBaseController
                                                         'id_user' => User::getCurrentId()
                                                 ]);
 
-        $json['user'] = false;
+        if($user && !$userProducer) {
+            $userProducer = Producer::addUser($user->id, $producer->id);
+        }
 
+        $json['user'] = false;
         if ($userProducer) {
             $json['user'] = [
                     'address' => $user->address,
@@ -841,7 +844,7 @@ class OrderController extends ProducerBaseController
                         $product->getAttributes(),
                         [
                                 'unit_coefficient' => Product::$unitsArray[$product->unit]['coefficient'],
-                                'prices' => $product->getPriceArray($userProducer->user, $pointSaleCurrent),
+                                'prices' => $product->getPriceArray($user, $pointSaleCurrent),
                                 'productDistribution' => $product['productDistribution'],
                                 'productPointSale' => $product['productPointSale'],
                         ]