SmartDukaan – /

Rev 2459 – Handling of different level of categories

rajveer — Wed, 06 Jul 2011 17:18:28 +0530

rajveer – 2 file(s) modified
Handling of different level of categories

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

Rev 2458 – Changed & to & in the option values

chandranshu — Wed, 06 Jul 2011 16:47:34 +0530

chandranshu – 1 file(s) modified
Changed & to & in the option values

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

Rev 2457 – Removed lines causing warnings

chandranshu — Wed, 06 Jul 2011 16:42:05 +0530

chandranshu – 3 file(s) modified
Removed lines causing warnings

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/FblikeTestController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 2456 – Changed all & to & in state list

chandranshu — Wed, 06 Jul 2011 16:39:34 +0530

chandranshu – 1 file(s) modified
Changed all & to & in state list

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

Rev 2455 – Added comments before method sigantures

varun.gupta — Wed, 06 Jul 2011 16:37:12 +0530

varun.gupta – 1 file(s) modified
Added comments before method sigantures

~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 2454 – Added comparison rule for battery slide for tablet

rajveer — Wed, 06 Jul 2011 16:32:53 +0530

rajveer – 2 file(s) modified
Added comparison rule for battery slide for tablet

~ /trunk/ContentStore/src/jython/comparisonrules/battery_math.py
~ /trunk/ContentStore/src/xml/model/comparisondefinitions.xml

Rev 2453 – Removed some redundant code in best-deals view. Put in some ...

chandranshu — Wed, 06 Jul 2011 16:32:28 +0530

chandranshu – 5 file(s) modified
Removed some redundant code in best-deals view. Put in some log statements in place of printing stack traces. Corrected indentation in pom.xml.

~ /trunk/Website/pom.xml
~ /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/utils/FileUtils.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm

Rev 2452 – Removed the imei no. which is being passed in the ...

chandranshu — Wed, 06 Jul 2011 16:24:18 +0530

chandranshu – 1 file(s) modified
Removed the imei no. which is being passed in the order

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

Rev 2451 – Corrected the battery slide

rajveer — Wed, 06 Jul 2011 16:20:23 +0530

rajveer – 2 file(s) modified
Corrected the battery slide

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

Rev 2450 – Can simply use toString() here

vikas — Wed, 06 Jul 2011 16:18:54 +0530

vikas – 1 file(s) modified
Can simply use toString() here

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

Rev 2449 – Started showing delivered orders to the admin in the dashboard. ...

chandranshu — Wed, 06 Jul 2011 16:17:00 +0530

chandranshu – 30 file(s) modified
Started showing delivered orders to the admin in the dashboard. Removed a lot of duplicated handlers.

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadDeliveredOrderListEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadDeliveredOrderListEventHandler.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/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProivderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptedOrderListHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BilledOrderListHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/NostockOrderListHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectedOrderListHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ShippedOrderListHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptedOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptedOrderListResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BilledOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BilledOrderListResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/NostockOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/NostockOrderListResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/RejectedOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/RejectedOrderListResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ShippedOrderListRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ShippedOrderListResponse.java

Rev 2448 – Tested that the data service class is able to set ...

chandranshu — Wed, 06 Jul 2011 16:14:24 +0530

chandranshu – 4 file(s) modified
Tested that the data service class is able to set up an entity defined in a different module

~ /trunk/PyProj/src/shop2020/test/DataService.py
+ /trunk/PyProj/src/shop2020/test/domain
+ /trunk/PyProj/src/shop2020/test/domain/Test1.py
+ /trunk/PyProj/src/shop2020/test/domain/__init__.py

Rev 2447 – Added attributes to the dashboard user and changed the return ...

chandranshu — Wed, 06 Jul 2011 16:12:49 +0530

chandranshu – 3 file(s) modified
Added attributes to the dashboard user and changed the return type of the authenticateUser method

~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py

Rev 2446 – Updated comment for future changes

chandranshu — Wed, 06 Jul 2011 16:11:47 +0530

chandranshu – 1 file(s) modified
Updated comment for future changes

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py

Rev 2445 – Moved out the DashboardUser class into its own file. Started ...

chandranshu — Wed, 06 Jul 2011 16:10:01 +0530

chandranshu – 6 file(s) modified
Moved out the DashboardUser class into its own file. Started returning the dashboard user from the authenticate method

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
+ /trunk/PyProj/src/shop2020/helpers/impl/model
+ /trunk/PyProj/src/shop2020/helpers/impl/model/DashboardUser.py
+ /trunk/PyProj/src/shop2020/helpers/impl/model/__init__.py

Rev 2444 – Removed ugly hack to increase the estimate of Galaxy S

chandranshu — Wed, 06 Jul 2011 16:08:27 +0530

chandranshu – 1 file(s) modified
Removed ugly hack to increase the estimate of Galaxy S

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

Rev 2443 – Added some attributes to the dashboard user and changed the ...

chandranshu — Wed, 06 Jul 2011 16:07:38 +0530

chandranshu – 2 file(s) modified
Added some attributes to the dashboard user and changed the return type of the authenticateUser

~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DashboardUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java

Rev 2442 – Added warehouse and admin attributes to the dashboard user and ...

chandranshu — Wed, 06 Jul 2011 16:03:45 +0530

chandranshu – 1 file(s) modified
Added warehouse and admin attributes to the dashboard user and changed the return type of authenticateUser to return the dashboard user object

~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 2441 – Added temp slide

rajveer — Wed, 06 Jul 2011 15:50:04 +0530

rajveer – 2 file(s) modified
Added temp slide

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

Rev 2440 – Removing the GWT generated hotspotdashboard folder

rajveer — Wed, 06 Jul 2011 15:47:05 +0530

rajveer – 1 file(s) modified
Removing the GWT generated hotspotdashboard folder

x /trunk/HotspotDashboard/src/main/webapp/hotspotdashboard

Rev 2439 – Changed the hard-coded upper limit on action to be dynamically ...

chandranshu — Wed, 06 Jul 2011 15:24:27 +0530

chandranshu – 1 file(s) modified
Changed the hard-coded upper limit on action to be dynamically loaded from the ACTIONS dictionary

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

Rev 2438 – Added new battery slide for tablets

rajveer — Wed, 06 Jul 2011 15:06:18 +0530

rajveer – 4 file(s) modified
Added new battery slide for tablets

~ /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 2437 – Fix product compare and research add event parsing.

vikas — Wed, 06 Jul 2011 15:01:11 +0530

vikas – 2 file(s) modified
Fix product compare and research add event parsing.

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

Rev 2436 – Provided reverse linking for terms in glossary

rajveer — Wed, 06 Jul 2011 13:51:36 +0530

rajveer – 2 file(s) modified
Provided reverse linking for terms in glossary

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm

Rev 2435 – Fixed the bug where no facet is required

rajveer — Wed, 06 Jul 2011 13:50:50 +0530

rajveer – 1 file(s) modified
Fixed the bug where no facet is required

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

Rev 2434 – Get url from json object.

rajveer — Wed, 06 Jul 2011 13:47:58 +0530

rajveer – 1 file(s) modified
Get url from json object.

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

Rev 2433 – Modified to use only one velocity context. Also added product ...

rajveer — Wed, 06 Jul 2011 13:43:15 +0530

rajveer – 13 file(s) modified
Modified to use only one velocity context. Also added product name in json object. Renamed name of velocity files to make them consistent with html filenames. Added proper javadocs

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
+ /trunk/ContentStore/src/velocity/CategorySnippet.vm
+ /trunk/ContentStore/src/velocity/CompareProductSnippet.vm
+ /trunk/ContentStore/src/velocity/CompareProductSummarySnippet.vm
+ /trunk/ContentStore/src/velocity/ComparisonSnippet.vm
+ /trunk/ContentStore/src/velocity/HomeSnippet.vm
+ /trunk/ContentStore/src/velocity/PhonesIOwnSnippet.vm
+ /trunk/ContentStore/src/velocity/ProductDetail.vm
+ /trunk/ContentStore/src/velocity/SearchSnippet.vm
+ /trunk/ContentStore/src/velocity/SlideGuide.vm
~ /trunk/ContentStore/src/velocity/slideguide_for_comparison.vm
+ /trunk/ContentStore/src/velocity/WidgetSnippet.vm

Rev 2432 – Added support to update weight and warehouse of an order

chandranshu — Wed, 06 Jul 2011 13:34:53 +0530

chandranshu – 1 file(s) modified
Added support to update weight and warehouse of an order

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

Rev 2431 – added java comments

ankur.singhal — Wed, 06 Jul 2011 11:45:51 +0530

ankur.singhal – 1 file(s) modified
added java comments

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Utils.java

Rev 2430 – Null check.

vikas — Tue, 05 Jul 2011 16:56:00 +0530

vikas – 1 file(s) modified
Null check.

~ /trunk/Website/src/main/java/in/shop2020/serving/utils/DataLogger.java

Rev 2429 – Added best deals to catalog_test.

vikas — Tue, 05 Jul 2011 16:54:07 +0530

vikas – 4 file(s) modified
Added best deals to catalog_test.

~ /trunk/Website/src/test/resources/db/catalog.sql
~ /trunk/Website/src/test/resources/scripts/test-setup.sh
~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/product/test1.html

Rev 2428 – modified method check_similar_item. product group, brand and model number should ...

ankur.singhal — Tue, 05 Jul 2011 16:38:56 +0530

ankur.singhal – 1 file(s) modified
modified method check_similar_item. product group, brand and model number should never be null or empty.

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

Rev 2427 – Added java docs

ankur.singhal — Tue, 05 Jul 2011 16:27:30 +0530

ankur.singhal – 32 file(s) modified
Added java docs

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/AuthenticateDialog.java
~ /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/FileUploadParams.java
x /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/Filters.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/LoginScreen.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginService.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/LoginServiceAsync.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/Shortcuts.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/StatusDialog.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/TopPanel.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/server/FileDownloadServlet.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/LoginServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
x /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/CatalogResults.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
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VendorItemMapping.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/VendorPricings.java
x /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ajax-loader.gif
~ /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
+ /trunk/CatalogDashboard/src/main/resources/log4j.properties

Rev 2426 – Removed unused methods and variables

rajveer — Tue, 05 Jul 2011 12:50:16 +0530

rajveer – 2 file(s) modified
Removed unused methods and variables

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 2425 – Added page for android mobiles in Brandcontroller

rajveer — Tue, 05 Jul 2011 12:18:09 +0530

rajveer – 4 file(s) modified
Added page for android mobiles in Brandcontroller

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrandController.java
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/product/test1.html

Rev 2424 – Modified to handle category at different levels

rajveer — Tue, 05 Jul 2011 11:37:52 +0530

rajveer – 5 file(s) modified
Modified to handle category at different levels

~ /trunk/ContentCreation/.classpath
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/SlidesController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-editNew.vm

Rev 2423 – Added content model for tablet categories

rajveer — Tue, 05 Jul 2011 11:36:03 +0530

rajveer – 3 file(s) modified
Added content model for tablet categories

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

Rev 2422 – Fix newline in the end mismatch.

vikas — Tue, 05 Jul 2011 11:32:18 +0530

vikas – 1 file(s) modified
Fix newline in the end mismatch.

~ /trunk/Website/src/test/samples/product/test1.html

Rev 2421 – modified tests to remove unused js code

rajveer — Tue, 05 Jul 2011 11:29:20 +0530

rajveer – 1 file(s) modified
modified tests to remove unused js code

~ /trunk/Website/src/test/samples/product/test1.html

Rev 2420 – Update googleappurl for data storage in prod.

vikas — Mon, 04 Jul 2011 18:45:19 +0530

vikas – 1 file(s) modified
Update googleappurl for data storage in prod.

~ /trunk/Website/src/main/filters/prod/filters.properties