WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

         itemIdItemMap[item.id] = item
     queryStateGstRate = session.query(StateGstRate).filter(StateGstRate.item_id.in_(itemIds)).filter(StateGstRate.state_id==stateId)
     itemIdTotalTaxRateMap = {}
     for stateGstRate in queryStateGstRate.all():
-        igstTaxRate = itemIdItemMap[stateGstRate.item_id].tax_rate
-        sgstTaxRate = stateGstRate.tax_rate
-        cgstTaxRate = igstTaxRate - sgstTaxRate
         gstRate = GstRate()
-        gstRate.cgstRate = cgstTaxRate
+        gstRate.igstRate = stateGstRate.igst_rate
-        gstRate.sgstRate = sgstTaxRate
+        gstRate.cgstRate = stateGstRate.cgst_rate
-        gstRate.igstRate = 0.0
+        gstRate.sgstRate = stateGstRate.sgst_rate
         gstRate.hsnCode = itemIdItemMap[stateGstRate.item_id].hsnCode
         itemIdTotalTaxRateMap[stateGstRate.item_id] = gstRate
     return itemIdTotalTaxRateMap
 def get_igst_tax_rate(itemIds):
-    queryItem = session.query(Item).filter(Item.id.in_(itemIds))
+    queryStateGstRate = session.query(StateGstRate).filter(StateGstRate.item_id.in_(itemIds)).filter(StateGstRate.state_id==-1)
-    itemIdTaxRateMap = {}
+    itemIdIgstTaxRateMap = {}
-    for item in queryItem.all():
+    for stateGstRate in queryStateGstRate.all():
-        itemIdTaxRateMap[item.id] = item.tax_rate
+        itemIdIgstTaxRateMap[stateGstRate.item_id] = stateGstRate.igst_rate
-    return itemIdTaxRateMap
+    return itemIdIgstTaxRateMap
 def get_interstate_gst_rates():
     #CategoryState.query.filter_by(stateId=stateId)
     centralGstMap = {}
     alias1 = aliased(CentralGstMaster)

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py – Rev 23148 → 23156