Merge pull request #276 from frappe/develop

chore: release
frappe · Oct 31, 2023 · 626d730 · 626d730
2 parents e584872 + ace843f
commit 626d730
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ecommerce_integrations/shopify/connection.py b/ecommerce_integrations/shopify/connection.py
@@ -1,4 +1,5 @@
 import base64
+import functools
 import hashlib
 import hmac
 import json
@@ -21,6 +22,7 @@
 def temp_shopify_session(func):
 	"""Any function that needs to access shopify api needs this decorator. The decorator starts a temp session that's destroyed when function returns."""
 
+	@functools.wraps(func)
 	def wrapper(*args, **kwargs):
 
 		# no auth in testing

diff --git a/ecommerce_integrations/shopify/constants.py b/ecommerce_integrations/shopify/constants.py
@@ -6,7 +6,7 @@
 SETTING_DOCTYPE = "Shopify Setting"
 OLD_SETTINGS_DOCTYPE = "Shopify Settings"
 
-API_VERSION = "2023-07"
+API_VERSION = "2023-04"
 
 WEBHOOK_EVENTS = [
 	"orders/create",

diff --git a/ecommerce_integrations/shopify/page/shopify_import_products/shopify_import_products.js b/ecommerce_integrations/shopify/page/shopify_import_products/shopify_import_products.js
@@ -33,9 +33,7 @@ shopify.ProductImporter = class {
 	}
 
 	async checkSyncStatus() {
-
-		const { message: jobs } = await frappe.db.get_list("RQ Job", {filters: {"status": ("in", ("queued", "started"))}});
-
+		const jobs = await frappe.db.get_list("RQ Job", {filters: {"status": ("in", ("queued", "started"))}});
 		this.syncRunning = jobs.find(job => job.job_name == 'shopify.job.sync.all.products') !== undefined;
 
 		if (this.syncRunning) {

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-ShopifyAPI==8.2.0  # update after resolving pyjwt conflict in frappe
+ShopifyAPI==12.3.0  # update after resolving pyjwt conflict in frappe
 boto3~=1.18.65