SmartDukaan – /trunk/Website/src/main/java/in/

Rev 7875 – Improved look and feel for cod info box.

rajveer — Tue, 30 Jul 2013 23:18:51 +0530

rajveer – 1 file(s) modified
Improved look and feel for cod info box.

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

Rev 7874 – Improved look and feel for cod info box.

rajveer — Tue, 30 Jul 2013 23:17:58 +0530

rajveer – 1 file(s) modified
Improved look and feel for cod info box.

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

Rev 7862 – Facilitating whole payment by coupon.

anupam.singh — Tue, 30 Jul 2013 15:10:21 +0530

anupam.singh – 6 file(s) modified
Facilitating whole payment by coupon.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/CouponPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 7859 – Fixed delivery estimate problem.

rajveer — Tue, 30 Jul 2013 14:37:33 +0530

rajveer – 1 file(s) modified
Fixed delivery estimate problem.

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

Rev 7853 – EMI will now be displayed at product page as well.

amit.gupta — Tue, 30 Jul 2013 12:33:56 +0530

amit.gupta – 9 file(s) modified
EMI will now be displayed at product page as well.

~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/CMPJythonWrapper.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/velocity/ProductDetail.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/webapp/css/entity.css
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 7845 – Start logistics service on support also.

rajveer — Mon, 29 Jul 2013 14:35:40 +0530

rajveer – 3 file(s) modified
Start logistics service on support also.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 7842 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 13:14:45 +0530

rajveer – 1 file(s) modified
Improved Estimate controller logic.

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

Rev 7840 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 12:52:13 +0530

rajveer – 1 file(s) modified
Improved Estimate controller logic.

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

Rev 7839 – Improved Estimate controller logic.

rajveer — Mon, 29 Jul 2013 12:47:29 +0530

rajveer – 2 file(s) modified
Improved Estimate controller logic.

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

Rev 7825 – Changes for Facebook Login

amar.kumar — Thu, 25 Jul 2013 16:27:50 +0530

amar.kumar – 19 file(s) modified
Changes for Facebook Login

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/filters/dev/filters.properties
~ /trunk/Website/src/main/filters/staging/filters.properties
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/UserMessage.java
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/signinsignup.css
~ /trunk/Website/src/main/webapp/js/facebook.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7809 – Display widget for cod.

rajveer — Tue, 23 Jul 2013 16:37:26 +0530

rajveer – 3 file(s) modified
Display widget for cod.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/widgets.js

Rev 7798 – Do not convert to int.

rajveer — Mon, 22 Jul 2013 19:23:29 +0530

rajveer – 1 file(s) modified
Do not convert to int.

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

Rev 7791 – Display date in the form of date not business days.

rajveer — Mon, 22 Jul 2013 15:13:51 +0530

rajveer – 7 file(s) modified
Display date in the form of date not business days.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/cart-details.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm

Rev 7789 – removed trim, used trimToNull

amit.gupta — Mon, 22 Jul 2013 14:05:02 +0530

amit.gupta – 1 file(s) modified
removed trim, used trimToNull

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

Rev 7418 – Added Power bank in accessory section.

amit.gupta — Fri, 07 Jun 2013 13:51:30 +0530

amit.gupta – 2 file(s) modified
Added Power bank in accessory section.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 7309 – Display cancellation in case of website only.

rajveer — Tue, 21 May 2013 17:36:18 +0530

rajveer – 1 file(s) modified
Display cancellation in case of website only.

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

Rev 7293 – - Changes related to StoreWebsite - Added source to ...

anupam.singh — Fri, 17 May 2013 13:30:57 +0530

anupam.singh – 23 file(s) modified
- Changes related to StoreWebsite
- Added source to "change_transaction_status" method

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
x /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm@7272)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/model/v1/order/script/CreateRTGSBulkOrders.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

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 7132 – updated definitions

amit.gupta — Tue, 09 Apr 2013 16:06:40 +0530

amit.gupta – 7 file(s) modified
updated definitions

+ /trunk/ContentStore/src/jython/irdatarules/tablets/resolution.py
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 7081 – Updated support to handle invoice numbers.

rajveer — Wed, 03 Apr 2013 14:38:06 +0530

rajveer – 2 file(s) modified
Updated support to handle invoice numbers.

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

Rev 7078 – Trim the customer name.

rajveer — Wed, 03 Apr 2013 13:18:26 +0530

rajveer – 1 file(s) modified
Trim the customer name.

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

Rev 7077 – Added user id as part of fetching invoice

rajveer — Tue, 02 Apr 2013 19:05:37 +0530

rajveer – 1 file(s) modified
Added user id as part of fetching invoice

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

Rev 7039 – Removing all changes related to facebook login because i dont ...

anupam.singh — Sun, 24 Mar 2013 16:35:03 +0530

anupam.singh – 18 file(s) modified
Removing all changes related to facebook login because i dont like them ;)

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7030 – Seprated service and controller.

rajveer — Fri, 22 Mar 2013 16:37:30 +0530

rajveer – 2 file(s) modified
Seprated service and controller.

+ /trunk/Common/src/main/java/in/shop2020/serving/services/RedExpressTrackingService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RedexpressUpdatesController.java

Rev 7029 – Add some spaces in the red express updates controller

rajveer — Fri, 22 Mar 2013 16:30:00 +0530

rajveer – 1 file(s) modified
Add some spaces in the red express updates controller

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

Rev 7026 – Added code for Redexpress to diaplay on website.

rajveer — Fri, 22 Mar 2013 15:41:04 +0530

rajveer – 7 file(s) modified
Added code for Redexpress to diaplay on website.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/RedExpressLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RedexpressUpdatesController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/redexpress-updates-show.vm

Rev 7023 – Checking for dummy call to login through facebook

amar.kumar — Thu, 21 Mar 2013 19:33:39 +0530

amar.kumar – 1 file(s) modified
Checking for dummy call to login through facebook

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

Rev 7007 – Changes to allow login through facebook and storing user's facebook ...

amar.kumar — Wed, 20 Mar 2013 17:05:22 +0530

amar.kumar – 21 file(s) modified
Changes to allow login through facebook and storing user's facebook credentials to be able to post on user's behalf on facebook

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/User.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /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/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/UserInterceptor.java
+ /trunk/Website/src/main/webapp/channel.html
~ /trunk/Website/src/main/webapp/css/common.css
+ /trunk/Website/src/main/webapp/images/facebooklogin.png
+ /trunk/Website/src/main/webapp/js/facebook.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-mini-index.vm

Rev 7001 – Adding direction code for hdfc 18 month emi

rajveer — Mon, 18 Mar 2013 22:48:42 +0530

rajveer – 1 file(s) modified
Adding direction code for hdfc 18 month emi

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

Rev 6998 – Search is now optimised and is more controllable.

amit.gupta — Mon, 18 Mar 2013 17:27:22 +0530

amit.gupta – 8 file(s) modified
Search is now optimised and is more controllable.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/SolrSearchService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/webapp/js/common.js

Rev 6996 – Added RechargeAgain button on my recharges page

anupam.singh — Mon, 18 Mar 2013 14:40:48 +0530

anupam.singh – 5 file(s) modified
Added RechargeAgain button on my recharges page

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyRechargesController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-recharges.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 6993 – Updated variable name.

rajveer — Fri, 15 Mar 2013 12:33:00 +0530

rajveer – 1 file(s) modified
Updated variable name.

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

Rev 6991 – Updated invoice controller.

rajveer — Fri, 15 Mar 2013 12:25:17 +0530

rajveer – 1 file(s) modified
Updated invoice controller.

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

Rev 6989 – added imports.

rajveer — Thu, 14 Mar 2013 18:15:09 +0530

rajveer – 1 file(s) modified
added imports.

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

Rev 6988 – Added support to fetch invoice number

rajveer — Thu, 14 Mar 2013 17:12:18 +0530

rajveer – 9 file(s) modified
Added support to fetch invoice number

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InvoiceController.java
+ /trunk/Website/src/main/webapp/WEB-INF/content/invoice-show.vm

Rev 6976 – Added pagination for category pages.

amit.gupta — Mon, 11 Mar 2013 12:37:39 +0530

amit.gupta – 3 file(s) modified
Added pagination for category pages.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 6975 – Made special pages sortable, and accessories page wont show classes.

amit.gupta — Thu, 07 Mar 2013 19:03:31 +0530

amit.gupta – 3 file(s) modified
Made special pages sortable, and accessories page wont show classes.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm

Rev 6973 – Made special pages sortable.

amit.gupta — Thu, 07 Mar 2013 16:29:49 +0530

amit.gupta – 4 file(s) modified
Made special pages sortable.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SpecialPageController.java
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm

Rev 6958 – Mark payments as captured in case of innoviti PG.

rajveer — Wed, 06 Mar 2013 12:39:08 +0530

rajveer – 1 file(s) modified
Mark payments as captured in case of innoviti PG.

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

Rev 6949 – modified styles and added cached snippets.

amit.gupta — Tue, 05 Mar 2013 18:03:19 +0530

amit.gupta – 3 file(s) modified
modified styles and added cached snippets.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm