SmartDukaan – /

Rev 27892 – Fixed Schemes

amit.gupta — Thu, 04 Mar 2021 11:08:34 +0530

amit.gupta – 3 file(s) modified
Fixed Schemes

~ /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-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 27891 – change

tejbeer — Thu, 04 Mar 2021 10:59:14 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27890 – change

tejbeer — Thu, 04 Mar 2021 10:58:12 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27889 – Changed selling price to mop

amit.gupta — Wed, 03 Mar 2021 21:21:51 +0530

amit.gupta – 1 file(s) modified
Changed selling price to mop

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

Rev 27888 –

amit.gupta — Wed, 03 Mar 2021 20:52:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 27887 –

amit.gupta — Wed, 03 Mar 2021 20:46:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 27886 –

amit.gupta — Wed, 03 Mar 2021 19:37:35 +0530

amit.gupta – 1 file(s) modified

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

Rev 27885 –

tejbeer — Wed, 03 Mar 2021 19:16:29 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.java

Rev 27884 – Changes regarding investment and activated imei

tejbeer — Wed, 03 Mar 2021 18:53:31 +0530

tejbeer – 27 file(s) modified
Changes regarding investment and activated imei

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ActivatedImeisWithSellingPrice.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/Axis.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ChartInvestmentModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePartnerOnBoardingPanel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingListingRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/Data.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DataInvestmentModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DataModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DataObjectModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DatasetInvestmentModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DatasetModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/Legend.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/OptionModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/OptionsModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PieLables.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScalesModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.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/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/panel-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/investmentdetails.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm

Rev 27883 –

amit.gupta — Wed, 03 Mar 2021 17:52:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 27882 – Removed readonly

amit.gupta — Wed, 03 Mar 2021 13:37:59 +0530

amit.gupta – 1 file(s) modified
Removed readonly

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

Rev 27881 –

amit.gupta — Tue, 02 Mar 2021 19:37:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java

Rev 27880 –

amit.gupta — Tue, 02 Mar 2021 18:15:46 +0530

amit.gupta – 1 file(s) modified

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

Rev 27879 –

amit.gupta — Tue, 02 Mar 2021 17:56:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 27878 –

amit.gupta — Tue, 02 Mar 2021 16:14:09 +0530

amit.gupta – 12 file(s) modified

x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PartnerTargetSlab.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TargetSlabModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ItemCriteria.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlab.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TargetSlab.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/enumuration/catalog/OfferSchemeType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/TargetType.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
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TargetSlab.java

Rev 27877 –

amit.gupta — Tue, 02 Mar 2021 16:12:44 +0530

amit.gupta – 23 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OfferRowModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.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/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/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/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.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/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/PartnerCriteria.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/PayoutSlab.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-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 27876 – Added Controllers

amit.gupta — Tue, 02 Mar 2021 16:09:58 +0530

amit.gupta – 5 file(s) modified
Added Controllers

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 27875 – Aded

amit.gupta — Tue, 02 Mar 2021 16:09:14 +0530

amit.gupta – 14 file(s) modified
Aded

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin-partner-target-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin-target.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
~ /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-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail.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
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer/published.vm

Rev 27874 –

amit.gupta — Tue, 02 Mar 2021 16:04:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 27873 –

amit.gupta — Tue, 02 Mar 2021 16:01:59 +0530

amit.gupta – 6 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-listing.vm

Rev 27872 – Added

amit.gupta — Tue, 02 Mar 2021 15:50:45 +0530

amit.gupta – 1 file(s) modified
Added

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-product-listing.vm

Rev 27871 – Added brand region mapping model

amit.gupta — Tue, 02 Mar 2021 15:35:47 +0530

amit.gupta – 2 file(s) modified
Added brand region mapping model

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/BrandRegionMapping.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/BrandRegionMappingRepository.java

Rev 27870 – Added shorthand formatter

amit.gupta — Tue, 02 Mar 2021 15:25:16 +0530

amit.gupta – 1 file(s) modified
Added shorthand formatter

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

Rev 27869 – If no POItem Availability exist

amit.gupta — Tue, 02 Mar 2021 13:04:26 +0530

amit.gupta – 1 file(s) modified
If no POItem Availability exist

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

Rev 27868 –

tejbeer — Tue, 02 Mar 2021 12:29:50 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/secondary-warehouse-billing-order.vm

Rev 27867 – chnage

tejbeer — Mon, 01 Mar 2021 22:58:02 +0530

tejbeer – 8 file(s) modified
chnage

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BrandRegionModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SecondaeryOrderDateRange.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SecondaryWarehouseWiseOrderBilllingModel.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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

Rev 27866 – chnage

tejbeer — Mon, 01 Mar 2021 22:48:46 +0530

tejbeer – 3 file(s) modified
chnage

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing-billing-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/secondary-warehouse-billing-order.vm

Rev 27865 –

amit.gupta — Fri, 26 Feb 2021 13:38:42 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java

Rev 27864 – chnage

tejbeer — Thu, 25 Feb 2021 11:30:50 +0530

tejbeer – 1 file(s) modified
chnage

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

Rev 27863 – change

tejbeer — Thu, 25 Feb 2021 11:11:37 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27862 –

amit.gupta — Wed, 24 Feb 2021 18:57:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 27861 – change

tejbeer — Wed, 24 Feb 2021 17:32:07 +0530

tejbeer – 9 file(s) modified
change

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FofoItemIdAmountModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PartnerOptionsAndItemAmountModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-order-customer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm

Rev 27860 – change

tejbeer — Wed, 24 Feb 2021 16:44:36 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27859 – change

tejbeer — Tue, 23 Feb 2021 12:29:39 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27858 – change

tejbeer — Tue, 23 Feb 2021 11:55:32 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27857 – change

tejbeer — Mon, 22 Feb 2021 18:09:59 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27856 – change

tejbeer — Mon, 22 Feb 2021 18:05:38 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27855 – change

tejbeer — Mon, 22 Feb 2021 18:05:17 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27854 –

amit.gupta — Mon, 22 Feb 2021 15:28:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java

Rev 27853 –

amit.gupta — Mon, 22 Feb 2021 13:52:36 +0530

amit.gupta – 1 file(s) modified

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