Author: mrisaliti
Date: Sun Jan 2 17:20:48 2011
New Revision: 1054435
URL: http://svn.apache.org/viewvc?rev=1054435&view=rev
Log:
USPS use the new Shipment Gateway Config features (OFBIZ-4089)
Modified:
ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/config/shipment.properties
ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java
ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
Modified: ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml?rev=1054435&r1=1054434&r2=1054435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml Sun Jan 2
17:20:48 2011
@@ -163,15 +163,6 @@
<value xml:lang="zh">已请æ±éè´§ã</value>
<value xml:lang="zh_TW">å·²è«æ±é貨ã</value>
</property>
- <property key="ProductUspsAddressValidationStateAndCityOrZipRqd">
- <value xml:lang="de">USPS Adressverifikation benötigt Postleitzahl
oder Ort/Staat</value>
- <value xml:lang="en">USPS address validation requires either zip5 or
city and state</value>
- <value xml:lang="fr">La validation de l'adresse USPS demande l'un ou
l'autre : zip5 ou ville et état</value>
- <value xml:lang="it">USPS richiedere validazione indirizzo entrambi
zip5 o città e stato</value>
- <value xml:lang="th">USPS à¸à¹à¸à¸à¸à¸²à¸£à¸à¸µà¹à¸à¸¢à¸¹à¹
à¸à¹à¸²à¹à¸¡à¹ รหัสà¹à¸à¸£à¸©à¸à¸µà¸¢à¹ หรืà¸
à¹à¸¡à¸·à¸à¸ à¹à¸¥à¸° รัà¸</value>
- <value xml:lang="zh">USPSå°åéªè¯éè¦zip5æè
çåå¸</value>
- <value
xml:lang="zh_TW">USPSä½åé©è¨¼éè¦zip5æè
çåå¸</value>
- </property>
<property key="productSearchEvents.added_param_features">
<value xml:lang="de">${numAdded} Merkmale hinzugefügt mit ID
${productFeatureId}</value>
<value xml:lang="en">Added ${numAdded} features with ID
${productFeatureId}</value>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1054435&r1=1054434&r2=1054435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Jan 2
17:20:48 2011
@@ -867,6 +867,10 @@
<value xml:lang="en">No ShipmentPackageRouteSegs (ie No Packages)
found for ShipmentRouteSegment with shipmentId ${shipmentId} and
shipmentRouteSegmentId ${shipmentRouteSegmentId}</value>
<value xml:lang="it">Nessun pacco trovato per la spedizione
${shipmentId} e il percorso spedizione ${shipmentRouteSegmentId}</value>
</property>
+ <property key="FacilityShipmentRateNotAvailable">
+ <value xml:lang="en">No rates available at this time</value>
+ <value xml:lang="it">Nessuna stima spedizione disponibile in questo
momento</value>
+ </property>
<property key="FacilityShipmentRouteSegmentOriginPostalAddressNotFound">
<value xml:lang="en">OriginPostalAddress not found for
ShipmentRouteSegment with shipmentId ${shipmentId} and shipmentRouteSegmentId
${shipmentRouteSegmentId}</value>
<value xml:lang="it">Indirizzo d'origine non trovato per la spedizione
${shipmentId} e percorso spedizione ${shipmentRouteSegmentId}</value>
@@ -1171,10 +1175,6 @@
<value xml:lang="en">Minimum weight for a package</value>
<value xml:lang="it">Peso minimo per un pacco</value>
</property>
- <property key="FacilityShipmentUpsNoRateAvailable">
- <value xml:lang="en">No rates available at this time</value>
- <value xml:lang="it">Nessuna stima spedizione disponibile in questo
momento</value>
- </property>
<property key="FacilityShipmentUpsNotRouteSegmentCarrier">
<value xml:lang="en">ERROR: The Carrier for ShipmentRouteSegment
${shipmentRouteSegmentId} of Shipment ${shipmentId}, is not UPS.</value>
<value xml:lang="it">ERRORE: il corriere sul percorso spedizione
${shipmentRouteSegmentId} della spedizione ${shipmentId}, non è UPS.</value>
@@ -1395,6 +1395,31 @@
<value xml:lang="en">Access User Id</value>
<value xml:lang="it">Id utente d'accesso</value>
</property>
+ <property key="FacilityShipmentUspsAddressValidationIncompleteResponse">
+ <value xml:lang="en">Incomplete response from USPS Address Validation
service: no Address element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS per il servizio di
validazione indirizzo: nessun elemento Address trovato</value>
+ </property>
+ <property key="FacilityShipmentUspsAddressValidationResponseError">
+ <value xml:lang="en">The following error was returned by the USPS
Address Validation service: ${errorString}</value>
+ <value xml:lang="it">Il seguente errore è stato restituito da USPS
servizio di validazione indirizzo: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsAddressValidationSendingError">
+ <value xml:lang="en">Error sending request for USPS Address Validation
service: ${errorString}</value>
+ <value xml:lang="it">Errore durante l'invio della richiesta a USPS per
il servizio di validazione indirizzo: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsAddressValidationStateAndCityOrZipRqd">
+ <value xml:lang="de">USPS Adressverifikation benötigt Postleitzahl
oder Ort/Staat</value>
+ <value xml:lang="en">USPS address validation requires either zip5 or
city and state</value>
+ <value xml:lang="fr">La validation de l'adresse USPS demande l'un ou
l'autre : zip5 ou ville et état</value>
+ <value xml:lang="it">USPS richiedere validazione indirizzo entrambi
zip5 o città e stato</value>
+ <value xml:lang="th">USPS à¸à¹à¸à¸à¸à¸²à¸£à¸à¸µà¹à¸à¸¢à¸¹à¹
à¸à¹à¸²à¹à¸¡à¹ รหัสà¹à¸à¸£à¸©à¸à¸µà¸¢à¹ หรืà¸
à¹à¸¡à¸·à¸à¸ à¹à¸¥à¸° รัà¸</value>
+ <value xml:lang="zh">USPSå°åéªè¯éè¦zip5æè
çåå¸</value>
+ <value
xml:lang="zh_TW">USPSä½åé©è¨¼éè¦zip5æè
çåå¸</value>
+ </property>
+ <property key="FacilityShipmentUspsConnectionProblem">
+ <value xml:lang="en">Problem connecting with USPS server:
${errorString}</value>
+ <value xml:lang="it">Errore durante la connession con il server di
USPS: ${errorString}</value>
+ </property>
<property key="FacilityShipmentUspsConnectTimeout">
<value xml:lang="en">Conntect Timeout</value>
<value xml:lang="it">Timeout connessione a USPS</value>
@@ -1403,10 +1428,198 @@
<value xml:lang="en">Conntect URL</value>
<value xml:lang="it">URL Connessione a USPS</value>
</property>
+ <property key="FacilityShipmentUspsConnectUrlIncomplete">
+ <value xml:lang="en">Incomplete connection URL; check your USPS
configuration</value>
+ <value xml:lang="it">URL connessione incompleto; verifica la tua
configurazione USPS</value>
+ </property>
+ <property key="FacilityShipmentUspsCityStateLookupIncompleteResponse">
+ <value xml:lang="en">Incomplete response from USPS City/State Lookup
service: no ZipCode element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio di ricerca
città /stato: nessun elemento ZipCode trovato</value>
+ </property>
+ <property key="FacilityShipmentUspsCityStateLookupIncompleteCityElement">
+ <value xml:lang="en">Incomplete response from USPS City/State Lookup
service: no City element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio di ricerca
città /stato: nessun elemento City trovato</value>
+ </property>
+ <property key="FacilityShipmentUspsCityStateLookupIncompleteStateElement">
+ <value xml:lang="en">Incomplete response from USPS City/State Lookup
service: no State element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio di ricerca
città /stato: nessun elemento State trovato</value>
+ </property>
+ <property key="FacilityShipmentUspsCityStateLookupResponseError">
+ <value xml:lang="en">Response from USPS: ${errorString}</value>
+ <value xml:lang="it">Risposta da USPS: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsCityStateLookupSendingError">
+ <value xml:lang="en">Error sending request for USPS City/State Lookup
service: ${errorString}</value>
+ <value xml:lang="it">Errore durante l'invio della richiesta a USPS per
il servizio di ricerca città /stato: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsDeliveryConfirmationSendingError">
+ <value xml:lang="en">Error sending request for USPS Delivery
Confirmation service: ${errorString}</value>
+ <value xml:lang="it">Errore durante l'invio della richiesta a USPS per
il servizio di conferma consegna: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsDeliveryConfirmationReadingError">
+ <value xml:lang="en">Error reading or writing shipment data for the
USPS Delivery Confirmation service: ${errorString}</value>
+ <value xml:lang="it">Errore di lettura o scrittura dei dati della
spedizione a USPS servizio conferma consegna: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsDeliveryConfirmationResponseError">
+ <value xml:lang="en">The following error was returned by the USPS
Delivery Confirmation service for ShipmentPackage ${shipmentId}
${shipmentPackageSeqId}: ${errorString}</value>
+ <value xml:lang="it">Il seguente errore è stato restituito da USPS
servizio conferma consegna per il pacco ${shipmentId} ${shipmentPackageSeqId}:
${errorString}</value>
+ </property>
+ <property
key="FacilityShipmentUspsDeliveryConfirmationResponseIncompleteElementDeliveryConfirmationLabel">
+ <value xml:lang="en">Incomplete response from the USPS Delivery
Confirmation service: missing or empty DeliveryConfirmationLabel element</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio conferma
consegna: elemento DeliveryConfirmationLabel mancante o vuoto</value>
+ </property>
+ <property
key="FacilityShipmentUspsDeliveryConfirmationResponsenIncompleteElementDeliveryConfirmationNumber">
+ <value xml:lang="en">Incomplete response from the USPS Delivery
Confirmation service: missing or empty DeliveryConfirmationNumber
element</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio conferma
consegna: elemento DeliveryConfirmationNumber mancante o vuoto</value>
+ </property>
+ <property key="FacilityShipmentUspsSerializingError">
+ <value xml:lang="en">Error serializing requestDocument:
${errorString}</value>
+ <value xml:lang="it">Errore durante la serializzazione del documento:
${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsGatewayNotAvailable">
+ <value xml:lang="en">USPS Shipment Gateway Configuration is not
available</value>
+ <value xml:lang="it">Configurazione gateway spedizioni USPS non è
disponibile</value>
+ </property>
<property key="FacilityShipmentUspsMaxEstimateWeight">
<value xml:lang="en">Estimate split into packages</value>
<value xml:lang="it">Stima spezzatura pacchi</value>
</property>
+ <property key="FacilityShipmentUspsNoCarrierServiceCodeFound">
+ <value xml:lang="en">Carrier Service Code not found for
CarrierShipmentMethod ${carrierPartyId}, shipmentMethodTypeId
${shipmentMethodTypeId}</value>
+ <value xml:lang="it">Il codice del servizio corriere non è stato
trovato per ${carrierPartyId}, metodo di spedizione
${shipmentMethodTypeId}</value>
+ </property>
+ <property key="FacilityShipmentUspsNoCarrierShipmentMethod">
+ <value xml:lang="en">No CarrierShipmentMethod entry for carrier
${carrierPartyId}, shipmentMethodTypeId ${shipmentMethodTypeId}</value>
+ <value xml:lang="it">Nessun metodo di spedizione per il corriere
${carrierPartyId}, tipo spedizione ${shipmentMethodTypeId}</value>
+ </property>
+ <property key="FacilityShipmentUspsNotRouteSegmentCarrier">
+ <value xml:lang="en">ERROR: The Carrier for ShipmentRouteSegment
${shipmentRouteSegmentId} of Shipment ${shipmentId}, is not USPS.</value>
+ <value xml:lang="it">ERRORE: il corriere sul percorso spedizione
${shipmentRouteSegmentId} della spedizione ${shipmentId}, non è USPS.</value>
+ </property>
+ <property key="FacilityShipmentUspsPriorityMailLabelOriginAddressMissing">
+ <value xml:lang="en">Unable to request a USPS Priority Mail
International Label: ShipmentRouteSegment is missing origin phone or address
details</value>
+ <value xml:lang="it">Non è possibile richiedere a USPS Etichetta
Posta Internazionale: percorso spedizione è mancante del telefono di origine o
dettagli sull'indirizzo</value>
+ </property>
+ <property key="FacilityShipmentUspsPriorityMailLabelSendingError">
+ <value xml:lang="en">Error sending request for USPS Priority Mail
International service: ${errorString}</value>
+ <value xml:lang="it">Errore di invio della richiesta a USPS servizio
Posta Internazionale: ${errorString}</value>
+ </property>
+ <property
key="FacilityShipmentUspsPriorityMailLabelResponseIncompleteElementBarcodeNumber">
+ <value xml:lang="en">Incomplete response from the USPS Priority Mail
International service: missing or empty BarcodeNumber element</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio Posta
Internazionale: elemento BarcodeNumber mancante o vuoto</value>
+ </property>
+ <property
key="FacilityShipmentUspsPriorityMailLabelResponseIncompleteElementLabelImage">
+ <value xml:lang="en">Incomplete response from the USPS Priority Mail
International service: missing or empty LabelImage element</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio Posta
Internazionale: elemento LabelImage mancante o vuoto</value>
+ </property>
+ <property key="FacilityShipmentUspsRateInquiryOnlyInUsDestinations">
+ <value xml:lang="en">Rate inquiry is only valid for US
destinations.</value>
+ <value xml:lang="it">Stima spedizione è valida solo per le
destinazioni negli USA.</value>
+ </property>
+ <property
key="FacilityShipmentUspsRateInternationCannotBeUsedForUsDestinations">
+ <value xml:lang="en">The USPS International Rate Calculation service
is not applicable to US destinations (including Possesions), use
uspsRateInquire</value>
+ <value xml:lang="it">il servizio di stima spedizione internazionale
non è applicabile per le destinazioni negli USA (inclusa Possessions), usare
uspsRateInquire.</value>
+ </property>
+ <property key="FacilityShipmentUspsRateDomesticReadingError">
+ <value xml:lang="en">Error reading or writing shipment data for the
USPS Domestic Rate Calculation service: ${errorString}</value>
+ <value xml:lang="it">Errore di lettura o scrittura dei dati di
spedizione a USPS per il servizio di stima spedizione: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsRateDomesticSendingError">
+ <value xml:lang="en">Error sending request for USPS Domestic Rate
Calculation service: ${errorString}</value>
+ <value xml:lang="it">Errore nella richiesta inviata a USPS per la
stima di spedizione: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsRateDomesticResponseError">
+ <value xml:lang="en">The following error was returned by the USPS
Domestic Rate Calculation service: ${errorString}</value>
+ <value xml:lang="it">Il seguente errore è stato restituito da USPS
servizio stima spedizione: ${errorString}</value>
+ </property>
+ <property
key="FacilityShipmentUspsRateDomesticResponseIncompleteElementPackage">
+ <value xml:lang="en">Incomplete response from USPS Domestic Rate
Calculation service: no Package element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio stima
spedizione: nessun elemento Package trovato</value>
+ </property>
+ <property
key="FacilityShipmentUspsRateDomesticResponseIncompleteElementPostage">
+ <value xml:lang="en">Incomplete response from USPS Domestic Rate
Calculation service: no Postage element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio stima
spedizione: nessun elemento Postage trovato</value>
+ </property>
+ <property
key="FacilityShipmentUspsRateDomesticResponseIncompleteElementZone">
+ <value xml:lang="en">Incomplete response from USPS Domestic Rate
Calculation service: no Zone element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio stima
spedizione: nessun elemento Zone trovato</value>
+ </property>
+ <property key="FacilityShipmentUspsRateInternationalSendingError">
+ <value xml:lang="en">Error sending request for USPS International Rate
Calculation service: ${errorString}</value>
+ <value xml:lang="it">Errore nella richiesta inviata a USPS per la
stima di spedizione internazionale: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsRouteSegmentDestinationZipCodeMissing">
+ <value xml:lang="en">ZIP code is missing from the destination postal
address ${contactMechId}</value>
+ <value xml:lang="it">Il CAP è mancante dall'indirizzo postale di
destinazione ${contactMechId}</value>
+ </property>
+ <property key="FacilityShipmentUspsResponseError">
+ <value xml:lang="en">Error reading request Document from a String:
${errorString}</value>
+ <value xml:lang="it">Errore durante la lettura del documento in
stringa: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsRouteSegmentOriginCountryGeoNotInUsa">
+ <value xml:lang="en">ShipmentRouteSeqment for shipmentId ${shipmentId}
and shipmentRouteSegmentId ${shipmentRouteSegmentId} does not originate from a
US address</value>
+ <value xml:lang="it">Percorso di spedizione per la spedizione
${shipmentId} e il percorso spedizione ${shipmentRouteSegmentId} non è
originata da un'indirizzo negli USA</value>
+ </property>
+ <property key="FacilityShipmentUspsRouteSegmentOriginZipCodeMissing">
+ <value xml:lang="en">ZIP code is missing from the origin postal
address ${contactMechId}</value>
+ <value xml:lang="it">Il CAP è mancante dall'indirizzo postale di
origine ${contactMechId}</value>
+ </property>
+ <property
key="FacilityShipmentUspsServiceStandardResponseIncompleteDaysElement">
+ <value xml:lang="en">Incomplete response from USPS ${serviceType}
Service Standards service: no Days element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS ${serviceType}
servizi Standards: nessun elemento Days trovato</value>
+ </property>
+ <property key="FacilityShipmentUspsServiceStandardSendingError">
+ <value xml:lang="en">Error sending request for USPS ${serviceType}
Service Standards service: ${errorString}</value>
+ <value xml:lang="it">Errore durante l'invio della richiesta a USPS
${serviceType} per i servizi Standards: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsShippableWeightMustGreaterThanZero">
+ <value xml:lang="en">Shippable Weight must be greater than zero</value>
+ <value xml:lang="it">Il peso della spedizione deve essere maggiore di
zero</value>
+ </property>
+ <property key="FacilityShipmentUspsTestMode">
+ <value xml:lang="en">Test Mode</value>
+ <value xml:lang="it">Modalità di test</value>
+ </property>
+ <property key="FacilityShipmentUspsTrackingIncompleteResponse">
+ <value xml:lang="en">Incomplete response from USPS Tracking service:
no TrackInfo element found</value>
+ <value xml:lang="it">Risposta incompleta da USPS servizio tracciatura:
nessun elemento TrackInfo trovato</value>
+ </property>
+ <property key="FacilityShipmentUspsTrackingSendingError">
+ <value xml:lang="en">Error sending request for USPS Tracking service:
${errorString}</value>
+ <value xml:lang="it">Errore nella richiesta inviata a USPS per la
tracciatura della spedizione: ${errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsUnableDetermineDestinationCountry">
+ <value xml:lang="en">Unable to determine the destination
country</value>
+ <value xml:lang="it">Non è possibile determinare il paese di
destinazione</value>
+ </property>
+ <property key="FacilityShipmentUspsUnableDetermineDestinationZip">
+ <value xml:lang="en">Unable to determine the destination ZIP</value>
+ <value xml:lang="it">Non è possibile determinare il CAP di
destinazione</value>
+ </property>
+ <property key="FacilityShipmentUspsUnableDetermineOriginationZip">
+ <value xml:lang="en">Unable to determine the origination ZIP</value>
+ <value xml:lang="it">Non è possibile determinare il CAP di
origine</value>
+ </property>
+ <property key="FacilityShipmentUspsUnableDetermineServiceCode">
+ <value xml:lang="en">Unable to determine the service code</value>
+ <value xml:lang="it">Non è possibile determinare il codice del
servizio</value>
+ </property>
+ <property key="FacilityShipmentUspsUnsupporteServiceType">
+ <value xml:lang="en">Unsupported service type: ${serviceType}</value>
+ <value xml:lang="it">Tipo servizio non supportato:
${serviceType}</value>
+ </property>
+ <property key="FacilityShipmentUspsWeightConversionError">
+ <value xml:lang="en">Error during weight conversion:
{errorString}</value>
+ <value xml:lang="it">Errore durante la conversione del peso:
{errorString}</value>
+ </property>
+ <property key="FacilityShipmentUspsWeightNotFound">
+ <value xml:lang="en">Weight not found for ShipmentPackage
${shipmentId} ${shipmentPackageSeqId}</value>
+ <value xml:lang="it">Peso non trovato per il pacco ${shipmentId}
${shipmentPackageSeqId}</value>
+ </property>
+ <property key="FacilityShipmentUspsWeightUnsupported">
+ <value xml:lang="en">Unsupported weightUom ${weightUomId} for
ShipmentPackage ${shipmentId} ${shipmentPackageSeqId}, could not find a
conversion factor for ${weightUom}</value>
+ <value xml:lang="it">Unità di misura peso non supportato
${weightUomId} per il pacco ${shipmentId} ${shipmentPackageSeqId}, non è
possibile trovare un fattore di conversione per ${weightUom}</value>
+ </property>
<property key="FacilityShipments">
<value xml:lang="de">Auslieferungen</value>
<value xml:lang="en">Shipments</value>
@@ -21885,7 +22098,7 @@
</property>
<property key="ProductShipmentRouteSegmentNotFound">
<value xml:lang="en">ShipmentRouteSegment not found with shipmentId
${shipmentId} and shipmentRouteSegmentId ${shipmentRouteSegmentId}</value>
- <value xml:lang="it">Percorso spedizione non trovato con shipmentId
${shipmentId} e shipmentRouteSegmentId ${shipmentRouteSegmentId}</value>
+ <value xml:lang="it">Percorso spedizione non trovata per la spedizione
${shipmentId} e il percorso spedizione ${shipmentRouteSegmentId}</value>
</property>
<property key="ProductShipmentThirdPartyAccountNumber">
<value xml:lang="de">Kontonummer Dritter</value>
Modified: ofbiz/trunk/applications/product/config/shipment.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/shipment.properties?rev=1054435&r1=1054434&r2=1054435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/shipment.properties (original)
+++ ofbiz/trunk/applications/product/config/shipment.properties Sun Jan 2
17:20:48 2011
@@ -137,9 +137,9 @@ shipment.usps.shipping=Y
shipment.usps.test=Y
# USPS Connection URL & timeout in seconds
-shipment.usps.connect.url=http://localhost:8080/facility/ShippingAPI.dll
+shipment.usps.connect.url=http://production.shippingapis.com/ShippingAPITest.dll
# Url for labels differs in that the url is the same whether testing or not
-shipment.usps.connect.url.labels=http://localhost:8080/facility/ShippingAPI.dll
+shipment.usps.connect.url.labels=http://production.shippingapis.com/ShippingAPITest.dll
shipment.usps.connect.timeout=60
# USPS Credentials
Modified: ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml?rev=1054435&r1=1054434&r2=1054435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ShipmentTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ShipmentTypeData.xml Sun Jan 2
17:20:48 2011
@@ -128,13 +128,14 @@ under the License.
<ShipmentGatewayConfigType shipmentGatewayConfTypeId="USPS" hasTable="N"
description="USPS Shipment Gateway"/>
<ShipmentGatewayConfig shipmentGatewayConfigId="USPS_CONFIG"
shipmentGatewayConfTypeId="USPS" description="USPS Config"/>
- <ShipmentGatewayUsps shipmentGatewayConfigId="USPS_CONFIG"
connectUrl="http://production.shippingapis.com/ShippingAPITest.dll";
connectTimeout="60" accessUserId="000000000000" accessPassword="999999999999"
maxEstimateWeight="70"/>
+ <ShipmentGatewayUsps shipmentGatewayConfigId="USPS_CONFIG"
connectUrl="http://production.shippingapis.com/ShippingAPITest.dll";
connectUrlLabels="http://production.shippingapis.com/ShippingAPITest.dll";
connectTimeout="60" accessUserId="000000000000" accessPassword="999999999999"
maxEstimateWeight="70" test="N"/>
<!-- Shipment Gateway custom methods by type -->
<CustomMethodType customMethodTypeId="SHIP_EST" parentTypeId=""
hasTable="N" description="Shipment Gateway rate estimate methods"/>
- <CustomMethod customMethodId="SHIP_EST_DHL"
customMethodTypeId="SHIP_EST" customMethodName="dhlRateEstimate"
description="DHL rate estimate"/>
- <CustomMethod customMethodId="SHIP_EST_FEDEX"
customMethodTypeId="SHIP_EST" customMethodName="fedexRateEstimate"
description="FedEx rate estimate"/>
- <CustomMethod customMethodId="SHIP_EST_UPS"
customMethodTypeId="SHIP_EST" customMethodName="upsRateEstimate"
description="UPS rate estimate"/>
- <CustomMethod customMethodId="SHIP_EST_USPS"
customMethodTypeId="SHIP_EST" customMethodName="uspsRateInquire"
description="USPS rate estimate"/>
+ <CustomMethod customMethodId="SHIP_EST_DHL"
customMethodTypeId="SHIP_EST" customMethodName="dhlRateEstimate"
description="DHL rate estimate"/>
+ <CustomMethod customMethodId="SHIP_EST_FEDEX"
customMethodTypeId="SHIP_EST" customMethodName="fedexRateEstimate"
description="FedEx rate estimate"/>
+ <CustomMethod customMethodId="SHIP_EST_UPS"
customMethodTypeId="SHIP_EST" customMethodName="upsRateEstimate"
description="UPS rate estimate"/>
+ <CustomMethod customMethodId="SHIP_EST_USPS"
customMethodTypeId="SHIP_EST" customMethodName="uspsRateInquire"
description="USPS rate estimate"/>
+ <CustomMethod customMethodId="SHIP_EST_USPS_INT"
customMethodTypeId="SHIP_EST" customMethodName="uspsInternationalRateInquire"
description="USPS rate estimate international"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=1054435&r1=1054434&r2=1054435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
(original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Sun Jan
2 17:20:48 2011
@@ -903,10 +903,12 @@ under the License.
title="USPS Shipment Gateway Configuration">
<field name="shipmentGatewayConfigId" type="id-ne"></field>
<field name="connectUrl" type="value"><description>USPS Connection
URL</description></field>
+ <field name="connectUrlLabels" type="value"><description>USPS Connection
URL for Labels</description></field>
<field name="connectTimeout" type="numeric"><description>Timeout in
seconds</description></field>
<field name="accessUserId" type="value" encrypt="true"><description>USPS
Access User ID</description></field>
<field name="accessPassword" type="value"
encrypt="true"><description>USPS Access Password</description></field>
<field name="maxEstimateWeight" type="numeric"><description>Estimate
split into packages</description></field>
+ <field name="test" type="short-varchar"><description>Test/Production
mode</description></field>
<prim-key field="shipmentGatewayConfigId"/>
<relation type="one" fk-name="SGUSPS_SGC"
rel-entity-name="ShipmentGatewayConfig">
<key-map field-name="shipmentGatewayConfigId"/>
Modified: ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml?rev=1054435&r1=1054434&r2=1054435&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml
(original)
+++ ofbiz/trunk/applications/product/servicedef/services_shipment_usps.xml Sun
Jan 2 17:20:48 2011
@@ -37,6 +37,8 @@ under the License.
<service name="uspsTrackConfirm" engine="java"
location="org.ofbiz.shipment.thirdparty.usps.UspsServices"
invoke="uspsTrackConfirm">
<attribute name="trackingId" type="String" mode="IN" optional="false"/>
+ <attribute name="shipmentGatewayConfigId" type="String" mode="IN"
optional="false"/>
+ <attribute name="configProps" type="String" mode="IN"
optional="false"/>
<attribute name="trackingSummary" type="String" mode="OUT"
optional="false"/>
<attribute name="trackingDetailList" type="List" mode="OUT"
optional="true"/>
</service>
@@ -49,11 +51,15 @@ under the License.
<attribute name="state" type="String" mode="INOUT" optional="true"/>
<attribute name="zip5" type="String" mode="INOUT" optional="true"/>
<attribute name="zip4" type="String" mode="INOUT" optional="true"/>
+ <attribute name="shipmentGatewayConfigId" type="String" mode="IN"
optional="false"/>
+ <attribute name="configProps" type="String" mode="IN"
optional="false"/>
<attribute name="returnText" type="String" mode="OUT" optional="true"/>
</service>
<service name="uspsCityStateLookup" engine="java"
location="org.ofbiz.shipment.thirdparty.usps.UspsServices"
invoke="uspsCityStateLookup">
<attribute name="zip5" type="String" mode="IN" optional="false"/>
+ <attribute name="shipmentGatewayConfigId" type="String" mode="IN"
optional="false"/>
+ <attribute name="configProps" type="String" mode="IN"
optional="false"/>
<attribute name="city" type="String" mode="OUT" optional="false"/>
<attribute name="state" type="String" mode="OUT" optional="false"/>
</service>
@@ -61,12 +67,16 @@ under the License.
location="org.ofbiz.shipment.thirdparty.usps.UspsServices"
invoke="uspsPriorityMailStandard">
<attribute name="originZip" type="String" mode="IN" optional="false"/>
<attribute name="destinationZip" type="String" mode="IN"
optional="false"/>
+ <attribute name="shipmentGatewayConfigId" type="String" mode="IN"
optional="false"/>
+ <attribute name="configProps" type="String" mode="IN"
optional="false"/>
<attribute name="days" type="String" mode="OUT" optional="false"/>
</service>
<service name="uspsPackageServicesStandard" engine="java"
location="org.ofbiz.shipment.thirdparty.usps.UspsServices"
invoke="uspsPackageServicesStandard">
<attribute name="originZip" type="String" mode="IN" optional="false"/>
<attribute name="destinationZip" type="String" mode="IN"
optional="false"/>
+ <attribute name="shipmentGatewayConfigId" type="String" mode="IN"
optional="false"/>
+ <attribute name="configProps" type="String" mode="IN"
optional="false"/>
<attribute name="days" type="String" mode="OUT" optional="false"/>
</service>
<service name="uspsDomesticRate" engine="java"
@@ -79,6 +89,8 @@ under the License.
<attribute name="container" type="String" mode="IN" optional="true"/>
<attribute name="size" type="String" mode="IN" optional="true"/>
<attribute name="machinable" type="String" mode="IN" optional="true"/>
+ <attribute name="shipmentGatewayConfigId" type="String" mode="IN"
optional="false"/>
+ <attribute name="configProps" type="String" mode="IN"
optional="false"/>
<attribute name="zone" type="String" mode="OUT" optional="false"/>
<attribute name="postage" type="String" mode="OUT" optional="false"/>
<attribute name="restrictionCodes" type="String" mode="OUT"
optional="true"/>
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1054435&r1=1054434&r2=1054435&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
Sun Jan 2 17:20:48 2011
@@ -1851,7 +1851,8 @@ public class UpsServices {
Map<String, BigDecimal> rateMap = FastMap.newInstance();
BigDecimal firstRate = null;
if (UtilValidate.isEmpty(rates)) {
- return
ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUpsNoRateAvailable", locale));
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
+ "FacilityShipmentRateNotAvailable", locale));
} else {
for (Element element: rates) {
// get service
