svn commit: r603351 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: mrisaliti
Date: Tue Dec 11 12:34:48 2007 New Revision: 603351 URL: http://svn.apache.org/viewvc?rev=603351&view=rev Log: eBay features are now moved to a specialpurpose application and it can be removed from the order application (Part of issue OFBIZ-1441) Removed: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties ofbiz/trunk/applications/order/servicedef/services.xml ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=603351&r1=603350&r2=603351&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Tue Dec 11 12:34:48 2007 @@ -291,16 +291,12 @@ FacilityShippingAndHandling=Shipping and Handling FacilitySpecialInstructions=Special Instructions FacilityWaitEntireOrderReady=Please wait until the entire order is ready before shipping. -FormFieldTitle_amountPaid=Amount Paid FormFieldTitle_billToCustomerPartyId=Bill To Customer Party Id FormFieldTitle_billingAccountId=Billing Account Id -FormFieldTitle_buyerName=Buyer Name FormFieldTitle_carrierPartyId=Carrier Party Id FormFieldTitle_carrierRoleTypeId=Carrier Role Type Id FormFieldTitle_cartons=Cartons -FormFieldTitle_checkoutStatus=Checkout Status FormFieldTitle_city=City -FormFieldTitle_completeStatus=Payment Sent by Buyer FormFieldTitle_contactMechId=Contact Mech Id FormFieldTitle_countryGeoId=Country Geo Id FormFieldTitle_createdBy=Created By @@ -314,10 +310,7 @@ FormFieldTitle_custRequestTypeId=Cust Request Type Id FormFieldTitle_deleteLink=Delete Link FormFieldTitle_deliverableId=Deliverable Id -FormFieldTitle_eBayPaymentStatus=eBay Payment Status -FormFieldTitle_emailBuyer=Buyer Email FormFieldTitle_entryDate=Entry Date -FormFieldTitle_errorMessage=Error Message FormFieldTitle_estimatedBudget=Estimated Budget FormFieldTitle_estimatedReadyDate=Estimated Ready Date FormFieldTitle_externalId=External Id @@ -336,7 +329,6 @@ FormFieldTitle_lastModifiedByUserLogin=Last Modified By User Login FormFieldTitle_lastModifiedDate=Last Modified Date FormFieldTitle_lastOrderedDate=Last Ordered Date -FormFieldTitle_listingStatus=Listing Status FormFieldTitle_listName=List Name FormFieldTitle_maximumAmount=Maximum Amount FormFieldTitle_needsInventoryIssuance=Needs Inventory Issuance @@ -349,16 +341,13 @@ FormFieldTitle_orderTypeId=Order Type Id FormFieldTitle_ordersLink=Orders Link FormFieldTitle_originFacilityId=Origin Facility Id -FormFieldTitle_paidTime=Date/Time Payment Received FormFieldTitle_parentShoppingListId=Parent Shopping List Id FormFieldTitle_partyId=Party Id FormFieldTitle_paymentMethodId=Payment Method Id -FormFieldTitle_paymentMethodUsed=Payment Method Used FormFieldTitle_postalCode=Postal Code FormFieldTitle_priority=Priority FormFieldTitle_productFeatureId=Product Feature Id FormFieldTitle_productId=Product Id -FormFieldTitle_productName=Product Name FormFieldTitle_productStoreId=Product Store Id FormFieldTitle_quoteId=Quote Id FormFieldTitle_reason=Reason @@ -378,10 +367,6 @@ FormFieldTitle_sendTo=Send To FormFieldTitle_shipAfterDate=Ship After Date FormFieldTitle_shipByDate=Ship By Date -FormFieldTitle_shippingService=Shipping Service -FormFieldTitle_shippingServiceCost=Shipping Service Cost -FormFieldTitle_shippedTime=Date/Time Shipment -FormFieldTitle_shippingTotalAdditionalCost=Shipping Additional Costs FormFieldTitle_shipmentMethodTypeId=Shipment Method Type Id FormFieldTitle_shoppingListId=Shopping List Id FormFieldTitle_shoppingListTypeId=Shopping List Type Id @@ -395,7 +380,6 @@ FormFieldTitle_totalCubicUomId=Cubic Measurement FormFieldTitle_totalWeight=Total Weight FormFieldTitle_totalWeightUomId=Weight Measurement -FormFieldTitle_transactionId=Transaction Id FormFieldTitle_unassignedRequirements=unassigned Requirements FormFieldTitle_unitsPieces=Units Pieces FormFieldTitle_useCase=Use Case @@ -513,9 +497,6 @@ OrderHowShallWeShipIt=How shall we ship it OrderHowShallYouPay=How shall you pay OrderImage=Image -OrderImportOrdersFromEbay=Import Orders From eBay -OrderImportOrdersSearchFromEbay=Search Orders To Import From eBay -OrderImportEbayItem=Item Id OrderInProduction=In Production OrderInProgress=In Progress OrderInputQuickPurchaseOrder=Purchase Order Quick Entry @@ -1005,27 +986,6 @@ # org.ofbiz.order.order messages # ======================================== items.none=ERROR: There are no items to order - -ordersImportFromEbay.cannotConvertFromDate=Cannot convert from date, from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format -ordersImportFromEbay.cannotConvertThruDate=Cannot convert thru date, from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format -ordersImportFromEbay.errorDuringBuildItemAndTransactionIdFromExternalId=Error during buildItemAndTransactionIdFromExternalId -ordersImportFromEbay.errorDuringPostCompleteSaleRequest=Error During Post Complete Sale Request -ordersImportFromEbay.errorRetrievingExternalIdFromOrderId=Error Retrieving externalId from orderId -ordersImportFromEbay.exceptionDuringBuildingCompleteSaleRequest=Exception during building CompleteSaleRequest -ordersImportFromEbay.exceptionDuringBuildingGetEbayDetailsReques=Exception during building get eBay details request -ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest=Exception during building get seller transactions request -ordersImportFromEbay.exceptionInCreateShoppingCart=Exception in createShoppingCart -ordersImportFromEbay.exceptionInImportOrderFromEbay=Exception in importOrderFromEbay -ordersImportFromEbay.exceptionInImportOrdersSearchFromEbay=Exception in importOrdersSearchFromEbay -ordersImportFromEbay.exceptionInSetEbayOrderToComplete=Exception in setEbayOrderToComplete -ordersImportFromEbay.externalIdAlreadyExist=ExternalId Already Exists -ordersImportFromEbay.externalIdNotAvailable=ExternalId Not Available -ordersImportFromEbay.noOrdersFound=No Orders Found -ordersImportFromEbay.orderIdOrExternalIdAreMandatory=OrderId Or ExternalId Are Mandatory -ordersImportFromEbay.paymentIsStillNotReceived=Before Import the order from eBay you have to receive the payment from the buyer -ordersImportFromEbay.productIdDoesNotExist=ProductId Does Not Exist -ordersImportFromEbay.productIdNotAvailable=ProductId Not Available -ordersImportFromEbay.productStoreIdIsMandatory=ProductStoreId Is Mandatory # 0=productName, 1=productId product.no_longer_for_sale=Tried to order the Product {0} (productId: {1}). This product is no longer available for sale. Please remove from your order. Modified: ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties?rev=603351&r1=603350&r2=603351&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties Tue Dec 11 12:34:48 2007 @@ -373,9 +373,6 @@ OrderGrossItemsSoldIncludesPromotionsAndPendingOrders=Righe Vendute Lorde (include promozioni e ordini sospesi) OrderHold=Congela Ordine OrderImage = Immagine -OrderImportOrdersFromEbay=Importa Ordini Da eBay -OrderImportOrdersSearchFromEbay=Ricerca Ordini Da Importare Da eBay -OrderImportEbayItem=Numero Oggetto OrderInProduction = In Produzione OrderInProgress = In Corso OrderInputQuickPurchaseOrder=Inserimento Veloce Ordine Acquisto @@ -848,27 +845,6 @@ items.none=ERRORE: Non ci sono righe nell'ordine -ordersImportFromEbay.cannotConvertFromDate=Non \u00e8 possibile convertire la data da, dal formato yyyy-MM-dd HH:mm:ss al formato yyyy-MM-dd'T'HH:mm:ss.SSS'Z' -ordersImportFromEbay.cannotConvertThruDate=Non \u00e8 possibile convertire la data a, dal formato yyyy-MM-dd HH:mm:ss al formato yyyy-MM-dd'T'HH:mm:ss.SSS'Z' -ordersImportFromEbay.errorDuringBuildItemAndTransactionIdFromExternalId=Errore durante buildItemAndTransactionIdFromExternalId -ordersImportFromEbay.errorDuringPostCompleteSaleRequest=Errore Durante il Post della Richiesta Complete Sale -ordersImportFromEbay.exceptionDuringBuildingCompleteSaleRequest=Eccezione durante la costruzione di CompleteSaleRequest -ordersImportFromEbay.errorRetrievingExternalIdFromOrderId=Errore Ricavando externalId da orderId -ordersImportFromEbay.exceptionDuringBuildingGetEbayDetailsReques=Eccezione durante la creazione della richiesta get eBay details -ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest=Eccezione durante la creazione della richiesta get seller transactions -ordersImportFromEbay.exceptionInCreateShoppingCart=Eccezione in createShoppingCart -ordersImportFromEbay.exceptionInImportOrderFromEbay=Eccezione in importOrderFromEbay -ordersImportFromEbay.exceptionInImportOrdersSearchFromEbay=Eccezione in importOrdersSearchFromEbay -ordersImportFromEbay.exceptionInSetEbayOrderToComplete=Eccezione in setEbayOrderToComplete -ordersImportFromEbay.externalIdAlreadyExist=Numero Ordine Esterno Gi\u00e0 Esistente -ordersImportFromEbay.externalIdNotAvailable=Numero Ordine Esterno Non Disponibile -ordersImportFromEbay.noOrdersFound=Nessun Ordine Trovato -ordersImportFromEbay.orderIdOrExternalIdAreMandatory=OrderId O ExternalId Sono Obbligatori -ordersImportFromEbay.paymentIsStillNotReceived=Prima di Importare l'ordine da eBay tu devi ricevere il pagamento dal compratore -ordersImportFromEbay.productIdDoesNotExist=Codice Prodotto Non Esiste -ordersImportFromEbay.productIdNotAvailable=Codice Prodotto Non Disponibile -ordersImportFromEbay.productStoreIdIsMandatory=Codice Negozio \u00e8 Obbligatorio - # 0=productId product.not_found=Non \u00e8 possibile trovare il prodotto con codice [{0}], non possono essere acquisti. fixed_asset_product_not_found=Non \u00e8 possibile trovare un cespite relativo a beni in affitto per il prodotto con il codice [{0}], non pu\u00f2 essere affittato. @@ -898,7 +874,6 @@ FormFieldTitle_webSiteId=Sito Web FormFieldTitle_productStoreId=Negozio FormFieldTitle_terminalId=Numero Terminale -FormFieldTitle_transactionId=Numero Transazione FormFieldTitle_needsInventoryIssuance=Necessario Emissione Inventario FormFieldTitle_isRushOrder=E' un'Ordine Rush FormFieldTitle_internalCode=Codice Interno @@ -978,19 +953,4 @@ FormFieldTitle_billToCustomerPartyId=Fattura Al Cliente FormFieldTitle_unassignedRequirements=Fabbisogni non assegnati FormFieldTitle_requirementByDate=Fabbisogno Per Data -FormFieldTitle_internalName=Nome interno -FormFieldTitle_shippingServiceCost=Costo Servizio Spedizione -FormFieldTitle_shippingTotalAdditionalCost=Costi Addizionali Spedizione -FormFieldTitle_amountPaid=Importo Pagato -FormFieldTitle_paidTime=Data/Ora Ricezione Pagamento -FormFieldTitle_shippedTime=Date/Ora Spedizione -FormFieldTitle_errorMessage=Messaggio di Errore -FormFieldTitle_paymentMethodUsed=Metodo Pagamento Scelto -FormFieldTitle_shippingService=Metodo Spedizione Scelto -FormFieldTitle_listingStatus=Stato dell'Asta -FormFieldTitle_eBayPaymentStatus=Stato Pagamento su eBay -FormFieldTitle_checkoutStatus=Stato Completamento Asta -FormFieldTitle_completeStatus=Pagamento Inviato dal Compratore -FormFieldTitle_buyerName=Nome Compratore -FormFieldTitle_emailBuyer=Email Compratore -FormFieldTitle_productName=Nome Prodotto +FormFieldTitle_internalName=Nome interno \ No newline at end of file Modified: ofbiz/trunk/applications/order/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?rev=603351&r1=603350&r2=603351&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services.xml Tue Dec 11 12:34:48 2007 @@ -786,56 +786,6 @@ <attribute name="orderListSize" type="Integer" mode="OUT" optional="false"/> </service> - <!-- Import Orders Services --> - <service name="importOrdersSearchFromEbay" engine="java" transaction-timeout="300" - location="org.ofbiz.order.order.ImportOrdersFromEbay" invoke="importOrdersSearchFromEbay" auth="true"> - <description>Import Orders Search from eBay</description> - <attribute type="String" mode="IN" name="productStoreId" optional="false"/> - <attribute type="String" mode="IN" name="fromDate" optional="false"/> - <attribute type="String" mode="IN" name="thruDate" optional="false"/> - <attribute type="List" mode="OUT" name="orderList" optional="true"/> - </service> - - <service name="importOrderFromEbay" engine="java" transaction-timeout="300" - location="org.ofbiz.order.order.ImportOrdersFromEbay" invoke="importOrderFromEbay" auth="true"> - <description>Import Order from eBay</description> - <attribute type="String" mode="IN" name="productStoreId" optional="false"/> - <attribute type="String" mode="IN" name="externalId" optional="false"/> - <attribute type="String" mode="IN" name="transactionId" optional="false"/> - <attribute type="String" mode="IN" name="createdDate" optional="false"/> - <attribute type="String" mode="IN" name="productId" optional="true"/> - <attribute type="String" mode="IN" name="quantityPurchased" optional="false"/> - <attribute type="String" mode="IN" name="transactionPrice" optional="false"/> - <attribute type="String" mode="IN" name="shippingService" optional="true"/> - <attribute type="String" mode="IN" name="shippingServiceCost" optional="true"/> - <attribute type="String" mode="IN" name="shippingTotalAdditionalCost" optional="true"/> - <attribute type="String" mode="IN" name="salesTaxAmount" optional="true"/> - <attribute type="String" mode="IN" name="salesTaxPercent" optional="true"/> - <attribute type="String" mode="IN" name="amountPaid" optional="true"/> - <attribute type="String" mode="IN" name="paidTime" optional="true"/> - <attribute type="String" mode="IN" name="shippedTime" optional="true"/> - <attribute type="String" mode="IN" name="buyerName" optional="true"/> - <attribute type="String" mode="IN" name="emailBuyer" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressPhone" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressStreet" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressStreet1" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressStreet2" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressPostalCode" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressCountry" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressStateOrProvince" optional="true"/> - <attribute type="String" mode="IN" name="shippingAddressCityName" optional="true"/> - </service> - - <service name="setEbayOrderToComplete" engine="java" transaction-timeout="300" - location="org.ofbiz.order.order.ImportOrdersFromEbay" invoke="setEbayOrderToComplete" auth="true"> - <description>Complete Order to eBay</description> - <attribute type="String" mode="IN" name="orderId" optional="true"/> - <attribute type="String" mode="IN" name="externalId" optional="true"/> - <attribute type="String" mode="IN" name="transactionId" optional="true"/> - <attribute type="String" mode="IN" name="paid" optional="true"/> - <attribute type="String" mode="IN" name="shipped" optional="true"/> - </service> - <service name="checkOrderIsOnBackOrder" engine="simple" auth="false" location="org/ofbiz/order/order/OrderServices.xml" invoke="checkOrderIsOnBackOrder"> <description>Check if an Order is on Back Order</description> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=603351&r1=603350&r2=603351&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Tue Dec 11 12:34:48 2007 @@ -1477,33 +1477,6 @@ <response name="success" type="view" value="LookupProductCategory"/> </request-map> - <request-map uri="ManageOrdersFromEbay"> - <response name="success" type="view" value="ManageOrdersFromEbay"/> - <response name="failure" type="view" value="ManageOrdersFromEbay"/> - </request-map> - - <request-map uri="ImportOrdersSearchFromEbay"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="importOrdersSearchFromEbay"/> - <response name="success" type="view" value="ManageOrdersFromEbay"/> - <response name="failure" type="view" value="ManageOrdersFromEbay"/> - </request-map> - - <request-map uri="ImportOrderFromEbay"> - <security https="true" auth="true"/> - <event type="service-multi" path="" invoke="importOrderFromEbay"/> - <response name="success" type="view" value="ManageOrdersFromEbay"/> - <response name="error" type="view" value="ManageOrdersFromEbay"/> - <response name="failure" type="view" value="ManageOrdersFromEbay"/> - </request-map> - - <request-map uri="setEbayOrderToComplete"> - <security https="true" auth="true"/> - <event type="service" invoke="setEbayOrderToComplete"/> - <response name="success" type="view" value="ManageOrdersFromEbay"/> - <response name="failure" type="view" value="ManageOrdersFromEbay"/> - </request-map> - <!-- These are just examples of reports developed using JasperReport and not really useful reports. In order to run them you'll have to follow the notes in the @@ -1681,7 +1654,5 @@ <view-map name="ShipGroupsPDF" type="screenfop" page="component://order/widget/ordermgr/OrderPrintScreens.xml#ShipGroupsPDF" content-type="application/pdf" encoding="none"/> <view-map name="SendConfirmationMail" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#SendOrderConfirmation"/> - <view-map name="ManageOrdersFromEbay" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#ManageOrdersFromEbay"/> - <view-map name="ListOrdersFromEbay" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#ListOrdersFromEbay"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=603351&r1=603350&r2=603351&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Tue Dec 11 12:34:48 2007 @@ -39,7 +39,6 @@ <li class="head3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li> <li><a href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}">${uiLabelMap.PartyFindParty}</a></li> - <li><a href="<@ofbizUrl>ManageOrdersFromEbay</@ofbizUrl>">${uiLabelMap.OrderImportOrdersFromEbay}</a></li> </ul> <br class="clear"/> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?rev=603351&r1=603350&r2=603351&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Tue Dec 11 12:34:48 2007 @@ -118,63 +118,4 @@ </field> <field name="addButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ManageOrdersFromEbay" type="single" target="ImportOrdersSearchFromEbay"> - <field name="productStoreId"> - <drop-down> - <entity-options entity-name="ProductStore" description="${storeName}" key-field-name="productStoreId"> - <entity-order-by field-name="storeName"/> - </entity-options> - </drop-down> - </field> - <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><date-time default-value="${bsh: org.ofbiz.base.util.UtilDateTime.getDayStart(org.ofbiz.base.util.UtilDateTime.nowTimestamp())}"/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"><date-time default-value="${bsh: org.ofbiz.base.util.UtilDateTime.getDayEnd(org.ofbiz.base.util.UtilDateTime.nowTimestamp())}"/></field> - <field name="submitButton" title="${uiLabelMap.OrderImportOrdersSearchFromEbay}"><submit button-type="button"/></field> - </form> - <form name="ListOrdersFromEbay" type="multi" use-row-submit="true" list-name="orderList" target="ImportOrderFromEbay"> - <row-actions> - <set field="canImportOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isEmpty(errorMessage)}" type="Boolean"/> - <set field="allowProductIdChange" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isNotEmpty(errorMessage)}" type="Boolean"/> - </row-actions> - <field name="productStoreId"><hidden/></field> - <field name="externalId" title="${uiLabelMap.OrderImportEbayItem}"><display/></field> - <field name="transactionId"><display/></field> - <field name="orderId"><hyperlink target="orderview?orderId=${orderId}" description="${orderId}"/></field> - <field name="createdDate"><display/></field> - <!-- - <field name="productId" use-when="!${allowProductIdChange}"><display/></field> - <field name="productId" use-when="${allowProductIdChange}"><lookup target-form-name="LookupProduct"/></field> - --> - <field name="productId"><display/></field> - <field name="productName" entry-name="productId"><display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/></field> - <field name="title"><display/></field> - <field name="quantityPurchased" title="${uiLabelMap.OrderQuantitySold}"><display/></field> - <field name="transactionPrice" title="${uiLabelMap.OrderUnitPrice}"><display/></field> - <field name="salesTaxAmount"><display/></field> - <field name="salesTaxPercent"><hidden/></field> - <field name="shippingServiceCost"><display/></field> - <field name="shippingTotalAdditionalCost"><display/></field> - <field name="amountPaid"><display/></field> - <field name="paidTime"><display/></field> - <field name="shippedTime"><display/></field> - <field name="paymentMethodUsed"><display/></field> - <field name="shippingService"><display/></field> - <field name="listingStatus"><display/></field> - <field name="eBayPaymentStatus"><display/></field> - <field name="checkoutStatus"><display/></field> - <field name="completeStatus"><display/></field> - <field name="buyerName"><display/></field> - <field name="shippingAddressStreet"><hidden/></field> - <field name="emailBuyer"><display/></field> - <field name="shippingAddressStreet2"><hidden/></field> - <field name="shippingAddressPhone"><hidden/></field> - <field name="shippingAddressStreet1"><hidden/></field> - <field name="shippingAddressPostalCode"><hidden/></field> - <field name="shippingAddressCountry"><hidden/></field> - <field name="shippingAddressStateOrProvince"><hidden/></field> - <field name="shippingAddressCityName"><hidden/></field> - <field name="errorMessage"><display/></field> - <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}" use-when="${canImportOrder}"><check/></field> - <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}" use-when="!${canImportOrder}"><display/></field> - <field name="submitButton" title="${uiLabelMap.OrderImportOrdersFromEbay}" widget-style="smallSubmit"><submit/></field> - </form> </forms> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=603351&r1=603350&r2=603351&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Tue Dec 11 12:34:48 2007 @@ -313,26 +313,4 @@ </widgets> </section> </screen> - <screen name="ManageOrdersFromEbay"> - <section> - <actions> - <set field="titleProperty" value="OrderImportOrdersSearchFromEbay"/> - <set field="orderList" from-field="parameters.orderList"/> - </actions> - <widgets> - <decorator-screen name="CommonOrderViewDecorator"> - <decorator-section name="body"> - <container> - <label style="head1">${uiLabelMap.OrderImportOrdersSearchFromEbay}</label> - </container> - <include-form name="ManageOrdersFromEbay" location="component://order/webapp/ordermgr/order/OrderForms.xml"/> - <container> - <label style="head1">${uiLabelMap.OrderImportOrdersFromEbay}</label> - </container> - <include-form name="ListOrdersFromEbay" location="component://order/webapp/ordermgr/order/OrderForms.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |