Mastercard-Gateway · riversy · Jun 27, 2022 · Aug 9, 2022 · Aug 9, 2022 · Sep 22, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [3.0.0] - 2022-11-23
+### Changed
+- Payment Interaction is moved to the Checkout page for both Modal and Embedded Payment Integration Modes 
+
+
 ## [2.3.2] - 2022-05-11
 ### Fixed
 - “Amount mismatch” error is triggered when a user purchases a product on recent versions of WooCommerce (WordPress 5.9.3 / Woocommerce 6.4.1)

diff --git a/README.md b/README.md
@@ -38,8 +38,29 @@ The module has been tested and is supported with the following versions of WooCo
   ![Activate Plugin](./docs/Wordpress_Activate_Plugin.png "Activate Plugin") 
 
 5. Plugin Settings 
-  ![Plugin Settings](./docs/SimplifyCommerce_Plugin_Settings.png "Plugin Settings") 
-
+  ![Plugin Settings](./docs/pluginsetting.png "Plugin Settings") 
+
+6. Select Transaction Mode
+  ![Transaction Mode](./docs/transactionmode.png "Plugin Settings")
+
+    There are two Transaction Modes:
+
+  - Authorization: In "Authorization" mode, the transaction is only authorized, and the capturing of funds is a manual process that you do use the Woocommerce admin panel. 
+  - Payment: The customer is charged immediately in "Payment" mode.
+
+7. Select Integration Mode
+
+    There are two Integration Modes:
+
+  - Embedded Form: The card detail form will appear on the checkout page below the payment method in this integration mode. So user can directly enter their card detail on the checkout page and place an order. 
+  ![Embedded Form Admin](./docs/embeddedformadmin.png "Embedded Form Admin")
+  ![Embedded Form Front](./docs/embeddedformfront.png "Embedded Form Front")  
+
+  - Modal Form: In this integration mode, the form to input payment detail will appear as a popup. On the checkout page, the Buy Now button will be available, and once the user clicks on Buy now button, a popup will appear where the user can enter their payment detail.
+  ![Modal Form Admin](./docs/modalformadmin.png "Modal Form Admin")
+  ![Modal Form Checkout](./docs/modalfrontcheckoutbuynow.png "Modal Form Checkout")  
+  ![Modal Form Popup](./docs/modalformfrontpay.png "Modal Form Popup")    
+
 6. Enter API Keys and other settings
   ![API Keys and other settings](./docs/SimplifyCommerce_Plugin_APIKeys.png "API Keys & Other Settings") 
 

diff --git a/composer.json b/composer.json
@@ -1,4 +1,4 @@
 {
-  "version": "2.3.2",
+  "version": "3.0.0",
   "type": "woocommerce-plugin"
 }
diff --git a/docs/embeddedformadmin.png b/docs/embeddedformadmin.png
diff --git a/docs/embeddedformfront.png b/docs/embeddedformfront.png
diff --git a/docs/modalformadmin.png b/docs/modalformadmin.png
diff --git a/docs/modalformfrontpay.png b/docs/modalformfrontpay.png
diff --git a/docs/modalfrontcheckoutbuynow.png b/docs/modalfrontcheckoutbuynow.png
diff --git a/docs/pluginsetting.png b/docs/pluginsetting.png
diff --git a/docs/transactionmode.png b/docs/transactionmode.png
diff --git a/includes/Simplify.php b/includes/Simplify.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2013 - 2017 Mastercard International Incorporated
+ * Copyright (c) 2013 - 2021 MasterCard International Incorporated
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification, are 
@@ -11,7 +11,7 @@
  * Redistributions in binary form must reproduce the above copyright notice, this list of 
  * conditions and the following disclaimer in the documentation and/or other materials 
  * provided with the distribution.
- * Neither the name of the Mastercard International Incorporated nor the names of its
+ * Neither the name of the MasterCard International Incorporated nor the names of its 
  * contributors may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
@@ -67,11 +67,8 @@ class Simplify
 require_once(dirname(__FILE__) . '/Simplify/ResourceList.php');
 require_once(dirname(__FILE__) . '/Simplify/Authorization.php');
 require_once(dirname(__FILE__) . '/Simplify/CardToken.php');
-require_once(dirname(__FILE__) . '/Simplify/Chargeback.php');
 require_once(dirname(__FILE__) . '/Simplify/Coupon.php');
 require_once(dirname(__FILE__) . '/Simplify/Customer.php');
-require_once(dirname(__FILE__) . '/Simplify/DataToken.php');
-require_once(dirname(__FILE__) . '/Simplify/Deposit.php');
 require_once(dirname(__FILE__) . '/Simplify/Event.php');
 require_once(dirname(__FILE__) . '/Simplify/FraudCheck.php');
 require_once(dirname(__FILE__) . '/Simplify/Invoice.php');

diff --git a/includes/Simplify/AccessToken.php b/includes/Simplify/AccessToken.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2013 - 2017 Mastercard International Incorporated
+ * Copyright (c) 2013 - 2021 MasterCard International Incorporated
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification, are 
@@ -11,7 +11,7 @@
  * Redistributions in binary form must reproduce the above copyright notice, this list of 
  * conditions and the following disclaimer in the documentation and/or other materials 
  * provided with the distribution.
- * Neither the name of the Mastercard International Incorporated nor the names of its
+ * Neither the name of the MasterCard International Incorporated nor the names of its 
  * contributors may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 

diff --git a/includes/Simplify/Authentication.php b/includes/Simplify/Authentication.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2013 - 2017 Mastercard International Incorporated
+ * Copyright (c) 2013 - 2021 MasterCard International Incorporated
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification, are 
@@ -11,7 +11,7 @@
  * Redistributions in binary form must reproduce the above copyright notice, this list of 
  * conditions and the following disclaimer in the documentation and/or other materials 
  * provided with the distribution.
- * Neither the name of the Mastercard International Incorporated nor the names of its
+ * Neither the name of the MasterCard International Incorporated nor the names of its 
  * contributors may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 

diff --git a/includes/Simplify/Authorization.php b/includes/Simplify/Authorization.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2013 - 2017 Mastercard International Incorporated
+ * Copyright (c) 2013 - 2021 MasterCard International Incorporated
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification, are 
@@ -11,7 +11,7 @@
  * Redistributions in binary form must reproduce the above copyright notice, this list of 
  * conditions and the following disclaimer in the documentation and/or other materials 
  * provided with the distribution.
- * Neither the name of the Mastercard International Incorporated nor the names of its
+ * Neither the name of the MasterCard International Incorporated nor the names of its 
  * contributors may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
@@ -39,10 +39,10 @@ class Simplify_Authorization extends Simplify_Object {
      *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. State abbreviations should be used. [max length: 255] </dd>
      *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 characters in length and only contains numbers or letters. [max length: 32] </dd>
      *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
-     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
-     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
+     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] </dd>
+     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] </dd>
      *     <dt><tt>card.name</tt></dt>    <dd>Name as it appears on the card. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
+     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] </dd>
      *     <dt><tt>currency</tt></dt>    <dd>Currency code (ISO-4217) for the transaction. Must match the currency associated with your account. [default: USD] <strong>required </strong></dd>
      *     <dt><tt>customer</tt></dt>    <dd>ID of customer. If specified, card on file of customer will be used. </dd>
      *     <dt><tt>description</tt></dt>    <dd>Free form text field to be used as a description of the payment. This field is echoed back with the payment on any find or list operations. [max length: 1024] </dd>

diff --git a/includes/Simplify/CardToken.php b/includes/Simplify/CardToken.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2013 - 2017 Mastercard International Incorporated
+ * Copyright (c) 2013 - 2021 MasterCard International Incorporated
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification, are 
@@ -11,7 +11,7 @@
  * Redistributions in binary form must reproduce the above copyright notice, this list of 
  * conditions and the following disclaimer in the documentation and/or other materials 
  * provided with the distribution.
- * Neither the name of the Mastercard International Incorporated nor the names of its
+ * Neither the name of the MasterCard International Incorporated nor the names of its 
  * contributors may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
@@ -39,11 +39,16 @@ class Simplify_CardToken extends Simplify_Object {
      *     <dt><tt>card.addressState</tt></dt>    <dd>State of residence of the cardholder. State abbreviations should be used. [max length: 255] </dd>
      *     <dt><tt>card.addressZip</tt></dt>    <dd>Postal code of the cardholder. The postal code size is between 5 and 9 in length and only contain numbers or letters. [max length: 32] </dd>
      *     <dt><tt>card.cvc</tt></dt>    <dd>CVC security code of the card. This is the code on the back of the card. Example: 123 </dd>
-     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] <strong>required </strong></dd>
-     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] <strong>required </strong></dd>
+     *     <dt><tt>card.expMonth</tt></dt>    <dd>Expiration month of the card. Format is MM. Example: January = 01 [min value: 1, max value: 12] </dd>
+     *     <dt><tt>card.expYear</tt></dt>    <dd>Expiration year of the card. Format is YY. Example: 2013 = 13 [min value: 0, max value: 99] </dd>
      *     <dt><tt>card.name</tt></dt>    <dd>Name as appears on the card. [max length: 50, min length: 2] </dd>
-     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] <strong>required </strong></dd>
-     *     <dt><tt>key</tt></dt>    <dd>Key used to create the card token. </dd></dl>
+     *     <dt><tt>card.number</tt></dt>    <dd>Card number as it appears on the card. [max length: 19, min length: 13] </dd>
+     *     <dt><tt>key</tt></dt>    <dd>Key used to create the card token. </dd>
+     *     <dt><tt>secure3DRequestData.amount</tt></dt>    <dd>Amount of the subsequent transaction in the smallest unit of your currency. Example: 100 = $1.00 <strong>required </strong></dd>
+     *     <dt><tt>secure3DRequestData.authOnly</tt></dt>    <dd>Specifies if the subsequent transaction is going to be a Payment or an Authorization (to be Captured later). If false or not specified, it refers to a Payment, otherwise it refers to an Authorization. </dd>
+     *     <dt><tt>secure3DRequestData.currency</tt></dt>    <dd>Currency code (ISO-4217). Must match the currency associated with your account. <strong>required </strong></dd>
+     *     <dt><tt>secure3DRequestData.description</tt></dt>    <dd>A description of the transaction. [max length: 256] <strong>required </strong></dd>
+     *     <dt><tt>secure3DRequestData.id</tt></dt>    <dd>3D Secure data ID. </dd></dl>
      * @param     $authentication -  information used for the API call.  If no value is passed the global keys Simplify::public_key and Simplify::private_key are used.  <i>For backwards compatibility the public and private keys may be passed instead of the authentication object.<i/>
      * @return    CardToken a CardToken object.
      */

diff --git a/includes/Simplify/Chargeback.php b/includes/Simplify/Chargeback.php
diff --git a/includes/Simplify/Constants.php b/includes/Simplify/Constants.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2013 - 2017 Mastercard International Incorporated
+ * Copyright (c) 2013 - 2021 MasterCard International Incorporated
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification, are 
@@ -11,7 +11,7 @@
  * Redistributions in binary form must reproduce the above copyright notice, this list of 
  * conditions and the following disclaimer in the documentation and/or other materials 
  * provided with the distribution.
- * Neither the name of the Mastercard International Incorporated nor the names of its
+ * Neither the name of the MasterCard International Incorporated nor the names of its 
  * contributors may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY