Merge branch 'develop' into update_backoffice_ui

CODE_OF_CONDUCT.md

+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at support@adyen.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

Model/Cron.php

@@ -38,6 +38,7 @@ class Cron
 
     /**
      * Logging instance
+     *
      * @var \Adyen\Payment\Logger\AdyenLogger
      */
     protected $_logger;
@@ -296,6 +297,7 @@ class Cron
 
     /**
      * Process the notification
+     *
      * @return void
      */
     public function processNotification()
@@ -452,7 +454,8 @@ class Cron
             } catch (\Exception $e) {
                 $this->_updateNotification($notification, false, false);
                 $this->_adyenLogger->addAdyenNotificationCronjob(
-                    sprintf("Notification %s had an error: %s \n %s", $notification->getEntityId(), $e->getMessage(), $e->getTraceAsString())
+                    sprintf("Notification %s had an error: %s \n %s", $notification->getEntityId(), $e->getMessage(),
+                        $e->getTraceAsString())
                 );
             }
         }
@@ -780,6 +783,7 @@ class Cron
 
     /**
      * retrieve last 4 digits of card from the reason field
+     *
      * @param $reason
      * @return string
      */
@@ -934,7 +938,7 @@ class Cron
                 }
 
                 // Order is already Cancelled
-                if ($this->_order->isCanceled()){
+                if ($this->_order->isCanceled()) {
                     $this->_adyenLogger->addAdyenNotificationCronjob("Order is already cancelled, skipping OFFER_CLOSED");
                     break;
                 }
@@ -1138,6 +1142,7 @@ class Cron
 
     /**
      * Not implemented
+     *
      * @return bool
      */
     protected function _refundOrder()
@@ -1287,8 +1292,8 @@ class Cron
     }
 
     /**
-     * @throws Exception
      * @return void
+     * @throws Exception
      */
     protected function _prepareInvoice()
     {
@@ -1352,19 +1357,27 @@ class Cron
         $orderCurrencyCode = $this->_order->getOrderCurrencyCode();
         $amount = $this->_adyenHelper->originalAmount($this->_value, $orderCurrencyCode);
 
-        // add to order payment
-        $date = new \DateTime();
-        $this->_adyenOrderPaymentFactory->create()
-            ->setPspreference($this->_pspReference)
-            ->setMerchantReference($this->_merchantReference)
-            ->setPaymentId($paymentObj->getId())
-            ->setPaymentMethod($this->_paymentMethod)
-            ->setAmount($amount)
-            ->setTotalRefunded(0)
-            ->setCreatedAt($date)
-            ->setUpdatedAt($date)
-            ->save();
-
+        try {
+            // add to order payment
+            $date = new \DateTime();
+            $this->_adyenOrderPaymentFactory->create()
+                ->setPspreference($this->_pspReference)
+                ->setMerchantReference($this->_merchantReference)
+                ->setPaymentId($paymentObj->getId())
+                ->setPaymentMethod($this->_paymentMethod)
+                ->setAmount($amount)
+                ->setTotalRefunded(0)
+                ->setCreatedAt($date)
+                ->setUpdatedAt($date)
+                ->save();
+        } catch (\Exception $e) {
+            $this->_adyenLogger->addError(
+                'While processing a notification an exception occured. The payment has already been saved in the ' .
+                'adyen_order_payment table but something went wrong later. Please check your logs for potential ' .
+                'error messages regarding the merchant reference (order id): "' . $this->_merchantReference .
+                '" and PSP reference: "' . $this->_pspReference . '"'
+            );
+        }
 
         if ($this->_isTotalAmount($paymentObj->getEntityId(), $orderCurrencyCode)) {
             $this->_createInvoice();
@@ -1618,9 +1631,9 @@ class Cron
     }
 
     /**
-     * @throws Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws Exception
      */
     protected function _createInvoice()
     {

SECURITY.md

+# Reporting Security Issues
+
+We welcome reports of possible vulnerabilities or issues as part of our responsible disclosure program. For more information go to
+https://support.adyen.com/hc/en-us/articles/115001187330-How-do-I-report-a-possible-security-issue-to-Adyen-

view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js

@@ -43,7 +43,7 @@ define(
         var paymentMethod = ko.observable(null);
         var messageComponents;
         var shippingAddressCountryCode = quote.shippingAddress().countryId;
-        var unsupportedPaymentMethods = ['scheme', 'boleto', 'bcmc_mobile_QR', 'wechatpay'];
+        var unsupportedPaymentMethods = ['scheme', 'boleto', 'bcmc_mobile_QR', 'wechatpay', 'bcmc'];
         /**
          * Shareble adyen checkout component
          * @type {AdyenCheckout}