AC-2901:AC-2901:Vault/Stored Payment Methods are not saved per store

Author: faizan-shk

app/code/Magento/Vault/Api/Data/PaymentTokenInterface.php

@@ -61,6 +61,11 @@ interface PaymentTokenInterface
      */
     const IS_VISIBLE = 'is_visible';
 
+    /*
+     * Vault website id
+     */
+    const WEBSITE_ID = 'website_id';
+
     /**
      * Gets the entity ID.
      *
@@ -249,4 +254,20 @@ public function getIsVisible();
      * @since 100.1.0
      */
     public function setIsVisible($isVisible);
+
+    /**
+     * Gets vault payment website id.
+     *
+     * @return int website id.
+     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+     */
+    public function getWebsiteId();
+
+    /**
+     * Sets vault payment website id.
+     *
+     * @param int $websiteId
+     * @return $this
+     */
+    public function setWebsiteId(int $websiteId);
 }

app/code/Magento/Vault/Model/PaymentToken.php

@@ -214,4 +214,22 @@ public function setIsVisible($isVisible)
         $this->setData(PaymentTokenInterface::IS_VISIBLE, (bool) $isVisible);
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWebsiteId()
+    {
+        return $this->getData(PaymentTokenInterface::WEBSITE_ID);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setWebsiteId(int $websiteId)
+    {
+        $this->setData(PaymentTokenInterface::WEBSITE_ID, $websiteId);
+
+        return $this;
+    }
 }

app/code/Magento/Vault/Observer/AfterPaymentSaveObserver.php

@@ -75,6 +75,7 @@ public function execute(Observer $observer)
         $paymentToken->setCustomerId($order->getCustomerId());
         $paymentToken->setIsActive(true);
         $paymentToken->setPaymentMethodCode($payment->getMethod());
+        $paymentToken->setWebsiteId($order->getStore()->getWebsiteId());
 
         $additionalInformation = $payment->getAdditionalInformation();
         $paymentToken->setIsVisible(