Subversion Repositories SmartDukaan

Rev

Rev 13159 | Rev 13200 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 13159 Rev 13162
Line 1484... Line 1484...
1484
                __capture_txn(order)
1484
                __capture_txn(order)
1485
        order.status = OrderStatus.ACCEPTED
1485
        order.status = OrderStatus.ACCEPTED
1486
        order.statusDescription = "Order Accepted"
1486
        order.statusDescription = "Order Accepted"
1487
        order.accepted_timestamp = datetime.datetime.now()
1487
        order.accepted_timestamp = datetime.datetime.now()
1488
        txnSeqRequired = 0
1488
        txnSeqRequired = 0
1489
        txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==order.transaction_id).order_by(desc(TransactionShipmentSequence.id,TransactionShipmentSequence.createdTimestamp)).first()
1489
        txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==order.transaction_id).order_by(desc(TransactionShipmentSequence.id)).first()
1490
        if txnShipSeq is None:
1490
        if txnShipSeq is None:
1491
            txnShipSeq = TransactionShipmentSequence()
1491
            txnShipSeq = TransactionShipmentSequence()
1492
            txnShipSeq.transactionId = order.transaction_id
1492
            txnShipSeq.transactionId = order.transaction_id
1493
            txnShipSeq.createdTimestamp = datetime.datetime.now()
1493
            txnShipSeq.createdTimestamp = datetime.datetime.now()
1494
            txnShipSeq.sequence = 1
1494
            txnShipSeq.sequence = 1
Line 7649... Line 7649...
7649
    if not logistics_client.isAlive():
7649
    if not logistics_client.isAlive():
7650
        logistics_client = LogisticsClient().get_client()
7650
        logistics_client = LogisticsClient().get_client()
7651
    awbNumber = logistics_client.getNewEmptyAwb(provider.id, deltype, totalOrderQuantity)
7651
    awbNumber = logistics_client.getNewEmptyAwb(provider.id, deltype, totalOrderQuantity)
7652
    
7652
    
7653
    txnSeqRequired = 0
7653
    txnSeqRequired = 0
7654
    txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==ordersList[0].transaction_id).order_by(desc(TransactionShipmentSequence.id,TransactionShipmentSequence.createdTimestamp)).first()
7654
    txnShipSeq = TransactionShipmentSequence.query.filter(TransactionShipmentSequence.transactionId==ordersList[0].transaction_id).order_by(desc(TransactionShipmentSequence.id)).first()
7655
    if txnShipSeq is None:
7655
    if txnShipSeq is None:
7656
        txnShipSeq = TransactionShipmentSequence()
7656
        txnShipSeq = TransactionShipmentSequence()
7657
        txnShipSeq.transactionId = ordersList[0].transaction_id
7657
        txnShipSeq.transactionId = ordersList[0].transaction_id
7658
        txnShipSeq.createdTimestamp = datetime.datetime.now()
7658
        txnShipSeq.createdTimestamp = datetime.datetime.now()
7659
        txnShipSeq.sequence = 1
7659
        txnShipSeq.sequence = 1