SmartDukaan – /

Rev 30089 –

tejbeer — Fri, 25 Feb 2022 20:59:59 +0530

tejbeer – 1 file(s) modified

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

Rev 30088 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 18:39:08 +0530

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

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

Rev 30087 – change

tejbeer — Fri, 25 Feb 2022 18:30:20 +0530

tejbeer – 16 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerCollectionPlan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerSecondaryPlan.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/entity/transaction/UserWallet.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCollectionPlanModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerSecondaryPlanModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTargetAchievementModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionPlanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionPlanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerSecondaryPlanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerSecondaryPlanRepositoryImpl.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/dao/repository/transaction/UserWalletRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 30086 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 17:59:53 +0530

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

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

Rev 30085 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 17:51:00 +0530

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

~ /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/controller/PlacementPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm

Rev 30084 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 14:57:22 +0530

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

+ /trunk/profitmandi-fofo/.idea
+ /trunk/profitmandi-fofo/.idea/codeStyles
+ /trunk/profitmandi-fofo/.idea/codeStyles/codeStyleConfig.xml
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm

Rev 30083 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 14:43:30 +0530

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

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

Rev 30082 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 12:53:30 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm

Rev 30081 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 11:23:59 +0530

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

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

Rev 30080 – Fixed ahead issue

amit.gupta — Fri, 25 Feb 2022 11:23:34 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.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/PlacementPlanController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm

Rev 30079 –

amit.gupta — Thu, 24 Feb 2022 14:39:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 30078 –

tejbeer — Thu, 24 Feb 2022 11:32:18 +0530

tejbeer – 1 file(s) modified

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

Rev 30077 – change

tejbeer — Wed, 23 Feb 2022 22:11:36 +0530

tejbeer – 18 file(s) modified
change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerCollectionPlan.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerSecondaryPlan.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/entity/transaction/UserWallet.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DateRangeModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCollectionPlanModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerSecondaryPlanModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTargetAchievementModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TargetModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionPlanRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionPlanRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerSecondaryPlanRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerSecondaryPlanRepositoryImpl.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/dao/repository/transaction/UserWalletRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 30076 – Fixed ahead issue

amit.gupta — Wed, 23 Feb 2022 16:16:37 +0530

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

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

Rev 30075 – Fixed ahead issue

amit.gupta — Wed, 23 Feb 2022 15:28:37 +0530

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

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

Rev 30074 – Fixed ahead issue

amit.gupta — Wed, 23 Feb 2022 15:27:57 +0530

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

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

Rev 30073 – Fixed send PO Notification

amit.gupta — Wed, 23 Feb 2022 12:47:03 +0530

amit.gupta – 3 file(s) modified
Fixed send PO Notification

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/POItemWarehouseModel.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/send_po_notification.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-po-notification.vm

Rev 30072 – Fixed ahead issue

amit.gupta — Tue, 22 Feb 2022 19:45:12 +0530

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

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

Rev 30071 – Fixed ahead issue

amit.gupta — Tue, 22 Feb 2022 19:36:45 +0530

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

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

Rev 30070 – Fixed scheme start date end date issue

amit.gupta — Tue, 22 Feb 2022 13:21:15 +0530

amit.gupta – 3 file(s) modified
Fixed scheme start date end date issue

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js

Rev 30069 – Fixed ahead issue

amit.gupta — Mon, 21 Feb 2022 19:02:37 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java

Rev 30068 – Fixed ahead issue

amit.gupta — Mon, 21 Feb 2022 18:48:43 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java

Rev 30067 – Fixed ahead issue

amit.gupta — Mon, 21 Feb 2022 18:48:08 +0530

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

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

Rev 30066 – Fixed logic to purchase/sales based value

amit.gupta — Mon, 21 Feb 2022 18:45:10 +0530

amit.gupta – 6 file(s) modified
Fixed logic to purchase/sales based value

~ /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/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 30065 – Fixed ahead issue

amit.gupta — Mon, 21 Feb 2022 17:08:23 +0530

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

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

Rev 30064 – Fixed scheme model

amit.gupta — Mon, 21 Feb 2022 16:20:11 +0530

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

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

Rev 30063 –

amit.gupta — Sat, 19 Feb 2022 20:19:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 30062 – Fixed ahead issue

amit.gupta — Sat, 19 Feb 2022 19:15:34 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/brand-logo.css

Rev 30061 – Fixed ahead issue

amit.gupta — Sat, 19 Feb 2022 19:09:04 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/brand-logo.css

Rev 30060 – Fixed ahead issue

amit.gupta — Sat, 19 Feb 2022 19:06:24 +0530

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

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

Rev 30059 – Fixed ahead issue

amit.gupta — Sat, 19 Feb 2022 19:04:38 +0530

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

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

Rev 30058 – Ordered brands based on billing

amit.gupta — Sat, 19 Feb 2022 19:01:09 +0530

amit.gupta – 1 file(s) modified
Ordered brands based on billing

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/brand-logo.css

Rev 30057 – Fixed ahead issue

amit.gupta — Sat, 19 Feb 2022 18:59:37 +0530

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

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

Rev 30056 – Added Indent and Tertiary

amit.gupta — Sat, 19 Feb 2022 16:27:59 +0530

amit.gupta – 2 file(s) modified
Added Indent and Tertiary

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java

Rev 30055 – commit

manish — Sat, 19 Feb 2022 15:17:24 +0530

manish – 3 file(s) modified
commit

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-credited-income.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-imei-wise-income.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/montly-brand-wise-income.vm

Rev 30054 –

manish — Sat, 19 Feb 2022 15:15:27 +0530

manish – 1 file(s) modified

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

Rev 30053 – commit

manish — Sat, 19 Feb 2022 15:11:28 +0530

manish – 2 file(s) modified
commit

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

Rev 30052 – commit

manish — Sat, 19 Feb 2022 15:09:13 +0530

manish – 2 file(s) modified
commit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java

Rev 30051 –

manish — Sat, 19 Feb 2022 15:07:16 +0530

manish – 8 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AllPurchaseInventoryModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ImeiWiseIncomePairAndMapModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/IncomeImeiDate.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthBrandWiseIncomeModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthCategoryUpgradeMargin.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthCreditedIncomeModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthFrontEndImeiModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthImeiModel.java

Rev 30050 – commit

manish — Sat, 19 Feb 2022 15:01:02 +0530

manish – 1 file(s) modified
commit

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