Subversion Repositories SmartDukaan

Rev

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

Rev 20816 Rev 20817
Line 63... Line 63...
63 
        shipper = ship
 63 
        shipper = ship
64 
    return shipper
 64 
    return shipper
65 
 
 65 
 
66 
def create_commodity_obj(orders_list, cd, ser):
 66 
def create_commodity_obj(orders_list, cd, ser):
67 
    SpecialInstruction = ""
 67 
    SpecialInstruction = ""
- 
 
 68 
    it=0
68 
    for order in orders_list:
 69 
    for order in orders_list:
- 
 
 70 
        it+=1
69 
        temp = xstr(order.lineitems[0].brand)+" "+xstr(order.lineitems[0].model_name)+" "+xstr(order.lineitems[0].model_number)+" "+xstr(order.lineitems[0].color)+"-"+str(order.lineitems[0].quantity)
 71 
        temp = xstr(order.lineitems[0].brand)+" "+xstr(order.lineitems[0].model_name)+" "+xstr(order.lineitems[0].model_number)+" "+xstr(order.lineitems[0].color)+"-"+str(order.lineitems[0].quantity)
70 
        SpecialInstruction+=temp+","
 72 
        SpecialInstruction+=temp
- 
 
 73 
        if len(orders_list) == it:
- 
 
 74 
            pass
- 
 
 75 
        else:
- 
 
 76 
            SpecialInstruction+=","
- 
 
 77
71 
    SpecialInstruction = re.sub(' +',' ',SpecialInstruction)
 78 
    SpecialInstruction = re.sub(' +',' ',SpecialInstruction)
72 
    ser.SpecialInstruction = SpecialInstruction
 79 
    ser.SpecialInstruction = SpecialInstruction[:50]
73 
    cd.CommodityDetail1 = SpecialInstruction[:30]
 80 
    cd.CommodityDetail1 = SpecialInstruction[:30]
74 
    cd.CommodityDetail2 = SpecialInstruction[30:60]
 81 
    cd.CommodityDetail2 = SpecialInstruction[30:60]
75 
    cd.CommodityDetail3 = SpecialInstruction[60:]
 82 
    cd.CommodityDetail3 = SpecialInstruction[60:90]
76 
    ser.Commodity = cd
 83 
    ser.Commodity = cd
77 
    return ser
 84 
    return ser
78
85
79 
def clean_address(order, consignee):
 86 
def clean_address(order, consignee):
80 
    address_string = xstr(order.customer_address1)+" "+xstr(order.customer_address2)
 87 
    address_string = xstr(order.customer_address1)+" "+xstr(order.customer_address2)