Merge remote-tracking branch 'origin/master' into feature/PLUG-1800

# Conflicts: # Model/Paymentmethod/PaymentMethod.php
paynl · May 1, 2023 · bd5261a · bd5261a
2 parents 3e843f9 + 2a63f38
commit bd5261a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Model/Paymentmethod/PaymentMethod.php b/Model/Paymentmethod/PaymentMethod.php
@@ -464,7 +464,7 @@ public function startTransaction(Order $order)
 
         return $transaction->getRedirectUrl();
     }
-
+ 
     /**
      * @return integer
      */

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "paynl/magento2-plugin",
   "description": "PAY. Payment methods for Magento2",
   "type": "magento2-module",
-  "version": "3.4.2",
+  "version": "3.5.0",
   "require": {
     "magento/module-sales": "^102.0.0 || ^103.0.0",
     "magento/module-payment": "^100.3.0",

diff --git a/etc/acl.xml b/etc/acl.xml
@@ -4,8 +4,9 @@
         <resources>
             <resource id="Magento_Backend::admin">
                 <resource id="Paynl_Payment::acl" title="Pay." sortOrder="1">
-                    <resource id="Paynl_Payment::logs" title="Download logs" sortOrder="1" />
-                    <resource id="Paynl_Payment::graphql_refund" title="GraphQl - Refund" sortOrder="2" />
+                    <resource id="Paynl_Payment::config" title="Configure Pay." sortOrder="1" />
+                    <resource id="Paynl_Payment::logs" title="Download logs" sortOrder="2" />
+                    <resource id="Paynl_Payment::graphql_refund" title="GraphQl - Refund" sortOrder="3" />
                 </resource>
             </resource>
         </resources>
-Original file line number
+Diff line change
@@ Expand Up / @@ -464,7 +464,7 @@ public function startTransaction(Order $order) @@
             return $transaction->getRedirectUrl();
         }
         /**
          * @return integer
          */
@@ Expand Down @@