From 96c741d3fca2bd2d277b699f8ef1c3aa87241d21 Mon Sep 17 00:00:00 2001
From: Felipe Orellana <forellana@digithinkit.com>
Date: Wed, 20 Sep 2017 09:05:06 -0700
Subject: [PATCH 1/3] Refactored for new address widget

---
 .../includes/integrations/gateway_selector/embed.html         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gateway_selector/templates/includes/integrations/gateway_selector/embed.html b/gateway_selector/templates/includes/integrations/gateway_selector/embed.html
index a548cbd..727a3f5 100644
--- a/gateway_selector/templates/includes/integrations/gateway_selector/embed.html
+++ b/gateway_selector/templates/includes/integrations/gateway_selector/embed.html
@@ -20,8 +20,8 @@ <h2>Select Payment Method</h2>
 {% if not is_backend %}
   <h2>Billing Address</h2>
   <div class="row">
-    <div id="awc-select-bill-addr">
-      {% include "templates/includes/integrations/gateway_selector/billing_address_select.html" with context %}
+    <div id="select-bill-addr">
+      <div id="billing-addrs"></div>
     </div>
     <div id="form-bill-addr" style="display: none;">
       {% include "templates/includes/integrations/gateway_selector/billing_address.html" with context %}

From c565c8dbd0b7ff1fd6a28075bd39b491fcfaa56d Mon Sep 17 00:00:00 2001
From: Felipe Orellana <forellana@digithinkit.com>
Date: Wed, 20 Sep 2017 19:56:50 +0000
Subject: [PATCH 2/3] Added prefix missing from address refactoring

---
 .../templates/includes/integrations/gateway_selector/embed.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gateway_selector/templates/includes/integrations/gateway_selector/embed.html b/gateway_selector/templates/includes/integrations/gateway_selector/embed.html
index 727a3f5..425343d 100644
--- a/gateway_selector/templates/includes/integrations/gateway_selector/embed.html
+++ b/gateway_selector/templates/includes/integrations/gateway_selector/embed.html
@@ -21,7 +21,7 @@ <h2>Select Payment Method</h2>
   <h2>Billing Address</h2>
   <div class="row">
     <div id="select-bill-addr">
-      <div id="billing-addrs"></div>
+      <div id="awc-billing-addrs"></div>
     </div>
     <div id="form-bill-addr" style="display: none;">
       {% include "templates/includes/integrations/gateway_selector/billing_address.html" with context %}

From b755c81afd15dbd74c5163d59fde673d92de158a Mon Sep 17 00:00:00 2001
From: Felipe Orellana <forellana@digithinkit.com>
Date: Wed, 20 Sep 2017 20:12:21 +0000
Subject: [PATCH 3/3] Fixes issue where old api was till being called on
 gateway selector backend pages for payment requests. Also removed old address
 fetching code

---
 gateway_selector/public/js/base.js                        | 3 ++-
 .../templates/pages/integrations/gateway_selector.py      | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/gateway_selector/public/js/base.js b/gateway_selector/public/js/base.js
index eb289ff..b1d91cb 100644
--- a/gateway_selector/public/js/base.js
+++ b/gateway_selector/public/js/base.js
@@ -254,7 +254,8 @@ frappe.integration_service.gateway_selector_gateway = Class.extend({
     })
 
     $('#gateway-selector-continue').click(function() {
-	  $('html, body').animate({ scrollTop: $('#awc-forms').offset().top - 60 }, 'slow');
+
+	  $('html, body').animate({ scrollTop: $('#awc-forms, #gateway-selector-forms').first().offset().top - 60 }, 'slow');
       if ( !base._is_enabled ) {
         return;
       }
diff --git a/gateway_selector/templates/pages/integrations/gateway_selector.py b/gateway_selector/templates/pages/integrations/gateway_selector.py
index ed61bb5..24aa36d 100644
--- a/gateway_selector/templates/pages/integrations/gateway_selector.py
+++ b/gateway_selector/templates/pages/integrations/gateway_selector.py
@@ -6,7 +6,6 @@
 from frappe.utils.formatters import format_value
 from awesome_cart.compat.customer import get_current_customer
 from awesome_cart.session import get_awc_session, set_awc_session
-from frappe.integration_broker.doctype.integration_service.integration_service import get_integration_controller
 from gateway_selector.gateway_selector.doctype.gateway_selector_settings.gateway_selector_settings import is_gateway_embedable, build_embed_context
 from gateway_selector import payments
 import json
@@ -27,8 +26,6 @@ def get_context(context):
 	awc_session = get_awc_session()
 	pr_access = awc_session.get("gateway_selector_pr_access")
 
-	print(pretty_json(awc_session))
-
 	# or from pathname, this works better for redirection on auth errors
 	if not proxy_name:
 		path_parts = context.get("pathname", "").split('/')
@@ -76,11 +73,6 @@ def get_context(context):
 		default_country = frappe.get_value("System Settings", "System Settings", "country")
 		default_country_doc = next((x for x in context["billing_countries"] if x.name == default_country), None)
 
-		customer = get_current_customer()
-
-		if customer:
-			context["addresses"] = frappe.get_all("Address", filters={"customer" : customer.name, "disabled" : 0, "address_type" : "Billing"}, fields="*")
-
 		country_idx = context["billing_countries"].index(default_country_doc)
 		context["billing_countries"].pop(country_idx)
 		context["billing_countries"] = [default_country_doc] + context["billing_countries"]