Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
24061 2694 d 18 h amit.gupta /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ REmoved restriction to duplicate entity  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
19685 3543 d 19 h kshitij.sood /trunk/ Entity upload  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityUploadController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-deny.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-result.vm
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload.vm
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentStore/src/main/java/in/shop2020/content/security/Action.java
/trunk/ContentStore/src/main/java/in/shop2020/content/security/RoleManager.java
/trunk/ContentStore/src/main/java/in/shop2020/content/security/UserManager.java
/trunk/ContentStore/src/main/java/in/shop2020/util/EntityUtils.java
12555 4159 d 19 h amit.gupta /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ Added log if android phone is updated.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
9253 4399 d 19 h rajveer /trunk/ Pass isAndroid field to the catalog service from content for android mobile phones.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
7471 4600 d 17 h amit.gupta /trunk/ContentCreation/src/main/ Added support for expert review creator to send for approval.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-show.vm
5945 4878 d 16 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
5109 5005 d 15 h amit.gupta /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ FreeformContent Object can be null for slides.
So skipping in such cases.		  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
5059 5013 d 22 h amit.gupta /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ Now files will be copied to the new folder for the entity.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
5012 5021 d 16 h amit.gupta /trunk/ContentCreation/src/main/ #599--Support for "create from existing entity" option in CMS
Reviewer : varun.gupta		  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
/trunk/ContentCreation/src/main/webapp/js/entity-index.js
4012 5181 d 17 h rajveer /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ Fixed messaging.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
4011 5181 d 18 h rajveer /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ Reduced non-assignment range from 2 hours to 45 minutes.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
3480 5222 d 17 h rajveer /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ Fixed the bug where user was able to assign the entity before 3 PM.  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
3127 5251 d 13 h rajveer /trunk/ Side effect of name changing of clients.  
/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/util/ContentGenerationUtility.java
/trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
2095 5336 d 18 h rajveer /trunk/ContentCreation/src/main/ 1) Display entities to be made ready. 2) Not allow to assign ready entities between 2 to 4  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
2078 5340 d 14 h rajveer /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ Update category, brand, model name and model number when item is marked as content complete  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
1338 5396 d 14 h rajveer /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ Moved action message to proper place  
/trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
1081 5414 d 14 h chandranshu /trunk/ContentCreation/ Moved Java sources to src/main/java  
/trunk/ContentCreation/src/main
/trunk/ContentCreation/src/main/java
/trunk/ContentCreation/src/main/java/in
/trunk/ContentCreation/src/main/resources
/trunk/ContentCreation/src/main/webapp
/trunk/ContentCreation/src/test
/trunk/ContentCreation/src/test/java
/trunk/ContentCreation/src/in
/trunk/ContentCreation/build.xml
1051 5417 d 20 h rajveer /trunk/ContentCreation/ CMS tool updates after Bdb storage. Also added user management.  
/trunk/ContentCreation/src/in/shop2020/creation/controllers/BaseController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/LoginController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/LogoutController.java
/trunk/ContentCreation/src/in/shop2020/creation/interceptors
/trunk/ContentCreation/src/in/shop2020/creation/interceptors/LoginInterceptor.java
/trunk/ContentCreation/src/velocity/login-index.vm
/trunk/ContentCreation/build.xml
/trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/MediaController.java
/trunk/ContentCreation/src/in/shop2020/creation/controllers/SlidesController.java
/trunk/ContentCreation/src/in/shop2020/creation/util/ContentValidator.java
/trunk/ContentCreation/src/jsp/index.jsp
/trunk/ContentCreation/src/velocity/entity-editSlide.vm
/trunk/ContentCreation/src/velocity/entity-index.vm
/trunk/ContentCreation/src/velocity/entity-show.vm
/trunk/ContentCreation/src/velocity/media-index.vm
/trunk/ContentCreation/src/velocity/slides-edit.vm
/trunk/ContentCreation/src/xml/config/struts.xml
725 5463 d 14 h chandranshu /trunk/ContentCreation/ Added support to mark an item as content complete in the catalog  
/trunk/ContentCreation/src/in/shop2020/creation/controllers/ItemUpdateController.java
/trunk/ContentCreation/.classpath
/trunk/ContentCreation/build.xml
/trunk/ContentCreation/src/velocity/entity-index.vm