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

     Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
     OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
     CodVerificationAgent, Attribute, RechargeVoucherTracker, EmiScheme, MiscCharges, \
     BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
     RechargeTransaction, HotspotStore, WalletForCompany, WalletHistoryForCompany, \
-    FRC, OperatorSeries, SourceDetail, Company, \
+    FRC, OperatorSeries, SourceDetail, Company, EbayOrder, \
     AmazonOrder, StoreOrderDetail, EdcBank, StoreOrderCollection, HotspotServiceMatrix
 from shop2020.model.v1.order.impl.model.BaseOrder import BaseOrder
 from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
 from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
     MobileRechargeOrder
 def create_order(t_order):
     order = Order()
     if t_order.warehouse_id:
         order.warehouse_id = t_order.warehouse_id
+        order.fulfilmentWarehouseId = t_order.fulfilmentWarehouseId
     if t_order.logistics_provider_id:
         order.logistics_provider_id = t_order.logistics_provider_id
         order.airwaybill_no = t_order.airwaybill_no
         order.tracking_id = t_order.tracking_id
     if t_order.expected_shipping_time:
         insuranceDetail.guardianName = t_order.guardianName
         insuranceDetail.order = order
     if t_order.freebieItemId:
         order.freebieItemId = t_order.freebieItemId
     order.source = t_order.source
+    #Change this temporary
+    if t_order.orderType is None:
+        order.orderType = 0
     order.advanceAmount = t_order.advanceAmount
     order.storeId = t_order.storeId
     return order
 def create_transaction(t_transaction):
     else:
         freebie_orderId = get_order_attribute_value(order.id, "freebieOrderId")
         if freebie_orderId != "":
             line_items = get_line_items_for_order(int(freebie_orderId))
             freebie_order = get_order(int(freebie_orderId))
-            if order.cod:
-                freebie_shipping_time = datetime.datetime.now() + datetime.timedelta(hours = 72)
-                freebie_text = freebie_text + "We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be shipped by" + freebie_shipping_time.strftime("%A, %d. %B %Y") + "<br/>"
-            else:
-                freebie_text = freebie_text + " We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be sent as a separate order with OrderId : " + freebie_orderId + " and is expected to be delivered on " + freebie_order.expected_delivery_time.strftime("%A, %d %B %Y")+ "<br/>You can track the status of this order from My Orders section in saholic.com"
+            freebie_text = freebie_text + " We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be sent as a separate order with OrderId : " + freebie_orderId + " and is expected to be delivered on " + freebie_order.expected_delivery_time.strftime("%A, %d %B %Y")+ "<br/>You can track the status of this order from My Orders section in saholic.com"
     html_header = html_header + thank_you_html + """
         </p>
         <div>
             Order Date: $order_date <br>
         amazon_order.transactionId = old_amazon_order.transactionId
         amazon_order.item_id= old_amazon_order.item_id
         amazon_order.status= old_amazon_order.status
         amazon_order.purchaseDateOnAmazon= old_amazon_order.purchaseDateOnAmazon
         session.commit()
+    if order.source == 6:
+        old_ebay_order = EbayOrder.get_by(orderId=order.id)
+        ebay_order = EbayOrder()
+        ebay_order.orderId = new_order.id
+        ebay_order.salesRecordNumber = old_ebay_order.salesRecordNumber
+        ebay_order.paisaPayId = old_ebay_order.paisaPayId
+        ebay_order.ebayListingId = old_ebay_order.ebayListingId
+        ebay_order.subsidyAmount= old_ebay_order.subsidyAmount
+        ebay_order.ebayTxnDate= old_ebay_order.ebayTxnDate
+        ebay_order.transactionId= old_ebay_order.transactionId
+        ebay_order.listingName= old_ebay_order.listingName
+        session.commit()
     attributes = Attribute.query.filter(Attribute.orderId == order.id).all()
     if attributes:
         for attribute in attributes:
             newattribute = Attribute()
     if provider_id != 7:
         awb_number = logistics_client.getEmptyAWB(provider_id, order.cod)
     order.logistics_provider_id = provider_id
     if provider_id != 7:
         order.airwaybill_no = awb_number
-        order.track_id = awb_number
+        order.tracking_id = awb_number
     session.commit()
     return order
 def change_product(order_id, item_id):
     logistics_info = lclient.getLogisticsEstimation(order.lineitems[0].item_id, order.customer_pincode, DeliveryType.PREPAID)
     dt = datetime.datetime.strptime(str(order.shipping_timestamp), "%Y-%m-%d %H:%M:%S")
     shipping_date = dt.strftime("%A, %d %B %Y %I:%M%p")
     product = str(order.lineitems[0])
     new_expected_delivery_timestamp = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), (logistics_info.deliveryTime - logistics_info.shippingTime)))
+    if order.source ==6:
+        new_expected_delivery_timestamp = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), 3))
     new_courier_delivery_time = datetime.datetime.now() + timedelta(adjust_delivery_time(datetime.datetime.now(), (logistics_info.deliveryTime - logistics_info.shippingTime - logistics_info.deliveryDelay)))
     #update new expected timestamp
     if order.cod:
         new_expected_delivery_timestamp = new_expected_delivery_timestamp.replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
         order.courier_delivery_time = new_courier_delivery_time.replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0, microsecond=0)
     else:
         freebie_orderId = get_order_attribute_value(order.id, "freebieOrderId")
         if freebie_orderId != "":
             line_items = get_line_items_for_order(int(freebie_orderId))
             freebie_order = get_order(int(freebie_orderId))
-            if order.cod:
-                freebie_text = freebie_text + "We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be shipped within 72 hours of delivery of your product<br/>"
-            else:
-                freebie_text = freebie_text + "We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be sent as a separate order with OrderId : " + freebie_orderId + " and is expected to be delivered on " + freebie_order.expected_delivery_time.strftime("%A, %d %B %Y")+ "<br/>"
+            freebie_text = freebie_text + "We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be sent as a separate order with OrderId : " + freebie_orderId + " and is expected to be delivered on " + freebie_order.expected_delivery_time.strftime("%A, %d %B %Y")+ "<br/>"
         else:
             freebie_text = ""
     info = dict(order_id = order.id, product_name = product, shipping_datetime = shipping_date, awb = order.airwaybill_no, expected_delivery_date = new_expected_delivery_date, courier_name = provider_name, courier_phone = provider_phone, source_name = source_name, otg_text = otg_text, freebie_text = freebie_text)
     return Template(html).substitute(info)
     logistics_client = LogisticsClient().get_client()
     logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, order.freebieItemId, DeliveryType.PREPAID, PickUpType.COURIER)
     freebie_order.logistics_provider_id = logistics_info.providerId;
     freebie_order.tracking_id = logistics_info.airway_billno
     freebie_order.airwaybill_no = logistics_info.airway_billno
+    new_shipping_date = max(to_py_date(shippingDate),order.expected_delivery_time+datetime.timedelta(hours=72))
-    freebie_order.expected_delivery_time = (to_py_date(shippingDate)+datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+    #freebie_order.expected_delivery_time = (to_py_date(shippingDate)+datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+    freebie_order.expected_delivery_time = (new_shipping_date+datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
     freebie_order.promised_delivery_time = order.promised_delivery_time
-    freebie_order.expected_shipping_time = to_py_date(shippingDate)
+    freebie_order.expected_shipping_time = new_shipping_date
     freebie_order.promised_shipping_time = order.promised_shipping_time
     inventory_client = InventoryClient().get_client()
     item_availability = inventory_client.getItemAvailabilityAtLocation(order.freebieItemId,1)
     freebie_order.warehouse_id = item_availability[2]
 def get_hotspot_service_matrices():
     hotspotServiceMatrices = HotspotServiceMatrix.query.all()
     return hotspotServiceMatrices
+def get_orders_by_vendor(vendors, statuses):
+    if not len(statuses):
+        raise TransactionServiceException(101, "Status list is empty")
+    if not len(vendors):
+        raise TransactionServiceException(101, "Vendor list is empty")
+    warehouse_ids = []
+    inventory_client = InventoryClient().get_client()
+    for vendor in vendors:
+        warehouses = inventory_client.getWarehouses(None, None, vendor, 0, 0)
+        for warehouse in warehouses:
+            warehouse_ids.append(warehouse.id)
+    query = Order.query.filter(Order.status.in_(statuses))
+    query = query.filter(Order.warehouse_id.in_(warehouse_ids))
+        #raise TransactionServiceException(101, "bad warehouse id")
+    return query.all()
+def create_ebay_order(ebay_order):
+    ebayOrder = EbayOrder()
+    ebayOrder.orderId =  ebay_order.orderId
+    ebayOrder.paisaPayId =  ebay_order.paisaPayId
+    ebayOrder.salesRecordNumber = ebay_order.salesRecordNumber
+    ebayOrder.ebayListingId =  ebay_order.ebayListingId
+    ebayOrder.subsidyAmount =  ebay_order.subsidyAmount
+    ebayOrder.ebayTxnDate =  to_py_date(ebay_order.ebayTxnDate)
+    ebayOrder.transactionId = ebay_order.transactionId
+    ebayOrder.listingName = ebay_order.listingName
+    ebayOrder.listingPrice = ebay_order.listingPrice
+    session.commit()
+def get_ebay_order_by_sales_rec_number(sales_rec_number):
+    return EbayOrder.query.filter(EbayOrder.salesRecordNumber == sales_rec_number).one()
+def get_ebay_order(sales_rec_number, listingId):
+    return EbayOrder.query.filter(EbayOrder.salesRecordNumber == sales_rec_number).filter(EbayOrder.ebayListingId == listingId).one()
+def get_ebay_order_by_orderId(order_id):
+    return EbayOrder.query.filter(EbayOrder.orderId == order_id).one()
+def update_ebay_order(ebay_order):
+    ebayOrder = get_ebay_order_by_orderId(ebay_order.orderId)
+    ebayOrder.subsidyAmount = ebay_order.subsidyAmount
+    ebayOrder.transactionId = ebay_order.transactionId
+    ebayOrder.ebayTxnDate = ebay_order.ebayTxnDate
+    session.commit()
+def ebay_order_exists(sales_rec_number, ebay_listing_id):
+    try:
+        ebayOrder = get_ebay_order_by_sales_rec_number(sales_rec_number)
+        if ebayOrder.ebayListingId == ebay_listing_id:
+            return True
+        else:
+            return False
+    except Exception as e:
+        return False
+def update_order_for_ebay(t_order):
+    order = get_order(t_order.id)
+    order.customer_id = t_order.customer_id
+    order.customer_name = t_order.customer_name
+    order.customer_city = t_order.customer_city
+    order.customer_state = t_order.customer_state
+    order.customer_mobilenumber = t_order.customer_mobilenumber
+    order.customer_pincode = t_order.customer_pincode
+    order.customer_address1 = t_order.customer_address1
+    order.customer_address2 = t_order.customer_address2
+    order.customer_email = t_order.customer_email
+    order.logistics_provider_id = t_order.logistics_provider_id
+    order.airwaybill_no = t_order.airwaybill_no
+    order.tracking_id = t_order.tracking_id
+    order.status = t_order.status
+    order.statusDescription = t_order.statusDescription
+    order.otg = False
+    order.freebieItemId = 0
+    order.orderType = OrderType.B2C
+    order.source = 6
+    transaction = get_transaction(order.transaction_id)
+    transaction.status = TransactionStatus.AUTHORIZED
+    transaction.customer_id = t_order.customer_id
+    session.commit()
+def split_ebay_order(order_id, split_order_qty, split_order_item_id, use_power_ship):
+    #In case of split now order is always assigned based on the website logic...Also itemId won't work for now
+    order = get_order(order_id)
+    if split_order_qty >=order.lineitems[0].quantity:
+        raise TransactionServiceException(108, "Split Quantity is greater than or equal to order quantity")
+    if order.status not in [OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.INVENTORY_LOW, OrderStatus.LOW_INV_PO_RAISED, OrderStatus.LOW_INV_REVERSAL_IN_PROCESS, OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT, OrderStatus.CAPTURE_IN_PROCESS, OrderStatus.REJECTED, OrderStatus.ACCEPTED]:
+        raise TransactionServiceException(108, "Order not allowed to be split")
+    new_order = __clone_order(order, False, False)
+    new_order.expected_delivery_time = order.expected_delivery_time
+    new_order.promised_delivery_time = order.promised_delivery_time
+    new_order.expected_shipping_time = order.expected_shipping_time
+    new_order.promised_shipping_time = order.promised_shipping_time
+    if use_power_ship:
+        new_order.logistics_provider_id = order.logistics_provider_id
+        new_order.airwaybill_no = order.airwaybill_no
+        new_order.tracking_id = order.tracking_id
+    new_order.lineitems[0].quantity = split_order_qty
+    order.lineitems[0].quantity = order.lineitems[0].quantity - split_order_qty
+    session.commit()
+    return new_order
 if __name__ == '__main__':
     print get_orders_by_mobile_number("9650889334")

Subversion Repositories SmartDukaan

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