Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: cleaner conditions and returns

Browse Source
This commit is contained in:
Shivam Mishra 2020-05-19 11:53:28 +05:30 committed by GitHub
parent 4cd4109905
commit d3d3836943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/erpnext_integrations/connectors/woocommerce_connection.py
View File

@ -75,14 +75,12 @@ def link_customer_and_address(raw_billing_data, raw_shipping_data, customer_name
frappe.rename_doc("Customer", old_name, customer_name) frappe.rename_doc("Customer", old_name, customer_name)
billing_address = frappe.get_doc("Address", {"woocommerce_email": customer_woo_com_email, "address_type": "Billing"}) billing_address = frappe.get_doc("Address", {"woocommerce_email": customer_woo_com_email, "address_type": "Billing"})
shipping_address = frappe.get_doc("Address", {"woocommerce_email": customer_woo_com_email, "address_type": "Shipping"}) shipping_address = frappe.get_doc("Address", {"woocommerce_email": customer_woo_com_email, "address_type": "Shipping"})
else:
billing_address = create_address(raw_billing_data, customer, "Billing")
shipping_address = create_address(raw_shipping_data, customer, "Shipping")
contact = create_contact(raw_billing_data, customer)
if customer_exists:
rename_address(billing_address, customer) rename_address(billing_address, customer)
rename_address(shipping_address, customer) rename_address(shipping_address, customer)
else:
create_address(raw_billing_data, customer, "Billing")
create_address(raw_shipping_data, customer, "Shipping")
create_contact(raw_billing_data, customer)
def create_contact(data, customer): def create_contact(data, customer):
email = data.get("email", None) email = data.get("email", None)
@ -111,8 +109,6 @@ def create_contact(data, customer):
contact.flags.ignore_mandatory = True contact.flags.ignore_mandatory = True
contact.save() contact.save()
return contact
def create_address(raw_data, customer, address_type): def create_address(raw_data, customer, address_type):
address = frappe.new_doc("Address") address = frappe.new_doc("Address")
@ -134,8 +130,6 @@ def create_address(raw_data, customer, address_type):
address.flags.ignore_mandatory = True address.flags.ignore_mandatory = True
address.save() address.save()
return address
def rename_address(address, customer): def rename_address(address, customer):
old_address_title = address.name old_address_title = address.name
new_address_title = customer.name + "-" + address.address_type new_address_title = customer.name + "-" + address.address_type