Re: svn commit: r780321 - in /ofbiz/trunk: applications/order/webapp/orde
Locked
Re: svn commit: r780321 - in /ofbiz/trunk: applications/order/webapp/orde
 
|
this really bothers me.
the do no harm comes to mind I do all my testing off line then submit a patch i believe the commiters should stop using the trunk for a test bed. [hidden email] sent the following on 5/30/2009 1:53 PM: > Author: ashish > Date: Sat May 30 20:53:04 2009 > New Revision: 780321 > > URL: http://svn.apache.org/viewvc?rev=780321&view=rev > Log: > Enabling the new java based implementation by default. > Reason of enabling this new implementation is that we should get bugs in extensive testing and code will become more stable. > > Modified: > ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl > 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/login.ftl > > 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=780321&r1=780320&r2=780321&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original) > +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Sat May 30 20:53:04 2009 > @@ -33,7 +33,7 @@ > <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewCart}</a> <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></li> > <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckoutQuick}</a></li> > <li><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceOnePageCheckout}</a></li> > - <li><a href="<@ofbizUrl>cartToGoogleCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li> > + <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li> > </ul> > </#if> > <table> > @@ -79,7 +79,7 @@ > <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewCart}</a> <a href="<@ofbizUrl>checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckout}</a></li> > <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCheckoutQuick}</a></li> > <li><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceOnePageCheckout}</a></li> > - <li><a href="<@ofbizUrl>cartToGoogleCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li> > + <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li> > </ul> > </#if> > <#else> > > 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=780321&r1=780320&r2=780321&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) > +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat May 30 20:53:04 2009 > @@ -1787,12 +1787,20 @@ > <response name="error" type="none"/> > </request-map> > > + <!-- Old request that calls the services written in Minilang --> > <request-map uri="cartToGoogleCheckout"> > <security auth="false" https="false"/> > <event type="service" invoke="transmitRequest"/> > <response type="view" name="success" value="cartToGoogleCheckout"/> > </request-map> > > + <!-- New request that prepare data in the Java code --> > + <request-map uri="googleCheckout"> > + <security auth="false" https="false" /> > + <event type="service" invoke="sendGoogleCheckoutRequest" /> > + <response type="view" name="success" value="redirectToGoogleCheckout" /> > + </request-map> > + > <!-- This will be used in production instance to provide secure communication --> > <request-map uri="secureGoogleCheckoutNotification"> > <security auth="false" https="true"/> > @@ -1946,5 +1954,6 @@ > <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"/> > + <view-map name="redirectToGoogleCheckout" 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=780321&r1=780320&r2=780321&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl (original) > +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/microcart.ftl Sat May 30 20:53:04 2009 > @@ -43,7 +43,7 @@ > <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="googleCheckoutEnabled"><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>">[${uiLabelMap.EcommerceCartToGoogleCheckout}]</a></span> > <span id="googleCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.EcommerceCartToGoogleCheckout}]</span> > <#else> > <span class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</span> > > Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=780321&r1=780320&r2=780321&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original) > +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Sat May 30 20:53:04 2009 > @@ -97,7 +97,7 @@ > <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;"> > + <form method="post" action="<@ofbizUrl>googleCheckout</@ofbizUrl>" style="margin: 0;"> > <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCartToGoogleCheckout}"/></div> > </form> > </div> > > > -- BJ Freeman http://www.businessesnetwork.com/automation http://bjfreeman.elance.com http://www.linkedin.com/profile?viewProfile=&key=1237480&locale=en_US&trk=tab_pro Systems Integrator. |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |