Merge branch 'dev'

backend/controllers/DistributionController.php

                                                 }
 
                                                 $typePaymentTiller = '';
-                                                if ($order->mean_payment == MeanPayment::MONEY
+                                                if ($order->mean_payment == MeanPayment::MONEY) {
+                                                        $typePaymentTiller = 'CASH';
+                                                }
+                                                if ($order->mean_payment == MeanPayment::CREDIT_CARD
                                                         || $order->mean_payment == MeanPayment::CREDIT
                                                         || $order->mean_payment == MeanPayment::TRANSFER
                                                         || $order->mean_payment == MeanPayment::OTHER) {
-                                                        $typePaymentTiller = 'CASH';
-                                                }
-                                                if ($order->mean_payment == MeanPayment::CREDIT_CARD) {
                                                         $typePaymentTiller = 'CARD';
                                                 }
                                                 if ($order->mean_payment == MeanPayment::CHEQUE) {