OFBiz › OFBiz - Commits

svn commit: r603353 - in /ofbiz/trunk/applications/product: config/ servicedef/ src/org/ofbiz/product/product/ webapp/catalog/WEB-INF/ webapp/catalog/find/ widget/catalog/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r603353 - in /ofbiz/trunk/applications/product: config/ servicedef/ src/org/ofbiz/product/product/ webapp/catalog/WEB-INF/ webapp/catalog/find/ widget/catalog/

Author: mrisaliti
Date: Tue Dec 11 12:41:37 2007
New Revision: 603353

URL: http://svn.apache.org/viewvc?rev=603353&view=rev
Log:
eBay features are now moved to a specialpurpose application and it can be removed from the product application (Part of issue OFBIZ-1441)

Removed:
ofbiz/trunk/applications/product/config/productsExport.properties
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductsExportToEbay.java
ofbiz/trunk/applications/product/webapp/catalog/find/ExportForms.xml
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.properties
ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
ofbiz/trunk/applications/product/servicedef/services.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl
ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=603353&r1=603352&r2=603353&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Tue Dec 11 12:41:37 2007
@@ -193,7 +193,6 @@
PageTitlePickListOptions=Pick List Options
PageTitlePickingMoveStock=Picking : Move Stock
PageTitlePickingViewStartedPicks=Picking : View Started Picks
-PageTitleProductsExportToEbay=Products Export on eBay
PageTitleQuickAddProductVariants=Quick Add Product Variants
PageTitleSearchInventoryItems=Search Inventory Items
PageTitleSearchResults=Search Results
@@ -574,7 +573,6 @@
ProductExpireDate=Expire Date
ProductExpireResultsFrom=Expire Results From
ProductExplodeOrderItems=Explode Order Items
-ProductExportToeBay=Export To eBay
ProductFacilities=Facilities
ProductFacilitiesList=Facilities List
ProductFacility=Facility
@@ -1512,10 +1510,6 @@
productevents.specified_update_mode_not_supported=Specified update mode: "${updateMode}" is not supported.
productevents.thru_date_not_formatted_correctly=Thru Date not formatted correctly.
productevents.updatemode_not_specified=Update Mode was not specified, but is required.
-productsExportToEbay.errorDuringAuthenticationToEbay=Error during authentication to eBay
-productsExportToEbay.exceptionDuringBuildingDataItemsToEbay=Exception occurred during building data items to eBay
-productsExportToEbay.exceptionInExportToEbay=Exception in exportToEbay
-productsExportToEbay.productItemsSentCorrecltyToEbay=Product items sent correclty to eBay
productsearchevents.added_x_product_category_members=Added ${numAdded} product category members.
productsearchevents.error_getting_search_results=Error getting search results: ${errSearchResult}.
productsearchevents.expired_x_items=Expired ${numExpired} items.
@@ -1896,22 +1890,4 @@
FormFieldTitle_carrierServiceCode=Carrier Service Code
FormFieldTitle_editLink=Edit Link
FormFieldTitle_monthsInPastLimit=Months In Past Limit
-FormFieldTitle_picklistBinId=Picklist Bin
-FormFieldTitle_geoCode=Country
-FormFieldTitle_location=Location
-FormFieldTitle_ebayCategory=eBay Category
-FormFieldTitle_paymentMethodsAccepted=Payment Methods Accepted
-FormFieldTitle_paymentPayPal=PayPal
-FormFieldTitle_paymentVisaMC=Visa/Mastercard
-FormFieldTitle_paymentAmEx=American Express
-FormFieldTitle_paymentDiscover=Discover card
-FormFieldTitle_paymentCCAccepted=Credit card
-FormFieldTitle_paymentCashInPerson=Cash-in-person
-FormFieldTitle_paymentCashOnPickup=Payment on delivery
-FormFieldTitle_paymentCOD=Cash on delivery
-FormFieldTitle_paymentCODPrePayDelivery=Cash On Delivery After Paid
-FormFieldTitle_paymentMOCC=Money order/cashiers check
-FormFieldTitle_paymentMoneyXferAccepted=Direct transfer of money
-FormFieldTitle_paymentPersonalCheck=Personal check
-FormFieldTitle_listingDuration=Listing Duration
-FormFieldTitle_startPrice=Start Price
+FormFieldTitle_picklistBinId=Picklist Bin
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=603353&r1=603352&r2=603353&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Tue Dec 11 12:41:37 2007
@@ -185,7 +185,6 @@
PageTitlePickListOptions=Opzioni Lista di Prelievo
PageTitlePickingMoveStock=Prelievo : Muovi Giacenza
PageTitlePickingViewStartedPicks=Prelievo : Mostra Inizio Prelievo
-PageTitleProductsExportToEbay=Esportazioni Prodotti su eBay
PageTitleQuickAddProductVariants=Aggiunta Veloce Varianti Prodotto
PageTitleSearchInventoryItems=Ricerca Righe Inventario
PageTitleSearchResults=Risultati Ricerca
@@ -556,7 +555,6 @@
ProductExpireDate=Data Scadenza
ProductExpireResultsFrom=Risultati Scaduti Da
ProductExplodeOrderItems=Esplodi Righe Ordine
-ProductExportToeBay=Esportazione Su eBay
ProductFacilities=Stabilimenti
ProductFacilitiesList=Lista Stabilimenti
ProductFacility=Stabilimento
@@ -1468,10 +1466,6 @@
productevents.specified_update_mode_not_supported=Specificato modo di aggiornamento: "${updateMode}" non \u00e8 supportato.
productevents.thru_date_not_formatted_correctly=Data A non formattata correttamente.
productevents.updatemode_not_specified=Modo di Aggiornamento non \u00e8 stato specificato, ma \u00e8 richiesto.
-productsExportToEbay.errorDuringAuthenticationToEbay=Errore durante l\'autenticazione su eBay
-productsExportToEbay.exceptionDuringBuildingDataItemsToEbay=Eccezione accaduta durante la creazione dei dati prodotti per eBay
-productsExportToEbay.exceptionInExportToEbay=Eccezione in exportToEbay
-productsExportToEbay.productItemsSentCorrecltyToEbay=Prodotti inviati correttamente su eBay
productsearchevents.added_x_product_category_members=Aggiunti ${numAdded} membri prodotto categoria.
productsearchevents.error_getting_search_results=Errore leggendo i risultati di ricerca: ${errSearchResult}.
productsearchevents.expired_x_items=${numExpired} righe Scadute.
@@ -1852,22 +1846,4 @@
FormFieldTitle_carrierServiceCode=Codice Servizio Corriere
FormFieldTitle_editLink=Aggiorna Link
FormFieldTitle_monthsInPastLimit=Mesi Nel Limite Passato
-FormFieldTitle_picklistBinId=Lista di Prelievo
-FormFieldTitle_geoCode=Paese
-FormFieldTitle_location=Localit\u00e0
-FormFieldTitle_ebayCategory=Categoria eBay
-FormFieldTitle_paymentMethodsAccepted=Metodi di Pagamento Accettati
-FormFieldTitle_paymentPayPal=PayPal
-FormFieldTitle_paymentVisaMC=Visa/Mastercard
-FormFieldTitle_paymentAmEx=American Express
-FormFieldTitle_paymentDiscover=Discover
-FormFieldTitle_paymentCCAccepted=Carta di Credito
-FormFieldTitle_paymentCashInPerson=Contanti di Persona
-FormFieldTitle_paymentCashOnPickup=Pagamento alla Consegna
-FormFieldTitle_paymentCOD=Contanti alla consegna
-FormFieldTitle_paymentCODPrePayDelivery=Contanti alla Consegna Dopo Aver Pagato
-FormFieldTitle_paymentMOCC=Ordini di Soldi/Assegni al cassiere
-FormFieldTitle_paymentMoneyXferAccepted=Trasferimento Diretto di Soldi
-FormFieldTitle_paymentPersonalCheck=Assegno Personale
-FormFieldTitle_listingDuration=Durata Asta
-FormFieldTitle_startPrice=Prezzo di Partenza
+FormFieldTitle_picklistBinId=Lista di Prelievo
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=603353&r1=603352&r2=603353&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Dec 11 12:41:37 2007
@@ -1154,31 +1154,6 @@
<permission-service service-name="productGenericPermission" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- 
- <service name="exportToEbay" engine="java"
- location="org.ofbiz.product.product.ProductsExportToEbay" invoke="exportToEbay" auth="true">
- <description>Export products to eBay</description>
- <attribute type="List" mode="IN" name="selectResult" optional="false"/>
- <attribute type="String" mode="IN" name="country" optional="false"/>
- <attribute type="String" mode="IN" name="location" optional="false"/>
- <attribute type="String" mode="IN" name="ebayCategory" optional="false"/>
- <attribute type="String" mode="IN" name="paymentPayPal" optional="true"/>
- <attribute type="String" mode="IN" name="paymentVisaMC" optional="true"/>
- <attribute type="String" mode="IN" name="paymentAmEx" optional="true"/>
- <attribute type="String" mode="IN" name="paymentDiscover" optional="true"/>
- <attribute type="String" mode="IN" name="paymentCCAccepted" optional="true"/>
- <attribute type="String" mode="IN" name="paymentCashInPerson" optional="true"/>
- <attribute type="String" mode="IN" name="paymentCashOnPickup" optional="true"/>
- <attribute type="String" mode="IN" name="paymentCOD" optional="true"/>
- <attribute type="String" mode="IN" name="paymentCODPrePayDelivery" optional="true"/>
- <attribute type="String" mode="IN" name="paymentMOCC" optional="true"/>
- <attribute type="String" mode="IN" name="paymentMoneyXferAccepted" optional="true"/>
- <attribute type="String" mode="IN" name="paymentPersonalCheck" optional="true"/>
- <attribute type="String" mode="IN" name="payPalEmail" optional="true"/>
- <attribute type="String" mode="IN" name="listingDuration" optional="false"/>
- <attribute type="String" mode="IN" name="startPrice" optional="false"/>
- <attribute type="String" mode="IN" name="quantity" optional="false"/>
- </service>


<service name="createVendorProduct" engine="simple" default-entity-name="VendorProduct"

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=603353&r1=603352&r2=603353&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Tue Dec 11 12:41:37 2007
@@ -2444,18 +2444,6 @@
<request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map>
<request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map>

- <request-map uri="ProductsExportToEbay">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ProductsExportToEbay"/>
- </request-map>
-
- <request-map uri="PostProductsToEbay">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="exportToEbay"/>
- <response name="success" type="view" value="ProductsExportToEbay"/>
- <response name="error" type="view" value="ProductsExportToEbay"/>
- </request-map>
-

<request-map uri="EditVendorProduct">
<security https="true" auth="true"/>
@@ -2608,8 +2596,6 @@
<view-map name="ListQuantityBreaks" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListQuantityBreaks"/>
<view-map name="ListShipmentMethodTypes" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListShipmentMethodTypes"/>
<view-map name="ListCarrierShipmentMethods" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListCarrierShipmentMethods"/>
-
- <view-map name="ProductsExportToEbay" type="screen" page="component://product/widget/catalog/FindScreens.xml#ProductsExportToEbay"/>


<view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=603353&r1=603352&r2=603353&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Tue Dec 11 12:41:37 2007
@@ -62,11 +62,6 @@
function toggle(e) {
e.checked = !e.checked;
}
-
- function exportToeBay() {
- document.products.action="<@ofbizUrl>ProductsExportToEbay</@ofbizUrl>";
- document.products.submit();
- }
</script>

<table border="0" width="100%" cellpadding="2">

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl?rev=603353&r1=603352&r2=603353&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Tue Dec 11 12:41:37 2007
@@ -113,8 +113,5 @@
<hr class="sepbar"/>
<div class="tabletext">
<b>${uiLabelMap.ProductSearchExportProductList}:</b> <a href="<@ofbizUrl>searchExportProductList?clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchExport}</a>
- <#if productIds?has_content>
- <a href="javascript:exportToeBay();" class="buttontext">${uiLabelMap.ProductExportToeBay}</a>
- </#if>
</div>
</#if>

Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=603353&r1=603352&r2=603353&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Tue Dec 11 12:41:37 2007
@@ -135,22 +135,4 @@
</widgets>
</section>
</screen>
-
- <screen name="ProductsExportToEbay">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleProductsExportToEbay"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.PageTitleProductsExportToEbay}</label>
- </container>
- <include-form name="ProductsExportToEbay" location="component://product/webapp/catalog/find/ExportForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>