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

     OOSTracker, EntityTag, ItemInsurerMapping, Insurer, Banner, BannerMap, \
     FreebieItem, BrandInfo, Amazonlisted, StorePricing, ItemVatMaster, \
     PageViewEvents, CartEvents, EbayItem, BannerUriMapping, Campaign, SnapdealItem, \
     ProductFeedSubmit, MarketplaceItems, MarketPlaceItemPrice, \
     SourcePercentageMaster, SourceItemPercentage, FlipkartItem, MarketPlaceUpdateHistory, \
-    SourceCategoryPercentage, MarketPlaceHistory, PrivateDeals, AmazonOutOfSync,PrivateDealsPriceComparison
+    SourceCategoryPercentage, MarketPlaceHistory, PrivateDeals, AmazonOutOfSync,PrivateDealsPriceComparison, SourceReturnPercentage
 from shop2020.thriftpy.model.v1.catalog.ttypes import status, ItemShippingInfo, \
     ItemType, PremiumType, FreebieItem as t_FreebieItem, \
     StorePricing as tStorePricing, CatalogServiceException, \
     BannerType, InsurerType, Banner as t_banner
 from shop2020.thriftpy.model.v1.inventory.ttypes import \
             marketplaceItem.emiFee = t_marketplaceItem.emiFee
             marketplaceItem.closingFee = t_marketplaceItem.closingFee
             marketplaceItem.returnProvision = t_marketplaceItem.returnProvision
             marketplaceItem.commission = t_marketplaceItem.commission
             marketplaceItem.vat = t_marketplaceItem.vat
+            if marketplaceItem.source == OrderSource.SNAPDEAL:
+                marketplaceItem.packagingCost = t_marketplaceItem.packagingCost
+            else:
-            marketplaceItem.packagingCost = 15.0
+                marketplaceItem.packagingCost = 15.0
             marketplaceItem.serviceTax = t_marketplaceItem.serviceTax
             marketplaceItem.courierCost = t_marketplaceItem.courierCost
             marketplaceItem.otherCost = t_marketplaceItem.otherCost
             marketplaceItem.autoIncrement = t_marketplaceItem.autoIncrement
             marketplaceItem.autoDecrement = t_marketplaceItem.autoDecrement
             marketplaceItem.minimumPossibleTp = t_marketplaceItem.minimumPossibleTp
             marketplaceItem.emiFee = t_marketplaceItem.emiFee
             marketplaceItem.closingFee = t_marketplaceItem.closingFee
             marketplaceItem.returnProvision = t_marketplaceItem.returnProvision
             marketplaceItem.commission = t_marketplaceItem.commission
+            if marketplaceItem.source == OrderSource.SNAPDEAL:
+                marketplaceItem.packagingCost = t_marketplaceItem.packagingCost
+            else:
+                marketplaceItem.packagingCost = 15.0
             marketplaceItem.vat = t_marketplaceItem.vat
             marketplaceItem.serviceTax = t_marketplaceItem.serviceTax
             marketplaceItem.maximumSellingPrice = t_marketplaceItem.maximumSellingPrice
             marketplaceItem.pgFee = t_marketplaceItem.pgFee
             marketplaceItem.courierCostMarketplace = t_marketplaceItem.courierCostMarketplace
         print e
         return False
 def get_costing_for_marketplace(source_id,itemId):
+    d_item = get_item(itemId)
     time = datetime.datetime.now()
     sip = SourceItemPercentage.query.filter(SourceItemPercentage.item_id==itemId).filter(SourceItemPercentage.source==source_id).filter(SourceItemPercentage.startDate<=time).filter(SourceItemPercentage.expiryDate>=time).first()
+    srm = SourceReturnPercentage.get_by(source=source_id,brand=d_item.brand,category_id=d_item.category)
     if sip is not None:
+        sip.returnProvision = srm.returnProvision
         return sip
     else:
         item = get_item(itemId)
         scp = SourceCategoryPercentage.query.filter(SourceCategoryPercentage.category_id==item.category).filter(SourceCategoryPercentage.source==source_id).filter(SourceCategoryPercentage.startDate<=time).filter(SourceCategoryPercentage.expiryDate>=time).first()
         if scp is not None:
+            scp.returnProvision = srm.returnProvision
             return scp
         else:
             spm = SourcePercentageMaster.get_by(source=source_id)
+            spm.returnProvision = srm.returnProvision
             return spm
 def __validateSnapdealObject(snapdealItem):
     if len(snapdealItem.supc)==0 or snapdealItem.supc is None or len(snapdealItem.skuAtSnapdeal)==0 or snapdealItem.skuAtSnapdeal is None or snapdealItem.sellingPrice==0 or snapdealItem.maxNlc==0:
         return False
             ic = InventoryClient().get_client()
             warehouse = ic.getWarehouse(item.warehouseId)
             if(warehouse.vendor.id==vendor_id):
                 item.maxNlc = nlc
                 vat = (item.sellingPrice/(1+(marketplaceitem.vat/100))-(nlc/(1+(marketplaceitem.vat/100))))*(marketplaceitem.vat/100)
-                inHouseCost = 15 + vat + (marketplaceitem.returnProvision/100)*item.sellingPrice + marketplaceitem.otherCost
+                inHouseCost = marketplaceitem.packagingCost + vat + (marketplaceitem.returnProvision/100)*item.sellingPrice + marketplaceitem.otherCost
                 marketplaceitem.minimumPossibleTp  = nlc + inHouseCost
                 if (marketplaceitem.pgFee/100)*item.sellingPrice>=20:
-                    marketplaceitem.minimumPossibleSp = (nlc+(item.courierCostMarketplace+marketplaceitem.closingFee)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat/100))+(15+marketplaceitem.otherCost)*(1+(marketplaceitem.vat)/100))/(1-(marketplaceitem.commission/100+marketplaceitem.emiFee/100+marketplaceitem.pgFee/100)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat)/100)-(marketplaceitem.returnProvision/100)*(1+(marketplaceitem.vat)/100))
+                    marketplaceitem.minimumPossibleSp = (nlc+(item.courierCostMarketplace+marketplaceitem.closingFee)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat/100))+(marketplaceitem.packagingCost+marketplaceitem.otherCost)*(1+(marketplaceitem.vat)/100))/(1-(marketplaceitem.commission/100+marketplaceitem.emiFee/100+marketplaceitem.pgFee/100)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat)/100)-(marketplaceitem.returnProvision/100)*(1+(marketplaceitem.vat)/100))
                 else:
-                    marketplaceitem.minimumPossibleSp = (nlc+(item.courierCostMarketplace+marketplaceitem.closingFee+20)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat/100))+(15+marketplaceitem.otherCost)*(1+(marketplaceitem.vat)/100))/(1-(marketplaceitem.commission/100+marketplaceitem.emiFee/100)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat)/100)-(marketplaceitem.returnProvision/100)*(1+(marketplaceitem.vat)/100))
+                    marketplaceitem.minimumPossibleSp = (nlc+(item.courierCostMarketplace+marketplaceitem.closingFee+20)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat/100))+(marketplaceitem.packagingCost+marketplaceitem.otherCost)*(1+(marketplaceitem.vat)/100))/(1-(marketplaceitem.commission/100+marketplaceitem.emiFee/100)*(1+(marketplaceitem.serviceTax/100))*(1+(marketplaceitem.vat)/100)-(marketplaceitem.returnProvision/100)*(1+(marketplaceitem.vat)/100))
                 session.commit()
         flipkartitem = FlipkartItem.get_by(item_id=itemid)
         if flipkartitem is not None:
             ic = InventoryClient().get_client()
             fmarketplaceitem =  MarketplaceItems.get_by(itemId=itemid,source=8)
 def get_amazon_out_of_sync(itemId):
     return AmazonOutOfSync.get_by(item_id=itemId)
 def get_all_private_deals_comparison():
-    return session.query(PrivateDealsPriceComparison,Item).join((Item,PrivateDealsPriceComparison.item_id==Item.id)).all()
     return session.query(PrivateDealsPriceComparison,Item).join((Item,PrivateDealsPriceComparison.item_id==Item.id)).all()
+def get_all_snapdeal_marketplaceItem():
+    return session.query(SnapdealItem,MarketplaceItems,Item).join((MarketplaceItems,SnapdealItem.item_id==MarketplaceItems.itemId)).join((Item,SnapdealItem.item_id==Item.id)).filter(MarketplaceItems.source==OrderSource.SNAPDEAL).all()
+def get_all_flipkart_marketplaceItem():
+    return session.query(FlipkartItem,MarketplaceItems,Item).join((MarketplaceItems,FlipkartItem.item_id==MarketplaceItems.itemId)).join((Item,FlipkartItem.item_id==Item.id)).filter(MarketplaceItems.source==OrderSource.FLIPKART).all()

Subversion Repositories SmartDukaan

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