Merge branch 'hotfix/hotfix_1271'

common/logic/Order/Order/Service/OrderBuilder.php

@@ -461,7 +461,7 @@ class OrderBuilder extends AbstractBuilder
         if (!is_null($synchroTiller)) {
             $order->tiller_synchronization = $synchroTiller;
         } else {
-            $amountPaid = $this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID);
+            $amountPaid = $this->orderSolver->getOrderAmountPaidByCredit($order);
 
             if ($amountPaid >= 0.01) {
                 $order->tiller_synchronization = 1;

producer/controllers/OrderController.php

@@ -506,6 +506,7 @@ class OrderController extends ProducerBaseController
                 }
             }
 
+            $order = $orderManager->findOneOrderById($order->id);
             $orderManager->initOrder($order);
             $orderManager->updateOrderTillerSynchronization($order);
         }