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



    start_date = start_time.date()
    end_date = start_date + datetime.timedelta(days = delivery_days)
    holidays = __get_holidays(start_time)
    
    while start_date <= end_date:
 
        if start_date.weekday() == 6 or start_date in holidays:
            delivery_days = delivery_days + 1
            end_date = end_date + datetime.timedelta(days = 1)
        start_date = start_date + datetime.timedelta(days = 1)
    
    return delivery_days
 
def enqueue_transaction_info_email(transaction_id):
    transaction = get_transaction(transaction_id)

Rev 4078	Rev 4088
Line 282...	Line 282...
282	`start_date = start_time.date()`	282	`start_date = start_time.date()`
283	`end_date = start_date + datetime.timedelta(days = delivery_days)`	283	`end_date = start_date + datetime.timedelta(days = delivery_days)`
284	`holidays = __get_holidays(start_time)`	284	`holidays = __get_holidays(start_time)`
285		285
286	`while start_date <= end_date:`	286	`while start_date <= end_date:`
287	`start_date = start_date + datetime.timedelta(days = 1)`	-
288	`if start_date.weekday() == 6 or start_date in holidays:`	287	`if start_date.weekday() == 6 or start_date in holidays:`
289	`delivery_days = delivery_days + 1`	288	`delivery_days = delivery_days + 1`
290	`end_date = end_date + datetime.timedelta(days = 1)`	289	`end_date = end_date + datetime.timedelta(days = 1)`
-		290	`start_date = start_date + datetime.timedelta(days = 1)`
291		291
292	`return delivery_days`	292	`return delivery_days`
293		293
294	`def enqueue_transaction_info_email(transaction_id):`	294	`def enqueue_transaction_info_email(transaction_id):`
295	`transaction = get_transaction(transaction_id)`	295	`transaction = get_transaction(transaction_id)`

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 4078 → 4088