SmartDukaan – //trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 32331 – Added changes related to schemes

amit.gupta — Mon, 14 Aug 2023 11:13:40 +0530

amit.gupta – 9 file(s) modified
Added changes related to schemes

~ /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/SchemeSummaryModel.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/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-table.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 32026 – Fixed additional scheme logic

amit.gupta — Fri, 19 May 2023 17:08:02 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 32022 – Fixed additional scheme logic

amit.gupta — Wed, 17 May 2023 16:51:32 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

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 31234 – Removed unwanted files

amit.gupta — Tue, 06 Dec 2022 14:59:31 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 31233 – Removed unwanted files

amit.gupta — Tue, 06 Dec 2022 14:45:06 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 31232 – Removed unwanted files

amit.gupta — Tue, 06 Dec 2022 14:05:15 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 31215 – fixed price circular missing header

amit.gupta — Thu, 01 Dec 2022 12:24:19 +0530

amit.gupta – 1 file(s) modified
fixed price circular missing header

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

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 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 30230 – Fixed ahead issue

amit.gupta — Tue, 29 Mar 2022 18:26:48 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 30206 – Fixed ahead issue

amit.gupta — Tue, 15 Mar 2022 16:35:19 +0530

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

~ /trunk/profitmandi-dao/build.gradle
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 30142 – Fixed ahead issue

amit.gupta — Mon, 07 Mar 2022 01:46:33 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 30012 – Fixed minor bug with price circular

amit.gupta — Mon, 14 Feb 2022 16:09:09 +0530

amit.gupta – 1 file(s) modified
Fixed minor bug with price circular

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 29960 – change

tejbeer — Wed, 09 Feb 2022 11:36:34 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 29889 –

amit.gupta — Thu, 20 Jan 2022 21:15:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 29848 –

amit.gupta — Thu, 13 Jan 2022 15:44:05 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 29847 –

amit.gupta — Thu, 13 Jan 2022 15:13:22 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 29846 – Fixed logic for slab change

amit.gupta — Thu, 13 Jan 2022 10:21:14 +0530

amit.gupta – 3 file(s) modified
Fixed logic for slab change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 29845 – Added upgrade offer to price circular

amit.gupta — Wed, 12 Jan 2022 17:38:44 +0530

amit.gupta – 7 file(s) modified
Added upgrade offer to price circular

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOffer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModel.java
~ /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-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 29785 – Fixed price circular

amit.gupta — Fri, 07 Jan 2022 19:14:42 +0530

amit.gupta – 24 file(s) modified
Fixed price circular

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemCriteriaPayout.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PriceCircularModel.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/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/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/ItemCriteria.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/offers/PayoutSlab.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularHeaderModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PriceCircularModel.java@29606)
+ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /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/price-circular-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/published-offers.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 29653 – change

tejbeer — Thu, 02 Dec 2021 17:08:23 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 28139 – change

tejbeer — Wed, 31 Mar 2021 18:35:32 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 28136 – chnage

tejbeer — Wed, 31 Mar 2021 16:58:56 +0530

tejbeer – 7 file(s) modified
chnage

~ /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/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 28134 – change

tejbeer — Wed, 31 Mar 2021 15:10:06 +0530

tejbeer – 5 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 28124 – chnage

tejbeer — Tue, 30 Mar 2021 11:02:44 +0530

tejbeer – 4 file(s) modified
chnage

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PriceCircularModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 28119 –

tejbeer — Fri, 26 Mar 2021 18:08:40 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 28117 – change

tejbeer — Fri, 26 Mar 2021 17:56:18 +0530

tejbeer – 5 file(s) modified
change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeItemView.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm

Rev 28109 – change

tejbeer — Thu, 25 Mar 2021 16:03:57 +0530

tejbeer – 6 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/payment-pending-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/review_order.vm

Rev 28102 – price circular change

tejbeer — Wed, 24 Mar 2021 11:16:31 +0530

tejbeer – 12 file(s) modified
price circular change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PriceCircularModel.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-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-circular.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/partner-price-circular.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm