SmartDukaan – /

Rev 21474 –

amit.gupta — Mon, 15 May 2017 11:35:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java

Rev 21473 –

amit.gupta — Mon, 15 May 2017 11:34:34 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java

Rev 21472 – Fixed Otp Repository

amit.gupta — Mon, 15 May 2017 00:31:00 +0530

amit.gupta – 5 file(s) modified
Fixed Otp Repository

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/OtpRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/OtpRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/SimpleCORSInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java

Rev 21471 –

amit.gupta — Sun, 14 May 2017 23:12:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java

Rev 21470 –

amit.gupta — Sun, 14 May 2017 22:57:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java

Rev 21469 – Added changes related to payu

amit.gupta — Sun, 14 May 2017 22:52:45 +0530

amit.gupta – 16 file(s) modified
Added changes related to payu

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/UserInfo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CommonPaymentService.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/checkout/PayuHandler.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration/UserStatus.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

Rev 21468 –

kshitij.sood — Fri, 12 May 2017 22:35:57 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/Utils.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/DenominationType.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

Rev 21467 – Fixed Namedqueries

amit.gupta — Fri, 12 May 2017 20:00:18 +0530

amit.gupta – 2 file(s) modified
Fixed Namedqueries

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java

Rev 21466 –

ashik.ali — Fri, 12 May 2017 18:41:49 +0530

ashik.ali – 1 file(s) modified

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

Rev 21465 –

ashik.ali — Fri, 12 May 2017 18:38:32 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java

Rev 21464 –

kshitij.sood — Fri, 12 May 2017 18:26:49 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/RechargeType.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

Rev 21463 –

ashik.ali — Fri, 12 May 2017 18:20:25 +0530

ashik.ali – 16 file(s) modified

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomLineItem.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomOrder.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomOrderDetail.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomTransaction.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomTransactionOrder.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ShippingAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/OrderRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/OrderRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.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/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java

Rev 21462 –

kshitij.sood — Fri, 12 May 2017 15:41:05 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21461 –

kshitij.sood — Fri, 12 May 2017 14:56:51 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21460 –

kshitij.sood — Fri, 12 May 2017 13:47:38 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 21459 –

kshitij.sood — Fri, 12 May 2017 13:41:56 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21458 –

kshitij.sood — Fri, 12 May 2017 13:41:38 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21457 – Fixed token response

amit.gupta — Fri, 12 May 2017 13:02:50 +0530

amit.gupta – 1 file(s) modified
Fixed token response

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

Rev 21456 –

amit.gupta — Fri, 12 May 2017 12:44:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java

Rev 21455 – Excluded path for google

amit.gupta — Fri, 12 May 2017 12:32:29 +0530

amit.gupta – 1 file(s) modified
Excluded path for google

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java

Rev 21454 – Order creation changes

amit.gupta — Fri, 12 May 2017 10:19:57 +0530

amit.gupta – 6 file(s) modified
Order creation changes

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 21453 – Added self pickup flag while creating orders

amit.gupta — Fri, 12 May 2017 10:10:04 +0530

amit.gupta – 1 file(s) modified
Added self pickup flag while creating orders

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java

Rev 21452 – Added Auth Interceptor related changes/Provided userid in attribut

amit.gupta — Fri, 12 May 2017 10:06:19 +0530

amit.gupta – 12 file(s) modified
Added Auth Interceptor related changes/Provided userid in attribut

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserAccountImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserAccountRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserCart.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.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/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/model/ProfitMandiResponse.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/order/OrderCreationResponsePojo.java
~ /trunk/profitmandi-web/src/main/resources/response-codes.properties

Rev 21451 – Fixed logging

amit.gupta — Thu, 11 May 2017 20:36:01 +0530

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

~ /trunk/profitmandi-web/src/main/resources/log4j.xml

Rev 21450 –

ashik.ali — Thu, 11 May 2017 19:56:44 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 21449 –

ashik.ali — Thu, 11 May 2017 19:53:08 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-web/src/main/resources/log4j.xml
~ /trunk/profitmandi-web/src/main/resources/response-codes.properties

Rev 21448 –

ashik.ali — Thu, 11 May 2017 19:52:09 +0530

ashik.ali – 40 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerRegisteredAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/ShopAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/DocumentRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PostOfficeRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepositoryImpl.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/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/GlobalExceptionHandler.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/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/req/RetailerAddBrandRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/util/ResponseSender.java

Rev 21447 –

kshitij.sood — Thu, 11 May 2017 17:15:41 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties

Rev 21446 –

kshitij.sood — Thu, 11 May 2017 16:51:16 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

Rev 21445 –

kshitij.sood — Thu, 11 May 2017 16:50:37 +0530

kshitij.sood – 2 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 21444 –

kshitij.sood — Thu, 11 May 2017 14:55:18 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 21443 –

kshitij.sood — Thu, 11 May 2017 14:41:10 +0530

kshitij.sood – 9 file(s) modified

~ /trunk/profitmandi-web/pom.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/services/MemCache.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/services/SnapdealProductPageParser.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/model/LimitedMasterDataPojo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/Mongo.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/LivePricingResponse.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/UserMessagePojo.java

Rev 21442 –

kshitij.sood — Thu, 11 May 2017 14:30:13 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/utils/FetchLivePrices.py

Rev 21441 –

kshitij.sood — Thu, 11 May 2017 14:28:38 +0530

kshitij.sood – 4 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/dtr/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/dtr/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/dtr/LivePricing.java
~ /trunk/ThriftGen/thriftsrc/DtrService/DtrService.thrift

Rev 21440 –

ashik.ali — Thu, 11 May 2017 13:41:23 +0530

ashik.ali – 15 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.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/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/checkout/PayuPayResponseController.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/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/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java

Rev 21439 –

ashik.ali — Thu, 11 May 2017 13:26:31 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/model/ProfitMandiResponse.java

Rev 21438 –

ashik.ali — Thu, 11 May 2017 13:23:01 +0530

ashik.ali – 2 file(s) modified

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

Rev 21437 – Fixed request info

amit.gupta — Thu, 11 May 2017 12:52:47 +0530

amit.gupta – 1 file(s) modified
Fixed request info

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

Rev 21436 –

kshitij.sood — Wed, 10 May 2017 20:25:33 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/UploadResponse.java

Rev 21435 –

ashik.ali — Wed, 10 May 2017 20:21:27 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Brand.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/DocumentRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java