SmartDukaan – /

Rev 21368 –

kshitij.sood — Thu, 04 May 2017 15:29:51 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21367 – Added changes related to cashback description.

amit.gupta — Thu, 04 May 2017 14:50:28 +0530

amit.gupta – 3 file(s) modified
Added changes related to cashback description.

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

Rev 21366 –

kshitij.sood — Thu, 04 May 2017 13:32:46 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21365 –

ashik.ali — Thu, 04 May 2017 13:31:57 +0530

ashik.ali – 1 file(s) modified

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserRequest.java

Rev 21364 –

kshitij.sood — Thu, 04 May 2017 13:11:56 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21363 –

kshitij.sood — Thu, 04 May 2017 13:08:37 +0530

kshitij.sood – 5 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserWalletCreditController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 21362 –

kshitij.sood — Wed, 03 May 2017 14:28:41 +0530

kshitij.sood – 5 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.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 21361 –

kshitij.sood — Wed, 03 May 2017 14:04:47 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/pom.xml

Rev 21360 –

kshitij.sood — Wed, 03 May 2017 14:03:26 +0530

kshitij.sood – 3 file(s) modified

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/OtpRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 21359 –

kshitij.sood — Wed, 03 May 2017 12:04:05 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21358 –

kshitij.sood — Wed, 03 May 2017 12:01:42 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21357 –

kshitij.sood — Wed, 03 May 2017 11:57:02 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21356 –

kshitij.sood — Wed, 03 May 2017 11:56:14 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21355 –

kshitij.sood — Wed, 03 May 2017 11:31:42 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21354 –

kshitij.sood — Wed, 03 May 2017 11:29:40 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/GenericClient.java

Rev 21353 –

kshitij.sood — Wed, 03 May 2017 11:27:41 +0530

kshitij.sood – 5 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/config/ConfigClient.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/Logger.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/LoggerUtil.java (copied from /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/Logger.java@21350)
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req
x /trunk/profitmandi-web/src/main/java/in

Rev 21352 –

kshitij.sood — Wed, 03 May 2017 11:22:26 +0530

kshitij.sood – 2 file(s) modified

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

Rev 21351 –

kshitij.sood — Wed, 03 May 2017 11:21:35 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/config/ConfigClient.java

Rev 21350 –

kshitij.sood — Wed, 03 May 2017 11:17:21 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/Logger.java

Rev 21349 –

kshitij.sood — Wed, 03 May 2017 11:15:27 +0530

kshitij.sood – 2 file(s) modified

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/config
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/config/ConfigClient.java (copied from /trunk/profitmandi-web/src/main/java/in/shop2020/thrift/clients/config/ConfigClient.java@21348)

Rev 21348 –

kshitij.sood — Wed, 03 May 2017 11:08:19 +0530

kshitij.sood – 30 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/thrift
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/AlertClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/CatalogClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/ConfigClientKeys.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/ContentClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/CRMClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/DtrClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/GenericClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/HelperClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/InventoryClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/Logger.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/LogisticsClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/PaymentClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/PromotionClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/PurchaseClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/TransactionClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/UserClient.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/thrift/clients/WarehouseClient.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/DealBrands.java
+ /trunk/profitmandi-web/src/main/java/in
+ /trunk/profitmandi-web/src/main/java/in/shop2020
+ /trunk/profitmandi-web/src/main/java/in/shop2020/thrift
+ /trunk/profitmandi-web/src/main/java/in/shop2020/thrift/clients
+ /trunk/profitmandi-web/src/main/java/in/shop2020/thrift/clients/config
+ /trunk/profitmandi-web/src/main/java/in/shop2020/thrift/clients/config/ConfigClient.java

Rev 21347 –

kshitij.sood — Wed, 03 May 2017 00:01:56 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/pom.xml

Rev 21346 –

ashik.ali — Tue, 02 May 2017 18:16:55 +0530

ashik.ali – 1 file(s) modified

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

Rev 21345 –

ashik.ali — Tue, 02 May 2017 18:11:13 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepositoryImpl.java

Rev 21344 –

kshitij.sood — Tue, 02 May 2017 17:36:22 +0530

kshitij.sood – 3 file(s) modified

~ /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 21343 –

kshitij.sood — Tue, 02 May 2017 17:23:55 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/profitmandi-web/pom.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-web/src/main/resources/META-INF/env.property

Rev 21342 –

kshitij.sood — Tue, 02 May 2017 14:21:45 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21341 –

kshitij.sood — Tue, 02 May 2017 14:12:40 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/resources/META-INF/persistence.xml

Rev 21340 –

kshitij.sood — Tue, 02 May 2017 14:06:53 +0530

kshitij.sood – 2 file(s) modified

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

Rev 21339 –

kshitij.sood — Tue, 02 May 2017 14:04:58 +0530

kshitij.sood – 16 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/client/RestClient.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/model/ProfitMandiResponse.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/AvailabilityInfo.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/BulkPricing.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/DealObjectResponse.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/DealsResponse.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/DetailedSpecs.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/Entity.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/EntityResponse.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/Images.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/Specs.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties

Rev 21338 –

amit.gupta — Tue, 02 May 2017 00:18:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21337 –

amit.gupta — Tue, 02 May 2017 00:05:59 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21336 –

amit.gupta — Mon, 01 May 2017 23:40:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21335 –

amit.gupta — Mon, 01 May 2017 19:30:45 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21334 –

amit.gupta — Mon, 01 May 2017 19:20:01 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21333 –

amit.gupta — Mon, 01 May 2017 18:48:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/api/Order.py

Rev 21332 –

amit.gupta — Mon, 01 May 2017 18:25:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/main.py

Rev 21331 –

amit.gupta — Mon, 01 May 2017 18:22:36 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/main.py

Rev 21330 –

amit.gupta — Mon, 01 May 2017 18:22:21 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21329 – notification icon

rajender — Mon, 01 May 2017 17:17:09 +0530

rajender – 1 file(s) modified
notification icon

~ /trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/MyFirebaseMessagingService.java