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

         orders = Order.query.filter(Order.id.in_(orderIds)).filter_by(warehouse_id = warehouseId, logistics_provider_id = providerId, status = OrderStatus.BILLED).all()
         for order in orders:
             order.status = OrderStatus.SHIPPED_FROM_WH
             order.statusDescription = "Order shipped from warehouse"
             order.shipping_timestamp = current_timestamp
+            '''
             try:
                 print "Trying to schedule alert"
                 monitoredEntity = MonitoredEntity();
                 monitoredEntity.entityType=EntityType.COURIER;
                 monitoredEntity.eventType=OrderStatus.SHIPPED_FROM_WH;
                 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()
+            session.commit()
         logisticsTxnIdOrdersMap = {}
-        try:
-            for order in orders:
+        for order in orders:
-                if order.logisticsTransactionId:
+            if order.logisticsTransactionId:
-                    if logisticsTxnIdOrdersMap.has_key(order.logisticsTransactionId):
+                if logisticsTxnIdOrdersMap.has_key(order.logisticsTransactionId):
-                        ordersList = logisticsTxnIdOrdersMap.get(order.logisticsTransactionId)
+                    ordersList = logisticsTxnIdOrdersMap.get(order.logisticsTransactionId)
-                        ordersList.append(order)
-                        logisticsTxnIdOrdersMap[order.logisticsTransactionId] = ordersList
-                    else:
-                        ordersList = []
-                        ordersList.append(order)
+                    ordersList.append(order)
-                        logisticsTxnIdOrdersMap[order.logisticsTransactionId] = ordersList
+                    logisticsTxnIdOrdersMap[order.logisticsTransactionId] = ordersList
                 else:
                     ordersList = []
                     ordersList.append(order)
-                    logisticsTxnIdOrdersMap[str(order.id)] = ordersList
+                    logisticsTxnIdOrdersMap[order.logisticsTransactionId] = ordersList
-        except Exception as e:
+            else:
-            print e
+                ordersList = []
+                ordersList.append(order)
+                logisticsTxnIdOrdersMap[str(order.id)] = ordersList
         for logisticsTxnId, orderList in logisticsTxnIdOrdersMap.iteritems():
             enqueue_shipping_confirmation_email(logisticsTxnId, orderList)
         try:
 def enqueue_shipping_confirmation_email(logisticsTxnId, orderList):
     # Calling helper service on production
     order = orderList[0]
     helperClient = HelperClient(host_key = "helper_service_server_host_prod").get_client()
-    try:
-        emailSubject = 'Shipping Details for Master Order ID: ' + logisticsTxnId
+    emailSubject = 'Shipping Details for Master Order ID: ' + logisticsTxnId
-        emailBody = get_shipping_confirmation_email_body(logisticsTxnId, orderList)
+    emailBody = get_shipping_confirmation_email_body(logisticsTxnId, orderList)
-        helperClient.saveUserEmailForSending([order.customer_email], None, emailSubject, emailBody, logisticsTxnId, 'ShippingConfirmation', [], [], order.source)
+    helperClient.saveUserEmailForSending([order.customer_email], None, emailSubject, emailBody, logisticsTxnId, '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'}}
+    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']
+    provider_name = logistics_providers[order.logistics_provider_id]['name']
-        if order.source == OrderSource.WEBSITE :
+    if order.source == OrderSource.WEBSITE :
-            send_transaction_sms(order.customer_id, order.customer_mobilenumber, "Dear Customer, We have shipped your order: " + logisticsTxnId + " 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: " + logisticsTxnId + " 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)
     query = query.filter(Order.created_timestamp >= start_date)
     query = query.filter(Order.created_timestamp <= end_date)
         totalWeight = totalWeight + order.total_weight
         #if order.cod:
         totalOrdersAmount = totalOrdersAmount + order.total_amount
         if order.cod:
-            if isPrivateDealUser:
+            if isPrivateDealUser and privateDealUser.bulkShipmentAmountLimit:
                 if totalOrdersAmount > privateDealUser.bulkShipmentAmountLimit:
+                    raise TransactionServiceException(208, "Private Deal Counter Group Shipment Weight Limit Violated i.e. "+ str(privateDealUser.bulkShipmentAmountLimit))
+            else:
+                if totalOrdersAmount > 50000:
-                    raise TransactionServiceException(208, "Private Deal Counter Group Shipment Weight Limit Violated")
+                    raise TransactionServiceException(208, "Private Deal Counter Group Shipment Weight Limit Violated i.e. "+ str(50000))
         if totalWeight > provider.bundleWeightLimit:
-            raise TransactionServiceException(210, "Logistics Partner "+provider.name+ " Group Shipment Weight Limit Violated")
+            raise TransactionServiceException(210, "Logistics Partner "+provider.name+ " Group Shipment Weight Limit Violated i.e. "+str(provider.bundleWeightLimit))
         if order.cod:
             if totalOrdersAmount > provider.maxCodLimit:
-                raise TransactionServiceException(210, "Logistics Partner "+provider.name+ " Max Cod Amount Collection Limit Violated")
+                raise TransactionServiceException(210, "Logistics Partner "+provider.name+ " Max Cod Amount Collection Limit Violated i.e. "+ str(provider.maxCodLimit))
         websiteCodLimit = float(providerLimits.get("websiteCodLimit"))
         providerPrepaidLimit = float(providerLimits.get("providerPrepaidLimit"))
         if order.cod and not isPrivateDealUser:
             if totalOrdersAmount > websiteCodLimit:
-                raise TransactionServiceException(212, "Website Maximum COD Limit Violated")
+                raise TransactionServiceException(212, "Website Maximum COD Limit Violated i.e. "+str(websiteCodLimit))
         if not order.cod:
             if totalOrdersAmount > providerPrepaidLimit:
                 raise TransactionServiceException(212, "Logistics Partner "+provider.name+ " Max Prepaid Amount Limit Violated Rs." +str(providerPrepaidLimit))

Subversion Repositories SmartDukaan

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