SmartDukaan – /

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

Rev 4282 – Removed bill order and reduce reservation count calls from method.

rajveer — Wed, 04 Jan 2012 15:37:05 +0530

rajveer – 1 file(s) modified
Removed bill order and reduce reservation count calls from method.

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

Rev 4281 – Added irmetadata rule for laptops operating system.

rajveer — Wed, 04 Jan 2012 11:32:09 +0530

rajveer – 3 file(s) modified
Added irmetadata rule for laptops operating system.

+ /trunk/ContentStore/src/jython/irmetadatarules/laptops/os.py
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irmetadatarules.xml

Rev 4280 – Aligning buttons centrally

anupam.singh — Tue, 03 Jan 2012 13:15:03 +0530

anupam.singh – 2 file(s) modified
Aligning buttons centrally

~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm

Rev 4279 – Changed date format to match it with the generated date ...

rajveer — Tue, 03 Jan 2012 13:06:08 +0530

rajveer – 1 file(s) modified
Changed date format to match it with the generated date format.

~ /trunk/PyProj/src/shop2020/logistics/service/script/LogisticsReportSender.py

Rev 4278 – Extended the usage limit to 1500

varun.gupta — Tue, 03 Jan 2012 12:56:43 +0530

varun.gupta – 1 file(s) modified
Extended the usage limit to 1500

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

Rev 4277 – Trac#809 Reviewer : Mandeep Dhir When user requests ...

anupam.singh — Mon, 02 Jan 2012 18:16:11 +0530

anupam.singh – 3 file(s) modified
Trac#809

Reviewer : Mandeep Dhir

When user requests for order cancellation a ticket is generated for the same in CRM and order goes into "cancel_request_recieved" state.
Outbound team in CRM should have an option to confirm or deny the request which should mark the order as cancelled or to its previous state respectively.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java

Rev 4276 – Ticket #795 - Sidebar widgets will automatically be closed in ...

varun.gupta — Fri, 30 Dec 2011 19:37:46 +0530

varun.gupta – 1 file(s) modified
Ticket #795 - Sidebar widgets will automatically be closed in case they are empty

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

Rev 4275 – Ticket #791 - Corrected the logic for computation of warranty ...

varun.gupta — Fri, 30 Dec 2011 19:36:23 +0530

varun.gupta – 1 file(s) modified
Ticket #791 - Corrected the logic for computation of warranty expiry date

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

Rev 4274 – Trac#805 Creating transaction service client before marking transaction as processed

mandeep.dhir — Fri, 30 Dec 2011 18:17:34 +0530

mandeep.dhir – 1 file(s) modified
Trac#805 Creating transaction service client before marking transaction as processed

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/FlaggedPaymentProcessorTask.java

Rev 4273 – Ticket #796 - Limited the list to 10 items and ...

varun.gupta — Fri, 30 Dec 2011 17:45:58 +0530

varun.gupta – 1 file(s) modified
Ticket #796 - Limited the list to 10 items and the item itself will not be included

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

Rev 4272 – Ticket #794 - Added search facate for Laptop Processor

varun.gupta — Fri, 30 Dec 2011 16:29:36 +0530

varun.gupta – 1 file(s) modified
Ticket #794 - Added search facate for Laptop Processor

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 4271 – Ticket #794 - Added search facates for Processor type and ...

varun.gupta — Fri, 30 Dec 2011 16:24:08 +0530

varun.gupta – 4 file(s) modified
Ticket #794 - Added search facates for Processor type and Storage Capacity

+ /trunk/ContentStore/src/jython/irdatarules/laptops/processor.py
~ /trunk/ContentStore/src/jython/irdatarules/laptops/storage.py
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml

Rev 4270 – Removing condition where empty field has been entered by mistake.

rajveer — Fri, 30 Dec 2011 15:50:33 +0530

rajveer – 1 file(s) modified
Removing condition where empty field has been entered by mistake.

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

Rev 4269 – Added a field vendorId in 'order' table Reviewer : ...

anupam.singh — Fri, 30 Dec 2011 14:38:16 +0530

anupam.singh – 6 file(s) modified
Added a field vendorId in 'order' table

Reviewer : Varun Gupta

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift