Subversion Repositories SmartDukaan

Rev

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

Rev 16370 Rev 16420
Line 101... Line 101...
101 
        print "Detailed Status need to be mapped", detailedStatus, self.store_id
 101 
        print "Detailed Status need to be mapped", detailedStatus, self.store_id
102 
        return None
 102 
        return None
103
103
104 
    def _getSingleSubOrderMap(self, orderId, soup, orderObj):
 104 
    def _getSingleSubOrderMap(self, orderId, soup, orderObj):
105 
        orderStatus = self.OrderStatusConfirmationMap.get(orderObj['0']['status'])
 105 
        orderStatus = self.OrderStatusConfirmationMap.get(orderObj['0']['status'])
106 
        statusTime= soup.findAll(attrs={'class' : 'sts no_mobile'})[1].contents[2].strip()
 106 
        statusTime= str(to_py_date(long(orderObj['0']['timestamp'])))
107 
        productDetailsMap = {}
 107 
        productDetailsMap = {}
108 
        orderTables = soup.body.findAll("table", {'class':'table product-list'})
 108 
        orderTables = soup.body.findAll("table", {'class':'table product-list'})
109 
        orderTable = orderTables[len(orderTables)-1].findAll('tr', recursive=False)
 109 
        orderTable = orderTables[len(orderTables)-1].findAll('tr', recursive=False)
110 
        firstRow = orderTable.pop(0)
 110 
        firstRow = orderTable.pop(0)
111 
        totalColumns = len(firstRow.find_all('th'))
 111 
        totalColumns = len(firstRow.find_all('th'))
Line 119... Line 119...
119 
                splitKey = key.split('-')
 119 
                splitKey = key.split('-')
120 
                if orderObj['0']['is_parent_order'] == 'N':
 120 
                if orderObj['0']['is_parent_order'] == 'N':
121 
                    if str(val['order_id']) == splitKey[0]:
 121 
                    if str(val['order_id']) == splitKey[0]:
122 
                        counts.append(int(splitKey[1]))
 122 
                        counts.append(int(splitKey[1]))
123 
                else:
 123 
                else:
- 
 
 124 
                    if val['child'] is None:
- 
 
 125 
                        if str(val['order_id']) == splitKey[0]:
- 
 
 126 
                            counts.append(int(splitKey[1]))
- 
 
 127 
                    else:
124 
                    if str(val['child']) == splitKey[0]:
 128 
                        if str(val['child']) == splitKey[0]:
125 
                        counts.append(int(splitKey[1]))
 129 
                            counts.append(int(splitKey[1]))
126
130
127 
            if len(counts) >0:
 131 
            if len(counts) >0:
128 
                newCount = max(counts)
 132 
                newCount = max(counts)
129 
            count = newCount +1
 133 
            count = newCount +1
130 
            if orderObj['0']['is_parent_order'] == 'N':
 134 
            if orderObj['0']['is_parent_order'] == 'N':
131 
                jsonSubOrdersMap[str(val['order_id'])+'-'+str(count)] = val
 135 
                jsonSubOrdersMap[str(val['order_id'])+'-'+str(count)] = val
132 
            else:
 136 
            else:
- 
 
 137 
                if val['child'] is None:
- 
 
 138 
                    jsonSubOrdersMap[str(val['order_id'])+'-'+str(count)] = val
- 
 
 139 
                else:
133 
                jsonSubOrdersMap[str(val['child'])+'-'+str(count)] = val
 140 
                    jsonSubOrdersMap[str(val['child'])+'-'+str(count)] = val
134
141
135
142
136
143
137 
        print jsonSubOrdersMap.items()
 144 
        print jsonSubOrdersMap.items()
138
145
Line 293... Line 300...
293 
                            print 'Order Total:- ',ordertotal
 300 
                            print 'Order Total:- ',ordertotal
294
301
295 
        if orderObj['0']['is_parent_order'] == 'N':
 302 
        if orderObj['0']['is_parent_order'] == 'N':
296 
            productDetailsMap = self._getSingleSubOrderMap(mpOrderId, soup, orderObj)
 303 
            productDetailsMap = self._getSingleSubOrderMap(mpOrderId, soup, orderObj)
297 
        else:
 304 
        else:
- 
 
 305 
            if orderObj['0']['items'].values()[0]['child'] is None:
- 
 
 306 
                productDetailsMap = self._getSingleSubOrderMap(mpOrderId, soup, orderObj)
- 
 
 307 
            else:
298 
            productDetailsMap = self._getMultiSubOrdersMap(mpOrderId, soup, orderObj)
 308 
                productDetailsMap = self._getMultiSubOrdersMap(mpOrderId, soup, orderObj)
299
309
300 
        merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl)
 310 
        merchantOrder = Order(orderId, userId, subTagId, self.store_id, orderSuccessUrl)
301 
        merchantOrder.placedOn = placedOn
 311 
        merchantOrder.placedOn = placedOn
302 
        merchantOrder.merchantOrderId = orderObj['0']['order_id']
 312 
        merchantOrder.merchantOrderId = orderObj['0']['order_id']
303 
        merchantOrder.paidAmount = ordertotal
 313 
        merchantOrder.paidAmount = ordertotal
Line 710... Line 720...
710 
            return 'EMAIL_SET_SUCCESS'
 720 
            return 'EMAIL_SET_SUCCESS'
711 
        else:
 721 
        else:
712 
            return 'EMAIL_NOT_FOUND'
 722 
            return 'EMAIL_NOT_FOUND'
713 
    '''
723 
    '''
714
724
- 
 
 725 
def to_py_date(java_timestamp):
- 
 
 726 
    date = datetime.datetime.fromtimestamp(java_timestamp)
- 
 
 727 
    return date
715
728
716 
def todict(obj, classkey=None):
 729 
def todict(obj, classkey=None):
717 
    if isinstance(obj, dict):
 730 
    if isinstance(obj, dict):
718 
        data = {}
 731 
        data = {}
719 
        for (k, v) in obj.items():
 732 
        for (k, v) in obj.items():