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

 from shop2020.clients.UserClient import UserClient
 from shop2020.clients.WarehouseClient import WarehouseClient
 from shop2020.config.client.ConfigClient import ConfigClient
 from shop2020.model.v1 import order
 from shop2020.model.v1.order.impl import DataService, RechargeService
-from shop2020.model.v1.order.impl.Convertors import to_t_emi_scheme, to_t_order
+from shop2020.model.v1.order.impl.Convertors import to_t_emi_scheme, to_t_order,\
+    cutoff_date
 from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
     Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
     OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
     CodVerificationAgent, Attribute, RechargeVoucherTracker, EmiScheme, MiscCharges, \
     BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
 from string import Template
 from suds.client import Client
 from textwrap import dedent
 from xml.dom.minidom import parseString
 import base64
-import base64
 import datetime
 import httplib
 import logging
 import os
 import re
         order.source =  OrderSource.WEBSITE
     else:
         order.source = t_order.source
     #Change this temporary
     if t_order.orderType is None or t_order.orderType ==OrderType.B2C:
-        order.orderType = 0
+        order.orderType = OrderType.B2C
     order.advanceAmount = t_order.advanceAmount
     order.storeId = t_order.storeId
     if t_order.productCondition:
         order.productCondition = t_order.productCondition
     if t_order.dataProtectionInsurer:
                 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 type cant be changed during authorization
+            #if orderType is not None:
-            order.orderType = orderType
+            #    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
             if pickUp == PickUpType.RUNNER or pickUp == PickUpType.SELF or order.source!=OrderSource.WEBSITE:
         subOrderAmountsMap = {}
         for order in transaction.orders:
             order.status = OrderStatus.COD_VERIFICATION_PENDING
             order.statusDescription = "Verification Pending"
             order.cod = True
+            #OrderType cant be changed
-            order.orderType = orderType
+            #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
             if order.pickupStoreId:
         if singleInvoiceAttr:
             if singleInvoiceAttr.value == "true":
                 session.commit()
                 return True
         if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
+            #as of now only company 1 - SORPL, 3-New company is operating and cutoff config will decide the company to be used to bill
+            #until further change - Amit Gupta
+            companyId = 1
+            if cutoff_date <= datetime.datetime.now():
+                companyId = 3
-            order.invoice_number = get_next_invoice_counter(order.orderType, whStateId)
+            order.invoice_number = get_next_invoice_counter(companyId, order.orderType, whStateId)
         session.commit()
         return True
     else:
         return False
     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 get_next_invoice_counter(orderType, stateId):
+def get_next_invoice_counter(companyId, orderType, stateId):
     if OrderType.B2Cbulk == orderType:
         orderType = OrderType.B2C
-    entity_id = InvoiceCounterGenerator.query.filter(InvoiceCounterGenerator.orderType == orderType).filter(InvoiceCounterGenerator.stateId == stateId).with_lockmode("update").one()
+    entity_id = InvoiceCounterGenerator.query.filter(InvoiceCounterGenerator.orderType == orderType).filter(InvoiceCounterGenerator.stateId == stateId).filter(InvoiceCounterGenerator.companyId==companyId).with_lockmode("update").one()
     invoice_number = entity_id.id + 1
     entity_id.id = invoice_number
     ret_invoiceNo = entity_id.prefix + str(invoice_number)
     return ret_invoiceNo
     if warehouseDbConnection.open:
         warehouseDbConnection.close()
     session.commit()
     if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
+        #as of now only company 1 - SORPL, 3-New company is operating and cutoff config will decide the company to be used to bill
+        #until further change - Amit Gupta
+        companyId = 1
+        if cutoff_date <= datetime.datetime.now():
+            companyId = 3
-        invoiceNumber = get_next_invoice_counter(ordersList[0].orderType, whStateId)
+        invoiceNumber = get_next_invoice_counter(companyId, ordersList[0].orderType, whStateId)
     invoiceTypeVal = 1
     if not individualInvoice:
         invoiceTypeVal = 2
     if lineItemSize > 1:
     returnOrder = ReturnOrderInfo.get_by(id=returnOrderId)
     if returnOrder is None:
         raise TransactionServiceException(101, "No Return Order is there with this Order Id")
 if __name__ == '__main__':
-    print get_orders_by_mobile_number("9650889334")
     print get_orders_by_mobile_number("9650889334")

Subversion Repositories SmartDukaan

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