Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
14372 3971 d 15 h kshitij.sood /trunk/  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/DtrClient.java
/trunk/ThriftGen/thriftsrc/DtrService
/trunk/ThriftGen/thriftsrc/DtrService/DtrService.thrift
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
9060 4421 d 10 h manish.sharma /trunk/Common/src/main/java/in/shop2020/utils/ Committed by Manish Sharma for Google Adwords Service on Dec-10-2013  
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
5945 4880 d 6 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
5610 4932 d 22 h amar.kumar /trunk/Common/src/main/java/in/shop2020/ Adding AlertClient and adding new keys for alertService in ConfigClientKeys  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/AlertClient.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
5586 4936 d 22 h phani.kumar /trunk/ changes in catalog dashboard to support hotspot
reviewer: Mandeep Dhir		  
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
/trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/PyProj/src/shop2020/clients/CatalogClient.py
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
4649 5064 d 10 h phani.kumar /trunk/ Ticket #937 authorization pop ups for selling price and transfer price
reviewer: Rajveer		  
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
4637 5065 d 8 h mandeep.dhir /trunk/ Reading DB location from config server
Removing jdbc.properties		  
/trunk/WarehouseService/src/main/resources/jdbc.properties
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java
/trunk/WarehouseService/src/main/resources/context.xml
4619 5066 d 6 h mandeep.dhir /trunk/ Removing dependancy from /tmp/resource/jdbc.properties
Implemented isAlive()		  
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentServer.java
/trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
/trunk/PaymentService/src/main/resources/context.xml
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
4499 5086 d 22 h mandeep.dhir /trunk/ Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item		  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/PurchaseClient.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/PoSheetGenerator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/WareHouseUtils.java
3891 5198 d 9 h chandranshu /trunk/Common/src/main/java/in/shop2020/ Added client for the Content Server  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/ContentClient.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
3324 5238 d 6 h chandranshu /trunk/ Added host and port configuration to run the inventory history server  
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
3123 5253 d 3 h rajveer /trunk/Common/src/main/ Build support to automatically failing over to another service instance in case one service is down. Updated names of the clients to make them consistent.
Updated config file to handle all configurations in one file only.		  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CRMClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/GenericClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/HelperClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/LogisticsClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/PaymentClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/PromotionClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/TransactionClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/UserClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/WarehouseClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CRMServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/GenericServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/HelperServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/LogisticsServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/PaymentServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/PromotionServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/TransactionServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/UserContextServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/WarehouseServiceClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/DataLoggingClient.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/TestClient.java
/trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/Common/src/main/resources/shop2020.cfg
3093 5254 d 11 h mandeep.dhir /trunk/Common/src/main/ Trac#488 Moving BlueDartTrackingService to Common
Adding client details for CRM server		  
/trunk/Common/src/main/java/in/shop2020/serving
/trunk/Common/src/main/java/in/shop2020/serving/model
/trunk/Common/src/main/java/in/shop2020/serving/model/ShipmentUpdate.java
/trunk/Common/src/main/java/in/shop2020/serving/services
/trunk/Common/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CRMServiceClient.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/Common/src/main/resources/shop2020.cfg
2822 5281 d 9 h chandranshu /trunk/Common/ Added support to send email with an attachment through Gmail  
/trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java
/trunk/Common/pom.xml
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/Common/src/main/resources/shop2020.cfg
/trunk/Common/src/main/resources/shop2020_production.cfg
/trunk/Common/src/main/resources/shop2020_staging.cfg
2496 5307 d 8 h ankur.singhal /trunk/Common/src/main/ added config keys for log file and max count for push to production.  
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/Common/src/main/resources/shop2020_staging.cfg
2381 5315 d 9 h ankur.singhal /trunk/Common/src/main/ Added property push-prices-to-production script path to config file for staging server.  
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/Common/src/main/resources/shop2020_production.cfg
/trunk/Common/src/main/resources/shop2020_staging.cfg
2283 5324 d 5 h ankur.singhal /trunk/Common/src/ Added parameter for production host of catalog service. This will be used from staging to mark/unmark item as risky on production as well. Also modified constructors in CatalogServiceClient to open transport.  
/trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogServiceClient.java
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
/trunk/Common/src/main/resources/shop2020.cfg
/trunk/Common/src/test/resources/shop2020.cfg
1987 5345 d 8 h varun.gupta /trunk/Common/src/main/java/in/shop2020/utils/ Keys for Promotion Server added  
/trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
1021 5420 d 12 h chandranshu /trunk/Common/ Moved Common to maven build process  
/trunk/Common/pom.xml
/trunk/Common/src/main
/trunk/Common/src/main/java
/trunk/Common/src/main/java/in
/trunk/Common/src/main/resources
/trunk/Common/src/main/resources/scribe_central.conf
/trunk/Common/src/main/resources/scribe_local.conf
/trunk/Common/src/main/resources/shop2020.cfg
/trunk/Common/conf/scribe_central.conf
/trunk/Common/conf/scribe_local.conf
/trunk/Common/conf/shop2020.cfg
/trunk/Common/src/META-INF
/trunk/Common/src/in
/trunk/Common
/trunk/Common/.classpath
/trunk/Common/.settings/org.eclipse.wst.common.component
/trunk/Common/build.xml
747 5462 d 9 h rajveer /trunk/Common/ Removed unused strings from config client. Also removed unused java client.  
/trunk/Common/src/in/shop2020/thrift/clients/EstimationServiceClient.java
/trunk/Common/src/in/shop2020/thrift/clients/GenericServiceJavaClient.java
/trunk/Common/conf/shop2020.cfg
/trunk/Common/src/in/shop2020/thrift/clients/HelperServiceClient.java
/trunk/Common/src/in/shop2020/thrift/clients/LogisticsServiceClient.java
/trunk/Common/src/in/shop2020/thrift/clients/PaymentServiceClient.java
/trunk/Common/src/in/shop2020/thrift/clients/UserContextServiceClient.java
/trunk/Common/src/in/shop2020/utils/ConfigClientKeys.java

←Prev12Next→

Show All