SmartDukaan – /

Rev 34149 – New panel for partner Brand commitments , add commitment , ...

tejus.lohani — Tue, 21 Jan 2025 17:11:29 +0530

tejus.lohani – 17 file(s) modified
New panel for partner Brand commitments , add commitment , update commitment and view partner commitments, Now in DMS code panel team only view commitment instead of update mean it read only

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiBrandCommitment.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerBrandCommitmentModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.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/AppConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BrandCommitmentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/brand-commitment.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment/brand-commitment-panel.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-commitment/partner-commitments.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-dealer-mapping-index.vm

Rev 34148 – code reverted as amit serial number

ranu — Tue, 21 Jan 2025 11:46:10 +0530

ranu – 1 file(s) modified
code reverted as amit serial number

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

Rev 34147 – offer serial number given amount according to amit parajapati

ranu — Tue, 21 Jan 2025 11:41:04 +0530

ranu – 1 file(s) modified
offer serial number given amount according to amit parajapati

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

Rev 34146 – partner targted > 0

ranu — Mon, 20 Jan 2025 12:21:42 +0530

ranu – 1 file(s) modified
partner targted > 0

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmBilledFofoIdsModel.java

Rev 34145 – only > 20k party considered as billed

ranu — Mon, 20 Jan 2025 11:26:03 +0530

ranu – 1 file(s) modified
only > 20k party considered as billed

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 34144 – added logic targeted arr (billed cinsider 20000 above party)

ranu — Fri, 17 Jan 2025 20:16:46 +0530

ranu – 4 file(s) modified
added logic targeted arr (billed cinsider 20000 above party)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmBilledFofoIdsModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 34143 – large number format change into scientific format ,so fix it ...

tejus.lohani — Fri, 17 Jan 2025 16:51:42 +0530

tejus.lohani – 2 file(s) modified
large number format change into scientific format ,so fix it in this commit

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/LineItemModel.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm

Rev 34142 – DN request only mapped partner ,show only mapped partner

tejus.lohani — Fri, 17 Jan 2025 12:31:03 +0530

tejus.lohani – 4 file(s) modified
DN request only mapped partner ,show only mapped partner

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm

Rev 34141 – add field , how request DN now we maintain also

tejus.lohani — Thu, 16 Jan 2025 21:50:05 +0530

tejus.lohani – 8 file(s) modified
add field , how request DN now we maintain also

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm

Rev 34140 – add store code field in pending-return panel

tejus.lohani — Wed, 15 Jan 2025 18:04:19 +0530

tejus.lohani – 1 file(s) modified
add store code field in pending-return panel

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

Rev 34139 – Fixed scheme related changes

amit.gupta — Wed, 15 Jan 2025 16:11:54 +0530

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

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

Rev 34138 – Minor change

amit.gupta — Wed, 15 Jan 2025 13:23:15 +0530

amit.gupta – 1 file(s) modified
Minor change

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

Rev 34137 – Minor commit

amit.gupta — Wed, 15 Jan 2025 13:19:18 +0530

amit.gupta – 1 file(s) modified
Minor commit

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

Rev 34136 – Minor Commit

amit.gupta — Wed, 15 Jan 2025 13:18:03 +0530

amit.gupta – 1 file(s) modified
Minor Commit

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

Rev 34135 – Minor commit

amit.gupta — Wed, 15 Jan 2025 13:17:33 +0530

amit.gupta – 1 file(s) modified
Minor commit

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

Rev 34134 – added partner state , mobile in upsell report

ranu — Wed, 15 Jan 2025 12:46:47 +0530

ranu – 4 file(s) modified
added partner state , mobile in upsell report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleCall.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpsellingReportModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/UpSaleController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upselling-report.vm

Rev 34133 – added partner state code , mobile in upsell report

ranu — Wed, 15 Jan 2025 12:34:10 +0530

ranu – 4 file(s) modified
added partner state code , mobile in upsell report

Rev 34132 – added upsell disposition

ranu — Wed, 15 Jan 2025 11:58:50 +0530

ranu – 1 file(s) modified
added upsell disposition

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/UpSaleCallStatus.java

Rev 34131 – disposition added in upsell report

ranu — Wed, 15 Jan 2025 11:36:10 +0530

ranu – 1 file(s) modified
disposition added in upsell report

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

Rev 34130 – disposition added in upsell report

ranu — Wed, 15 Jan 2025 11:34:50 +0530

ranu – 1 file(s) modified
disposition added in upsell report

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

Rev 34129 – disposition added in upsell report

ranu — Tue, 14 Jan 2025 19:51:45 +0530

ranu – 2 file(s) modified
disposition added in upsell report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleCall.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpsellingReportModel.java

Rev 34128 – bug fix

tejus.lohani — Tue, 14 Jan 2025 15:05:40 +0530

tejus.lohani – 1 file(s) modified
bug fix

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

Rev 34127 – bug fix

tejus.lohani — Tue, 14 Jan 2025 14:51:49 +0530

tejus.lohani – 1 file(s) modified
bug fix

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

Rev 34126 – bug fix

tejus.lohani — Tue, 14 Jan 2025 14:46:01 +0530

tejus.lohani – 1 file(s) modified
bug fix

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

Rev 34125 – sanction request reject on approval amount is null

ranu — Mon, 13 Jan 2025 18:37:45 +0530

ranu – 1 file(s) modified
sanction request reject on approval amount is null

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

Rev 34124 – upload all shop photo or no file upload if source ...

tejus.lohani — Mon, 13 Jan 2025 16:31:08 +0530

tejus.lohani – 1 file(s) modified
upload all shop photo or no file upload if source is other then self

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

Rev 34123 – email id validation

ranu — Mon, 13 Jan 2025 15:27:34 +0530

ranu – 1 file(s) modified
email id validation

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upsale-create-insurance-model.vm

Rev 34122 – credit hard limit reset restircted if hard limit is true

ranu — Mon, 13 Jan 2025 11:49:58 +0530

ranu – 1 file(s) modified
credit hard limit reset restircted if hard limit is true

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

Rev 34121 – foco sales report added customer name

ranu — Fri, 10 Jan 2025 20:00:57 +0530

ranu – 1 file(s) modified
foco sales report added customer name

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

Rev 34120 – rbm billed giving zero billed column

ranu — Fri, 10 Jan 2025 18:37:26 +0530

ranu – 1 file(s) modified
rbm billed giving zero billed column

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 34119 – rbm billed giving zero billed column

ranu — Fri, 10 Jan 2025 18:28:42 +0530

ranu – 3 file(s) modified
rbm billed giving zero billed column

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 34118 – create lead detail to add shop photo

tejus.lohani — Fri, 10 Jan 2025 17:21:22 +0530

tejus.lohani – 2 file(s) modified
create lead detail to add shop photo

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

Rev 34117 – upselling Report Update..given partner name on calling panel and report

ranu — Fri, 10 Jan 2025 12:39:37 +0530

ranu – 5 file(s) modified
upselling Report Update..given partner name on calling panel and report

Rev 34116 – bug fix

tejus.lohani — Thu, 09 Jan 2025 11:21:32 +0530

tejus.lohani – 1 file(s) modified
bug fix

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

Rev 34115 – blocked imei unblocked

ranu — Wed, 08 Jan 2025 18:27:07 +0530

ranu – 1 file(s) modified
blocked imei unblocked

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

Rev 34114 – rbm arr targeted party

ranu — Wed, 08 Jan 2025 14:58:11 +0530

ranu – 4 file(s) modified
rbm arr targeted party

Rev 34113 – if lead authUser is inactive then no need to check ...

tejus.lohani — Wed, 08 Jan 2025 12:40:24 +0530

tejus.lohani – 1 file(s) modified
if lead authUser is inactive then no need to check all details to edit lead

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

Rev 34112 – fix some bug

tejus.lohani — Wed, 08 Jan 2025 12:29:34 +0530

tejus.lohani – 1 file(s) modified
fix some bug

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

Rev 34111 – upsellinf report generated

ranu — Wed, 08 Jan 2025 11:46:51 +0530

ranu – 8 file(s) modified
upsellinf report generated

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleCall.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpsellingReportModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleCallRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleCallRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/UpSaleController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/up-sale.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upselling-calling-list.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upselling-report.vm

Rev 34110 – rbm arr percentage of color change (95)

ranu — Tue, 07 Jan 2025 20:14:46 +0530

ranu – 1 file(s) modified
rbm arr percentage of color change (95)

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm