Subversion Repositories SmartDukaan

Rev

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

Rev 13384 Rev 13385
Line 1156... Line 1156...
1156
            html += """<td align="center">No</td>"""
1156
            html += """<td align="center">No</td>"""
1157
        if orderObj.freebieItemId:
1157
        if orderObj.freebieItemId:
1158
            hasFreebie = True
1158
            hasFreebie = True
1159
            catalog_client = CatalogClient().get_client()
1159
            catalog_client = CatalogClient().get_client()
1160
            item = catalog_client.getItem(orderObj.freebieItemId)
1160
            item = catalog_client.getItem(orderObj.freebieItemId)
1161
            html += """<td align="center">"""+item.brand+" "+item.model_name+ " " + item.model_number +"""</td>"""
1161
            html += """<td align="center">"""+item.brand+" "+item.modelName+ " " + item.modelNumber +"""</td>"""
1162
        else:
1162
        else:
1163
            html += """<td align="center"></td>"""
1163
            html += """<td align="center"></td>"""
1164
            freebieOrderId = get_order_attribute_value(orderObj.id, "freebieOrderId")
1164
            freebieOrderId = get_order_attribute_value(orderObj.id, "freebieOrderId")
1165
            if freebieOrderId != "":
1165
            if freebieOrderId != "":
1166
                freebieOrder = get_order(freebieOrderId)
1166
                freebieOrder = get_order(freebieOrderId)
Line 4678... Line 4678...
4678
        
4678
        
4679
        if orderObj.freebieItemId:
4679
        if orderObj.freebieItemId:
4680
            hasFreebie = True
4680
            hasFreebie = True
4681
            catalog_client = CatalogClient().get_client()
4681
            catalog_client = CatalogClient().get_client()
4682
            item = catalog_client.getItem(orderObj.freebieItemId)
4682
            item = catalog_client.getItem(orderObj.freebieItemId)
4683
            html += """<td align="center">"""+item.brand+" "+item.model_name+ " " + item.model_number +"""</td>"""
4683
            html += """<td align="center">"""+item.brand+" "+item.modelName+ " " + item.modelNumber +"""</td>"""
4684
        else:
4684
        else:
4685
            html += """<td align="center"></td>"""
4685
            html += """<td align="center"></td>"""
4686
            freebieOrderId = get_order_attribute_value(orderObj.id, "freebieOrderId")
4686
            freebieOrderId = get_order_attribute_value(orderObj.id, "freebieOrderId")
4687
            if freebieOrderId != "":
4687
            if freebieOrderId != "":
4688
                freebieOrder = get_order(freebieOrderId)
4688
                freebieOrder = get_order(freebieOrderId)