Subversion Repositories SmartDukaan

Rev

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

Rev 7746 Rev 7760
Line 3953... Line 3953...
3953
    </p>
3953
    </p>
3954
</div>
3954
</div>
3955
</body>
3955
</body>
3956
</html>
3956
</html>
3957
    """
3957
    """
3958
    logistics_providers = {1: {'name': 'BlueDart', 'phone': '011-66111234'}, 2: {'name': 'Aramex', 'phone': '0124- 39419900'}, 3: {'name': 'Delhivery', 'phone' : '0124- 4212200'}}
3958
    logistics_providers = {1: {'name': 'BlueDart', 'phone': '011-66111234'}, 6: {'name': 'RedExpress', 'phone': '8373915813'}, 3: {'name': 'Delhivery', 'phone' : '0124- 4212200'}}
3959
    provider_name = logistics_providers[order.logistics_provider_id]['name']
3959
    provider_name = logistics_providers[order.logistics_provider_id]['name']
3960
    provider_phone = logistics_providers[order.logistics_provider_id]['phone']
3960
    provider_phone = logistics_providers[order.logistics_provider_id]['phone']
3961
    
3961
    
3962
    lclient = LogisticsClient().get_client()
3962
    lclient = LogisticsClient().get_client()
3963
    logistics_info = lclient.getLogisticsEstimation(order.lineitems[0].item_id, order.customer_pincode, DeliveryType.PREPAID)
3963
    logistics_info = lclient.getLogisticsEstimation(order.lineitems[0].item_id, order.customer_pincode, DeliveryType.PREPAID)
Line 4108... Line 4108...
4108
    return RechargeOrder.get_by(id = rechargeOrderId)
4108
    return RechargeOrder.get_by(id = rechargeOrderId)
4109
 
4109
 
4110
def get_recharge_orders(userId):
4110
def get_recharge_orders(userId):
4111
    return RechargeOrder.query.filter_by(userId = userId).all()
4111
    return RechargeOrder.query.filter_by(userId = userId).all()
4112
 
4112
 
4113
def update_recharge_order_status(rechargeOrderId, rechargeOrderStatus, refundDate=None):
4113
def update_recharge_order_status(rechargeOrderId, rechargeOrderStatus):
4114
    recharge_order = get_recharge_order(rechargeOrderId)
4114
    recharge_order = get_recharge_order(rechargeOrderId)
4115
    if rechargeOrderStatus == RechargeOrderStatus.PAYMENT_FAILED:
4115
    if rechargeOrderStatus == RechargeOrderStatus.PAYMENT_FAILED:
4116
        recharge_order.status = RechargeOrderStatus.PAYMENT_FAILED
4116
        recharge_order.status = RechargeOrderStatus.PAYMENT_FAILED
4117
        session.commit()
4117
        session.commit()
4118
        return True
4118
        return True
4119
    
4119
    
4120
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED:
4120
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED:
4121
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED
4121
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED
-
 
4122
        recharge_order.responseTimestamp = datetime.datetime.now()
4122
        session.commit()
4123
        session.commit()
4123
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id)
4124
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id)
4124
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id)
4125
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id)
4125
        enqueue_recharge_info_email(recharge_order)
4126
        enqueue_recharge_info_email(recharge_order)
4126
        return True
4127
        return True
Line 4133... Line 4134...
4133
        enqueue_recharge_info_email(recharge_order, gvs)
4134
        enqueue_recharge_info_email(recharge_order, gvs)
4134
        return True
4135
        return True
4135
    
4136
    
4136
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED:
4137
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED:
4137
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED_REFUNDED
4138
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED_REFUNDED
4138
        order.responseTimestamp = refundDate
4139
        order.responseTimestamp = datetime.datetime.now()
4139
        session.commit()
4140
        session.commit()
4140
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id)
4141
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id)
4141
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id)
4142
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id)
4142
        enqueue_recharge_info_email(recharge_order)
4143
        enqueue_recharge_info_email(recharge_order)
4143
        return True
4144
        return True