SmartDukaan – /

Rev 4616 – Added exception logging.

rajveer — Mon, 05 Mar 2012 14:00:38 +0530

rajveer – 1 file(s) modified
Added exception logging.

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

Rev 4615 – Logistics Reconcilation undelivered orders report generated and mailed reviewer: Rajveer

phani.kumar — Mon, 05 Mar 2012 13:10:13 +0530

phani.kumar – 1 file(s) modified
Logistics Reconcilation undelivered orders report generated and mailed
reviewer: Rajveer

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

Rev 4614 – Corrected usable and unusable issue.

rajveer — Mon, 05 Mar 2012 12:59:31 +0530

rajveer – 1 file(s) modified
Corrected usable and unusable issue.

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

Rev 4613 – Ticket #917 mouse pointer shown on link and image background ...

phani.kumar — Mon, 05 Mar 2012 12:00:15 +0530

phani.kumar – 2 file(s) modified
Ticket #917 mouse pointer shown on link and image background changed
reviewer: Rajveer

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CaptchaController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 4612 – Ticket #953 - Added category slide sequence for external HDD

varun.gupta — Mon, 05 Mar 2012 10:39:07 +0530

varun.gupta – 1 file(s) modified
Ticket #953 - Added category slide sequence for external HDD

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

Rev 4611 – Ticket #953 - Implemented Content Model for External HDDs

varun.gupta — Mon, 05 Mar 2012 00:38:30 +0530

varun.gupta – 4 file(s) modified
Ticket #953 - Implemented Content Model for External HDDs

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml
~ /trunk/ContentStore/src/xml/model/slidedefinitions.xml

Rev 4610 – Ticket #917 mouse pointer shown on image reviewer: Rajveer

phani.kumar — Sun, 04 Mar 2012 15:59:32 +0530

phani.kumar – 1 file(s) modified
Ticket #917 mouse pointer shown on image
reviewer: Rajveer

~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

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 4608 – Changing the inventory in the end. To make sure when ...

mandeep.dhir — Sat, 03 Mar 2012 23:05:57 +0530

mandeep.dhir – 1 file(s) modified
Changing the inventory in the end. To make sure when order gets billed, inventory is in good state.

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

Rev 4607 – Added report to get the slipped orders and send the ...

rajveer — Sat, 03 Mar 2012 14:08:34 +0530

rajveer – 7 file(s) modified
Added report to get the slipped orders and send the mail to concerned persons.

~ /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/DelayedOrdersReport.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 4606 – Updated the hardcoded mail id of bluedart.

rajveer — Fri, 02 Mar 2012 17:09:52 +0530

rajveer – 4 file(s) modified
Updated the hardcoded mail id of bluedart.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProivderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4605 – Trac # 931 Tables now display 10 rows by default. ...

anupam.singh — Fri, 02 Mar 2012 17:05:58 +0530

anupam.singh – 2 file(s) modified
Trac # 931
Tables now display 10 rows by default. Activity and Ticket description length quadrupled to 8192 bytes.

Reviewer : Mandeep Dhir

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

Rev 4604 – When order is not prepaid amount to collect field should ...

anupam.singh — Fri, 02 Mar 2012 16:30:09 +0530

anupam.singh – 1 file(s) modified
When order is not prepaid amount to collect field should be zero

Reviewer : Rajveer

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

Rev 4603 – Added support to choose the provider at the time of ...

rajveer — Fri, 02 Mar 2012 15:38:14 +0530

rajveer – 13 file(s) modified
Added support to choose the provider at the time of authorization.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AuthorizePickupEvent.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/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/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/PickupAuthorizationInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProivderList.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/AuthorizePickupHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/LogisticsUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllProvidersListResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthorizePickupRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java

Rev 4602 – Added the selection box at the time of authorization of ...

rajveer — Fri, 02 Mar 2012 15:36:41 +0530

rajveer – 6 file(s) modified
Added the selection box at the time of authorization of the pickup number.

~ /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 4601 – Added authentication check for access

varun.gupta — Fri, 02 Mar 2012 15:33:00 +0530

varun.gupta – 1 file(s) modified
Added authentication check for access

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

Rev 4600 – Vendor Reconciliation Report Generator - v1.0

varun.gupta — Fri, 02 Mar 2012 15:24:31 +0530

varun.gupta – 22 file(s) modified
Vendor Reconciliation Report Generator - v1.0

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/handler/PaymentGatewayHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/persistence/PaymentGatewayMapper.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PaymentService/src/main/resources/in/shop2020/payment/persistence/PaymentGatewayMapper.xml
~ /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/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/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PaymentSettlement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 4599 – Not scanning out until all validations are made

mandeep.dhir — Fri, 02 Mar 2012 13:53:41 +0530

mandeep.dhir – 1 file(s) modified
Not scanning out until all validations are made

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

Rev 4598 – Trac #881 Added transactionId against each product sale in Affiliate ...

anupam.singh — Fri, 02 Mar 2012 13:53:40 +0530

anupam.singh – 1 file(s) modified
Trac #881
Added transactionId against each product sale in Affiliate report.

Reviewer : Amar

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

Rev 4597 – Changed the location of import statement.

rajveer — Fri, 02 Mar 2012 11:35:00 +0530

rajveer – 1 file(s) modified
Changed the location of import statement.

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

Rev 4596 – Corrected code to fill the color in the cell.

rajveer — Fri, 02 Mar 2012 11:31:30 +0530

rajveer – 1 file(s) modified
Corrected code to fill the color in the cell.

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

Rev 4595 – Added HTC Desire HD A9191

varun.gupta — Fri, 02 Mar 2012 11:31:00 +0530

varun.gupta – 1 file(s) modified
Added HTC Desire HD A9191

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

Rev 4594 – Changed the date format.

rajveer — Thu, 01 Mar 2012 21:06:11 +0530

rajveer – 1 file(s) modified
Changed the date format.

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

Rev 4593 – Added coloring to the header of the procurement report.

rajveer — Thu, 01 Mar 2012 17:46:41 +0530

rajveer – 1 file(s) modified
Added coloring to the header of the procurement report.

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

Rev 4592 – Removing redundant or

mandeep.dhir — Thu, 01 Mar 2012 16:22:06 +0530

mandeep.dhir – 1 file(s) modified
Removing redundant or

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

Rev 4591 – Fixing orderstatus while fetchingorders to be batched

mandeep.dhir — Thu, 01 Mar 2012 16:21:24 +0530

mandeep.dhir – 1 file(s) modified
Fixing orderstatus while fetchingorders to be batched

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

Rev 4590 – Removed name field from contact us form

varun.gupta — Thu, 01 Mar 2012 13:33:51 +0530

varun.gupta – 1 file(s) modified
Removed name field from contact us form

~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm

Rev 4589 – Trac #921 Added space between list items

varun.gupta — Thu, 01 Mar 2012 13:26:33 +0530

varun.gupta – 1 file(s) modified
Trac #921 Added space between list items

~ /trunk/Website/src/main/webapp/WEB-INF/content/easy-linux.vm

Rev 4588 – Ticket #897 - Added media coverage section above the footer

varun.gupta — Thu, 01 Mar 2012 13:16:04 +0530

varun.gupta – 5 file(s) modified
Ticket #897 - Added media coverage section above the footer

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
+ /trunk/Website/src/main/webapp/images/Business_Std.jpg
+ /trunk/Website/src/main/webapp/images/moneycontrol.jpg
+ /trunk/Website/src/main/webapp/images/times-of-india.jpg

Rev 4587 – Adding order Id in error message

mandeep.dhir — Thu, 01 Mar 2012 12:51:05 +0530

mandeep.dhir – 1 file(s) modified
Adding order Id in error message

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

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.

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