You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/04/22 20:32:57 UTC
svn commit: r1740578 - in /ofbiz/trunk/specialpurpose/googlecheckout:
template/ template/redirect/ webapp/googlecheckout/redirect/
webapp/googlecheckout/templates/ widget/GoogleCheckoutScreens.xml
Author: deepak
Date: Fri Apr 22 18:32:56 2016
New Revision: 1740578
URL: http://svn.apache.org/viewvc?rev=1740578&view=rev
Log:
(OFBIZ-6834) relocate .ftl files in the specialpurpose/googlecheckout component.
Thanks Pierre for your contribution.
Added:
ofbiz/trunk/specialpurpose/googlecheckout/template/
- copied from r1740441, ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/templates/
ofbiz/trunk/specialpurpose/googlecheckout/template/redirect/
- copied from r1740441, ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/
Removed:
ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/
ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/templates/
Modified:
ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml
Modified: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml?rev=1740578&r1=1740577&r2=1740578&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml Fri Apr 22 18:32:56 2016
@@ -24,28 +24,28 @@
<screen name="CheckoutShoppingCart">
<section>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/CheckoutShoppingCart.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/CheckoutShoppingCart.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
<screen name="shoppingCart">
<section>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/shoppingCart.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/shoppingCart.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
<screen name="checkoutFlowSupport">
<section>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/checkoutFlowSupport.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
<screen name="orderProcessingSupport">
<section>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/orderProcessingSupport.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/orderProcessingSupport.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -53,7 +53,7 @@
<screen name="items">
<section>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/shoppingCart/items.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/shoppingCart/items.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -63,7 +63,7 @@
<not><if-empty field="googleCart.cartExpiration"/></not>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/shoppingCart/expiration.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/shoppingCart/expiration.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -73,7 +73,7 @@
<not><if-empty field="googleCart.merchantPrivateData"/></not>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/shoppingCart/privateData.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/shoppingCart/privateData.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -83,7 +83,7 @@
<not><if-empty field="merchantCalculations"/></not>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/merchantCaluclations.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/checkoutFlowSupport/merchantCaluclations.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -93,14 +93,14 @@
<not><if-empty field="shippingMethods"/></not>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/shippingMethods.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/checkoutFlowSupport/shippingMethods.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
<screen name="simpleFlow">
<section>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/simpleFlow.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/checkoutFlowSupport/simpleFlow.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -110,7 +110,7 @@
<not><if-empty field="flowSupport.taxTables"/></not>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/taxTables.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/checkoutFlowSupport/taxTables.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -120,7 +120,7 @@
<not><if-empty field="flowSupport.requestPhone"/></not>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://googlecheckout/webapp/googlecheckout/templates/checkoutFlowSupport/requestPhone.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://googlecheckout/template/checkoutFlowSupport/requestPhone.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -128,7 +128,7 @@
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl"/></html>
+ <html><html-template location="component://googlecheckout/template/redirect/redirectHeader.ftl"/></html>
</platform-specific>
</widgets>
</section>