From 4776ae58d522ed4d3df1f3678ba67628d908890a Mon Sep 17 00:00:00 2001
From: Nanda <29716662+nandadubey@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:29:19 -0700
Subject: [PATCH] =?UTF-8?q?Adding=20default=20checkout=20type=20as=20Modal?=
 =?UTF-8?q?=20and=20Fix=20for=20jquery=20ui=20library=20c=E2=80=A6=20(#44)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adding default checkout type as Modal and Fix for jquery ui library changes

* Removing unused module dependency
---
 Block/System/Config/Form/Field/Date.php  | 2 +-
 composer.json                            | 2 +-
 etc/config.xml                           | 1 +
 etc/module.xml                           | 2 +-
 view/frontend/templates/pixel/code.phtml | 4 ++--
 view/frontend/web/js/affirmPixel.js      | 4 ++--
 view/frontend/web/js/affirmWidget.js     | 4 ++--
 view/frontend/web/js/aslowasPDP.js       | 2 +-
 view/frontend/web/js/aslowasPLP.js       | 2 +-
 view/frontend/web/js/model/global.js     | 2 +-
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Block/System/Config/Form/Field/Date.php b/Block/System/Config/Form/Field/Date.php
index 635d0f96..b9ee5138 100644
--- a/Block/System/Config/Form/Field/Date.php
+++ b/Block/System/Config/Form/Field/Date.php
@@ -62,7 +62,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
             $this->_coreRegistry->registry('datepicker_loaded', 1);
         }
         $html .= '<script type="text/javascript">
-            require(["jquery", "jquery/ui"], function () {
+            require(["jquery"], function () {
                 jQuery(document).ready(function () {
                     jQuery("#' . $element->getHtmlId() . '").datepicker( { dateFormat: "mm/dd/yy" } );
                     var el = document.getElementById("' . $element->getHtmlId() . '");
diff --git a/composer.json b/composer.json
index 6e04b8ab..01e48824 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "affirm/magento2",
     "description": "Affirm's extension for the Magento 2 https://www.affirm.com/",
     "type": "magento2-module",
-    "version": "3.0.3",
+    "version": "3.0.4",
     "license": [
         "BSD-3-Clause"
     ],
diff --git a/etc/config.xml b/etc/config.xml
index 18fe5e51..86075f05 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -46,6 +46,7 @@
                 <enable_checkout_button>0</enable_checkout_button>
                 <checkout_button_code>https://cdn-assets.affirm.com/images/buttons/30_148-white.png</checkout_button_code>
                 <checkout_button_width>148</checkout_button_width>
+                <checkout_flow_type>Modal</checkout_flow_type>
                 <notification>
                     <notification_update>1</notification_update>
                 </notification>
diff --git a/etc/module.xml b/etc/module.xml
index ea514aee..c27a3a8c 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -10,7 +10,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Astound_Affirm" setup_version="3.0.3">
+    <module name="Astound_Affirm" setup_version="3.0.4">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>
diff --git a/view/frontend/templates/pixel/code.phtml b/view/frontend/templates/pixel/code.phtml
index af4bca59..791bdfad 100755
--- a/view/frontend/templates/pixel/code.phtml
+++ b/view/frontend/templates/pixel/code.phtml
@@ -87,7 +87,7 @@ if ($action == 'catalog_product_view' && $block->isProductViewTrackPixelEnabled(
     if($block->isAddCartTrackPixelEnabled()){
     ?>
     <script>
-        require(['jquery', 'jquery/ui'],function($){
+        require(['jquery', 'jquery-ui-modules/widget'],function($){
 
             $('#product-addtocart-button').click(function () {
                 
@@ -191,4 +191,4 @@ $serializedPixelCode = $this->helper('Magento\Framework\Json\Helper\Data')->json
     }
 }
 </script>
-<!-- END AFFIRM ANALYTICS CODE -->
\ No newline at end of file
+<!-- END AFFIRM ANALYTICS CODE -->
diff --git a/view/frontend/web/js/affirmPixel.js b/view/frontend/web/js/affirmPixel.js
index 2b552c6a..b78b3978 100644
--- a/view/frontend/web/js/affirmPixel.js
+++ b/view/frontend/web/js/affirmPixel.js
@@ -36,7 +36,7 @@
 define([
     "jquery",
     "Astound_Affirm/js/model/aslowas",
-    "jquery/ui"
+    "jquery-ui-modules/widget"
 ], function ($, aslowas) {
     "use strict"
 
@@ -77,4 +77,4 @@ define([
     });
 
     return $.mage.affirmPixel
-});;
\ No newline at end of file
+});;
diff --git a/view/frontend/web/js/affirmWidget.js b/view/frontend/web/js/affirmWidget.js
index ee08f101..538a72e0 100644
--- a/view/frontend/web/js/affirmWidget.js
+++ b/view/frontend/web/js/affirmWidget.js
@@ -7,7 +7,7 @@
 define([
     "jquery",
     "Astound_Affirm/js/model/aslowas",
-    "jquery/ui"
+    "jquery-ui-modules/widget"
 ], function ($, aslowas) {
 
     "use strict"
@@ -51,4 +51,4 @@ define([
     });
 
     return $.mage.affirmWidget
-});
\ No newline at end of file
+});
diff --git a/view/frontend/web/js/aslowasPDP.js b/view/frontend/web/js/aslowasPDP.js
index 67f2128c..675b3592 100644
--- a/view/frontend/web/js/aslowasPDP.js
+++ b/view/frontend/web/js/aslowasPDP.js
@@ -6,7 +6,7 @@
 define(["jquery",
     "mage/translate",
     "Astound_Affirm/js/model/aslowas",
-    "jquery/ui"
+    "jquery-ui-modules/widget"
 ], function ($, $t, aslowas) {
 
     "use strict"
diff --git a/view/frontend/web/js/aslowasPLP.js b/view/frontend/web/js/aslowasPLP.js
index 9b500991..e6e4e19d 100755
--- a/view/frontend/web/js/aslowasPLP.js
+++ b/view/frontend/web/js/aslowasPLP.js
@@ -6,7 +6,7 @@
 define(["jquery",
     "mage/translate",
     "Astound_Affirm/js/model/aslowas",
-    "jquery/ui"
+    "jquery-ui-modules/widget"
 ], function ($, $t, aslowas) {
 
     "use strict"
diff --git a/view/frontend/web/js/model/global.js b/view/frontend/web/js/model/global.js
index 0e58dce3..788e492d 100644
--- a/view/frontend/web/js/model/global.js
+++ b/view/frontend/web/js/model/global.js
@@ -36,7 +36,7 @@
 define([
     "jquery",
     "mage/translate",
-    "jquery/ui"
+    "jquery-ui-modules/widget"
 ],
     function ($, $t) {
         'use strict';