SmartDukaan – /

Rev 24426 – Added brand restriction changes

amit.gupta — Fri, 18 Jan 2019 10:51:12 +0530

amit.gupta – 2 file(s) modified
Added brand restriction changes

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

amit.gupta — Thu, 17 Jan 2019 18:01:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 24424 –

amit.gupta — Thu, 17 Jan 2019 17:52:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 24423 –

amit.gupta — Thu, 17 Jan 2019 16:49:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/CartLine.java

Rev 24422 –

amit.gupta — Thu, 17 Jan 2019 16:24:58 +0530

amit.gupta – 2 file(s) modified

Rev 24421 – Resolved issues

amit.gupta — Thu, 17 Jan 2019 16:24:21 +0530

amit.gupta – 3 file(s) modified
Resolved issues

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/CartLine.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CartLineRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CartLineRepositoryImpl.java

Rev 24420 – Added cron to process schemes daily

amit.gupta — Thu, 17 Jan 2019 14:03:50 +0530

amit.gupta – 1 file(s) modified
Added cron to process schemes daily

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java

Rev 24419 –

amit.gupta — Wed, 16 Jan 2019 18:23:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

Rev 24418 – Added new js version

amit.gupta — Wed, 16 Jan 2019 15:58:14 +0530

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

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

Rev 24417 – Ticket related development

govind — Wed, 16 Jan 2019 15:25:26 +0530

govind – 38 file(s) modified
Ticket related development

~ /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/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/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/ActivityRepositoryImpl.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/PartnerRegionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerRegionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/RegionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/RegionRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-partner-region.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-position.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-region.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket-category.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket-sub-category.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-sub-categories.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-sub-category.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm

Rev 24416 – Fixed Recharge commission

amit.gupta — Mon, 14 Jan 2019 16:33:16 +0530

amit.gupta – 1 file(s) modified
Fixed Recharge commission

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

Rev 24415 –

amit.gupta — Tue, 08 Jan 2019 17:19:00 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 24414 – Fied

amit.gupta — Mon, 07 Jan 2019 16:12:45 +0530

amit.gupta – 4 file(s) modified
Fied

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.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/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js

Rev 24413 – Fixed colors issue

amit.gupta — Mon, 07 Jan 2019 13:14:37 +0530

amit.gupta – 1 file(s) modified
Fixed colors issue

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

Rev 24412 – Added new version

amit.gupta — Mon, 07 Jan 2019 12:22:06 +0530

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

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

Rev 24411 – Fixed price drop

amit.gupta — Mon, 07 Jan 2019 12:21:05 +0530

amit.gupta – 3 file(s) modified
Fixed price drop

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.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 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