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

     InventoryServiceException, WarehouseType, InventoryType
 from shop2020.thriftpy.model.v1.order.ttypes import TransactionServiceException, \
     TransactionStatus, OrderStatus, DelayReason, ExtraTransactionProcessingType, \
     HotspotAction, TimeoutSummary, OrderStatusGroups, OrderType, RechargeOrderStatus, \
     RechargeType, RechargeStatistics, DeviceNumberInfo, EmiChargeType, PayMethod, OrderSource,\
-    StorePaymentStatus
+    StorePaymentStatus, ProductCondition
 from shop2020.thriftpy.model.v1.user.ttypes import VoucherType
 from shop2020.thriftpy.payments.ttypes import PaymentException
 #Start:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
 from shop2020.thriftpy.crm.ttypes import *
 #End:- Added By Manish Sharma for Creating a new Ticket: Category- RTO Refund on 21-Jun-2013
                 if ourColor and etpColor != ourColor and not authorize:
                     raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
                 else:
                     billedOrdersColorMap.pop(orderId)
         '''
+        if order.productCondition == ProductCondition.BAD:
+            if billingType != BillingType.OURS:
+                raise TransactionServiceException(110, 'Bad inventory is not allowed to be sold from current warehouse')
         if billingType == BillingType.EXTERNAL:
             order.invoice_number = invoice_number
         if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
             if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):
             print e.message
             raise TransactionServiceException(110, 'Transfer price missing for itemId: ' + str(item_id) + ' and vendor: ' + str(warehouse.vendor.id))
         # For OUR warehouse, we need to scan out items for every billed order
         if billingType == BillingType.OURS:
+            if order.productCondition == ProductCondition.GOOD:
-            for index, serialNumber in enumerate(serialNumbers):
+                for index, serialNumber in enumerate(serialNumbers):
-                try:
+                    try:
-                    warehouse_client = WarehouseClient().get_client()
+                        warehouse_client = WarehouseClient().get_client()
-                    # Fetching GOOD w/h corresponding to the virtual one here
+                        # Fetching GOOD w/h corresponding to the virtual one here
-                    if not warehouse.billingWarehouseId:
+                        if not warehouse.billingWarehouseId:
-                        warehouse = inventory_client.getWarehouses(None, InventoryType.GOOD, warehouse.vendor.id, order.warehouse_id, 0)[0]
+                            warehouse = inventory_client.getWarehouses(None, InventoryType.GOOD, warehouse.vendor.id, order.warehouse_id, 0)[0]
-                    if ItemType.SERIALIZED == item.type:
+                        if ItemType.SERIALIZED == item.type:
-                        inventoryItem = warehouse_client.getInventoryItem(serialNumber)
+                            inventoryItem = warehouse_client.getInventoryItem(serialNumber)
-                    else:
+                        else:
-                        inventoryItem = warehouse_client.getNonSeralizedInventoryItem(itemNumbers[index], item_id, warehouse.id, warehouse.billingWarehouseId)
+                            inventoryItem = warehouse_client.getNonSeralizedInventoryItem(itemNumbers[index], item_id, warehouse.id, warehouse.billingWarehouseId)
-                    if (inventoryItem.itemId != item_id):
+                        if (inventoryItem.itemId != item_id):
+                            catalog_client = CatalogClient().get_client()
+                            item = catalog_client.getItem(inventoryItem.itemId)
+                            scanItemString = " ".join([str(item.brand), str(item.modelName), str(item.modelNumber), str(item.color)])
+                            lineItemString = " ".join([str(lineitem.brand), str(lineitem.model_name), str(lineitem.model_number), str(lineitem.color)])
+                            raise TransactionServiceException(110, 'Trying to scan ' + scanItemString + ' instead of ' + lineItemString)
+                        if ItemType.SERIALIZED == item.type:
+                            inventoryItem = warehouse_client.scanSerializedItemForOrder(serialNumber, ScanType.SALE, orderId, warehouse.id, 1, order.warehouse_id)
+                        else:
+                            inventoryItem = warehouse_client.scanForOrder(inventoryItem, ScanType.SALE, 1, order.id, warehouse.id, order.warehouse_id)
+                        lineitem.transfer_price = inventoryItem.unitPrice
+                        lineitem.nlc = inventoryItem.nlc
+                        order.vendorId = inventoryItem.supplierId
                         catalog_client = CatalogClient().get_client()
-                        item = catalog_client.getItem(inventoryItem.itemId)
+                    except WarehouseServiceException as e:
-                        scanItemString = " ".join([str(item.brand), str(item.modelName), str(item.modelNumber), str(item.color)])
+                        print sys.exc_info()[0]
-                        lineItemString = " ".join([str(lineitem.brand), str(lineitem.model_name), str(lineitem.model_number), str(lineitem.color)])
+                        print 'Could not scan out orders due to: ' + e.message
-                        raise TransactionServiceException(110, 'Trying to scan ' + scanItemString + ' instead of ' + lineItemString)
+                        raise TransactionServiceException(110, e.message)
+            else:
+                for index, serialNumber in enumerate(serialNumbers):
+                    try:
+                        warehouse_client = WarehouseClient().get_client()
-                    if ItemType.SERIALIZED == item.type:
+                        if ItemType.SERIALIZED == item.type:
-                        inventoryItem = warehouse_client.scanSerializedItemForOrder(serialNumber, ScanType.SALE, orderId, warehouse.id, 1, order.warehouse_id)
+                            inventoryItem = warehouse_client.scanForBadSale(serialNumber, itemNumbers[index], item_id, orderId, warehouse.id, 1, order.warehouse_id)
-                    else:
+                        else:
-                        inventoryItem = warehouse_client.scanForOrder(inventoryItem, ScanType.SALE, 1, order.id, warehouse.id, order.warehouse_id)
+                            raise TransactionServiceException(110, "Bad sale for Non Serialized inventory is not allowed as of now")
-                    lineitem.transfer_price = inventoryItem.unitPrice
+                        lineitem.transfer_price = inventoryItem.unitPrice
-                    lineitem.nlc = inventoryItem.nlc
+                        lineitem.nlc = inventoryItem.nlc
-                    order.vendorId = inventoryItem.supplierId
+                        order.vendorId = inventoryItem.supplierId
-                    catalog_client = CatalogClient().get_client()
+                        catalog_client = CatalogClient().get_client()
-                except WarehouseServiceException as e:
+                    except WarehouseServiceException as e:
-                    print sys.exc_info()[0]
+                        print sys.exc_info()[0]
-                    print 'Could not scan out orders due to: ' + e.message
+                        print 'Could not scan out orders due to: ' + e.message
-                    raise TransactionServiceException(110, e.message)
+                        raise TransactionServiceException(110, e.message)
         elif billingType == BillingType.OURS_EXTERNAL:
             try:
                 if ItemType.SERIALIZED == item.type:
                     serialNumber = serialNumbers[0]
                 else:

Subversion Repositories SmartDukaan

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