SmartDukaan – /

Rev 24410 – Fixed pricing

amit.gupta — Sun, 06 Jan 2019 17:31:04 +0530

amit.gupta – 10 file(s) modified
Fixed pricing

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemDescriptionModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24409 – Fixed pricedrop issue

amit.gupta — Sun, 06 Jan 2019 12:42:30 +0530

amit.gupta – 4 file(s) modified
Fixed pricedrop issue

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24408 –

amit.gupta — Fri, 04 Jan 2019 16:07:18 +0530

amit.gupta – 1 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/DepartmentCategoryService.java

Rev 24407 – Region,PartnerRegion and Region Entity

govind — Fri, 04 Jan 2019 15:18:08 +0530

govind – 5 file(s) modified
Region,PartnerRegion and Region Entity

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/PartnerRegion.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Position.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Region.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/cs
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/cs/EscalationType.java

Rev 24406 – Fixed changes related to item acitve/pause

amit.gupta — Thu, 03 Jan 2019 14:44:30 +0530

amit.gupta – 11 file(s) modified
Fixed changes related to item acitve/pause

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24405 –

govind — Wed, 02 Jan 2019 16:59:25 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 24404 –

amit.gupta — Tue, 01 Jan 2019 15:05:26 +0530

amit.gupta – 12 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/DateTimePattern.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminDeliveryNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminInventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/InstructionItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/ScanOutPartnerItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Vendor.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Warehouse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.java

Rev 24403 – fixed

amit.gupta — Tue, 01 Jan 2019 15:02:53 +0530

amit.gupta – 1 file(s) modified
fixed

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

Rev 24402 – Fixed date formatting

amit.gupta — Tue, 01 Jan 2019 12:39:03 +0530

amit.gupta – 15 file(s) modified
Fixed date formatting

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/DailyRecharge.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PunchInOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeCommission.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeProviderCreditWalletHistory.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeTransaction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.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/fofo/PartnerTargetDetails.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 24401 –

amit.gupta — Mon, 31 Dec 2018 18:35:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 24400 –

amit.gupta — Mon, 31 Dec 2018 18:26:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 24399 – Added new version

amit.gupta — Sat, 29 Dec 2018 20:00:18 +0530

amit.gupta – 1 file(s) modified
Added new version

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

Rev 24398 –

amit.gupta — Fri, 28 Dec 2018 15:34:24 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationCampaigns.java

Rev 24397 –

amit.gupta — Fri, 28 Dec 2018 14:34:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/ProfitMandiNewPushNotificationSender.py

Rev 24396 –

amit.gupta — Fri, 28 Dec 2018 14:32:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/ProfitMandiNewPushNotificationSender.py

Rev 24395 –

amit.gupta — Fri, 28 Dec 2018 13:30:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/ProfitMandiNewPushNotificationSender.py

Rev 24394 –

amit.gupta — Fri, 28 Dec 2018 13:24:12 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/ProfitMandiNewPushNotificationSender.py

Rev 24393 –

amit.gupta — Fri, 28 Dec 2018 12:35:22 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/ProfitMandiNotificationSenderStart.sh

Rev 24392 –

amit.gupta — Fri, 28 Dec 2018 12:34:03 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/ProfitMandiNotificationSenderStart.sh

Rev 24391 –

amit.gupta — Fri, 28 Dec 2018 12:21:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Config/live.php

Rev 24390 –

amit.gupta — Fri, 28 Dec 2018 12:20:59 +0530

amit.gupta – 4 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Config/dev.php
~ /trunk/DtrMobileAppDashboard/app/Config/live.php
~ /trunk/DtrMobileAppDashboard/app/Config/staging.php
~ /trunk/DtrMobileAppDashboard/app/webroot/js/profittill.js

Rev 24389 –

amit.gupta — Fri, 28 Dec 2018 11:42:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 24388 –

amit.gupta — Fri, 28 Dec 2018 11:40:43 +0530

amit.gupta – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Activity.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java

Rev 24387 – Fixed dashboard

amit.gupta — Fri, 28 Dec 2018 11:39:20 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24386 – Fixed dtr-data to dtr

amit.gupta — Thu, 27 Dec 2018 17:49:55 +0530

amit.gupta – 1 file(s) modified
Fixed dtr-data to dtr

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

Rev 24385 – Fixed cod allowed

amit.gupta — Thu, 27 Dec 2018 17:47:53 +0530

amit.gupta – 1 file(s) modified
Fixed cod allowed

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

Rev 24384 – Added last activity

amit.gupta — Thu, 27 Dec 2018 17:43:48 +0530

amit.gupta – 1 file(s) modified
Added last activity

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java

Rev 24383 – Added major commit to remove dtr-data

amit.gupta — Thu, 27 Dec 2018 17:32:47 +0530

amit.gupta – 53 file(s) modified
Added major commit to remove dtr-data

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Activity.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketSubCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivityType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketCategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketCategoryRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepositoryImpl.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/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.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/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.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/css/login.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth-users-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/change-auth-user-password.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/forget-password.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
~ /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
~ /trunk/PyDTR/src/scripts/ActivityReport.py
~ /trunk/PyDTR/src/scripts/ProfitMandiPushNotificationSender.py
~ /trunk/PyDTR/src/scripts/pushbatchcreditnotification.py
~ /trunk/PyDTR/src/scripts/UserSegmentationLinksMaster.py

Rev 24382 –

amit.gupta — Mon, 24 Dec 2018 21:12:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java

Rev 24381 –

amit.gupta — Sat, 22 Dec 2018 17:05:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 24380 – Fixed js

amit.gupta — Sat, 22 Dec 2018 14:44:08 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24379 –

amit.gupta — Sat, 22 Dec 2018 12:16:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 24378 –

amit.gupta — Sat, 22 Dec 2018 12:16:14 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24377 –

amit.gupta — Sat, 22 Dec 2018 01:59:47 +0530

amit.gupta – 1 file(s) modified

x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services1.vm

Rev 24376 – Fixed item typeahead

amit.gupta — Sat, 22 Dec 2018 01:29:02 +0530

amit.gupta – 4 file(s) modified
Fixed item typeahead

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services1.vm

Rev 24375 – Fixed address

amit.gupta — Fri, 21 Dec 2018 18:16:27 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 24374 –

amit.gupta — Fri, 21 Dec 2018 16:43:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 24373 –

amit.gupta — Fri, 21 Dec 2018 15:41:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java

Rev 24372 –

amit.gupta — Fri, 21 Dec 2018 15:38:59 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepositoryImpl.java

Rev 24371 –

amit.gupta — Fri, 21 Dec 2018 14:47:39 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js