diff --git a/ecommerce/template/order/QuickAdd.ftl b/ecommerce/template/order/QuickAdd.ftl index 32c02f45a..3491d54bf 100644 --- a/ecommerce/template/order/QuickAdd.ftl +++ b/ecommerce/template/order/QuickAdd.ftl @@ -16,51 +16,54 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -
-<#if product??> -
- - ${product.productId} - -
-
-
- -
- <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> - ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/> - <#else> -   - -
-
- <#if totalPrice??> -
${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/>
- <#else> -
- <@ofbizCurrency amount=price.price isoCode=price.currencyUsed/> -
- -
-
- <#-- check to see if introductionDate hasn't passed yet --> - <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> - ${uiLabelMap.ProductNotYetAvailable} - <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)> - ${uiLabelMap.ProductNoLongerAvailable} - <#-- check to see if the product is a virtual product --> - <#elseif "Y" == product.isVirtual?default("N")> - ${uiLabelMap.OrderChooseVariations}... - <#else> - - -
-
-<#else> - + +<#if productCategory?has_content> +

${productCategory.categoryName!}

+
+ +
${uiLabelMap.ProductChooseQuickAddCategory}
+
+<#if productCategory.categoryImageUrl?? || productCategory.longDescription??> +
+ <#if productCategory.categoryImageUrl??> + +${productCategory.longDescription!}
-
\ No newline at end of file + + + +<#if productCategoryMembers?? && 0 < productCategoryMembers?size> +
+
+ + +
+ <#list productCategoryMembers as productCategoryMember> + <#assign product = productCategoryMember.getRelatedOne("Product", true)> +

+ ${setRequestAttribute("optProductId", productCategoryMember.productId)} + ${screens.render(quickaddsummaryScreen)} +

+ +
+ +
+
+<#else> + + + diff --git a/ecommerce/template/order/QuickAddSummary.ftl b/ecommerce/template/order/QuickAddSummary.ftl index 32c02f45a..bf240b3ea 100644 --- a/ecommerce/template/order/QuickAddSummary.ftl +++ b/ecommerce/template/order/QuickAddSummary.ftl @@ -25,17 +25,17 @@ under the License.
-
+ -
+
<#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/> <#else>  
-
+
<#if totalPrice??>
${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/>
<#else> @@ -44,7 +44,7 @@ under the License.
-
+
<#-- check to see if introductionDate hasn't passed yet --> <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> ${uiLabelMap.ProductNotYetAvailable}