Merge branch 'hotfix/hotfix_1716'

producer/web/js/vuejs/order-order.js

@@ -580,10 +580,11 @@ var app = new Vue({
                 && !this.isPaymentMethodCreditActiveFunctioningMandatory()
         },
         errorCreditMandatoryAndLimit: function() {
-            return this.user && (
-                    this.pointSaleActive.credit_functioning == 'mandatory'
-                    || (this.pointSaleActive.credit_functioning == 'user' && this.user.credit_active)
-                )
+            return this.user
+                && this.pointSaleActive
+                && this.pointSaleActive.payment_method_credit
+                && (this.pointSaleActive.credit_functioning == 'mandatory'
+                    || (this.pointSaleActive.credit_functioning == 'user' && this.user.credit_active))
                 && !this.checkCreditLimit(this.order);
         },
         confirmClick: function() {