SmartDukaan – /

Rev 4388 – Removing instance variables from the UserInterceptor. This will prevent hashmap ...

rajveer — Fri, 27 Jan 2012 15:17:39 +0530

rajveer – 1 file(s) modified
Removing instance variables from the UserInterceptor. This will prevent hashmap to going into infinite loop. Because Interceptors has only one instance for all threads while actions (controllers in our case) have instance per thread.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java

Rev 4387 – Adding SH911 image promo in the widget bar for Lumia ...

rajveer — Fri, 27 Jan 2012 12:42:31 +0530

rajveer – 2 file(s) modified
Adding SH911 image promo in the widget bar for Lumia 710

+ /trunk/Website/src/main/webapp/images/SH911-widgetbar.jpg
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 4386 – On courier-details dashboard gave functionality to get details given an ...

anupam.singh — Fri, 27 Jan 2012 03:00:14 +0530

anupam.singh – 20 file(s) modified
On courier-details dashboard gave functionality to get details given an AWB number.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/AwbDetails.java
+ /trunk/Support/src/main/webapp/js/courier-details.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-info.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Awb.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4385 – keep backup of only two days.

rajveer — Thu, 26 Jan 2012 16:00:29 +0530

rajveer – 1 file(s) modified
keep backup of only two days.

~ /trunk/runutils/backup-CMS.sh

Rev 4384 – Added logs to XML generation code

varun.gupta — Wed, 25 Jan 2012 16:41:33 +0530

varun.gupta – 1 file(s) modified
Added logs to XML generation code

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 4383 – Allowed Laptops in product XML feed.

varun.gupta — Wed, 25 Jan 2012 16:24:25 +0530

varun.gupta – 1 file(s) modified
Allowed Laptops in product XML feed.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 4382 – Included Laptop in product XML feed.

varun.gupta — Wed, 25 Jan 2012 16:04:03 +0530

varun.gupta – 1 file(s) modified
Included Laptop in product XML feed.

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java

Rev 4381 – Batch no should be created for INVENTORY_LOW orders as well

mandeep.dhir — Wed, 25 Jan 2012 15:07:27 +0530

mandeep.dhir – 1 file(s) modified
Batch no should be created for INVENTORY_LOW orders as well

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4380 – POs should be created for Low inventory items as well

mandeep.dhir — Wed, 25 Jan 2012 15:05:00 +0530

mandeep.dhir – 1 file(s) modified
POs should be created for Low inventory items as well

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4379 – Reverting the removal of Lumnia 710 from SH911

varun.gupta — Wed, 25 Jan 2012 12:54:55 +0530

varun.gupta – 1 file(s) modified
Reverting the removal of Lumnia 710 from SH911

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py

Rev 4378 – Validating communication type

mandeep.dhir — Wed, 25 Jan 2012 12:07:53 +0530

mandeep.dhir – 1 file(s) modified
Validating communication type

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java

Rev 4377 – Validating communication type

mandeep.dhir — Wed, 25 Jan 2012 12:04:02 +0530

mandeep.dhir – 1 file(s) modified
Validating communication type

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java

Rev 4376 – Removed dependency on OrderStatus.

rajveer — Wed, 25 Jan 2012 11:22:06 +0530

rajveer – 1 file(s) modified
Removed dependency on OrderStatus.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py

Rev 4375 – Removed VendorId field from warehouse class in Catalog Service ...

anupam.singh — Tue, 24 Jan 2012 17:00:55 +0530

anupam.singh – 4 file(s) modified
Removed VendorId field from warehouse class in Catalog Service

Reviewer : Rajveer

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4374 – Added abhishek in the mailing list once an item goes ...

rajveer — Tue, 24 Jan 2012 16:08:58 +0530

rajveer – 1 file(s) modified
Added abhishek in the mailing list once an item goes out of stock.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 4373 – Move all products which we intend to procure from hotspot ...

rajveer — Tue, 24 Jan 2012 15:30:59 +0530

rajveer – 1 file(s) modified
Move all products which we intend to procure from hotspot to warehouse 5.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 4372 – Added Google Analytics tracking for click events

varun.gupta — Tue, 24 Jan 2012 15:00:11 +0530

varun.gupta – 3 file(s) modified
Added Google Analytics tracking for click events

~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 4371 – changed content disposition to attachment

anupam.singh — Tue, 24 Jan 2012 14:41:07 +0530

anupam.singh – 1 file(s) modified
changed content disposition to attachment

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java

Rev 4370 – Created a dashboard for raising manual PO's Reviewer : ...

anupam.singh — Tue, 24 Jan 2012 13:09:06 +0530

anupam.singh – 11 file(s) modified
Created a dashboard for raising manual PO's

Reviewer : Mandeep

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.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/RaisePOController.java
+ /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/authfail.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-result.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4369 – Adding support to generate the reminder report for the orders ...

rajveer — Tue, 24 Jan 2012 12:46:44 +0530

rajveer – 10 file(s) modified
Adding support to generate the reminder report for the orders whose estimated time to procure/reversal has been timed out.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ProcurementReportProcessor.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TimeoutSummary.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4368 – Removed some of the hardcoding for vendors and warehouses.

rajveer — Tue, 24 Jan 2012 12:35:29 +0530

rajveer – 1 file(s) modified
Removed some of the hardcoding for vendors and warehouses.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 4367 – Disable all buttons for warehouse monitor. Also remove verifyOrder button ...

rajveer — Tue, 24 Jan 2012 11:30:08 +0530

rajveer – 1 file(s) modified
Disable all buttons for warehouse monitor. Also remove verifyOrder button for all roles.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java

Rev 4366 – Added support to display counts against each order category.

rajveer — Tue, 24 Jan 2012 10:56:51 +0530

rajveer – 2 file(s) modified
Added support to display counts against each order category.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java

Rev 4365 – Adding scan out for sale and scan in for sales ...

mandeep.dhir — Tue, 24 Jan 2012 10:50:31 +0530

mandeep.dhir – 2 file(s) modified
Adding scan out for sale and scan in for sales return and DOA in. Also removed a commit statement that was making a transaction committing things at half stage

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py

Rev 4364 – Adding order support to get order counts.

rajveer — Mon, 23 Jan 2012 23:39:09 +0530

rajveer – 2 file(s) modified
Adding order support to get order counts.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java

Rev 4363 – 1) Removed hardcoding for vendor. 2) Print All Invoices only ...

rajveer — Mon, 23 Jan 2012 20:19:26 +0530

rajveer – 8 file(s) modified
1) Removed hardcoding for vendor.
2) Print All Invoices only enabled in case of accepted orders.
3)

~ /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/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java

Rev 4362 – Updated the status description for hotspot actions.

rajveer — Mon, 23 Jan 2012 20:13:55 +0530

rajveer – 1 file(s) modified
Updated the status description for hotspot actions.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4361 – Added support to print multiple invoices at one time. Also ...

rajveer — Mon, 23 Jan 2012 16:31:50 +0530

rajveer – 16 file(s) modified
Added support to print multiple invoices at one time. Also display the list of all orders when user clicks at All Pending. Display counts of ordertype also.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderCountsEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderCountsEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderListEvent.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
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.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/OrderCountsHandler.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/shared/actions/OrderCountsRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderCountsResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java

Rev 4360 – Lumia 710 removed from the effect of SH911 coupon

varun.gupta — Mon, 23 Jan 2012 15:12:39 +0530

varun.gupta – 1 file(s) modified
Lumia 710 removed from the effect of SH911 coupon

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_HDFC_campaign.py

Rev 4359 – Reverting change related to role.

rajveer — Mon, 23 Jan 2012 12:01:42 +0530

rajveer – 2 file(s) modified
Reverting change related to role.

Rev 4358 – Changed the name of role from category manager to ...

rajveer — Mon, 23 Jan 2012 11:36:50 +0530

rajveer – 3 file(s) modified
Changed the name of role from category manager to warehouse monitor.

~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Role.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 4357 – Adding new role.

rajveer — Mon, 23 Jan 2012 11:30:17 +0530

rajveer – 1 file(s) modified
Adding new role.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Role.java

Rev 4356 – Addding new role of warehouse monitor.

rajveer — Mon, 23 Jan 2012 11:25:14 +0530

rajveer – 3 file(s) modified
Addding new role of warehouse monitor.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/UserType.java

Rev 4355 – Hardcoded redirectURL param value to /shipping

varun.gupta — Sat, 21 Jan 2012 22:20:04 +0530

varun.gupta – 1 file(s) modified
Hardcoded redirectURL param value to /shipping

~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 4354 – Adding a log message

mandeep.dhir — Fri, 20 Jan 2012 18:08:06 +0530

mandeep.dhir – 1 file(s) modified
Adding a log message

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

Rev 4353 – 1) Message when file uploaded successfully and close the box. ...

rajveer — Fri, 20 Jan 2012 15:09:31 +0530

rajveer – 3 file(s) modified
1) Message when file uploaded successfully and close the box.
2) Rearrangement of order anchors in left side of OM dashboard.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/FileUploadBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java

Rev 4352 – Added two more statuses in inventory report generator.

rajveer — Fri, 20 Jan 2012 13:20:49 +0530

rajveer – 1 file(s) modified
Added two more statuses in inventory report generator.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py

Rev 4351 – Accept orders with po raised and reversal initiated.

rajveer — Fri, 20 Jan 2012 13:19:35 +0530

rajveer – 1 file(s) modified
Accept orders with po raised and reversal initiated.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4350 – Not allowing address to be changed for payment failed or ...

mandeep.dhir — Fri, 20 Jan 2012 12:57:43 +0530

mandeep.dhir – 1 file(s) modified
Not allowing address to be changed for payment failed or payment pending orders.

~ /trunk/Website/src/main/resources/templates/orderdetails.vm

Rev 4349 – Passing item id instead of lineitem id

mandeep.dhir — Fri, 20 Jan 2012 12:49:28 +0530

mandeep.dhir – 1 file(s) modified
Passing item id instead of lineitem id

~ /trunk/Website/src/main/resources/templates/orderdetails.vm