Subversion Repositories SmartDukaan

Rev

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

Rev 6787 Rev 6789
Line 1110... Line 1110...
1110
                __capture_txn(order)
1110
                __capture_txn(order)
1111
        order.status = OrderStatus.ACCEPTED
1111
        order.status = OrderStatus.ACCEPTED
1112
        order.statusDescription = "Order Accepted"
1112
        order.statusDescription = "Order Accepted"
1113
        order.accepted_timestamp = datetime.datetime.now()
1113
        order.accepted_timestamp = datetime.datetime.now()
1114
        __amend_fulfilment_warehouse(order)
1114
        __amend_fulfilment_warehouse(order)
-
 
1115
        __update_transfer_price(order, order.fulfilmentWarehouseId)
1115
        session.commit()
1116
        session.commit()
1116
        logging.info("Successfully accepted the order no.:" + str(orderId))
1117
        logging.info("Successfully accepted the order no.:" + str(orderId))
1117
        return True
1118
        return True
1118
    else:
1119
    else:
1119
        logging.warning("Accept called for the unacceptable order: " + str(orderId))
1120
        logging.warning("Accept called for the unacceptable order: " + str(orderId))
Line 2823... Line 2824...
2823
        else:
2824
        else:
2824
            raise TransactionServiceException(119, "Shifting of warehouse allowed to GOOD inventory type warehouse with billing support")
2825
            raise TransactionServiceException(119, "Shifting of warehouse allowed to GOOD inventory type warehouse with billing support")
2825
 
2826
 
2826
    inventoryClient.reserveItemInWarehouse(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)
2827
    inventoryClient.reserveItemInWarehouse(lineitem.item_id, warehouse.id, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), lineitem.quantity)
2827
    __update_inventory_reservation(order)
2828
    __update_inventory_reservation(order)
2828
 
-
 
-
 
2829
    if order.status == OrderStatus.ACCEPTED:
-
 
2830
        __update_transfer_price(order, warehouse.id)
2829
    order.warehouse_id = warehouse.billingWarehouseId
2831
    order.warehouse_id = warehouse.billingWarehouseId
2830
    order.fulfilmentWarehouseId = warehouse.id
2832
    order.fulfilmentWarehouseId = warehouse.id
2831
    session.commit()
2833
    session.commit()
2832
    return order
2834
    return order
2833
 
2835
 
-
 
2836
def __update_transfer_price(order, warehouse_id):
-
 
2837
    lineitem = order.lineitems[0]
-
 
2838
    inventory_client = InventoryClient().get_client()
-
 
2839
    warehouse = inventory_client.getWarehouse(warehouse_id)
-
 
2840
    item_pricing = inventory_client.getItemPricing(lineitem.item_id, warehouse.vendor.id)
-
 
2841
    lineitem.transfer_price = item_pricing.transferPrice
-
 
2842
    lineitem.nlc = item_pricing.nlc
-
 
2843
 
2834
def add_delay_reason(order_id, reason, further_delay, delayReasonText):
2844
def add_delay_reason(order_id, reason, further_delay, delayReasonText):
2835
    '''
2845
    '''
2836
    Adds a delay reason to the order and updates the expected delivery time.
2846
    Adds a delay reason to the order and updates the expected delivery time.
2837
    '''
2847
    '''
2838
    order = get_order(order_id)
2848
    order = get_order(order_id)