SmartDukaan – /

Rev 7287 – Added store.

amit.gupta — Wed, 15 May 2013 14:59:20 +0530

amit.gupta – 1 file(s) modified
Added store.

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

Rev 7286 – Expert Review Code.

amit.gupta — Wed, 15 May 2013 14:58:16 +0530

amit.gupta – 145 file(s) modified
Expert Review Code.

+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewController.java
+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ExpertReviewSourceController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/LoginController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SlidesController.java
+ /trunk/ContentCreation/src/main/webapp/js/tinymce
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/license.txt
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/advlist
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/advlist/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/anchor
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/anchor/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autolink
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autolink/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autoresize
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autoresize/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autosave
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/autosave/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/bbcode
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/bbcode/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/charmap
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/charmap/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/code
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/code/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/editable_selects.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/form_utils.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/mctabs.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/tiny_mce_popup.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/compat3x/validate.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/contextmenu
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/contextmenu/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/directionality
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/directionality/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-cool.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-cry.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-frown.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-smile.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-wink.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-yell.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/emoticons/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example_dependency
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/example_dependency/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullpage
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullpage/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullscreen
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/fullscreen/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/hr
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/hr/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/image
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/image/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/insertdatetime
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/insertdatetime/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/layer
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/layer/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/legacyoutput
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/legacyoutput/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/link
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/link/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/lists
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/lists/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/media
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/media/moxieplayer.swf
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/media/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/nonbreaking
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/nonbreaking/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/noneditable
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/noneditable/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/pagebreak
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/pagebreak/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/paste
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/paste/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/preview
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/preview/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/print
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/print/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/save
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/save/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/searchreplace
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/searchreplace/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/spellchecker
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/spellchecker/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/tabfocus
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/tabfocus/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/table
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/table/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/template
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/template/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/textcolor
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/textcolor/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks/css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks/css/visualblocks.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualblocks/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualchars
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/visualchars/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/wordcount
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/plugins/wordcount/plugin.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/content.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.eot
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.svg
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.ttf
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/fonts/icomoon.woff
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/anchor.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/loader.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/object.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/trans.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/img/wline.gif
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/skin.classic.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/skin.ie7.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/skins/lightgray/skin.min.css
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/themes
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/themes/modern
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/themes/modern/theme.min.js
+ /trunk/ContentCreation/src/main/webapp/js/tinymce/tinymce.min.js
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-edit-new.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-show.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/expert-review-source-index.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/tag-page-edit.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/Action.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/Role.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/RoleManager.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/UserManager.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReview.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReviewSource.java
+ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/core/ExpertReviewStatus.java
~ /trunk/ContentStore/src/main/java/in/shop2020/metamodel/util/CreationUtils.java

Rev 7285 – Added support to add balance in wallet for spice

rajveer — Tue, 14 May 2013 19:04:39 +0530

rajveer – 11 file(s) modified
Added support to add balance in wallet for spice

~ /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/ProcessRechargeTransaction.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/RechargeTopupController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/StoreAdminController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-topup-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/store-admin-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7284 – Added horizontal rule.

kshitij.sood — Tue, 14 May 2013 18:56:44 +0530

kshitij.sood – 1 file(s) modified
Added horizontal rule.

~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm

Rev 7283 – Amazon dashboard.

kshitij.sood — Tue, 14 May 2013 18:20:26 +0530

kshitij.sood – 22 file(s) modified
Amazon dashboard.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
+ /trunk/Support/src/main/webapp/css/demo_page_amazon.css
+ /trunk/Support/src/main/webapp/css/demo_table_amazon.css
+ /trunk/Support/src/main/webapp/css/jquery.alerts.css
+ /trunk/Support/src/main/webapp/css/style.css
+ /trunk/Support/src/main/webapp/images/back_disabled.png
+ /trunk/Support/src/main/webapp/images/back_enabled.png
+ /trunk/Support/src/main/webapp/images/back_enabled_hover.png
+ /trunk/Support/src/main/webapp/images/bottom-line.png
+ /trunk/Support/src/main/webapp/images/center-bcg.png
+ /trunk/Support/src/main/webapp/images/center-blue.png
+ /trunk/Support/src/main/webapp/images/forward_disabled.png
+ /trunk/Support/src/main/webapp/images/forward_enabled.png
+ /trunk/Support/src/main/webapp/images/forward_enabled_hover.png
+ /trunk/Support/src/main/webapp/images/head-bcg.jpg
+ /trunk/Support/src/main/webapp/images/spinner.gif
+ /trunk/Support/src/main/webapp/images/top-light-blue.png
+ /trunk/Support/src/main/webapp/js/jquery.alerts.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/amaon-list-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm

Rev 7282 – Added refund time in downloadable report Handled null description

anupam.singh — Tue, 14 May 2013 18:18:42 +0530

anupam.singh – 2 file(s) modified
Added refund time in downloadable report
Handled null description

~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ReportController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm

Rev 7281 – Changes in Pyproj and thrift for amazon.

kshitij.sood — Tue, 14 May 2013 18:17:31 +0530

kshitij.sood – 18 file(s) modified
Changes in Pyproj and thrift for amazon.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AmazonInventorySnapshot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 7280 – Added content generation for store website.

amit.gupta — Tue, 14 May 2013 15:58:18 +0530

amit.gupta – 1 file(s) modified
Added content generation for store website.

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

Rev 7279 – Added content generation for store website.

amit.gupta — Tue, 14 May 2013 15:47:28 +0530

amit.gupta – 2 file(s) modified
Added content generation for store website.

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

Rev 7278 – Added amit tyagi in the MIS mailing list.

rajveer — Tue, 14 May 2013 15:36:01 +0530

rajveer – 1 file(s) modified
Added amit tyagi in the MIS mailing list.

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

Rev 7277 – Added amit tyagi in the MIS mailing list.

rajveer — Tue, 14 May 2013 14:55:57 +0530

rajveer – 1 file(s) modified
Added amit tyagi in the MIS mailing list.

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

Rev 7276 – Update wallet with correct amount.

rajveer — Tue, 14 May 2013 13:50:58 +0530

rajveer – 1 file(s) modified
Update wallet with correct amount.

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

Rev 7275 – Amended method to calculate min advance amount.

rajveer — Tue, 14 May 2013 12:42:23 +0530

rajveer – 2 file(s) modified
Amended method to calculate min advance amount.

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

Rev 7274 – Added store pricing

rajveer — Mon, 13 May 2013 16:17:00 +0530

rajveer – 1 file(s) modified
Added store pricing

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

Rev 7273 – Return date.

rajveer — Mon, 13 May 2013 15:51:36 +0530

rajveer – 1 file(s) modified
Return date.

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

Rev 7272 – storewebsite entity page. added brandInfo table for product brands in ...

amit.gupta — Mon, 13 May 2013 15:24:49 +0530

amit.gupta – 72 file(s) modified
storewebsite entity page.
added brandInfo table for product brands in catalog.

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
+ /StoreWebsite/src/main/resources/ehcache.xml
+ /StoreWebsite/src/main/webapp/css/common.css
+ /StoreWebsite/src/main/webapp/css/entity.css
+ /StoreWebsite/src/main/webapp/css/header-footer.css
+ /StoreWebsite/src/main/webapp/css/product.css
+ /StoreWebsite/src/main/webapp/js/all.js
+ /StoreWebsite/src/main/webapp/js/cart-details.js
+ /StoreWebsite/src/main/webapp/js/cartVariation_AB.js
+ /StoreWebsite/src/main/webapp/js/cart_ABTesting.js
+ /StoreWebsite/src/main/webapp/js/charLimit.js
+ /StoreWebsite/src/main/webapp/js/common.js
+ /StoreWebsite/src/main/webapp/js/comparison.js
+ /StoreWebsite/src/main/webapp/js/contact-us.js
+ /StoreWebsite/src/main/webapp/js/conversionPage.js
+ /StoreWebsite/src/main/webapp/js/custom-jquery.js
+ /StoreWebsite/src/main/webapp/js/entity.js
+ /StoreWebsite/src/main/webapp/js/facebook.js
+ /StoreWebsite/src/main/webapp/js/ga-invoker.js
+ /StoreWebsite/src/main/webapp/js/gallery.js
+ /StoreWebsite/src/main/webapp/js/jquery-ui-1.8.6.custom.min.js
+ /StoreWebsite/src/main/webapp/js/jquery-ui.js
+ /StoreWebsite/src/main/webapp/js/jquery-ui.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.cookie.js
+ /StoreWebsite/src/main/webapp/js/jquery.easing.1.3.js
+ /StoreWebsite/src/main/webapp/js/jquery.imgareaselect.pack.js
+ /StoreWebsite/src/main/webapp/js/jquery.js
+ /StoreWebsite/src/main/webapp/js/jquery.jscrollpane.js
+ /StoreWebsite/src/main/webapp/js/jquery.number_format.js
+ /StoreWebsite/src/main/webapp/js/jquery.qtip-1.0.0-rc3.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.slider.js
+ /StoreWebsite/src/main/webapp/js/jquery.slidy.js
+ /StoreWebsite/src/main/webapp/js/jquery.slidy.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.Storage.js
+ /StoreWebsite/src/main/webapp/js/jquery.tipsy.js
+ /StoreWebsite/src/main/webapp/js/jquery.truncate.min.js
+ /StoreWebsite/src/main/webapp/js/jquery.ui.autocomplete.js
+ /StoreWebsite/src/main/webapp/js/jQueryRotate.js
+ /StoreWebsite/src/main/webapp/js/jsapi.js
+ /StoreWebsite/src/main/webapp/js/loginpop.js
+ /StoreWebsite/src/main/webapp/js/loginregister.js
+ /StoreWebsite/src/main/webapp/js/loopedslider.js
+ /StoreWebsite/src/main/webapp/js/myaccount.js
+ /StoreWebsite/src/main/webapp/js/notification.js
+ /StoreWebsite/src/main/webapp/js/paymode-selection.js
+ /StoreWebsite/src/main/webapp/js/priceSlider.js
+ /StoreWebsite/src/main/webapp/js/proceed-to-pay.js
+ /StoreWebsite/src/main/webapp/js/productCategory.js
+ /StoreWebsite/src/main/webapp/js/recharge.js
+ /StoreWebsite/src/main/webapp/js/remarketing.js
+ /StoreWebsite/src/main/webapp/js/saholicmobilephones.js
+ /StoreWebsite/src/main/webapp/js/scrolltab.js
+ /StoreWebsite/src/main/webapp/js/shippingAddress.js
+ /StoreWebsite/src/main/webapp/js/widgets.js
+ /StoreWebsite/src/main/webapp/js/widget_accordion.js
+ /StoreWebsite/src/main/webapp/js/widget_slidetab.js
+ /StoreWebsite/src/main/webapp/js/youtubeplayer.js
+ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BrandInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7271 – fixed an issue

rajveer — Mon, 13 May 2013 15:16:41 +0530

rajveer – 1 file(s) modified
fixed an issue

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

Rev 7270 – fixed an issue

rajveer — Mon, 13 May 2013 14:52:50 +0530

rajveer – 1 file(s) modified
fixed an issue

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

Rev 7269 – Fixing error to resolve Compilation

amar.kumar — Mon, 13 May 2013 13:14:54 +0530

amar.kumar – 1 file(s) modified
Fixing error to resolve Compilation

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

Rev 7268 – Changes for store website

anupam.singh — Mon, 13 May 2013 12:48:03 +0530

anupam.singh – 5 file(s) modified
Changes for store website

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/service/ContentServingService.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
+ /StoreWebsite/src/main/webapp/WEB-INF/content/estimate-index.vm

Rev 7267 – Service changes for recharge dashboard admin console

anupam.singh — Mon, 13 May 2013 11:35:11 +0530

anupam.singh – 6 file(s) modified
Service changes for recharge dashboard admin console

Rev 7266 – Added option to delete FRC's and reset passwords

anupam.singh — Mon, 13 May 2013 11:32:16 +0530

anupam.singh – 6 file(s) modified
Added option to delete FRC's and reset passwords

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/DeleteFrcController.java
+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ManageStoreController.java
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/delete-frc-index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/manage-store-index.vm

Rev 7265 – Added methods to update store pricing

rajveer — Mon, 13 May 2013 10:45:45 +0530

rajveer – 5 file(s) modified
Added methods to update store pricing

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 7264 – Adding admin console for RechargeDashboard

anupam.singh — Sat, 11 May 2013 15:34:33 +0530

anupam.singh – 3 file(s) modified
Adding admin console for RechargeDashboard

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AdminController.java
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-index.vm
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm

Rev 7263 – Checkin for SnippetCaching, SourceDetail, CSS and JS changes etc.

anupam.singh — Fri, 10 May 2013 16:53:39 +0530

anupam.singh – 35 file(s) modified
Checkin for SnippetCaching, SourceDetail, CSS and JS changes etc.

~ /StoreWebsite/pom.xml
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/CategorySnippetCacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/EhcacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/SearchSnippetCacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/cache/SnippetCacheWrapper.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/service/ContentServingService.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/Category.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/DesEncrypter.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/FileUtils.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/SnippetType.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/utils/UserMessage.java
x /StoreWebsite/src/main/webapp/css/rechargewebapp_18042013.css
+ /StoreWebsite/src/main/webapp/css/storewebsite.css (copied from /StoreWebsite/src/main/webapp/css/rechargewebapp_18042013.css@7226)
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
+ /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /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/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /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/SourceDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7262 – Adding AgentId "45" to Escalation Matrix

amar.kumar — Fri, 10 May 2013 12:18:22 +0530

amar.kumar – 1 file(s) modified
Adding AgentId "45" to Escalation Matrix

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java

Rev 7261 – removed clearance from UI

rajveer — Fri, 10 May 2013 12:09:29 +0530

rajveer – 1 file(s) modified
removed clearance from UI

~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml

Rev 7260 – Removed Clearance button from catalog dashboard

rajveer — Fri, 10 May 2013 12:08:25 +0530

rajveer – 5 file(s) modified
Removed Clearance button from catalog dashboard

~ /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/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java

Rev 7259 – Added blue color highliting.

amit.gupta — Fri, 10 May 2013 11:55:17 +0530

amit.gupta – 1 file(s) modified
Added blue color highliting.

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

Rev 7258 – Removed clearance sale Controller and template.

amit.gupta — Thu, 09 May 2013 18:46:50 +0530

amit.gupta – 2 file(s) modified
Removed clearance sale Controller and template.

x /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
x /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 7257 – Commented alert for store pricing.

rajveer — Thu, 09 May 2013 18:16:18 +0530

rajveer – 1 file(s) modified
Commented alert for store pricing.

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

Rev 7256 – Added infra for store delivery estimate.

rajveer — Thu, 09 May 2013 17:53:22 +0530

rajveer – 17 file(s) modified
Added infra for store delivery estimate.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /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/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/StorePricing.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 7255 – Added auto suggest.

amit.gupta — Thu, 09 May 2013 16:55:02 +0530

amit.gupta – 9 file(s) modified
Added auto suggest.

x /StoreWebsite/src/main/java/in/shop2020/serving/auth/InventoryAuthorizingRealm.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/AutoSuggestController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/service/AutoSuggestService.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
+ /StoreWebsite/src/main/webapp/WEB-INF/content/auto-suggest-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 7254 – Corrected IP hotspot data push.

rajveer — Thu, 09 May 2013 16:34:46 +0530

rajveer – 1 file(s) modified
Corrected IP hotspot data push.

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

Rev 7253 – Changed IP for store collection push.

rajveer — Thu, 09 May 2013 16:17:54 +0530

rajveer – 1 file(s) modified
Changed IP for store collection push.

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

Rev 7252 – Add alert for possible problem while sending alert.

rajveer — Thu, 09 May 2013 14:35:59 +0530

rajveer – 1 file(s) modified
Add alert for possible problem while sending alert.

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

Rev 7251 – Added provision to store data before sending to ocr.

rajveer — Thu, 09 May 2013 13:19:39 +0530

rajveer – 1 file(s) modified
Added provision to store data before sending to ocr.

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

Rev 7250 – Added provision to store data before sending to ocr.

rajveer — Thu, 09 May 2013 13:18:57 +0530

rajveer – 1 file(s) modified
Added provision to store data before sending to ocr.

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

Rev 7249 – Transaction to be created only if entry has been added ...

rajveer — Thu, 09 May 2013 12:28:37 +0530

rajveer – 1 file(s) modified
Transaction to be created only if entry has been added in wallethistory.

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

Rev 7248 – New changes

anupam.singh — Thu, 09 May 2013 11:48:44 +0530

anupam.singh – 6 file(s) modified
New changes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/images/1.jpg
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm