SmartDukaan – /

Rev 3086 – Added email notification sender. We will send email to the ...

rajveer — Mon, 29 Aug 2011 19:54:02 +0530

rajveer – 14 file(s) modified
Added email notification sender. We will send email to the users who want to receive the notifications for the out of stock products.

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.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/model/v1/catalog/script/ProductNotifier.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/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 3085 – Store id and catalog_id as long.

vikas — Mon, 29 Aug 2011 19:34:44 +0530

vikas – 1 file(s) modified
Store id and catalog_id as long.

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

Rev 3084 – Changes to upload catalog data to GAE.

vikas — Mon, 29 Aug 2011 18:43:02 +0530

vikas – 3 file(s) modified
Changes to upload catalog data to GAE.

~ /trunk/GoogleAppDatalog/pom.xml
+ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/UploadCatalogItemsServlet.java
~ /trunk/GoogleAppDatalog/src/main/webapp/WEB-INF/web.xml

Rev 3083 – Changes to upload catalog data to GAE.

vikas — Mon, 29 Aug 2011 18:34:40 +0530

vikas – 15 file(s) modified
Changes to upload catalog data to GAE.

~ /trunk/ContentStore/pom.xml
+ /trunk/ContentStore/src/main/filters
+ /trunk/ContentStore/src/main/filters/dev
+ /trunk/ContentStore/src/main/filters/dev/filters.properties
+ /trunk/ContentStore/src/main/filters/prod
+ /trunk/ContentStore/src/main/filters/prod/filters.properties
+ /trunk/ContentStore/src/main/filters/staging
+ /trunk/ContentStore/src/main/filters/staging/filters.properties
+ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
+ /trunk/ContentStore/src/main/resources/in
+ /trunk/ContentStore/src/main/resources/in/shop2020
+ /trunk/ContentStore/src/main/resources/in/shop2020/ui
+ /trunk/ContentStore/src/main/resources/in/shop2020/ui/util
+ /trunk/ContentStore/src/main/resources/in/shop2020/ui/util/CatalogUploderToGAE.properties

Rev 3082 – Trac#485 Updating a test case! Also, updating to use latest ...

mandeep.dhir — Mon, 29 Aug 2011 16:12:10 +0530

mandeep.dhir – 2 file(s) modified
Trac#485 Updating a test case! Also, updating to use latest GSON library

~ /trunk/ContentStore/pom.xml
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/SpecialPageJSONConvertor.java

Rev 3081 – Trac#485 Changing input type of special pages' prime URL and ...

mandeep.dhir — Mon, 29 Aug 2011 16:10:52 +0530

mandeep.dhir – 2 file(s) modified
Trac#485 Changing input type of special pages' prime URL and Saholic URL

~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-edit.vm
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/special-page-editNew.vm

Rev 3080 – Added support to give user an option to register for ...

rajveer — Mon, 29 Aug 2011 15:54:23 +0530

rajveer – 4 file(s) modified
Added support to give user an option to register for notification for out of stock item. Once item will be in stock notifications will be sent.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-success.vm

Rev 3079 – Added support for email notifications for out of stock items.

rajveer — Mon, 29 Aug 2011 15:52:26 +0530

rajveer – 7 file(s) modified
Added support for email notifications for out of stock items.

~ /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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 3078 – Showing status description instead of status name

chandranshu — Mon, 29 Aug 2011 13:00:02 +0530

chandranshu – 1 file(s) modified
Showing status description instead of status name

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

Rev 3077 – Rename field prodId to itemId and make it long.

vikas — Mon, 29 Aug 2011 12:36:46 +0530

vikas – 1 file(s) modified
Rename field prodId to itemId and make it long.

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

Rev 3076 – Added some log messages for exceptions

chandranshu — Mon, 29 Aug 2011 12:34:48 +0530

chandranshu – 1 file(s) modified
Added some log messages for exceptions

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

Rev 3075 – Added a note for COD orders informing the customers about ...

chandranshu — Mon, 29 Aug 2011 12:34:09 +0530

chandranshu – 1 file(s) modified
Added a note for COD orders informing the customers about the verification call

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

Rev 3074 – Log prodId also on product view event in datalogger.

vikas — Mon, 29 Aug 2011 12:26:30 +0530

vikas – 1 file(s) modified
Log prodId also on product view event in datalogger.

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

Rev 3073 – Log prodId also on product view event in datalogger.

vikas — Mon, 29 Aug 2011 12:24:44 +0530

vikas – 2 file(s) modified
Log prodId also on product view event in datalogger.

~ /trunk/Common/src/main/java/in/shop2020/datalogger/event/ProductView.java
~ /trunk/Common/src/main/java/in/shop2020/utils/DataLogger.java

Rev 3072 – Started displaying orders in verification pending state in the statistics ...

chandranshu — Mon, 29 Aug 2011 11:57:31 +0530

chandranshu – 1 file(s) modified
Started displaying orders in verification pending state in the statistics dashboard

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

Rev 3071 – Added support to display the type of order and added ...

chandranshu — Mon, 29 Aug 2011 11:56:50 +0530

chandranshu – 2 file(s) modified
Added support to display the type of order and added logging messages

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm

Rev 3070 – Added check of none

rajveer — Mon, 29 Aug 2011 11:52:44 +0530

rajveer – 1 file(s) modified
Added check of none

~ /trunk/ContentStore/src/jython/irmetadatarules/form-factor.py

Rev 3069 – Added spinning image on comparison box.

rajveer — Mon, 29 Aug 2011 11:43:22 +0530

rajveer – 1 file(s) modified
Added spinning image on comparison box.

+ /trunk/Website/src/main/webapp/images/ui-anim_basic_16x16.gif

Rev 3068 – Corrected reference to an image and removed reference to an ...

chandranshu — Mon, 29 Aug 2011 11:39:49 +0530

chandranshu – 3 file(s) modified
Corrected reference to an image and removed reference to an invalid javascript file in production environment

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/jquery.ui.autocomplete.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm

Rev 3067 – Update test cases.

vikas — Mon, 29 Aug 2011 10:59:08 +0530

vikas – 4 file(s) modified
Update test cases.

~ /trunk/Website/src/test/samples/home/test1.html
~ /trunk/Website/src/test/samples/home/test18.javascript
~ /trunk/Website/src/test/samples/product/test1.html
~ /trunk/Website/src/test/samples/product/test20.javascript

Rev 3066 – Minor usability changes

chandranshu — Mon, 29 Aug 2011 07:26:07 +0530

chandranshu – 1 file(s) modified
Minor usability changes

~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3065 – Changes for COD

chandranshu — Fri, 26 Aug 2011 19:37:46 +0530

chandranshu – 23 file(s) modified
Changes for COD

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkOrdersAsManifestedEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/VerifyOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/VerifyOrderEventHandler.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/MarkOrdersAsManifestedConfirmationBox.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/OrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProviderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProviderDetails.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/MarkOrdersAsManifestedHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/VerifyOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/DetailsMask.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkOrdersAsManifestedRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/VerifyOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/VerifyOrderResponse.java

Rev 3064 – Changes for COD

chandranshu — Fri, 26 Aug 2011 19:36:48 +0530

chandranshu – 11 file(s) modified
Changes for COD

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /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/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.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

Rev 3063 – Changes for COD

chandranshu — Fri, 26 Aug 2011 19:35:51 +0530

chandranshu – 12 file(s) modified
Changes for COD

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/prod/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
+ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/OrderController.properties
~ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ShippingController.properties
~ /trunk/Website/src/main/webapp/js/paymode-selection.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 3062 – Changes for COD

chandranshu — Fri, 26 Aug 2011 19:35:14 +0530

chandranshu – 5 file(s) modified
Changes for COD

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm

Rev 3061 – Changes to support COD

chandranshu — Fri, 26 Aug 2011 19:34:25 +0530

chandranshu – 5 file(s) modified
Changes to support COD

~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionStatus.java

Rev 3060 – Changes to support COD

chandranshu — Fri, 26 Aug 2011 19:33:58 +0530

chandranshu – 2 file(s) modified
Changes to support COD

~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 3059 – will not be set at this stage.

vikas — Fri, 26 Aug 2011 18:57:09 +0530

vikas – 1 file(s) modified
will not be set at this stage.

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

Rev 3058 – Added HTC Wildfire and Motorola Defy

varun.gupta — Fri, 26 Aug 2011 18:32:46 +0530

varun.gupta – 1 file(s) modified
Added HTC Wildfire and Motorola Defy

~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 3057 – Make ajax call only when research and browse history list ...

vikas — Fri, 26 Aug 2011 18:17:00 +0530

vikas – 1 file(s) modified
Make ajax call only when research and browse history list is not empty.

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

Rev 3056 – Unset Pragma to enable caching.

vikas — Fri, 26 Aug 2011 16:53:58 +0530

vikas – 1 file(s) modified
Unset Pragma to enable caching.

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

Rev 3055 – Use setHeader to clear existing value if any.

vikas — Fri, 26 Aug 2011 15:16:59 +0530

vikas – 1 file(s) modified
Use setHeader to clear existing value if any.

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

Rev 3054 – Added constant for new payment method

chandranshu — Fri, 26 Aug 2011 14:52:19 +0530

chandranshu – 1 file(s) modified
Added constant for new payment method

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

Rev 3053 – Adding the resource bundle for Shipping Controller

chandranshu — Fri, 26 Aug 2011 14:51:37 +0530

chandranshu – 5 file(s) modified
Adding the resource bundle for Shipping Controller

+ /trunk/Website/src/main/resources/in
+ /trunk/Website/src/main/resources/in/shop2020
+ /trunk/Website/src/main/resources/in/shop2020/serving
+ /trunk/Website/src/main/resources/in/shop2020/serving/controllers
+ /trunk/Website/src/main/resources/in/shop2020/serving/controllers/ShippingController.properties

Rev 3052 – Cache ajax calls to load widgets.

vikas — Fri, 26 Aug 2011 13:56:08 +0530

vikas – 5 file(s) modified
Cache ajax calls to load widgets.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RelatedAccessoriesController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/CachingInterceptor.java
~ /trunk/Website/src/main/resources/struts.xml

Rev 3051 – Rectified the derivation of email and account no of a ...

chandranshu — Fri, 26 Aug 2011 13:34:03 +0530

chandranshu – 1 file(s) modified
Rectified the derivation of email and account no of a provider

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

Rev 3050 – Use ehcache for caching best-deals, latest arrivals and best-sellers snippet ...

vikas — Thu, 25 Aug 2011 19:08:08 +0530

vikas – 4 file(s) modified
Use ehcache for caching best-deals, latest arrivals and best-sellers snippet on home page.

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

Rev 3049 – Coupons on MI-270, MI-310 & MI-410 removed

varun.gupta — Thu, 25 Aug 2011 17:24:36 +0530

varun.gupta – 2 file(s) modified
Coupons on MI-270, MI-310 & MI-410 removed

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_single_coupon_different_discounts_for_different_models.py
~ /trunk/Social/src/main/webapp/WEB-INF/content/community-promotion-success.vm

Rev 3048 – Updated script to update content

rajveer — Thu, 25 Aug 2011 15:49:00 +0530

rajveer – 1 file(s) modified
Updated script to update content

~ /trunk/runutils/update-content.sh

Rev 3047 – Updated scripts for updating static content

rajveer — Thu, 25 Aug 2011 15:32:51 +0530

rajveer – 2 file(s) modified
Updated scripts for updating static content

~ /trunk/runutils/generate-content-from-catalog.sh
~ /trunk/runutils/update-static-content.sh