SmartDukaan – /

Rev 4818 – #792, #823

amit.gupta — Wed, 28 Mar 2012 12:03:50 +0530

amit.gupta – 4 file(s) modified
#792, #823

~ /trunk/ContentStore/src/jython/comparisonrules/software_math.py
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 4817 – Registered user report now supports date range. Reviewer : Varun ...

anupam.singh — Tue, 27 Mar 2012 20:55:47 +0530

anupam.singh – 3 file(s) modified
Registered user report now supports date range.
Reviewer : Varun Gupta

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RegisteredUsersController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/registered-users-authsuccess.vm

Rev 4816 – Ticket ID : #998 Reviewed by : Varun Gupta

amar.kumar — Tue, 27 Mar 2012 20:33:54 +0530

amar.kumar – 1 file(s) modified
Ticket ID : #998
Reviewed by : Varun Gupta

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearch.jsp

Rev 4815 – Ticket #985 Add cancel button on order detail page on ...

phani.kumar — Tue, 27 Mar 2012 19:51:23 +0530

phani.kumar – 17 file(s) modified
Ticket #985 Add cancel button on order detail page on Website
Ticket #1023 Tracking of DOA and Return Pickups
Ticket #1022 Changes in Email Sent to Customers after DOA/Return Pickups are Confirmed
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/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /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/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/js/myaccount.js

Rev 4814 – Fixed the bug where items are not conconated correctly.

rajveer — Tue, 27 Mar 2012 16:27:32 +0530

rajveer – 1 file(s) modified
Fixed the bug where items are not conconated correctly.

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

Rev 4813 – Fixed the bug where inventory update from non preferred warehouse ...

rajveer — Tue, 27 Mar 2012 16:10:20 +0530

rajveer – 1 file(s) modified
Fixed the bug where inventory update from non preferred warehouse is marking item as paused by risk.

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

Rev 4812 – Discount value modified for Spice Qt-58

varun.gupta — Tue, 27 Mar 2012 14:57:45 +0530

varun.gupta – 1 file(s) modified
Discount value modified for Spice Qt-58

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

Rev 4811 – Updated product list

varun.gupta — Tue, 27 Mar 2012 12:43:02 +0530

varun.gupta – 1 file(s) modified
Updated product list

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

Rev 4810 – CSS sprite'd the media coverage section

varun.gupta — Tue, 27 Mar 2012 08:49:44 +0530

varun.gupta – 4 file(s) modified
CSS sprite'd the media coverage section

~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
+ /trunk/Website/src/main/webapp/images/press-logos-sprite.jpg
~ /trunk/Website/src/main/webapp/js/common.js

Rev 4809 – Changing script to reflect changes in orderstatus table in pentaho.

anupam.singh — Mon, 26 Mar 2012 20:53:58 +0530

anupam.singh – 1 file(s) modified
Changing script to reflect changes in orderstatus table in pentaho.

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 4808 – Corrected the parent category id for laptops and tablets.

rajveer — Mon, 26 Mar 2012 17:44:20 +0530

rajveer – 1 file(s) modified
Corrected the parent category id for laptops and tablets.

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

Rev 4807 – Fixed the bug where provider and warehouse id had interchanged.

rajveer — Mon, 26 Mar 2012 17:25:02 +0530

rajveer – 1 file(s) modified
Fixed the bug where provider and warehouse id had interchanged.

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

Rev 4806 – Ticket #1008 - Helper service modified to store quick links ...

varun.gupta — Mon, 26 Mar 2012 16:21:02 +0530

varun.gupta – 12 file(s) modified
Ticket #1008 - Helper service modified to store quick links and a UI created to manage these

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/QuicklinksController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/QuickLink.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 4805 – Corrected the call for definitions container.

rajveer — Mon, 26 Mar 2012 16:20:15 +0530

rajveer – 1 file(s) modified
Corrected the call for definitions container.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java

Rev 4804 – Corrected syntex.

rajveer — Mon, 26 Mar 2012 15:18:56 +0530

rajveer – 1 file(s) modified
Corrected syntex.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 4803 – Donot show location serviceable if only Aramex is delivering there.

rajveer — Mon, 26 Mar 2012 15:13:22 +0530

rajveer – 1 file(s) modified
Donot show location serviceable if only Aramex is delivering there.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 4802 – Making comparable and has accessories as attributes. Also made category ...

amit.gupta — Mon, 26 Mar 2012 14:59:36 +0530

amit.gupta – 12 file(s) modified
Making comparable and has accessories as attributes. Also made category tree at same level.

~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/Category.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/definitions/DefinitionsContainer.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/jaxb/core/CategoryType.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AccessoriesFinder.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewCMP.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/NewIR.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/xml/metamodel/core.xsd
~ /trunk/ContentStore/src/xml/model/categories.xml

Rev 4801 – Trac #1025 Created a dashboard for viewing courier performance ...

anupam.singh — Mon, 26 Mar 2012 13:45:49 +0530

anupam.singh – 10 file(s) modified
Trac #1025

Created a dashboard for viewing courier performance report in Support webapp.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /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/Support/src/main/java/in/shop2020/support/controllers/CourierPerformanceController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-performance-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4800 – Send mail from cnc.center instead of help

rajveer — Mon, 26 Mar 2012 13:05:18 +0530

rajveer – 1 file(s) modified
Send mail from cnc.center instead of help

~ /trunk/pentaho/scripts/ReportMailerFromDb.py

Rev 4799 – Added Bluberry QT-58 to SH911 for a discount of Rs.350

varun.gupta — Mon, 26 Mar 2012 12:53:19 +0530

varun.gupta – 1 file(s) modified
Added Bluberry QT-58 to SH911 for a discount of Rs.350

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

Rev 4798 – Moved Research Widget related methods from all.js to widgets.js & ...

varun.gupta — Mon, 26 Mar 2012 12:27:08 +0530

varun.gupta – 2 file(s) modified
Moved Research Widget related methods from all.js to widgets.js & fixed the selected-item-for-comparison count on widget load

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

Rev 4797 – TIcket #1034: Send mail to Abhishek & Chaitnaya for OOS ...

rajveer — Mon, 26 Mar 2012 12:20:55 +0530

rajveer – 1 file(s) modified
TIcket #1034: Send mail to Abhishek & Chaitnaya for OOS items.

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

Rev 4796 – Adding logs for any uncaught exception that is thrown

mandeep.dhir — Mon, 26 Mar 2012 11:56:27 +0530

mandeep.dhir – 1 file(s) modified
Adding logs for any uncaught exception that is thrown

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 4795 – Adding logs for any uncaught exception that is thrown

mandeep.dhir — Mon, 26 Mar 2012 11:53:31 +0530

mandeep.dhir – 1 file(s) modified
Adding logs for any uncaught exception that is thrown

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 4794 – Ticket #945 - Menu under Best Deals added

varun.gupta — Sun, 25 Mar 2012 22:11:33 +0530

varun.gupta – 2 file(s) modified
Ticket #945 - Menu under Best Deals added

~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css

Rev 4793 – Ticket ID : #1010 Reviewed by : Anupam Singh

amar.kumar — Sun, 25 Mar 2012 00:25:05 +0530

amar.kumar – 21 file(s) modified
Ticket ID : #1010
Reviewed by : Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Agent.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Agent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 4792 – Ticket #1002 Logistics Reconcilation of Bluedart and Aramex reviewer: Rajveer

phani.kumar — Fri, 23 Mar 2012 19:36:56 +0530

phani.kumar – 3 file(s) modified
Ticket #1002 Logistics Reconcilation of Bluedart and Aramex
reviewer: Rajveer

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

Rev 4791 – Ticket #918 - On payment success page, look and feel ...

varun.gupta — Fri, 23 Mar 2012 18:40:04 +0530

varun.gupta – 2 file(s) modified
Ticket #918 - On payment success page, look and feel of action button corrected

~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 4790 – Changes in shipping process where user will be able to ...

rajveer — Fri, 23 Mar 2012 18:14:32 +0530

rajveer – 14 file(s) modified
Changes in shipping process where user will be able to select or deselect the orders.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBilledOrdersEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBilledOrdersEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkOrdersAsManifestedEvent.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/MarkOrdersAsManifestedConfirmationBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProviderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsReportMerger.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/MarkOrdersAsManifestedHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ShipOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkOrdersAsManifestedResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ShipOrderRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ShipOrderResponse.java

Rev 4789 – Mark selected orders as shipped.

rajveer — Fri, 23 Mar 2012 18:12:41 +0530

rajveer – 4 file(s) modified
Mark selected orders as shipped.

~ /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

Rev 4788 – Changes in shipping process where user will be able to ...

rajveer — Fri, 23 Mar 2012 18:11:45 +0530

rajveer – 5 file(s) modified
Changes in shipping process where user will be able to select or deselect the orders.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4787 – Using jars from maven

mandeep.dhir — Fri, 23 Mar 2012 15:08:43 +0530

mandeep.dhir – 2 file(s) modified
Using jars from maven

~ /trunk/runutils/init.d/crm-server
~ /trunk/runutils/init.d/warehouse-server

Rev 4786 – Ticket #913 - Added events for click on product links ...

varun.gupta — Fri, 23 Mar 2012 13:13:39 +0530

varun.gupta – 2 file(s) modified
Ticket #913 - Added events for click on product links in best deals, latest arrivals and best sellers sections

~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm

Rev 4785 – Ticket Id #998 Reviewed By : Varun Gupta

amar.kumar — Thu, 22 Mar 2012 19:01:34 +0530

amar.kumar – 1 file(s) modified
Ticket Id #998
Reviewed By : Varun Gupta

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/productSearchFrequency.jsp

Rev 4784 – Applied valid names to Processor and Os for Laptops

amit.gupta — Thu, 22 Mar 2012 16:50:51 +0530

amit.gupta – 1 file(s) modified
Applied valid names to Processor and Os for Laptops

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

Rev 4783 – Ticket #990 Need Report for orders which have crossed expected ...

phani.kumar — Thu, 22 Mar 2012 16:14:51 +0530

phani.kumar – 10 file(s) modified
Ticket #990 Need Report for orders which have crossed expected Delivery Date
reviewer: Rajveer

~ /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/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.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 4782 – Making POST call instead of PUT to avoid issue due ...

mandeep.dhir — Thu, 22 Mar 2012 16:10:49 +0530

mandeep.dhir – 1 file(s) modified
Making POST call instead of PUT to avoid issue due to large emails

~ /trunk/Crm/src/main/webapp/js/common.js

Rev 4781 – Handle condition where our color is None.

rajveer — Thu, 22 Mar 2012 14:37:19 +0530

rajveer – 1 file(s) modified
Handle condition where our color is None.

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

Rev 4780 – Removed dropped columns mop and dealer price.

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

mandeep.dhir – 1 file(s) modified
Removed dropped columns mop and dealer price.

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

Rev 4779 – Removed dropped columns mop and dealer price.

mandeep.dhir — Thu, 22 Mar 2012 13:04:50 +0530

mandeep.dhir – 2 file(s) modified
Removed dropped columns mop and dealer price.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Item.java