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

 def add_billing_details(orderId, invoice_number, serialNumbers, itemNumbers, freebieWarehouseId, billedBy, jacketNumber, billingType, fulfilmentWarehouseId, authorize):
     if billedBy is None or billedBy.strip() == "":
         raise TransactionServiceException(110, "Invalid Biller")
     order = Order.get_by(id=orderId)
+    hsnCode = order.getLineItems.get(0).hsnCode
     if not order:
         raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
     newTaxType = __getOrderTaxType(order)
-    if order.taxType == TaxType.CFORM and newTaxType == TaxType.VAT:
-            raise TransactionServiceException(101, "C-Form billing is not allowed for same state for Order" + str(orderId))
-    else:
-        order.taxType = newTaxType
+    order.taxType = newTaxType
     if jacketNumber is None or jacketNumber <= 0:
         if order.source == OrderSource.EBAY or order.source == OrderSource.SNAPDEAL or order.source == OrderSource.FLIPKART:
             print "Skipping Jacket Number field for OrderId " + str(orderId)
     catalog_client = CatalogClient().get_client()
     item = catalog_client.getItem(item_id)
     if order.status == OrderStatus.ACCEPTED:
         order.jacket_number = jacketNumber
-        if order.source == 6:
-            order.jacket_number = "600"+str(orderId)
-        if order.source == 7:
-            order.jacket_number = "700"+str(orderId)
-        if order.source == 8:
-            order.jacket_number = "800"+str(orderId)
         if itemNumbers:
             lineitem.item_number = itemNumbers[0]
-        if singleInvoiceAttr:
-            if singleInvoiceAttr.value == "true":
-                if serialNumbers:
-                    finalSerialNo =''
-                    for serialNumber in serialNumbers:
-                        finalSerialNo = finalSerialNo +','+ serialNumber
-                        lineItemImei = Line_Item_Imei()
-                        lineItemImei.serial_number = serialNumber
-                        lineItemImei.line_item_id = lineitem.id
-                    finalSerialNo = finalSerialNo[1:]
-                    if lineitem.serial_number is None:
-                        lineitem.serial_number = finalSerialNo
-                    else:
-                        lineitem.serial_number = lineitem.serial_number + ',' + finalSerialNo
-        else:
-            if serialNumbers:
+        if serialNumbers:
-                lineitem.serial_number = serialNumbers[0]
+            lineitem.serial_number = serialNumbers[0]
-        '''
-        if billingType == BillingType.EXTERNAL or billingType == BillingType.OURS_EXTERNAL:
-            if billedOrdersColorMap.has_key(orderId):
-                etpColor = billedOrdersColorMap.get(orderId)
-                ourColor = order.lineitems[0].color
-                if ourColor and etpColor != ourColor and not authorize:
-                    raise TransactionServiceException(777, "ETP color: " + etpColor + " and Order color: " + ourColor)
-                else:
-                    billedOrdersColorMap.pop(orderId)
-        '''
         if order.productCondition == ProductCondition.BAD:
             if billingType != BillingType.OURS:
                 raise TransactionServiceException(110, 'Bad inventory is not allowed to be sold from current warehouse')
         if billingType == BillingType.EXTERNAL:
             inventory_client = InventoryClient().get_client()
             warehouse = inventory_client.getWarehouse(fulfilmentWarehouseId)
             item_pricing = inventory_client.getItemPricing(item_id, warehouse.vendor.id)
             lineitem.transfer_price = item_pricing.transferPrice
             lineitem.nlc = item_pricing.nlc
-            if order.taxType == TaxType.CFORM:
-                lineitem.vatRate = 2
-            else:
-                if fetchStateMaster()[warehouse.stateId].vatType==VatType.MRP and lineitem.mrp:
-                    lineitem.vatRate = catalog_client.getVatPercentageForItem(lineitem.item_id, warehouse.stateId, lineitem.mrp)
-                else:
-                    lineitem.vatRate = catalog_client.getVatPercentageForItem(lineitem.item_id, warehouse.stateId, lineitem.unit_price)
-            order.vendorId = warehouse.vendor.id
-            whStateId = warehouse.stateId
         except InventoryServiceException as e:
             print sys.exc_info()[0]
             print e.message
             raise TransactionServiceException(110, 'Transfer price missing for itemId: ' + str(item_id) + ' and vendor: ' + str(warehouse.vendor.id))
-        if order.orderType == OrderType.B2B:
-            tinNumber = Attribute.query.filter(Attribute.orderId == order.id).filter(Attribute.name == "tinNumber").first()
-            if tinNumber is None:
-                raise TransactionServiceException(101, "Tin Number is Missing for B2B Order. Please contact engineering Team" + str(orderId))
-            if newTaxType != 0:
-                order.orderType = OrderType.B2C
         # For OUR warehouse, we need to scan out items for every billed order
         if billingType == BillingType.OURS:
             if order.productCondition == ProductCondition.GOOD:
                 for index, serialNumber in enumerate(serialNumbers):
                     try:
                 return True
         if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
             #as of now only company 2 - SORPL, 3-New company is operating and cutoff config will decide the company to be used to bill
             #until further change - Amit Gupta
             seller_id = __get_seller(order.warehouse_id)
-            order.invoice_number = get_next_invoice_counter(seller_id, order.warehouse_id, order.orderType)
+            order.invoice_number = get_next_invoice_counter(seller_id, order.warehouse_id, hsnCode)
             order.seller_id = seller_id
             whaddressmapping = WarehouseAddressMapping.query.filter_by(warehouse_id=order.warehouse_id).one()
             order.warehouse_address_id = whaddressmapping.address_id
         session.commit()
         return True
     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(seller_id, warehouse_id, orderType):
+def get_next_invoice_counter(seller_id, warehouse_id, hsnCode):
     #Sequence would now be maintained through single order for seller
-    if OrderType.B2Cbulk == orderType:
-        orderType = OrderType.B2C
     #entity_id = InvoiceCounterGenerator.query.filter(InvoiceCounterGenerator.orderType == orderType).filter(InvoiceCounterGenerator.stateId == stateId).filter(InvoiceCounterGenerator.companyId==companyId).with_lockmode("update").one()
     entity_id = SellerWarehouse.query.filter(SellerWarehouse.warehouse_id == warehouse_id).filter(SellerWarehouse.seller_id==seller_id).with_lockmode("update").one()
+    prefix = entity_id.prefix
+    if hsnCode=="NOGST":
+        document_number = entity_id.challan_id + 1
+        entity_id.challan_id = document_number
+        prefix = 'CHLN-' + prefix
+    else:
-    invoice_number = entity_id.id + 1
+        document_number = entity_id.id + 1
-    entity_id.id = invoice_number
+        entity_id.id = document_number
-    ret_invoiceNo = entity_id.prefix + str(invoice_number)
+    ret_invoiceNo = entity_id.prefix + str(document_number)
     return ret_invoiceNo
 def toggle_doa_flag(order_id):
     order = get_order(order_id)
     if(order.doaFlag):
             raise TransactionServiceException(301, "No order found for the given order id" + str(orderId))
         else:
             ordersList.append(order)
     singleOrder = ordersList[0]
+    hsnCode = singleOrder.getLineItems.get(0).hsnCode
     if singleOrder.logisticsTransactionId is not None:
         grouppedOrders = get_group_orders_by_logistics_txn_id(singleOrder.logisticsTransactionId)
         errorString = ""
         missingString = "Billing Details Missing for following Orders:- "
     if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
         #get seller for current warehouse id
         seller_id  = __get_seller(order.warehouse_id)
         whaddressmapping = WarehouseAddressMapping.query.filter_by(warehouse_id=ordersList[0].warehouse_id).one()
-        invoiceNumber = get_next_invoice_counter(seller_id, ordersList[0].warehouse_id, ordersList[0].orderType)
+        invoiceNumber = get_next_invoice_counter(seller_id, ordersList[0].warehouse_id, hsnCode)
     invoiceTypeVal = 1
     if not individualInvoice:

Subversion Repositories SmartDukaan

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