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

 from shop2020.clients.WarehouseClient import WarehouseClient
 from shop2020.model.v1 import order
 from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
     Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
     OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
-    CodVerificationAgent, RechargeVoucherTracker
+    CodVerificationAgent, Attribute, RechargeVoucherTracker
 from shop2020.model.v1.order.impl.model.ReturnOrder import ReturnOrder
 from shop2020.thriftpy.generic.ttypes import ExceptionType
-from shop2020.thriftpy.logistics.ttypes import DeliveryType
+from shop2020.thriftpy.logistics.ttypes import DeliveryType, PickUpType
 from shop2020.thriftpy.model.v1.catalog.ttypes import BillingType, \
     InventoryServiceException, WarehouseType, ItemType, InventoryType
 from shop2020.thriftpy.model.v1.order.ttypes import TransactionServiceException, \
     TransactionStatus, OrderStatus, DelayReason, ExtraTransactionProcessingType, \
-    HotspotAction, TimeoutSummary, OrderStatusGroups
+    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.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
+from sqlalchemy.sql.expression import and_, or_, desc, not_, distinct, select
 from string import Template
 from textwrap import dedent
 import datetime
 import logging
 import os
     transaction = get_transaction(transaction_id)
     return transaction.status
-def change_transaction_status(transaction_id, new_status, description, selfPickup):
+def change_transaction_status(transaction_id, new_status, description, pickUp, orderType):
     transaction = get_transaction(transaction_id)
     transaction.status = new_status
     transaction.status_message = description
     if new_status == TransactionStatus.FAILED:
         for order in transaction.orders:
                 order.statusDescription = "Submitted to warehouse"
             elif new_status == TransactionStatus.FLAGGED:
                 order.status = OrderStatus.PAYMENT_FLAGGED
                 order.statusDescription = "Payment flagged by gateway"
             order.cod = False
+            order.orderType = orderType
             #After we got payment success, we will set logistics info also
             logistics_client = LogisticsClient().get_client()
             #FIXME line item is only one now. If multiple will come, need to fix.
             item_id = order.lineitems[0].item_id
             logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID)
                 item_pricing = catalog_client.getItemPricing(item_id, -1)
                 order.lineitems[0].transfer_price = item_pricing.transferPrice
             except:
                 print "Not able to get transfer price. Skipping"
-            if selfPickup:
+            if pickUp == PickUpType.SELF or pickUp == PickUpType.RUNNER:
-                order.logistics_provider_id = 4
+                logisticsClient = LogisticsClient().get_client()
+                order.logistics_provider_id = logisticsClient.getProviderForPickupType(pickUp)
-                order.airwaybill_no = 'Self Pickup'
+                order.airwaybill_no = PickUpType._VALUES_TO_NAMES.get(pickUp)
                 order.tracking_id = order.airwaybill_no
             voucherAmount = catalog_client.getVoucherAmount(item_id, VoucherType.SPICEDECK_MOBILE)
             if voucherAmount:
                 __create_recharge_voucher_tracker(order, voucherAmount, VoucherType.SPICEDECK_MOBILE)
     elif new_status == TransactionStatus.COD_IN_PROCESS:
         for order in transaction.orders:
             order.status = OrderStatus.COD_VERIFICATION_PENDING
             order.statusDescription = "Verification Pending"
             order.cod = True
+            order.orderType = orderType
             #After we got payment success, we will set logistics info also
             logistics_client = LogisticsClient().get_client()
             #FIXME line item is only one now. If multiple will come, need to fix.
             item_id = order.lineitems[0].item_id
             logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD)
     try:
         payment_client = PaymentClient().get_client()
         capture_result = payment_client.capturePayment(txnId)
         if capture_result:
             logging.info("Successfully captured payment for merchant txn:" + str(txnId))
-            change_transaction_status(txnId, TransactionStatus.IN_PROCESS, "Payment received", False)
+            change_transaction_status(txnId, TransactionStatus.IN_PROCESS, "Payment received", PickUpType.COURIER, order.orderType)
         else:
             raise TransactionServiceException(115, "Payment capture failed.")
     except PaymentException as e:
         if e.error_code == 106:
             order.status = OrderStatus.CAPTURE_IN_PROCESS
             if ItemType.SERIALIZED == item.type and not (serialNumbers and serialNumbers[0]):
                 raise TransactionServiceException(110, "No Serial Number supplied")
             if serialNumbers:
                 lineitem.serial_number = serialNumbers[0]
-            order.invoice_number = get_next_invoice_number()
+            order.invoice_number = get_next_invoice_number(order.orderType)
         else:
             order.invoice_number = invoice_number
             # In case of hotspot billing, we should try to verify that color billed in ETP is same as color in order.
             if billedOrdersColorMap.has_key(orderId):
                 etpColor = billedOrdersColorMap.get(orderId)
     query = query.order_by(desc(Order.created_timestamp))
     if limit != 0:
         query = query.limit(limit)
     return query.all()
-def get_next_invoice_number():
+def get_next_invoice_number(orderType):
+    if OrderType.B2Cbulk == orderType:
+        orderType = OrderType.B2C
-    entity_id = InvoiceIDGenerator.query.with_lockmode("update").one()
+    entity_id = InvoiceIDGenerator.query.filter(InvoiceIDGenerator.orderType == orderType).with_lockmode("update").one()
     invoice_number = entity_id.id + 1
     entity_id.id = invoice_number
     return invoice_number
 def toggle_doa_flag(order_id):
     new_order.created_timestamp = current_time
     new_order.originalOrderId = order.originalOrderId if order.originalOrderId is not None else order.id
     new_order.transaction = order.transaction
     new_order.cod = is_cod
+    new_order.orderType = order.orderType
     for line_item in order.lineitems:
         litem = LineItem()
         litem.item_id = line_item.item_id
         litem.productGroup = line_item.productGroup
     return Order.query.filter(Order.vendor_paid == 1).filter(Order.status.in_(orderStatusGroup.refundedOrders)).all()
 def get_all_verification_agents(minOrderId, maxOrderId):
     return CodVerificationAgent.query.filter(CodVerificationAgent.orderId >= minOrderId).filter(CodVerificationAgent.orderId <= maxOrderId).all()
+def get_all_attributes_for_order_id(orderId):
+    return Attribute.query.filter(Attribute.orderId == orderId).all()
+def set_order_attribute_for_transaction(transactionId, t_attribute):
+    for order in Order.query.filter_by(transaction_id = transactionId).all():
+        attribute = Attribute()
+        attribute.orderId = order.id
+        attribute.name = t_attribute.name
+        attribute.value = t_attribute.value
+        session.commit()
 def close_session():
     if session.is_active:
         print "session is active. closing it."
         session.close()

Subversion Repositories SmartDukaan

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