Subversion Repositories SmartDukaan

Rev

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

Rev 19714 Rev 19817
Line 497... Line 497...
497
    for returnOrder in returnTransaction.returnOrders:
497
    for returnOrder in returnTransaction.returnOrders:
498
        rTransaction.returnOrders.append(to_t_returnOrderInfo(returnOrder))
498
        rTransaction.returnOrders.append(to_t_returnOrderInfo(returnOrder))
499
    return rTransaction
499
    return rTransaction
500
 
500
 
501
def to_t_returnOrderInfo(returnorderInfo):
501
def to_t_returnOrderInfo(returnorderInfo):
-
 
502
    print returnorderInfo
502
    return_OrderInfo = returnOrderInfo()
503
    return_OrderInfo = returnOrderInfo()
-
 
504
    if returnorderInfo is None:
-
 
505
        return return_OrderInfo
-
 
506
    return_OrderInfo.id = returnorderInfo.id
503
    return_OrderInfo.returnTransactionId = returnorderInfo.returnTransactionId
507
    return_OrderInfo.returnTransactionId = returnorderInfo.returnTransaction_id
504
    return_OrderInfo.masterOrderId = returnorderInfo.masterOrderId
508
    return_OrderInfo.masterOrderId = returnorderInfo.masterOrderId
505
    return_OrderInfo.orderId = returnorderInfo.orderId
509
    return_OrderInfo.orderId = returnorderInfo.orderId
506
    return_OrderInfo.lineItemId = returnorderInfo.lineItemId
510
    return_OrderInfo.lineItemId = returnorderInfo.lineItemId
507
    return_OrderInfo.logisticsRequestId = returnorderInfo.logisticsRequestId
511
    return_OrderInfo.logisticsRequestId = returnorderInfo.logisticsRequestId
508
    return_OrderInfo.returnQuantity = returnorderInfo.returnQuantity
512
    return_OrderInfo.returnQuantity = returnorderInfo.returnQuantity
Line 538... Line 542...
538
        return_OrderInfo.returnTxnResolutionStatus = ReturnTxnResolutionStatus._NAMES_TO_VALUES[returnorderInfo.returnTxnResolutionStatus]
542
        return_OrderInfo.returnTxnResolutionStatus = ReturnTxnResolutionStatus._NAMES_TO_VALUES[returnorderInfo.returnTxnResolutionStatus]
539
    return return_OrderInfo
543
    return return_OrderInfo
540
 
544
 
541
def to_t_rPickupRequest(returnPickupRequest):
545
def to_t_rPickupRequest(returnPickupRequest):
542
    rPickupRequest = RPickupRequest()
546
    rPickupRequest = RPickupRequest()
-
 
547
    if returnPickupRequest is None:
-
 
548
        return rPickupRequest
543
    rPickupRequest.id = returnPickupRequest.id
549
    rPickupRequest.id = returnPickupRequest.id
544
    rPickupRequest.logisticsProviderId = returnPickupRequest.logisticsProviderId
550
    rPickupRequest.logisticsProviderId = returnPickupRequest.logisticsProviderId
545
    rPickupRequest.pickupRequestNo = returnPickupRequest.pickupRequestNo
551
    rPickupRequest.pickupRequestNo = returnPickupRequest.pickupRequestNo
546
    if returnPickupRequest.confirmedAt:
552
    if returnPickupRequest.confirmedAt:
547
        rPickupRequest.confirmedAt = to_java_date(returnPickupRequest.confirmedAt)
553
        rPickupRequest.confirmedAt = to_java_date(returnPickupRequest.confirmedAt)