SmartDukaan – /

Rev 31921 – Fixed scheme depenedncy issue

amit.gupta — Sat, 06 May 2023 14:35:21 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 31920 – Added inventoryPayoutModel

amit.gupta — Sat, 06 May 2023 14:34:38 +0530

amit.gupta – 6 file(s) modified
Added inventoryPayoutModel

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/InventoryPayoutModel.java

Rev 31919 – Fixed offer issues related to returns

amit.gupta — Fri, 05 May 2023 22:47:15 +0530

amit.gupta – 1 file(s) modified
Fixed offer issues related to returns

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

Rev 31918 – Fixed target slab

amit.gupta — Fri, 05 May 2023 22:40:57 +0530

amit.gupta – 2 file(s) modified
Fixed target slab

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

Rev 31917 – fixed common.js

amit.gupta — Fri, 05 May 2023 22:24:53 +0530

amit.gupta – 3 file(s) modified
fixed common.js

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-health.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm

Rev 31916 – Fixed additional scheme logic

amit.gupta — Fri, 05 May 2023 21:24:37 +0530

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

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

Rev 31915 – Fixed additional scheme logic

amit.gupta — Fri, 05 May 2023 21:24:10 +0530

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

~ /trunk/profitmandi-dao/src/main/resources/partner-code-created.vm

Rev 31914 – Added logic for activation

amit.gupta — Fri, 05 May 2023 19:25:08 +0530

amit.gupta – 2 file(s) modified
Added logic for activation

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

Rev 31913 – Fixed logic

amit.gupta — Fri, 05 May 2023 17:40:02 +0530

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

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

Rev 31912 – Fixed logic

amit.gupta — Fri, 05 May 2023 17:02:24 +0530

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

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

Rev 31911 – Fixed logic

amit.gupta — Fri, 05 May 2023 16:20:38 +0530

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

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

Rev 31910 – Fixed logic

amit.gupta — Fri, 05 May 2023 16:12:27 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/SchemeType.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 31909 – Fixed logic

amit.gupta — Fri, 05 May 2023 12:42:52 +0530

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

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingModel.java

Rev 31908 – Fixed logic

amit.gupta — Fri, 05 May 2023 12:41:29 +0530

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

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

Rev 31907 – Committed

amit.gupta — Fri, 05 May 2023 11:56:40 +0530

amit.gupta – 1 file(s) modified
Committed

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/PartnerAgeingModel.java

Rev 31906 – Added brand ageing limit

amit.gupta — Fri, 05 May 2023 11:54:44 +0530

amit.gupta – 5 file(s) modified
Added brand ageing limit

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/BrandAgeingLimit.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/BrandAgeingLimitRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/BrandAgeingLimitRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingServiceImpl.java

Rev 31905 – Fixed logic

amit.gupta — Fri, 05 May 2023 11:52:11 +0530

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

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

Rev 31904 – Fixed logic

amit.gupta — Fri, 05 May 2023 11:50:56 +0530

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

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

Rev 31903 – Added changes related to new scheme rollout policy

amit.gupta — Fri, 05 May 2023 11:49:09 +0530

amit.gupta – 32 file(s) modified
Added changes related to new scheme rollout policy

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlab.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlabEntity.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlab.java@31902)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java@31902)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ImeiMarginModel.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/OfferTargetSlabRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/CatalogSchemeSummaryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/CatalogSummaryModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModelNew.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModel.java@31869)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/SchemeSummaryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/InventoryPayoutModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/paginated-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 31902 –

tejbeer — Thu, 04 May 2023 18:22:36 +0530

tejbeer – 1 file(s) modified

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

Rev 31901 –

tejbeer — Thu, 04 May 2023 18:06:57 +0530

tejbeer – 1 file(s) modified

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

Rev 31900 –

tejbeer — Thu, 04 May 2023 16:57:15 +0530

tejbeer – 1 file(s) modified

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

Rev 31899 –

tejbeer — Thu, 04 May 2023 16:40:50 +0530

tejbeer – 1 file(s) modified

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

Rev 31898 –

tejbeer — Thu, 04 May 2023 16:37:06 +0530

tejbeer – 1 file(s) modified

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

Rev 31897 –

tejbeer — Thu, 04 May 2023 16:16:09 +0530

tejbeer – 1 file(s) modified

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

Rev 31896 –

tejbeer — Thu, 04 May 2023 15:57:32 +0530

tejbeer – 1 file(s) modified

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

Rev 31895 –

tejbeer — Thu, 04 May 2023 14:26:17 +0530

tejbeer – 1 file(s) modified

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

Rev 31894 –

tejbeer — Thu, 04 May 2023 14:16:38 +0530

tejbeer – 1 file(s) modified

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

Rev 31893 –

tejbeer — Thu, 04 May 2023 14:15:03 +0530

tejbeer – 1 file(s) modified

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

Rev 31892 – change

tejbeer — Thu, 04 May 2023 14:01:17 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm

Rev 31891 –

tejbeer — Wed, 03 May 2023 17:41:07 +0530

tejbeer – 1 file(s) modified

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

Rev 31890 –

tejbeer — Wed, 03 May 2023 17:36:41 +0530

tejbeer – 1 file(s) modified

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

Rev 31889 –

tejbeer — Wed, 03 May 2023 16:31:43 +0530

tejbeer – 1 file(s) modified

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

Rev 31888 – change

tejbeer — Wed, 03 May 2023 10:51:29 +0530

tejbeer – 1 file(s) modified
change

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

Rev 31887 – change

tejbeer — Tue, 02 May 2023 23:06:28 +0530

tejbeer – 2 file(s) modified
change

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

Rev 31886 –

tejbeer — Tue, 02 May 2023 23:04:04 +0530

tejbeer – 1 file(s) modified

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

Rev 31885 –

tejbeer — Tue, 02 May 2023 16:00:56 +0530

tejbeer – 1 file(s) modified

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

Rev 31884 – change

tejbeer — Tue, 02 May 2023 15:54:45 +0530

tejbeer – 5 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BrandStockPrice.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.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/PerformanceController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm

Rev 31883 –

tejbeer — Mon, 01 May 2023 16:33:47 +0530

tejbeer – 1 file(s) modified

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

Rev 31882 –

tejbeer — Mon, 01 May 2023 16:28:54 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm