SmartDukaan – /

Rev 30485 – change

tejbeer — Wed, 25 May 2022 15:24:49 +0530

tejbeer – 19 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FranchiseeVisit.java
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/build-config.js
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/CHANGES.md
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/ckEditor.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/ckeditor.js
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/config.js
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/contents.css
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/lang
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/LICENSE.md
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/plugins
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/README.md
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/samples
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/skins
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/ckeditor/styles.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 30484 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 14:59:40 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java

Rev 30483 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 13:51:08 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java

Rev 30482 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 13:40:07 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java

Rev 30481 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 13:38:05 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java

Rev 30480 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 13:34:02 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java

Rev 30479 – Fixed GRN

amit.gupta — Wed, 25 May 2022 13:25:22 +0530

amit.gupta – 6 file(s) modified
Fixed GRN

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java

Rev 30478 – Fixed leads logic

amit.gupta — Tue, 24 May 2022 20:44:16 +0530

amit.gupta – 1 file(s) modified
Fixed leads logic

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

Rev 30477 – Fixed leads logic

amit.gupta — Tue, 24 May 2022 20:43:56 +0530

amit.gupta – 1 file(s) modified
Fixed leads logic

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

Rev 30476 – Fixed leads logic

amit.gupta — Tue, 24 May 2022 19:31:22 +0530

amit.gupta – 1 file(s) modified
Fixed leads logic

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

Rev 30475 – Fixed leads logic

amit.gupta — Tue, 24 May 2022 18:44:37 +0530

amit.gupta – 1 file(s) modified
Fixed leads logic

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

Rev 30474 – Added virtual stock

amit.gupta — Tue, 24 May 2022 18:27:52 +0530

amit.gupta – 1 file(s) modified
Added virtual stock

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

Rev 30473 – Fixed ahead issue

amit.gupta — Tue, 24 May 2022 16:56:10 +0530

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

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

Rev 30472 – Fixed ahead issue

amit.gupta — Tue, 24 May 2022 12:55:54 +0530

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

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

Rev 30471 – Fixed ahead issue

amit.gupta — Tue, 24 May 2022 12:06:25 +0530

amit.gupta – 5 file(s) modified
Fixed ahead issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModel.java
~ /trunk/profitmandi-fofo/build.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/categorywise-circular.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 30470 – Fixed issue

amit.gupta — Mon, 23 May 2022 19:31:04 +0530

amit.gupta – 2 file(s) modified
Fixed 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/OfferController.java

Rev 30469 – Fixed ahead issue

amit.gupta — Mon, 23 May 2022 11:12:45 +0530

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

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

Rev 30468 – Fixed ahead issue

amit.gupta — Sun, 22 May 2022 14:15:45 +0530

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

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

Rev 30467 – Fixed ahead issue

amit.gupta — Sun, 22 May 2022 14:12:50 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java

Rev 30466 – Fixed issues with activated imeis

amit.gupta — Sun, 22 May 2022 14:02:04 +0530

amit.gupta – 3 file(s) modified
Fixed issues with activated imeis

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 30465 – Fixed ahead issue

amit.gupta — Sun, 22 May 2022 13:59:10 +0530

amit.gupta – 3 file(s) modified
Fixed ahead issue

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activated-imeis-grn-pending.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-activated-imeis.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-grn-pending-activated-imeis.vm

Rev 30464 – Fixed ahead issue

amit.gupta — Sat, 21 May 2022 19:22:12 +0530

amit.gupta – 2 file(s) modified
Fixed ahead issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java

Rev 30463 – Changed working of Special Support also added in nlc calculations

amit.gupta — Sat, 21 May 2022 19:18:05 +0530

amit.gupta – 4 file(s) modified
Changed working of Special Support also added in nlc calculations

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 30462 –

tejbeer — Sat, 21 May 2022 18:57:14 +0530

tejbeer – 1 file(s) modified

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

Rev 30461 –

tejbeer — Sat, 21 May 2022 18:49:05 +0530

tejbeer – 1 file(s) modified

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

Rev 30460 –

tejbeer — Sat, 21 May 2022 18:42:41 +0530

tejbeer – 1 file(s) modified

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

Rev 30459 –

tejbeer — Sat, 21 May 2022 17:07:35 +0530

tejbeer – 1 file(s) modified

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

Rev 30458 –

tejbeer — Sat, 21 May 2022 17:01:49 +0530

tejbeer – 4 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCollectionPlanModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerCollectionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-health.vm

Rev 30457 – Fixed ahead issue

amit.gupta — Sat, 21 May 2022 14:08:09 +0530

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

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

Rev 30456 – Fixed ahead issue

amit.gupta — Sat, 21 May 2022 14:05:56 +0530

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

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

Rev 30455 – Fixed ahead issue

amit.gupta — Sat, 21 May 2022 14:05:30 +0530

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

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

Rev 30454 – Fixed scheme issue

amit.gupta — Sat, 21 May 2022 14:04:06 +0530

amit.gupta – 7 file(s) modified
Fixed scheme issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateSchemeRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 30453 –

tejbeer — Sat, 21 May 2022 13:22:02 +0530

tejbeer – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 30452 –

tejbeer — Sat, 21 May 2022 11:23:34 +0530

tejbeer – 1 file(s) modified

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

Rev 30451 –

tejbeer — Fri, 20 May 2022 19:03:29 +0530

tejbeer – 1 file(s) modified

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

Rev 30450 – Added Logic for Offer

amit.gupta — Fri, 20 May 2022 16:27:57 +0530

amit.gupta – 1 file(s) modified
Added Logic for Offer

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/SchemeType.java

Rev 30449 – Added Offer Changes

amit.gupta — Fri, 20 May 2022 16:21:59 +0530

amit.gupta – 19 file(s) modified
Added Offer Changes

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ImeiActivationTimestampModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.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/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/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 30448 – Fixed leads logic

amit.gupta — Fri, 20 May 2022 08:04:59 +0530

amit.gupta – 1 file(s) modified
Fixed leads logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java

Rev 30447 – Fixed leads logic

amit.gupta — Fri, 20 May 2022 07:05:24 +0530

amit.gupta – 1 file(s) modified
Fixed leads logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java

Rev 30446 – Fixed leads logic

amit.gupta — Thu, 19 May 2022 20:02:51 +0530

amit.gupta – 1 file(s) modified
Fixed leads logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java