svn commit: r779910 - in /ofbiz/trunk: applications/order/webapp/orde
Locked
svn commit: r779910 - in /ofbiz/trunk: applications/order/webapp/orde
 
|
Author: ashish
Date: Fri May 29 10:02:35 2009 New Revision: 779910 URL: http://svn.apache.org/viewvc?rev=779910&view=rev Log: For now we are enabling link to checkout using Google Checkout. For using this feature you may need to create Merchant Account in the Google Checkout area. We can disable this links if anyone think otherwise but the idea of keeping these links on ecommerce is that the End User knows that this feature also exists in OFBiz and could use it accordingly. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=779910&r1=779909&r2=779910&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Fri May 29 10:02:35 2009 @@ -34,6 +34,7 @@ <div><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewCart}</a> <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></div> <div style="margin-top: 4px;"><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckoutQuick}</a></div> <div style="margin-top: 4px;"><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceOnePageCheckout}</a></div> + <div style="margin-top: 4px;"><a href="<@ofbizUrl>cartToGoogleCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></div> </#if> <table width="100%" cellpadding="0" cellspacing="2"> <tr> @@ -71,6 +72,7 @@ <div><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewCart}</a> <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></div> <div style="margin-top: 4px;"><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckoutQuick}</a></div> <div style="margin-top: 4px;"><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceOnePageCheckout}</a></div> + <div style="margin-top: 4px;"><a href="<@ofbizUrl>cartToGoogleCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></div> </#if> <#else> <p>${uiLabelMap.OrderShoppingCartEmpty}</p> Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=779910&r1=779909&r2=779910&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Fri May 29 10:02:35 2009 @@ -383,6 +383,9 @@ <value xml:lang="th">à¸à¸£à¸°à¸à¸£à¹à¸²à¸¡à¸µ</value> <value xml:lang="zh">è´ç©è½¦æ</value> </property> + <property key="EcommerceCartToGoogleCheckout"> + <value xml:lang="en">Google Checkout</value> + </property> <property key="EcommerceCartTotal"> <value xml:lang="cs">KoÅ¡Ãk celkem</value> <value xml:lang="da">Indkøbskurv total</value> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=779910&r1=779909&r2=779910&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri May 29 10:02:35 2009 @@ -1785,7 +1785,12 @@ <response name="success" type="none"/> <response name="error" type="none"/> </request-map> - + + <request-map uri="cartToGoogleCheckout"> + <security auth="false" https="false"/> + <event type="service" invoke="transmitRequest"/> + <response type="view" name="success" value="cartToGoogleCheckout"/> + </request-map> <!-- End of Request Mappings --> <!-- View Mappings --> @@ -1920,5 +1925,7 @@ <!-- One Page Checkout --> <view-map name="OnePageCheckout" type="screen" page="component://ecommerce/widget/OrderScreens.xml#OnePageCheckout"/> + <!-- Google Checkout View Mapping --> + <view-map name="cartToGoogleCheckout" type="screen" page="component://googlecheckout/widget/GoogleCheckoutScreens.xml#redirect"/> <!-- End of View Mappings --> </site-conf> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl?rev=779910&r1=779909&r2=779910&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl Fri May 29 10:02:35 2009 @@ -43,6 +43,8 @@ <span id="quickCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</span> <span id="onePageCheckoutEnabled"><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>">[${uiLabelMap.EcommerceOnePageCheckout}]</a></span> <span id="onePageCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</span> + <span id="googleCheckoutEnabled"><a href="<@ofbizUrl>cartToGoogleCheckout</@ofbizUrl>">[${uiLabelMap.EcommerceCartToGoogleCheckout}]</a></span> + <span id="googleCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.EcommerceCartToGoogleCheckout}]</span> <#else> <span class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</span> <span class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</span> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=779910&r1=779909&r2=779910&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Fri May 29 10:02:35 2009 @@ -474,6 +474,8 @@ $('quickCheckoutDisabled').show(); $('onePageCheckoutEnabled').hide(); $('onePageCheckoutDisabled').show(); + $('googleCheckoutEnabled').hide(); + $('googleCheckoutDisabled').show(); } else { // Used for edit cart $('microCartQuantity').update(data.totalQuantity); Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=779910&r1=779909&r2=779910&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Fri May 29 10:02:35 2009 @@ -97,6 +97,9 @@ <form method="post" action="<@ofbizUrl>anonOnePageCheckout</@ofbizUrl>" style="margin: 0;"> <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceOnePageCheckout}"/></div> </form> + <form method="post" action="<@ofbizUrl>cartToGoogleCheckout</@ofbizUrl>" style="margin: 0;"> + <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCartToGoogleCheckout}"/></div> + </form> </div> </div> </#if> Modified: ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml?rev=779910&r1=779909&r2=779910&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml Fri May 29 10:02:35 2009 @@ -21,23 +21,23 @@ <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> - <service name="ConvertOfbizCartToGoogle" engine="simple" invoke="ConvertOfbizCartToGoogle" + <service name="ConvertOfbizCartToGoogle" engine="simple" invoke="ConvertOfbizCartToGoogle" auth="false" location="component://googlecheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml"> - <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> + <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.WebShoppingCart" mode="IN" optional="false"/> <attribute name="googleCart" mode="OUT" type="Map" optional="false"/> <attribute name="flowSupport" mode="OUT" type="Map" optional="false"/> <attribute name="sendInitialAuthDetails" mode="OUT" type="Boolean" optional="false"/> </service> - <service name="createXMLOutput" engine="simple" invoke="createXMLOutput" + <service name="createXMLOutput" engine="simple" invoke="createXMLOutput" auth="false" location="component://googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml"> - <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> + <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.WebShoppingCart" mode="IN" optional="false"/> </service> - <service name="transmitRequest" engine="simple" invoke="transmitRequest" + <service name="transmitRequest" engine="simple" invoke="transmitRequest" auth="false" location="component://googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml"> <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> <attribute name="redirect" mode="OUT" type="String" optional="false"/> </service> - <service name="connectToGoogleCheckoutServer" engine="simple" invoke="connectToGoogleCheckoutServer" + <service name="connectToGoogleCheckoutServer" engine="simple" invoke="connectToGoogleCheckoutServer" auth="false" location="component://googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml"> <attribute name="conn" mode="OUT" type="java.net.HttpURLConnection" optional="false"/> </service> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |