SmartDukaan – /trunk/profitmandi-web/

Rev 21754 – Fixed added partially captured status

amit.gupta — Fri, 16 Jun 2017 16:06:20 +0530

amit.gupta – 1 file(s) modified
Fixed added partially captured status

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21748 –

ashik.ali — Fri, 16 Jun 2017 13:15:42 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/pom.xml

Rev 21744 –

ashik.ali — Fri, 16 Jun 2017 12:54:44 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-web/pom.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java

Rev 21743 –

ashik.ali — Fri, 16 Jun 2017 11:57:03 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/SimpleCORSInterceptor.java

Rev 21741 –

ashik.ali — Thu, 15 Jun 2017 19:54:25 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21740 –

ashik.ali — Thu, 15 Jun 2017 19:51:36 +0530

ashik.ali – 31 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/ApiRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateRetailerRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateShopRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/GoogleLoginRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/RoleRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/model
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/JsonProcessor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/util

Rev 21738 –

amit.gupta — Thu, 15 Jun 2017 19:42:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java

Rev 21737 –

amit.gupta — Thu, 15 Jun 2017 19:38:10 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21735 –

ashik.ali — Thu, 15 Jun 2017 19:00:26 +0530

ashik.ali – 34 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/ApiRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateUserRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/GoogleLoginRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/RoleRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Role.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateAddressJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateApiJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRoleJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateUserJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GoogleLoginApiJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/UpdateApiJsonValidator.java

Rev 21734 –

ashik.ali — Thu, 15 Jun 2017 18:39:29 +0530

ashik.ali – 2 file(s) modified

x /trunk/profitmandi-api
+ /trunk/profitmandi-web (copied from /trunk/profitmandi-api@21733)

Rev 21730 –

ashik.ali — Thu, 15 Jun 2017 16:32:49 +0530

ashik.ali – 2 file(s) modified

+ /trunk/profitmandi-api (copied from /trunk/profitmandi-web@21729)
x /trunk/profitmandi-web

Rev 21729 –

ashik.ali — Thu, 15 Jun 2017 16:26:23 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java

Rev 21708 – Added mobileNumber

amit.gupta — Wed, 14 Jun 2017 16:37:28 +0530

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

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

Rev 21707 – Added @Transactional

amit.gupta — Tue, 13 Jun 2017 18:38:31 +0530

amit.gupta – 1 file(s) modified
Added @Transactional

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java

Rev 21706 –

amit.gupta — Tue, 13 Jun 2017 17:52:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 21705 – Removed @Transactional

amit.gupta — Tue, 13 Jun 2017 17:42:21 +0530

amit.gupta – 1 file(s) modified
Removed @Transactional

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 21703 –

amit.gupta — Tue, 13 Jun 2017 17:32:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 21702 –

ashik.ali — Tue, 13 Jun 2017 17:24:03 +0530

ashik.ali – 11 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 21699 –

ashik.ali — Tue, 13 Jun 2017 17:00:52 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java

Rev 21698 – Fixed method selectAddressIdByRetailerId

amit.gupta — Tue, 13 Jun 2017 16:24:09 +0530

amit.gupta – 1 file(s) modified
Fixed method selectAddressIdByRetailerId

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 21692 –

amit.gupta — Tue, 13 Jun 2017 15:40:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 21691 – fixed userId

amit.gupta — Tue, 13 Jun 2017 13:52:43 +0530

amit.gupta – 1 file(s) modified
fixed userId

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 21684 –

amit.gupta — Mon, 12 Jun 2017 20:21:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21683 –

amit.gupta — Mon, 12 Jun 2017 20:05:45 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21681 –

amit.gupta — Sat, 10 Jun 2017 16:50:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java

Rev 21667 – Fixed Pa

amit.gupta — Fri, 09 Jun 2017 12:27:35 +0530

amit.gupta – 1 file(s) modified
Fixed Pa

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21666 – Fixed controllers related to address

amit.gupta — Fri, 09 Jun 2017 11:13:29 +0530

amit.gupta – 10 file(s) modified
Fixed controllers related to address

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentStatusResponse.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/FofoItemId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21659 – Fixed json stream

amit.gupta — Thu, 08 Jun 2017 14:39:45 +0530

amit.gupta – 1 file(s) modified
Fixed json stream

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/util/ResponseSender.java

Rev 21658 – Added repository

amit.gupta — Thu, 08 Jun 2017 13:08:54 +0530

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

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21651 –

amit.gupta — Wed, 07 Jun 2017 13:33:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 21649 – Added Config

amit.gupta — Tue, 06 Jun 2017 23:06:12 +0530

amit.gupta – 3 file(s) modified
Added Config

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java

Rev 21648 – removed conflicting code

amit.gupta — Tue, 06 Jun 2017 21:50:26 +0530

amit.gupta – 3 file(s) modified
removed conflicting code

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/api
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/dao
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/service

Rev 21647 – These files have moved to dao layer

amit.gupta — Tue, 06 Jun 2017 21:36:46 +0530

amit.gupta – 1 file(s) modified
These files have moved to dao layer

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/fofo/dao/repository

Rev 21643 –

ashik.ali — Tue, 06 Jun 2017 20:56:03 +0530

ashik.ali – 10 file(s) modified

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/client
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration/SchemeType.java

Rev 21593 – Added dependencies

amit.gupta — Wed, 31 May 2017 13:41:52 +0530

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

~ /trunk/profitmandi-web/pom.xml

Rev 21556 –

ashik.ali — Thu, 25 May 2017 15:05:41 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 21550 – moved to profitmandi-common and profitmandi-dao project

ashik.ali — Wed, 24 May 2017 15:21:01 +0530

ashik.ali – 3 file(s) modified
moved to profitmandi-common and profitmandi-dao project

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift

Rev 21549 – Moved to profitmandi-dao project

ashik.ali — Wed, 24 May 2017 15:17:39 +0530

ashik.ali – 1 file(s) modified
Moved to profitmandi-dao project

x /trunk/profitmandi-web/src/main/resources/database.properties

Rev 21548 – moved to profitmandi-common project

ashik.ali — Wed, 24 May 2017 15:16:35 +0530

ashik.ali – 1 file(s) modified
moved to profitmandi-common project

x /trunk/profitmandi-web/src/main/resources/response-codes.properties

Rev 21539 – Fixed pom

amit.gupta — Tue, 23 May 2017 15:11:59 +0530

amit.gupta – 1 file(s) modified
Fixed pom

~ /trunk/profitmandi-web/pom.xml