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

 def enqueue_transaction_info_email(transaction_id):
     transaction = get_transaction(transaction_id)
+    #Dear Customer, thanks for placing order of Spice Stellar Mi-535 Black and 5 other items amounting Rs. 25000. Check your email for details.
-    smsText = "Dear Customer, Thanks for ordering "
+    smsText = "Dear Customer, thanks for placing order of "
-    otgSms = False
     mobileNo = None
     customerId = 0
+    sendSms = True
+    transactionAmount = 0.0
+    orderQuantity = 0
     subject = source_name + " - Order Details"
     orders = transaction.orders
     advance_amount = orders[0].advanceAmount
     saddress = ""
+    for order in orders:
+        if order.pickupStoreId:
+            sendSms= False
+        transactionAmount = transactionAmount + order.total_amount
+        for lineitem in order.lineitems:
+            orderQuantity = orderQuantity + lineitem.model_number
+    oneProduct = str(orders[0].lineitems[0])
+    smsText = smsText + oneProduct
+    orderQuantity = orderQuantity - 1
+    if orderQuantity !=0 and orderQuantity >0:
+        smsText = smsText + " and " + str(orderQuantity) + " other items"
+    smsText = smsText +" amounting Rs. "+transactionAmount+ ". Check your email for details."
     bcc = []
     if advance_amount  > 0:
         store = get_hotspot_store(orders[0].storeId, "")
         bcc = bcc + store.approvalEmail.split(';')  + [store.email,  "amit.gupta@shop2020.in", "rajneesh.arora@shop2020.in", "amit.sirohi@shop2020.in"]
         saddress += " at our store " + __get_hotspot_store_address_html(store)
     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
             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 = """
             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)+ ")" +". "
             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)+" "
         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."
     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))
-    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)
+        if sendSms:
-        send_transaction_sms(customerId, mobileNo, smsText, SmsType.TRANSACTIONAL)
+            send_transaction_sms(customerId, mobileNo, smsText, SmsType.TRANSACTIONAL)
         return True
     except Exception as e:
         print e
         return False

Subversion Repositories SmartDukaan

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