SmartDukaan – /

Rev 3269 – Trac#488 Making customer "not mandatory to be a registered user" ...

mandeep.dhir — Mon, 12 Sep 2011 15:21:00 +0530

mandeep.dhir – 22 file(s) modified
Trac#488 Making customer "not mandatory to be a registered user" for ticket and activity creation

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrdersController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.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-tickets-edit.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-tickets-editNew.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Activity.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/domain/Ticket.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/ActivityMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml
~ /trunk/CRMService/src/test/java/in/shop2020/crm/handler/TicketHandlerTest.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Activity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/ActivityType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/Ticket.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 3268 – Removed some warnings from the Ehcache usages

chandranshu — Mon, 12 Sep 2011 14:17:57 +0530

chandranshu – 5 file(s) modified
Removed some warnings from the Ehcache usages

~ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java

Rev 3267 – Use gateway id to get paymethod, if paymethod is not ...

vikas — Mon, 12 Sep 2011 14:14:55 +0530

vikas – 1 file(s) modified
Use gateway id to get paymethod, if paymethod is not set.

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

Rev 3266 – Started showing tablets in latest arrivals on home page and ...

chandranshu — Mon, 12 Sep 2011 14:11:09 +0530

chandranshu – 2 file(s) modified
Started showing tablets in latest arrivals on home page and only tablets and smart phones on the latest arrivals page

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

Rev 3265 – Use latest payment in case of multiple payments for same ...

vikas — Mon, 12 Sep 2011 13:33:35 +0530

vikas – 1 file(s) modified
Use latest payment in case of multiple payments for same transaction.

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

Rev 3264 – Started logging recaptcha response for easy tracking

chandranshu — Mon, 12 Sep 2011 11:46:21 +0530

chandranshu – 1 file(s) modified
Started logging recaptcha response for easy tracking

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

Rev 3263 – Removed unnecessary code.

rajveer — Sat, 10 Sep 2011 18:19:38 +0530

rajveer – 1 file(s) modified
Removed unnecessary code.

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

Rev 3262 – Exclude specific custom queries from formatting.

rajveer — Sat, 10 Sep 2011 18:09:13 +0530

rajveer – 1 file(s) modified
Exclude specific custom queries from formatting.

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

Rev 3261 – Corrected query for brand filter in case of default and ...

rajveer — Sat, 10 Sep 2011 16:48:45 +0530

rajveer – 1 file(s) modified
Corrected query for brand filter in case of default and condition in solr.

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

Rev 3260 – Added INIT to the list of acceptable order states

chandranshu — Fri, 09 Sep 2011 15:54:29 +0530

chandranshu – 1 file(s) modified
Added INIT to the list of acceptable order states

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

Rev 3259 – Samsung Galaxy Tab URL modified

varun.gupta — Fri, 09 Sep 2011 14:40:14 +0530

varun.gupta – 1 file(s) modified
Samsung Galaxy Tab URL modified

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

Rev 3258 – Removed config client dependency from config.properties file.

rajveer — Fri, 09 Sep 2011 13:44:27 +0530

rajveer – 2 file(s) modified
Removed config client dependency from config.properties file.

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/config/ConfigClient.java
~ /trunk/PyProj/src/shop2020/config/client/ConfigClient.py

Rev 3257 –

varun.gupta — Fri, 09 Sep 2011 13:18:34 +0530

varun.gupta – 1 file(s) modified

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

Rev 3256 – Miultiple if blocks clubbed together in if-elif-else blocks

varun.gupta — Fri, 09 Sep 2011 13:16:33 +0530

varun.gupta – 1 file(s) modified
Miultiple if blocks clubbed together in if-elif-else blocks

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

Rev 3255 – Added style to notification box

rajveer — Fri, 09 Sep 2011 13:14:39 +0530

rajveer – 2 file(s) modified
Added style to notification box

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

Rev 3254 –

varun.gupta — Fri, 09 Sep 2011 13:09:55 +0530

varun.gupta – 1 file(s) modified

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

Rev 3253 – Added a wait message both before redirecting to the payment ...

chandranshu — Fri, 09 Sep 2011 13:07:46 +0530

chandranshu – 2 file(s) modified
Added a wait message both before redirecting to the payment gateway and also after being redirected back from the PG

~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-processing-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-success.vm

Rev 3252 – Removed hard-coding of config file path

chandranshu — Fri, 09 Sep 2011 13:05:05 +0530

chandranshu – 1 file(s) modified
Removed hard-coding of config file path

~ /trunk/PyProj/src/shop2020/config/ConfigServer.py

Rev 3251 – Comparison changed to int compare from tupple lookup

varun.gupta — Fri, 09 Sep 2011 12:56:52 +0530

varun.gupta – 1 file(s) modified
Comparison changed to int compare from tupple lookup

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

Rev 3250 – Corrected the payment URLs used on the local machine

chandranshu — Fri, 09 Sep 2011 12:40:44 +0530

chandranshu – 1 file(s) modified
Corrected the payment URLs used on the local machine

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

Rev 3249 – Promotion Rule for HDFC campaign

varun.gupta — Fri, 09 Sep 2011 12:39:17 +0530

varun.gupta – 1 file(s) modified
Promotion Rule for HDFC campaign

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

Rev 3248 – Reporter for items deliverable on the next day

chandranshu — Fri, 09 Sep 2011 12:03:03 +0530

chandranshu – 1 file(s) modified
Reporter for items deliverable on the next day

+ /trunk/runutils/NextDayDeliverableItemsReporter.sh

Rev 3247 – Added zero before customer care number.

rajveer — Fri, 09 Sep 2011 11:48:36 +0530

rajveer – 2 file(s) modified
Added zero before customer care number.

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

Rev 3246 – Set default query as AND in solr configuration itself.

rajveer — Thu, 08 Sep 2011 19:17:49 +0530

rajveer – 1 file(s) modified
Set default query as AND in solr configuration itself.

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

Rev 3245 – Added the check to not to make product live if ...

rajveer — Thu, 08 Sep 2011 18:43:13 +0530

rajveer – 1 file(s) modified
Added the check to not to make product live if selling price is null.

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

Rev 3244 – Resolved the import of NoResultFound and MultipleResultFound

chandranshu — Thu, 08 Sep 2011 18:08:32 +0530

chandranshu – 1 file(s) modified
Resolved the import of NoResultFound and MultipleResultFound

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

Rev 3243 – Added an option to process COD transactions

chandranshu — Thu, 08 Sep 2011 18:06:37 +0530

chandranshu – 1 file(s) modified
Added an option to process COD transactions

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

Rev 3242 – Enable caching for category snippets

vikas — Thu, 08 Sep 2011 18:03:40 +0530

vikas – 12 file(s) modified
Enable caching for category snippets

+ /trunk/Website/src/main/java/in/shop2020/serving/cache
+ /trunk/Website/src/main/java/in/shop2020/serving/cache/CategorySnippetCacheWrapper.java
+ /trunk/Website/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java (copied from /trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java@3236)
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
x /trunk/Website/src/main/java/in/shop2020/serving/utils/EhcacheWrapper.java
~ /trunk/Website/src/main/resources/ehcache.xml

Rev 3241 – Updated to clean the old configuration complete from memory.

rajveer — Thu, 08 Sep 2011 17:01:22 +0530

rajveer – 1 file(s) modified
Updated to clean the old configuration complete from memory.

~ /trunk/PyProj/src/shop2020/config/impl/ConfigServerHandler.py

Rev 3240 – Added ports in configuration fail over.

rajveer — Thu, 08 Sep 2011 16:19:51 +0530

rajveer – 1 file(s) modified
Added ports in configuration fail over.

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

Rev 3239 – Added the third missing argument of logistics info

chandranshu — Thu, 08 Sep 2011 15:54:41 +0530

chandranshu – 1 file(s) modified
Added the third missing argument of logistics info

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

Rev 3238 – Add shipping access, proceed to pay, pay success, pay failure ...

vikas — Thu, 08 Sep 2011 15:51:59 +0530

vikas – 3 file(s) modified
Add shipping access, proceed to pay, pay success, pay failure etc. in product performance report.

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/model/ItemActivity.java
~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyAggregatorServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/jsp/product-activity.jsp

Rev 3237 – FIxed a parsing bug.

vikas — Thu, 08 Sep 2011 15:47:56 +0530

vikas – 1 file(s) modified
FIxed a parsing bug.

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

Rev 3236 – Added script to start price comparison server

rajveer — Thu, 08 Sep 2011 13:49:14 +0530

rajveer – 1 file(s) modified
Added script to start price comparison server

+ /trunk/runutils/start-price-comparison-server.sh

Rev 3235 – Removed hardcoding.

rajveer — Thu, 08 Sep 2011 13:06:20 +0530

rajveer – 1 file(s) modified
Removed hardcoding.

~ /trunk/PriceComparisonFramework/src/WebUI/Server.py

Rev 3234 – Trac#488 Added support to export data tables in various formats

mandeep.dhir — Thu, 08 Sep 2011 13:05:23 +0530

mandeep.dhir – 39 file(s) modified
Trac#488 Added support to export data tables in various formats

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserTicketsController.java
+ /trunk/Crm/src/main/webapp/as3
+ /trunk/Crm/src/main/webapp/as3/lib
+ /trunk/Crm/src/main/webapp/as3/lib/AlivePDF.swc
+ /trunk/Crm/src/main/webapp/as3/ZeroClipboard.as
+ /trunk/Crm/src/main/webapp/as3/ZeroClipboardPdf.as
~ /trunk/Crm/src/main/webapp/css/common.css
+ /trunk/Crm/src/main/webapp/css/TableTools.css
+ /trunk/Crm/src/main/webapp/css/TableTools_JUI.css
+ /trunk/Crm/src/main/webapp/images/background.png
+ /trunk/Crm/src/main/webapp/images/collection.png
+ /trunk/Crm/src/main/webapp/images/collection_hover.png
+ /trunk/Crm/src/main/webapp/images/copy.png
+ /trunk/Crm/src/main/webapp/images/copy document.psd
+ /trunk/Crm/src/main/webapp/images/copy_hover.png
+ /trunk/Crm/src/main/webapp/images/csv.png
+ /trunk/Crm/src/main/webapp/images/csv_hover.png
+ /trunk/Crm/src/main/webapp/images/file_types.psd
+ /trunk/Crm/src/main/webapp/images/pdf.png
+ /trunk/Crm/src/main/webapp/images/pdf_hover.png
+ /trunk/Crm/src/main/webapp/images/print.png
+ /trunk/Crm/src/main/webapp/images/printer.psd
+ /trunk/Crm/src/main/webapp/images/print_hover.png
+ /trunk/Crm/src/main/webapp/images/psd
+ /trunk/Crm/src/main/webapp/images/psd/collection.psd
+ /trunk/Crm/src/main/webapp/images/psd/copy document.psd
+ /trunk/Crm/src/main/webapp/images/psd/file_types.psd
+ /trunk/Crm/src/main/webapp/images/psd/printer.psd
+ /trunk/Crm/src/main/webapp/images/xls.png
+ /trunk/Crm/src/main/webapp/images/xls_hover.png
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
+ /trunk/Crm/src/main/webapp/js/TableTools.min.js
+ /trunk/Crm/src/main/webapp/swf
+ /trunk/Crm/src/main/webapp/swf/copy_cvs_xls.swf
+ /trunk/Crm/src/main/webapp/swf/copy_cvs_xls_pdf.swf
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/input.vm

Rev 3233 – Added project setting

varun.gupta — Thu, 08 Sep 2011 12:57:21 +0530

varun.gupta – 3 file(s) modified
Added project setting

+ /trunk/PriceComparisonFramework/.project
+ /trunk/PriceComparisonFramework/.pydevproject
+ /trunk/PriceComparisonFramework/.settings/org.eclipse.ltk.core.refactoring.prefs

Rev 3232 – PriceComparisonFramework first version.

varun.gupta — Thu, 08 Sep 2011 12:54:27 +0530

varun.gupta – 52 file(s) modified
PriceComparisonFramework first version.

+ /trunk/PriceComparisonFramework/.settings
+ /trunk/PriceComparisonFramework/src
+ /trunk/PriceComparisonFramework/src/Clients
+ /trunk/PriceComparisonFramework/src/Clients/GAEServletClient.py
+ /trunk/PriceComparisonFramework/src/Clients/__init__.py
+ /trunk/PriceComparisonFramework/src/PyLucene
+ /trunk/PriceComparisonFramework/src/PyLucene/IndexBuilder.py
+ /trunk/PriceComparisonFramework/src/PyLucene/PhonePriceDoc.py
+ /trunk/PriceComparisonFramework/src/PyLucene/Retriever.py
+ /trunk/PriceComparisonFramework/src/PyLucene/__init__.py
+ /trunk/PriceComparisonFramework/src/ScraperAgent.py
+ /trunk/PriceComparisonFramework/src/ScraperLoader.py
+ /trunk/PriceComparisonFramework/src/Scrapers
+ /trunk/PriceComparisonFramework/src/Scrapers/FlipcartScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/InfibeamScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/LetsBuyScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/SaholicScraper.py
+ /trunk/PriceComparisonFramework/src/Scrapers/__init__.py
+ /trunk/PriceComparisonFramework/src/Utils.py
+ /trunk/PriceComparisonFramework/src/WebUI
+ /trunk/PriceComparisonFramework/src/WebUI/app.cfg
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/FetchResults.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/LoginForm.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/PriceChart.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/SearchForm.html
+ /trunk/PriceComparisonFramework/src/WebUI/HTMLTemplates/SearchResults.html
+ /trunk/PriceComparisonFramework/src/WebUI/Server.py
+ /trunk/PriceComparisonFramework/src/WebUI/static
+ /trunk/PriceComparisonFramework/src/WebUI/static/chart.js
+ /trunk/PriceComparisonFramework/src/WebUI/static/facebox.css
+ /trunk/PriceComparisonFramework/src/WebUI/static/facebox.js
+ /trunk/PriceComparisonFramework/src/WebUI/static/images
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/best.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/border.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/closelabel.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/controls.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderBottomCenter.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderBottomLeft.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderBottomRight.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderMiddleLeft.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderMiddleRight.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderTopCenter.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderTopLeft.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/ie6/borderTopRight.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/loading.gif
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/loading_background.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/images/overlay.png
+ /trunk/PriceComparisonFramework/src/WebUI/static/jquery-1.6.2.min.js
+ /trunk/PriceComparisonFramework/src/WebUI/test.py
+ /trunk/PriceComparisonFramework/src/WebUI/__init__.py

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