Subversion Repositories SmartDukaan

Rev

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

Rev 13387 Rev 13388
Line 1234... Line 1234...
1234
                                """ 
1234
                                """ 
1235
            elif delayed:
1235
            elif delayed:
1236
                max_discount = 500*otgCount
1236
                max_discount = 500*otgCount
1237
                delayedDays = max(1,get_business_days_count(order.promised_delivery_time, fda_datetime))
1237
                delayedDays = max(1,get_business_days_count(order.promised_delivery_time, fda_datetime))
1238
                max_discount = min(max_discount, totalUnitPrice/10)
1238
                max_discount = min(max_discount, totalUnitPrice/10)
1239
                discount = min(round(max_discount),delayedDays*50)
1239
                discount = min(round(max_discount),delayedDays*50*otgCount)
1240
                promotion_client = PromotionClient().get_client()
1240
                promotion_client = PromotionClient().get_client()
1241
                endOn =  order.delivery_timestamp + datetime.timedelta(days = 30)
1241
                endOn =  order.delivery_timestamp + datetime.timedelta(days = 30)
1242
                expiry = endOn.strftime("%A, %d. %B %Y")
1242
                expiry = endOn.strftime("%A, %d. %B %Y")
1243
                endOn = to_java_date(endOn)
1243
                endOn = to_java_date(endOn)
1244
                arguments = "{\"endOn\":" + str(endOn) + ", \"emails\":[\"" + order.customer_email + "\"], \"couponType\":\"both\", \"usage_limit_for_user\":1, \"isCod\":False, \"discount\":" + str(discount) + "}"
1244
                arguments = "{\"endOn\":" + str(endOn) + ", \"emails\":[\"" + order.customer_email + "\"], \"couponType\":\"both\", \"usage_limit_for_user\":1, \"isCod\":False, \"discount\":" + str(discount) + "}"
Line 4926... Line 4926...
4926
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
4926
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
4927
        if recharge_order.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
4927
        if recharge_order.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
4928
            print "Same updation for status RECHARGE_SUCCESSFUL"
4928
            print "Same updation for status RECHARGE_SUCCESSFUL"
4929
            return True
4929
            return True
4930
        recharge_order.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
4930
        recharge_order.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
-
 
4931
        recharge_order.responseTimestamp = datetime.datetime.now()
4931
        recharge_order.invoiceNumber = get_next_invoice_number(OrderType.RECHARGE)
4932
        recharge_order.invoiceNumber = get_next_invoice_number(OrderType.RECHARGE)
4932
        session.commit()
4933
        session.commit()
4933
        gvs = allocate_gift_voucher(recharge_order)
4934
        gvs = allocate_gift_voucher(recharge_order)
4934
        enqueue_recharge_info_email(recharge_order, gvs)
4935
        enqueue_recharge_info_email(recharge_order, gvs)
4935
        return True
4936
        return True
Line 6002... Line 6003...
6002
        store.collectedAmount = store.collectedAmount - rechargeTransaction.amount + rechargeTransaction.discount
6003
        store.collectedAmount = store.collectedAmount - rechargeTransaction.amount + rechargeTransaction.discount
6003
        session.commit()
6004
        session.commit()
6004
 
6005
 
6005
    if status == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
6006
    if status == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
6006
        rechargeTransaction.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
6007
        rechargeTransaction.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
-
 
6008
        rechargeTransaction.responseTime = datetime.datetime.now() 
6007
        rechargeTransaction.invoiceNumber = get_next_invoice_number(OrderType.RCH4HOTSPOT)
6009
        rechargeTransaction.invoiceNumber = get_next_invoice_number(OrderType.RCH4HOTSPOT)
6008
        session.commit()
6010
        session.commit()
6009
 
6011
 
6010
 
6012
 
6011
def create_recharge_transaction(t_recharge):
6013
def create_recharge_transaction(t_recharge):