Thanks Hans Regards Scott
On 3/07/2009, at 3:29 PM, Hans Bakker wrote:
I stand corrected: we did not see that and will use that option. Regards, Hans On Fri, 2009-07-03 at 15:25 +1200, Scott Gray wrote:Hi Hans Just wondering if you saw the email that I sent yesterday. Thanks Scott On 2/07/2009, at 9:44 PM, Scott Gray wrote:Hi Hans How is this different from the ProductStore.showCheckoutGiftOptions field? And if it does have a different meaning why isn't it being put on the ProductStore entity? Thanks Scott On 2/07/2009, at 9:25 PM, [email protected] wrote:Author: hansbak Date: Thu Jul 2 09:25:14 2009 New Revision: 790517 URL: http://svn.apache.org/viewvc?rev=790517&view=rev Log: introduce a 'gift enable' with default = Y in the order.properties file and pos, ecommerce and ordermgr itself use it Modified: ofbiz/trunk/applications/order/config/order.properties ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/ showcartitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/ checkoutoptions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/ optionsettings.ftl ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryCartScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryOrderScreens.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/ showcart.ftl ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml Modified: ofbiz/trunk/applications/order/config/order.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/order.properties?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = = = = ===================================================================--- ofbiz/trunk/applications/order/config/order.properties (original)+++ ofbiz/trunk/applications/order/config/order.properties Thu Jul 2 09:25:14 2009 @@ -18,4 +18,7 @@ ############################################################################### # Days Till Cancel Replacement Order -daysTillCancelReplacementOrder=30 \ No newline at end of file +daysTillCancelReplacementOrder=30 + +# Gift setting +#orderPreference.giftEnable=NModified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/ cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/ showcartitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/ showcartitems.ftl Thu Jul 2 09:25:14 2009 @@ -39,7 +39,7 @@ <td colspan="2"> <div> <b>${uiLabelMap.ProductProduct}</b> - <#if showOrderGiftWrap?default("true") == "true"> + <#if giftEnable != "N"> <select name="GWALL" onchange="javascript:gwAll(this);"> <option value="">$ {uiLabelMap.OrderGiftWrapAllItems}</option> <option value="NO^">$ {uiLabelMap.OrderNoGiftWrap}</option> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/ checkoutoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/ checkoutoptions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/ checkoutoptions.ftl Thu Jul 2 09:25:14 2009 @@ -234,7 +234,7 @@ </td> </tr> <#if shipping == true> - <#if productStore.showCheckoutGiftOptions? if_exists != "N"> + <#if productStore.showCheckoutGiftOptions? if_exists != "N" && giftEnable != "N"> <tr><td colspan="2"><hr/></td></tr> <tr> <td colspan="2"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/ optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/ optionsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/ optionsettings.ftl Thu Jul 2 09:25:14 2009 @@ -127,6 +127,7 @@ <textarea cols="30" rows="3" name="$ {shipGroupIndex?default("0")}_shipping_instructions">$ {cart.getShippingInstructions(shipGroupIndex)?if_exists}</textarea> </td> </tr> + <#if giftEnable != "N"> <tr> <td colspan="2"> <#if cart.getOrderType() = "PURCHASE_ORDER"> @@ -153,6 +154,7 @@ </td> </tr> </#if> + </#if> <tr> <td colspan="2"></td> </tr> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryCartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryCartScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryCartScreens.xml Thu Jul 2 09:25:14 2009 @@ -65,6 +65,7 @@ <actions> <set field="titleProperty" value="PageTitleOrderShowCart"/> <set field="productsummaryScreen" value="component://order/widget/ordermgr/ OrderEntryCatalogScreens.xml#productsummary"/>+ <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> <set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/ OrderEntryCartScreens.xml#promoUseDetailsInline"/> <script location="component://order/webapp/ordermgr/ WEB-INF/actions/entry/ShowCart.groovy"/> <script location="component://order/webapp/ordermgr/ WEB-INF/actions/entry/ShowPromoText.groovy"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryOrderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ OrderEntryOrderScreens.xml Thu Jul 2 09:25:14 2009 @@ -53,6 +53,7 @@ <script location="component://order/webapp/ordermgr/ WEB-INF/actions/entry/CheckoutPayment.groovy"/> <script location="component://order/webapp/ordermgr/ WEB-INF/actions/entry/CheckoutOptions.groovy"/> <script location="component://order/webapp/ordermgr/ WEB-INF/actions/entry/StorePaymentOptions.groovy"/> + <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> </actions> <widgets> <decorator-screen name="main-decorator" location="$ {parameters.mainDecoratorLocation}"> @@ -143,6 +144,7 @@ <set field="stepTitleId" value="OrderOrderOptionSettings"/> <set field="stepLabelId" value="CommonOptions"/> <script location="component://order/webapp/ordermgr/ WEB-INF/actions/entry/OptionSettings.groovy"/> + <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> </actions> <widgets><decorator-screen name="CommonOrderCheckoutDecorator">Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/ cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/ showcart.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/ showcart.ftl Thu Jul 2 09:25:14 2009 @@ -163,7 +163,7 @@ <tr> <th></th> <th scope="row">${uiLabelMap.OrderProduct}</th> - <#if asslGiftWraps?has_content && showOrderGiftWrap? default("true") == "true"> + <#if asslGiftWraps?has_content && giftEnable != "Y"> <th scope="row"> <select class="selectBox" name="GWALL" onchange="javascript:gwAll(this);"> <option value="">$ {uiLabelMap.EcommerceGiftWrapAllItems}</option>Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ CartScreens.xmlURL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml Thu Jul 2 09:25:14 2009 @@ -69,6 +69,7 @@ <set field="titleProperty" value="PageTitleShoppingCart"/> <set field="headerItem" value="Shopping Cart"/> + <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> <script location="component://ecommerce/webapp/ ecommerce/WEB-INF/actions/cart/ShowCart.groovy"/> <script location="component://ecommerce/webapp/ ecommerce/WEB-INF/actions/cart/ShowPromoText.groovy"/> </actions>Modified: ofbiz/trunk/specialpurpose/webpos/widget/ WebPosScreens.xmlURL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml?rev=790517&r1=790516&r2=790517&view=diff = = = = = = = = == = ===================================================================--- ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml Thu Jul 2 09:25:14 2009 @@ -130,7 +130,7 @@ <property-map resource="AccountingUiLabels" map- name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map- name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map- name="uiLabelMap" global="true"/> - + <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> <set field="titleProperty" value="PageTitleShoppingCart"/> <set field="headerItem" value="Shopping Cart"/> <script location="component://webpos/webapp/webpos/ WEB-INF/actions/cart/ShowCart.groovy"/>-- Antwebsystems.com: Quality OFBiz services for competitive rates
smime.p7s
Description: S/MIME cryptographic signature
