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

             inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
             try:
                 item_pricing = inventory_client.getItemPricing(item_id, -1)
                 order.lineitems[0].transfer_price = item_pricing.transferPrice
+                order.lineitems[0].nlc = item_pricing.nlc
             except:
                 print "Not able to get transfer price. Skipping"
             catalog_client = CatalogClient().get_client()
             voucherAmount = catalog_client.getVoucherAmount(item_id, VoucherType.SPICEDECK_MOBILE)
             inventory_client = InventoryClient().get_client()
             inventory_client.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, order.id, to_java_date(order.created_timestamp), to_java_date(order.promised_shipping_time), order.lineitems[0].quantity)
             try:
                 item_pricing = inventory_client.getItemPricing(item_id, -1)
                 order.lineitems[0].transfer_price = item_pricing.transferPrice
+                order.lineitems[0].nlc = item_pricing.nlc
             except:
                 print "Not able to get transfer price. Skipping"
             catalog_client = CatalogClient().get_client()
             voucherAmount = catalog_client.getVoucherAmount(item_id, VoucherType.SPICEDECK_MOBILE)
     catalog_client = CatalogClient().get_client()
     item = catalog_client.getItem(item_id)
     if order.status == OrderStatus.ACCEPTED:
         order.jacket_number = jacketNumber
+        if itemNumbers:
+            lineitem.item_number = itemNumbers[0]
+        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]
-        if billingType == BillingType.OURS:
+        if billingType == BillingType.EXTERNAL or billingType == BillingType.OURS_EXTERNAL:
             if itemNumbers:
                 lineitem.item_number = itemNumbers[0]
             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.invoice_number = get_next_invoice_number(order.orderType)
-        else:
-            order.invoice_number = invoice_number
-            # In case of hotspot billing, we should try to verify that color billed in ETP is same as color in order.
             if billedOrdersColorMap.has_key(orderId):
                 etpColor = billedOrdersColorMap.get(orderId)
                 ourColor = order.lineitems[0].color
                 if ourColor and etpColor != ourColor and not authorize:
                     raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
                 else:
                     billedOrdersColorMap.pop(orderId)
+        if billingType == BillingType.EXTERNAL:
+            order.invoice_number = invoice_number
+        if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
+            order.invoice_number = get_next_invoice_number(order.orderType)
         order.status = OrderStatus.BILLED
         order.statusDescription = "Order Billed"
         order.billing_timestamp = datetime.datetime.now()
         order.billed_by = billedBy
         try:
             inventory_client = InventoryClient().get_client()
             warehouse = inventory_client.getWarehouse(fulfilmentWarehouseId)
             item_pricing = inventory_client.getItemPricing(item_id, warehouse.vendor.id)
             lineitem.transfer_price = item_pricing.transferPrice
+            lineitem.nlc = item_pricing.nlc
             lineitem.vatRate = catalog_client.getVatPercentageForItem(lineitem.item_id, lineitem.unit_price)
             order.vendorId = warehouse.vendor.id
         except InventoryServiceException as e:
             print sys.exc_info()[0]
             print e.message
                     catalog_client = CatalogClient().get_client()
                 except WarehouseServiceException as e:
                     print sys.exc_info()[0]
                     print 'Could not scan out orders due to: ' + e.message
                     raise TransactionServiceException(110, e.message)
+        '''elif billingType == BillingType.OURS_EXTERNAL:
+            try:
+                serialNumber = serialNumbers[0]
+                warehouse_client = WarehouseClient().get_client()
+                inventoryItem = warehouse_client.scanForOursExternalSale(lineitem.item_number, serialNumber, invoice_number, order.fulfilmentWarehouseId, lineitem.transfer_price)
+                lineitem.transfer_price = inventoryItem.unitPrice
+                order.vendorId = inventoryItem.supplierId
+            except WarehouseServiceException as e:
+                print sys.exc_info()[0]
+                print 'Could not scan out orders due to: ' + e.message
+                raise TransactionServiceException(110, e.message)
+        '''
         else:
             if not warehouse.isAvailabilityMonitored:
                 inventory_client = InventoryClient().get_client()
                 inventory_client.addInventory(item.id, warehouse.id, -1 * lineitem.quantity)
         session.commit()
         return True
     else:
         return False
-def add_invoice_number(orderId, invoiceNumber, color):
+def add_invoice_number(orderId, invoiceNumber, color, serialNumber, itemNumber):
     order = Order.get_by(id=orderId)
     if not order:
         raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
     if order.status == OrderStatus.ACCEPTED:
         order.invoice_number = invoiceNumber
         if color:
             billedOrdersColorMap[orderId] = color;
+        if serialNumber:
+            order.lineitems[0].serial_number = serialNumber
+        if itemNumber:
+            order.lineitems[0].item_number = itemNumber
     session.commit()
 def batch_orders(warehouseId):
     if not warehouseId:
         raise TransactionServiceException(101, "bad warehouse id")
         litem.unit_price = line_item.unit_price
         litem.unit_weight = line_item.unit_weight
         litem.total_price = line_item.total_price
         litem.total_weight = line_item.total_weight
         litem.transfer_price = line_item.transfer_price
+        litem.nlc = line_item.nlc
         litem.dealText = line_item.dealText
         litem.vatRate = line_item.vatRate
         litem.order = new_order
     logistics_client = LogisticsClient().get_client()

Subversion Repositories SmartDukaan

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