SmartDukaan – /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 5945 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:37:44 +0530

mandeep.dhir – 99 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.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/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/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.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/runutils/.project
+ /trunk/runutils/.pydevproject
+ /trunk/runutils/init.d/inventory-server
+ /trunk/Support/Converted-2-2012-08-06-16:29:31.xls
+ /trunk/Support/Converted-2-2012-08-11-14:58:00.xls
~ /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
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
+ /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/catalog/Category.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.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/CatalogService/CatalogService.thrift
+ /trunk/ThriftGen/thriftsrc/InventoryService
+ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.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

Rev 5109 – FreeformContent Object can be null for slides. So skipping in ...

amit.gupta — Thu, 03 May 2012 17:47:05 +0530

amit.gupta – 1 file(s) modified
FreeformContent Object can be null for slides.
So skipping in such cases.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 5059 – Now files will be copied to the new folder for ...

amit.gupta — Wed, 25 Apr 2012 10:47:51 +0530

amit.gupta – 1 file(s) modified
Now files will be copied to the new folder for the entity.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 5012 – #599--Support for "create from existing entity" option in CMS Reviewer ...

amit.gupta — Tue, 17 Apr 2012 17:09:35 +0530

amit.gupta – 3 file(s) modified
#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/js/entity-index.js
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm

Rev 4012 – Fixed messaging.

rajveer — Wed, 09 Nov 2011 15:40:33 +0530

rajveer – 1 file(s) modified
Fixed messaging.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 4011 – Reduced non-assignment range from 2 hours to 45 minutes.

rajveer — Wed, 09 Nov 2011 15:32:47 +0530

rajveer – 1 file(s) modified
Reduced non-assignment range from 2 hours to 45 minutes.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 3480 – Fixed the bug where user was able to assign the ...

rajveer — Thu, 29 Sep 2011 16:00:34 +0530

rajveer – 1 file(s) modified
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

Rev 3127 – Side effect of name changing of clients.

rajveer — Wed, 31 Aug 2011 20:14:56 +0530

rajveer – 5 file(s) modified
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

Rev 2095 – 1) Display entities to be made ready. 2) Not allow ...

rajveer — Tue, 07 Jun 2011 15:14:07 +0530

rajveer – 3 file(s) modified
1) Display entities to be made ready. 2) Not allow to assign ready entities between 2 to 4

Rev 2078 – Update category, brand, model name and model number when item ...

rajveer — Fri, 03 Jun 2011 19:05:44 +0530

rajveer – 1 file(s) modified
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

Rev 1338 – Moved action message to proper place

rajveer — Fri, 08 Apr 2011 18:42:11 +0530

rajveer – 1 file(s) modified
Moved action message to proper place

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java

Rev 1081 – Moved Java sources to src/main/java

chandranshu — Mon, 21 Mar 2011 19:13:24 +0530

chandranshu – 9 file(s) modified
Moved Java sources to src/main/java

~ /trunk/ContentCreation/build.xml
x /trunk/ContentCreation/src/in
+ /trunk/ContentCreation/src/main
+ /trunk/ContentCreation/src/main/java
+ /trunk/ContentCreation/src/main/java/in (copied from /trunk/ContentCreation/src/in@1080)
+ /trunk/ContentCreation/src/main/resources
+ /trunk/ContentCreation/src/main/webapp
+ /trunk/ContentCreation/src/test
+ /trunk/ContentCreation/src/test/java

Rev 1051 – CMS tool updates after Bdb storage. Also added user management.

rajveer — Fri, 18 Mar 2011 13:04:49 +0530

rajveer – 19 file(s) modified
CMS tool updates after Bdb storage. Also added user management.

~ /trunk/ContentCreation/build.xml
+ /trunk/ContentCreation/src/in/shop2020/creation/controllers/BaseController.java
~ /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/LoginController.java
+ /trunk/ContentCreation/src/in/shop2020/creation/controllers/LogoutController.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/interceptors
+ /trunk/ContentCreation/src/in/shop2020/creation/interceptors/LoginInterceptor.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/login-index.vm
~ /trunk/ContentCreation/src/velocity/media-index.vm
~ /trunk/ContentCreation/src/velocity/slides-edit.vm
~ /trunk/ContentCreation/src/xml/config/struts.xml

Rev 725 – Added support to mark an item as content complete in ...

chandranshu — Mon, 31 Jan 2011 19:09:46 +0530

chandranshu – 4 file(s) modified
Added support to mark an item as content complete in the catalog

~ /trunk/ContentCreation/.classpath
~ /trunk/ContentCreation/build.xml
+ /trunk/ContentCreation/src/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentCreation/src/velocity/entity-index.vm