From fbcbb215e021b42092ae1cf692e06f2563f07739 Mon Sep 17 00:00:00 2001 From: Johnathnnault Date: Wed, 24 Apr 2024 18:28:20 -0500 Subject: [PATCH 1/2] Added Orders Upsert Support -Fixed a bug that caused order creation to fail --- .gitignore | 1 + README.md | 2 +- cartridges/int_extend/cartridge/scripts/extend.js | 2 +- .../cartridge/scripts/extendShippingProtectionHelpers.js | 2 ++ cartridges/int_extend_sfra/cartridge/scripts/extend.js | 2 +- .../scripts/helpers/extendShippingProtectionHelpers.js | 2 ++ cartridges/int_extend_sfra/cartridge/scripts/services/rest.js | 4 ++-- package-lock.json | 2 +- package.json | 4 ++-- 9 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6d3f2aac..1751bde0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dw.json node_modules/ cartridges/*/cartridge/static/default/fonts/ +cartridges/app_storefront_base/* diff --git a/README.md b/README.md index b716b2c3..7e85eccb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

## The latest version -The latest version of this cartridge is v2022_08 +The latest version of this cartridge is v2024_04 ## Company Overview diff --git a/cartridges/int_extend/cartridge/scripts/extend.js b/cartridges/int_extend/cartridge/scripts/extend.js index 5f9afeda..3c23abbe 100644 --- a/cartridges/int_extend/cartridge/scripts/extend.js +++ b/cartridges/int_extend/cartridge/scripts/extend.js @@ -229,7 +229,7 @@ function getLineItems(order) { for (var k = 0; k < productLi.quantity.value; k++) { pliObj = {}; pliObj.product = product; - pliObj.lineItemTransactionID = productLi.getUUID(); + pliObj.lineItemTransactionId = productLi.getUUID(); if (productLi.custom.isWarrantable && !productLi.custom.persistentUUID) { pliObj.quantity = productLi.quantity.value; diff --git a/cartridges/int_extend/cartridge/scripts/extendShippingProtectionHelpers.js b/cartridges/int_extend/cartridge/scripts/extendShippingProtectionHelpers.js index 70677275..b7e16275 100644 --- a/cartridges/int_extend/cartridge/scripts/extendShippingProtectionHelpers.js +++ b/cartridges/int_extend/cartridge/scripts/extendShippingProtectionHelpers.js @@ -289,6 +289,8 @@ function createShippingProtectionContractLine(order) { shippingProtectionLineItem.type = 'shipments'; + shippingProtectionLineItem.type = 'shipments'; + var extendShippingQuoteId = extendShippingProtectionLineItem.custom.extendShippingQuoteId; shippingProtectionLineItem.quoteId = extendShippingQuoteId; diff --git a/cartridges/int_extend_sfra/cartridge/scripts/extend.js b/cartridges/int_extend_sfra/cartridge/scripts/extend.js index 4fcfead7..30537977 100644 --- a/cartridges/int_extend_sfra/cartridge/scripts/extend.js +++ b/cartridges/int_extend_sfra/cartridge/scripts/extend.js @@ -227,7 +227,7 @@ function getLineItems(order) { for (var k = 0; k < productLi.quantity.value; k++) { pliObj = {}; pliObj.product = product; - pliObj.lineItemTransactionID = productLi.getUUID(); + pliObj.lineItemTransactionId = productLi.getUUID(); if (productLi.custom.isWarrantable && !productLi.custom.persistentUUID) { pliObj.quantity = productLi.quantity.value; diff --git a/cartridges/int_extend_sfra/cartridge/scripts/helpers/extendShippingProtectionHelpers.js b/cartridges/int_extend_sfra/cartridge/scripts/helpers/extendShippingProtectionHelpers.js index 23968951..49dddf3d 100644 --- a/cartridges/int_extend_sfra/cartridge/scripts/helpers/extendShippingProtectionHelpers.js +++ b/cartridges/int_extend_sfra/cartridge/scripts/helpers/extendShippingProtectionHelpers.js @@ -264,6 +264,8 @@ function createShippingProtectionContractLine(order) { shippingProtectionLineItem.type = 'shipments'; + shippingProtectionLineItem.lineItemTransactionId = 'shipping'; + var extendShippingQuoteId = extendShippingProtectionLineItem.custom.extendShippingQuoteId; shippingProtectionLineItem.quoteId = extendShippingQuoteId; diff --git a/cartridges/int_extend_sfra/cartridge/scripts/services/rest.js b/cartridges/int_extend_sfra/cartridge/scripts/services/rest.js index 31fd6b7a..5f9299e0 100644 --- a/cartridges/int_extend_sfra/cartridge/scripts/services/rest.js +++ b/cartridges/int_extend_sfra/cartridge/scripts/services/rest.js @@ -26,7 +26,7 @@ function createServiceCall(configObj) { var orderApiMethod = (extendAPIMethod === 'ordersAPIonOrderCreate') || (extendAPIMethod === 'ordersAPIonSchedule'); if (orderApiMethod) { - API_VERSION = '2022-02-01'; + API_VERSION = 'latest'; } else { // used '2021-04-01' API version in case of contracts API API_VERSION = '2021-04-01'; @@ -133,7 +133,7 @@ function createRequestConfiguration(endpoint, requestObject) { case 'orders': configObj.endpoint = 'orders'; - configObj.method = 'POST'; + configObj.method = 'PUT'; configObj.extendMethod = 'orders'; configObj.XIdempotencyKey = UUIDUtils.createUUID(); configObj.mock = mocks.ordersResponseMock; diff --git a/package-lock.json b/package-lock.json index 708a6311..5f4aba42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "int_extend_sfra", - "version": "19.2.0", + "version": "23.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 88efdab3..4a0dce27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "int_extend_sfra", - "version": "22.1.0", + "version": "23.0.0", "description": "Extend SFRA cartridge", "devDependencies": { "@babel/core": "^7.6.3", @@ -39,6 +39,6 @@ "compile:scss": "sgmf-scripts --compile css" }, "paths": { - "base": "../helloextend/cartridges/app_storefront_base/" + "base": "./cartridges/app_storefront_base/" } } From 5170f2319ca7e90d6ee1f609a015c04ef2397fed Mon Sep 17 00:00:00 2001 From: Johnathnnault Date: Mon, 20 May 2024 09:08:56 -0500 Subject: [PATCH 2/2] Updated metadata xml filenames --- metadata/{catalog.xml => extend-catalog.xml} | 0 metadata/{jobs.xml => extend-jobs.xml} | 0 metadata/{services.xml => extend-services.xml} | 0 ...e-definitions.xml => extend-custom-objecttype-definitions.xml} | 0 ...ype-extensions.xml => sextend-ystem-objecttype-extensions.xml} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename metadata/{catalog.xml => extend-catalog.xml} (100%) rename metadata/{jobs.xml => extend-jobs.xml} (100%) rename metadata/{services.xml => extend-services.xml} (100%) rename metadata/meta/{custom-objecttype-definitions.xml => extend-custom-objecttype-definitions.xml} (100%) rename metadata/meta/{system-objecttype-extensions.xml => sextend-ystem-objecttype-extensions.xml} (100%) diff --git a/metadata/catalog.xml b/metadata/extend-catalog.xml similarity index 100% rename from metadata/catalog.xml rename to metadata/extend-catalog.xml diff --git a/metadata/jobs.xml b/metadata/extend-jobs.xml similarity index 100% rename from metadata/jobs.xml rename to metadata/extend-jobs.xml diff --git a/metadata/services.xml b/metadata/extend-services.xml similarity index 100% rename from metadata/services.xml rename to metadata/extend-services.xml diff --git a/metadata/meta/custom-objecttype-definitions.xml b/metadata/meta/extend-custom-objecttype-definitions.xml similarity index 100% rename from metadata/meta/custom-objecttype-definitions.xml rename to metadata/meta/extend-custom-objecttype-definitions.xml diff --git a/metadata/meta/system-objecttype-extensions.xml b/metadata/meta/sextend-ystem-objecttype-extensions.xml similarity index 100% rename from metadata/meta/system-objecttype-extensions.xml rename to metadata/meta/sextend-ystem-objecttype-extensions.xml