Subversion Repositories SmartDukaan

Rev

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

Rev 11793 Rev 11815
Line 387... Line 387...
387
            
387
            
388
            order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
388
            order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
389
            order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
389
            order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
390
            order.promised_shipping_time = order.expected_shipping_time
390
            order.promised_shipping_time = order.expected_shipping_time
391
            order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
391
            order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
392
            order.promised_delivery_time = order.expected_delivery_time 
392
            order.promised_delivery_time = order.expected_delivery_time
393
            
393
             
394
            if order.pickupStoreId:
394
            if order.pickupStoreId:
395
                order.otg = False
395
                order.otg = False
396
                
396
                
397
            inventory_client = InventoryClient().get_client()
397
            inventory_client = InventoryClient().get_client()
398
            if order.productCondition != ProductCondition.BAD:
398
            if order.productCondition != ProductCondition.BAD:
Line 517... Line 517...
517
                    helper_client = HelperClient().get_client()
517
                    helper_client = HelperClient().get_client()
518
                    helper_client.saveUserEmailForSending(store.approvalEmail.split(';'), "", "Price approval requested for " + str(order.lineitems[0]) + " order Id " + str(order.id) + " in store " + store.hotspotId , content, str(transaction_id), "PriceApproval", [], [], order.source)
518
                    helper_client.saveUserEmailForSending(store.approvalEmail.split(';'), "", "Price approval requested for " + str(order.lineitems[0]) + " order Id " + str(order.id) + " in store " + store.hotspotId , content, str(transaction_id), "PriceApproval", [], [], order.source)
519
                    session.commit()
519
                    session.commit()
520
            else:
520
            else:
521
                order.otg = False
521
                order.otg = False
-
 
522
                session.commit()
522
        except Exception as e:
523
        except Exception as e:
523
            print "Error inserting transaction Id: " + str(transaction_id) + " due to " + str(e)
524
            print "Error inserting transaction Id: " + str(transaction_id) + " due to " + str(e)
524
 
525
 
525
    return True
526
    return True
526
 
527