Subversion Repositories SmartDukaan

Rev

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

Rev 13379 Rev 13381
Line 1145... Line 1145...
1145 
            hasInsurer = True
 1145 
            hasInsurer = True
1146 
            total_amount += orderObj.insuranceAmount
 1146 
            total_amount += orderObj.insuranceAmount
1147 
            html += """<td align="center">"""+("%.2f" % orderObj.insuranceAmount) +"""</td>"""
 1147 
            html += """<td align="center">"""+("%.2f" % orderObj.insuranceAmount) +"""</td>"""
1148 
        else:
 1148 
        else:
1149 
            html += """<td align="center">0.00</td>"""
 1149 
            html += """<td align="center">0.00</td>"""
- 
 
 1150 
        if orderObj.otg:
- 
 
 1151 
            hasOtg = True
- 
 
 1152 
            otgCount += 1
- 
 
 1153 
            totalUnitPrice += lineitem.unit_price
- 
 
 1154 
            html += """<td align="center">Yes</td>"""
- 
 
 1155 
        else:
- 
 
 1156 
            html += """<td align="center">No</td>"""
1150 
        if orderObj.freebieItemId:
 1157 
        if orderObj.freebieItemId:
1151 
            hasFreebie = True
 1158 
            hasFreebie = True
1152 
            catalog_client = CatalogClient().get_client()
 1159 
            catalog_client = CatalogClient().get_client()
1153 
            item = catalog_client.getItem(order.freebieItemId)
 1160 
            item = catalog_client.getItem(order.freebieItemId)
1154 
            html += """<td align="center">"""+item.brand+" "+item.model_name+ " " + item.model_number +"""</td>"""
 1161 
            html += """<td align="center">"""+item.brand+" "+item.model_name+ " " + item.model_number +"""</td>"""
Line 1159... Line 1166...
1159 
                freebieOrder = get_order(freebieOrderId)
 1166 
                freebieOrder = get_order(freebieOrderId)
1160 
                hasSplitOrder = True
 1167 
                hasSplitOrder = True
1161 
                splitOrdersMap[orderObj.id] = freebieOrder
 1168 
                splitOrdersMap[orderObj.id] = freebieOrder
1162 
        if orderObj.pickupStoreId:
 1169 
        if orderObj.pickupStoreId:
1163 
            hasPickupStoreOrder = True
 1170 
            hasPickupStoreOrder = True
1164 
        if orderObj.otg:
 - 
 
1165 
            hasOtg = True
 - 
 
1166 
            otgCount += 1
 - 
 
1167 
            totalUnitPrice += lineitem.unit_price
 - 
 
1168 
            html += """<td align="center">Yes</td>"""
 - 
 
1169 
        else:
 - 
 
1170 
            html += """<td align="center">No</td>"""
 - 
 
1171
1171
1172 
        html += """
 1172 
        html += """
1173 
                </tr>
 1173 
                </tr>
1174 
            """
 1174 
            """
1175 
    html += """
 1175 
    html += """
Line 4673... Line 4673...
4673 
            hasInsurer = True
 4673 
            hasInsurer = True
4674 
            total_amount += orderObj.insuranceAmount
 4674 
            total_amount += orderObj.insuranceAmount
4675 
            html += """<td align="center">"""+("%.2f" % orderObj.insuranceAmount) +"""</td>"""
 4675 
            html += """<td align="center">"""+("%.2f" % orderObj.insuranceAmount) +"""</td>"""
4676 
        else:
 4676 
        else:
4677 
            html += """<td align="center">0.00</td>"""
 4677 
            html += """<td align="center">0.00</td>"""
- 
 
 4678
4678 
        if orderObj.freebieItemId:
 4679 
        if orderObj.freebieItemId:
4679 
            hasFreebie = True
 4680 
            hasFreebie = True
4680 
            catalog_client = CatalogClient().get_client()
 4681 
            catalog_client = CatalogClient().get_client()
4681 
            item = catalog_client.getItem(order.freebieItemId)
 4682 
            item = catalog_client.getItem(order.freebieItemId)
4682 
            html += """<td align="center">"""+item.brand+" "+item.model_name+ " " + item.model_number +"""</td>"""
 4683 
            html += """<td align="center">"""+item.brand+" "+item.model_name+ " " + item.model_number +"""</td>"""
Line 4685... Line 4686...
4685 
            freebieOrderId = get_order_attribute_value(orderObj.id, "freebieOrderId")
 4686 
            freebieOrderId = get_order_attribute_value(orderObj.id, "freebieOrderId")
4686 
            if freebieOrderId != "":
 4687 
            if freebieOrderId != "":
4687 
                freebieOrder = get_order(freebieOrderId)
 4688 
                freebieOrder = get_order(freebieOrderId)
4688 
                hasSplitOrder = True
 4689 
                hasSplitOrder = True
4689 
                splitOrdersMap[orderObj.id] = freebieOrder
 4690 
                splitOrdersMap[orderObj.id] = freebieOrder
4690 
        if orderObj.otg:
 - 
 
4691 
            hasOtg = True
 - 
 
4692 
            html += """<td align="center">Yes</td>"""
 - 
 
4693 
        else:
 - 
 
4694 
            html += """<td align="center">No</td>"""
 - 
 
4695
4691
4696 
        html += """
 4692 
        html += """
4697 
                </tr>
 4693 
                </tr>
4698 
            """
 4694 
            """
4699
4695