Merge branch 'dev'

backend/controllers/OrderController.php

@@ -875,6 +875,8 @@ class OrderController extends BackendController
                                 $order->processCredit();
                         }
 
+                        $order->setTillerSynchronization() ;
+
                         // lien utilisateur / point de vente
                         if ($idUser && $pointSale) {
                                 $pointSale->linkUser($idUser);

common/models/Order.php

@@ -500,6 +500,24 @@ class Order extends ActiveRecordCommon
                 }
         }
 
+        public function setTillerSynchronization()
+        {
+                $order = Order::searchOne(['id' => $this->id]);
+
+                $paymentStatus = $order->getPaymentStatus();
+
+                if ($paymentStatus == self::PAYMENT_PAID) {
+                        $order->tiller_synchronization = 1 ;
+                }
+                else {
+                        $order->tiller_synchronization = 0 ;
+                }
+
+                $order->save() ;
+
+                return $order ;
+        }
+
         /**
          * Retourne le statut de paiement de la commande (payée, surplus, ou impayée).
          *

common/models/Subscription.php

@@ -218,6 +218,8 @@ class Subscription extends ActiveRecordCommon
                                 }
                         }
 
+                        $order->tiller_synchronization = $order->auto_payment ;
+
                         $userPointSale = UserPointSale::searchOne([
                                 'id_point_sale' => $this->id_point_sale,
                                 'id_user' => $this->id_user

producer/controllers/OrderController.php

@@ -393,9 +393,12 @@ class OrderController extends ProducerBaseController
                                                 User::getCurrentId()
                                         );
                                 }
-                        }else{
+                        }
+                        else{
                                 $order->changeOrderStatus('waiting-paiement-on-delivery', 'user');
                         }
+
+                        $order->setTillerSynchronization() ;
                 }