SmartDukaan – /

Rev 2149 – Asynchronous data logging.

vikas — Fri, 10 Jun 2011 18:42:46 +0530

vikas – 3 file(s) modified
Asynchronous data logging.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/DataLogger.java
~ /trunk/Website/src/main/resources/log4j.properties

Rev 2148 – Removed some unused variables. Used some others.

chandranshu — Fri, 10 Jun 2011 18:26:48 +0530

chandranshu – 5 file(s) modified
Removed some unused variables. Used some others.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ExceptionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/StaticController.java

Rev 2147 – Removed unused variables

chandranshu — Fri, 10 Jun 2011 18:21:58 +0530

chandranshu – 2 file(s) modified
Removed unused variables

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

Rev 2146 – Removed unused imports and some unused variables

chandranshu — Fri, 10 Jun 2011 18:09:25 +0530

chandranshu – 6 file(s) modified
Removed unused imports and some unused variables

~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/LoginInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/pages/DummyPageFetcher.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/DesEncrypter.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/FileUtils.java

Rev 2145 – Removed unused imports and some unused variables

chandranshu — Fri, 10 Jun 2011 18:08:04 +0530

chandranshu – 11 file(s) modified
Removed unused imports and some unused variables

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AflUpdatesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PersonalDetailsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/TestController.java

Rev 2144 – Added three new display type

rajveer — Fri, 10 Jun 2011 18:03:50 +0530

rajveer – 1 file(s) modified
Added three new display type

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

Rev 2143 –

vrinda — Fri, 10 Jun 2011 17:52:57 +0530

vrinda – 25 file(s) modified

+ /content/Helpdocs/AAC plus.html
+ /content/Helpdocs/AAX.html
+ /content/Helpdocs/AIFF.html
+ /content/Helpdocs/AMR.html
+ /content/Helpdocs/ASF.html
+ /content/Helpdocs/AVC.html
+ /content/Helpdocs/AVI.html
+ /content/Helpdocs/eAAC plus.html
+ /content/Helpdocs/HE-AAC.html
+ /content/Helpdocs/IMAP.html
+ /content/Helpdocs/M4A.html
+ /content/Helpdocs/M4V.html
+ /content/Helpdocs/MIDI.html
+ /content/Helpdocs/MXMF.html
+ /content/Helpdocs/OGG.html
+ /content/Helpdocs/Optical Trackpad.html
+ /content/Helpdocs/PNG.html
+ /content/Helpdocs/QCP.html
+ /content/Helpdocs/RA.html
+ /content/Helpdocs/RSS.html
+ /content/Helpdocs/TIG.html
+ /content/Helpdocs/Touchscreen T9 keyboard.html
+ /content/Helpdocs/WAP 2.0.html
+ /content/Helpdocs/WBMP.html
+ /content/Helpdocs/XCSS.html

Rev 2142 –

vrinda — Fri, 10 Jun 2011 17:51:19 +0530

vrinda – 1 file(s) modified

+ /content/Helpdocs/AAX plus.html

Rev 2141 – Removed unused imports

chandranshu — Fri, 10 Jun 2011 17:51:18 +0530

chandranshu – 4 file(s) modified
Removed unused imports

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 2140 –

vrinda — Fri, 10 Jun 2011 17:50:10 +0530

vrinda – 1 file(s) modified

+ /content/Helpdocs/3G2.html

Rev 2139 – Corrected the calculation of cart's total price

chandranshu — Fri, 10 Jun 2011 17:39:45 +0530

chandranshu – 1 file(s) modified
Corrected the calculation of cart's total price

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 2138 – Fixed weight = -1 bug. Added event for selection of ...

ankur.singhal — Fri, 10 Jun 2011 17:31:06 +0530

ankur.singhal – 2 file(s) modified
Fixed weight = -1 bug. Added event for selection of handsets category to populate product group.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java

Rev 2137 – Started showing prices to two decimal places. Started reading the ...

chandranshu — Fri, 10 Jun 2011 17:30:58 +0530

chandranshu – 4 file(s) modified
Started showing prices to two decimal places. Started reading the amount from DB before sending to PG. Started reading total price from the cart.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java

Rev 2136 – Add titles to brand page links.

vikas — Fri, 10 Jun 2011 15:43:33 +0530

vikas – 1 file(s) modified
Add titles to brand page links.

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

Rev 2135 – Run queries once in two days alternatively.

vikas — Fri, 10 Jun 2011 15:14:42 +0530

vikas – 1 file(s) modified
Run queries once in two days alternatively.

~ /trunk/runutils/rankdumper.py

Rev 2134 – Allow a difference of upto 50 paise in the returned ...

chandranshu — Fri, 10 Jun 2011 13:36:14 +0530

chandranshu – 2 file(s) modified
Allow a difference of upto 50 paise in the returned amount from Hdfc and EBS payment gateways

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

Rev 2133 – Added a script to make a transaction successful

chandranshu — Fri, 10 Jun 2011 13:10:56 +0530

chandranshu – 1 file(s) modified
Added a script to make a transaction successful

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

Rev 2132 – Order ID will now be included in report for orders ...

varun.gupta — Fri, 10 Jun 2011 13:08:59 +0530

varun.gupta – 1 file(s) modified
Order ID will now be included in report for orders with coupon

~ /trunk/runutils/PromotionReporter.sh

Rev 2131 – Coupon disabled for Samsung Galaxy S II

varun.gupta — Fri, 10 Jun 2011 13:03:30 +0530

varun.gupta – 1 file(s) modified
Coupon disabled for Samsung Galaxy S II

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

Rev 2130 – Modified partners xml to add image url. Also changed name ...

rajveer — Fri, 10 Jun 2011 11:01:12 +0530

rajveer – 1 file(s) modified
Modified partners xml to add image url. Also changed name of xml file from phonecurry.xml to saholicmobilephones.xml

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

Rev 2129 – modified functions in accordance with catalog dashboard.

ankur.singhal — Thu, 09 Jun 2011 20:24:04 +0530

ankur.singhal – 1 file(s) modified
modified functions in accordance with catalog dashboard.

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

Rev 2128 – made some Item struct attributes optional.

ankur.singhal — Thu, 09 Jun 2011 20:21:20 +0530

ankur.singhal – 2 file(s) modified
made some Item struct attributes optional.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2127 – made some Item struct attributes optional.

ankur.singhal — Thu, 09 Jun 2011 20:10:54 +0530

ankur.singhal – 1 file(s) modified
made some Item struct attributes optional.

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2126 – Added action buttons to change the status of an item. ...

ankur.singhal — Thu, 09 Jun 2011 20:09:16 +0530

ankur.singhal – 16 file(s) modified
Added action buttons to change the status of an item. Refactored some code.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemList.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/VendorMappingDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/ItemsComparator.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
+ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ajax-loader.gif
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemActions.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/Shortcuts.ui.xml

Rev 2125 – Added Google Plusone button

varun.gupta — Thu, 09 Jun 2011 14:21:59 +0530

varun.gupta – 3 file(s) modified
Added Google Plusone button

~ /trunk/Website/src/main/resources/templates/socialutils.vm
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2124 – New script, PromotionReporter.sh coded to serve same purpose

varun.gupta — Thu, 09 Jun 2011 12:18:29 +0530

varun.gupta – 1 file(s) modified
New script, PromotionReporter.sh coded to serve same purpose

x /trunk/runutils/promotion_reporter.sh

Rev 2123 – File can now take arguments from shell

varun.gupta — Thu, 09 Jun 2011 11:31:23 +0530

varun.gupta – 1 file(s) modified
File can now take arguments from shell

~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py

Rev 2122 – SQL JOIN added to get user's email

varun.gupta — Thu, 09 Jun 2011 11:25:46 +0530

varun.gupta – 1 file(s) modified
SQL JOIN added to get user's email

+ /trunk/runutils/PromotionReporter.sh

Rev 2121 – Rule execution made dynamic

varun.gupta — Wed, 08 Jun 2011 19:13:22 +0530

varun.gupta – 6 file(s) modified
Rule execution made dynamic

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
+ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionRuleDataUtilities.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_for_5perc_discount_on_5k_purchase.py
+ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/__init__.py

Rev 2120 – Refactored validate_prices method in DataAcessors. Bug fix in Convertors.

ankur.singhal — Wed, 08 Jun 2011 16:14:25 +0530

ankur.singhal – 3 file(s) modified
Refactored validate_prices method in DataAcessors. Bug fix in Convertors.

Rev 2119 – Enhancements in catalog dashboard. Validations, bug fixing, refactoring.

ankur.singhal — Wed, 08 Jun 2011 16:11:30 +0530

ankur.singhal – 21 file(s) modified
Enhancements in catalog dashboard. Validations, bug fixing, refactoring.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogDashboard.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/CatalogTree.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemActions.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemList.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/VendorMappingDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/VendorPricesDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java
x /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VendorDetails.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VendorItemMapping.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VendorPricings.java (copied from /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VendorDetails.java@2105)
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/CatalogDashboard.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/VendorMappingDialog.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/VendorPricesDialog.ui.xml

Rev 2118 – Incorporated code review comments from Rajveer

chandranshu — Wed, 08 Jun 2011 15:33:03 +0530

chandranshu – 5 file(s) modified
Incorporated code review comments from Rajveer

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm

Rev 2117 – Send pageview to GA on proceed to pay button click.

vikas — Wed, 08 Jun 2011 11:48:39 +0530

vikas – 1 file(s) modified
Send pageview to GA on proceed to pay button click.

~ /trunk/Website/src/main/webapp/js/paymode-selection.js

Rev 2116 – added methods in DataAcessors to be used in CatalogDashboard. Added ...

ankur.singhal — Wed, 08 Jun 2011 11:27:00 +0530

ankur.singhal – 6 file(s) modified
added methods in DataAcessors to be used in CatalogDashboard. Added convertor for VendorItemMapping.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py

Rev 2115 – created struct VendorItemMapping in Catalog thrift.

ankur.singhal — Wed, 08 Jun 2011 11:25:04 +0530

ankur.singhal – 1 file(s) modified
created struct VendorItemMapping in Catalog thrift.

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java

Rev 2114 – added methods to get VendorItemMapping for an item. Created a ...

ankur.singhal — Wed, 08 Jun 2011 11:24:11 +0530

ankur.singhal – 2 file(s) modified
added methods to get VendorItemMapping for an item. Created a struct VendorItemMapping. Also added hotspotCategory to Item struct.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java

Rev 2113 – added methods to get VendorItemMapping for an item. Also created ...

ankur.singhal — Wed, 08 Jun 2011 11:23:20 +0530

ankur.singhal – 1 file(s) modified
added methods to get VendorItemMapping for an item. Also created a struct VendorItemMapping

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 2112 –

vrinda — Wed, 08 Jun 2011 10:06:22 +0530

vrinda – 6 file(s) modified

+ /content/Helpdocs/Super AMOLED.html
x /content/Helpdocs/SuperAMOLED.html
+ /content/Helpdocs/Trackpad.html
x /content/Helpdocs/Trackpad Navigation.html
x /content/Helpdocs/Tri-Band.html
+ /content/Helpdocs/Triband.html

Rev 2111 –

varun.gupta — Tue, 07 Jun 2011 19:50:59 +0530

varun.gupta – 1 file(s) modified

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

Rev 2110 – Page tracking for register page.

vikas — Tue, 07 Jun 2011 19:15:00 +0530

vikas – 2 file(s) modified
Page tracking for register page.

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