Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
10253 4322 d 0 h manish.sharma /trunk/ Committed by Manish Sharma for Changing Email Id in Various Reports on Mar-18-2014  
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
/trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
/trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/InventoryUpdateMonitor.py
/trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py
/trunk/PyProj/src/shop2020/purchase/scripts/vendorFulfilmentReport.py
/trunk/PyProj/src/shop2020/utils/orderTablePoller.py
/trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java
/trunk/SnapDealFeeds/src/main/java/in/shop2020/UpdateSnapdealInventoryUsingPanel.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/Support/src/main/java/in/shop2020/support/utils/StockSalesReportFetcher.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/HotspotStockReportSender.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InTransitInventoryReportSender.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java
6747 4734 d 22 h amar.kumar /trunk/ Changes for Getting ItemNumber and SerialNumber from Hotspot etp database and putting it in our order database  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/Support/src/main/java/in/shop2020/support/models/BillingUpdate.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
6236 4836 d 16 h amar.kumar /trunk/Support/src/main/java/in/shop2020/support/controllers/ Adding Amit, Rajveer and Khushal for PLB mismatch reports  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5964 4875 d 0 h amar.kumar /trunk/ Adding amar.kumar@shop2020.in in mailing list for inventory-mismatch, stock-report, negative-reserved, build-scripts
Also change is done for bringing only pincodes in cache with either cod or exp field set. This will allow us to only mark cod/exp field to zero for disabling a pincode rather than deleting the record, hence preventing any issue while taking invoice for an order with a disabled pincode

Reviewed By : Mandeep Dhir
 
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/runutils/build-for-production.sh
/trunk/runutils/build-for-shop2020.sh
5959 4876 d 0 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Separating inventory and catalog services  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5945 4878 d 19 h mandeep.dhir /trunk/ Separating catalog and inventory services Trac#1594 Reviewer: Rajveer  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
/trunk/Support/Converted-2-2012-08-06-16:29:31.xls
/trunk/Support/Converted-2-2012-08-11-14:58:00.xls
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
/trunk/ThriftGen/thriftsrc/InventoryService
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/runutils/.project
/trunk/runutils/.pydevproject
/trunk/runutils/init.d/inventory-server
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
/trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
/trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
/trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
/trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
5779 4903 d 1 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Adding Rajneesh and Pankaj Kankar as well  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5712 4914 d 22 h mandeep.dhir /trunk/ Bug fix. Added another separate method to update vendor string of a warehouse  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
5702 4917 d 18 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Updating last timestamp on staging as well  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5690 4920 d 22 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Some amendments to make client connections happy  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5684 4921 d 18 h mandeep.dhir /trunk/ Trac#903 Auto shifting warehouse of orders with scan Ins of items  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
5597 4934 d 21 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Adding some sleep statements  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5451 4959 d 0 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Case-insensitive mapping lookup  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5448 4959 d 2 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Case-insensitive mapping lookup  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5423 4963 d 19 h rajveer /trunk/ Corrected spelling from availibility to availability.  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5399 4966 d 17 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ PLB - Not skipping accessories now.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5395 4967 d 2 h mandeep.dhir /trunk/ Trac#1344 Bugfix for po creation date, Updating PLB update logic  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
5306 4979 d 23 h rajveer /trunk/Support/src/main/java/in/shop2020/support/controllers/ Offloaded item inventory from item.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5304 4980 d 0 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Temporarily removing the recursice calls  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
5290 4981 d 1 h mandeep.dhir /trunk/Support/src/main/java/in/shop2020/support/controllers/ Repeatedly trying to reload the items in case it fails  
/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

Show All