From f171eb5e29753c624641fe4c8de5088f0ce704d2 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Mon, 5 Jun 2023 10:40:41 +0000 Subject: [PATCH 01/24] chore(release): Bumped to Version 1.17.1 ## [1.17.1](https://github.com/frappe/ecommerce_integrations/compare/v1.17.0...v1.17.1) (2023-06-05) ### Bug Fixes * dont run invoice hooks if unicommerce isn't enabled ([cb5853f](https://github.com/frappe/ecommerce_integrations/commit/cb5853fd49bfc189e288f10fd839170605da54a5)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 3024410..c7bbe49 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.17.0" +__version__ = "1.17.1" From b59a1ed415c1d2f0b4e203a1bbd0b5134fb63cdb Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 5 Jun 2023 16:13:24 +0530 Subject: [PATCH 02/24] chore: ignore if unicommerce is not enabled --- ecommerce_integrations/unicommerce/invoice.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ecommerce_integrations/unicommerce/invoice.py b/ecommerce_integrations/unicommerce/invoice.py index 5d61ce6..8f99a52 100644 --- a/ecommerce_integrations/unicommerce/invoice.py +++ b/ecommerce_integrations/unicommerce/invoice.py @@ -615,6 +615,10 @@ def on_submit(self, method=None): def on_cancel(self, method=None): + settings = frappe.get_cached_doc(SETTINGS_DOCTYPE) + if not settings.is_enabled(): + return + results = frappe.db.get_all( "Pick List Sales Order Details", filters={"sales_invoice": self.name, "docstatus": 1} ) From 394a2e62602ab7e245948026bab825fc3b37e176 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Thu, 22 Jun 2023 12:22:54 +0000 Subject: [PATCH 03/24] chore(release): Bumped to Version 1.17.2 ## [1.17.2](https://github.com/frappe/ecommerce_integrations/compare/v1.17.1...v1.17.2) (2023-06-22) ### Bug Fixes * Correctly filter existing return order ([2fe3d07](https://github.com/frappe/ecommerce_integrations/commit/2fe3d07cd4dd4d2b7eda733910a28b13ba5c50b3)) * ignore picklist validation if not enabled ([1fee343](https://github.com/frappe/ecommerce_integrations/commit/1fee343b2ac5d3e3d5bde9dc548f28ba28e6efa8)) * Use UTC timestamp for filtering recent orders ([6ab22a0](https://github.com/frappe/ecommerce_integrations/commit/6ab22a04a3db197dabece0c1fbbb6eb14b6f57bc)) * Warning about recomputed taxes ([1bb9198](https://github.com/frappe/ecommerce_integrations/commit/1bb9198e92a39df741c1a376ed0556c6c70e5a3d)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index c7bbe49..0daeee7 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.17.1" +__version__ = "1.17.2" From f346383e6ce13fc366563f945c992792e103f6e9 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Thu, 29 Jun 2023 14:48:34 +0000 Subject: [PATCH 04/24] chore(release): Bumped to Version 1.17.3 ## [1.17.3](https://github.com/frappe/ecommerce_integrations/compare/v1.17.2...v1.17.3) (2023-06-29) ### Bug Fixes * delete logs in single query before uninstall ([8b8251a](https://github.com/frappe/ecommerce_integrations/commit/8b8251a5a7b120adfbbe749a6e0e60604424b95c)) ### Performance Improvements * use cached shopify settings ([80ec3a2](https://github.com/frappe/ecommerce_integrations/commit/80ec3a2783285164dc44fc5e9eea5d9938465109)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 0daeee7..6694259 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.17.2" +__version__ = "1.17.3" From 4c4b0772cf4f5c4cd245b305e6e6c68fd938fd7b Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Fri, 7 Jul 2023 07:47:48 +0000 Subject: [PATCH 05/24] chore(release): Bumped to Version 1.17.4 ## [1.17.4](https://github.com/frappe/ecommerce_integrations/compare/v1.17.3...v1.17.4) (2023-07-07) ### Bug Fixes * bump shopify API version ([#254](https://github.com/frappe/ecommerce_integrations/issues/254)) ([d0fb890](https://github.com/frappe/ecommerce_integrations/commit/d0fb890fba4d9d8902e813196d2ea38b133ba404)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 6694259..8120568 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.17.3" +__version__ = "1.17.4" From ee9def8d52b716baed32c7fb8597faa9c958485e Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Wed, 2 Aug 2023 08:41:09 +0000 Subject: [PATCH 06/24] chore(release): Bumped to Version 1.18.0 # [1.18.0](https://github.com/frappe/ecommerce_integrations/compare/v1.17.4...v1.18.0) (2023-08-02) ### Bug Fixes * add filters for `Warehouse` and `Account Group` ([b7b9f4d](https://github.com/frappe/ecommerce_integrations/commit/b7b9f4da3c62e14cb8ba6783f9a215b8b694abe6)) * add validation for `Amazon Fields Map` ([bab7702](https://github.com/frappe/ecommerce_integrations/commit/bab7702a1aaf70f48cf024d70fcf999798e23d4d)) * make `state` title case ([d0b2da0](https://github.com/frappe/ecommerce_integrations/commit/d0b2da00ac7b5ba636548198e0ef317bbf67320a)) * set default field-map onload ([60c936a](https://github.com/frappe/ecommerce_integrations/commit/60c936ab608b324d208a77273b64541b42ca73a8)) * tests ([212127b](https://github.com/frappe/ecommerce_integrations/commit/212127b1346c406b700c6cbc7d0db044570e8cfc)) * **ux:** don't show Sync buttons in local doc ([e525f9e](https://github.com/frappe/ecommerce_integrations/commit/e525f9ec5e9945dab7d5a186918f4c7bab252997)) ### Features * add table `Amazon Fields Map` in `Amazon SP API Settings` ([45d48ac](https://github.com/frappe/ecommerce_integrations/commit/45d48acc45af7ec6df06374d3bacc6bf2bed1252)) * new child doctype `Amazon Fields Map` ([e3d1bf2](https://github.com/frappe/ecommerce_integrations/commit/e3d1bf202aad3b8c726147923aa7cdd3054ff1b8)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 8120568..6cea18d 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.17.4" +__version__ = "1.18.0" From 34cfb56e95f838e7ee4c56cd5322a6971e71f274 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Thu, 3 Aug 2023 09:33:35 +0000 Subject: [PATCH 07/24] chore(release): Bumped to Version 1.18.1 ## [1.18.1](https://github.com/frappe/ecommerce_integrations/compare/v1.18.0...v1.18.1) (2023-08-03) ### Bug Fixes * unable to save `Amazon SP API Settings` ([#262](https://github.com/frappe/ecommerce_integrations/issues/262)) ([ffb7c97](https://github.com/frappe/ecommerce_integrations/commit/ffb7c97ad79d5888b0f9358c212356932b6f2db6)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 6cea18d..4a7bff5 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.18.0" +__version__ = "1.18.1" From b0feb7be0ff79674d2816d18eee736d41e106fad Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Thu, 3 Aug 2023 16:41:59 +0000 Subject: [PATCH 08/24] chore(release): Bumped to Version 1.18.2 ## [1.18.2](https://github.com/frappe/ecommerce_integrations/compare/v1.18.1...v1.18.2) (2023-08-03) ### Bug Fixes * **patch:** `set_default_amazon_item_fields_map` ([#263](https://github.com/frappe/ecommerce_integrations/issues/263)) ([27f777b](https://github.com/frappe/ecommerce_integrations/commit/27f777bb15e0762b4893f6bcbcb4f27ceb9282fd)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 4a7bff5..4bd6f7b 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.18.1" +__version__ = "1.18.2" From 187ffdb65e21abb8b796a786b9f46f4e05724a66 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Mon, 9 Oct 2023 10:34:05 +0530 Subject: [PATCH 09/24] fix: shopify default customer (#270) --- ecommerce_integrations/shopify/order.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ecommerce_integrations/shopify/order.py b/ecommerce_integrations/shopify/order.py index c282b4e..03585fd 100644 --- a/ecommerce_integrations/shopify/order.py +++ b/ecommerce_integrations/shopify/order.py @@ -68,9 +68,10 @@ def create_order(order, setting, company=None): def create_sales_order(shopify_order, setting, company=None): - customer = frappe.db.get_value( - "Customer", {CUSTOMER_ID_FIELD: shopify_order.get("customer", {}).get("id")}, "name", - ) + customer = setting.default_customer + if customer_id := shopify_order.get("customer", {}).get("id"): + customer = frappe.db.get_value("Customer", {CUSTOMER_ID_FIELD: customer_id}, "name") + so = frappe.db.get_value("Sales Order", {ORDER_ID_FIELD: shopify_order.get("id")}, "name") if not so: @@ -100,7 +101,7 @@ def create_sales_order(shopify_order, setting, company=None): "naming_series": setting.sales_order_series or "SO-Shopify-", ORDER_ID_FIELD: str(shopify_order.get("id")), ORDER_NUMBER_FIELD: shopify_order.get("name"), - "customer": customer or setting.default_customer, + "customer": customer, "transaction_date": getdate(shopify_order.get("created_at")) or nowdate(), "delivery_date": getdate(shopify_order.get("created_at")) or nowdate(), "company": setting.company, From 0047478eb34e4c33d300af051268f4ae92c29b34 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Mon, 9 Oct 2023 05:19:03 +0000 Subject: [PATCH 10/24] chore(release): Bumped to Version 1.18.3 ## [1.18.3](https://github.com/frappe/ecommerce_integrations/compare/v1.18.2...v1.18.3) (2023-10-09) ### Bug Fixes * shopify default customer ([#270](https://github.com/frappe/ecommerce_integrations/issues/270)) ([187ffdb](https://github.com/frappe/ecommerce_integrations/commit/187ffdb65e21abb8b796a786b9f46f4e05724a66)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 4bd6f7b..14e8848 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.18.2" +__version__ = "1.18.3" From 3a00eb931334637448fb36379cb0bae88d67d49e Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Tue, 17 Oct 2023 15:40:14 +0000 Subject: [PATCH 11/24] chore(release): Bumped to Version 1.18.4 ## [1.18.4](https://github.com/frappe/ecommerce_integrations/compare/v1.18.3...v1.18.4) (2023-10-17) ### Bug Fixes * prioritize user input in tax description ([83c5299](https://github.com/frappe/ecommerce_integrations/commit/83c52994a2c1720a7b9bce3101dbb003dd7856ce)) * shopify default customer ([#270](https://github.com/frappe/ecommerce_integrations/issues/270)) ([882207f](https://github.com/frappe/ecommerce_integrations/commit/882207f931fedfea0ff43d012c63c2c005b62b3f)) * use RQ job to query active jobs ([f7100d2](https://github.com/frappe/ecommerce_integrations/commit/f7100d2060678e384adadf18881be455fe80c94a)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 14e8848..e2f88ee 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.18.3" +__version__ = "1.18.4" From e58487272fea2082cc64338b7c971441259db543 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Tue, 24 Oct 2023 06:11:46 +0000 Subject: [PATCH 12/24] chore(release): Bumped to Version 1.19.0 # [1.19.0](https://github.com/frappe/ecommerce_integrations/compare/v1.18.4...v1.19.0) (2023-10-24) ### Bug Fixes * avoid duplicate logs for old order sync ([9f90628](https://github.com/frappe/ecommerce_integrations/commit/9f9062885440d00edde522e46fae96d280ae3508)) ### Features * Default sales tax account in shopify ([7c18889](https://github.com/frappe/ecommerce_integrations/commit/7c18889986d54b2bc39d4b47c3f4c8ff43f7b886)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index e2f88ee..d84d79d 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.18.4" +__version__ = "1.19.0" From 5197835bc0f3a07bf76774541429ce594c6bd55a Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Tue, 31 Oct 2023 12:32:01 +0000 Subject: [PATCH 13/24] chore(release): Bumped to Version 1.19.1 ## [1.19.1](https://github.com/frappe/ecommerce_integrations/compare/v1.19.0...v1.19.1) (2023-10-31) ### Bug Fixes * Correctly wrap function ([b1dc35c](https://github.com/frappe/ecommerce_integrations/commit/b1dc35cfd7cfd73e38dcdade7450e8ac05bc277d)) * product sync ([3acebaa](https://github.com/frappe/ecommerce_integrations/commit/3acebaa1254e964d72639774f2c18497840e3602)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index d84d79d..90fa096 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.19.0" +__version__ = "1.19.1" From c62e360bcb6c13db536d075ae22c1a882f29a06e Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Wed, 8 Nov 2023 11:57:11 +0000 Subject: [PATCH 14/24] chore(release): Bumped to Version 1.19.2 ## [1.19.2](https://github.com/frappe/ecommerce_integrations/compare/v1.19.1...v1.19.2) (2023-11-08) ### Bug Fixes * iterate and fetch all locations ([af4c57c](https://github.com/frappe/ecommerce_integrations/commit/af4c57cc61cd21bbdf740e530b2c7ba3fc1b6b32)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 90fa096..d388c7a 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.19.1" +__version__ = "1.19.2" From f9a9dd15e153794d8c94d48c820c99d3c2fd9d59 Mon Sep 17 00:00:00 2001 From: Muhammad Saad <72243425+saadsafda@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:15:04 +0500 Subject: [PATCH 15/24] fix: error when there is no billing address is shopify order (#283) * fix: error when there is no billing address is shopify order * fix: error when there is no billing address is shopify order * chore: unnecessary default --------- Co-authored-by: Ankush Menat --- ecommerce_integrations/shopify/order.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecommerce_integrations/shopify/order.py b/ecommerce_integrations/shopify/order.py index 39cb4d6..74284cd 100644 --- a/ecommerce_integrations/shopify/order.py +++ b/ecommerce_integrations/shopify/order.py @@ -38,9 +38,9 @@ def sync_sales_order(payload, request_id=None): create_shopify_log(status="Invalid", message="Sales order already exists, not synced") return try: - shopify_customer = order.get("customer", {}) - shopify_customer["billing_address"] = order.get("billing_address") - shopify_customer["shipping_address"] = order.get("shipping_address") + shopify_customer = order.get("customer") if order.get("customer") is not None else {} + shopify_customer["billing_address"] = order.get("billing_address", "") + shopify_customer["shipping_address"] = order.get("shipping_address", "") customer_id = shopify_customer.get("id") if customer_id: customer = ShopifyCustomer(customer_id=customer_id) From 02a2e7fa9fdb8c30fb979e6372ba1cdc263baa39 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Mon, 20 Nov 2023 11:15:54 +0000 Subject: [PATCH 16/24] chore(release): Bumped to Version 1.19.3 ## [1.19.3](https://github.com/frappe/ecommerce_integrations/compare/v1.19.2...v1.19.3) (2023-11-20) ### Bug Fixes * error when there is no billing address is shopify order ([#283](https://github.com/frappe/ecommerce_integrations/issues/283)) ([f9a9dd1](https://github.com/frappe/ecommerce_integrations/commit/f9a9dd15e153794d8c94d48c820c99d3c2fd9d59)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index d388c7a..f27cba7 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.19.2" +__version__ = "1.19.3" From c5ab362e810972a7b75b4e65edd11a76b9f992e3 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Wed, 29 Nov 2023 11:56:09 +0530 Subject: [PATCH 17/24] chore: bump `boto3` --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b312446..027e65b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ ShopifyAPI==12.3.0 # update after resolving pyjwt conflict in frappe -boto3~=1.18.65 +boto3~=1.28.10 From 2e06e87264974566e6535a3958e51df1aa2990ae Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Mon, 4 Dec 2023 07:11:53 +0000 Subject: [PATCH 18/24] chore(release): Bumped to Version 1.19.4 ## [1.19.4](https://github.com/frappe/ecommerce_integrations/compare/v1.19.3...v1.19.4) (2023-12-04) ### Bug Fixes * error when there is no billing address is shopify order ([#283](https://github.com/frappe/ecommerce_integrations/issues/283)) ([d1e7354](https://github.com/frappe/ecommerce_integrations/commit/d1e735480e379263e2e4ed6b86e3535093adfb4e)) * Give low priority to SKU ([#287](https://github.com/frappe/ecommerce_integrations/issues/287)) ([042c88a](https://github.com/frappe/ecommerce_integrations/commit/042c88a8837749728d68d5e67bbff26decaf014c)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index f27cba7..ad7ca55 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.19.3" +__version__ = "1.19.4" From 67907707e08a819769aa9d2aad501c3cbbaf9112 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Tue, 5 Dec 2023 13:46:59 +0000 Subject: [PATCH 19/24] chore(release): Bumped to Version 1.19.5 ## [1.19.5](https://github.com/frappe/ecommerce_integrations/compare/v1.19.4...v1.19.5) (2023-12-05) ### Bug Fixes * clear old integration logs automatically ([4452fea](https://github.com/frappe/ecommerce_integrations/commit/4452feae5250ce66c2d0247f6ba850399d1e4944)) * **UX:** Correct URL in shopify webhooks ([71d5a3f](https://github.com/frappe/ecommerce_integrations/commit/71d5a3fc0214bb60bd42c609f6379204109d4f3c)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index ad7ca55..a0d493d 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.19.4" +__version__ = "1.19.5" From 1480e7af3dee9f4bda5cd0d5941d18f3b86db0d7 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Thu, 7 Dec 2023 06:02:35 +0000 Subject: [PATCH 20/24] chore(release): Bumped to Version 1.19.6 ## [1.19.6](https://github.com/frappe/ecommerce_integrations/compare/v1.19.5...v1.19.6) (2023-12-07) ### Bug Fixes * **shopify:** handle multiple instance of same item in delivery ([7d663c1](https://github.com/frappe/ecommerce_integrations/commit/7d663c1a95d49b7d7b433c10152eabdd479fa996)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index a0d493d..bdc444f 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.19.5" +__version__ = "1.19.6" From 8d4176852bd7fb622179caaea62bd4f1606786d1 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 19 Jan 2024 06:18:30 +0530 Subject: [PATCH 21/24] fix: shopify sync issue without customer --- ecommerce_integrations/shopify/order.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ecommerce_integrations/shopify/order.py b/ecommerce_integrations/shopify/order.py index 74284cd..431c431 100644 --- a/ecommerce_integrations/shopify/order.py +++ b/ecommerce_integrations/shopify/order.py @@ -75,8 +75,9 @@ def create_order(order, setting, company=None): def create_sales_order(shopify_order, setting, company=None): customer = setting.default_customer - if customer_id := shopify_order.get("customer", {}).get("id"): - customer = frappe.db.get_value("Customer", {CUSTOMER_ID_FIELD: customer_id}, "name") + if shopify_order.get("customer", {}): + if customer_id := shopify_order.get("customer", {}).get("id"): + customer = frappe.db.get_value("Customer", {CUSTOMER_ID_FIELD: customer_id}, "name") so = frappe.db.get_value("Sales Order", {ORDER_ID_FIELD: shopify_order.get("id")}, "name") From 1ea1f732fc32492808ea8679f3a648ba5ee6b9a7 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 7 Feb 2024 15:23:44 +0530 Subject: [PATCH 22/24] ci: use node 20 for release --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 152f5bd..cfe7b4b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Node.js v14 uses: actions/setup-node@v2 with: - node-version: 18 + node-version: 20 - name: Setup dependencies run: | npm install @semantic-release/git @semantic-release/exec --no-save From c4db7c0df2ebdd071e3762fbee9b71c7b0a9e246 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Wed, 7 Feb 2024 09:54:35 +0000 Subject: [PATCH 23/24] chore(release): Bumped to Version 1.20.0 # [1.20.0](https://github.com/frappe/ecommerce_integrations/compare/v1.19.6...v1.20.0) (2024-02-07) ### Bug Fixes * shopify sync issue without customer ([8d41768](https://github.com/frappe/ecommerce_integrations/commit/8d4176852bd7fb622179caaea62bd4f1606786d1)) * shopify sync issue without customer ([3763ab5](https://github.com/frappe/ecommerce_integrations/commit/3763ab5d113ca29d477f6d12f1672c302958672d)) ### Features * bulk retry failed jobs ([2f9bb71](https://github.com/frappe/ecommerce_integrations/commit/2f9bb7137adfe3d9f41a4773d1897821dffb234a)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index bdc444f..0dcddbc 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.19.6" +__version__ = "1.20.0" From c12600d6521e3466022d57b37001fa3ad58fe525 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Wed, 27 Mar 2024 14:53:13 +0000 Subject: [PATCH 24/24] chore(release): Bumped to Version 1.20.1 ## [1.20.1](https://github.com/frappe/ecommerce_integrations/compare/v1.20.0...v1.20.1) (2024-03-27) ### Bug Fixes * Bump shopify version ([#310](https://github.com/frappe/ecommerce_integrations/issues/310)) ([0eeef5e](https://github.com/frappe/ecommerce_integrations/commit/0eeef5edbb49e506f63efb033de295928818fd87)) --- ecommerce_integrations/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecommerce_integrations/__init__.py b/ecommerce_integrations/__init__.py index 0dcddbc..3e49871 100644 --- a/ecommerce_integrations/__init__.py +++ b/ecommerce_integrations/__init__.py @@ -1 +1 @@ -__version__ = "1.20.0" +__version__ = "1.20.1"