SmartDukaan – /

Rev 30502 – Fixed ahead issue

amit.gupta — Thu, 26 May 2022 13:02:06 +0530

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

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

Rev 30501 – Fixed ahead issue

amit.gupta — Thu, 26 May 2022 13:01:00 +0530

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

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

Rev 30500 – Fixed ahead issue

amit.gupta — Thu, 26 May 2022 12:57:36 +0530

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

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

Rev 30499 – Fixed category

amit.gupta — Thu, 26 May 2022 12:46:36 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/tag-listing-brands.vm

Rev 30498 –

tejbeer — Thu, 26 May 2022 12:01:15 +0530

tejbeer – 1 file(s) modified

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

Rev 30497 – Fixed ahead issue

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

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-brands-to-service.vm

Rev 30496 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 21:10:28 +0530

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

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/tag-listing-brands.vm

Rev 30495 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 21:08:12 +0530

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

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

Rev 30494 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 21:07:06 +0530

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

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

Rev 30493 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 21:03:03 +0530

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

Rev 30492 – Added Category option

amit.gupta — Wed, 25 May 2022 20:58:38 +0530

amit.gupta – 7 file(s) modified
Added Category option

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.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-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/service.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 30491 – Fixed ahead issue

amit.gupta — Wed, 25 May 2022 20:57:36 +0530

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

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

Rev 30490 –

tejbeer — Wed, 25 May 2022 18:12:02 +0530

tejbeer – 1 file(s) modified

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

Rev 30489 – Added Einvoice Files

amit.gupta — Wed, 25 May 2022 17:50:32 +0530

amit.gupta – 1 file(s) modified
Added Einvoice Files

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

Rev 30488 –

tejbeer — Wed, 25 May 2022 17:49:33 +0530

tejbeer – 1 file(s) modified

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

Rev 30487 – change

tejbeer — Wed, 25 May 2022 17:41:22 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FranchiseeVisit.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/HyperTrackController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 30486 –

tejbeer — Wed, 25 May 2022 15:27:35 +0530

tejbeer – 1 file(s) modified

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

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