SmartDukaan – /

Rev 4586 – Trac#909 Creating POs for each supplier

mandeep.dhir — Wed, 29 Feb 2012 23:47:01 +0530

mandeep.dhir – 9 file(s) modified
Trac#909 Creating POs for each supplier

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/PrintPendingOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/WareHouseUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/PrintPendingOrderResponse.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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 4585 – Receive billing updates from the client and update the billing ...

rajveer — Wed, 29 Feb 2012 17:48:58 +0530

rajveer – 3 file(s) modified
Receive billing updates from the client and update the billing info from that.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/BillingUpdate.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/InventoryUpdate.java

Rev 4584 – Added support to fetch bill number from ETP and store ...

rajveer — Wed, 29 Feb 2012 17:48:23 +0530

rajveer – 2 file(s) modified
Added support to fetch bill number from ETP and store them in our order db for the order.

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java
~ /ClientAgent/src/main/resources/agent.conf

Rev 4583 – catalog Dashboard preferred vendor drop down reviewer:rajveer

phani.kumar — Wed, 29 Feb 2012 15:08:45 +0530

phani.kumar – 1 file(s) modified
catalog Dashboard preferred vendor drop down
reviewer:rajveer

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java

Rev 4582 – Move tablets to handsets group for hotspot.

rajveer — Wed, 29 Feb 2012 14:51:50 +0530

rajveer – 1 file(s) modified
Move tablets to handsets group for hotspot.

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

Rev 4581 – Ticket #889 Aramex Logistics Reconcilation using thier api, order service ...

phani.kumar — Wed, 29 Feb 2012 13:42:15 +0530

phani.kumar – 8 file(s) modified
Ticket #889 Aramex Logistics Reconcilation using thier api, order service update_non_delivery_reason function returns undelivered orders
reviewer: Rajveer

~ /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/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.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 4580 – Populate the billing information if it is already populated.

rajveer — Wed, 29 Feb 2012 13:16:41 +0530

rajveer – 1 file(s) modified
Populate the billing information if it is already populated.

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

Rev 4579 – Added support to add invoice number in the order. Added ...

rajveer — Wed, 29 Feb 2012 12:27:49 +0530

rajveer – 6 file(s) modified
Added support to add invoice number in the order.
Added support to raise the pickup request with different courier partners.

~ /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 4578 – Added support to choose logistics provider at the time of ...

rajveer — Wed, 29 Feb 2012 12:26:28 +0530

rajveer – 6 file(s) modified
Added support to choose logistics provider at the time of requesting pickup.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/RequestPickupEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ChoosePickupProviderBox.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/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RequestPickupHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/RequestPickupRequest.java

Rev 4577 – Added tablet category

amit.gupta — Wed, 29 Feb 2012 06:57:29 +0530

amit.gupta – 1 file(s) modified
Added tablet category

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

Rev 4576 – Redeploying the changeswith scanout validations at Mahipalpur warehouse

mandeep.dhir — Wed, 29 Feb 2012 00:17:28 +0530

mandeep.dhir – 1 file(s) modified
Redeploying the changeswith scanout validations at Mahipalpur warehouse

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

Rev 4575 – Using one-jar plugin

mandeep.dhir — Wed, 29 Feb 2012 00:09:17 +0530

mandeep.dhir – 1 file(s) modified
Using one-jar plugin

~ /trunk/runutils/run-warehouse-service.sh

Rev 4574 – Using one-jar plugin

mandeep.dhir — Wed, 29 Feb 2012 00:04:07 +0530

mandeep.dhir – 2 file(s) modified
Using one-jar plugin

~ /trunk/WarehouseService/pom.xml
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java

Rev 4573 – Added BB Playbook 16GB

varun.gupta — Tue, 28 Feb 2012 16:30:23 +0530

varun.gupta – 1 file(s) modified
Added BB Playbook 16GB

~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 4572 – email attachment downloader code changed to set flags and use ...

phani.kumar — Mon, 27 Feb 2012 19:58:48 +0530

phani.kumar – 2 file(s) modified
email attachment downloader code changed to set flags and use them for search
reviewer:rajveer singh

~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentDownloader.py

Rev 4571 – Updated the email address from central to sales.central.

rajveer — Mon, 27 Feb 2012 15:12:43 +0530

rajveer – 1 file(s) modified
Updated the email address from central to sales.central.

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

Rev 4570 – Sort by Brand before sending the procurement report.

rajveer — Mon, 27 Feb 2012 15:01:05 +0530

rajveer – 1 file(s) modified
Sort by Brand before sending the procurement report.

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

Rev 4569 – Ticket #919 - Fixed comparison score computation for processor slide

varun.gupta — Mon, 27 Feb 2012 14:44:28 +0530

varun.gupta – 1 file(s) modified
Ticket #919 - Fixed comparison score computation for processor slide

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py

Rev 4568 – Linux promotion banner image

varun.gupta — Mon, 27 Feb 2012 12:46:16 +0530

varun.gupta – 1 file(s) modified
Linux promotion banner image

+ /trunk/Website/src/main/webapp/images/Linux_Homepage.jpg

Rev 4567 – imagemap banner for Linux promotion

varun.gupta — Mon, 27 Feb 2012 12:11:24 +0530

varun.gupta – 1 file(s) modified
imagemap banner for Linux promotion

+ /trunk/Website/src/main/webapp/WEB-INF/content/banner.vm

Rev 4566 – Adding support of secure hash in ebs payment gateway.

rajveer — Mon, 27 Feb 2012 12:05:14 +0530

rajveer – 2 file(s) modified
Adding support of secure hash in ebs payment gateway.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm

Rev 4565 – Added MI-310

varun.gupta — Mon, 27 Feb 2012 12:02:44 +0530

varun.gupta – 1 file(s) modified
Added MI-310

~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 4564 – Fixing receipients list

mandeep.dhir — Fri, 24 Feb 2012 23:33:03 +0530

mandeep.dhir – 1 file(s) modified
Fixing receipients list

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

Rev 4563 – Ticket #895 Create Sub Menu Under Laptop Menu Bar

phani.kumar — Fri, 24 Feb 2012 16:59:22 +0530

phani.kumar – 1 file(s) modified
Ticket #895 Create Sub Menu Under Laptop Menu Bar

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

Rev 4562 – Removed blueberry from SH911

varun.gupta — Fri, 24 Feb 2012 16:45:43 +0530

varun.gupta – 1 file(s) modified
Removed blueberry from SH911

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

Rev 4561 – Adding the missing return statement

mandeep.dhir — Fri, 24 Feb 2012 16:25:27 +0530

mandeep.dhir – 1 file(s) modified
Adding the missing return statement

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

Rev 4560 – typo error 10001 was used instead of 10011 while checking ...

phani.kumar — Thu, 23 Feb 2012 20:16:30 +0530

phani.kumar – 1 file(s) modified
typo error 10001 was used instead of 10011 while checking parent category id for Accessories

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

Rev 4559 – Ticket #889 Aramex Logistics Reconcilation using thier api

phani.kumar — Thu, 23 Feb 2012 20:11:22 +0530

phani.kumar – 1 file(s) modified
Ticket #889 Aramex Logistics Reconcilation using thier api

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 4558 – Reverting

mandeep.dhir — Thu, 23 Feb 2012 14:21:39 +0530

mandeep.dhir – 1 file(s) modified
Reverting

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

Rev 4557 – Added email ids of pankaj and mandeep

mandeep.dhir — Wed, 22 Feb 2012 22:50:26 +0530

mandeep.dhir – 1 file(s) modified
Added email ids of pankaj and mandeep

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

Rev 4556 – Committing on behalf of Rajveer

mandeep.dhir — Wed, 22 Feb 2012 22:47:39 +0530

mandeep.dhir – 4 file(s) modified
Committing on behalf of Rajveer

~ /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/PyProj/src/shop2020/model/v1/catalog/script/ProcurementReportProcessor.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4555 – Modified services with better interface resulting in minimal calls

mandeep.dhir — Wed, 22 Feb 2012 12:44:32 +0530

mandeep.dhir – 16 file(s) modified
Modified services with better interface resulting in minimal calls

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 4554 – Trac#908 Commenting the check

mandeep.dhir — Tue, 21 Feb 2012 18:35:08 +0530

mandeep.dhir – 1 file(s) modified
Trac#908 Commenting the check

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

Rev 4553 – Closing session

mandeep.dhir — Tue, 21 Feb 2012 18:13:40 +0530

mandeep.dhir – 1 file(s) modified
Closing session

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 4552 – Closing session

mandeep.dhir — Tue, 21 Feb 2012 18:00:17 +0530

mandeep.dhir – 1 file(s) modified
Closing session

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 4551 – Trac#908 Fixing bug

mandeep.dhir — Tue, 21 Feb 2012 16:02:03 +0530

mandeep.dhir – 1 file(s) modified
Trac#908 Fixing bug

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

Rev 4550 – Logo was not getting displayed in case of Prepaid.

rajveer — Tue, 21 Feb 2012 16:01:34 +0530

rajveer – 1 file(s) modified
Logo was not getting displayed in case of Prepaid.

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

Rev 4549 – Deleted updateInvoiceNumbers

anupam.singh — Tue, 21 Feb 2012 15:31:58 +0530

anupam.singh – 1 file(s) modified
Deleted updateInvoiceNumbers

x /trunk/PyProj/src/shop2020/model/v1/order/script/UpdateInvoiceNumbers

Rev 4548 – Removed Manmohan and added Avinash in the user lists.

rajveer — Tue, 21 Feb 2012 14:42:26 +0530

rajveer – 1 file(s) modified
Removed Manmohan and added Avinash in the user lists.

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

Rev 4547 – Trac#908 Fixing accessor

mandeep.dhir — Tue, 21 Feb 2012 13:39:41 +0530

mandeep.dhir – 1 file(s) modified
Trac#908 Fixing accessor

~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py