SmartDukaan – /

Rev 31538 – Added Partner Region wise billing

amit.gupta — Mon, 06 Feb 2023 16:17:34 +0530

amit.gupta – 9 file(s) modified
Added Partner Region wise billing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTypeRegionBilledModel.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BrandRegionPOModel.java@31528)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTypeSecondaryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm

Rev 31537 –

tejbeer — Mon, 06 Feb 2023 13:20:42 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 31536 –

tejbeer — Mon, 06 Feb 2023 13:05:12 +0530

tejbeer – 1 file(s) modified

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

Rev 31535 – Handling

amit.gupta — Sat, 04 Feb 2023 22:40:40 +0530

amit.gupta – 1 file(s) modified
Handling

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

Rev 31534 – Handling

amit.gupta — Sat, 04 Feb 2023 22:37:06 +0530

amit.gupta – 1 file(s) modified
Handling

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

Rev 31533 – changed logic for first billing

amit.gupta — Sat, 04 Feb 2023 18:42:49 +0530

amit.gupta – 1 file(s) modified
changed logic for first billing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 31532 – Removed attendance from cron

amit.gupta — Sat, 04 Feb 2023 10:10:32 +0530

amit.gupta – 1 file(s) modified
Removed attendance from cron

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

Rev 31531 – Fixed SD

amit.gupta — Fri, 03 Feb 2023 13:16:44 +0530

amit.gupta – 2 file(s) modified
Fixed SD

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/HdfcPaymentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/HdfcPaymentRepositoryImpl.java

Rev 31530 – Handling add-payment to capture payments

amit.gupta — Fri, 03 Feb 2023 13:08:35 +0530

amit.gupta – 1 file(s) modified
Handling add-payment to capture payments

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

Rev 31529 – Removed old listener

amit.gupta — Thu, 02 Feb 2023 16:38:21 +0530

amit.gupta – 1 file(s) modified
Removed old listener

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

Rev 31528 – Fixed partner type change

amit.gupta — Thu, 02 Feb 2023 15:49:13 +0530

amit.gupta – 1 file(s) modified
Fixed partner type change

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

Rev 31527 – OfferRepository

amit.gupta — Thu, 02 Feb 2023 12:06:02 +0530

amit.gupta – 1 file(s) modified
OfferRepository

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java

Rev 31526 –

tejbeer — Thu, 02 Feb 2023 11:49:30 +0530

tejbeer – 1 file(s) modified

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

Rev 31525 – Fixed net availability to SaholicCIS Table

amit.gupta — Thu, 02 Feb 2023 01:15:48 +0530

amit.gupta – 1 file(s) modified
Fixed net availability to SaholicCIS Table

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

Rev 31524 – F

amit.gupta — Thu, 02 Feb 2023 01:06:59 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31523 – Text is now bronze+

amit.gupta — Thu, 02 Feb 2023 00:28:45 +0530

amit.gupta – 1 file(s) modified
Text is now bronze+

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

Rev 31522 – Added new logos

amit.gupta — Thu, 02 Feb 2023 00:28:05 +0530

amit.gupta – 7 file(s) modified
Added new logos

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerType.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/small-bronze.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/small-diamond.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/small-gold.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/small-platinum.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/small-risingstar.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/small-silver.png

Rev 31521 – Change Cutoff investment to 40 and MIN_INVESTMENT_PERCENT to 20

amit.gupta — Wed, 01 Feb 2023 17:18:44 +0530

amit.gupta – 4 file(s) modified
Change Cutoff investment to 40
and MIN_INVESTMENT_PERCENT to 20

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/RetailerController.java

Rev 31520 – Skip invalid catalog ids that are being added

amit.gupta — Wed, 01 Feb 2023 16:53:15 +0530

amit.gupta – 1 file(s) modified
Skip invalid catalog ids that are being added

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

Rev 31519 – Fixed SD Credit

amit.gupta — Wed, 01 Feb 2023 16:28:26 +0530

amit.gupta – 1 file(s) modified
Fixed SD Credit

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

Rev 31518 – Fixed compilation error on ScheduledTasks.java

amit.gupta — Wed, 01 Feb 2023 16:26:55 +0530

amit.gupta – 4 file(s) modified
Fixed compilation error on ScheduledTasks.java

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.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/transaction/SDCreditService.java

Rev 31517 – Added changes related to count

amit.gupta — Wed, 01 Feb 2023 11:31:55 +0530

amit.gupta – 3 file(s) modified
Added changes related to count

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 31516 – F

amit.gupta — Tue, 31 Jan 2023 16:23:49 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31515 – F

amit.gupta — Tue, 31 Jan 2023 15:40:33 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31514 – Send Mail temporary fix

amit.gupta — Tue, 31 Jan 2023 15:33:36 +0530

amit.gupta – 1 file(s) modified
Send Mail temporary fix

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

Rev 31513 – F

amit.gupta — Tue, 31 Jan 2023 15:29:06 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31512 – F

amit.gupta — Tue, 31 Jan 2023 15:27:19 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31511 – F

amit.gupta — Tue, 31 Jan 2023 15:18:28 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31510 – F

amit.gupta — Tue, 31 Jan 2023 12:08:51 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31509 – F

amit.gupta — Tue, 31 Jan 2023 12:05:43 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31508 –

tejbeer — Tue, 31 Jan 2023 12:01:39 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandCategoryRepositoryImpl.java

Rev 31507 – brand changes

tejbeer — Tue, 31 Jan 2023 11:51:47 +0530

tejbeer – 9 file(s) modified
brand changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/BrandCatalog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandCategoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandCategoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandsRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandsRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 31506 – F

amit.gupta — Mon, 30 Jan 2023 21:04:31 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31505 – Removed logic

amit.gupta — Mon, 30 Jan 2023 20:54:15 +0530

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

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

Rev 31504 – F

amit.gupta — Mon, 30 Jan 2023 19:03:03 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31503 – Fixed net availability to SaholicCIS Table

amit.gupta — Wed, 25 Jan 2023 13:16:42 +0530

amit.gupta – 1 file(s) modified
Fixed net availability to SaholicCIS Table

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

Rev 31502 – Fixed net availability to SaholicCIS Table

amit.gupta — Wed, 25 Jan 2023 13:03:20 +0530

amit.gupta – 1 file(s) modified
Fixed net availability to SaholicCIS Table

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

Rev 31501 – Fixed net availability to SaholicCIS Table

amit.gupta — Wed, 25 Jan 2023 12:44:39 +0530

amit.gupta – 1 file(s) modified
Fixed net availability to SaholicCIS Table

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

Rev 31500 – Fixed net availability to SaholicCIS Table

amit.gupta — Wed, 25 Jan 2023 11:11:22 +0530

amit.gupta – 1 file(s) modified
Fixed net availability to SaholicCIS Table

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

Rev 31499 –

tejbeer — Tue, 24 Jan 2023 16:22:46 +0530

tejbeer – 1 file(s) modified

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