svn commit: r1840581 - in /ofbiz/ofbiz-plugins/trunk: ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java

[nmalin]

Author: nmalin
Date: Tue Sep 11 14:49:49 2018
New Revision: 1840581

URL: http://svn.apache.org/viewvc?rev=1840581&view=rev
Log:
Implemented: Calculate estimated shipment delivery time
(OFBIZ-10372)
resynchronise ShoppingCart.makeAllShipGroupInfos function on ebay component with trunk at revision 1840579

Modified:
    ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
    ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java
    ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java

Modified: ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java?rev=1840581&r1=1840580&r2=1840581&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java Tue Sep 11 14:49:49 2018
@@ -1205,7 +1205,7 @@ public class EbayOrderServices {
 
                 Debug.logInfo("Setting shipment method: " + (String) shippingServiceSelectedCtx.get("shippingService"), module);
                 EbayHelper.setShipmentMethodType(cart, (String) shippingServiceSelectedCtx.get("shippingService"), productStoreId, delegator);
-                cart.makeAllShipGroupInfos();
+                cart.makeAllShipGroupInfos(dispatcher);
 
                 // create the order
                 Debug.logInfo("Creating CheckOutHelper.", module);

Modified: ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java?rev=1840581&r1=1840580&r2=1840581&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java Tue Sep 11 14:49:49 2018
@@ -786,7 +786,7 @@ public class ImportOrdersFromEbay {
                 Debug.logInfo("Setting shipment method: " + (String) parameters.get("shippingService"), module);
                 EbayHelper.setShipmentMethodType(cart, (String) parameters.get("shippingService"), productStoreId, delegator);
 
-                cart.makeAllShipGroupInfos();
+                cart.makeAllShipGroupInfos(dispatcher);
 
                 // create the order
                 Debug.logInfo("Creating CheckOutHelper.", module);

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java?rev=1840581&r1=1840580&r2=1840581&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java Tue Sep 11 14:49:49 2018
@@ -277,7 +277,7 @@ public class EbayStoreOrder {
                 Debug.logInfo("Setting shipment method: " + context.get("shippingService").toString(), module);
                 EbayHelper.setShipmentMethodType(cart, context.get("shippingService").toString(), productStoreId, delegator);
 
-                cart.makeAllShipGroupInfos();
+                cart.makeAllShipGroupInfos(dispatcher);
 
                 // create the order
                 Debug.logInfo("Creating CheckOutHelper.", module);
@@ -510,7 +510,7 @@ public class EbayStoreOrder {
 
             Debug.logInfo("Setting shipment method: " + (String) shippingServiceSelectedCtx.get("shippingService"), module);
             EbayHelper.setShipmentMethodType(cart, (String) shippingServiceSelectedCtx.get("shippingService"), productStoreId, delegator);
-            cart.makeAllShipGroupInfos();
+            cart.makeAllShipGroupInfos(dispatcher);
 
             // create the order
             Debug.logInfo("Creating CheckOutHelper.", module);