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

Rev 13521 – Added changes related to No Captcha for Private Deal User

amit.gupta — Thu, 08 Jan 2015 12:29:35 +0530

amit.gupta – 12 file(s) modified
Added changes related to No Captcha for Private Deal User

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ClearItemAvailabilityCache.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 13505 – If GV Amount >= Total Amount then cod should be ...

amit.gupta — Tue, 06 Jan 2015 18:27:10 +0530

amit.gupta – 1 file(s) modified
If GV Amount >= Total Amount then cod should be false

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

Rev 13469 –

amit.gupta — Fri, 26 Dec 2014 16:25:00 +0530

amit.gupta – 2 file(s) modified

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 13460 – Added Changes regarding netbanking ui

amit.gupta — Fri, 26 Dec 2014 10:18:54 +0530

amit.gupta – 6 file(s) modified
Added Changes regarding netbanking ui

~ /trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/pay-options-index.vm
~ /trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm

Rev 13436 – UNIB to UBIB

amit.gupta — Wed, 24 Dec 2014 14:56:34 +0530

amit.gupta – 2 file(s) modified
UNIB to UBIB

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 13432 – All banks are now routed through PayU except OBC

amit.gupta — Wed, 24 Dec 2014 14:07:00 +0530

amit.gupta – 1 file(s) modified
All banks are now routed through PayU except OBC

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

Rev 13425 – Added Net Banking for PAYU

amit.gupta — Tue, 23 Dec 2014 09:52:06 +0530

amit.gupta – 8 file(s) modified
Added Net Banking for PAYU

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PayuPayController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RechargePaymentController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 13423 – Added cancellation url to error url

amit.gupta — Mon, 22 Dec 2014 12:06:24 +0530

amit.gupta – 2 file(s) modified
Added cancellation url to error url

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 13413 –

amit.gupta — Fri, 19 Dec 2014 18:57:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 13411 –

amit.gupta — Fri, 19 Dec 2014 18:37:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 13410 –

amit.gupta — Fri, 19 Dec 2014 18:13:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 13393 – Payu changes

amit.gupta — Thu, 18 Dec 2014 20:11:03 +0530

amit.gupta – 1 file(s) modified
Payu changes

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

Rev 13391 –

amit.gupta — Thu, 18 Dec 2014 19:42:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 13380 –

amit.gupta — Thu, 18 Dec 2014 18:03:06 +0530

amit.gupta – 1 file(s) modified

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

Rev 13376 –

amit.gupta — Thu, 18 Dec 2014 17:29:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 13374 –

amit.gupta — Thu, 18 Dec 2014 17:14:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 13373 – Added payu service.

amit.gupta — Thu, 18 Dec 2014 16:45:10 +0530

amit.gupta – 2 file(s) modified
Added payu service.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PayuPaymentService.java

Rev 13372 – Added Payu Changes.

amit.gupta — Thu, 18 Dec 2014 16:29:12 +0530

amit.gupta – 6 file(s) modified
Added Payu Changes.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
x /trunk/Website/src/main/webapp/images/payu-pay-logo.png
~ /trunk/Website/src/main/webapp/WEB-INF/content/payu-pay-show.vm

Rev 13288 – Rolled back changes

amit.gupta — Wed, 10 Dec 2014 15:55:57 +0530

amit.gupta – 1 file(s) modified
Rolled back changes

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

Rev 13287 –

amit.gupta — Wed, 10 Dec 2014 15:52:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 13277 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Wed, 10 Dec 2014 12:51:29 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 10-Dec-2014

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

Rev 13236 – Added new Category for Watch Strap

amit.gupta — Mon, 08 Dec 2014 14:42:04 +0530

amit.gupta – 2 file(s) modified
Added new Category for Watch Strap

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

Rev 13220 –

kshitij.sood — Sat, 06 Dec 2014 16:42:14 +0530

kshitij.sood – 1 file(s) modified

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

Rev 13213 – GOSF

kshitij.sood — Sat, 06 Dec 2014 15:59:38 +0530

kshitij.sood – 35 file(s) modified
GOSF

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GosfController.java
+ /trunk/Website/src/main/webapp/css/gosf.css
+ /trunk/Website/src/main/webapp/css/reset.css
+ /trunk/Website/src/main/webapp/css/stylesheet.css
+ /trunk/Website/src/main/webapp/fonts/androidland/League_Gothic-webfont.eot
+ /trunk/Website/src/main/webapp/fonts/androidland/League_Gothic-webfont.svg
+ /trunk/Website/src/main/webapp/fonts/androidland/League_Gothic-webfont.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/League_Gothic-webfont.woff
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-BOLD.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-BOLDCOND.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-BOLDCONDIT.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-BOLDIT.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-COND.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-CONDIT.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-REGULAR.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-SEMIBOLD.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MYRIADPRO-SEMIBOLDIT.OTF
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-Bold-Italic.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-Bold.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-Semibold-Italic.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-Semibold.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-Thin-Italic.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-Thin.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-UltraLight-Italic.ttf
+ /trunk/Website/src/main/webapp/fonts/androidland/MyriadSetPro-UltraLight.ttf
+ /trunk/Website/src/main/webapp/images/button-next.png
+ /trunk/Website/src/main/webapp/images/button-previous.png
+ /trunk/Website/src/main/webapp/images/facebook-gosf.png
+ /trunk/Website/src/main/webapp/images/social-media-arrow.png
+ /trunk/Website/src/main/webapp/images/twitter-gosf.png
+ /trunk/Website/src/main/webapp/js/jquery.countdown.js
+ /trunk/Website/src/main/webapp/js/jquery.flexisel.js
+ /trunk/Website/src/main/webapp/js/modernizr.custom.js
+ /trunk/Website/src/main/webapp/js/script.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/gosf-index.vm

Rev 13199 – Transaction is marked PrivateDeal if user is Private Deal User.

amit.gupta — Tue, 02 Dec 2014 19:49:17 +0530

amit.gupta – 2 file(s) modified
Transaction is marked PrivateDeal if user is Private Deal User.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java

Rev 13142 – Fixed Total Amount and actual price(Selling Price or deal Price) ...

amit.gupta — Thu, 27 Nov 2014 08:23:42 +0530

amit.gupta – 3 file(s) modified
Fixed Total Amount and actual price(Selling Price or deal Price) for display

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java

Rev 12985 –

kshitij.sood — Tue, 04 Nov 2014 12:00:32 +0530

kshitij.sood – 1 file(s) modified

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

Rev 12978 – Changes related to async recharge

kshitij.sood — Mon, 03 Nov 2014 16:46:28 +0530

kshitij.sood – 5 file(s) modified
Changes related to async recharge

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/webapp/css/header-footer.css
+ /trunk/Website/src/main/webapp/js/jquery.countdown360.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-status.vm

Rev 12859 – Captcha in contact us

kshitij.sood — Tue, 07 Oct 2014 19:23:34 +0530

kshitij.sood – 6 file(s) modified
Captcha in contact us

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/UserMessage.java
~ /trunk/Website/src/main/webapp/css/contactus.css
~ /trunk/Website/src/main/webapp/js/contact-us.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm

Rev 12789 –

amit.gupta — Sat, 27 Sep 2014 07:36:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 12788 – Added Website

amit.gupta — Fri, 26 Sep 2014 22:14:57 +0530

amit.gupta – 8 file(s) modified
Added Website

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 12695 – Unexpected Behaviour of smart watches.

amit.gupta — Sun, 21 Sep 2014 12:12:27 +0530

amit.gupta – 1 file(s) modified
Unexpected Behaviour of smart watches.

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

Rev 12633 – checked for npe

amit.gupta — Mon, 15 Sep 2014 15:41:00 +0530

amit.gupta – 1 file(s) modified
checked for npe

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

Rev 12626 – Changes related to affiliate

amit.gupta — Mon, 15 Sep 2014 00:01:30 +0530

amit.gupta – 5 file(s) modified
Changes related to affiliate

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/css/entity.css
+ /trunk/Website/src/main/webapp/images/flipkart_logo.png
~ /trunk/Website/src/main/webapp/js/entity.js

Rev 12620 – Added changes related to exclusive affiliate program

amit.gupta — Fri, 12 Sep 2014 16:10:17 +0530

amit.gupta – 20 file(s) modified
Added changes related to exclusive affiliate program

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/utils/Utils.java
~ /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/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ExclusiveAffiliateItemInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ExclusiveItemInfo.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/OutbuoundAffiliate.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 12616 – disabling data logging for now

anikendra — Thu, 11 Sep 2014 12:05:50 +0530

anikendra – 23 file(s) modified
disabling data logging for now

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LogoutController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PayuPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PromotionController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 12527 – Removed comma

amit.gupta — Thu, 21 Aug 2014 22:57:10 +0530

amit.gupta – 1 file(s) modified
Removed comma

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

Rev 12525 – Added projectors to category.

amit.gupta — Thu, 21 Aug 2014 17:33:35 +0530

amit.gupta – 1 file(s) modified
Added projectors to category.

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

Rev 12429 – Fixed bug related to search.

amit.gupta — Thu, 14 Aug 2014 14:18:46 +0530

amit.gupta – 1 file(s) modified
Fixed bug related to search.

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

Rev 12391 – Search index page will render now all products.

amit.gupta — Tue, 12 Aug 2014 13:11:49 +0530

amit.gupta – 1 file(s) modified
Search index page will render now all products.

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