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

     return diff - (non_business_days + sundays)
 def enqueue_transaction_info_email(transaction_id):
     transaction = get_transaction(transaction_id)
-    '''
     smsText = "Dear Customer, Thanks for ordering "
     otgSms = False
     mobileNo = None
     customerId = 0
-    '''
     subject = source_name + " - Order Details"
     orders = transaction.orders
     advance_amount = orders[0].advanceAmount
     saddress = ""
     bcc = []
     otgLink = ""
     inOrderOtg = "<div>On Time Guarantee<br><span style=color:red>We pay if we delay</span></div>"
     if len(transaction.orders) == 1:
         inOrderOtg = ""
         if transaction.orders[0].otg :
-            #otgSms = True
+            otgSms = True
             subject = "Your Order is confirmed with On Time Guarantee We Pay if we Delay"
             otgLink = ' Your Order is covered under the <a href="http://www.saholic.com/static/on-time-guarantee">On Time Guarantee, We pay If we Delay.</a>'
     customer_name = ""
     html_header = """
     if orders[0].pickupStoreId:
         random_text = str(randrange(100000, 999999))
     first = True
     for order in orders:
-        '''mobileNo = order.customer_mobilenumber
+        mobileNo = order.customer_mobilenumber
         customerId = order.customer_id
-        '''
         customer_name = order.customer_name
         order_date = order.created_timestamp
         user_email = order.customer_email
         if first:
             first = False
             attribute.name = "SECRET_CODE"
             attribute.value = random_text
             session.commit()
         for lineitem in order.lineitems:
-            #smsText = smsText + lineitem.brand + " " + lineitem.model_name + " " + lineitem.model_number + "("+str(lineitem.quantity)+ ")" +". "
+            smsText = smsText + lineitem.brand + " " + lineitem.model_name + " " + lineitem.model_number + "("+str(lineitem.quantity)+ ")" +". "
             lineitem_total_price = round(lineitem.total_price, 2)
             html_tr += "<td>" + str(lineitem) + "</td>"
             if order.otg:
                 html_tr += "<td align='center'><div>" + store_delivery_date + "</div>" + inOrderOtg + "</td>"
             html_tr += "<td align='center'>" + ("%.0f" % lineitem.quantity) + "</td>"
             html_tr += "<td align='center'> Rs. " + ("%.2f" % lineitem.unit_price) + "</td>"
             html_tr += "<td align='center'> Rs. " + ("%.2f" % lineitem_total_price) + "</td></tr>"
             total_amount += lineitem_total_price
             html_table += html_tr
-        #smsText = smsText + "Order Id: "+str(order.id)+" "
+        smsText = smsText + "Order Id: "+str(order.id)+" "
         if order.freebieItemId:
             catalog_client = CatalogClient().get_client()
             item = catalog_client.getItem(order.freebieItemId)
             html_table += "<tr><td align='center'></td><td style='font-style:italic;' colspan='5'> Free Item: "+item.brand + " " + item.modelName + " " + item.modelNumber+"</td></tr>"
         if order.insurer:
             html_table += "<tr><td colspan=6>&nbsp;</td></tr>"
             html_table += "<tr><td align='center'></td><td style='font-style:italic;'>Insured Against Theft for 1 Year. <a href='http://www.saholic.com/static/insurance-terms'>Know More</a></td><td align='center'></td><td align='center'></td><td align='center'></td>"
             html_table += "<td align='center'>" + str(order.insuranceAmount) + "</td></tr>"
             total_amount += order.insuranceAmount
-    #smsText = smsText + "Saholic.com."
+    smsText = smsText + "Saholic.com."
     emi_amount = 0
     miscCharges = get_misc_charges(transaction_id)
     if miscCharges.get(1):
         emi_amount = miscCharges.get(1)
     store_delivery_date = sdt.strftime("%A, %d %B %Y")
     email_header = Template(html_header).substitute(dict(order_date = formated_order_date, customer_name = customer_name, source_url = source_url, otgLink = otgLink, saddress = saddress))
     email_footer = Template(html_footer).substitute(dict(total_amount = "%.2f" % total_amount, emi_amount = "%.2f" % emi_amount, advance_amount = "%.2f" % advance_amount, net_amount = "%.2f" % (total_amount-order.gvAmount), secret_code = random_text, store_address = store_address, store_delivery_date = store_delivery_date, source_url = source_url, source_name = source_name, amount_string = amount_string))
-    try:
-        helper_client = HelperClient().get_client()
-        helper_client.saveUserEmailForSending([user_email], "", subject, email_header + html_table + email_footer, str(transaction_id), "TransactionInfo", [], bcc, orders[0].source)
-        return True
-    except Exception as e:
-        print e
-        return False
-    '''
     if otgSms:
         smsText = smsText +" Order comes under On Time Guarantee We Pay if we Delay. T&C Apply"
     try:
         helper_client = HelperClient().get_client()
         helper_client.saveUserEmailForSending([user_email], "", subject, email_header + html_table + email_footer, str(transaction_id), "TransactionInfo", [], bcc, orders[0].source)
-    except Exception as e:
-        print e
-        try:
-            send_transaction_sms(customerId, mobileNo, smsText, SmsType.TRANSACTIONAL)
-            return True
-        except Exception as e:
-            print e
-            print sys.exc_info()[0]
-            return False
-    try:
         send_transaction_sms(customerId, mobileNo, smsText, SmsType.TRANSACTIONAL)
         return True
     except Exception as e:
         print e
-        print sys.exc_info()[0]
-        return True
+        return False
-    '''
 def send_transaction_sms(customerId, mobileNo, smsText, smsType):
     if mobileNo is not None:
             helper_client = HelperClient().get_client()
             helper_client.saveUserSmsForSending(customerId, mobileNo, smsText, SmsType.TRANSACTIONAL)
     email_footer = Template(html_footer).substitute(dict(total_amount = "%.2f" % total_amount, source_name = source_name, freebie_text = freebie_text))
     try:
         helper_client = HelperClient(host_key = "helper_service_server_host_prod").get_client()
         helper_client.saveUserEmailForSending([user_email], "", subject, email_header + html_table + email_footer, str(order.id), "DeliverySuccess", [], [], order.source)
-        '''
         if order.source == OrderSource.WEBSITE:
             send_transaction_sms(order.customer_id, order.customer_mobilenumber, "Dear Customer, Your order: " + str(order.id) + " has been delivered now. For any queries please call 0120-2479977." , SmsType.TRANSACTIONAL)
-        '''
         return True
     except Exception as e:
         print e
         return False
     helperClient = HelperClient(host_key = "helper_service_server_host_prod").get_client()
     try:
         emailSubject = 'Shipping Details for Order ID: ' + str(order.id)
         emailBody = get_shipping_confirmation_email_body(order)
         helperClient.saveUserEmailForSending([order.customer_email], None, emailSubject, emailBody, str(order.id), 'ShippingConfirmation', [], [], order.source)
-        '''
         logistics_providers = {1: {'name': 'BlueDart', 'phone': '011-66111234'}, 6: {'name': 'RedExpress', 'phone': '8373915813'}, 3: {'name': 'Delhivery', 'phone' : '0124- 4212200'}, 7: {'name': 'FedEx', 'phone' : '0120-4354176'}}
         provider_name = logistics_providers[order.logistics_provider_id]['name']
         if order.source == OrderSource.WEBSITE :
             send_transaction_sms(order.customer_id, order.customer_mobilenumber, "Dear Customer, We have shipped your order: " + str(order.id) + " through "+provider_name + " AWB No. " + order.airwaybill_no, SmsType.TRANSACTIONAL)
-        '''
     except Exception as e:
         print e
 def get_order_distribution_by_status(start_date, end_date):
     query = session.query(Order.status, func.count(Order.id)).group_by(Order.status)

Subversion Repositories SmartDukaan

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