SmartDukaan – /

Rev 24461 – Fixed changes related to old schemes

amit.gupta — Wed, 30 Jan 2019 14:47:16 +0530

amit.gupta – 2 file(s) modified
Fixed changes related to old schemes

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

Rev 24460 – Margins should be added when scheme is rolled back earlier ...

amit.gupta — Wed, 30 Jan 2019 13:28:41 +0530

amit.gupta – 1 file(s) modified
Margins should be added when scheme is rolled back earlier due to cancellation

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

Rev 24459 –

amit.gupta — Wed, 30 Jan 2019 08:53:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 24458 –

amit.gupta — Wed, 30 Jan 2019 08:41:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 24457 – Fixed overlay issue while grn

amit.gupta — Wed, 30 Jan 2019 08:40:59 +0530

amit.gupta – 5 file(s) modified
Fixed overlay issue while grn

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bootbox.min.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24456 –

amit.gupta — Wed, 30 Jan 2019 07:51:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 24455 –

amit.gupta — Tue, 29 Jan 2019 21:17:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 24454 –

amit.gupta — Tue, 29 Jan 2019 21:15:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 24453 –

amit.gupta — Tue, 29 Jan 2019 21:14:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 24452 –

govind — Tue, 29 Jan 2019 12:22:17 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java

Rev 24451 –

govind — Tue, 29 Jan 2019 10:19:04 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth-users-paginated.vm

Rev 24450 – Added wiseapp policies

amit.gupta — Mon, 28 Jan 2019 17:56:42 +0530

amit.gupta – 2 file(s) modified
Added wiseapp policies

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

Rev 24449 – Fixed javascript ordering.

amit.gupta — Sat, 26 Jan 2019 12:31:24 +0530

amit.gupta – 1 file(s) modified
Fixed javascript ordering.

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

Rev 24448 –

amit.gupta — Sat, 26 Jan 2019 12:26:57 +0530

amit.gupta – 1 file(s) modified

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

Rev 24447 – Added promoter repository

amit.gupta — Sat, 26 Jan 2019 10:04:09 +0530

amit.gupta – 2 file(s) modified
Added promoter repository

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PromoterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestServiceImpl.java

Rev 24446 – Minor fixes

amit.gupta — Sat, 26 Jan 2019 08:46:19 +0530

amit.gupta – 2 file(s) modified
Minor fixes

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.ftl

Rev 24445 – Minor fixes

amit.gupta — Sat, 26 Jan 2019 08:43:44 +0530

amit.gupta – 2 file(s) modified
Minor fixes

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

Rev 24444 – Fixed Profitmandi

amit.gupta — Sat, 26 Jan 2019 02:38:39 +0530

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

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

Rev 24443 – Fixed versioning

amit.gupta — Sat, 26 Jan 2019 02:19:04 +0530

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

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

Rev 24442 – Resticted jio to minimum 5pcs

amit.gupta — Sat, 26 Jan 2019 02:02:35 +0530

amit.gupta – 1 file(s) modified
Resticted jio to minimum 5pcs

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

Rev 24441 –

amit.gupta — Sat, 26 Jan 2019 00:49:47 +0530

amit.gupta – 1 file(s) modified

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

Rev 24440 – Improved order creation and added Zest integration

amit.gupta — Sat, 26 Jan 2019 00:47:42 +0530

amit.gupta – 30 file(s) modified
Improved order creation and added Zest integration

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/DateTimePattern.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCustomer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InsuranceModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SerialNumberDetail.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WiseAppInsuaranceModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/MobileInsurancePlan.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/WiseappInsuranceServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/WiseappWebService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestResponseModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/ZestServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.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/OrderController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/icici.jpg
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/iffco.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/provider-logos/tataaig.png
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 24439 –

govind — Thu, 24 Jan 2019 18:21:34 +0530

govind – 18 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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/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/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-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
~ /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/managerTicket.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm

Rev 24438 –

amit.gupta — Tue, 22 Jan 2019 19:23:03 +0530

amit.gupta – 1 file(s) modified

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

Rev 24437 – Fixed logic For 90%

amit.gupta — Tue, 22 Jan 2019 19:21:17 +0530

amit.gupta – 1 file(s) modified
Fixed logic For 90%

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

Rev 24436 –

amit.gupta — Tue, 22 Jan 2019 10:47:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 24435 – Fixed overlay bug

amit.gupta — Mon, 21 Jan 2019 20:23:50 +0530

amit.gupta – 2 file(s) modified
Fixed overlay bug

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js

Rev 24434 –

amit.gupta — Mon, 21 Jan 2019 16:36:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-cron/build.gradle

Rev 24433 – Fixed issues

amit.gupta — Mon, 21 Jan 2019 16:34:24 +0530

amit.gupta – 5 file(s) modified
Fixed issues

+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/build.gradle (copied from /trunk/profitmandi-common/build.gradle@24182)
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/DBConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 24432 –

amit.gupta — Mon, 21 Jan 2019 15:16:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 24431 – Added Imeis to pricedrop imei on spring boot.

amit.gupta — Mon, 21 Jan 2019 14:11:02 +0530

amit.gupta – 5 file(s) modified
Added Imeis to pricedrop imei on spring boot.

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 24430 –

amit.gupta — Fri, 18 Jan 2019 18:53:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 24429 – promoter changes

tejbeer — Fri, 18 Jan 2019 18:34:05 +0530

tejbeer – 5 file(s) modified
promoter changes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PromoterDetailModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Promoter.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm

Rev 24428 –

amit.gupta — Fri, 18 Jan 2019 17:46:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 24427 –

amit.gupta — Fri, 18 Jan 2019 16:01:48 +0530

amit.gupta – 1 file(s) modified

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

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