svn commit: r780501 - in /ofbiz/trunk/specialpurpose/go
Locked
 
|
Author: ashish
Date: Sun May 31 20:16:04 2009 New Revision: 780501 URL: http://svn.apache.org/viewvc?rev=780501&view=rev Log: Following things are included in this commit. 1) Added the UI's for the configuration entities introduced in previous commit. This will help to avoid the restarting of server. (Previously values were maintained in the property files) 2) Renamed those two configuration entities to more closely follow the GoogleCheckout naming pattern. The idea behind renaming of entity is that in future we can have other feature coming from Google so at that time GoogleConfiguration entity will be bit confusing.IMO this entities are introduced before few days(1 or 2 days) and I am sure no one is using these entities in Production so we will be safe by this change in the initial phase of google checkout. Thanks to myself :) Added: ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml (with props) ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml (with props) ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/ ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp (with props) ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml (with props) ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml (with props) ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml (with props) Modified: ofbiz/trunk/specialpurpose/googlecheckout/data/DemoGoogleCheckoutData.xml ofbiz/trunk/specialpurpose/googlecheckout/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml Added: ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml?rev=780501&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml (added) +++ ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml Sun May 31 20:16:04 2009 @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <property key="GoogleCheckoutAddGoogleCheckoutConfiguration"> + <value xml:lang="en">Add Google Checkout Configuration</value> + </property> + <property key="GoogleCheckoutAddGoogleCheckoutShippingMethod"> + <value xml:lang="en">Add Google Checkout Shipping Method</value> + </property> + <property key="GoogleCheckoutApplication"> + <value xml:lang="en">Google Checkout Application</value> + </property> + <property key="GoogleCheckoutCompanyName"> + <value xml:lang="en">OFBiz: Google Checkout</value> + </property> + <property key="GoogleCheckoutGoogleCheckoutConfiguration"> + <value xml:lang="en">Google Checkout Configuration</value> + </property> + <property key="GoogleCheckoutShippingMethods"> + <value xml:lang="en">Shipping Methods Configuration</value> + </property> +</resource> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/googlecheckout/data/DemoGoogleCheckoutData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/data/DemoGoogleCheckoutData.xml?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/data/DemoGoogleCheckoutData.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/data/DemoGoogleCheckoutData.xml Sun May 31 20:16:04 2009 @@ -21,9 +21,9 @@ <entity-engine-xml> <WebSite webSiteId="GOOGLECHECKOUT" productStoreId="9000" /> - <GoogleShippingMethods methodTypeEnumId="GOOGLE_FLAT_RATE" shipmentMethodName="Express" productStoreId="9000" amount="20.00" carrierPartyId="UPS" shipmentMethodTypeId="AIR"/> - <GoogleShippingMethods methodTypeEnumId="GOOGLE_FLAT_RATE" shipmentMethodName="Standard" productStoreId="9000" amount="10.00" carrierPartyId="UPS" shipmentMethodTypeId="GROUND"/> - <GoogleShippingMethods methodTypeEnumId="GOOGLE_FLAT_RATE" shipmentMethodName="Free" productStoreId="9000" amount="0.00" carrierPartyId="USPS" shipmentMethodTypeId="STANDARD"/> + <GoogleCheckoutShippingMethod methodTypeEnumId="GOOGLE_FLAT_RATE" shipmentMethodName="Express" productStoreId="9000" amount="20.00" carrierPartyId="UPS" shipmentMethodTypeId="AIR"/> + <GoogleCheckoutShippingMethod methodTypeEnumId="GOOGLE_FLAT_RATE" shipmentMethodName="Standard" productStoreId="9000" amount="10.00" carrierPartyId="UPS" shipmentMethodTypeId="GROUND"/> + <GoogleCheckoutShippingMethod methodTypeEnumId="GOOGLE_FLAT_RATE" shipmentMethodName="Free" productStoreId="9000" amount="0.00" carrierPartyId="USPS" shipmentMethodTypeId="STANDARD"/> - <GoogleConfiguration productStoreId="9000" merchantId="634321449957567" merchantKey="DAnyTJLnPzhhK_CuCaQOCg" envEnumId="GOOGLE_SANDBOX" webSiteId="WebStore" prodCatalogId="DemoCatalog" currencyUomId="USD" requestAuthDetails="Y" requestPhone="Y" sendPromoItems="N" errorOnBadItem="Y" acceptCoupons="N" acceptGiftCerts="N"/> + <GoogleCheckoutConfiguration productStoreId="9000" merchantId="634321449957567" merchantKey="DAnyTJLnPzhhK_CuCaQOCg" envEnumId="GOOGLE_SANDBOX" webSiteId="WebStore" prodCatalogId="DemoCatalog" currencyUomId="USD" requestAuthDetails="Y" requestPhone="Y" sendPromoItems="N" errorOnBadItem="Y" acceptCoupons="N" acceptGiftCerts="N"/> </entity-engine-xml> \ No newline at end of file Added: ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml?rev=780501&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml (added) +++ ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml Sun May 31 20:16:04 2009 @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<entity-engine-xml> + <!-- Google Checkout security --> + <SecurityPermission description="View operations in the Google Checkout Management Screens." permissionId="GCHECKOUT_VIEW"/> + <SecurityPermission description="Create operations in the Google Checkout Management Screens." permissionId="GCHECKOUT_CREATE"/> + <SecurityPermission description="Update operations in the Google Checkout Management Screens." permissionId="GCHECKOUT_UPDATE"/> + <SecurityPermission description="Delete operations in the Google Checkout Management Screens." permissionId="GCHECKOUT_DELETE"/> + <SecurityPermission description="ALL operations in the Google Checkout Management Screens." permissionId="GCHECKOUT_ADMIN"/> + <SecurityGroupPermission groupId="FULLADMIN" permissionId="GCHECKOUT_ADMIN"/> + <SecurityGroupPermission groupId="FLEXADMIN" permissionId="GCHECKOUT_CREATE"/> + <SecurityGroupPermission groupId="FLEXADMIN" permissionId="GCHECKOUT_DELETE"/> + <SecurityGroupPermission groupId="FLEXADMIN" permissionId="GCHECKOUT_UPDATE"/> + <SecurityGroupPermission groupId="FLEXADMIN" permissionId="GCHECKOUT_VIEW"/> + <SecurityGroupPermission groupId="VIEWADMIN" permissionId="GCHECKOUT_VIEW"/> + <SecurityGroupPermission groupId="BIZADMIN" permissionId="GCHECKOUT_ADMIN"/> +</entity-engine-xml> Propchange: ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/googlecheckout/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/entitydef/entitymodel.xml?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/entitydef/entitymodel.xml Sun May 31 20:16:04 2009 @@ -41,7 +41,7 @@ <!-- org.ofbiz.googlecheckout.config --> <!-- ========================================================= --> - <entity entity-name="GoogleConfiguration" + <entity entity-name="GoogleCheckoutConfiguration" package-name="org.ofbiz.googlecheckout.config" title="Google Checkout Configuration"> <field name="productStoreId" type="id-ne"></field> @@ -79,7 +79,7 @@ <!-- org.ofbiz.googlecheckout.shipping --> <!-- ========================================================= --> - <entity entity-name="GoogleShippingMethods" + <entity entity-name="GoogleCheckoutShippingMethod" package-name="org.ofbiz.googlecheckout.shipping" title="Google Shipping Method Config"> <field name="shipmentMethodName" type="id-ne"></field> Modified: ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/ofbiz-component.xml Sun May 31 20:16:04 2009 @@ -28,6 +28,7 @@ <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutTypeData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleCheckoutData.xml"/> <service-resource type="model" loader="main" location="servicedef/services_request.xml"/> @@ -35,11 +36,11 @@ <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> <webapp name="googlecheckout" - title="GoogleCheckout" + title="Google Checkout" + menu-name="secondary" server="default-server" location="webapp/googlecheckout" - base-permission="OFBTOOLS,GOOGLECHECKOUT" - mount-point="/googlecheckout" - app-bar-display="false"/> + base-permission="OFBTOOLS,GCHECKOUT" + mount-point="/googlecheckout"/> </ofbiz-component> Modified: ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/servicedef/services.xml Sun May 31 20:16:04 2009 @@ -20,7 +20,7 @@ <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> - + <!-- Start Old Implementation to send data in XML format --> <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.WebShoppingCart" mode="IN" optional="false"/> @@ -41,4 +41,37 @@ location="component://googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml"> <attribute name="conn" mode="OUT" type="java.net.HttpURLConnection" optional="false"/> </service> + <!-- End Old Implementation to send data in XML format --> + + <!-- Start configuration services --> + <service name="createGoogleCheckoutConfiguration" default-entity-name="GoogleCheckoutConfiguration" engine="entity-auto" invoke="create" auth="true"> + <description>Create a GoogleCheckoutConfiguration</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="updateGoogleCheckoutConfiguration" default-entity-name="GoogleCheckoutConfiguration" engine="entity-auto" invoke="update" auth="true"> + <description>Update a GoogleCheckoutConfiguration</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="deleteGoogleCheckoutConfiguration" default-entity-name="GoogleCheckoutConfiguration" engine="entity-auto" invoke="delete" auth="true"> + <description>Delete a GoogleCheckoutConfiguration</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + </service> + + <service name="createGoogleCheckoutShippingMethod" default-entity-name="GoogleCheckoutShippingMethod" engine="entity-auto" invoke="create" auth="true"> + <description>Create a GoogleCheckoutShippingMethod</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="updateGoogleCheckoutShippingMethod" default-entity-name="GoogleCheckoutShippingMethod" engine="entity-auto" invoke="update" auth="true"> + <description>Update a GoogleCheckoutShippingMethod</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + <service name="deleteGoogleCheckoutShippingMethod" default-entity-name="GoogleCheckoutShippingMethod" engine="entity-auto" invoke="delete" auth="true"> + <description>Delete a GoogleCheckoutShippingMethod</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + </service> + <!-- End configuration services --> </services> Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Sun May 31 20:16:04 2009 @@ -335,7 +335,7 @@ String shippingName = shipping.getShippingName(); GenericValue googleShipping = null; try { - googleShipping = delegator.findOne("GoogleShippingMethods", UtilMisc.toMap("shipmentMethodName", shippingName, + googleShipping = delegator.findOne("GoogleCheckoutShippingMethod", UtilMisc.toMap("shipmentMethodName", shippingName, "productStoreId", cart.getProductStoreId()), false); } catch (GenericEntityException e) { Debug.logError(e, module); Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Sun May 31 20:16:04 2009 @@ -120,7 +120,7 @@ // setup shipping options support List<GenericValue> shippingOptions = null; try { - shippingOptions = delegator.findByAnd("GoogleShippingMethods", UtilMisc.toMap("productStoreId", productStoreId)); + shippingOptions = delegator.findByAnd("GoogleCheckoutShippingMethod", UtilMisc.toMap("productStoreId", productStoreId)); } catch (GenericEntityException e) { Debug.logError(e, module); } @@ -513,7 +513,7 @@ if (productStoreId == null) return null; GenericValue config = null; try { - config = delegator.findOne("GoogleConfiguration", true, "productStoreId", productStoreId); + config = delegator.findOne("GoogleCheckoutConfiguration", true, "productStoreId", productStoreId); } catch (GenericEntityException e) { Debug.logError(e, module); } Modified: ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/controller.xml?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/controller.xml Sun May 31 20:16:04 2009 @@ -20,25 +20,82 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> - + <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> <description>Google Checkout Component Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> - <errorpage>/error/error.jsp</errorpage> - <handler name="java" type="request" class="org.ofbiz.webapp.event.JavaEventHandler"/> <request-map uri="main"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> </request-map> - <request-map uri="handleMessage" track-serverhit="false" track-visit="false"> <security https="false" auth="false"/> <event type="java" path="org.ofbiz.googlecheckout.GoogleCheckoutResponseEvents" invoke="checkNotification"/> <response name="success" type="none"/> <response name="error" type="none"/> </request-map> + + <!-- Start Configuration requests --> + <request-map uri="GoogleCheckoutConfigurations"> + <security https="true" auth="true"/> + <response name="success" type="view" value="GoogleCheckoutConfigurations"/> + </request-map> + <request-map uri="createGoogleCheckoutConfiguration"> + <security https="true" auth="true"/> + <event type="service" invoke="createGoogleCheckoutConfiguration"/> + <response name="success" type="view" value="GoogleCheckoutConfigurations"/> + <response name="error" type="view" value="GoogleCheckoutConfigurations"/> + </request-map> + <request-map uri="updateGoogleCheckoutConfiguration"> + <security https="true" auth="true"/> + <event type="service" invoke="updateGoogleCheckoutConfiguration"/> + <response name="success" type="view" value="GoogleCheckoutConfigurations"/> + <response name="error" type="view" value="GoogleCheckoutConfigurations"/> + </request-map> + <request-map uri="deleteGoogleCheckoutConfiguration"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteGoogleCheckoutConfiguration"/> + <response name="success" type="view" value="GoogleCheckoutConfigurations"/> + <response name="error" type="view" value="GoogleCheckoutConfigurations"/> + </request-map> + <request-map uri="GoogleCheckoutShippingMethods"> + <security https="true" auth="true"/> + <response name="success" type="view" value="GoogleCheckoutShippingMethods"/> + </request-map> + <request-map uri="createGoogleCheckoutShippingMethod"> + <security https="true" auth="true"/> + <event type="service" invoke="createGoogleCheckoutShippingMethod"/> + <response name="success" type="view" value="GoogleCheckoutShippingMethods"/> + <response name="error" type="view" value="GoogleCheckoutShippingMethods"/> + </request-map> + <request-map uri="updateGoogleCheckoutShippingMethod"> + <security https="true" auth="true"/> + <event type="service" invoke="updateGoogleCheckoutShippingMethod"/> + <response name="success" type="view" value="GoogleCheckoutShippingMethods"/> + <response name="error" type="view" value="GoogleCheckoutShippingMethods"/> + </request-map> + <request-map uri="deleteGoogleCheckoutShippingMethod"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteGoogleCheckoutShippingMethod"/> + <response name="success" type="view" value="GoogleCheckoutShippingMethods"/> + <response name="error" type="view" value="GoogleCheckoutShippingMethods"/> + </request-map> + <!-- End Configuration requests --> + + <!-- Lookup request --> + <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map> + <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="main" type="screen" page="component://workeffort/widget/CommonScreens.xml#main"/> + <view-map name="main" type="screen" page="component://googlecheckout/widget/GoogleCheckoutScreens.xml#GoogleCheckoutConfigurations"/> + + <!-- Start Configuration view mappings --> + <view-map name="GoogleCheckoutConfigurations" type="screen" page="component://googlecheckout/widget/GoogleCheckoutScreens.xml#GoogleCheckoutConfigurations"/> + <view-map name="GoogleCheckoutShippingMethods" type="screen" page="component://googlecheckout/widget/GoogleCheckoutScreens.xml#GoogleCheckoutShippingMethods"/> + <!-- End Configuration view mappings --> + + <!-- Lookup view mappings --> + <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> + </site-conf> Modified: ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml Sun May 31 20:16:04 2009 @@ -38,6 +38,21 @@ <param-value>googlecheckout</param-value> <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description> </context-param> + <context-param> + <param-name>mainDecoratorLocation</param-name> + <param-value>component://googlecheckout/widget/CommonScreens.xml</param-value> + <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> + </context-param> + <context-param> + <param-name>widgetVerbose</param-name> + <param-value>false</param-value> + <description>Enable widget boundary comments. See org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled().</description> + </context-param> + <context-param> + <param-name>compressHTML</param-name> + <param-value>false</param-value> + <description>Remove unnecessary whitespace from HTML output.</description> + </context-param> <filter> <filter-name>ContextFilter</filter-name> Added: ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp?rev=780501&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp (added) +++ ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp Sun May 31 20:16:04 2009 @@ -0,0 +1,52 @@ +<%-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--%> +<%@ page import="org.ofbiz.base.util.*" %> +<html> +<head> +<title>Open For Business Message</title> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +</head> + +<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %> + +<body bgcolor="#FFFFFF"> +<div align="center"> + <br/> + <table width="100%" border="1" height="200"> + <tr> + <td> + <table width="100%" border="0" height="200"> + <tr bgcolor="#CC6666"> + <td height="45"> + <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div> + </td> + </tr> + <tr> + <td> + <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div> + </td> + </tr> + </table> + </td> + </tr> + </table> +</div> +<div align="center"></div> +</body> +</html> Propchange: ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/error/error.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml?rev=780501&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml (added) +++ ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml Sun May 31 20:16:04 2009 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="main-decorator"> + <section> + <actions> + <property-map resource="GoogleCheckoutUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <set field="activeApp" value="googlecheckout" global="true"/> + + <set field="layoutSettings.companyName" from-field="uiLabelMap.GoogleCheckoutCompanyName" global="true"/> + <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.GoogleCheckoutApplication" global="true"/> + <set field="applicationMenuName" value="GoogleCheckoutAppBar" global="true"/> + <set field="applicationMenuLocation" value="component://googlecheckout/widget/GoogleCheckoutMenus.xml" global="true"/> + <set field="applicationTitle" value="${uiLabelMap.GoogleCheckoutApplication}" global="true"/> + </actions> + <widgets> + <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/CommonScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml?rev=780501&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml (added) +++ ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml Sun May 31 20:16:04 2009 @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="ListGoogleCheckoutConfigurations" type="list" list-name="googleCheckoutConfigurations" target="updateGoogleCheckoutConfiguration" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="GoogleCheckoutConfiguration"> + <order-by field-name="productStoreId"/> + </entity-condition> + </actions> + <auto-fields-service service-name="updateGoogleCheckoutConfiguration"/> + <field name="productStoreId"><display/></field> + <field name="envEnumId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_ENV_TYPE"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="webSiteId"> + <drop-down allow-empty="true"> + <entity-options description="${siteName}" entity-name="WebSite"> + <entity-order-by field-name="siteName"/> + </entity-options> + </drop-down> + </field> + <field name="prodCatalogId"> + <drop-down allow-empty="true"> + <entity-options description="${catalogName}" entity-name="ProdCatalog"> + <entity-order-by field-name="catalogName"/> + </entity-options> + </drop-down> + </field> + <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}"> + <drop-down allow-empty="true"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> + <field name="deleteGoogleCheckoutConfiguration" title="" widget-style="buttontext"> + <hyperlink target="deleteGoogleCheckoutConfiguration" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="productStoreId"/> + </hyperlink> + </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + </form> + + <form name="AddGoogleCheckoutConfiguration" type="single" target="createGoogleCheckoutConfiguration" title=""> + <auto-fields-service service-name="createGoogleCheckoutConfiguration"/> + <field name="productStoreId"> + <drop-down allow-empty="false"> + <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> + <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]"> + <entity-order-by field-name="storeName"/> + </entity-options> + </drop-down> + </field> + <field name="envEnumId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_ENV_TYPE"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="webSiteId"> + <drop-down allow-empty="true"> + <entity-options description="${siteName}" entity-name="WebSite"> + <entity-order-by field-name="siteName"/> + </entity-options> + </drop-down> + </field> + <field name="prodCatalogId"> + <drop-down allow-empty="true"> + <entity-options description="${catalogName}" entity-name="ProdCatalog"> + <entity-order-by field-name="catalogName"/> + </entity-options> + </drop-down> + </field> + <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}"> + <drop-down allow-empty="true"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> + </form> + + <form name="ListGoogleCheckoutShippingMethods" type="list" list-name="googleCheckoutShippingMethods" target="updateGoogleCheckoutShippingMethod" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="GoogleCheckoutShippingMethod"> + <order-by field-name="shipmentMethodName"/> + <order-by field-name="productStoreId"/> + </entity-condition> + </actions> + <auto-fields-service service-name="updateGoogleCheckoutShippingMethod"/> + <field name="productStoreId"><display/></field> + <field name="shipmentMethodName"><display/></field> + <field name="methodTypeEnumId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_SHIP_TYPE"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="shipmentMethodTypeId"> + <drop-down current="selected" allow-empty="false"> + <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/> + </drop-down> + </field> + <field name="deleteGoogleCheckoutShippingMethod" title="" widget-style="buttontext"> + <hyperlink target="deleteGoogleCheckoutShippingMethod" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="shipmentMethodName"/> + <parameter param-name="productStoreId"/> + </hyperlink> + </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + </form> + + <form name="AddGoogleCheckoutShippingMethod" type="single" target="createGoogleCheckoutShippingMethod" title=""> + <auto-fields-service service-name="createGoogleCheckoutShippingMethod"/> + <field name="methodTypeEnumId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> + <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_SHIP_TYPE"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="productStoreId"> + <drop-down allow-empty="false"> + <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> + <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]"> + <entity-order-by field-name="storeName"/> + </entity-options> + </drop-down> + </field> + <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="shipmentMethodTypeId"> + <drop-down current="selected" allow-empty="false"> + <entity-options entity-name="ShipmentMethodType" description="${description}"/> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> + </form> +</forms> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml?rev=780501&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml (added) +++ ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml Sun May 31 20:16:04 2009 @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> + <menu name="GoogleCheckoutAppBar" title="${uiLabelMap.GoogleCheckoutApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="GoogleCheckoutConfigurations" title="${uiLabelMap.GoogleCheckoutGoogleCheckoutConfiguration}"><link target="GoogleCheckoutConfigurations"/></menu-item> + <menu-item name="GoogleCheckoutShippingMethods" title="${uiLabelMap.GoogleCheckoutShippingMethods}"><link target="GoogleCheckoutShippingMethods"/></menu-item> + </menu> +</menus> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutMenus.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml?rev=780501&r1=780500&r2=780501&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutScreens.xml Sun May 31 20:16:04 2009 @@ -133,4 +133,48 @@ </widgets> </section> </screen> + + <!-- Google Checkout configuration screens --> + + <screen name="GoogleCheckoutConfigurations"> + <section> + <actions> + <set field="titleProperty" value="GoogleCheckoutGoogleCheckoutConfiguration"/> + <set field="headerItem" value="GoogleCheckoutConfigurations"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListGoogleCheckoutConfigurations" location="component://googlecheckout/widget/GoogleCheckoutForms.xml"/> + <screenlet id="add-gc-configuration" title="${uiLabelMap.GoogleCheckoutAddGoogleCheckoutConfiguration}" collapsible="true"> + <include-form name="AddGoogleCheckoutConfiguration" location="component://googlecheckout/widget/GoogleCheckoutForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="GoogleCheckoutShippingMethods"> + <section> + <actions> + <set field="titleProperty" value="GoogleCheckoutGoogleCheckoutConfiguration"/> + <set field="headerItem" value="GoogleCheckoutShippingMethods"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <set field="shipmentMethodName" from-field="parameters.shipmentMethodName"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="ListGoogleCheckoutShippingMethods" location="component://googlecheckout/widget/GoogleCheckoutForms.xml"/> + <screenlet id="add-gc-shipping-method" title="${uiLabelMap.GoogleCheckoutAddGoogleCheckoutShippingMethod}" collapsible="true"> + <include-form name="AddGoogleCheckoutShippingMethod" location="component://googlecheckout/widget/GoogleCheckoutForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |