SmartDukaan – /

Rev 2729 – Added comparison statistics fetcher. It will fetch comparison statistics occasionally ...

rajveer — Wed, 27 Jul 2011 13:45:37 +0530

rajveer – 1 file(s) modified
Added comparison statistics fetcher. It will fetch comparison statistics occasionally and store it into BDB. At the time of content generation, we will read from BDB.

+ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/ComparisonStatsFetcher.java

Rev 2728 – Add payment gateway and paymethod.

vikas — Wed, 27 Jul 2011 13:44:01 +0530

vikas – 3 file(s) modified
Add payment gateway and paymethod.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm

Rev 2727 – Removed more tabs

chandranshu — Wed, 27 Jul 2011 13:33:23 +0530

chandranshu – 1 file(s) modified
Removed more tabs

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

Rev 2726 – Removed inactive entities from the related accessories list.

rajveer — Wed, 27 Jul 2011 13:32:22 +0530

rajveer – 3 file(s) modified
Removed inactive entities from the related accessories list.

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

Rev 2725 – Removed some more tabs to resolve the diffs

chandranshu — Wed, 27 Jul 2011 13:20:26 +0530

chandranshu – 2 file(s) modified
Removed some more tabs to resolve the diffs

~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/test/samples/home/test1.html

Rev 2724 – Clean up the flow.

vikas — Wed, 27 Jul 2011 13:07:24 +0530

vikas – 6 file(s) modified
Clean up the flow.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/OrderCustomerInputController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/order-customer-input-index.vm

Rev 2723 – Made the order of best deals explicit and removed some ...

chandranshu — Wed, 27 Jul 2011 12:28:20 +0530

chandranshu – 2 file(s) modified
Made the order of best deals explicit and removed some tabs from index.vm

~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/test/resources/db/catalog.sql

Rev 2722 – Trac#473 Removed references to MediaNew class

mandeep.dhir — Wed, 27 Jul 2011 11:27:14 +0530

mandeep.dhir – 1 file(s) modified
Trac#473 Removed references to MediaNew class

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

Rev 2721 – Trac#473 New slide for After Sales added for all categories ...

mandeep.dhir — Wed, 27 Jul 2011 11:20:39 +0530

mandeep.dhir – 4 file(s) modified
Trac#473 New slide for After Sales added for all categories and with features Accessories (reused from charger slides), softwares (new feature added) and warranty.

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

Rev 2720 – Trac#473 Added support for Documents in Media in CMS. Made ...

mandeep.dhir — Wed, 27 Jul 2011 11:13:25 +0530

mandeep.dhir – 8 file(s) modified
Trac#473 Added support for Documents in Media in CMS. Made relevant changes in Website and ContentGeneratorUtility.

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/MediaController.java
~ /trunk/ContentCreation/src/main/webapp/js/gallery.js
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/media-index.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/FreeformContent.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/Media.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/Website/src/main/webapp/js/gallery.js

Rev 2719 – 3 new phones are added to the campaign

varun.gupta — Wed, 27 Jul 2011 09:21:37 +0530

varun.gupta – 1 file(s) modified
3 new phones are added to the campaign

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 2718 – My Notes - Second Iteration

varun.gupta — Tue, 26 Jul 2011 20:22:30 +0530

varun.gupta – 10 file(s) modified
My Notes - Second Iteration

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/my-notes.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-json.vm (copied from /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-show.vm@2683)
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-show.vm

Rev 2717 – Slide key changed from SlideId (Long) to SlideName (String)

varun.gupta — Tue, 26 Jul 2011 19:34:06 +0530

varun.gupta – 10 file(s) modified
Slide key changed from SlideId (Long) to SlideName (String)

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserNote.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 2716 – New slide introduced for My Research. SlideGuide and ProductDetail updated ...

varun.gupta — Tue, 26 Jul 2011 19:29:26 +0530

varun.gupta – 5 file(s) modified
New slide introduced for My Research. SlideGuide and ProductDetail updated to show My Notes colorbox

~ /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/velocity/MyResearchSnippet.vm
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/ContentStore/src/velocity/SlideGuide.vm

Rev 2715 – Added cart details in CRM.

vikas — Tue, 26 Jul 2011 19:20:04 +0530

vikas – 1 file(s) modified
Added cart details in CRM.

+ /trunk/Crm/src/main/webapp/WEB-INF/content/user-cart-index.vm

Rev 2714 – Added cart details in CRM.

vikas — Tue, 26 Jul 2011 19:17:53 +0530

vikas – 10 file(s) modified
Added cart details in CRM.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/OrderCustomerInputController.java
+ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.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/order-customer-input-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-orders-index.vm

Rev 2713 – Deploy crm as well

vikas — Tue, 26 Jul 2011 16:18:24 +0530

vikas – 2 file(s) modified
Deploy crm as well

~ /trunk/runutils/copy-wars-to-production.sh
~ /trunk/runutils/deploy-everything.sh

Rev 2712 – Add user dimenssion.

vikas — Tue, 26 Jul 2011 15:45:02 +0530

vikas – 1 file(s) modified
Add user dimenssion.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 2711 – Select active carts.

vikas — Tue, 26 Jul 2011 15:00:00 +0530

vikas – 1 file(s) modified
Select active carts.

~ /trunk/pentaho/data-integration/transformations/cartLoader.ktr

Rev 2710 – Select active carts.

vikas — Tue, 26 Jul 2011 14:49:07 +0530

vikas – 1 file(s) modified
Select active carts.

~ /trunk/pentaho/data-integration/transformations/cartLoader.ktr

Rev 2709 – Added Tablets also as brand Filter, so that Tablets can ...

rajveer — Tue, 26 Jul 2011 14:04:55 +0530

rajveer – 1 file(s) modified
Added Tablets also as brand Filter, so that Tablets can be displayed on brand page.

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

Rev 2708 – Call the payment service method to capture the payment

chandranshu — Tue, 26 Jul 2011 13:59:58 +0530

chandranshu – 7 file(s) modified
Call the payment service method to capture the payment

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java

Rev 2707 – Call the payment service method to capture the payment

chandranshu — Tue, 26 Jul 2011 13:40:27 +0530

chandranshu – 1 file(s) modified
Call the payment service method to capture the payment

~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 2706 – Added Common and Hdfc-payment JARs to the classpath

chandranshu — Tue, 26 Jul 2011 13:39:20 +0530

chandranshu – 1 file(s) modified
Added Common and Hdfc-payment JARs to the classpath

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

Rev 2705 – Trac#468 New enumerations added for 3DV, MBR and M4B music ...

mandeep.dhir — Tue, 26 Jul 2011 13:38:05 +0530

mandeep.dhir – 1 file(s) modified
Trac#468 New enumerations added for 3DV, MBR and M4B music and video formats.

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

Rev 2704 – Cart Cube.

vikas — Tue, 26 Jul 2011 13:33:18 +0530

vikas – 3 file(s) modified
Cart Cube.

+ /trunk/pentaho/data-integration/transformations/cartLoader.ktr
+ /trunk/pentaho/data-integration/transformations/userLoader.ktr
+ /trunk/pentaho/schema/CartSchema.xml

Rev 2703 – Started reading the configuration file from classpath so that we ...

chandranshu — Tue, 26 Jul 2011 11:27:16 +0530

chandranshu – 1 file(s) modified
Started reading the configuration file from classpath so that we can run multiple client agents on the same machine

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

Rev 2702 – Raised the process return order event

chandranshu — Mon, 25 Jul 2011 19:38:59 +0530

chandranshu – 1 file(s) modified
Raised the process return order event

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

Rev 2701 – Added support to process a return order

chandranshu — Mon, 25 Jul 2011 19:36:00 +0530

chandranshu – 8 file(s) modified
Added support to process a return order

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ProcessReturnOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ProcessReturnOrderEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ProcessReturnOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ProcessReturnOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ProcessReturnOrderResponse.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 2700 – Added support to show return order details in the dashboard

chandranshu — Mon, 25 Jul 2011 18:52:26 +0530

chandranshu – 17 file(s) modified
Added support to show return order details in the dashboard

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadReturnOrderDetailsEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadReturnOrderDetailsEventHandler.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/ReturnOrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ReturnOrderDetails.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ReturnOrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReturnOrderDetailsHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReturnOrderDetailsRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReturnOrderDetailsResponse.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 2699 – Add indexes on eventType, date. Add mapper for counting product ...

vikas — Mon, 25 Jul 2011 18:08:48 +0530

vikas – 4 file(s) modified
Add indexes on eventType, date. Add mapper for counting product related events.

~ /trunk/GoogleAppDatalog/pom.xml
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/mappers/TestMapper.java
+ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/datastore-indexes.xml
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/mapreduce.xml

Rev 2698 – hadoop jar

vikas — Mon, 25 Jul 2011 18:06:11 +0530

vikas – 3 file(s) modified
hadoop jar

+ /thirdparty/src/main/resources/readonly/hadoop
+ /thirdparty/src/main/resources/readonly/hadoop/0.20.2
+ /thirdparty/src/main/resources/readonly/hadoop/0.20.2/hadoop-core-0.20.2.jar

Rev 2697 – Added support to show return orders in the dashboard

chandranshu — Mon, 25 Jul 2011 17:19:54 +0530

chandranshu – 19 file(s) modified
Added support to show return orders in the dashboard

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllReturnOrdersEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllReturnOrdersEventHandler.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/ReturnOrderList.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ReturnOrderList.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AllReturnOrdersListHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllReturnOrdersListRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllReturnOrdersListResponse.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReturnOrder.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/ReturnOrder.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnOrder.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 2696 – Fixed bug where number of items are not getting updated ...

rajveer — Mon, 25 Jul 2011 17:04:41 +0530

rajveer – 1 file(s) modified
Fixed bug where number of items are not getting updated properly in cart.

~ /trunk/Website/src/main/webapp/js/cart-details.js

Rev 2695 – Removed alert.

rajveer — Mon, 25 Jul 2011 16:20:33 +0530

rajveer – 1 file(s) modified
Removed alert.

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

Rev 2694 – Updated year range in myaccounts section. Now user wont be ...

rajveer — Mon, 25 Jul 2011 16:18:26 +0530

rajveer – 1 file(s) modified
Updated year range in myaccounts section. Now user wont be able to specify future date of birth.

~ /trunk/Website/src/main/webapp/js/custom-jquery.js

Rev 2693 – Handling the case when the pickup or delivery time is ...

chandranshu — Mon, 25 Jul 2011 13:50:32 +0530

chandranshu – 1 file(s) modified
Handling the case when the pickup or delivery time is unknown.

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

Rev 2692 – Removed parameter from hdfcpay error url to enable it to ...

rajveer — Mon, 25 Jul 2011 13:47:48 +0530

rajveer – 2 file(s) modified
Removed parameter from hdfcpay error url to enable it to initialize the payment. Also added check in payerror controller to ckeck for the returned parameters

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java

Rev 2691 – Ensured that only an accepted order is billed

chandranshu — Mon, 25 Jul 2011 13:37:05 +0530

chandranshu – 1 file(s) modified
Ensured that only an accepted order is billed

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

Rev 2690 – Added ReturnOrder object and methods to process it

chandranshu — Mon, 25 Jul 2011 13:35:26 +0530

chandranshu – 5 file(s) modified
Added ReturnOrder object and methods to process it

~ /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/ReturnOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java