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



    return_OrderInfo.masterOrderId = returnorderInfo.masterOrderId
    return_OrderInfo.orderId = returnorderInfo.orderId
    return_OrderInfo.lineItemId = returnorderInfo.lineItemId
    return_OrderInfo.logisticsRequestId = returnorderInfo.logisticsRequestId
    return_OrderInfo.returnQuantity = returnorderInfo.returnQuantity
    return_OrderInfo.receivedQuantity = returnorderInfo.receivedQuantity
    return_OrderInfo.createdAt = to_java_date(returnorderInfo.createdAt)
    if returnorderInfo.processedAt:
        return_OrderInfo.processedAt = to_java_date(returnorderInfo.processedAt)
    return_OrderInfo.returnStatus = returnorderInfo.returnStatus
    if returnorderInfo.reshippedAt:

    return_OrderInfo.shippingType = returnorderInfo.shippingType
    return_OrderInfo.replacementOrderId = returnorderInfo.replacementOrderId
    return_OrderInfo.receivedReturnType = returnorderInfo.receivedReturnType
    return_OrderInfo.freebieItemId = returnorderInfo.freebieItemId
    return_OrderInfo.returnAction = returnorderInfo.returnAction
    return_OrderInfo.returnPickupType = returnorderInfo.returnPickupType
    if returnorderInfo.returnTxnResolutionStatus:
        return_OrderInfo.returnTxnResolutionStatus = ReturnTxnResolutionStatus._NAMES_TO_VALUES[returnorderInfo.returnTxnResolutionStatus]
    return return_OrderInfo
 
def to_t_rPickupRequest(returnPickupRequest):
    rPickupRequest = RPickupRequest()
 
 
    rPickupRequest.id = returnPickupRequest.id
    rPickupRequest.logisticsProviderId = returnPickupRequest.logisticsProviderId
    rPickupRequest.pickupRequestNo = returnPickupRequest.pickupRequestNo
    if returnPickupRequest.confirmedAt:
        rPickupRequest.confirmedAt = to_java_date(returnPickupRequest.confirmedAt)

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py – Rev 19980 → 20028

Rev 19980		Rev 20028
Line 531...		Line 531...
531	`return_OrderInfo.masterOrderId = returnorderInfo.masterOrderId`	531	`return_OrderInfo.masterOrderId = returnorderInfo.masterOrderId`
532	`return_OrderInfo.orderId = returnorderInfo.orderId`	532	`return_OrderInfo.orderId = returnorderInfo.orderId`
533	`return_OrderInfo.lineItemId = returnorderInfo.lineItemId`	533	`return_OrderInfo.lineItemId = returnorderInfo.lineItemId`
534	`return_OrderInfo.logisticsRequestId = returnorderInfo.logisticsRequestId`	534	`return_OrderInfo.logisticsRequestId = returnorderInfo.logisticsRequestId`
535	`return_OrderInfo.returnQuantity = returnorderInfo.returnQuantity`	535	`return_OrderInfo.returnQuantity = returnorderInfo.returnQuantity`
536	`return_OrderInfo.receivedQuantity = return_OrderInfo.receivedQuantity`	536	`return_OrderInfo.receivedQuantity = returnorderInfo.receivedQuantity`
537	`return_OrderInfo.createdAt = to_java_date(returnorderInfo.createdAt)`	537	`return_OrderInfo.createdAt = to_java_date(returnorderInfo.createdAt)`
538	`if returnorderInfo.processedAt:`	538	`if returnorderInfo.processedAt:`
539	`return_OrderInfo.processedAt = to_java_date(returnorderInfo.processedAt)`	539	`return_OrderInfo.processedAt = to_java_date(returnorderInfo.processedAt)`
540	`return_OrderInfo.returnStatus = returnorderInfo.returnStatus`	540	`return_OrderInfo.returnStatus = returnorderInfo.returnStatus`
541	`if returnorderInfo.reshippedAt:`	541	`if returnorderInfo.reshippedAt:`
Line 559...		Line 559...
559	`return_OrderInfo.shippingType = returnorderInfo.shippingType`	559	`return_OrderInfo.shippingType = returnorderInfo.shippingType`
560	`return_OrderInfo.replacementOrderId = returnorderInfo.replacementOrderId`	560	`return_OrderInfo.replacementOrderId = returnorderInfo.replacementOrderId`
561	`return_OrderInfo.receivedReturnType = returnorderInfo.receivedReturnType`	561	`return_OrderInfo.receivedReturnType = returnorderInfo.receivedReturnType`
562	`return_OrderInfo.freebieItemId = returnorderInfo.freebieItemId`	562	`return_OrderInfo.freebieItemId = returnorderInfo.freebieItemId`
563	`return_OrderInfo.returnAction = returnorderInfo.returnAction`	563	`return_OrderInfo.returnAction = returnorderInfo.returnAction`
-		564	`return_OrderInfo.returnPickupType = returnorderInfo.returnPickupType`
564	`if returnorderInfo.returnTxnResolutionStatus:`	565	`if returnorderInfo.returnTxnResolutionStatus:`
565	`return_OrderInfo.returnTxnResolutionStatus = ReturnTxnResolutionStatus._NAMES_TO_VALUES[returnorderInfo.returnTxnResolutionStatus]`	566	`return_OrderInfo.returnTxnResolutionStatus = ReturnTxnResolutionStatus._NAMES_TO_VALUES[returnorderInfo.returnTxnResolutionStatus]`
566	`return return_OrderInfo`	567	`return return_OrderInfo`
567		568
568	`def to_t_rPickupRequest(returnPickupRequest):`	569	`def to_t_rPickupRequest(returnPickupRequest):`
569	`rPickupRequest = RPickupRequest()`	570	`rPickupRequest = RPickupRequest()`
570	`if returnPickupRequest is None:`	-
571	`return rPickupRequest`	-
572	`rPickupRequest.id = returnPickupRequest.id`	571	`rPickupRequest.id = returnPickupRequest.id`
573	`rPickupRequest.logisticsProviderId = returnPickupRequest.logisticsProviderId`	572	`rPickupRequest.logisticsProviderId = returnPickupRequest.logisticsProviderId`
574	`rPickupRequest.pickupRequestNo = returnPickupRequest.pickupRequestNo`	573	`rPickupRequest.pickupRequestNo = returnPickupRequest.pickupRequestNo`
575	`if returnPickupRequest.confirmedAt:`	574	`if returnPickupRequest.confirmedAt:`
576	`rPickupRequest.confirmedAt = to_java_date(returnPickupRequest.confirmedAt)`	575	`rPickupRequest.confirmedAt = to_java_date(returnPickupRequest.confirmedAt)`