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

     TransactionStatus, OrderStatus, DelayReason, ExtraTransactionProcessingType, \
     HotspotAction, TimeoutSummary, OrderStatusGroups, OrderType, RechargeOrderStatus, \
     RechargeType, RechargeStatistics, DeviceNumberInfo, EmiChargeType, PayMethod, \
     OrderSource, StorePaymentStatus, ProductCondition, TaxType, \
     AmazonFCWarehouseLocation
-#from shop2020.thriftpy.utils.ttypes import UserSmsInfo, SmsType
+from shop2020.thriftpy.utils.ttypes import UserSmsInfo, SmsType
 from shop2020.thriftpy.model.v1.user.ttypes import VoucherType, CouponCategory, \
     User, Sex
 from shop2020.thriftpy.payments.ttypes import PaymentException
 from shop2020.thriftpy.warehouse.ttypes import ScanType, \
     WarehouseServiceException
 def enqueue_transaction_info_email(transaction_id):
     transaction = get_transaction(transaction_id)
     '''
-    smsText = "Thanks for ordering "
+    smsText = "Dear Customer, Thanks for ordering "
     otgSms = False
     mobileNo = None
     customerId = 0
     '''
     subject = source_name + " - Order Details"
             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_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)
     except Exception as e:
         print e
         return False
     '''
     if otgSms:
-        smsText = smsText +" On Time Guarantee We Pay if we Delay. T&C Apply"
+        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:
     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 "+ order.customer_name +", Your order: " + str(order.id) + " has been delivered now. For any queries please call 0120-2479977." , SmsType.TRANSACTIONAL)
+            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.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 "+ order.customer_name +", We have shipped your order: " + str(order.id) + " through "+provider_name + " AWB No. " + order.airwaybill_no, SmsType.TRANSACTIONAL)
+            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):
     FailureReasonMap = {}
     FailureReasonMap["Invalid Amount"] = "the amount you tried seems to be invalid. Please try another amount."
     FailureReasonMap["Customer Exceeded Daily Limit"] = "you have exceeded daily recharge limit for this number. Please try after 12 hours."
     FailureReasonMap["Invalid Device Number"] = "it seems that your device number is not being recognized by selected operator. Please make sure the number you tried is correct."
-    '''
     FailureReasonMapSms = {}
     FailureReasonMapSms["Invalid Amount"] = " invalid amount."
-    FailureReasonMapSms["Customer Exceeded Daily Limit"] = " daily limit exceeded. Please try after 12Hrs"
+    FailureReasonMapSms["Customer Exceeded Daily Limit"] = " daily limit exceeded. Please try after 12Hrs."
     FailureReasonMapSms["Invalid Device Number"] = " invalid device number."
-    '''
     failureReason = FailureReasonMap.get(recharge_order.description)
-    '''
     failureReasonSms = FailureReasonMapSms.get(recharge_order.description)
     if failureReasonSms is None:
         failureReasonSms = " network failure."
-    '''
     if failureReason is None:
         failureReason = "of network failure."
     if recharge_order.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
         status = "Recharge Successful"
         message = ""
     formated_order_date = dt.strftime("%A, %d. %B %Y %I:%M%p")
     email_header = Template(html_header).substitute(dict(order_id = display_order_id, order_date = formated_order_date, email = email, source_url = source_url, order_amount = recharge_order.totalAmount, order_status = status, device_number = deviceNumber, service_provider = providerName, failureReason = failureReason))
     email_footer = Template(html_footer).substitute(dict(source_url = source_url, source_name = source_name))
-    '''
     if isinstance(recharge_order, MobileRechargeOrder):
         smsText = ""
         if status == "Recharge Failed" and recharge_order.description == "Invalid Device Number" :
             print "Do send Sms"
+            '''
+            try:
+                helper_client = HelperClient().get_client()
+                helper_client.saveUserEmailForSending([email], "", source_name + " - Recharge Order Details", email_header + email_footer, str(recharge_order.id), "RechargeInfo", [], [], 1)
+            except Exception as e:
+                print e
+            '''
         elif status == "Recharge Failed" and recharge_order.description != "Invalid Device Number" :
             smsText = "Dear Customer, We could not process your recharge due to" + failureReasonSms + " We have credited the amount to your recharge wallet. You can use wallet amount to recharge again. "
         elif status == "Recharge Successful" :
-            smsText = "Thanks for recharging your mobile for Rs. "+ str(recharge_order.totalAmount) + " from Saholic.com. Order Id is "+ display_order_id + ". Any Query? please call 0120-2479977"
+            smsText = "Dear Customer, Thanks for recharging your mobile for Rs. "+ str(recharge_order.totalAmount) + " from Saholic.com. Order Id is "+ display_order_id + ". Any Query? please call 0120-2479977"
         elif status == "Recharge Under Process" :
-            smsText = "Dear Customer, Your Payment was successful but due to some internal error with the operator's system we are not sure if the recharge was successful. In case your recharge is not processed, we will credit amount to your recharge wallet. You can use wallet amount to recharge again."
+            smsText = "Dear Customer, Your Payment was successful but due to some internal error with the operator's system we are not sure if the recharge was successful. In case your recharge is not processed, we will credit amount to your recharge wallet."
+            #Dear Customer, Your Payment was successful but due to some internal error with the operator's system we are not sure if the recharge was successful. In case your recharge is not processed, we will credit amount to your recharge wallet.
         elif status == "Recharge Failed, Amount Refunded" :
             smsText = "Dear Customer, It seems operator could not process your recharge request. We are crediting the refund amount to your recharge wallet. You can use wallet amount to recharge again."
         try:
             send_transaction_sms(recharge_order.userId, deviceNumber, smsText, SmsType.TRANSACTIONAL)
         except Exception as e:
             print e
-            try:
+            pass
-                helper_client = HelperClient().get_client()
-                helper_client.saveUserEmailForSending([email], "", source_name + " - Recharge Order Details", email_header + email_footer, str(recharge_order.id), "RechargeInfo", [], [], 1)
-                return True
-            except Exception as e:
-                print e
-                return False
-    '''
     try:
         helper_client = HelperClient().get_client()
         helper_client.saveUserEmailForSending([email], "", source_name + " - Recharge Order Details", email_header + email_footer, str(recharge_order.id), "RechargeInfo", [], [], 1)
         return True
     except Exception as e:

Subversion Repositories SmartDukaan

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