SmartDukaan – /

Rev 4322 – Trac #828 - Removed helpdoc mapping for Web cam

varun.gupta — Mon, 16 Jan 2012 13:25:03 +0530

varun.gupta – 1 file(s) modified
Trac #828 - Removed helpdoc mapping for Web cam

~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 4321 – Closing the UserDataAccessor session used inside createOrders()

mandeep.dhir — Sat, 14 Jan 2012 20:34:53 +0530

mandeep.dhir – 1 file(s) modified
Closing the UserDataAccessor session used inside createOrders()

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py

Rev 4320 – Added method to update inventory for our warehouse when user ...

rajveer — Sat, 14 Jan 2012 01:57:41 +0530

rajveer – 7 file(s) modified
Added method to update inventory for our warehouse when user scans in an item.

~ /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/PyProj/src/shop2020/warehouse/main/handler/WarehouseHandler.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 4319 – Changed mail id.

rajveer — Sat, 14 Jan 2012 00:07:20 +0530

rajveer – 1 file(s) modified
Changed mail id.

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

Rev 4318 – Reduce reservation and send mail to chaitnaya in case of ...

rajveer — Fri, 13 Jan 2012 20:04:08 +0530

rajveer – 1 file(s) modified
Reduce reservation and send mail to chaitnaya in case of some item goes out of stock.

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

Rev 4317 – If expectedDelay field for item was Null, resetting it to ...

varun.gupta — Fri, 13 Jan 2012 19:41:25 +0530

varun.gupta – 1 file(s) modified
If expectedDelay field for item was Null, resetting it to 0.

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

Rev 4316 – Put try catch block before setting dummy transfer price.

anupam.singh — Fri, 13 Jan 2012 17:57:37 +0530

anupam.singh – 1 file(s) modified
Put try catch block before setting dummy transfer price.

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

Rev 4315 – Send VendorItemPricing Object instead of only transfer price.

anupam.singh — Fri, 13 Jan 2012 17:56:47 +0530

anupam.singh – 1 file(s) modified
Send VendorItemPricing Object instead of only transfer price.

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

Rev 4314 – Added one more cancelation reason : user wants early delivery ...

anupam.singh — Fri, 13 Jan 2012 14:41:44 +0530

anupam.singh – 2 file(s) modified
Added one more cancelation reason : user wants early delivery
Reviewer : Mandeep

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/js/common.js

Rev 4313 – Changed in RTO instructions for BlueDart.

rajveer — Fri, 13 Jan 2012 13:40:27 +0530

rajveer – 1 file(s) modified
Changed in RTO instructions for BlueDart.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java

Rev 4312 – Do not update warranty period if it is null.

rajveer — Fri, 13 Jan 2012 12:48:44 +0530

rajveer – 1 file(s) modified
Do not update warranty period if it is null.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 4311 – Random.

rajveer — Wed, 11 Jan 2012 18:41:00 +0530

rajveer – 1 file(s) modified
Random.

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

Rev 4310 – Changed public to private ips.

rajveer — Wed, 11 Jan 2012 13:25:39 +0530

rajveer – 1 file(s) modified
Changed public to private ips.

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

Rev 4309 – Allow warehouse admin to print invoice at any stage.

rajveer — Wed, 11 Jan 2012 12:08:12 +0530

rajveer – 1 file(s) modified
Allow warehouse admin to print invoice at any stage.

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

Rev 4308 – Added support to display different low inventory statuses in dashboard.

rajveer — Tue, 10 Jan 2012 18:38:19 +0530

rajveer – 6 file(s) modified
Added support to display different low inventory statuses in dashboard.

~ /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/server/handler/OrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java

Rev 4307 – When creating an Order we now add average transfer price. ...

anupam.singh — Tue, 10 Jan 2012 17:48:21 +0530

anupam.singh – 2 file(s) modified
When creating an Order we now add average transfer price.

Reviewer : Rajveer

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

Rev 4306 – Updated code to take care of new statuses.

rajveer — Tue, 10 Jan 2012 17:00:55 +0530

rajveer – 1 file(s) modified
Updated code to take care of new statuses.

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

Rev 4305 – Added authentication to product notification report

varun.gupta — Tue, 10 Jan 2012 16:18:17 +0530

varun.gupta – 1 file(s) modified
Added authentication to product notification report

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

Rev 4304 – Added commons io depandency

rajveer — Tue, 10 Jan 2012 15:30:40 +0530

rajveer – 1 file(s) modified
Added commons io depandency

~ /trunk/HotspotDashboard/pom.xml

Rev 4303 – Added support to read the response of hotspot procurement report. ...

rajveer — Tue, 10 Jan 2012 15:20:07 +0530

rajveer – 11 file(s) modified
Added support to read the response of hotspot procurement report. This response will be recorded in our database.

+ /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/DataService.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/HotspotAction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4302 – Reverted orderstatus file.

rajveer — Mon, 09 Jan 2012 15:49:50 +0530

rajveer – 1 file(s) modified
Reverted orderstatus file.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 4301 – Marked orders as out of stock whose inventory is not ...

rajveer — Mon, 09 Jan 2012 15:43:29 +0530

rajveer – 1 file(s) modified
Marked orders as out of stock whose inventory is not available.

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

Rev 4300 – Avoid duplicate file loading.

rajveer — Mon, 09 Jan 2012 15:38:37 +0530

rajveer – 1 file(s) modified
Avoid duplicate file loading.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessInventoryReportServlet.java

Rev 4299 – Removed unwanted lines

rajveer — Mon, 09 Jan 2012 14:47:16 +0530

rajveer – 1 file(s) modified
Removed unwanted lines

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

Rev 4298 – Removed the logic to get new transfer price.

rajveer — Mon, 09 Jan 2012 14:40:41 +0530

rajveer – 1 file(s) modified
Removed the logic to get new transfer price.

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

Rev 4297 – Updated the report

rajveer — Fri, 06 Jan 2012 18:20:19 +0530

rajveer – 1 file(s) modified
Updated the report

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.java

Rev 4296 – Updated the inventory stock report

rajveer — Fri, 06 Jan 2012 18:19:00 +0530

rajveer – 2 file(s) modified
Updated the inventory stock report

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

Rev 4295 – Ticket #756, #811 - Product Notification Requests Report and Functionality ...

varun.gupta — Fri, 06 Jan 2012 16:56:28 +0530

varun.gupta – 28 file(s) modified
Ticket #756, #811 - Product Notification Requests Report and Functionality to add warranty expiry date to each order at it's creation.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /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/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.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/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/webapp/WEB-INF/content/product-notifications-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.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/ProductNotificationRequest.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotificationRequestCount.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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 4293 – Corrected the client get method.

rajveer — Fri, 06 Jan 2012 15:47:39 +0530

rajveer – 1 file(s) modified
Corrected the client get method.

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

Rev 4292 – Fixed the transfer price issue in purchase ordel also.

rajveer — Fri, 06 Jan 2012 15:32:13 +0530

rajveer – 1 file(s) modified
Fixed the transfer price issue in purchase ordel also.

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

Rev 4291 – Coupon added for Nishant Gandhi

varun.gupta — Fri, 06 Jan 2012 14:29:07 +0530

varun.gupta – 1 file(s) modified
Coupon added for Nishant Gandhi

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

Rev 4290 – Updated the mailing list for procurement report.

rajveer — Fri, 06 Jan 2012 12:09:47 +0530

rajveer – 1 file(s) modified
Updated the mailing list for procurement report.

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.properties

Rev 4289 – Updated recipients in mailing list.

rajveer — Thu, 05 Jan 2012 19:44:28 +0530

rajveer – 1 file(s) modified
Updated recipients in mailing list.

~ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.properties

Rev 4288 – Included Billed and Init state orders in cancellable orders.

anupam.singh — Thu, 05 Jan 2012 19:30:30 +0530

anupam.singh – 1 file(s) modified
Included Billed and Init state orders in cancellable orders.

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

Rev 4287 – For order cancellation request tickets populate orders only when order ...

anupam.singh — Thu, 05 Jan 2012 19:04:17 +0530

anupam.singh – 1 file(s) modified
For order cancellation request tickets populate orders only when order status is "cancellation request recieved"

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java

Rev 4286 – Added support to upload inventory report from warehouse. Added support ...

rajveer — Thu, 05 Jan 2012 17:02:34 +0530

rajveer – 14 file(s) modified
Added support to upload inventory report from warehouse. Added support to select vendor at the time of billing.

~ /trunk/HotspotDashboard/pom.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/FileUploadBox.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/JacketInfoBox.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/BillOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessInventoryReportServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
+ /trunk/HotspotDashboard/src/main/resources/in/shop2020/hotspot/dashbaord/server/InventoryReportProcessor.properties
~ /trunk/HotspotDashboard/src/main/webapp/WEB-INF/web.xml

Rev 4285 – Added support to accept given number of orders for a ...

rajveer — Thu, 05 Jan 2012 17:00:06 +0530

rajveer – 7 file(s) modified
Added support to accept given number of orders for a item based on shipping timestamp. Fixed small bugs of addBillingDetail method.
Updated InventoryReport generation code to support new format and use xlwt library instead of csv.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4284 – Ticket #800 - Cart empty lightbox message changed

varun.gupta — Thu, 05 Jan 2012 14:52:24 +0530

varun.gupta – 1 file(s) modified
Ticket #800 - Cart empty lightbox message changed

~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 4283 – trac#793 : Re-factored vendor-warehouse mapping and billing flow. Reviewer : ...

anupam.singh — Wed, 04 Jan 2012 16:41:24 +0530

anupam.singh – 12 file(s) modified
trac#793 : Re-factored vendor-warehouse mapping and billing flow.
Reviewer : Rajveer

Merged methods for billing in case of our warehouse and other warehouse.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.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/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift