You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2016/07/05 04:24:53 UTC
svn commit: r1751393 - in /ofbiz/trunk:
applications/order/template/entry/cart/ framework/images/webapp/images/
framework/security/config/ specialpurpose/ebay/widget/
specialpurpose/ecommerce/config/ specialpurpose/ecommerce/template/cart/
specialpurpo...
Author: ashish
Date: Tue Jul 5 04:24:53 2016
New Revision: 1751393
URL: http://svn.apache.org/viewvc?rev=1751393&view=rev
Log:
Applied patch from jira issue - OFBIZ-7705 - Remove Google Checkout component from specialpurpose as it was discontinued.
Thanks Ravi for removing the reference of Google Checkout from everywhere.
Modified:
ofbiz/trunk/applications/order/template/entry/cart/MiniCart.ftl
ofbiz/trunk/framework/images/webapp/images/ecommain.css
ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl
ofbiz/trunk/specialpurpose/ecommerce/template/order/StartAnonCheckout.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
Modified: ofbiz/trunk/applications/order/template/entry/cart/MiniCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/MiniCart.ftl?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/MiniCart.ftl (original)
+++ ofbiz/trunk/applications/order/template/entry/cart/MiniCart.ftl Tue Jul 5 04:24:53 2016
@@ -36,7 +36,6 @@ under the License.
<li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckout}</a></li>
<li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckoutQuick}</a></li>
<li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
- <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
</ul>
</#if>
<table>
@@ -83,7 +82,6 @@ under the License.
<li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckout}</a></li>
<li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckoutQuick}</a></li>
<li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
- <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
</ul>
</#if>
<#else>
Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Tue Jul 5 04:24:53 2016
@@ -1040,9 +1040,6 @@ display: inline;
#microcart li#microCartPayPalCheckout img {
width: 135px;
}
-#microcart li#googleCheckoutEnabled img, #microcart li#googleCheckoutDisabled img {
-width: 145px;
-}
/*===================For ProductDetail page.===========================================*/
#productdetail {
width: 670px;
Modified: ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml (original)
+++ ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml Tue Jul 5 04:24:53 2016
@@ -997,13 +997,6 @@
<value xml:lang="zh">场所管理中的浏览操作。</value>
<value xml:lang="zh-TW">場所管理中的檢視操作.</value>
</property>
- <property key="SecurityPermission.description.GOOGLEBASE_VIEW">
- <value xml:lang="en">View operations in the Google Base application.</value>
- <value xml:lang="it">Operazioni di visualizzazione nell'applicazione Google Base.</value>
- <value xml:lang="ja">Googleショッピング業務での表示操作。</value>
- <value xml:lang="zh">Google Base应用程序中的浏览操作。</value>
- <value xml:lang="zh-TW">Google Base應用程式中的檢視操作.</value>
- </property>
<property key="SecurityPermission.description.HUMANRES_CREATE">
<value xml:lang="en">Create operations in the HumanRes Manager.</value>
<value xml:lang="it">Operazioni di creazione nella gestione risorse umane.</value>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Tue Jul 5 04:24:53 2016
@@ -28,7 +28,6 @@ under the License.
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/>
<set field="activeApp" value="ebay" global="true"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.EbayCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.EbayApplication" global="true"/>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Tue Jul 5 04:24:53 2016
@@ -70,7 +70,6 @@ under the License.
<screen name="ProductsExportToEbay">
<section>
<actions>
- <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/>
<set field="headerItem" value="export"/>
<set field="titleProperty" value="PageTitleEbayProductsExportToEbay"/>
<set field="selectResult" from-field="parameters.selectResult"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Tue Jul 5 04:24:53 2016
@@ -540,16 +540,6 @@
<value xml:lang="zh">购物车有</value>
<value xml:lang="zh-TW">購物車有</value>
</property>
- <property key="EcommerceCartToGoogleCheckout">
- <value xml:lang="en">Google Checkout</value>
- <value xml:lang="it">Checkout con Google Checkout</value>
- <value xml:lang="ja">Googleチェックアウト</value>
- <value xml:lang="nl">Google checkout</value>
- <value xml:lang="pt-BR">Finalizar compra com Google Checkout</value>
- <value xml:lang="vi">Google Checkout</value>
- <value xml:lang="zh">Google结账</value>
- <value xml:lang="zh-TW">Google結帳</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/template/cart/MicroCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl Tue Jul 5 04:24:53 2016
@@ -47,8 +47,6 @@ under the License.
<li id="quickCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li>
<li id="onePageCheckoutEnabled"><a href="<@o...@ofbizUrl>">[${uiLabelMap.EcommerceOnePageCheckout}]</a></li>
<li id="onePageCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</li>
- <li id="googleCheckoutEnabled"><a href="<@o...@ofbizUrl>"><img src="https://checkout.google.com/buttons/checkout.gif?merchant_id=634321449957567&w=160&h=43&style=white&variant=text&loc=${initialLocaleComplete}" alt="[${uiLabelMap.EcommerceCartToGoogleCheckout}]" /></a></li>
- <li id="googleCheckoutDisabled" style="display:none" class="disabled"><img src="https://checkout.google.com/buttons/checkout.gif?merchant_id=634321449957567&w=160&h=43&style=white&variant=text&loc=${initialLocaleComplete}" alt="[${uiLabelMap.EcommerceCartToGoogleCheckout}]" /></li>
<#if shoppingCart?has_content && (shoppingCart.getGrandTotal() > 0)>
<li id="microCartPayPalCheckout"><a href="<@o...@ofbizUrl>"><img src="https://www.paypal.com/${initialLocaleComplete}/i/btn/btn_xpressCheckout.gif" alt="[PayPal Express Checkout]" onError="this.onerror=null;this.src='https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif'"/></a></li>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/StartAnonCheckout.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/StartAnonCheckout.ftl?rev=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/StartAnonCheckout.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/StartAnonCheckout.ftl Tue Jul 5 04:24:53 2016
@@ -32,7 +32,6 @@ under the License.
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderCheckout}</a></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderCheckoutQuick}</a></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
</ul>
</div>
</#if>
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=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Jul 5 04:24:53 2016
@@ -1797,44 +1797,7 @@ under the License.
<response name="success" type="request" value="json"/>
<response name="error" type="request" value="json"/>
</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"/>
- <event type="java" path="org.ofbiz.googlecheckout.GoogleCheckoutResponseEvents" invoke="checkNotification"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
- </request-map>
- <!-- This request can be used for server that don't have SSL certificate installed or sandbox instance that handles google response on unsecure port-->
- <request-map uri="unSecureGoogleCheckoutNotification">
- <security auth="false" https="false"/>
- <event type="java" path="org.ofbiz.googlecheckout.GoogleCheckoutResponseEvents" invoke="checkNotification"/>
- <response name="success" type="none"/>
- <response name="error" type="none"/>
- </request-map>
-
- <request-map uri="returnBackFromGoogle">
- <security https="false" auth="false"/>
- <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="clearCart"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="main"/>
- </request-map>
-
<!-- Product Comparison Requests -->
<request-map uri="addToCompare">
<security https="false" auth="false"/>
@@ -2055,10 +2018,6 @@ under the License.
<!-- 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"/>
- <view-map name="redirectToGoogleCheckout" type="screen" page="component://googlecheckout/widget/GoogleCheckoutScreens.xml#redirect"/>
-
<view-map name="compareProducts" type="screen" page="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#compareProducts"/>
<!-- Product in the different UOM -->
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=1751393&r1=1751392&r2=1751393&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Tue Jul 5 04:24:53 2016
@@ -538,8 +538,6 @@ function updateCartData(elementId, formV
jQuery('#quickCheckoutDisabled').show();
jQuery('#onePageCheckoutEnabled').hide();
jQuery('#onePageCheckoutDisabled').show();
- jQuery('#googleCheckoutEnabled').hide();
- jQuery('#googleCheckoutDisabled').show();
jQuery('#microCartPayPalCheckout').hide();
} else {
// Replace whole cart panel with updated cart values for updating line item in case of gift item is added or remove in cart after applying coupon code