Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -1387,7 +1387,8 @@ class DistributionController extends BackendController
                                                                    ]
                                                            ]);
 
-                        $order->tiller_external_id = $returnTiller->id;
+                        $returnTillerObject = json_decode($returnTiller);
+                        $order->tiller_external_id = $returnTillerObject->id;
                         $order->save();
 
                         $return[] = $returnTiller;