SmartDukaan – /

Rev 3231 – Excluding After sales slide from comparison.

rajveer — Thu, 08 Sep 2011 11:27:15 +0530

rajveer – 3 file(s) modified
Excluding After sales slide from comparison.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/Utils.java
~ /trunk/ContentStore/src/velocity/ComparisonSnippet.vm

Rev 3230 – Added solr search engine configuration for support machine.

rajveer — Wed, 07 Sep 2011 18:58:33 +0530

rajveer – 1 file(s) modified
Added solr search engine configuration for support machine.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 3229 – Initial import.

varun.gupta — Wed, 07 Sep 2011 18:34:14 +0530

varun.gupta – 1 file(s) modified
Initial import.

+ /trunk/PriceComparisonFramework

Rev 3228 – Trac#488 - Fixes related to formatting issues ...

mandeep.dhir — Wed, 07 Sep 2011 16:54:35 +0530

mandeep.dhir – 8 file(s) modified
Trac#488
- Fixes related to formatting issues
- Added links for users added in tickets view

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.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/tickets-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-index.vm

Rev 3227 – Updated the transaction database dump

chandranshu — Wed, 07 Sep 2011 15:44:11 +0530

chandranshu – 1 file(s) modified
Updated the transaction database dump

~ /trunk/Website/src/test/resources/db/transaction.sql

Rev 3226 – Started recording the refund reason entered by the operator

chandranshu — Wed, 07 Sep 2011 14:45:48 +0530

chandranshu – 8 file(s) modified
Started recording the refund reason entered by the operator

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3225 – Added caching of snippets on product page.

vikas — Wed, 07 Sep 2011 14:14:42 +0530

vikas – 3 file(s) modified
Added caching of snippets on product page.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java
~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3224 – Get sessionId from cookies. As due to loadbalanced tomcats current ...

vikas — Wed, 07 Sep 2011 11:56:26 +0530

vikas – 6 file(s) modified
Get sessionId from cookies. As due to loadbalanced tomcats current jsession id can not be used for session tracking in datalog.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java

Rev 3223 – Removed sysout statements.

rajveer — Wed, 07 Sep 2011 11:01:23 +0530

rajveer – 1 file(s) modified
Removed sysout statements.

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

Rev 3222 – Add affiliate to sales report.

vikas — Tue, 06 Sep 2011 19:05:10 +0530

vikas – 1 file(s) modified
Add affiliate to sales report.

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 3221 – Add affiliate to sales report.

vikas — Tue, 06 Sep 2011 18:47:50 +0530

vikas – 1 file(s) modified
Add affiliate to sales report.

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

Rev 3220 – Trac#488 Displaying appropriate row lying on on next pages for ...

mandeep.dhir — Tue, 06 Sep 2011 17:44:00 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Displaying appropriate row lying on on next pages for orders

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

Rev 3219 – Trac#488 Displaying appropriate row lying on on next pages

mandeep.dhir — Tue, 06 Sep 2011 16:12:27 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Displaying appropriate row lying on on next pages

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

Rev 3218 – Added caching in logistics service.

rajveer — Tue, 06 Sep 2011 15:28:43 +0530

rajveer – 3 file(s) modified
Added caching in logistics service.

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

Rev 3217 – Added caching in logistics service.

rajveer — Tue, 06 Sep 2011 14:45:20 +0530

rajveer – 2 file(s) modified
Added caching in logistics service.

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

Rev 3216 – Removed canceled orders from the count of valid orders

chandranshu — Tue, 06 Sep 2011 14:11:12 +0530

chandranshu – 1 file(s) modified
Removed canceled orders from the count of valid orders

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

Rev 3215 – Missed updating this class for new event Procced to Pay.

vikas — Tue, 06 Sep 2011 13:33:46 +0530

vikas – 1 file(s) modified
Missed updating this class for new event Procced to Pay.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/Event.java

Rev 3214 – Removed printStackTrace

chandranshu — Tue, 06 Sep 2011 12:54:52 +0530

chandranshu – 1 file(s) modified
Removed printStackTrace

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

Rev 3213 – Removed printStackTrace

chandranshu — Tue, 06 Sep 2011 12:39:43 +0530

chandranshu – 8 file(s) modified
Removed printStackTrace

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PaymentDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/RegisteredUsersGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/ReportsUtils.java

Rev 3212 – Add itemIds to Order creation event.

vikas — Tue, 06 Sep 2011 12:31:55 +0530

vikas – 1 file(s) modified
Add itemIds to Order creation event.

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

Rev 3211 – Add option for Procced to pay event.

vikas — Tue, 06 Sep 2011 12:31:10 +0530

vikas – 1 file(s) modified
Add option for Procced to pay event.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp

Rev 3210 – Add itemIds to Order creation event. Fix bug in loop ...

vikas — Tue, 06 Sep 2011 12:30:07 +0530

vikas – 6 file(s) modified
Add itemIds to Order creation event. Fix bug in loop condition in shipping, payment, session and proceed_to_pay events.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/OrderCreation.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentFailure.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentSuccess.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProceedToPay.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ShippingAccess.java

Rev 3209 – Add itemIds in shipping, order creation, and payment events. Add ...

vikas — Tue, 06 Sep 2011 11:53:10 +0530

vikas – 7 file(s) modified
Add itemIds in shipping, order creation, and payment events. Add new event ProccedtoPay.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 3208 – Add itemIds in shipping, order creation, and payment events. Add ...

vikas — Tue, 06 Sep 2011 11:52:23 +0530

vikas – 7 file(s) modified
Add itemIds in shipping, order creation, and payment events. Add new event ProccedtoPay.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/NewSession.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/OrderCreation.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentFailure.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/PaymentSuccess.java
+ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProceedToPay.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ShippingAccess.java
~ /trunk/Common/src/main/java/in/shop2020/datalogger/EventType.java

Rev 3207 – Trac#488 Ordering tickets by Date Opened

mandeep.dhir — Tue, 06 Sep 2011 11:02:07 +0530

mandeep.dhir – 1 file(s) modified
Trac#488 Ordering tickets by Date Opened

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

Rev 3206 – Trac#488 Added support to mail a customer from CRM as ...

mandeep.dhir — Tue, 06 Sep 2011 10:53:03 +0530

mandeep.dhir – 38 file(s) modified
Trac#488 Added support to mail a customer from CRM as part of an activity done on a ticket

~ /trunk/Crm/pom.xml
+ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java (copied from /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java@3177)
x /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMRealm.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/java/in/shop2020/util
+ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/resources/shiro.ini
+ /trunk/Crm/src/main/webapp/css/colorbox.css
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/images
+ /trunk/Crm/src/main/webapp/css/images/border.png
+ /trunk/Crm/src/main/webapp/css/images/controls.png
+ /trunk/Crm/src/main/webapp/css/images/loading.gif
+ /trunk/Crm/src/main/webapp/css/images/loading_background.png
~ /trunk/Crm/src/main/webapp/images/ajax-loader.gif
~ /trunk/Crm/src/main/webapp/js/common.js
+ /trunk/Crm/src/main/webapp/js/dataTables.fnDisplayRow.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/jquery.colorbox-min.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-edit.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/log4j.properties
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 3205 – Removed unnecessary query about alerts

chandranshu — Mon, 05 Sep 2011 18:57:59 +0530

chandranshu – 1 file(s) modified
Removed unnecessary query about alerts

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

Rev 3204 – Updated both failover parameters for services.

rajveer — Mon, 05 Sep 2011 18:32:23 +0530

rajveer – 1 file(s) modified
Updated both failover parameters for services.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 3203 – Fix the bug. we should set cookie if it was ...

vikas — Mon, 05 Sep 2011 17:53:32 +0530

vikas – 1 file(s) modified
Fix the bug. we should set cookie if it was null.

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

Rev 3202 – Added failover configuration for Prod1 and Prod2 servers.

rajveer — Mon, 05 Sep 2011 17:36:00 +0530

rajveer – 1 file(s) modified
Added failover configuration for Prod1 and Prod2 servers.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 3201 – Corrected small bug.

rajveer — Mon, 05 Sep 2011 17:26:22 +0530

rajveer – 1 file(s) modified
Corrected small bug.

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

Rev 3200 – Corrected import statements

rajveer — Mon, 05 Sep 2011 17:21:04 +0530

rajveer – 2 file(s) modified
Corrected import statements

~ /trunk/PyProj/src/shop2020/config/script/ConfigPropertiesReloader.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ProductNotifier.py

Rev 3199 – Check for NPE.

vikas — Mon, 05 Sep 2011 17:16:28 +0530

vikas – 1 file(s) modified
Check for NPE.

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 3198 – Add table userwidgetitem in test database.

vikas — Mon, 05 Sep 2011 16:48:30 +0530

vikas – 1 file(s) modified
Add table userwidgetitem in test database.

~ /trunk/Website/src/test/resources/db/user.sql

Rev 3197 – Fix a typp.

vikas — Mon, 05 Sep 2011 16:27:50 +0530

vikas – 1 file(s) modified
Fix a typp.

~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp

Rev 3196 – Started showing cancelled orders in the dashboard

chandranshu — Mon, 05 Sep 2011 15:57:26 +0530

chandranshu – 1 file(s) modified
Started showing cancelled orders in the dashboard

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

Rev 3195 – Minor correction

chandranshu — Mon, 05 Sep 2011 15:53:01 +0530

chandranshu – 1 file(s) modified
Minor correction

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

Rev 3194 – Added reloading script to reload config server parameters from shop2020.cfg ...

rajveer — Mon, 05 Sep 2011 15:50:51 +0530

rajveer – 3 file(s) modified
Added reloading script to reload config server parameters from shop2020.cfg file.

+ /trunk/PyProj/src/shop2020/config/script
+ /trunk/PyProj/src/shop2020/config/script/ConfigPropertiesReloader.py
+ /trunk/PyProj/src/shop2020/config/script/__init__.py

Rev 3193 – Add shortdate to events.

vikas — Mon, 05 Sep 2011 15:50:20 +0530

vikas – 4 file(s) modified
Add shortdate to events.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/AddDataLogServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/search-events.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/session-activity.jsp
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/user-activity.jsp

Rev 3192 – Removed the caching till further action.

rajveer — Mon, 05 Sep 2011 15:39:39 +0530

rajveer – 1 file(s) modified
Removed the caching till further action.

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