Merge branch 'develop'

Author: ankush

ecommerce_integrations/amazon/doctype/amazon_sp_api_settings/amazon_repository.py

@@ -13,16 +13,16 @@
 
 
 class AmazonRepository:
-	def __init__(self) -> None:
-		self.amz_settings = frappe.get_doc("Amazon SP API Settings")
+	def __init__(self, amz_setting_name) -> None:
+		self.amz_setting = frappe.get_doc("Amazon SP API Settings", amz_setting_name)
 		self.instance_params = dict(
-			iam_arn=self.amz_settings.iam_arn,
-			client_id=self.amz_settings.client_id,
-			client_secret=self.amz_settings.get_password("client_secret"),
-			refresh_token=self.amz_settings.refresh_token,
-			aws_access_key=self.amz_settings.aws_access_key,
-			aws_secret_key=self.amz_settings.get_password("aws_secret_key"),
-			country_code=self.amz_settings.country,
+			iam_arn=self.amz_setting.iam_arn,
+			client_id=self.amz_setting.client_id,
+			client_secret=self.amz_setting.get_password("client_secret"),
+			refresh_token=self.amz_setting.refresh_token,
+			aws_access_key=self.amz_setting.aws_access_key,
+			aws_secret_key=self.amz_setting.get_password("aws_secret_key"),
+			country_code=self.amz_setting.country,
 		)
 
 	# Helper Methods
@@ -34,7 +34,7 @@ def return_as_list(self, input):
 
 	def call_sp_api_method(self, sp_api_method, **kwargs):
 		errors = {}
-		max_retries = self.amz_settings.max_retry_limit
+		max_retries = self.amz_setting.max_retry_limit
 
 		for x in range(max_retries):
 			try:
@@ -53,8 +53,8 @@ def call_sp_api_method(self, sp_api_method, **kwargs):
 				message=f"{error}: {errors.get(error)}", title=f'Method "{sp_api_method.__name__}" failed'
 			)
 
-		self.amz_settings.enable_sync = 0
-		self.amz_settings.save()
+		self.amz_setting.enable_sync = 0
+		self.amz_setting.save()
 
 		frappe.throw(
 			_("Scheduled sync has been temporarily disabled because maximum retries have been exceeded!")
@@ -70,8 +70,8 @@ def get_account(self, name):
 		if not account_name:
 			new_account = frappe.new_doc("Account")
 			new_account.account_name = "Amazon {0}".format(name)
-			new_account.company = self.amz_settings.company
-			new_account.parent_account = self.amz_settings.market_place_account_group
+			new_account.company = self.amz_setting.company
+			new_account.parent_account = self.amz_setting.market_place_account_group
 			new_account.insert(ignore_permissions=True)
 			account_name = new_account.name
 
@@ -180,9 +180,9 @@ def create_customer(self, order):
 		else:
 			new_customer = frappe.new_doc("Customer")
 			new_customer.customer_name = order_customer_name
-			new_customer.customer_group = self.amz_settings.customer_group
-			new_customer.territory = self.amz_settings.territory
-			new_customer.customer_type = self.amz_settings.customer_type
+			new_customer.customer_group = self.amz_setting.customer_group
+			new_customer.territory = self.amz_setting.territory
+			new_customer.customer_type = self.amz_setting.customer_type
 			new_customer.save()
 
 			new_contact = frappe.new_doc("Contact")
@@ -240,7 +240,7 @@ def get_order_items(self, order_id):
 		)
 
 		final_order_items = []
-		warehouse = self.amz_settings.warehouse
+		warehouse = self.amz_setting.warehouse
 
 		while True:
 
@@ -298,11 +298,11 @@ def create_sales_order(self, order):
 					"delivery_date": delivery_date,
 					"transaction_date": transaction_date,
 					"items": items,
-					"company": self.amz_settings.company,
+					"company": self.amz_setting.company,
 				}
 			)
 
-			taxes_and_charges = self.amz_settings.taxes_charges
+			taxes_and_charges = self.amz_setting.taxes_charges
 
 			if taxes_and_charges:
 				charges_and_fees = self.get_charges_and_fees(order_id)
@@ -373,7 +373,7 @@ def create_item_group(self, amazon_item):
 			if not item_group:
 				new_item_group = frappe.new_doc("Item Group")
 				new_item_group.item_group_name = item_group_name
-				new_item_group.parent_item_group = self.amz_settings.parent_item_group
+				new_item_group.parent_item_group = self.amz_setting.parent_item_group
 				new_item_group.insert()
 				return new_item_group.item_group_name
 
@@ -425,7 +425,7 @@ def create_ecommerce_item(self, item_code, asin, sku):
 
 	def create_item_price(self, amazon_item, item_code):
 		item_price = frappe.new_doc("Item Price")
-		item_price.price_list = self.amz_settings.price_list
+		item_price.price_list = self.amz_setting.price_list
 		item_price.price_list_rate = (
 			amazon_item.get("AttributeSets")[0].get("ListPrice", {}).get("Amount") or 0
 		)
@@ -536,15 +536,15 @@ def get_report_document(self, report_id):
 
 
 # Helper functions
-def validate_amazon_sp_api_credentials(**kargs):
+def validate_amazon_sp_api_credentials(**args):
 	api = sp_api.SPAPI(
-		iam_arn=kargs.get("iam_arn"),
-		client_id=kargs.get("client_id"),
-		client_secret=kargs.get("client_secret"),
-		refresh_token=kargs.get("refresh_token"),
-		aws_access_key=kargs.get("aws_access_key"),
-		aws_secret_key=kargs.get("aws_secret_key"),
-		country_code=kargs.get("country"),
+		iam_arn=args.get("iam_arn"),
+		client_id=args.get("client_id"),
+		client_secret=args.get("client_secret"),
+		refresh_token=args.get("refresh_token"),
+		aws_access_key=args.get("aws_access_key"),
+		aws_secret_key=args.get("aws_secret_key"),
+		country_code=args.get("country"),
 	)
 
 	try:
@@ -559,11 +559,11 @@ def validate_amazon_sp_api_credentials(**kargs):
 		frappe.throw(msg)
 
 
-def get_orders(created_after):
-	amazon_repository = AmazonRepository()
+def get_orders(amz_setting_name, created_after):
+	amazon_repository = AmazonRepository(amz_setting_name)
 	return amazon_repository.get_orders(created_after)
 
 
-def get_products_details():
-	amazon_repository = AmazonRepository()
+def get_products_details(amz_setting_name):
+	amazon_repository = AmazonRepository(amz_setting_name)
 	return amazon_repository.get_products_details()

ecommerce_integrations/amazon/doctype/amazon_sp_api_settings/amazon_sp_api_settings.json

@@ -5,7 +5,7 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "enable_amazon",
+  "is_active",
   "section_break_4",
   "iam_arn",
   "refresh_token",
@@ -40,9 +40,12 @@
  "fields": [
   {
    "default": "0",
-   "fieldname": "enable_amazon",
+   "fieldname": "is_active",
    "fieldtype": "Check",
-   "label": "Enable Amazon"
+   "in_list_view": 1,
+   "in_preview": 1,
+   "in_standard_filter": 1,
+   "label": "Is Active"
   },
   {
    "fieldname": "section_break_4",
@@ -70,7 +73,8 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Client ID",
-   "reqd": 1
+   "reqd": 1,
+   "unique": 1
   },
   {
    "fieldname": "client_secret",
@@ -87,7 +91,8 @@
    "fieldname": "aws_access_key",
    "fieldtype": "Data",
    "label": "AWS Access Key",
-   "reqd": 1
+   "reqd": 1,
+   "unique": 1
   },
   {
    "fieldname": "aws_secret_key",
@@ -231,9 +236,8 @@
    "report_hide": 1
   }
  ],
- "issingle": 1,
  "links": [],
- "modified": "2022-02-07 16:16:17.733273",
+ "modified": "2022-04-19 17:08:28.354861",
  "modified_by": "Administrator",
  "module": "Amazon",
  "name": "Amazon SP API Settings",
@@ -250,7 +254,6 @@
    "write": 1
   }
  ],
- "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],

ecommerce_integrations/amazon/doctype/amazon_sp_api_settings/amazon_sp_api_settings.py

@@ -16,7 +16,7 @@
 
 class AmazonSPAPISettings(Document):
 	def validate(self):
-		if self.enable_amazon == 1:
+		if self.is_active == 1:
 			self.validate_credentials()
 			setup_custom_fields()
 		else:
@@ -42,20 +42,24 @@ def after_save(self):
 
 	@frappe.whitelist()
 	def get_products_details(self):
-		if self.enable_amazon == 1:
-			get_products_details()
+		if self.is_active == 1:
+			get_products_details(amz_setting_name=self.name)
 
 	@frappe.whitelist()
 	def get_order_details(self):
-		if self.enable_amazon == 1:
-			get_orders(created_after=self.after_date)
+		if self.is_active == 1:
+			get_orders(amz_setting_name=self.name, created_after=self.after_date)
 
 
 # Called via a hook in every hour.
 def schedule_get_order_details():
-	amz_settings = frappe.get_doc("Amazon SP API Settings")
-	if amz_settings.enable_amazon and amz_settings.enable_sync:
-		get_orders(created_after=amz_settings.after_date)
+	amz_settings = frappe.get_all(
+		"Amazon SP API Settings", filters={"is_active": 1, "enable_sync": 1}, pluck="name"
+	)
+
+	for amz_setting in amz_settings:
+		after_date = frappe.get_value("Amazon SP API Settings", amz_setting, "after_date")
+		get_orders(amz_setting_name=amz_setting, created_after=after_date)
 
 
 def setup_custom_fields():

ecommerce_integrations/amazon/doctype/amazon_sp_api_settings/test_amazon_sp_api_settings.py

@@ -217,7 +217,7 @@ def get_item_group():
 
 			return item_group_name
 
-		self.enable_amazon = 1
+		self.is_active = 1
 		self.iam_arn = "********************"
 		self.refresh_token = "********************"
 		self.client_id = "********************"
@@ -241,19 +241,19 @@ def get_item_group():
 
 class TestAmazonRepository(AmazonRepository):
 	def __init__(self) -> None:
-		self.amz_settings = TestAmazonSettings()
+		self.amz_setting = TestAmazonSettings()
 		self.instance_params = dict(
-			iam_arn=self.amz_settings.iam_arn,
-			client_id=self.amz_settings.client_id,
-			client_secret=self.amz_settings.client_secret,
-			refresh_token=self.amz_settings.refresh_token,
-			aws_access_key=self.amz_settings.aws_access_key,
-			aws_secret_key=self.amz_settings.aws_secret_key,
-			country_code=self.amz_settings.country,
+			iam_arn=self.amz_setting.iam_arn,
+			client_id=self.amz_setting.client_id,
+			client_secret=self.amz_setting.client_secret,
+			refresh_token=self.amz_setting.refresh_token,
+			aws_access_key=self.amz_setting.aws_access_key,
+			aws_secret_key=self.amz_setting.aws_secret_key,
+			country_code=self.amz_setting.country,
 		)
 
 	def call_sp_api_method(self, sp_api_method, **kwargs):
-		max_retries = self.amz_settings.max_retry_limit
+		max_retries = self.amz_setting.max_retry_limit
 
 		for x in range(max_retries):
 			try:

ecommerce_integrations/patches.txt

@@ -1 +1,2 @@
 ecommerce_integrations.patches.update_shopify_custom_fields
+ecommerce_integrations.patches.copy_amazon_single_doc

ecommerce_integrations/patches/copy_amazon_single_doc.py

@@ -0,0 +1,38 @@
+import frappe
+
+
+def execute():
+	if frappe.db.get_single_value("Amazon SP API Settings", "enable_amazon"):
+		try:
+			amz_settings = frappe.get_doc("Amazon SP API Settings")
+
+			frappe.reload_doc("amazon", "doctype", frappe.scrub("Amazon SP API Settings"))
+
+			new_amz_setting = frappe.new_doc("Amazon SP API Settings")
+			new_amz_setting.is_active = amz_settings.enable_amazon
+			new_amz_setting.iam_arn = amz_settings.iam_arn
+			new_amz_setting.refresh_token = amz_settings.refresh_token
+			new_amz_setting.client_id = amz_settings.client_id
+			new_amz_setting.client_secret = amz_settings.get_password("client_secret")
+			new_amz_setting.aws_access_key = amz_settings.aws_access_key
+			new_amz_setting.aws_secret_key = amz_settings.get_password("aws_secret_key")
+			new_amz_setting.country = amz_settings.country
+			new_amz_setting.company = amz_settings.company
+			new_amz_setting.warehouse = amz_settings.warehouse
+			new_amz_setting.parent_item_group = amz_settings.parent_item_group
+			new_amz_setting.price_list = amz_settings.price_list
+			new_amz_setting.customer_group = amz_settings.customer_group
+			new_amz_setting.territory = amz_settings.territory
+			new_amz_setting.customer_type = amz_settings.customer_type
+			new_amz_setting.market_place_account_group = amz_settings.market_place_account_group
+			new_amz_setting.after_date = amz_settings.after_date
+			new_amz_setting.taxes_charges = amz_settings.taxes_charges
+			new_amz_setting.enable_sync = amz_settings.enable_sync
+			new_amz_setting.max_retry_limit = amz_settings.max_retry_limit
+			new_amz_setting.is_old_data_migrated = amz_settings.is_old_data_migrated
+
+			new_amz_setting.insert()
+		except Exception as e:
+			frappe.log_error(
+				message=e, title=f'Method "{execute.__name__}" failed',
+			)

ecommerce_integrations/unicommerce/constants.py

@@ -29,6 +29,7 @@
 ITEM_LENGTH_FIELD = "unicommerce_item_length"
 ITEM_WIDTH_FIELD = "unicommerce_item_width"
 ITEM_HEIGHT_FIELD = "unicommerce_item_height"
+ITEM_BATCH_GROUP_FIELD = "unicommerce_batch_group_code"
 SHIPPING_PACKAGE_STATUS_FIELD = "unicommerce_shipping_package_status"
 IS_COD_CHECKBOX = "unicommerce_is_cod"
 SHIPPING_METHOD_FIELD = "unicommerce_shipping_method"

ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.py

@@ -22,6 +22,7 @@
 	GRN_STOCK_ENTRY_TYPE,
 	INVOICE_CODE_FIELD,
 	IS_COD_CHECKBOX,
+	ITEM_BATCH_GROUP_FIELD,
 	ITEM_HEIGHT_FIELD,
 	ITEM_LENGTH_FIELD,
 	ITEM_SYNC_CHECKBOX,
@@ -231,6 +232,13 @@ def setup_custom_fields(update=True):
 				insert_after=ITEM_WIDTH_FIELD,
 				print_hide=1,
 			),
+			dict(
+				fieldname=ITEM_BATCH_GROUP_FIELD,
+				label="Batch Group Code",
+				fieldtype="Data",
+				insert_after=ITEM_HEIGHT_FIELD,
+				print_hide=1,
+			),
 		],
 		"Sales Order": [
 			dict(

ecommerce_integrations/unicommerce/product.py

@@ -10,6 +10,7 @@
 from ecommerce_integrations.unicommerce.api_client import JsonDict, UnicommerceAPIClient
 from ecommerce_integrations.unicommerce.constants import (
 	DEFAULT_WEIGHT_UOM,
+	ITEM_BATCH_GROUP_FIELD,
 	ITEM_HEIGHT_FIELD,
 	ITEM_LENGTH_FIELD,
 	ITEM_SYNC_CHECKBOX,
@@ -37,6 +38,7 @@
 	"length": ITEM_LENGTH_FIELD,
 	"width": ITEM_WIDTH_FIELD,
 	"height": ITEM_HEIGHT_FIELD,
+	"batchGroupCode": ITEM_BATCH_GROUP_FIELD,
 }
 
 ERPNEXT_TO_UNI_ITEM_MAPPING = {v: k for k, v in UNI_TO_ERPNEXT_ITEM_MAPPING.items()}