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

     TransactionStatus, OrderStatus, DelayReason, ExtraTransactionProcessingType, \
     HotspotAction, TimeoutSummary, OrderStatusGroups, OrderType
 from shop2020.thriftpy.payments.ttypes import PaymentException
 from shop2020.thriftpy.warehouse.ttypes import ScanType, \
     WarehouseServiceException
-from shop2020.utils.EmailAttachmentSender import mail, get_attachment_part,\
+from shop2020.utils.EmailAttachmentSender import mail, get_attachment_part
-    mail_html
 from shop2020.utils.Utils import to_py_date, to_java_date
 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
 from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import and_, or_, desc, not_, distinct, select
 from string import Template
     return delivery_days
 def enqueue_transaction_info_email(transaction_id):
     transaction = get_transaction(transaction_id)
-    customer_name = ""
     html_header = """
 <html>
 <body>
 <div>
     <p>
-        Hello $customer_name,<br /><br />
+        Hello,<br /><br />
         Thanks for placing order with us. Following are the details of your order:
     </p>
     <div>
         Order Date: $order_date
     </div>
     orders = transaction.orders
     html_pickup_text = ""
     random_text = ""
     if orders[0].pickupStoreId:
         random_text = str(randrange(100000, 999999))
+        html_pickup_text =  "Secret code for your order is " + random_text + ". Please tell store manager this secret code to get the order. "
     for order in orders:
-        customer_name = order.customer_name
         order_date = order.created_timestamp
         user_email = order.customer_email
         html_tr = "<tr><td align='center'>" + str(order.id) + "</td>"
         if order.pickupStoreId:
             <td> Rs. $total_amount</td>
         </tr>
         </table>
     </div>
     """
-    store_address = ""
-    if orders[0].pickupStoreId:
-        store = LogisticsClient().get_client().getPickupStore(orders[0].pickupStoreId)
-        store_address = __get_store_address_html(store)
-        html_pickup_text = html_pickup_text + """
-        <h3>Steps to Pickup In Store</h3>
-) Estimated arrival date of your product(s) is $store_delivery_date at your selected Store.<br>
-) You will receive a confirmation email from us when your product(s) reaches the store. Once you receive the same, please visit the following store selected by you.<br>
-        <br><i>$store_address</i><br>
-        """
-        if orders[0].cod:
-            html_pickup_text = html_pickup_text + """
-) Pay Rs. $total_amount, present a valid Photo Identity Proof* and use your Secret Code <b><i>$secret_code</i></b> to claim your Product(s).<br><br>
-            *Valid Photo Identity Proof are Driving License, Passport, PAN Card, Voter ID, Company Issued ID Card, College issued Student ID Card Or any other Government approved Photo Id.<br>
-            <br>
-            In case you have any questions please visit <a href="www.saholic.com/static/buy-online-pickup-in-store">Details on Pickup in Store</a>. If you still have more questions feel free to contact us 24/7 via <a href="http://www.saholic.com/contact-us">http://www.saholic.com/contact-us</a>
-            </br><hr />
-            """
-        else:
-            html_pickup_text = html_pickup_text + """
-) Present a valid Photo Identity Proof* and use your Secret Code <b><i>$secret_code</i></b> to claim your Product(s).<br><br>
-            *Valid Photo Identity Proof are Driving License, Passport, PAN Card, Voter ID, Company Issued ID Card, College issued Student ID Card Or any other Government approved Photo Id.<br>
-            <br>
-            In case you have any questions please visit <a href="www.saholic.com/static/buy-online-pickup-in-store">Details on Pickup in Store</a>. If you still have more questions feel free to contact us 24/7 via <a href="http://www.saholic.com/contact-us">http://www.saholic.com/contact-us</a>
-            </br><hr />
-            """
     html_footer = html_footer + html_pickup_text + """
     <p>
         Best Wishes,<br />
         Saholic Team
     </p>
 </html>
     """
     dt = datetime.datetime.strptime(str(order_date), "%Y-%m-%d %H:%M:%S")
     formated_order_date = dt.strftime("%A, %d. %B %Y %I:%M%p")
-    sdt = datetime.datetime.strptime(str(orders[0].expected_delivery_time), "%Y-%m-%d %H:%M:%S")
-    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))
+    email_header = Template(html_header).substitute(dict(order_date = formated_order_date))
-    email_footer = Template(html_footer).substitute(dict(total_amount = "%.2f" % total_amount, secret_code = random_text, store_address = store_address, store_delivery_date = store_delivery_date))
+    email_footer = Template(html_footer).substitute(dict(total_amount = "%.2f" % total_amount))
     try:
         helper_client = HelperClient().get_client()
         helper_client.saveUserEmailForSending(user_email, "", "Saholic - Order Details", email_header + html_table + email_footer, str(transaction_id), "TransactionInfo")
         return True
                     monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
                     monitoredEntity.description="warehouseId = " + str(warehouseId) + " providerId = " + str(providerId) + " orderId = "  + str(order.id);
                     alert_client = AlertClient().get_client()
                     alert_client.scheduleAlert(monitoredEntity)
                 except Exception as e:
+                    print "Exception in scheduling alert in ShippedFromWarehouse method"
                     print e
         session.commit()
         try:
             enqueue_shipping_confirmation_email(orders)
             monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
             monitoredEntity.description="providerId = " + str(provider_id) + "   " + pickup_details
             alert_client = AlertClient().get_client()
             alert_client.updateMonitoredObject(monitoredEntity)
         except Exception as e:
+            print "Exception in updating alert in MarkOrdersAsPickedUp method"
             print e
     session.commit()
 def get_orders_not_picked_up(provider_id):
     current_time = datetime.datetime.now()
                 monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
                 monitoredEntity.description="deliveryTimeAtStore = " + str(order.delivery_timestamp) + " orderId = "  + str(order.id);
                 alert_client = AlertClient().get_client()
                 alert_client.updateMonitoredObject(monitoredEntity)
             except Exception as e:
+                print "Exception in updating alert in MarkOrdersAsDelivered method"
                 print e
         else:
             order.status = OrderStatus.DELIVERY_SUCCESS
             order.statusDescription = "Order delivered"
             update_trust_level(order)
             try:
                 alert_client = AlertClient().get_client()
                 alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
             except Exception as e:
+                print "Exception in scheduling alert in ShippedFromWarehouse method"
                 print e
         timestamp, receiver = detail.split('|')
         if order.first_dlvyatmp_timestamp is None:
             order.first_dlvyatmp_timestamp = timestamp
         order.delivery_timestamp = timestamp
     try:
         alert_client = AlertClient().get_client()
         alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
     except Exception as e:
+        print "Exception in ending alert in MarkOrderAsDelivered method"
         print e
 def mark_order_as_received_at_store(orderId, deliveryTimestamp):
     order = Order.get_by(id=orderId)
     session.commit()
     try:
         alert_client = AlertClient().get_client()
         alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + order.id)
     except Exception as e:
+        print "Exception in ending alert in MarkOrderAsRTO method"
         print e
 def get_rto_orders(provider_id):
     current_time = datetime.datetime.now()
     to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
             monitoredEntity.criticalExpiryTime = critical_time
             monitoredEntity.description="providerId = " + str(provider_id) + " destination city " + order.customer_city
             alert_client = AlertClient().get_client()
             alert_client.updateMonitoredObject(monitoredEntity)
         except Exception as e:
+            print "Exception in updating alert in MarkOrderAsLocalConnected method"
             print e
         session.commit()
 def get_orders_not_local_connected(provider_id):
     current_time = datetime.datetime.now()
             monitoredEntity.criticalExpiryTime = critical_time
             monitoredEntity.description="providerId = " + str(provider_id) + " destination city " + order.customer_city
             alert_client = AlertClient().get_client()
             alert_client.updateMonitoredObject(monitoredEntity)
         except Exception as e:
+            print "Exception in updating alert in MarkOrderAsDestCityReached method"
             print e
     session.commit()
 def mark_orders_as_firstDeliveryAttempted(provider_id, first_atdl_orders):
     for awb, detail in first_atdl_orders.iteritems():
             monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
             monitoredEntity.description="providerId = " + str(provider_id) + " first attempt timestamp" + order.first_dlvyatmp_timestamp
             alert_client = AlertClient().get_client()
             alert_client.updateMonitoredObject(monitoredEntity)
         except Exception as e:
+            print "Exception in updating alert in MarkOrdersAsFirstDeliveryAttempted method"
             print e
     session.commit()
 def get_orders_not_met_expected_delivery_date():
     current_time = datetime.datetime.now()
     if store.line2:
         address = address + store.line2 + "\n"
     address = address + store.city + "\n"
     address = address + store.state + "\n"
     address = address + "PIN " + store.pin + "\n"
-    if store.phone:
-        address = address + "Phone: " + store.phone
+    address = address + "Phone: " + store.phone
-    return address
-def __get_store_address_html(store):
-    address = store.name + "<br>" + store.line1 + "<br>"
-    if store.line2:
-        address = address + store.line2 + "<br>"
-    address = address + store.city + "<br>"
-    address = address + store.state + "<br>"
-    address = address + "PIN " + store.pin + "<br>"
-    if store.phone:
-        address = address + "Phone: " + store.phone
     return address
 def __generate_return_advice(order, warehouse, provider, filename):
     if warehouse.id == 7:
         executive = 'Amit Kumar'

Subversion Repositories SmartDukaan

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