SmartDukaan – /trunk/Common/

Rev 7935 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 17:24:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Integration - Tracking and Shipment Creation on 06-Aug-2013

+ /trunk/Common/src/main/java/in/shop2020/utils/FedExShipAccountInfo.java

Rev 7934 – Committed by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 17:23:00 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for FedEx Integration - Tracking and Shipment Creation on 06-Aug-2013

~ /trunk/Common/pom.xml

Rev 7930 – Commited by Manish Sharma for FedEx Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 11:57:16 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for FedEx Integration - Tracking and Shipment Creation on 06-Aug-2013

+ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java

Rev 7928 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Tue, 06 Aug 2013 11:15:03 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 06-Aug-2013

~ /trunk/Common/pom.xml

Rev 7920 –

manish.sharma — Mon, 05 Aug 2013 18:00:51 +0530

manish.sharma – 1 file(s) modified

x /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java

Rev 7919 – Committed by Manish Sharma for Fedex Integration - Tracking and ...

manish.sharma — Mon, 05 Aug 2013 17:05:48 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Fedex Integration - Tracking and Shipment Creation on 05-Aug-2013

+ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java

Rev 7031 – Corrected.

rajveer — Fri, 22 Mar 2013 17:06:12 +0530

rajveer – 1 file(s) modified
Corrected.

~ /trunk/Common/src/main/java/in/shop2020/serving/services/RedExpressTrackingService.java

Rev 7030 – Seprated service and controller.

rajveer — Fri, 22 Mar 2013 16:37:30 +0530

rajveer – 2 file(s) modified
Seprated service and controller.

+ /trunk/Common/src/main/java/in/shop2020/serving/services/RedExpressTrackingService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RedexpressUpdatesController.java

Rev 6627 – FirstFlight Tracking service.

kshitij.sood — Wed, 09 Jan 2013 13:15:40 +0530

kshitij.sood – 4 file(s) modified
FirstFlight Tracking service.

~ /trunk/Common/pom.xml
+ /trunk/Common/src/main/java/in/shop2020/serving/services/FirstFlightTrackingService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FirstflightUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/firstflight-updates-show.vm

Rev 6217 – Setting tracking url for bluedart in case of not being ...

amar.kumar — Wed, 17 Oct 2012 16:38:33 +0530

amar.kumar – 1 file(s) modified
Setting tracking url for bluedart in case of not being able to read it from config service

~ /trunk/Common/src/main/java/in/shop2020/serving/services/BlueDartTrackingService.java

Rev 6113 – Adding new recharge related events

amar.kumar — Tue, 09 Oct 2012 14:28:06 +0530

amar.kumar – 1 file(s) modified
Adding new recharge related events

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/Event.java

Rev 6108 – Changes to log events in case of 1) Recharge ...

amar.kumar — Tue, 09 Oct 2012 12:37:16 +0530

amar.kumar – 5 file(s) modified
Changes to log events in case of
1) Recharge Successful
2) Recharge Failed + Payment Successful
3) Payment Failed for Recharge
4) Failure in getting provider for Number

Reviewed by: Amit Gupta

+ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProviderFetchFailure.java
+ /trunk/Common/src/main/java/in/shop2020/datalogger/event/RechargeStatusEvent.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/EventType.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.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 5687 – This file can be used to upload events from data.log ...

amar.kumar — Thu, 26 Jul 2012 18:16:34 +0530

amar.kumar – 1 file(s) modified
This file can be used to upload events from data.log which were not stored in GAE because of QuotaDenial or any other issue

+ /trunk/Common/src/main/java/in/shop2020/utils/GAEFailedEventUploader.java

Rev 5610 – Adding AlertClient and adding new keys for alertService in ConfigClientKeys

amar.kumar — Tue, 17 Jul 2012 00:39:57 +0530

amar.kumar – 2 file(s) modified
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

Rev 5586 – changes in catalog dashboard to support hotspot reviewer: Mandeep Dhir

phani.kumar — Fri, 13 Jul 2012 00:33:28 +0530

phani.kumar – 15 file(s) modified
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

Rev 5552 – Ticket #1431 Data Tracking for Comparisons required [Product] Ticket #1432 ...

phani.kumar — Mon, 09 Jul 2012 13:13:48 +0530

phani.kumar – 25 file(s) modified
Ticket #1431 Data Tracking for Comparisons required [Product]
Ticket #1432 Product Changes to Comparison Feature Visibility[Product]
Ticket #1433 Changes to the Compare Page [Product]
reviewer: Rajveer Singh, Amar Kumar

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProductCompare.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ResearchAdd.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/velocity/CategorySnippet.vm
~ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
~ /trunk/ContentStore/src/velocity/HomeSnippet.vm
+ /trunk/ContentStore/src/velocity/MostComparedSnippet.vm
~ /trunk/ContentStore/src/velocity/SearchSnippet.vm
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/comparison-stats.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MostComparedProductsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/SnippetType.java
~ /trunk/Website/src/main/resources/templates/myresearch.vm
~ /trunk/Website/src/main/webapp/css/comparision.css
~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm

Rev 5264 – Delhivery

phani.kumar — Thu, 24 May 2012 16:10:54 +0530

phani.kumar – 1 file(s) modified
Delhivery

~ /trunk/Common/src/main/java/in/shop2020/serving/services/DelhiveryTrackingService.java

Rev 5262 – Delhivery

phani.kumar — Thu, 24 May 2012 14:58:27 +0530

phani.kumar – 5 file(s) modified
Delhivery

+ /trunk/Common/src/main/java/in/shop2020/serving/services/DelhiveryTrackingService.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
+ /trunk/PyProj/src/shop2020/model/v1/order/script/DelhiveryLogisticsReconciliation.py
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/DelhiveryUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/delhivery-updates-show.vm

Rev 5140 – Removed new util method to send ssl mail with Bytes ...

amit.gupta — Tue, 08 May 2012 14:49:25 +0530

amit.gupta – 2 file(s) modified
Removed new util method to send ssl mail with Bytes as attachment, and its usage.
Reviewer: Anupam

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java

Rev 5138 – Trac#1219 Distributing mails across domains in case we get an ...

mandeep.dhir — Tue, 08 May 2012 11:49:48 +0530

mandeep.dhir – 1 file(s) modified
Trac#1219 Distributing mails across domains in case we get an error while sending the email

~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java

Rev 5128 – Ticket#1085 New Reports/alerts related to items in catalog

amit.gupta — Mon, 07 May 2012 12:50:37 +0530

amit.gupta – 12 file(s) modified
Ticket#1085
New Reports/alerts related to items in catalog

~ /trunk/CatalogDashboard/pom.xml
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogTree.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/InactiveWithInventoryServlet.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/ItemsBelowBreakevenServlet.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSenderScheduler.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/CatalogDashboard.gwt.xml
~ /trunk/CatalogDashboard/src/main/webapp/WEB-INF/web.xml
~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java

Rev 5072 – Ticket Id : #1136 Reviewed by : Varun Gupta ...

amar.kumar — Fri, 27 Apr 2012 15:09:53 +0530

amar.kumar – 6 file(s) modified
Ticket Id : #1136
Reviewed by : Varun Gupta

Changes for adding event and view for Delivery Estimates in Google App Engine

+ /trunk/Common/src/main/java/in/shop2020/datalogger/event/DeliveryEstimate.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/Event.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/EventType.java
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/DeliveryEstimate.java
+ /trunk/GoogleAppDatalog/src/main/webapp/jsp/delivery-estimate-stats.jsp
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java

Rev 4963 – Logging different types of exceptions separately

varun.gupta — Thu, 12 Apr 2012 12:57:10 +0530

varun.gupta – 1 file(s) modified
Logging different types of exceptions separately

~ /trunk/Common/src/main/java/in/shop2020/utils/DataLogger.java

Rev 4827 – Trac#992 Added feature to upload EOD stock reports and removed ...

mandeep.dhir — Wed, 28 Mar 2012 16:08:59 +0530

mandeep.dhir – 26 file(s) modified
Trac#992 Added feature to upload EOD stock reports and removed unused cde related to purchase orders

~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadPurchaseOrdersListEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadPurchaseOrdersListEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/PrintPendingEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/PrintPendingEventHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/EODStockReportUploadBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/PurchaseOrderList.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportProcessor.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EODStockReportServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/PrintPendingOrderHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/PurchaseOrderListHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/PendingOrdersServlet.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/PoSheetGenerator.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/WareHouseUtils.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/POLineItem.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PoType.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PrintPendingOrderRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PrintPendingOrderResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PurchaseOrder.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PurchaseOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PurchaseOrderListResponse.java
~ /trunk/HotspotDashboard/src/main/webapp/WEB-INF/web.xml

Rev 4710 – Enabling Aramex shipment updates in CRM. Reviewer : Phani Kumar

anupam.singh — Tue, 13 Mar 2012 20:03:31 +0530

anupam.singh – 3 file(s) modified
Enabling Aramex shipment updates in CRM.
Reviewer : Phani Kumar

+ /trunk/Common/src/main/java/in/shop2020/serving/services/AramexTrackingService.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
x /trunk/Website/src/main/java/in/shop2020/serving/services/AramexTrackingService.java

Rev 4649 – Ticket #937 authorization pop ups for selling price and transfer ...

phani.kumar — Wed, 07 Mar 2012 12:34:50 +0530

phani.kumar – 14 file(s) modified
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

Rev 4637 – Reading DB location from config server Removing jdbc.properties

mandeep.dhir — Tue, 06 Mar 2012 15:32:56 +0530

mandeep.dhir – 5 file(s) modified
Reading DB location from config server
Removing 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
x /trunk/WarehouseService/src/main/resources/jdbc.properties

Rev 4632 – Ticket Id: 954 Added the Referer URL in JsonData ...

amar.kumar — Tue, 06 Mar 2012 14:31:30 +0530

amar.kumar – 2 file(s) modified
Ticket Id: 954

Added the Referer URL in JsonData while logging the Product View event in Google App Engine

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProductView.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 4619 – Removing dependancy from /tmp/resource/jdbc.properties Implemented isAlive()

mandeep.dhir — Mon, 05 Mar 2012 17:25:28 +0530

mandeep.dhir – 5 file(s) modified
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/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/PaymentServer.java
~ /trunk/PaymentService/src/main/resources/context.xml
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 4609 – Ticket #917 Provide a simple Captcha on Site reviewer: Rajveer

phani.kumar — Sun, 04 Mar 2012 14:53:34 +0530

phani.kumar – 6 file(s) modified
Ticket #917 Provide a simple Captcha on Site
reviewer: Rajveer

~ /trunk/Common/src/main/java/in/shop2020/datalogger/EventType.java
~ /trunk/Website/pom.xml
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CaptchaController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/webapp/js/proceed-to-pay.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 4499 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 00:46:41 +0530

mandeep.dhir – 4 file(s) modified
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

Rev 4294 – Edited method to get Color with product name

varun.gupta — Fri, 06 Jan 2012 16:46:25 +0530

varun.gupta – 1 file(s) modified
Edited method to get Color with product name

~ /trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.java

Rev 4142 – Trac#686 UI Enhancements in Crm - Revamped Order info ...

mandeep.dhir — Mon, 28 Nov 2011 11:46:29 +0530

mandeep.dhir – 24 file(s) modified
Trac#686 UI Enhancements in Crm
- Revamped Order info page
- Cleaned up code to access the model objects directly in vm files
- Added advanced search options for ticket category and activity type
- Removed code related to UserCommunications
- Improved CartPageController and vm files
- Changed ticket edit page to reflect first orders and then tickets

~ /trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationInfoController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCommunicationsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-cart-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-communication-info-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/user-communications-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml

Rev 3892 – Corrected the imported Client class

chandranshu — Tue, 25 Oct 2011 13:59:35 +0530

chandranshu – 1 file(s) modified
Corrected the imported Client class

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/ContentClient.java

Rev 3891 – Added client for the Content Server

chandranshu — Tue, 25 Oct 2011 13:57:51 +0530

chandranshu – 2 file(s) modified
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

Rev 3546 – Trac#511 Changes related to COD orders verification

mandeep.dhir — Fri, 07 Oct 2011 16:28:14 +0530

mandeep.dhir – 27 file(s) modified
Trac#511 Changes related to COD orders verification

+ /trunk/Common/src/main/java/in/shop2020/utils/ModelUtils.java
~ /trunk/Crm/pom.xml
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/SearchFilter.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/PyProj/src/shop2020/thriftpy/crm/CRMService.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/SearchFilter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3445 – Cleanup logging.

vikas — Tue, 27 Sep 2011 16:45:53 +0530

vikas – 1 file(s) modified
Cleanup logging.

~ /trunk/Common/src/main/java/in/shop2020/utils/DataLogger.java

Rev 3429 – Changes due to thrift revision upgrade from 0.2 to 0.7

rajveer — Mon, 26 Sep 2011 19:30:39 +0530

rajveer – 2 file(s) modified
Changes due to thrift revision upgrade from 0.2 to 0.7

~ /trunk/Common/pom.xml
~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/TestOfTestServer.java

Rev 3419 – Deleted unused configuration files.

rajveer — Fri, 23 Sep 2011 18:08:12 +0530

rajveer – 4 file(s) modified
Deleted unused configuration files.

x /trunk/Common/src/main/resources/shop2020.cfg
x /trunk/Common/src/main/resources/shop2020_production.cfg
x /trunk/Common/src/main/resources/shop2020_staging.cfg
x /trunk/Common/src/test/resources/shop2020.cfg