PON-673: Fix for multistore label for the orders from webhook (#205)

razorpay · Oct 23, 2020 · cf320d2 · cf320d2
1 parent 62254dc
commit cf320d2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Controller/Payment/Webhook.php b/Controller/Payment/Webhook.php
@@ -299,7 +299,12 @@ protected function getQuoteObject($post, $quoteId)
 
         $quote->getPayment()->setMethod(PaymentMethod::METHOD_CODE);
 
-        $store = $this->storeManagement->getStore();
+        $store = $quote->getStore();
+
+        if(empty($store) === true)
+        {
+            $store = $this->storeManagement->getStore();
+        }
 
         $websiteId = $store->getWebsiteId();
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "razorpay/magento",
     "description": "Razorpay Magento 2.0 plugin for accepting payments.",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "require": {
         "php": "~5.5.0|~5.6.0|^7.0",
         "razorpay/razorpay": "2.*"

diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
@@ -17,5 +17,10 @@
                 <value id="razorpay_api" type="host">api.razorpay.com</value>
             </values>
         </policy>
+        <policy id="connect-src">
+            <values>
+                <value id="razorpay_lumberjack" type="host">lumberjack.razorpay.com</value>
+            </values>
+        </policy>
     </policies>
 </csp_whitelist>
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Razorpay_Magento" setup_version="3.2.0">
+    <module name="Razorpay_Magento" setup_version="3.2.1">
 	    <sequence>
 	        <module name="Magento_Sales" />
 	        <module name="Magento_Payment" />