SmartDukaan – /

Rev 33126 – exclude some fields thats occur multiple time and no any ...

tejus.lohani — Wed, 20 Mar 2024 11:13:34 +0530

tejus.lohani – 1 file(s) modified
exclude some fields thats occur multiple time and no any single use (deena sir guide)

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

Rev 33125 – js version change

ranu — Tue, 19 Mar 2024 15:42:25 +0530

ranu – 1 file(s) modified
js version change

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

Rev 33124 – area territory for fofo store(phase one)

ranu — Tue, 19 Mar 2024 15:41:10 +0530

ranu – 20 file(s) modified
area territory for fofo store(phase one)

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/UpdateRetailerRequest.java
~ /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/logistics/Area.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/AreaRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/AreaRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/AST.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ASTRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ASTRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/Territory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/TerritoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/TerritoryRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/AreaZone.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PostOfficeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PostOfficeServiceImpl.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/PostOfficeController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/smartsecure.jpeg
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 33123 – spelling correct

shampa — Mon, 18 Mar 2024 19:08:58 +0530

shampa – 2 file(s) modified
spelling correct

~ /trunk/profitmandi-fofo/src/main/resources/messages_en.properties
~ /trunk/profitmandi-fofo/src/main/resources/message_en.properties

Rev 33122 – patch for

amit.gupta — Mon, 18 Mar 2024 19:02:33 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33121 – patch for

amit.gupta — Mon, 18 Mar 2024 18:24:56 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33120 – patch for

amit.gupta — Mon, 18 Mar 2024 18:23:46 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33119 – Fixed Offer

amit.gupta — Mon, 18 Mar 2024 18:15:34 +0530

amit.gupta – 4 file(s) modified
Fixed Offer

~ /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-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java

Rev 33118 – add all payment option in mobile app

tejus.lohani — Mon, 18 Mar 2024 16:30:47 +0530

tejus.lohani – 1 file(s) modified
add all payment option in mobile app

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

Rev 33117 – spelling correction

shampa — Mon, 18 Mar 2024 15:26:20 +0530

shampa – 1 file(s) modified
spelling correction

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

Rev 33116 – add discription in wallet report download file

tejus.lohani — Mon, 18 Mar 2024 13:44:53 +0530

tejus.lohani – 1 file(s) modified
add discription in wallet report download file

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

Rev 33115 – spelling correction

shampa — Mon, 18 Mar 2024 13:00:18 +0530

shampa – 1 file(s) modified
spelling correction

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

Rev 33114 – order summary spelling correction

shampa — Mon, 18 Mar 2024 12:19:04 +0530

shampa – 3 file(s) modified
order summary spelling correction

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

Rev 33113 – Removed method with error

amit.gupta — Mon, 18 Mar 2024 11:32:32 +0530

amit.gupta – 2 file(s) modified
Removed method with error

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

Rev 33112 – Sidbi Related changes to step down sanction value to remaining ...

amit.gupta — Sat, 16 Mar 2024 21:14:55 +0530

amit.gupta – 7 file(s) modified
Sidbi Related changes to step down sanction value to remaining months at beginning of each month

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/FofoSidbiSanction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditAccountRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditAccountRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/FofoSidbiSanctionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/FofoSidbiSanctionRepositoryImpl.java

Rev 33111 – Added Sidbi Credit Account logic

amit.gupta — Sat, 16 Mar 2024 19:20:16 +0530

amit.gupta – 1 file(s) modified
Added Sidbi Credit Account logic

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

Rev 33110 – patch for

amit.gupta — Sat, 16 Mar 2024 17:11:07 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33109 – patch for

amit.gupta — Sat, 16 Mar 2024 16:54:13 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33108 – fix download report issue thats occurs in partner dashboard

tejus.lohani — Sat, 16 Mar 2024 12:26:01 +0530

tejus.lohani – 1 file(s) modified
fix download report issue thats occurs in partner dashboard

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

Rev 33107 – Fixed password

amit.gupta — Fri, 15 Mar 2024 22:38:49 +0530

amit.gupta – 1 file(s) modified
Fixed password

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 33106 – Fixed invoices

amit.gupta — Fri, 15 Mar 2024 21:58:17 +0530

amit.gupta – 1 file(s) modified
Fixed invoices

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 33105 – fix auth user manager name issue and fix searchig issue ...

tejus.lohani — Fri, 15 Mar 2024 17:48:06 +0530

tejus.lohani – 2 file(s) modified
fix auth user manager name issue and fix searchig issue in "create auth user" section

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm

Rev 33104 – Fixed interest accrued to 0.8 for new rates i.e. 0.6

amit.gupta — Fri, 15 Mar 2024 16:41:46 +0530

amit.gupta – 1 file(s) modified
Fixed interest accrued to 0.8 for new rates i.e. 0.6

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

Rev 33103 – patch for

amit.gupta — Fri, 15 Mar 2024 15:03:47 +0530

amit.gupta – 2 file(s) modified
patch for

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm

Rev 33102 – FIX reports Download problem (download report was Empty) on admin ...

tejus.lohani — Fri, 15 Mar 2024 12:26:20 +0530

tejus.lohani – 3 file(s) modified
FIX reports Download problem (download report was Empty) on admin dashboard

Rev 33101 – Fixed invoices

amit.gupta — Thu, 14 Mar 2024 19:08:12 +0530

amit.gupta – 1 file(s) modified
Fixed invoices

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

Rev 33100 – Added functionality to

amit.gupta — Thu, 14 Mar 2024 19:01:54 +0530

amit.gupta – 2 file(s) modified
Added functionality to

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 33099 – google spelling correction

ranu — Thu, 14 Mar 2024 11:55:10 +0530

ranu – 1 file(s) modified
google spelling correction

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

Rev 33098 – scheme and offer report

shampa — Wed, 13 Mar 2024 18:48:34 +0530

shampa – 1 file(s) modified
scheme and offer report

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

Rev 33097 – scheme and offer report

shampa — Wed, 13 Mar 2024 18:35:04 +0530

shampa – 1 file(s) modified
scheme and offer report

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

Rev 33096 – update js

shampa — Wed, 13 Mar 2024 18:23:59 +0530

shampa – 2 file(s) modified
update js

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

Rev 33095 – update js

shampa — Wed, 13 Mar 2024 18:02:02 +0530

shampa – 1 file(s) modified
update js

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

Rev 33094 – scheme and offer report

shampa — Wed, 13 Mar 2024 18:00:21 +0530

shampa – 1 file(s) modified
scheme and offer report

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

Rev 33093 – update js version 205 to 206

tejus.lohani — Wed, 13 Mar 2024 17:46:31 +0530

tejus.lohani – 1 file(s) modified
update js version 205 to 206

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

Rev 33092 – Add partner reports option on side bar of Admin Dashboard

tejus.lohani — Wed, 13 Mar 2024 17:15:53 +0530

tejus.lohani – 9 file(s) modified
Add partner reports option on side bar of Admin Dashboard

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /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-collection-summary.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/wallet-summary-report.vm

Rev 33091 – scheme and offer report

shampa — Wed, 13 Mar 2024 16:57:40 +0530

shampa – 4 file(s) modified
scheme and offer report

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm

Rev 33090 – Fixed retailer

amit.gupta — Wed, 13 Mar 2024 12:27:30 +0530

amit.gupta – 1 file(s) modified
Fixed retailer

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

Rev 33089 – Fixed address

amit.gupta — Wed, 13 Mar 2024 12:19:22 +0530

amit.gupta – 1 file(s) modified
Fixed address

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

Rev 33088 – Changed 90 to 300 days

amit.gupta — Wed, 13 Mar 2024 08:55:43 +0530

amit.gupta – 3 file(s) modified
Changed 90 to 300 days

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 33087 – Added changes to stop payouts for samsung stock aged above ...

amit.gupta — Tue, 12 Mar 2024 19:56:54 +0530

amit.gupta – 14 file(s) modified
Added changes to stop payouts for samsung stock aged above 90 days since primary.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ImeiAgeingModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/AgeingSummaryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm