Subversion Repositories SmartDukaan

Rev

Rev 20039 | Rev 20072 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 20039 Rev 20065
Line 3017... Line 3017...
3017
                monitoredEntity.entityIdentifier="orderId = " + str(order.id);
3017
                monitoredEntity.entityIdentifier="orderId = " + str(order.id);
3018
        
3018
        
3019
                sec = datetime.datetime.now()
3019
                sec = datetime.datetime.now()
3020
                #Warn alert time is taken as expected delivery time
3020
                #Warn alert time is taken as expected delivery time
3021
                warn_time1 = (order.expected_delivery_time)
3021
                warn_time1 = (order.expected_delivery_time)
3022
                warn_time2 = sec + timedelta(order.expected_delivery_time - order.expected_shipping_timestamp) - timedelta(sec - order.shipping_time)
3022
                warn_time2 = sec + timedelta(order.expected_delivery_time - order.expected_shipping_time) - timedelta(sec - order.shipping_time)
3023
                warn_time = max(warn_time1, warn_time2)
3023
                warn_time = max(warn_time1, warn_time2)
3024
                
3024
                
3025
                #Critical alert time is taken as 13 hrs less than promised delivery time                    
3025
                #Critical alert time is taken as 13 hrs less than promised delivery time                    
3026
                critical_time1 = (order.expected_delivery_time + timedelta(hours = 5))
3026
                critical_time1 = (order.expected_delivery_time + timedelta(hours = 5))
3027
                critical_time2  = sec + timedelta(order.expected_delivery_time - order.expected_shipping_timestamp) - timedelta(sec - order.shipping_time) + timedelta(hours = 5)
3027
                critical_time2  = sec + timedelta(order.expected_delivery_time - order.expected_shipping_time) - timedelta(sec - order.shipping_time) + timedelta(hours = 5)
3028
                critical_time = max(critical_time1, critical_time2)
3028
                critical_time = max(critical_time1, critical_time2)
3029
                
3029
                
3030
                monitoredEntity.warnExpiryTime = int(warn_time.strftime("%s"))*1000
3030
                monitoredEntity.warnExpiryTime = int(warn_time.strftime("%s"))*1000
3031
                monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
3031
                monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
3032
                monitoredEntity.description="providerId = " + str(provider_id) + " destination city " + order.customer_city 
3032
                monitoredEntity.description="providerId = " + str(provider_id) + " destination city " + order.customer_city 
Line 4039... Line 4039...
4039
    '''
4039
    '''
4040
    new_order.airwaybill_no = logistics_info.airway_billno
4040
    new_order.airwaybill_no = logistics_info.airway_billno
4041
    new_order.tracking_id = new_order.airwaybill_no
4041
    new_order.tracking_id = new_order.airwaybill_no
4042
    '''
4042
    '''
4043
    new_order.source = order.source
4043
    new_order.source = order.source
-
 
4044
    order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-
 
4045
    new_order.promised_delivery_time = new_order.expected_delivery_time
-
 
4046
    new_order.promised_shipping_time = order.promised_shipping_time
4044
    
4047
    
4045
    if reserved:
4048
    if reserved:
4046
        order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-
 
4047
        new_order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
4049
        new_order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
4048
        new_order.promised_delivery_time = new_order.expected_delivery_time
-
 
4049
        new_order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
4050
        new_order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
4050
        new_order.promised_shipping_time = new_order.expected_shipping_time
-
 
4051
    else:
4051
    else:
4052
        order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-
 
4053
        new_order.expected_delivery_time = order.expected_delivery_time
4052
        new_order.expected_delivery_time = order.expected_delivery_time
4054
        new_order.promised_delivery_time = order.promised_delivery_time
-
 
4055
        new_order.expected_shipping_time = order.expected_shipping_time
4053
        new_order.expected_shipping_time = order.expected_shipping_time
4056
        new_order.promised_shipping_time = order.promised_shipping_time
-
 
4057
        
4054
        
4058
    if should_copy_billing_info:
4055
    if should_copy_billing_info:
4059
        new_order.vendorId = order.vendorId
4056
        new_order.vendorId = order.vendorId
4060
        new_order.invoice_number = order.invoice_number
4057
        new_order.invoice_number = order.invoice_number
4061
        new_order.billed_by = order.billed_by
4058
        new_order.billed_by = order.billed_by
Line 10993... Line 10990...
10993
        buyerInfo.buyerId = buyerId
10990
        buyerInfo.buyerId = buyerId
10994
        buyerInfo.stateId = sellerInfo.stateId 
10991
        buyerInfo.stateId = sellerInfo.stateId 
10995
        addressMapping = session.query(WarehouseAddressMaster).join((WarehouseAddressMapping,WarehouseAddressMapping.address_id==WarehouseAddressMaster.id)).filter(WarehouseAddressMapping.warehouse_id==warehouse_id).first()
10992
        addressMapping = session.query(WarehouseAddressMaster).join((WarehouseAddressMapping,WarehouseAddressMapping.address_id==WarehouseAddressMaster.id)).filter(WarehouseAddressMapping.warehouse_id==warehouse_id).first()
10996
        if addressMapping is not None:
10993
        if addressMapping is not None:
10997
            buyerInfo.addressId = addressMapping.id
10994
            buyerInfo.addressId = addressMapping.id
10998
            buyerInfo.address = addressMapping
10995
            buyerInfo.address = to_t_warehouse_address(addressMapping)
10999
        else:
10996
        else:
11000
            return None
10997
            return None
11001
        return buyerInfo
10998
        return buyerInfo
11002
if __name__ == '__main__':
10999
if __name__ == '__main__':
11003
    print get_orders_by_mobile_number("9650889334")
11000
    print get_orders_by_mobile_number("9650889334")