diff --git a/ecommerce/template/order/CheckoutOptions.ftl b/ecommerce/template/order/CheckoutOptions.ftl new file mode 100644 index 000000000..f0c52c5fd --- /dev/null +++ b/ecommerce/template/order/CheckoutOptions.ftl @@ -0,0 +1,371 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + + + +<#assign shipping = !shoppingCart.containAllWorkEffortCartItems()> <#-- contains items which need shipping? --> +
+ \ No newline at end of file diff --git a/ecommerce/template/order/CheckoutReview.ftl b/ecommerce/template/order/CheckoutReview.ftl index 12e0fea2a..fef8f8365 100644 --- a/ecommerce/template/order/CheckoutReview.ftl +++ b/ecommerce/template/order/CheckoutReview.ftl @@ -34,7 +34,7 @@ under the License. // --> -${uiLabelMap.OrderDemoFrontNote}.
#if> @@ -43,27 +43,23 @@ under the License. ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}| - - | -
-
+
+
+
<#-- doesn't work with Safari, seems to work with IE, Mozilla
- [${uiLabelMap.OrderSubmitOrder}] -->
- |
- |||