Merge branch 'MAGETWO-42231-PR' of github.corp.magento.com:magento-mpi/magento2ce into MPI-S73-PR

Conflicts:
	composer.lock

Author: Gurzhyi, Andrii

app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js

@@ -54,6 +54,7 @@ define([
          */
         initChildren: function () {
             var self = this;
+
             _.each(paymentMethods(), function (paymentMethodData) {
                 self.createRenderer(paymentMethodData);
             });
@@ -62,50 +63,55 @@ define([
         },
 
         /**
-         * Create renderer.
-         *
-         * @param {Object} paymentMethodData
+         * @returns
          */
-        createRenderer: function (paymentMethodData) {
-            var renderer = this.getRendererByType(paymentMethodData.method),
-                rendererTemplate,
+        createComponent: function (payment) {
+            var rendererTemplate,
                 rendererComponent,
                 templateData;
 
-            if (renderer) {
-                templateData = {
-                    parentName: this.name,
-                    name: paymentMethodData.method
-                };
-                rendererTemplate = {
-                    parent: '${ $.$data.parentName }',
-                    name: '${ $.$data.name }',
-                    displayArea: 'payment-method-items',
-                    component: renderer.component
-                };
-                rendererComponent = utils.template(rendererTemplate, templateData);
-                utils.extend(rendererComponent, {
-                    item: paymentMethodData
-                });
-                layout([rendererComponent]);
-            }
+            templateData = {
+                parentName: this.name,
+                name: payment.name
+            };
+            rendererTemplate = {
+                parent: '${ $.$data.parentName }',
+                name: '${ $.$data.name }',
+                displayArea: 'payment-method-items',
+                component: payment.component
+            };
+            rendererComponent = utils.template(rendererTemplate, templateData);
+            utils.extend(rendererComponent, {
+                item: payment.item,
+                config: payment.config
+            });
+
+            return rendererComponent;
         },
 
         /**
-         * Get renderer for payment method type.
+         * Create renderer.
          *
-         * @param {String} paymentMethodCode
-         * @returns {Object}
+         * @param {Object} paymentMethodData
          */
-        getRendererByType: function (paymentMethodCode) {
-            var compatibleRenderer;
+        createRenderer: function (paymentMethodData) {
             _.find(rendererList(), function (renderer) {
-                if (renderer.type === paymentMethodCode) {
-                    compatibleRenderer = renderer;
+                if (renderer.type.indexOf(paymentMethodData.method) === 0) {
+                    layout(
+                        [
+                            this.createComponent(
+                                {
+                                    config: renderer.config,
+                                    component: renderer.component,
+                                    name: renderer.type,
+                                    method: paymentMethodData.method,
+                                    item: paymentMethodData
+                                }
+                            )
+                        ]
+                    );
                 }
-            });
-
-            return compatibleRenderer;
+            }.bind(this));
         },
 
         /**
@@ -115,8 +121,9 @@ define([
          */
         removeRenderer: function (paymentMethodCode) {
             var items = this.getRegion('payment-method-items');
+
             _.find(items(), function (value) {
-                if (value.item.method === paymentMethodCode) {
+                if (value.item.method.indexOf(paymentMethodCode) === 0) {
                     value.disposeSubscriptions();
                     this.removeChild(value);
                 }

app/code/Magento/Payment/Gateway/CommandExecutorInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Gateway;
+
+/**
+ * Interface CommandExecutorInterface
+ */
+interface CommandExecutorInterface
+{
+    /**
+     * Performs command
+     *
+     * @param string $commandCode
+     * @param array $arguments
+     * @return null|Command\ResultInterface
+     */
+    public function executeCommand($commandCode, array $arguments = []);
+}