WebSVN – SmartDukaan – Diff – //trunk/PyDTR/src/dtr/sources/shopclues.py



            subOrder.cashBackStatus = cashbackStatus
            subOrder.cashBackAmount = cashbackAmount
            subOrder.cashBackPercentage = percentage
        return subOrders
        
    def _parseOrders(self, orderId, mpOrderId, subTagId, userId, page, orderSuccessUrl, orderObj):
        soup = BeautifulSoup(page)
        productDetailsMap = {}
        paymentFields = soup.findAll(attrs={'class' : 'box_paymentcalculations_row'})
        orderDateList = soup.findAll(attrs={'class':'price ord_date'})
        placedOn= orderDateList[0].text.strip().replace("\t","").replace("\n","").replace("  ","")

                            ordertotal = val.contents[3].text.strip().replace("Rs.","")
                            ordertotal = ordertotal.replace(',','')
                            print ordertotal
        
        if orderObj['0']['is_parent_order'] == 'N':
            productDetailsMap = self._getSingleSubOrderMap(mpOrderId, soup, orderObj)
        else:
            productDetailsMap = self._getMultiSubOrdersMap(mpOrderId, soup, orderObj)
            
        merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl)
        merchantOrder.placedOn = placedOn
        merchantOrder.merchantOrderId = orderObj['0']['order_id']
        merchantOrder.paidAmount = ordertotal

                if header[0] == 'Content-Type' and 'json' in header[1]:
                    jsonResponse = json.loads(page)
            if jsonResponse is not None:
                page = jsonResponse['text']
            
            merchantOrder = self._parseOrders(orderId, merchantOrderId, subTagId, userId, page, orderSuccessUrl, orderObj)
            
            merchantOrder.orderTrackingUrl = ORDER_TRACK_URL_DB + 'order_id=' +str(orderId)+'&email_id='+ emailId
               
            if self._saveToOrder(todict(merchantOrder)):
                resp['result'] = 'ORDER_CREATED'

Subversion Repositories SmartDukaan

(root)//trunk/PyDTR/src/dtr/sources/shopclues.py – Rev 15942 → 15947

Rev 15942		Rev 15947
Line 260...		Line 260...
260	`subOrder.cashBackStatus = cashbackStatus`	260	`subOrder.cashBackStatus = cashbackStatus`
261	`subOrder.cashBackAmount = cashbackAmount`	261	`subOrder.cashBackAmount = cashbackAmount`
262	`subOrder.cashBackPercentage = percentage`	262	`subOrder.cashBackPercentage = percentage`
263	`return subOrders`	263	`return subOrders`
264		264
265	`def _parseOrders(self, orderId, subTagId, userId, page, orderSuccessUrl, orderObj):`	265	`def _parseOrders(self, orderId, mpOrderId, subTagId, userId, page, orderSuccessUrl, orderObj):`
266	`soup = BeautifulSoup(page)`	266	`soup = BeautifulSoup(page)`
267	`productDetailsMap = {}`	267	`productDetailsMap = {}`
268	`paymentFields = soup.findAll(attrs={'class' : 'box_paymentcalculations_row'})`	268	`paymentFields = soup.findAll(attrs={'class' : 'box_paymentcalculations_row'})`
269	`orderDateList = soup.findAll(attrs={'class':'price ord_date'})`	269	`orderDateList = soup.findAll(attrs={'class':'price ord_date'})`
270	`placedOn= orderDateList[0].text.strip().replace("\t","").replace("\n","").replace(" ","")`	270	`placedOn= orderDateList[0].text.strip().replace("\t","").replace("\n","").replace(" ","")`
Line 290...		Line 290...
290	`ordertotal = val.contents[3].text.strip().replace("Rs.","")`	290	`ordertotal = val.contents[3].text.strip().replace("Rs.","")`
291	`ordertotal = ordertotal.replace(',','')`	291	`ordertotal = ordertotal.replace(',','')`
292	`print ordertotal`	292	`print ordertotal`
293		293
294	`if orderObj['0']['is_parent_order'] == 'N':`	294	`if orderObj['0']['is_parent_order'] == 'N':`
295	`productDetailsMap = self._getSingleSubOrderMap(orderId, soup, orderObj)`	295	`productDetailsMap = self._getSingleSubOrderMap(mpOrderId, soup, orderObj)`
296	`else:`	296	`else:`
297	`productDetailsMap = self._getMultiSubOrdersMap(orderId, soup, orderObj)`	297	`productDetailsMap = self._getMultiSubOrdersMap(mpOrderId, soup, orderObj)`
298		298
299	`merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl)`	299	`merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl)`
300	`merchantOrder.placedOn = placedOn`	300	`merchantOrder.placedOn = placedOn`
301	`merchantOrder.merchantOrderId = orderObj['0']['order_id']`	301	`merchantOrder.merchantOrderId = orderObj['0']['order_id']`
302	`merchantOrder.paidAmount = ordertotal`	302	`merchantOrder.paidAmount = ordertotal`
Line 351...		Line 351...
351	`if header[0] == 'Content-Type' and 'json' in header[1]:`	351	`if header[0] == 'Content-Type' and 'json' in header[1]:`
352	`jsonResponse = json.loads(page)`	352	`jsonResponse = json.loads(page)`
353	`if jsonResponse is not None:`	353	`if jsonResponse is not None:`
354	`page = jsonResponse['text']`	354	`page = jsonResponse['text']`
355		355
356	`merchantOrder = self._parseOrders(orderId, subTagId, userId, page, orderSuccessUrl, orderObj)`	356	`merchantOrder = self._parseOrders(orderId, merchantOrderId, subTagId, userId, page, orderSuccessUrl, orderObj)`
357		357
358	`merchantOrder.orderTrackingUrl = ORDER_TRACK_URL_DB + 'order_id=' +str(orderId)+'&email_id='+ emailId`	358	`merchantOrder.orderTrackingUrl = ORDER_TRACK_URL_DB + 'order_id=' +str(orderId)+'&email_id='+ emailId`
359		359
360	`if self._saveToOrder(todict(merchantOrder)):`	360	`if self._saveToOrder(todict(merchantOrder)):`
361	`resp['result'] = 'ORDER_CREATED'`	361	`resp['result'] = 'ORDER_CREATED'`