Merge pull request #456 from magento-firedrakes/MAGETWO-40006

[Firedrakes] Bugfixes

Author: vpelipenko

app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php

@@ -50,8 +50,13 @@ public function prepareDataSource(array & $dataSource)
     {
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
-                $item[$this->getData('name')] = $this->paymentHelper->getMethodInstance($item[$this->getData('name')])
-                    ->getTitle();
+                try {
+                    $item[$this->getData('name')] = $this->paymentHelper
+                        ->getMethodInstance($item[$this->getData('name')])
+                        ->getTitle();
+                } catch (\UnexpectedValueException $exception) {
+                    //Displaying payment code (with no changes) if payment method is not available in system
+                }
             }
         }
     }

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -1131,6 +1131,7 @@ AdminOrder.prototype = {
             disableElements('save');
             jQuery('#edit_form').on('invalid-form.validate', function() {
                 enableElements('save');
+                jQuery('#edit_form').trigger('processStop');
                 jQuery('#edit_form').off('invalid-form.validate');
             });
             jQuery('#edit_form').triggerHandler('save');