Merge branch 'dev'

producer/controllers/OrderController.php

@@ -344,9 +344,9 @@ class OrderController extends ProducerBaseController
             $amountRemaining = $order->getAmount(Order::AMOUNT_REMAINING) ;
             
             if($credit && $pointSale->credit && 
-                    (   $posts['use_credit'] || 
-                        $pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_MANDATORY ||
-                        ($pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_USER && $userProducer->credit_active) 
+                    ( ($pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_OPTIONAL && $posts['use_credit']) || 
+                      $pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_MANDATORY ||
+                      ($pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_USER && $userProducer->credit_active) 
                     )) {
 
                 // à payer