SmartDukaan – /

Rev 27918 – Aded changes for Target Type

amit.gupta — Fri, 05 Mar 2021 19:02:59 +0530

amit.gupta – 8 file(s) modified
Aded changes for Target Type

~ /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
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/AchievementType.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/TargetType.java@27888)
x /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/OfferRowModel.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/offers/OfferServiceImpl.java

Rev 27917 – ok

tejbeer — Fri, 05 Mar 2021 16:17:43 +0530

tejbeer – 1 file(s) modified
ok

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

Rev 27916 –

amit.gupta — Fri, 05 Mar 2021 16:16:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 27915 – change

tejbeer — Fri, 05 Mar 2021 16:16:06 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27914 – change

tejbeer — Fri, 05 Mar 2021 16:04:29 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27913 – change

tejbeer — Fri, 05 Mar 2021 15:59:28 +0530

tejbeer – 2 file(s) modified
change

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

Rev 27912 –

amit.gupta — Fri, 05 Mar 2021 15:35:53 +0530

amit.gupta – 1 file(s) modified

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

Rev 27911 –

amit.gupta — Fri, 05 Mar 2021 15:35:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 27910 – change

tejbeer — Fri, 05 Mar 2021 15:13:43 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DatasetModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScalesModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 27909 –

amit.gupta — Fri, 05 Mar 2021 11:59:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 27908 –

amit.gupta — Fri, 05 Mar 2021 11:59:35 +0530

amit.gupta – 1 file(s) modified

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

Rev 27907 –

amit.gupta — Fri, 05 Mar 2021 11:43:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 27906 – change

tejbeer — Thu, 04 Mar 2021 18:10:49 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27905 – CHANGE

tejbeer — Thu, 04 Mar 2021 18:10:22 +0530

tejbeer – 1 file(s) modified
CHANGE

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DataModel.java

Rev 27904 – cHANGE

tejbeer — Thu, 04 Mar 2021 18:10:00 +0530

tejbeer – 1 file(s) modified
cHANGE

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DatasetModel.java

Rev 27903 – chnage

tejbeer — Thu, 04 Mar 2021 17:38:27 +0530

tejbeer – 6 file(s) modified
chnage

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /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/PartnerDetailModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_partner_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing.vm

Rev 27902 – change

tejbeer — Thu, 04 Mar 2021 17:18:38 +0530

tejbeer – 1 file(s) modified
change

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

Rev 27901 –

tejbeer — Thu, 04 Mar 2021 17:15:05 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DataModel.java

Rev 27900 – changes

tejbeer — Thu, 04 Mar 2021 17:09:36 +0530

tejbeer – 4 file(s) modified
changes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DataModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DatasetModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 27899 –

amit.gupta — Thu, 04 Mar 2021 15:06:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 27898 –

amit.gupta — Thu, 04 Mar 2021 13:40:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 27897 –

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

amit.gupta – 1 file(s) modified

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

Rev 27896 –

amit.gupta — Thu, 04 Mar 2021 12:35:46 +0530

amit.gupta – 1 file(s) modified

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

Rev 27895 – Added offer related changes

amit.gupta — Thu, 04 Mar 2021 12:25:28 +0530

amit.gupta – 5 file(s) modified
Added offer related changes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 27894 –

tejbeer — Thu, 04 Mar 2021 11:37:33 +0530

tejbeer – 1 file(s) modified

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

Rev 27893 – secondary changes

tejbeer — Thu, 04 Mar 2021 11:16:08 +0530

tejbeer – 13 file(s) modified
secondary changes

~ /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/PartnerDetailModel.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/PartnerStatsServiceImpl.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/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_partner_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /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/partner-secondary-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/secondary-warehouse-billing-order.vm

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