WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py



        if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
            if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):
                raise TransactionServiceException(110, "No Serial Number supplied")
            if serialNumbers:
                lineitem.serial_number = serialNumbers[0]
            
        
        order.status = OrderStatus.BILLED
        order.statusDescription = "Order Billed"
        order.billing_timestamp = datetime.datetime.now()
        order.billed_by = billedBy

                inventory_client = InventoryClient().get_client()
                inventory_client.addInventory(item.id, warehouse.id, -1 * lineitem.quantity)
 
        __update_inventory_reservation(order)
        order.fulfilmentWarehouseId = warehouse.id
        if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
            order.invoice_number = get_next_invoice_number(order.orderType)
        session.commit()
        return True
    else:
        return False
 

Rev 6957	Rev 6969
Line 1215...	Line 1215...
1215	`if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:`	1215	`if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:`
1216	`if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):`	1216	`if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):`
1217	`raise TransactionServiceException(110, "No Serial Number supplied")`	1217	`raise TransactionServiceException(110, "No Serial Number supplied")`
1218	`if serialNumbers:`	1218	`if serialNumbers:`
1219	`lineitem.serial_number = serialNumbers[0]`	1219	`lineitem.serial_number = serialNumbers[0]`
1220	`order.invoice_number = get_next_invoice_number(order.orderType)`	1220
1221		1221
1222	`order.status = OrderStatus.BILLED`	1222	`order.status = OrderStatus.BILLED`
1223	`order.statusDescription = "Order Billed"`	1223	`order.statusDescription = "Order Billed"`
1224	`order.billing_timestamp = datetime.datetime.now()`	1224	`order.billing_timestamp = datetime.datetime.now()`
1225	`order.billed_by = billedBy`	1225	`order.billed_by = billedBy`
Line 1291...	Line 1291...
1291	`inventory_client = InventoryClient().get_client()`	1291	`inventory_client = InventoryClient().get_client()`
1292	`inventory_client.addInventory(item.id, warehouse.id, -1 * lineitem.quantity)`	1292	`inventory_client.addInventory(item.id, warehouse.id, -1 * lineitem.quantity)`
1293		1293
1294	`__update_inventory_reservation(order)`	1294	`__update_inventory_reservation(order)`
1295	`order.fulfilmentWarehouseId = warehouse.id`	1295	`order.fulfilmentWarehouseId = warehouse.id`
-		1296	`if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:`
-		1297	`order.invoice_number = get_next_invoice_number(order.orderType)`
1296	`session.commit()`	1298	`session.commit()`
1297	`return True`	1299	`return True`
1298	`else:`	1300	`else:`
1299	`return False`	1301	`return False`
1300		1302

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 6957 → 6969