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

     BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
     RechargeTransaction, HotspotStore, WalletForCompany, WalletHistoryForCompany, \
     FRC, OperatorSeries, SourceDetail, Company, EbayOrder, AmazonFbaSalesSnapshot, \
     AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, \
     HotspotServiceMatrix, SnapdealOrder, FlipkartOrder, DataInsuranceDetailForOrder, \
-    AmazonFbaOrderReturns, FlipkartAdvantageOrder, InvoiceCounterGenerator
+    AmazonFbaOrderReturns, FlipkartAdvantageOrder, InvoiceCounterGenerator, \
+    TransactionShipmentSequence
 from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
 from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
 from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
     MobileRechargeOrder
 from shop2020.model.v1.order.impl.model.RechargeDenomination import \
                 order.cod = False
             session.commit()
             return "True"
         __amend_fulfilment_warehouse(order)
         __update_transfer_price(order, order.fulfilmentWarehouseId)
+        txnSeqRequired = 0
+        txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==order.transaction_id).order_by(desc(TransactionShipmentSequence.id,TransactionShipmentSequence.createdTimestamp)).first()
+        if txnShipSeq is None:
+            txnShipSeq = TransactionShipmentSequence()
+            txnShipSeq.transactionId = order.transaction_id
+            txnShipSeq.createdTimestamp = datetime.datetime.now()
+            txnShipSeq.sequence = 1
+            txnSeqRequired = 1
+        else:
+            txnShipSeqNew = TransactionShipmentSequence()
+            txnShipSeqNew.transactionId = txnShipSeq.transactionId
+            txnShipSeqNew.createdTimestamp = datetime.datetime.now()
+            txnShipSeqNew.sequence = txnShipSeq.sequence + 1
+            txnSeqRequired = txnShipSeq.sequence + 1
-        session.commit()
+            session.commit()
         '''
         if order.logistics_provider_id != 7 and order.airwaybill_no is None or order.airwaybill_no == "null":
             logistics_client = LogisticsClient().get_client()
             if order.cod and order.total_amount > 1:
                 airwaybillNo= logistics_client.getEmptyAWB(order.logistics_provider_id, DeliveryType.COD)
 #Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
 def update_order_AWB(orderId, airwayBillNo):
     order = Order.get_by(id = orderId)
     order.airwaybill_no=airwayBillNo
     order.tracking_id=airwayBillNo
-    order.logisticsTransactionId = str(order.transaction_id)+airwayBillNo
+    #order.logisticsTransactionId = str(order.transaction_id)+airwayBillNo
     session.commit()
     return order
 #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
 def get_hotspot_service_matrices():
                     itemPricing = cursor.fetchone()
                 except Exception as e:
                     print "Error: unable to fetch data 3"
                 if itemPricing is None:
-                    raise TransactionServiceException(214, "Vendor Item Pricing Missing For Item Id "+itemId+ " and Fulfillment Warehouse "+ orderFulfillmentWarehouse[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:
+            raise TransactionServiceException(216, "Order in Unacceptable Status.. "+str(order.id))
     try:
         conn.commit()
     except:
         conn.close()
     if ordersList[0].cod:
         deltype = DeliveryType.COD
     if not logistics_client.isAlive():
         logistics_client = LogisticsClient().get_client()
     awbNumber = logistics_client.getNewEmptyAwb(provider.id, deltype, totalOrderQuantity)
+    txnSeqRequired = 0
+    txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==ordersList[0].transaction_id).order_by(desc(TransactionShipmentSequence.id,TransactionShipmentSequence.createdTimestamp)).first()
+    if txnShipSeq is None:
+        txnShipSeq = TransactionShipmentSequence()
+        txnShipSeq.transactionId = ordersList[0].transaction_id
+        txnShipSeq.createdTimestamp = datetime.datetime.now()
+        txnShipSeq.sequence = 1
+        txnSeqRequired = 1
-    session.commit()
+    else:
+        txnShipSeqNew = TransactionShipmentSequence()
+        txnShipSeqNew.transactionId = txnShipSeq.transactionId
+        txnShipSeqNew.createdTimestamp = datetime.datetime.now()
+        txnShipSeqNew.sequence = txnShipSeq.sequence + 1
+        txnSeqRequired = txnShipSeq.sequence + 1
     for order in ordersList:
         update_order_AWB(order.id, awbNumber)
+        order.logisticsTransactionId = str(order.transaction_id)+"-"+str(txnSeqRequired)
+    session.commit()
     return True
 def get_group_orders_by_logistics_txn_id(logisticsTxnId):
     orders = Order.query.filter(Order.logisticsTransactionId==logisticsTxnId).all()

Subversion Repositories SmartDukaan

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