Author: ashish
Date: Wed Sep 16 14:04:31 2009
New Revision: 815789
URL: http://svn.apache.org/viewvc?rev=815789&view=rev
Log:
Here comes the GUI support for eBay Shipping Methods (CRUD operation for
EbayShippingMethod entity).
Modified:
ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=815789&r1=815788&r2=815789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Wed Sep 16 14:04:31
2009
@@ -19,6 +19,9 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <property key="EbayAddEbayShippingMethod">
+ <value xml:lang="en">Add Ebay Shipping Method</value>
+ </property>
<property key="EbayApplication">
<value xml:lang="en">Ebay Integration</value>
<value xml:lang="fr">Intégration Ebay</value>
@@ -65,6 +68,9 @@
<value
xml:lang="th">à¸à¹à¸à¸«à¸²à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸¢à¸±à¸à¸à¸²à¸£à¸à¸³à¹à¸à¹à¸²à¸ªà¸´à¸à¸à¹à¸²à¸à¸²à¸à¸à¸µà¹à¸à¸¢à¹</value>
<value xml:lang="zh">æç´¢ä»eBay导å
¥ç订å</value>
</property>
+ <property key="EbayShippingMethodConfigurations">
+ <value xml:lang="en">Shipping Method Configurations</value>
+ </property>
<property key="EbayViewPermissionError">
<value xml:lang="en">You do not have permission to view this page.
("EBAY_VIEW" needed)</value>
<value xml:lang="fr">Vous n'avez pas la permission de voir cette page.
(Il faut l'autorisation "EBAY_VIEW")</value>
Modified: ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml?rev=815789&r1=815788&r2=815789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/entitydef/entitymodel.xml Wed Sep 16
14:04:31 2009
@@ -63,8 +63,8 @@
</entity>
<entity entity-name="EbayShippingMethod"
- package-name="org.ofbiz.googlecheckout.shipping"
- title="Google Shipping Method Config">
+ package-name="org.ofbiz.ebay.shipping"
+ title="Ebay Shipping Method Config">
<field name="shipmentMethodName" type="id-long-ne"></field>
<field name="productStoreId" type="id-ne"></field>
<field name="amount" type="currency-amount"></field>
Modified: ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml?rev=815789&r1=815788&r2=815789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/servicedef/services.xml Wed Sep 16 14:04:31
2009
@@ -138,4 +138,19 @@
<attribute name="orderItemList" type="List" mode="IN" optional="true"/>
</service>
+ <service name="createEbayShippingMethod"
default-entity-name="EbayShippingMethod" engine="entity-auto" invoke="create"
auth="true">
+ <description>Create a EbayShippingMethod</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateEbayShippingMethod"
default-entity-name="EbayShippingMethod" engine="entity-auto" invoke="update"
auth="true">
+ <description>Update a EbayShippingMethod</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteEbayShippingMethod"
default-entity-name="EbayShippingMethod" engine="entity-auto" invoke="delete"
auth="true">
+ <description>Delete a EbayShippingMethod</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
</services>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml?rev=815789&r1=815788&r2=815789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Wed Sep
16 14:04:31 2009
@@ -69,6 +69,29 @@
<response name="failure" type="view" value="ManageOrdersFromEbay"/>
</request-map>
+ <request-map uri="EbayShippingMethods">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EbayShippingMethods"/>
+ </request-map>
+ <request-map uri="createEbayShippingMethod">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createEbayShippingMethod"/>
+ <response name="success" type="view" value="EbayShippingMethods"/>
+ <response name="error" type="view" value="EbayShippingMethods"/>
+ </request-map>
+ <request-map uri="updateEbayShippingMethod">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateEbayShippingMethod"/>
+ <response name="success" type="view" value="EbayShippingMethods"/>
+ <response name="error" type="view" value="EbayShippingMethods"/>
+ </request-map>
+ <request-map uri="deleteEbayShippingMethod">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteEbayShippingMethod"/>
+ <response name="success" type="view" value="EbayShippingMethods"/>
+ <response name="error" type="view" value="EbayShippingMethods"/>
+ </request-map>
+
<!-- New Import Order entries -->
<request-map uri="eBayOrders">
<security https="true" auth="true"/>
@@ -99,5 +122,7 @@
<view-map name="ProductsExportToEbay" type="screen"
page="component://ebay/widget/EbayScreens.xml#ProductsExportToEbay"/>
<view-map name="ManageOrdersFromEbay" type="screen"
page="component://ebay/widget/EbayScreens.xml#ManageOrdersFromEbay"/>
<view-map name="EbayOrders" type="screen"
page="component://ebay/widget/EbayScreens.xml#EbayOrders"/>
+
+ <view-map name="EbayShippingMethods" type="screen"
page="component://ebay/widget/EbayScreens.xml#EbayShippingMethods"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=815789&r1=815788&r2=815789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Wed Sep 16 14:04:31
2009
@@ -101,4 +101,66 @@
<field name="thruDate"
title="${uiLabelMap.CommonThruDateTime}"><date-time default-value="${groovy:
org.ofbiz.base.util.UtilDateTime.getDayEnd(nowTimestamp)}"/></field>
<field name="submitButton"
title="${uiLabelMap.EbayImportOrdersFromEbay}"><submit
button-type="button"/></field>
</form>
+
+ <form name="ListEbayShippingMethods" type="list"
list-name="eBayShippingMethods" target="updateEbayShippingMethod"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="EbayShippingMethod">
+ <order-by field-name="shipmentMethodName"/>
+ <order-by field-name="productStoreId"/>
+ </entity-condition>
+ </actions>
+ <auto-fields-service service-name="updateEbayShippingMethod"/>
+ <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="EBAY_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="deleteEbayShippingMethod" title=""
widget-style="buttontext">
+ <hyperlink target="deleteEbayShippingMethod"
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="AddEbayShippingMethod" type="single"
target="createEbayShippingMethod" title="">
+ <auto-fields-service service-name="createEbayShippingMethod"/>
+ <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="EBAY_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
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml?rev=815789&r1=815788&r2=815789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Wed Sep 16 14:04:31
2009
@@ -22,5 +22,6 @@
<menu-item name="export" title="${uiLabelMap.EbayExportToEbay}"><link
target="advancedsearch"/></menu-item>
<menu-item name="importOrders"
title="${uiLabelMap.EbayImportSingleTransactionFromEbay}"><link
target="ManageOrdersFromEbay"/></menu-item>
<menu-item name="eBayOrders"
title="${uiLabelMap.EbayEBayOrders}"><link target="eBayOrders"/></menu-item>
+ <menu-item name="eBayShippingMethods"
title="${uiLabelMap.EbayShippingMethodConfigurations}"><link
target="EbayShippingMethods"/></menu-item>
</menu>
</menus>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=815789&r1=815788&r2=815789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Wed Sep 16 14:04:31
2009
@@ -225,4 +225,25 @@
</widgets>
</section>
</screen>
+
+ <screen name="EbayShippingMethods">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="EbayShippingMethodConfigurations"/>
+ <set field="headerItem" value="eBayShippingMethods"/>
+ <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="ListEbayShippingMethods"
location="component://ebay/widget/EbayForms.xml"/>
+ <screenlet id="add-ebay-shipping-method"
title="${uiLabelMap.EbayAddEbayShippingMethod}" collapsible="true">
+ <include-form name="AddEbayShippingMethod"
location="component://ebay/widget/EbayForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
