Subversion Repositories SmartDukaan

Rev

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

Rev 20815 Rev 20816
Line 71... Line 71...
71 
    SpecialInstruction = re.sub(' +',' ',SpecialInstruction)
 71 
    SpecialInstruction = re.sub(' +',' ',SpecialInstruction)
72 
    ser.SpecialInstruction = SpecialInstruction
 72 
    ser.SpecialInstruction = SpecialInstruction
73 
    cd.CommodityDetail1 = SpecialInstruction[:30]
 73 
    cd.CommodityDetail1 = SpecialInstruction[:30]
74 
    cd.CommodityDetail2 = SpecialInstruction[30:60]
 74 
    cd.CommodityDetail2 = SpecialInstruction[30:60]
75 
    cd.CommodityDetail3 = SpecialInstruction[60:]
 75 
    cd.CommodityDetail3 = SpecialInstruction[60:]
76 
    ser.CommodityDetail = cd
 76 
    ser.Commodity = cd
77 
    return ser
 77 
    return ser
78
78
79 
def clean_address(order, consignee):
 79 
def clean_address(order, consignee):
80 
    address_string = xstr(order.customer_address1)+" "+xstr(order.customer_address2)
 80 
    address_string = xstr(order.customer_address1)+" "+xstr(order.customer_address2)
81 
    address_string = re.sub(",",' ',address_string)
 81 
    address_string = re.sub(",",' ',address_string)
Line 156... Line 156...
156 
        d.Length = float(t_dimensions[0].strip())
 156 
        d.Length = float(t_dimensions[0].strip())
157 
        d.Breadth = float(t_dimensions[1].strip())
 157 
        d.Breadth = float(t_dimensions[1].strip())
158 
        d.Height = float(t_dimensions[2].strip())
 158 
        d.Height = float(t_dimensions[2].strip())
159 
        ser.Dimensions=[d]
 159 
        ser.Dimensions=[d]
160
160
161 
        cd = get_client().factory.create('ns2:CommodityDetail')
 161 
        cd = get_client().factory.create('ns2:Commodity')
162
162
163 
        ser = create_commodity_obj(orders_list, cd, ser)
 163 
        ser = create_commodity_obj(orders_list, cd, ser)
164
164
165 
        wbg.Consignee = consignee
 165 
        wbg.Consignee = consignee
166 
        wbg.Services = ser
 166 
        wbg.Services = ser