SmartDukaan – /

Rev 30220 – Added changes related to Purchase Graph

amit.gupta — Tue, 29 Mar 2022 11:51:05 +0530

amit.gupta – 7 file(s) modified
Added changes related to Purchase Graph

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/Provider.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/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ChartService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ChartServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java

Rev 30219 – change

tejbeer — Mon, 28 Mar 2022 16:54:39 +0530

tejbeer – 28 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/FundfinaService.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PartnerBankAccount.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PartnerUserData.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovalRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovalResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovals.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PreApprovalsResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PushNotificationRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/PushNotificationResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionalData.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionResponse.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/TransactionSummary.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/fundfina/Vertical.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/CreditAccount.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/FundFinaPreApproval.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FundFinaPreApprovalRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FundFinaPreApprovalRepositoryImpl.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/config/WebSecurityConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FundFinaController.java

Rev 30218 –

amit.gupta — Mon, 28 Mar 2022 14:42:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 30217 – change

tejbeer — Mon, 28 Mar 2022 13:34:26 +0530

tejbeer – 1 file(s) modified
change

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

Rev 30216 – Fixed ahead issue

amit.gupta — Sat, 26 Mar 2022 17:41:56 +0530

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

~ /trunk/profitmandi-dao/build.gradle

Rev 30215 – Fixed ahead issue

amit.gupta — Sat, 26 Mar 2022 17:40:38 +0530

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

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 30214 – Made more generalised

amit.gupta — Sat, 26 Mar 2022 17:21:08 +0530

amit.gupta – 2 file(s) modified
Made more generalised

~ /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

Rev 30213 – Fixed ahead issue

amit.gupta — Sat, 26 Mar 2022 17:16:47 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ImeiActivationTimestampModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VivoImeiAndActivationTimeStampModel.java@30212)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VivoImeiAndActivationTimeStampModel.java

Rev 30212 – Fixed ahead issue

amit.gupta — Sat, 26 Mar 2022 17:06:44 +0530

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

~ /trunk/profitmandi-cron/build.gradle

Rev 30211 – Added enable scheduling

amit.gupta — Sat, 26 Mar 2022 17:06:12 +0530

amit.gupta – 1 file(s) modified
Added enable scheduling

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

Rev 30210 – Added properties to run

amit.gupta — Sat, 26 Mar 2022 17:05:31 +0530

amit.gupta – 1 file(s) modified
Added properties to run

+ /trunk/profitmandi-cron/src/main/resources/META-INF/run.properties

Rev 30209 – Added Oppo Activation

amit.gupta — Sat, 26 Mar 2022 17:05:04 +0530

amit.gupta – 8 file(s) modified
Added Oppo Activation

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/StandAlone.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/CheckOppoWarrantyTask.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OppoImeiActivationService.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/VivoImeiActivationService.java

Rev 30208 – Fixed ahead issue

amit.gupta — Tue, 15 Mar 2022 17:24:08 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java

Rev 30207 – Fixed ahead issue

amit.gupta — Tue, 15 Mar 2022 16:41:44 +0530

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

~ /trunk/profitmandi-common/build.gradle

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 30205 – change

tejbeer — Tue, 15 Mar 2022 14:44:21 +0530

tejbeer – 15 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/model/TeamCommitmentModel.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/team-commitment-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/team-commitment-table.vm
+ /trunk/profitmandi-web/bin
+ /trunk/profitmandi-web/bin/target
+ /trunk/profitmandi-web/bin/target/m2e-wtp
+ /trunk/profitmandi-web/bin/target/m2e-wtp/web-resources
+ /trunk/profitmandi-web/bin/target/m2e-wtp/web-resources/META-INF
+ /trunk/profitmandi-web/bin/target/m2e-wtp/web-resources/META-INF/maven
+ /trunk/profitmandi-web/bin/target/m2e-wtp/web-resources/META-INF/maven/com.profitmandi
+ /trunk/profitmandi-web/bin/target/m2e-wtp/web-resources/META-INF/maven/com.profitmandi/profitmandi-web
+ /trunk/profitmandi-web/bin/target/m2e-wtp/web-resources/META-INF/maven/com.profitmandi/profitmandi-web/pom.properties
+ /trunk/profitmandi-web/bin/target/m2e-wtp/web-resources/META-INF/maven/com.profitmandi/profitmandi-web/pom.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 30204 – Added new File

amit.gupta — Sat, 12 Mar 2022 07:09:05 +0530

amit.gupta – 1 file(s) modified
Added new File

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

Rev 30203 –

tejbeer — Fri, 11 Mar 2022 16:55:54 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java

Rev 30202 – change

tejbeer — Fri, 11 Mar 2022 15:31:01 +0530

tejbeer – 1 file(s) modified
change

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

Rev 30201 –

tejbeer — Fri, 11 Mar 2022 14:52:28 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicCIS.java

Rev 30200 –

tejbeer — Fri, 11 Mar 2022 14:50:22 +0530

tejbeer – 1 file(s) modified

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

Rev 30199 –

tejbeer — Fri, 11 Mar 2022 14:47:20 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/PartnerCollectionPlan.java

Rev 30198 – Added new File

amit.gupta — Fri, 11 Mar 2022 14:46:42 +0530

amit.gupta – 1 file(s) modified
Added new File

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

Rev 30197 – change

tejbeer — Fri, 11 Mar 2022 14:46:12 +0530

tejbeer – 8 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicCIS.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicPOItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SaholicCISModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java

Rev 30196 – Fixed nlc api for detailed view

amit.gupta — Fri, 11 Mar 2022 14:07:49 +0530

amit.gupta – 3 file(s) modified
Fixed nlc api for detailed view

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 30195 – commit

manish — Thu, 10 Mar 2022 19:39:38 +0530

manish – 1 file(s) modified
commit

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

Rev 30194 – commit

manish — Thu, 10 Mar 2022 19:38:20 +0530

manish – 1 file(s) modified
commit

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

Rev 30193 – Added new File

amit.gupta — Thu, 10 Mar 2022 12:50:14 +0530

amit.gupta – 1 file(s) modified
Added new File

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

Rev 30192 – Fixed ahead issue

amit.gupta — Wed, 09 Mar 2022 18:07:19 +0530

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

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

Rev 30191 – Fixed ahead issue

amit.gupta — Wed, 09 Mar 2022 17:57:04 +0530

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

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

Rev 30190 – Added new File

amit.gupta — Wed, 09 Mar 2022 17:19:09 +0530

amit.gupta – 1 file(s) modified
Added new File

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

Rev 30189 – commit

manish — Wed, 09 Mar 2022 17:16:26 +0530

manish – 1 file(s) modified
commit

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm

Rev 30188 – Added new File

amit.gupta — Wed, 09 Mar 2022 17:11:17 +0530

amit.gupta – 2 file(s) modified
Added new File

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/FofoCatalogResponse.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 30187 – Added new File

amit.gupta — Wed, 09 Mar 2022 15:08:08 +0530

amit.gupta – 1 file(s) modified
Added new File

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

Rev 30186 – Added new File

amit.gupta — Wed, 09 Mar 2022 13:26:54 +0530

amit.gupta – 1 file(s) modified
Added new File

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

Rev 30185 – change

tejbeer — Wed, 09 Mar 2022 12:32:52 +0530

tejbeer – 13 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/model/TeamCommitmentModel.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-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/team-commitment-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/team-commitment-table.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/team-commitment.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 30184 – commit

manish — Tue, 08 Mar 2022 19:10:44 +0530

manish – 1 file(s) modified
commit

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm

Rev 30183 – commit

manish — Tue, 08 Mar 2022 18:58:56 +0530

manish – 7 file(s) modified
commit

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-billing-summary-report.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-total-income.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 30182 – commit

manish — Tue, 08 Mar 2022 18:46:42 +0530

manish – 1 file(s) modified
commit

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

Rev 30181 – commit

manish — Tue, 08 Mar 2022 15:38:47 +0530

manish – 1 file(s) modified
commit

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