SmartDukaan – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java

Rev 35797 – Margin scheme (Rule 32(5)) support for refurbished category (10007) ...

amit — Thu, 19 Feb 2026 17:25:51 +0530

amit – 6 file(s) modified
Margin scheme (Rule 32(5)) support for refurbished category (10007)

- FofoSolr: Add 10007 to CATEGORY_MASTER, stop remapping to categoryId 3
- TransactionServiceImpl: Use RF- invoice prefix (fits NIC 16-char limit)
- InvoiceService: Margin calculation (GST on margin only), separate regular/margin items, purchase price lookup, restructured saveInvoice flow
- GstProService: Use InvoicePdfModel for correct taxable values, OthChrg for non-taxable component so TotInvVal = full selling price (GSTR1 & EWB compliance), safe Optional check for EWBPPD, email alert on missing EWB
- LogisticsServiceImpl: Null checks for shipment sequence and provider to prevent NPE in EWB details
- RunOnceTasks: Fix testIrnLive to generate InvoicePdfModel before calling getEInvoice

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 34373 – Distance field in billing Dashboard,when warehouse and billing address pincode ...

tejus.lohani — Thu, 03 Apr 2025 16:44:46 +0530

tejus.lohani – 14 file(s) modified
Distance field in billing Dashboard,when warehouse and billing address pincode are same ,then distance is required

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/WarehousePartnerDistanceMapping.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Address.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/transaction/OrderBillingModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehousePartnerDistanceMappingRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehousePartnerDistanceMappingRepositoryImpl.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/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.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/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction-detail.vm

Rev 34372 – Added details for TransDocDt and TransDocNo in EwbDtls

amit.gupta — Wed, 02 Apr 2025 18:36:04 +0530

amit.gupta – 1 file(s) modified
Added details for TransDocDt and TransDocNo in EwbDtls

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

Rev 33741 – Now allo EWB as well Invoice files related

amit.gupta — Sat, 07 Sep 2024 14:07:13 +0530

amit.gupta – 31 file(s) modified
Now allo EWB as well Invoice files related

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/EWayBillPdfModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/EWBPartAModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/EWBPartBModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InvoicePdfModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/EWayBillPDF.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/WarehouseProvider.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/WarehouseRider.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/EInvoiceDetails.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionShipmentSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/WarehouseAddressMaster.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/transaction/OrderBillingModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseProviderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseProviderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseRiderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseRiderRepositoryImpl.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/TransactionShipmentSequenceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionShipmentSequenceRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/api/model/E_InvoiceCommon.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.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/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/GoogleTokenUtil.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction-detail.vm

Rev 32974 – Fixed changes

amit.gupta — Tue, 20 Feb 2024 13:50:06 +0530

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

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

Rev 32973 – Fixed changes related to shipping upload should not be before ...

amit.gupta — Mon, 19 Feb 2024 13:45:20 +0530

amit.gupta – 1 file(s) modified
Fixed changes related to shipping upload should not be before billing date

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

Rev 32884 – Fixed changes related to notification only send based on shipping/delivery ...

amit.gupta — Wed, 24 Jan 2024 14:41:56 +0530

amit.gupta – 2 file(s) modified
Fixed changes related to notification only send based on shipping/delivery date not exceeded T+1 and T+2 respectively

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DispatchNotificationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java

Rev 32609 – Fixed orders Shipping Date(dd-MM-yyyy HH:mm:ss), set shipping time in Orders

raveendra.bharati — Tue, 07 Nov 2023 18:19:15 +0530

raveendra.bharati – 4 file(s) modified
Fixed orders Shipping Date(dd-MM-yyyy HH:mm:ss), set shipping time in Orders

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java

Rev 31077 – change

tejbeer — Wed, 19 Oct 2022 13:33:00 +0530

tejbeer – 10 file(s) modified
change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/BlueDartAttribute.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/BlueDartAttributeRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/BlueDartAttributeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/BluedartService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/BluedartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/bluedart/ArrayOfWayBillGenerationRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/bluedart/WayBillGenerationProd.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java

Rev 29578 – activation related change

tejbeer — Fri, 12 Nov 2021 13:03:54 +0530

tejbeer – 13 file(s) modified
activation related change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ActivationBrandModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ActivationItemDetailModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ActivationYearMonthModel.java
~ /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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activation-pending-item-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activation-tabular.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-details.vm

Rev 29305 –

tejbeer — Sat, 25 Sep 2021 16:43:33 +0530

tejbeer – 1 file(s) modified

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

Rev 29292 –

tejbeer — Fri, 24 Sep 2021 17:22:48 +0530

tejbeer – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java

Rev 29256 –

tejbeer — Fri, 17 Sep 2021 17:49:45 +0530

tejbeer – 1 file(s) modified

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

Rev 29255 – change

tejbeer — Fri, 17 Sep 2021 17:42:15 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java

Rev 29250 – change

tejbeer — Thu, 16 Sep 2021 18:13:04 +0530

tejbeer – 11 file(s) modified
change

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DelayDayModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MarkDeliveredModel.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/service/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.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/LogisticsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/logistics.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider-tat.vm

Rev 29222 – change

tejbeer — Tue, 14 Sep 2021 15:49:25 +0530

tejbeer – 23 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /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/logistics/ProviderDetails.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ProviderTat.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/PublicHolidays.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DispatchNotificationModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ProviderDetailModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ProviderTatModel.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/service/LogisticsService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/logistics.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/logistics.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-legal-row-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider-tat-detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider-tat.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/public-provider-holiday.vm