Subversion Repositories SmartDukaan

Rev

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

Rev 16971 Rev 17099
Line 158... Line 158...
158
                if cols[3].text.strip()!='-' and 'Rs.' in cols[3].text.strip():
158
                if cols[3].text.strip()!='-' and 'Rs.' in cols[3].text.strip():
159
                    discount = long(cols[3].text.strip().replace("Rs.","").replace(',',''))
159
                    discount = long(cols[3].text.strip().replace("Rs.","").replace(',',''))
160
                else:
160
                else:
161
                    discount = 0
161
                    discount = 0
162
                subtotal = long(cols[4].text.strip().replace("Rs.","").replace(',',''))
162
                subtotal = long(cols[4].text.strip().replace("Rs.","").replace(',',''))
-
 
163
            elif totalColumns == 6:
-
 
164
                if cols[3].text.strip()!='-' and 'Rs.' in cols[3].text.strip():
-
 
165
                    discount = long(cols[3].text.strip().replace("Rs.","").replace(',',''))
-
 
166
                else:
-
 
167
                    discount = 0
-
 
168
                subtotal = long(cols[5].text.strip().replace("Rs.","").replace(',',''))
163
            else:
169
            else:
164
                subtotal = long(cols[3].text.strip().replace("Rs.","").replace(',',''))
170
                subtotal = long(cols[3].text.strip().replace("Rs.","").replace(',',''))
165
            productDetailsSubMap['productUrl']=BASE_MURL+productUrl
171
            productDetailsSubMap['productUrl']=BASE_MURL+productUrl
166
            productDetailsSubMap['productName']=productName
172
            productDetailsSubMap['productName']=productName
167
            productDetailsSubMap['subOrderTrackingUrl']=ORDER_TRACK_URL_DB+'order_id=' +str(orderId)+'&email_id='+ orderObj['0']['email']
173
            productDetailsSubMap['subOrderTrackingUrl']=ORDER_TRACK_URL_DB+'order_id=' +str(orderId)+'&email_id='+ orderObj['0']['email']