Merge branch 'feature/3223-reconsume-mod' into dev-ngds

# Conflicts:
#	common/models/forms/OrderForm.php

common/models/forms/OrderForm.php

@@ -875,7 +875,7 @@ class OrderForm extends Model
                     $userId = Info::getUserIdByUserName($this->userName);
                     $userStage = Instalment::getStage($userId);
                     $userInstalmentInfo = Instalment::getInfo($userId);
-                    if ($userStage==0 || $userStage == 3){
+                    if ($userStage == 3){
 
                     }else{
                         if($userInstalmentInfo){