mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 08:24:47 +00:00
fix: enable address without checkout feature
* fix add address form country link field
This commit is contained in:
@@ -64,16 +64,6 @@ frappe.ready(() => {
|
|||||||
fieldtype: 'Data',
|
fieldtype: 'Data',
|
||||||
reqd: 1
|
reqd: 1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: __('Address Type'),
|
|
||||||
fieldname: 'address_type',
|
|
||||||
fieldtype: 'Select',
|
|
||||||
options: [
|
|
||||||
'Billing',
|
|
||||||
'Shipping'
|
|
||||||
],
|
|
||||||
reqd: 1
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: __('Address Line 1'),
|
label: __('Address Line 1'),
|
||||||
fieldname: 'address_line1',
|
fieldname: 'address_line1',
|
||||||
@@ -96,16 +86,37 @@ frappe.ready(() => {
|
|||||||
fieldname: 'state',
|
fieldname: 'state',
|
||||||
fieldtype: 'Data'
|
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'),
|
label: __('Pin Code'),
|
||||||
fieldname: 'pincode',
|
fieldname: 'pincode',
|
||||||
fieldtype: 'Data'
|
fieldtype: 'Data'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: __('Country'),
|
fieldname: "phone",
|
||||||
fieldname: 'country',
|
fieldtype: "Data",
|
||||||
fieldtype: 'Link',
|
label: "Phone"
|
||||||
reqd: 1
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
primary_action_label: __('Save'),
|
primary_action_label: __('Save'),
|
||||||
|
|||||||
@@ -83,12 +83,10 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if cart_settings.enable_checkout %}
|
|
||||||
<div class="cart-addresses mt-5">
|
<div class="cart-addresses mt-5">
|
||||||
{% include "templates/includes/cart/cart_address.html" %}
|
{% include "templates/includes/cart/cart_address.html" %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row mt-5">
|
<div class="row mt-5">
|
||||||
|
|||||||
Reference in New Issue
Block a user