Merge branch 'dev'

backend/controllers/DistributionController.php

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

common/helpers/Tiller.php

@@ -90,7 +90,7 @@ class Tiller
                                         $ordersOpendistribSynchro[$orderOpendistrib->id] = false;
                                         if(isset($ordersTiller->orders)) {
                                                 foreach ($ordersTiller->orders as $orderTiller) {
-                                                        if ($orderOpendistrib->tiller_external_id == $orderTiller->externalId
+                                                        if ($orderOpendistrib->tiller_external_id == $orderTiller->id
                                                                 && (int) round($orderOpendistrib->getAmountWithTax(Order::AMOUNT_TOTAL) * 100) == (int) $orderTiller->currentBill) {
 
                                                                 $ordersOpendistribSynchro[$orderOpendistrib->id] = true;