| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 35797 |
83 d 20 h |
amit |
/trunk/ |
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/LogisticsServiceImpl.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/transaction/TransactionServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java
|
| 34373 |
405 d 21 h |
tejus.lohani |
/trunk/ |
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/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/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/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/WEB-INF/views/ftl/transaction-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
|
| 34372 |
406 d 19 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
Added details for TransDocDt and TransDocNo in EwbDtls |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
|
| 33741 |
614 d 0 h |
amit.gupta |
/trunk/ |
Now allo EWB as well Invoice files related |
|
/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/EWayBillPdfModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/EWayBillPDF.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/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-common/src/main/java/com/spice/profitmandi/common/model/InvoicePdfModel.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/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/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/LogisticsService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.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/integrations/gstpro/api/model/E_InvoiceCommon.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.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/WEB-INF/views/ftl/transaction-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
|
| 32974 |
814 d 0 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
Fixed changes |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
|
| 32973 |
815 d 0 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
Fixed changes related to shipping upload should not be before billing date |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
|
| 32884 |
840 d 23 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
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
|
| 32609 |
918 d 19 h |
raveendra.bharati |
/trunk/ |
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
|
| 31077 |
1303 d 0 h |
tejbeer |
/trunk/ |
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/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/service/integrations/bluedart/WayBillGenerationProd.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.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/LogisticsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/bluedart/ArrayOfWayBillGenerationRequest.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
|
| 29578 |
1644 d 1 h |
tejbeer |
/trunk/ |
activation related change |
|
/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-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-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.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/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-details.vm
|
| 29305 |
1691 d 21 h |
tejbeer |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
|
| 29292 |
1692 d 20 h |
tejbeer |
/trunk/ |
|
|
/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
|
| 29256 |
1699 d 20 h |
tejbeer |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
|
| 29255 |
1699 d 20 h |
tejbeer |
/trunk/ |
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
|
| 29250 |
1700 d 20 h |
tejbeer |
/trunk/ |
change |
|
/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-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.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/WEB-INF/views/ftl/provider-tat.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/logistics.js
|
| 29222 |
1702 d 22 h |
tejbeer |
/trunk/ |
change |
|
/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/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/WEB-INF/views/ftl/logistics.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
/trunk/profitmandi-fofo/src/main/webapp/resources/js/logistics.js
/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/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.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
|