SmartDukaan – /

Rev 22388 –

amit.gupta — Tue, 05 Sep 2017 17:45:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/main/java/in/shop2020/util/EntityUtils.java

Rev 22387 –

amit.gupta — Tue, 05 Sep 2017 16:55:21 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py

Rev 22386 –

amit.gupta — Tue, 05 Sep 2017 08:24:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java

Rev 22385 –

amit.gupta — Tue, 05 Sep 2017 08:08:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java

Rev 22384 – Added image to lineitem

amit.gupta — Tue, 05 Sep 2017 07:37:34 +0530

amit.gupta – 6 file(s) modified
Added image to lineitem

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomLineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ProductPojo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/ContentPojoPopulator.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.java

Rev 22383 –

amit.gupta — Mon, 04 Sep 2017 16:16:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/webapp/js/common.js

Rev 22382 –

amit.gupta — Mon, 04 Sep 2017 15:28:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/webapp/js/common.js

Rev 22381 –

rajender — Mon, 04 Sep 2017 12:13:40 +0530

rajender – 7 file(s) modified

~ /app/app/src/main/java/com/saholic/profittill/main/DealsHomeFragment.java
~ /app/app/src/main/java/com/saholic/profittill/main/LoginActivity.java
~ /app/app/src/main/java/com/saholic/profittill/main/MainActivity.java
~ /app/app/src/main/java/com/saholic/profittill/main/SearchFragment.java
~ /app/app/src/main/java/com/saholic/profittill/MyFirebaseInstanceIDService.java
~ /app/app/src/main/java/com/saholic/profittill/MyFirebaseMessagingService.java
~ /app/app/src/main/java/com/saholic/profittill/SplashScreen.java

Rev 22380 –

rajender — Mon, 04 Sep 2017 12:09:31 +0530

rajender – 1 file(s) modified

~ /trunk/ProfitMandiAndroid/app/build.gradle

Rev 22379 –

rajender — Mon, 04 Sep 2017 12:05:15 +0530

rajender – 1 file(s) modified

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

Rev 22378 –

rajender — Mon, 04 Sep 2017 12:01:46 +0530

rajender – 1 file(s) modified

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

Rev 22377 –

rajender — Mon, 04 Sep 2017 11:58:41 +0530

rajender – 1 file(s) modified

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

Rev 22376 –

amit.gupta — Mon, 04 Sep 2017 11:37:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp

Rev 22375 – This will ensure that single item update wont fail

amit.gupta — Sun, 03 Sep 2017 11:25:37 +0530

amit.gupta – 1 file(s) modified
This will ensure that single item update wont fail

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 22374 –

amit.gupta — Sun, 03 Sep 2017 10:21:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/update-content-and-catalog.sh

Rev 22373 –

amit.gupta — Sun, 03 Sep 2017 10:19:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/generate-content-from-catalog.sh

Rev 22372 –

amit.gupta — Sat, 02 Sep 2017 22:09:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 22371 – Fixed bug for GST.

amit.gupta — Fri, 01 Sep 2017 18:41:19 +0530

amit.gupta – 1 file(s) modified
Fixed bug for GST.

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

Rev 22370 –

amit.gupta — Thu, 31 Aug 2017 20:26:17 +0530

amit.gupta – 1 file(s) modified

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

Rev 22369 – Fixed Wallet payment

amit.gupta — Thu, 31 Aug 2017 19:49:29 +0530

amit.gupta – 1 file(s) modified
Fixed Wallet payment

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

Rev 22368 –

amit.gupta — Thu, 31 Aug 2017 18:58:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 22367 –

amit.gupta — Thu, 31 Aug 2017 18:52:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 22366 –

ashik.ali — Thu, 31 Aug 2017 17:45:44 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 22365 –

ashik.ali — Thu, 31 Aug 2017 17:45:19 +0530

ashik.ali – 1 file(s) modified

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

Rev 22364 – Verify Retailer Feature

ashik.ali — Thu, 31 Aug 2017 17:45:00 +0530

ashik.ali – 4 file(s) modified
Verify Retailer Feature

~ /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/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 22363 – Verify Retailer Feature

ashik.ali — Thu, 31 Aug 2017 17:43:15 +0530

ashik.ali – 5 file(s) modified
Verify Retailer Feature

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
x /trunk/Crm/src/main/java/in/shop2020/serving/controllers/VerifyDocController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm
x /trunk/Crm/src/main/webapp/WEB-INF/content/verify-doc-index.vm

Rev 22362 –

amit.gupta — Thu, 31 Aug 2017 16:03:08 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22361 – Fixed retailer bug

amit.gupta — Thu, 31 Aug 2017 15:58:22 +0530

amit.gupta – 1 file(s) modified
Fixed retailer bug

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

Rev 22360 –

ashik.ali — Thu, 31 Aug 2017 15:00:03 +0530

ashik.ali – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 22359 –

ashik.ali — Thu, 31 Aug 2017 14:58:40 +0530

ashik.ali – 2 file(s) modified

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

Rev 22358 –

ashik.ali — Thu, 31 Aug 2017 14:57:32 +0530

ashik.ali – 5 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 22357 –

amit.gupta — Thu, 31 Aug 2017 14:50:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 22356 –

ashik.ali — Thu, 31 Aug 2017 13:15:37 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java

Rev 22355 –

ashik.ali — Thu, 31 Aug 2017 13:15:16 +0530

ashik.ali – 4 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/controller/RetailerController.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

Rev 22354 –

ashik.ali — Thu, 31 Aug 2017 13:04:27 +0530

ashik.ali – 17 file(s) modified

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 22353 –

ashik.ali — Thu, 31 Aug 2017 13:01:41 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22352 –

ashik.ali — Thu, 31 Aug 2017 12:57:03 +0530

ashik.ali – 34 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotBuyBack.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotBuyBackId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/User.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserAccounts.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Cart.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Counter.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUser.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUserAddressId.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUserAddressMapping.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/User.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CartRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CartRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserAddressMappingRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserAddressMappingRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MongoMigrationUtil.java@22214)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MongoMigrationUtil.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/UserToRetailerMigrationUtil.java

Rev 22351 –

ashik.ali — Thu, 31 Aug 2017 12:51:38 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 22350 –

ashik.ali — Thu, 31 Aug 2017 12:49:41 +0530

ashik.ali – 4 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-info-index.vm

Rev 22349 – Added to cart.

amit.gupta — Wed, 30 Aug 2017 18:35:37 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py