From 95dc7cfc1d6b1c46b9ad94437f35056cada98839 Mon Sep 17 00:00:00 2001 From: Eduardo Diniz Date: Tue, 28 Jan 2025 13:15:08 -0300 Subject: [PATCH] LPD-47555 Fix some bugs on marketplace --- .../src/pages/GetApp/GetAppOutlet.tsx | 2 ++ .../liferay-marketplace-custom-element/src/types.d.ts | 2 +- .../ddm-templates/marketplace-display-date/ddm-template.ftl | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/pages/GetApp/GetAppOutlet.tsx b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/pages/GetApp/GetAppOutlet.tsx index 5bb354a59350ce..6df9eeb13151e6 100644 --- a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/pages/GetApp/GetAppOutlet.tsx +++ b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/pages/GetApp/GetAppOutlet.tsx @@ -214,6 +214,8 @@ const GetAppOutlet = () => { const orderType = getProductOrderTypes(productSpecificationValues); + delete billingAddress.saveAddress; + try { const cart = buildNewCart({ billingAddress, diff --git a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/types.d.ts b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/types.d.ts index 29052927cccf24..62fce92fe53251 100644 --- a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/types.d.ts +++ b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/types.d.ts @@ -181,7 +181,7 @@ type BillingAddress = { name?: string; phoneNumber?: string; regionISOCode?: string; - saveAddress: boolean; + saveAddress?: boolean; street1?: string; street2?: string; zip?: string; diff --git a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-site-initializer/site-initializer/ddm-templates/marketplace-display-date/ddm-template.ftl b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-site-initializer/site-initializer/ddm-templates/marketplace-display-date/ddm-template.ftl index cc9e22e5235d3d..f6b3e799018de5 100644 --- a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-site-initializer/site-initializer/ddm-templates/marketplace-display-date/ddm-template.ftl +++ b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-site-initializer/site-initializer/ddm-templates/marketplace-display-date/ddm-template.ftl @@ -1,5 +1,5 @@ <#setting date_format="MMMMM d, yyyy"> <#if (CPDefinition_displayDate.getData())??> - ${CPDefinition_displayDate.getData()?datetime("MM/dd/yy HH:mm")?date} + ${CPDefinition_displayDate.getData()?datetime("M/d/yy, h:mm a")?string("MM/dd/yy HH:mm")} \ No newline at end of file