Added:
ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml?view=auto&rev=504996
==============================================================================
---
ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml
(added)
+++
ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml
Thu Feb 8 10:41:20 2007
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<#compress>
+
+ <#--
+ 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.
+ -->
+
+ <#-- FreeMarker template for Fedex FDXShipRequest -->
+
+ <FDXShipRequest xmlns:api="http://www.fedex.com/fsmapi";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="FDXShipRequest.xsd">
+ <RequestHeader>
+ <AccountNumber>${AccountNumber?xml}</AccountNumber>
+ <MeterNumber>${MeterNumber?xml}</MeterNumber>
+ <CarrierCode>${CarrierCode?xml}</CarrierCode>
+ </RequestHeader>
+ <ShipDate>${ShipDate?string("yyyy-MM-dd")}</ShipDate>
+ <ShipTime>${ShipTime?string("hh:mm:ss")}</ShipTime>
+ <DropoffType>${DropoffType?xml}</DropoffType>
+ <Service>${Service?xml}</Service>
+ <Packaging>${Packaging?xml}</Packaging>
+ <WeightUnits>${WeightUnits?xml}</WeightUnits>
+ <Weight>${Weight?xml}</Weight>
+ <CurrencyCode>${CurrencyCode?xml}</CurrencyCode>
+ <Origin>
+ <Contact>
+ <#if OriginContactPersonName?exists>
+ <PersonName>${OriginContactPersonName?xml}</PersonName>
+ <#elseif OriginContactCompanyName?exists>
+ <CompanyName>${OriginContactCompanyName?xml}</CompanyName>
+ </#if>
+ <PhoneNumber>${OriginContactPhoneNumber?xml}</PhoneNumber>
+ </Contact>
+ <Address>
+ <Line1>${OriginAddressLine1?xml}</Line1>
+ <#if OriginAddressLine2?exists>
+ <Line2>${OriginAddressLine2?xml}</Line2>
+ </#if>
+ <City>${OriginAddressCity?xml}</City>
+ <#if OriginAddressStateOrProvinceCode?exists>
+
<StateOrProvinceCode>${OriginAddressStateOrProvinceCode?xml}</StateOrProvinceCode>
+ </#if>
+ <PostalCode>${OriginAddressPostalCode?xml}</PostalCode>
+ <CountryCode>${OriginAddressCountryCode}</CountryCode>
+ </Address>
+ </Origin>
+ <Destination>
+ <Contact>
+ <#if DestinationContactPersonName?exists>
+
<PersonName>${DestinationContactPersonName?xml}</PersonName>
+ <#elseif DestinationContactCompanyName?exists>
+
<CompanyName>${DestinationContactCompanyName?xml}</CompanyName>
+ </#if>
+ <PhoneNumber>${DestinationContactPhoneNumber?xml}</PhoneNumber>
+ </Contact>
+ <Address>
+ <Line1>${DestinationAddressLine1?xml}</Line1>
+ <#if DestinationAddressLine2?exists>
+ <Line2>${DestinationAddressLine2?xml}</Line2>
+ </#if>
+ <City>${DestinationAddressCity?xml}</City>
+ <#if DestinationAddressStateOrProvinceCode?exists>
+
<StateOrProvinceCode>${DestinationAddressStateOrProvinceCode?xml}</StateOrProvinceCode>
+ </#if>
+ <PostalCode>${DestinationAddressPostalCode?xml}</PostalCode>
+ <CountryCode>${DestinationAddressCountryCode}</CountryCode>
+ </Address>
+ </Destination>
+ <Payment>
+ <PayorType>${PayorType?xml}</PayorType>
+ </Payment>
+ <ReferenceInfo>
+ <CustomerReference>${CustomerReference?xml}</CustomerReference>
+ </ReferenceInfo>
+ <#if DimensionsUnits?exists>
+ <Dimensions>
+ <#if DimensionsLength?exists>
+ <Length>${DimensionsLength?xml}</Length>
+ </#if>
+ <#if DimensionsWidth?exists>
+ <Width>${DimensionsWidth?xml}</Width>
+ </#if>
+ <#if DimensionsHeight?exists>
+ <Height>${DimensionsHeight?xml}</Height>
+ </#if>
+ <Units>${DimensionsUnits?xml}</Units>
+ </Dimensions>
+ </#if>
+ <#if HomeDeliveryType?exists>
+ <HomeDelivery>
+ <Type>${HomeDeliveryType?xml}</Type>
+ <#if HomeDeliveryDate?exists>
+ <Date>${HomeDeliveryDate?string("yyyy-MM-dd")}</Date>
+ </#if>
+ <PhoneNumber>${DestinationContactPhoneNumber?xml}</PhoneNumber>
+ </HomeDelivery>
+ </#if>
+ <Label>
+ <Type>${LabelType?xml}</Type>
+ <ImageType>${LabelImageType?xml}</ImageType>
+ </Label>
+ <#if HomeDeliveryType?exists>
+ <SpecialServices>
+ <ResidentialDelivery>true</ResidentialDelivery>
+ </SpecialServices>
+ </#if>
+
+ </FDXShipRequest>
+
+</#compress>
\ No newline at end of file
Propchange:
ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml?view=auto&rev=504996
==============================================================================
---
ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml
(added)
+++
ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml
Thu Feb 8 10:41:20 2007
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<#compress>
+
+ <#--
+ 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.
+ -->
+
+ <#-- FreeMarker template for Fedex FDXSubscriptionRequest -->
+
+ <FDXSubscriptionRequest xmlns:api="http://www.fedex.com/fsmapi";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="FDXSubscriptionRequest.xsd">
+ <RequestHeader>
+ <AccountNumber>${AccountNumber?xml}</AccountNumber>
+ </RequestHeader>
+ <Contact>
+ <PersonName>${PersonName?xml}</PersonName>
+ <CompanyName>${CompanyName?xml}</CompanyName>
+ <PhoneNumber>${PhoneNumber?xml}</PhoneNumber>
+ <#if FaxNumber?exists>
+ <FaxNumber>${FaxNumber?xml}</FaxNumber>
+ </#if>
+ <#if EMailAddress?exists>
+ <#-- Freemarker has a problem with the E-MailAddress tag name,
so the opening and closing tags need to be wrapped in the noparse directive. -->
+
<#noparse><E-MailAddress></#noparse>${EMailAddress?xml}<#noparse></E-MailAddress></#noparse>
+ </#if>
+ </Contact>
+ <Address>
+ <Line1>${Line1?xml}</Line1>
+ <#if Line2?exists>
+ <Line2>${Line2?xml}</Line2>
+ </#if>
+ <City>${City?xml}</City>
+ <#if StateOrProvinceCode?exists>
+
<StateOrProvinceCode>${StateOrProvinceCode?xml}</StateOrProvinceCode>
+ </#if>
+ <PostalCode>${PostalCode?xml}</PostalCode>
+ <CountryCode>${CountryCode?xml}</CountryCode>
+ </Address>
+ </FDXSubscriptionRequest>
+
+</#compress>
Propchange:
ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diff&rev=504996&r1=504995&r2=504996
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Thu
Feb 8 10:41:20 2007
@@ -953,6 +953,14 @@
<response name="error" type="view" value="EditShipmentRouteSegments"/>
</request-map>
+ <!-- Fedex carrier requests -->
+ <request-map uri="fedexShipmentConfirm">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="fedexShipRequest"/>
+ <response name="success" type="request-redirect"
value="EditShipmentRouteSegments"/>
+ <response name="error" type="view" value="EditShipmentRouteSegments"/>
+ </request-map>
+
<!-- ================ Shipment Items From Order Requests =================
-->
<request-map uri="AddItemsFromOrder">
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl?view=diff&rev=504996&r1=504995&r2=504996
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
Thu Feb 8 10:41:20 2007
@@ -51,7 +51,7 @@
<option
value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)}
[${weightUomOption.abbreviation}]</option>
</#list>
</select>
- <span class="tabletext">${uiLabelMap.ShipmentBoxType}:</span>
+ <span
class="tabletext">${uiLabelMap.ProductShipmentBoxType}:</span>
<select name="shipmentBoxTypeId" class="selectBox">
<option value=""> </option>
<#list boxTypes as boxType>
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?view=diff&rev=504996&r1=504995&r2=504996
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
Thu Feb 8 10:41:20 2007
@@ -27,6 +27,7 @@
<div
class="tableheadtext">${uiLabelMap.ProductOriginDestinationPhoneId}</div>
</td>
<td>
+ <div
class="tableheadtext">${uiLabelMap.ProductShipmentFedexHomeDeliveryTypeDate}</div>
<div class="tableheadtext">${uiLabelMap.ProductCarrierStatus}</div>
<div
class="tableheadtext">${uiLabelMap.ProductTrackingNumber}</div>
<div
class="tableheadtext">${uiLabelMap.ProductEstimatedStartArrive}</div>
@@ -147,7 +148,30 @@
<a
href="<@ofbizUrl>dhlShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductConfirmShipmentDHL}</a>
</#if>
</#if>
-
+ <#if "FEDEX" == shipmentRouteSegment.carrierPartyId?if_exists>
+ <#if !shipmentRouteSegment.carrierServiceStatusId?has_content
|| "SHRSCS_NOT_STARTED" ==
shipmentRouteSegment.carrierServiceStatusId?if_exists>
+ <a
href="<@ofbizUrl>fedexShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductConfirmShipmentFedex}</a>
+ <br/>
+ <#if shipmentMethodType?exists &&
shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME">
+ <select name="homeDeliveryType" class="selectBox">
+ <option
value="">${uiLabelMap.ProductShipmentNone}</option>
+ <option
${(shipmentRouteSegment.homeDeliveryType?default("")=="DATECERTAIN")?string("selected=\"selected\"","")}
value="DATECERTAIN">${uiLabelMap.ProductShipmentFedexHomeDateCertain}</option>
+ <option
${(shipmentRouteSegment.homeDeliveryType?default("")=="EVENING")?string("selected=\"selected\"","")}
value="EVENING">${uiLabelMap.ProductShipmentFedexHomeEvening}</option>
+ <option
${(shipmentRouteSegment.homeDeliveryType?default("")=="APPOINTMENT")?string("selected=\"selected\"","")}
value="APPOINTMENT">${uiLabelMap.ProductShipmentFedexHomeAppointment}</option>
+ </select>
+ <input type="text" size="25" name="homeDeliveryDate"
value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}"
class="inputBox"/><a
href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.homeDeliveryDate,
'${(shipmentRouteSegment.homeDeliveryDate.toString())?default(nowTimestampString)}');"><img
src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16'
height='16' border='0' alt='Calendar'></a>
+ </#if>
+ <#else>
+ <#-- Todo: implement closeout with Fedex -->
+ <#-- Todo: implement shipment cancellation with Fedex -->
+ <#-- Todo: implement shipment tracking with Fedex -->
+
${shipmentRouteSegment.homeDeliveryType?default(uiLabelMap.ProductShipmentNone)}
+ <#if shipmentRouteSegment.homeDeliveryDate?exists>
+
(${shipmentRouteSegment.homeDeliveryDate?string("yyyy-MM-dd")})
+ </#if>
+ <br/>
+ </#if>
+ </#if>
<br/>
<select name="carrierServiceStatusId" class="selectBox">
<#if carrierServiceStatusItem?has_content>
