Subversion Repositories SmartDukaan

Rev

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

Rev 2823 Rev 3044
Line 6... Line 6...
6 
 
 6 
 
7 
from shop2020.logistics.service.impl import DataService
 7 
from shop2020.logistics.service.impl import DataService
8 
from shop2020.logistics.service.impl.DataService import Awb, AwbUpdate, Provider, \
 8 
from shop2020.logistics.service.impl.DataService import Awb, AwbUpdate, Provider, \
9 
     DeliveryEstimate, WarehouseAllocation, DestinationProviderAllocation,\
 9 
     DeliveryEstimate, WarehouseAllocation, DestinationProviderAllocation,\
10 
    PublicHolidays
 10 
    PublicHolidays
11 
from shop2020.thriftpy.logistics.ttypes import LogisticsServiceException
 11 
from shop2020.thriftpy.logistics.ttypes import LogisticsServiceException,\
- 
 
 12 
    DeliveryType
12 
from shop2020.utils.Utils import log_entry, to_py_date, to_java_date
 13 
from shop2020.utils.Utils import log_entry, to_py_date, to_java_date
13 
from elixir import session
 14 
from elixir import session
14 
import datetime, time
 15 
import datetime, time
15 
import sys
 16 
import sys
16 
 
 17 
 
Line 73... Line 74...
73 
    query = Awb.query.filter_by(awb_number = awb_number)
 74 
    query = Awb.query.filter_by(awb_number = awb_number)
74 
    awb = query.one()
75 
    awb = query.one()
75 
    awb.is_available=False
 76 
    awb.is_available=False
76 
    session.commit()
 77 
    session.commit()
77
78
78 
def get_empty_AWB(provider_id):
 79 
def get_empty_AWB(provider_id, type = DeliveryType.PREPAID):
79 
    query = Awb.query.with_lockmode("update").filter_by(provider_id = provider_id, is_available = True)  #check the provider thing
 80 
    query = Awb.query.with_lockmode("update").filter_by(provider_id = provider_id, is_available = True)  #check the provider thing
- 
 
 81 
    if type == DeliveryType.PREPAID:
- 
 
 82 
        query = query.filter_by(type="Prepaid")
- 
 
 83 
    if type == DeliveryType.COD:
- 
 
 84 
        query = query.filter_by(type="COD")
- 
 
 85
80 
    try:
 86 
    try:
81 
        awb = query.first()
 87 
        awb = query.first()
82 
        awb.is_available = False
 88 
        awb.is_available = False
83 
        session.commit()
 89 
        session.commit()
84 
        return awb.awb_number
 90 
        return awb.awb_number