From af10f659d9eb574ada5ba3b2e52436beb282f32a Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Wed, 11 Dec 2019 17:43:04 +0530
Subject: [PATCH] fix: enable address without checkout feature * fix add
 address form country link field

---
 .../templates/includes/cart/cart_address.html | 39 ++++++++++++-------
 erpnext/templates/pages/cart.html             |  2 -
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index fe53f34dba5..f7f35483208 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -64,16 +64,6 @@ frappe.ready(() => {
 					fieldtype: 'Data',
 					reqd: 1
 				},
-				{
-					label: __('Address Type'),
-					fieldname: 'address_type',
-					fieldtype: 'Select',
-					options: [
-						'Billing',
-						'Shipping'
-					],
-					reqd: 1
-				},
 				{
 					label: __('Address Line 1'),
 					fieldname: 'address_line1',
@@ -96,16 +86,37 @@ frappe.ready(() => {
 					fieldname: 'state',
 					fieldtype: 'Data'
 				},
+				{
+					label: __('Country'),
+					fieldname: 'country',
+					fieldtype: 'Link',
+					options: 'Country',
+					reqd: 1
+				},
+				{
+					fieldname: "column_break0",
+					fieldtype: "Column Break",
+					width: "50%"
+				},
+				{
+					label: __('Address Type'),
+					fieldname: 'address_type',
+					fieldtype: 'Select',
+					options: [
+						'Billing',
+						'Shipping'
+					],
+					reqd: 1
+				},
 				{
 					label: __('Pin Code'),
 					fieldname: 'pincode',
 					fieldtype: 'Data'
 				},
 				{
-					label: __('Country'),
-					fieldname: 'country',
-					fieldtype: 'Link',
-					reqd: 1
+					fieldname: "phone",
+					fieldtype: "Data",
+					label: "Phone"
 				},
 			],
 			primary_action_label: __('Save'),
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index b301fc0665a..912702e386d 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -83,12 +83,10 @@
 		</div>
 	{% endif %}
 
-	{% if cart_settings.enable_checkout %}
 	<div class="cart-addresses mt-5">
 	{% include "templates/includes/cart/cart_address.html" %}
 	</div>
 	{% endif %}
-	{% endif %}
 </div>
 
 <div class="row mt-5">