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

         session.commit()
         return True
     return False
 def mark_order_as_rto_in_transit(order_id):
-    order = get_order(order_id)
+    selectedOrder = get_order(order_id)
-    if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERED_AT_STORE, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERY_SUCCESS]:
+    if selectedOrder.logisticsTransactionId:
+        orders = get_group_orders_by_logistics_txn_id(selectedOrder.logisticsTransactionId)
+        for order in orders:
-        return False
+            if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERED_AT_STORE, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERY_SUCCESS]:
+                return False
-    order.status = OrderStatus.RTO_IN_TRANSIT
+            order.status = OrderStatus.RTO_IN_TRANSIT
-    order.delivery_timestamp = datetime.datetime.now()
+            order.delivery_timestamp = datetime.datetime.now()
-    order.statusDescription = "Order Returned to Origin"
+            order.statusDescription = "Order Returned to Origin"
+            update_trust_level(order)
+            session.commit()
+            try:
+                alert_client = AlertClient().get_client()
+                alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
+            except Exception as e:
+                print "Exception in ending alert in MarkOrderAsRTO method"
+                print e
+    else:
-    update_trust_level(order)
+        if selectedOrder == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERED_AT_STORE, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERY_SUCCESS]:
+            return False
+        selectedOrder.status = OrderStatus.RTO_IN_TRANSIT
+        selectedOrder.delivery_timestamp = datetime.datetime.now()
+        selectedOrder.statusDescription = "Order Returned to Origin"
+        update_trust_level(selectedOrder)
-    session.commit()
+        session.commit()
-    try:
+        try:
-        alert_client = AlertClient().get_client()
+            alert_client = AlertClient().get_client()
-        alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
+            alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(selectedOrder.id))
-    except Exception as e:
+        except Exception as e:
-        print "Exception in ending alert in MarkOrderAsRTO method"
+            print "Exception in ending alert in MarkOrderAsRTO method"
-        print e
+            print e
     return True
 def get_order(order_id):
     order = Order.get_by(id=order_id)
     if not order:
     current_time = datetime.datetime.now()
     to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
     orders_not_picked_up = Order.query.filter_by(doa_logistics_provider_id = provider_id).filter_by(status=OrderStatus.RET_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp <= to_datetime).all()
     return orders_not_picked_up
-def receive_return(order_id, receiveCondition, receiveFreebie):
+def receive_return(order_id, receiveCondition, receiveFreebie, serialNumbers):
     order = get_order(order_id)
     scanFreebie = False
     if order.status in [OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.DOA_RETURN_IN_TRANSIT]:
         if receiveCondition == 0:
             catalogClient = CatalogClient().get_client()
             item = catalogClient.getItem(lineitem.item_id)
             warehouseClient = WarehouseClient().get_client()
             if warehouse.billingType == BillingType.OURS or scanType != ScanType.SALE_RET:
                 if item.type == ItemType.SERIALIZED:
+                    if lineitem.quantity > 1:
+                        if serialNumbers is None or len(serialNumbers)==0:
+                            return False
+                        else:
+                            serialNoList = serialNumbers.split(',')
+                            for serialNumber in serialNoList:
+                                warehouseClient.scanSerializedItemForOrder(serialNumber, scanType, order.id, order.fulfilmentWarehouseId, 1, order.warehouse_id)
+                    else:
-                    warehouseClient.scanSerializedItemForOrder(lineitem.serial_number, scanType, order.id, order.fulfilmentWarehouseId, lineitem.quantity, order.warehouse_id)
+                        warehouseClient.scanSerializedItemForOrder(lineitem.serial_number, scanType, order.id, order.fulfilmentWarehouseId, lineitem.quantity, order.warehouse_id)
                 else:
                     warehouseClient.scanForOrder(None, scanType, lineitem.quantity, order.id, order.fulfilmentWarehouseId, order.warehouse_id)
             if warehouse.billingType == BillingType.OURS_EXTERNAL and scanType == ScanType.SALE_RET:
                 warehouseClient.scanForOursExternalSaleReturn(order.id, lineitem.transfer_price)
             if scanFreebie:
         orderInv.delete()
     session.commit()
     return ret_timeouts
 def get_order_for_awb(awb):
-    order = Order.get_by(airwaybill_no=awb)
+    orders = Order.query.filter(Order.airwaybill_no==awb).all()
-    if not order:
+    if not orders:
-        raise TransactionServiceException(108, "no such order")
+        orders = []
-    return order
+    return orders
 def get_orders_for_provider_for_status(provider_id, order_status_list):
     if not provider_id or not order_status_list:
         raise TransactionServiceException(101, "bad provider id or order status")
     doa_provider = False
     order.expected_shipping_time = to_py_date(date)
     order.promised_shipping_time = to_py_date(date)
     session.commit()
 def get_order_for_airwayBillNo(airwaybillNo):
-    order = Order.get_by(airwaybill_no=airwaybillNo)
+    orders = Order.query.filter(Order.airwaybill_no==airwaybillNo).all()
-    if not order:
+    if not orders:
-        print "Not found order for airwayBillNo " + str(airwaybillNo)
-        raise TransactionServiceException(108, "no such order")
+        orders = []
-    return order
+    return orders
 def get_orders_count_created_after_timestamp_for_source(timestamp,source):
     item_ordercount = dict()
     status=[15,18,34,0,1]
                     raise TransactionServiceException(214, "Vendor Item Pricing Missing For Item Id "+str(itemId)+ " and Fulfillment Warehouse "+ str(orderFulfillmentWarehouse[1]))
                 else:
                     order.lineitems[0].transfer_price = itemPricing[4]
                     order.lineitems[0].nlc = itemPricing[5]
         else:
+            conn.close()
             raise TransactionServiceException(216, "Order in Unacceptable Status.. "+str(order.id))
     try:
         conn.commit()
     except:
         conn.close()
     orders = Order.query.filter(Order.logisticsTransactionId==logisticsTxnId).all()
     if not orders:
         orders = []
     return orders
-def add_billing_details_for_groupped_orders(orderIds, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize):
+def add_billing_details_for_groupped_orders(orderIds, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType):
     ''' Check for Biller'''
     if billed_by is None or billed_by.strip() == "":
         raise TransactionServiceException(110, "Invalid Biller")
     ordersList = []
         raise TransactionServiceException(302, "Unable to connect to Warehouse System")
     inventory_client = InventoryClient().get_client()
     warehouse_client = WarehouseClient().get_client()
     catalog_client = CatalogClient().get_client()
     whStateId = None
+    lineItemSize = 0
+    individualInvoice = True
     for order in ordersList:
         newTaxType = __getOrderTaxType(order)
         if order.taxType == 2:
             if newTaxType == 0:
                 raise TransactionServiceException(302, "C-Form billing is not allowed for same state for Order" + str(order.id))
                 raise TransactionServiceException(307,'Parent order for this is COD and is still undelivered')
         if not catalog_client.isAlive():
             catalog_client = CatalogClient().get_client()
         item = catalog_client.getItem(item_id)
+        if ItemType.SERIALIZED == item.type and lineitem.quantity>2:
+            individualInvoice=False
+        if order.type== OrderType.B2B:
+            individualInvoice=False
+        lineItemSize = lineItemSize+1
         if order.status == OrderStatus.ACCEPTED:
             if order.source == 6:
                 order.jacket_number = "600"+str(orderId)
             elif order.source == 7:
                 order.jacket_number = "700"+str(orderId)
                 order.vendorId = warehouse.vendor.id
                 whStateId = warehouse.stateId
             except InventoryServiceException as e:
                 print sys.exc_info()[0]
                 print e.message
+                if warehouseDbConnection.open:
+                    warehouseDbConnection.close()
                 raise TransactionServiceException(110, 'Transfer price missing for itemId: ' + str(item_id) + ' and vendor: ' + str(warehouse.vendor.id))
             if order.orderType == OrderType.B2B:
                 tinNumber = Attribute.query.filter(Attribute.orderId == order.id).filter(Attribute.name == "tinNumber").first()
                 if tinNumber is None:
+                    if warehouseDbConnection.open:
+                        warehouseDbConnection.close()
                     raise TransactionServiceException(308, "Tin Number is Missing for B2B Order. Please contact engineering Team" + str(orderId))
                 if newTaxType != 0:
                     order.orderType = OrderType.B2C
             if billingType == BillingType.OURS:
                         for serialNumber in serialNumbers:
                             invItemSql = "select i.id, i.itemId, i.itemNumber, i.serialNumber, i.initialQuantity, i.currentQuantity, i.purchaseId, i.purchaseReturnId, i.currentWarehouseId, i.lastScanType, i.transferStatus, physicalWarehouseId, po.supplierId, l.unitPrice, l.nlc from inventoryItem i join purchase p on i.purchaseId = p.id join purchaseorder po on p.purchaseOrder_id = po.id join lineitem l on (i.itemId = l.itemId and po.id =l.purchaseOrder_id) where i.serialNumber ='%s' order by i.id desc limit 1"%(serialNumber)
                             whCursor.execute(invItemSql)
                             invItem = whCursor.fetchone()
                             if invItem is None:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(309, "No Item in the inventory with this serial number " + serialNumber+" and Order Id:- "+str(order.id))
                             if item.id!=invItem[1]:
                                 if not catalog_client.isAlive():
                                     catalog_client = CatalogClient().get_client()
                                 sritem = catalog_client.getItem(invItem[1])
                                 scanItemString = " ".join([str(sritem.brand), str(sritem.modelName), str(sritem.modelNumber), str(sritem.color)])
                                 lineItemString = " ".join([str(lineitem.brand), str(lineitem.model_name), str(lineitem.model_number), str(lineitem.color)])
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(310, "Trying to scan " + scanItemString + " instead of " + lineItemString+" Order Id- "+order.id)
                             if order.warehouse_id!= invItem[11]:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(311, "No Item residing in Billing Warehouse with this serial number " + serialNumber+" and Order Id:- "+str(order.id))
                             if invItem[10] is not None and invItem[10]=='IN_TRANSIT':
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(312, "Trying to Scan In-Transit Inventory " + serialNumber+" and Order Id:- "+str(order.id))
                             if invItem[9]=='MARKED_BAD' or invItem[9]=='DOA_IN' or invItem[9]=='DOA_OUT' or invItem[9]=='DOA_REJECTED' or invItem[9]=='SALE_RET_UNUSABLE' or invItem[9]=='BAD_SALE':
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(313, "Trying to Scan Bad Inventory Serial Number:- " + serialNumber+" and Order Id:- "+str(order.id))
                             scanSql = "select * from scanNew where inventoryItemId =%d"%(invItem[0])
                             whCursor.execute(scanSql)
                             scans = whCursor.fetchall()
                             if scans is None:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(314, "Item with Serial Number:- " + serialNumber+" never scanned in the system")
                             lastScan = scans[len(scans)-1]
                             if lastScan[3]=='SALE':
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(315, "Inventory Item with serial number- "+ serialNumber+" already scanned against order id- "+str(lastScan[6]))
                             if warehouse.id!=invItem[8]:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(316, "Inventory Item scanning from vendor warehouse "+str(invItem[8])+" instead of order fulfillment warehouse "+str(warehouse.id)+" order id- "+str(order.id))
                             current_time = datetime.datetime.now()
                             insertScanSql = "insert into scanNew(inventoryItemId, warehouseId, type, scannedAt, quantity, orderId) values(%d,%d,'%s','%s',%d,%d)"%(invItem[0],warehouse.id,'SALE',current_time.strftime('%Y-%m-%d %H:%M:%S'),1,order.id)
                             whCursor.execute(insertScanSql)
                             updateInvItemSql = "update inventoryItem set currentQuantity = currentQuantity-1, lastScanType='SALE' where id=%d and serialnumber ='%s'"%(invItem[0],serialNumber)
                             whCursor.execute(updateInvItemSql)
                         invItemSql = "select i.id, i.itemId, i.itemNumber, i.serialNumber, i.initialQuantity, i.currentQuantity, i.purchaseId, i.purchaseReturnId, i.currentWarehouseId, i.lastScanType, i.transferStatus, physicalWarehouseId, po.supplierId, l.unitPrice, l.nlc from inventoryItem i join purchase p on i.purchaseId = p.id join purchaseorder po on p.purchaseOrder_id = po.id join lineitem l on (i.itemId = l.itemId and po.id =l.purchaseOrder_id) where i.itemId = %d AND i.currentQuantity > 0 AND i.currentWarehouseId = %d AND i.physicalWarehouseId = %d AND i.lastScanType not in ('MARKED_BAD','DOA_IN','DOA_REJECTED','DOA_REPLACED') AND (i.transferStatus is NULL or i.transferStatus != 'IN_TRANSIT') AND i.itemNumber ='%s'"%(item.id,order.fulfilmentWarehouseId,order.warehouse_id,itemNumbers[0])
                         whCursor.execute(invItemSql)
                         invItems = whCursor.fetchall()
                         if invItems is None:
                             raise TransactionServiceException(317, "No Item in the inventory with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
+                            warehouseDbConnection.close()
                         totalCurrentQuantity =0
                         for invItem in invItems:
                             totalCurrentQuantity = totalCurrentQuantity + invItem[5]
                         orderQuantity = lineitem.quantity
                         if totalCurrentQuantity < lineitem.quantity:
+                            if warehouseDbConnection.open:
+                                warehouseDbConnection.close()
                             raise TransactionServiceException(318, "Unsufficient Quantity with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
                         for invItem in invItems:
                             scanSql = "select * from scanNew where inventoryItemId =%d"%(invItem[0])
                             whCursor.execute(scanSql)
                             scans = whCursor.fetchall()
                             if scans is None:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(319, "Item with Item Number:- " + itemNumbers[0]+" never scanned in the system")
                             currentQuantity = invItem[5]
                             scanQuantity = 0
                         for serialNumber in serialNumbers:
                             invItemSql = "select i.id, i.itemId, i.itemNumber, i.serialNumber, i.initialQuantity, i.currentQuantity, i.purchaseId, i.purchaseReturnId, i.currentWarehouseId, i.lastScanType, i.transferStatus, physicalWarehouseId, po.supplierId, l.unitPrice, l.nlc from inventoryItem i join purchase p on i.purchaseId = p.id join purchaseorder po on p.purchaseOrder_id = po.id join lineitem l on (i.itemId = l.itemId and po.id =l.purchaseOrder_id) where i.serialNumber ='%s' order by i.id desc limit 1"%(serialNumber)
                             whCursor.execute(invItemSql)
                             invItem = whCursor.fetchone()
                             if invItem is None:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "No Item in the inventory with this serial number " + serialNumber+" and Order Id:- "+str(order.id))
                             if item.id!=invItem[1]:
                                 if not catalog_client.isAlive():
                                     catalog_client = CatalogClient().get_client()
                                 sritem = catalog_client.getItem(invItem[1])
                                 scanItemString = " ".join([str(sritem.brand), str(sritem.modelName), str(sritem.modelNumber), str(sritem.color)])
                                 lineItemString = " ".join([str(lineitem.brand), str(lineitem.model_name), str(lineitem.model_number), str(lineitem.color)])
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "Trying to scan " + scanItemString + " instead of " + lineItemString+" Order Id- "+order.id)
                             if order.warehouse_id!= invItem[11]:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "No Item residing in Billing Warehouse with this serial number " + serialNumber+" and Order Id:- "+str(order.id))
                             if invItem[10] is not None and invItem[10]=='IN_TRANSIT':
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "Trying to Scan In-Transit Inventory " + serialNumber+" and Order Id:- "+str(order.id))
                             if invItem[9]!='MARKED_BAD' or invItem[9]!='DOA_IN' or invItem[9]!='DOA_REJECTED' or invItem[9]!='SALE_RET_UNUSABLE':
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "Trying to Scan Good Inventory Serial Number:- " + serialNumber+" and Order Id:- "+str(order.id))
                             scanSql = "select * from scanNew where inventoryItemId =%d"%(invItem[0])
                             whCursor.execute(scanSql)
                             scans = whCursor.fetchall()
                             if scans is None:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "Item with Serial Number:- " + serialNumber+" never scanned in the system")
                             lastScan = scans[len(scans)-1]
                             if lastScan[3]=='BAD_SALE':
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "Inventory Item with serial number- "+ serialNumber+" already scanned against order id- "+str(lastScan[6]))
                             if warehouse.id!=invItem[8]:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "Inventory Item scanning from vendor warehouse "+str(invItem[8])+" instead of order fulfillment warehouse "+str(warehouse.id)+" order id- "+str(order.id))
                             current_time = datetime.datetime.now()
                             insertScanSql = "insert into scanNew(inventoryItemId, warehouseId, type, scannedAt, quantity, orderId) values(%d,%d,'%s','%s',%d,%d)"%(invItem[0],warehouse.id,'BAD_SALE',current_time.strftime('%Y-%m-%d %H:%M:%S'),1,order.id)
                             whCursor.execute(insertScanSql)
                             updateInvItemSql = "update inventoryItem set currentQuantity = currentQuantity-1, lastScanType='BAD_SALE' where id=%d and serialnumber ='%s'"%(invItem[0],serialNumber)
                     else:
                         invItemSql = "select i.id, i.itemId, i.itemNumber, i.serialNumber, i.initialQuantity, i.currentQuantity, i.purchaseId, i.purchaseReturnId, i.currentWarehouseId, i.lastScanType, i.transferStatus, physicalWarehouseId, po.supplierId, l.unitPrice, l.nlc from inventoryItem i join purchase p on i.purchaseId = p.id join purchaseorder po on p.purchaseOrder_id = po.id join lineitem l on (i.itemId = l.itemId and po.id =l.purchaseOrder_id) where i.itemNumber = '%s' AND itemId = %d AND i.physicalWarehouseId = %d AND i.currentWarehouseId =%d AND lastScanType in ('BAD_SALE', 'MARKED_BAD', 'SALE_RET_UNUSABLE', 'DOA_REJECTED', 'DOA_IN') AND (i.transferStatus is NULL or i.transferStatus != 'IN_TRANSIT')"%(itemNumbers[0],item.id,order.warehouse_id,order.fulfilmentWarehouseId)
                         whCursor.execute(invItemSql)
                         invItems = whCursor.fetchall()
                         if invItems is None:
+                            if warehouseDbConnection.open:
+                                warehouseDbConnection.close()
                             raise TransactionServiceException(110, "No Item in the inventory with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
                         totalCurrentQuantity =0
                         for invItem in invItems:
                             totalCurrentQuantity = totalCurrentQuantity + invItem[5]
                         orderQuantity = lineitem.quantity
                         if totalCurrentQuantity < lineitem.quantity:
+                            if warehouseDbConnection.open:
+                                warehouseDbConnection.close()
                             raise TransactionServiceException(110, "Unsufficient Quantity with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
                         for invItem in invItems:
                             scanSql = "select * from scanNew where inventoryItemId =%d"%(invItem[0])
                             whCursor.execute(scanSql)
                             scans = whCursor.fetchall()
                             if scans is None:
+                                if warehouseDbConnection.open:
+                                    warehouseDbConnection.close()
                                 raise TransactionServiceException(110, "Item with Item Number:- " + itemNumbers[0]+" never scanned in the system")
                             if warehouse.billingType == BillingType.OURS:
                                 if not inventory_client.isAlive():
                                     inventory_client = InventoryClient().get_client()
                                 inventory_client.addInventory(item.id, warehouse.id, long(-1.0*lineitem.quantity))
                         inventory_client.reduceReservationCount(lineitem.item_id, order.fulfilmentWarehouseId, sourceId, order.id, lineitem.quantity)
                 except:
                     print "Unable to reduce reservation count"
     warehouseDbConnection.commit()
+    if warehouseDbConnection.open:
-    warehouseDbConnection.close()
+        warehouseDbConnection.close()
     session.commit()
     if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
         invoiceNumber = get_next_invoice_counter(ordersList[0].orderType, whStateId)
+    invoiceTypeVal = 1
+    if not individualInvoice:
+        invoiceTypeVal = 2
+    if lineItemSize >20:
+        invoiceTypeVal = 2
+    if lineItemSize < 20 and invoiceType =="BulkInvoice" :
+        invoiceTypeVal = 2
+    transactionShipSeqValues = ordersList[0].logisticsTransactionId.split('-')
+    txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==int(transactionShipSeqValues[0])).filter(TransactionShipmentSequence.sequence==int(transactionShipSeqValues[1])).order_by(desc(TransactionShipmentSequence.id)).first()
+    txnShipSeq.invoiceFormat = invoiceTypeVal
     for order in ordersList:
         order.invoice_number = invoiceNumber
     session.commit()
     return True
+def get_invoice_format_logistics_txn_id(transactionId, shipementSeq):
+    txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==transactionId).filter(TransactionShipmentSequence.sequence==int(transactionShipSeqValues[1])).order_by(desc(TransactionShipmentSequence.id)).first()
+    if txnShipSeq.invoiceFormat == 2:
+        return 'Bulk'
+    else:
+        return 'Individual'
 if __name__ == '__main__':
     print get_orders_by_mobile_number("9650889334")

Subversion Repositories SmartDukaan

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