Subversion Repositories SmartDukaan

Rev

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

Rev 13381 Rev 13382
Line 1209... Line 1209...
1209
        pickup_text = "Pickup Date: " + order.delivery_timestamp.strftime("%A, %d. %B %Y %I:%M%p")
1209
        pickup_text = "Pickup Date: " + order.delivery_timestamp.strftime("%A, %d. %B %Y %I:%M%p")
1210
        thank_you_html = """
1210
        thank_you_html = """
1211
        Thank you for shopping with us and picking up your order in Store. 
1211
        Thank you for shopping with us and picking up your order in Store. 
1212
    
1212
    
1213
        Following are the details of your order $master_order_id for which the pickup has happened. <br> If you have not picked up this product please <a href="$source_url/contact-us" target="_blank">contact us</a> immediately.<br>
1213
        Following are the details of your order $master_order_id for which the pickup has happened. <br> If you have not picked up this product please <a href="$source_url/contact-us" target="_blank">contact us</a> immediately.<br>
1214
        If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word
1214
        If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word.<br/>
1215
        """
1215
        """
1216
    else:
1216
    else:
1217
        if hasOtg:
1217
        if hasOtg:
1218
            delayed = False
1218
            delayed = False
1219
            fda = False
1219
            fda = False
Line 1227... Line 1227...
1227
            if order.promised_delivery_time.date() < fda_date:
1227
            if order.promised_delivery_time.date() < fda_date:
1228
                delayed = True
1228
                delayed = True
1229
 
1229
 
1230
            if not delayed and not fda:
1230
            if not delayed and not fda:
1231
                thank_you_html = """We are pleased to inform that the following items in your order $master_order_id have been delivered.<br/>As Promised order placed by you has been <b>Delivered On Time.</b><br/>
1231
                thank_you_html = """We are pleased to inform that the following items in your order $master_order_id have been delivered.<br/>As Promised order placed by you has been <b>Delivered On Time.</b><br/>
1232
                                If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word
1232
                                If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word.<br/>
1233
                                Delivered Item Details are:
1233
                                Delivered Item Details are:
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))
Line 1245... Line 1245...
1245
                otgCoupon = promotion_client.createCoupon(28,CouponCategory.CUSTOMER_SATISFACTION , '', arguments, False, "otg")
1245
                otgCoupon = promotion_client.createCoupon(28,CouponCategory.CUSTOMER_SATISFACTION , '', arguments, False, "otg")
1246
                thank_you_html = """Following items in your order $master_order_id have been delivered. We apologise for a delay of """+delayedDays+""" days<br/>
1246
                thank_you_html = """Following items in your order $master_order_id have been delivered. We apologise for a delay of """+delayedDays+""" days<br/>
1247
                                As per our On Time Guarantee Please accept a Gift Voucher worth Rs."""+str(discount)+"""as a token of our apology.
1247
                                As per our On Time Guarantee Please accept a Gift Voucher worth Rs."""+str(discount)+"""as a token of our apology.
1248
                                Your unique Gift Voucher Code is """+otgCoupon+""" Gift Voucher Expiry Date: """+expiry+"""<br/>
1248
                                Your unique Gift Voucher Code is """+otgCoupon+""" Gift Voucher Expiry Date: """+expiry+"""<br/>
1249
                                You can use the same to buy any Mobile, Camera, Laptop, Tablet, Accessory or Mobile/DTH Recharge from our website.</br/>
1249
                                You can use the same to buy any Mobile, Camera, Laptop, Tablet, Accessory or Mobile/DTH Recharge from our website.</br/>
1250
                                If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word
1250
                                If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word.<br/>
1251
                                """
1251
                                """
1252
            elif fda:
1252
            elif fda:
1253
                fdaFormattedString = order.first_dlvyatmp_timestamp.strftime("%A, %d. %B %Y")
1253
                fdaFormattedString = order.first_dlvyatmp_timestamp.strftime("%A, %d. %B %Y")
1254
                thank_you_html = """We are pleased to inform that the following items in your order $master_order_id have been delivered.<br/>  The First Delivery attempt was made on """+ fdaFormattedString +""" , within our commited estimated time for delivery.<br/>
1254
                thank_you_html = """We are pleased to inform that the following items in your order $master_order_id have been delivered.<br/>  The First Delivery attempt was made on """+ fdaFormattedString +""" , within our commited estimated time for delivery.<br/>
1255
                                If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word
1255
                                If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word.<br/>
1256
                                Following Items are Delivered:
1256
                                Following Items are Delivered:
1257
                                """ 
1257
                                """ 
1258
        else :
1258
        else :
1259
            thank_you_html = """We are pleased to inform that the following items in your order $master_order_id have been delivered.<br/>
1259
            thank_you_html = """We are pleased to inform that the following items in your order $master_order_id have been delivered.<br/>
1260
                            If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word
1260
                            If you are happy with our services please join us on <a href="https://twitter.com/saholic">Twitter</a>, <a href="http://www.facebook.com/mysaholic">Facebook Page</a> and help us spread the word.<br/>
1261
                            Following Items are Delivered:
1261
                            Following Items are Delivered:
1262
                            """ 
1262
                            """ 
1263
        
1263
        
1264
    freebie_text = "<br/>"
1264
    freebie_text = "<br/>"
1265
    if hasFreebie and not hasSplitOrder:
1265
    if hasFreebie and not hasSplitOrder: