| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37489 |
20 d 22 h |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Restore Utils.html and Utils.htmlJson removed by r37477
r37477 reorganised Utils while consolidating the mail APIs and dropped its only two
instance methods. They have no Java callers -- they exist solely for Velocity, where
AppConfig binds new Utils() as $vmUtils -- so the compiler, IDE find-usages and any
grep over *.java all reported them dead.
With htmlJson gone, data-paramslist="$vmUtils.htmlJson(...)" stopped rendering usable
JSON on every report link (admin.vm:840, admin.vm:910, reports.vm:51). reports.js:7
then read $(this).data("paramslist") as undefined and returned true, letting the
browser follow the plain <a href> natively -- a GET against the @PostMapping
/reports/{projectName}/{fileName} (ReportsController:126), answered with GE_1007
"Request method 'GET' not supported". The modal POST path was the only way that
endpoint was ever reachable, so every partner report broke at once.
Confirmed against prod: zero occurrences in fofo.log for Aug 13/20/26/28/30, and 87
today starting 18:37:23, right after today's ROOT.war deploy. 13 distinct reports hit.
$vmUtils.html had two further callers that also come back:
offer_margin_detail_partner.vm:12 and :241 (offer description and notes).
Restored verbatim from r37476, and commented as template-only so the next refactor
does not read them as dead code again. |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 37477 |
21 d 0 h |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/ |
mail: one way to send mail, and nothing sends inline
There were three overlapping APIs -- Utils.sendMail* (7 static overloads),
EmailServiceImpl.sendMail* (7 more) and MailOutboxService.queueMail* (20). The
first two built their own MimeMessage, hardcoded From: noreply@smartdukaan.com
in eleven places, and pushed straight down whichever JavaMailSender the caller
passed.
That From is why mail was refused: an authenticated Workspace session may send
only as the account it logged in as, and noreply@ is a different identity in the
same domain. Sending inline also meant a failed send was lost outright and took
the calling job down with it, which is how one expired credential came to mark
ten report jobs FAILED.
New in profitmandi-common:
MailQueue - the single entry point; queue() returns once the mail is
recorded, not once it is sent
MailRequest - one value object replacing the 34 overloads
MailSenderType - GOOGLE (authenticated, From rewritten) or RELAY (IP-authorised)
The interface lives in common while MailOutboxService implements it in dao,
because dao depends on common and not the reverse -- Utils and EmailService
could not otherwise reach the outbox at all.
Utils and EmailService keep their signatures so the ~38 call sites still
compile, but now delegate and ignore the JavaMailSender argument; choosing a
transport was never the caller's business. Both are marked deprecated.
MailQueueHolder bridges the static helpers to the bean and is documented as a
compromise, not a pattern. |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/mail
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/mail/MailQueue.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/mail/MailQueueHolder.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/mail/MailRequest.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/mail/MailSenderType.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/EmailService.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/EmailServiceImpl.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 36623 |
123 d 3 h |
amit |
/trunk/profitmandi-common/ |
Remove ThriftConfig dependency and Thrift client wrappers
- Removed ThriftConfig from build.gradle dependency
- Deleted entire thrift/clients/ directory (16 RPC client files)
- Removed Thrift-dependent methods from Utils.java (getRechargeDisplayStatus, getOrderStatus, getWarehouseClient, etc.)
- Deleted dead code: HelperServiceUtils.java, OrderObject.java
- Moved to profitmandi-dao: WalletHistoryModel.java, ExcelUtils.java, CustomOrder.java |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomOrder.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/mandii/OrderObject.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/WalletHistoryModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/thrift
/trunk/profitmandi-common/build.gradle
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 35204 |
341 d 1 h |
amit |
/trunk/ |
Fixed changes related to downloading file at home page |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java
|
| 35102 |
354 d 8 h |
amit |
/trunk/ |
Added csvn report |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseItemAgeingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java
|
| 34568 |
493 d 23 h |
vikas.jangra |
/trunk/ |
Liquidation/Bidding push notification and Publish Email |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LiquidationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/catalog/LiquidationController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/liquidation.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js
|
| 33354 |
864 d 4 h |
amit.gupta |
/trunk/ |
Enhanced Sidbi Sanctions |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SidbiService.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.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/transaction/FofoSidbiSanctionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/FofoSidbiSanctionRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
|
| 33231 |
887 d 20 h |
amit.gupta |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Fixed Utils removed Thrift dependencies |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 33045 |
931 d 4 h |
amit.gupta |
/trunk/ |
Added sidbi and improvements in credit note |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/FofoSidbiSanction.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/NotEqualsModel.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
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDropIMEI.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail-row.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-credit-detail.js
|
| 32955 |
951 d 5 h |
amit.gupta |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Fixed changes |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 32724 |
1013 d 22 h |
amit.gupta |
/trunk/ |
Added changes related to Loan Interest correction and ReturnOrder |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ReturnOrderInfo.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ReturnTransaction.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnTransactionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnTransactionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnServiceImpl.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.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/ReturnOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PurchaseInvoiceService.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
|
| 32199 |
1166 d 21 h |
amit.gupta |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
Fixed additional scheme logic |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 31903 |
1235 d 6 h |
amit.gupta |
/trunk/ |
Added changes related to new scheme rollout policy |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlabEntity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ImeiMarginModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModelNew.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/InventoryPayoutModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/paginated-item.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlab.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
/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/CreateOfferRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/CatalogSchemeSummaryModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/CatalogSummaryModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/SchemeSummaryModel.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-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
|
| 31697 |
1291 d 2 h |
amit.gupta |
/trunk/ |
Fixed sales margin logic |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
|
| 31177 |
1400 d 4 h |
tejbeer |
/trunk/ |
change |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
|
| 30122 |
1661 d 1 h |
amit.gupta |
/trunk/ |
Fixed issue |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SchemeItems.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SchemeModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/categorywise-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
|
| 29552 |
1781 d 21 h |
amit.gupta |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
|
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 28987 |
1860 d 6 h |
amit.gupta |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
|
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 28925 |
1865 d 23 h |
amit.gupta |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ |
|
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
|
| 28395 |
1956 d 21 h |
amit.gupta |
/trunk/ |
Added changes for activation schemes |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
|