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? --> +
+ + +
+

+ <#if shipping == true> + 1. ${uiLabelMap.OrderWhereShallWeShipIt}? + <#else> + 1) ${uiLabelMap.OrderInformationAboutYou} + +

+
+
+ + +
+
+ ${uiLabelMap.CommonAdd} ${uiLabelMap.PartyAddNewAddress} + <#if (shoppingCart.getTotalQuantity() > 1) && !shoppingCart.containAllWorkEffortCartItems()> <#-- no splitting when only rental items --> + ${uiLabelMap.OrderSplitIntoMultipleShipments} + <#if (shoppingCart.getShipGroupSize() > 1)> +
${uiLabelMap.OrderNOTEMultipleShipmentsExist}.
+ + +
+ <#if shippingContactMechList?has_content> + <#list shippingContactMechList as shippingContactMech> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> +
+ checked="checked"/> + +
+ ${uiLabelMap.CommonUpdate} + <#if shippingContactMech_has_next> + + + +
+
+
+

+ <#if shipping == true> + 2. ${uiLabelMap.OrderHowShallWeShipIt}? + <#else> + 2. ${uiLabelMap.OrderOptions}? + +

+
+ <#if shipping == true> +
+ <#list carrierShipmentMethodList as carrierShipmentMethod> + <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> +
+
+ checked="checked"/> + +
+
+ +
+ <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> + + +
${uiLabelMap.OrderShipAllAtOnce}?
+ + + <#else> + + + + +
${uiLabelMap.OrderSpecialInstructions}
+ + <#if shipping == true> + <#if productStore.showCheckoutGiftOptions! != "N" && giftEnable! != "N"> +
+
${uiLabelMap.OrderIsThisGift}
+
+ checked="checked" name="is_gift" id="is_gift" value="true"> + + checked="checked" name="is_gift" id="is_not_gift" value="false"> + +
+
+
${uiLabelMap.OrderGiftMessage}
+ + <#else> + + + +
${uiLabelMap.PartyEmailAddresses}
+
${uiLabelMap.OrderEmailSentToFollowingAddresses}:
+
+ + <#list emailList as email> + ${email.infoString!}<#if email_has_next>, + + +
+
${uiLabelMap.OrderUpdateEmailAddress} <@ofbizUrl>viewprofile?DONE_PAGE=quickcheckout" class="buttontext">${uiLabelMap.PartyProfile}.
+
+ + + +
+
+ + <#-- Payment Method Selection --> +
+

+ 3. ${uiLabelMap.OrderHowShallYouPay}? +

+
+
${uiLabelMap.CommonAdd}:
+
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> + ${uiLabelMap.AccountingCreditCard} + + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> + ${uiLabelMap.AccountingEFTAccount} + + ${uiLabelMap.AccountingSplitPayment} +
+ + <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??> +
+ checked="checked"/> + +
+ + <#if productStorePaymentMethodTypeIdMap.EXT_COD??> +
+ checked="checked"/> + +
+ + <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??> +
+ checked="checked"/> + +
+ + <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??> +
+ checked="checked"/> + +
+ + + <#-- financial accounts --> + <#list finAccounts as finAccount> +
+ checked="checked"/> + +
+ + + <#if !paymentMethodList?has_content> + <#if (!finAccounts?has_content)> +
${uiLabelMap.AccountingNoPaymentMethods}
+ + <#else> + <#list paymentMethodList as paymentMethod> + <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> + <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> +
+ checked="checked"/> + +
+ ${uiLabelMap.CommonUpdate} + <#if paymentMethod.description?has_content>
(${paymentMethod.description}) +  ${uiLabelMap.OrderCardSecurityCode}  + + <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> + <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> +
+ checked="checked"/> + +
+ ${uiLabelMap.CommonUpdate} + <#if paymentMethod.description?has_content>
(${paymentMethod.description}) + + <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> + <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)> + + <#if giftCard?has_content && giftCard.cardNumber?has_content> + <#assign giftCardNumber = ""> + <#assign pcardNumber = giftCard.cardNumber> + <#if pcardNumber?has_content> + <#assign psize = pcardNumber?length - 4> + <#if 0 < psize> + <#list 0 .. psize-1 as foo> + <#assign giftCardNumber = giftCardNumber + "*"> + + <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]> + <#else> + <#assign giftCardNumber = pcardNumber> + + + + + + [${uiLabelMap.CommonUpdate}] + <#if paymentMethod.description?has_content>
(${paymentMethod.description}) + + + + + + <#-- special billing account functionality to allow use w/ a payment method --> + <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT??> + <#if billingAccountList?has_content> + + + + + ${uiLabelMap.OrderBillUpTo} + + + <#-- end of special billing account functionality --> + + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> +
+ + +
+
+ + +
+ <#if shoppingCart.isPinRequiredForGC(delegator)> +
+ + +
+ +
+ + +
+ +
+
+ <#-- End Payment Method Selection --> +
+
+
+ ${uiLabelMap.OrderBacktoShoppingCart} +
+
+ ${uiLabelMap.OrderContinueToFinalOrderReview} +
+
\ 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.OrderFinalCheckoutReview}

+

${uiLabelMap.OrderFinalCheckoutReview}

<#if !isDemoStore?? && isDemoStore>

${uiLabelMap.OrderDemoFrontNote}.

@@ -43,27 +43,23 @@ under the License. ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} - - - - - -
-   - -
- <#if (requestParameters.checkoutpage)?has_content> - - - <#if (requestAttributes.issuerId)?has_content> - - - -
+
+
+
+ <#if (requestParameters.checkoutpage)?has_content> + + + <#if (requestAttributes.issuerId)?has_content> + + + +
<#-- doesn't work with Safari, seems to work with IE, Mozilla - [${uiLabelMap.OrderSubmitOrder}]  --> -
+ [${uiLabelMap.OrderSubmitOrder}]  --> + + + <#else>

${uiLabelMap.OrderErrorShoppingCartEmpty}.

diff --git a/ecommerce/template/order/OrderItems.ftl b/ecommerce/template/order/OrderItems.ftl index e0bb80481..d8b288866 100644 --- a/ecommerce/template/order/OrderItems.ftl +++ b/ecommerce/template/order/OrderItems.ftl @@ -57,9 +57,9 @@ under the License. ${uiLabelMap.OrderQtyOrdered} - ${uiLabelMap.EcommerceUnitPrice} - ${uiLabelMap.OrderAdjustments} - ${uiLabelMap.CommonSubtotal} + ${uiLabelMap.EcommerceUnitPrice} + ${uiLabelMap.OrderAdjustments} + ${uiLabelMap.CommonSubtotal} <#if "Y" == maySelectItems?default("N") && "PLACING_CUSTOMER" == roleTypeId!> @@ -68,7 +68,7 @@ under the License. ${uiLabelMap.CommonSubtotal} - <@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/> + <@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/> <#if "Y" == maySelectItems?default("N")> @@ -76,7 +76,7 @@ under the License. <#list headerAdjustmentsToShow as orderHeaderAdjustment> ${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)} - <@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/> + <@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/> <#if "Y" == maySelectItems?default("N")> @@ -84,14 +84,14 @@ under the License. ${uiLabelMap.OrderShippingAndHandling} - <@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/> + <@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/> <#if "Y" == maySelectItems?default("N")> ${uiLabelMap.OrderSalesTax} - <@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/> + <@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/> <#if "Y" == maySelectItems?default("N")> @@ -107,7 +107,7 @@ under the License. ${uiLabelMap.OrderGrandTotal} - + <@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/> <#if "Y" == maySelectItems?default("N")> @@ -224,13 +224,13 @@ under the License. ${canceledQty?default(0)?string.number} - + <@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> - + <@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/> - + <#if workEfforts??> <@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem)*rentalQuantity isoCode=currencyUomId/> <#else> @@ -308,7 +308,7 @@ under the License. - + <@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentTotal(orderItem, orderItemAdjustment) isoCode=currencyUomId/> diff --git a/ecommerce/widget/OrderScreens.xml b/ecommerce/widget/OrderScreens.xml index fa8b9e0c8..a34211bbd 100644 --- a/ecommerce/widget/OrderScreens.xml +++ b/ecommerce/widget/OrderScreens.xml @@ -242,7 +242,7 @@ under the License. - +