WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py

 '''
 from shop2020.thriftpy.logistics.ttypes import LogisticsInfo,\
     LogisticsServiceException, DeliveryType
 from shop2020.logistics.service.impl.DataAccessor import get_empty_AWB,\
     get_shipment_info, initialize, get_logistics_estimation, get_provider,\
-    get_providers, close_session, get_free_awb_count, get_holidays
+    get_providers, close_session, get_free_awb_count, get_holidays,\
+    is_cod_allowed
 from shop2020.logistics.service.impl.Converters import to_t_awbupdate,\
     to_t_provider
 from shop2020.clients.InventoryClient import InventoryClient
 from shop2020.config.client.ConfigClient import ConfigClient
 import datetime
     def __init__(self, dbname='logistics'):
         initialize(dbname)
         try:
             config_client = ConfigClient()
             self.cutoff_time = int(config_client.get_property('delivery_cutoff_time'))
+            self.cod_cutoff_time = 0 #int(config_client.get_property('delivery_cutoff_time'))
             self.stock_threshold = int(config_client.get_property('inventory_stock_threshold'))
-            self.time_to_producre = int(config_client.get_property('inventory_time_to_procure'))
+            self.time_to_procure = int(config_client.get_property('inventory_time_to_procure'))
             self.default_pincode = int(config_client.get_property('default_pincode'))
         except Exception as ex:
             print "[ERROR] Unexpected config error:", sys.exc_info()[0]
             self.cutoff_time = 15
+            self.cod_cutoff_time = 0
             self.stock_threshold = 2
-            self.time_to_producre = 48
+            self.time_to_procure = 48
             self.default_pincode = "110001"
         ##FIXME
+        '''
         self.kanwaar_effected_pins_by_two_days = ['244713', '247667', '248001', '248002', '248003', '248005', '248006',
                                              '248008', '248009', '248110', '248146', '248171', '248179', '249201',
                                              '249401', '249403', '249404', '249407', '249408', '249409', '249410',
                                              '249411', '262405', '263139', '263153']
         self.kanwaar_effected_pins_by_one_day = ['201001', '201002', '201003', '201004', '201005', '201007', '201009',
                                             '201010', '201011', '201012', '201014', '201204', '202001', '202002',
                                             '203001', '203131', '204101']
+        '''
     def getProvider(self, providerId):
         """
         Returns a provider for a given provider ID. Throws an exception if none found.
         Parameters:
             client = InventoryClient().get_client()
             item = client.getItem(itemId)
         except Exception as ex:
             raise LogisticsServiceException(103, "Unable to fetch inventory information about this item.")
-        delivery_estimate = get_logistics_estimation(destination_pin, item.sellingPrice)
+        delivery_estimate = get_logistics_estimation(destination_pin, item.sellingPrice, None, type)
         if delivery_estimate is None:
             raise LogisticsServiceException(104, "Unable to fetch delivery estimate for this pincode.")
         warehouse_loc = delivery_estimate.warehouse_location
         try:
         except Exception as ex:
             raise LogisticsServiceException(103, "Unable to fetch inventory information about this item.")
         # We are revising the estimated based on the actual warehouse that will be assigned to this order.
         # This warehouse may be located in a different zone that the one we allocated for this pincode.
-        delivery_estimate = get_logistics_estimation(destination_pin, item.sellingPrice, warehouse_loc)
+        delivery_estimate = get_logistics_estimation(destination_pin, item.sellingPrice, warehouse_loc, type)
         if delivery_estimate is None:
             raise LogisticsServiceException(105, "Unable to fetch delivery estimate for pincode: " + destination_pin + " and revised location: " + str(warehouse_loc))
         delivery_time = 24*delivery_estimate.delivery_time
         # Increase the estimate if the actual stock is less than the threshold
         if items_in_inventory < self.stock_threshold :
-            delivery_time = delivery_time + self.time_to_producre
+            delivery_time = delivery_time + self.time_to_procure
         #Further increase the estimate if it's late in the day
-        if self.cutoff_time <= datetime.datetime.now().hour:
+        current_hour = datetime.datetime.now().hour
+        if type == DeliveryType.PREPAID and self.cutoff_time <= current_hour:
+            delivery_time = delivery_time + 24
+        elif type == DeliveryType.COD and self.cod_cutoff_time <= current_hour:
             delivery_time = delivery_time + 24
         delivery_time = int(math.ceil(delivery_time/24.0))
+        '''
         ## FIXME Due to Kanwaar on the delhi Dehradun route deliveries on following pin codes will be effected.
         ## Changing as per ticket number #462
         if destination_pin in self.kanwaar_effected_pins_by_two_days:
-            delivery_time += 2;
+            delivery_time += 2
         elif destination_pin in self.kanwaar_effected_pins_by_one_day:
-            delivery_time += 1;
+            delivery_time += 1
         ## FIXME Remove the above code once Kanwaar season is over
+        '''
         logistics_info = LogisticsInfo()
         logistics_info.deliveryTime = delivery_time
         logistics_info.providerId = delivery_estimate.provider_id
         logistics_info.warehouseId = warehouse_id
         """
         try:
             return get_holidays(fromDate, toDate)
         finally:
             close_session()
+    def isCodAllowed(self, destination_pincode):
+        """
+        Returns true if COD is allowed for this destination pincode
+        Parameters:
+         - destination_pincode
+        """
+        try:
+            return is_cod_allowed(destination_pincode)
+        finally:
+            close_session()
     def closeSession(self, ):
         close_session()

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py – Rev 3044 → 3064