| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36831 |
6 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: reconcile month-end scheme line to wallet net; exclude loan from statement
- Add a "Scheme adjustment (per wallet)" line at each month-end = wallet scheme net minus
margin CN total, so the running balance follows the actual wallet (source of truth)
instead of the CN gross. Surfaces scheme reversals (e.g. demo-convert) that margin CNs
miss, instead of burying them in the FLOAT DIFF / rounding line.
- Statement excludes loan/interest entirely (closing = wallet + pending indent): keep
CREDIT_LIMIT/CREDIT_UTILIZED/LOAN/LOAN_REPAYMENT legs in the body so it reconciles to the
loan-free closing; drop the INTEREST ACCRUED line and interestAccruedCost plumbing. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36801 |
9 d 18 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36780 |
13 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Rename reco CSV column header In Transit -> Unbilled PO (label only; calculation unchanged) |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36776 |
13 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Remove redundant /account/closing-statements; repoint wallet-details closing button to /account/reco (now on the wallet+PI-loan model) |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
|
| 36775 |
13 d 23 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Align /account/reco closing with individual account statement: closing = wallet + pending indent - loan outstanding; add Loan Outstanding column |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36772 |
14 d 16 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: per-CN scheme/margin lines + non-month-end raw-scheme fallback.
- Month-end: one 'Margin / Scheme Payout' line PER credit note (MARGINS net >=0 -> Credit Note (CN); CN_CANCELLATION or negative net -> Debit Note (DN), reducing the balance), referenced by CN number.
- Non-month-end statements: the trailing month's MARGINS CN isn't issued yet, so consolidate that month's raw scheme wallet entries into a single 'Margin / Scheme Payout' line placed at the end, just before the FLOAT DIFF. Keeps partial-period statements reconciling (verified AYAAN 01-15/04 float -1.97 vs 36,462 in the diff without it). |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36769 |
14 d 17 h |
amit |
/trunk/ |
Account statement: select the month-end scheme/margin credit notes by margin_month instead of cn_date.
Added CreditNoteRepository.selectByMarginMonth(fofoId, YearMonth) - fofo-scoped, keyed on margin_month passed as a YearMonth so the generic repo matches it as a whole-month range (robust to the stored day). populateData now uses it for the month-end CN block. margin_month is the explicit margin-period field (always populated for MARGINS and CN_CANCELLATION; RETURNS have none and are naturally excluded, consistent with returns being sourced from returnorderinfo). |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36755 |
15 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: relabel the reconciling line as 'FLOAT DIFF' (rounding/float only).
It is not pending indent or a cross-period movement - with clean data it is only a few rupees of float. A large value indicates a data issue (e.g. MARGINS CN not yet rolled out) and is surfaced by the existing reconciliation warning. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36754 |
15 d 23 h |
amit |
/trunk/ |
Account statement (Excel): reconcile running balance to net standing (wallet + pending indent - loan).
- populateData: categorised lines, scheme/margin shown as month-end MARGINS credit note (CN_CANCELLATION and negative-net CNs rendered as debit notes), interest-accrued line as the standing-moving loan cost, and a net-pending-indent/diff line that lands the running balance on closing.
- Returns shown individually from returnorderinfo (one credit line per return, against its invoice on refundedAt); billing-query RETURNED/RETURNS_CN suppressed to avoid double count.
- Exclude PURCHASE and CREDIT_LIMIT/CREDIT_UTILIZED (loan cash legs) from the wallet body.
- LoanStatementRepository.getInterestAccruedBetween; ReturnOrderInfoRepository.selectReturnsBetween. |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanStatement.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36746 |
17 d 2 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Restore Total Payables and Credit Utilization fields on wallet statement dashboard (NPE-safe via creditSummary) |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
|
| 36720 |
21 d 15 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Remove redundant credit section from wallet dashboard: fixes NPE for users without SD Credit, credit info already available in partner report |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
|
| 36513 |
38 d 17 h |
amit |
/trunk/ |
Add running_balance to userwallethistory: persist wallet balance after each transaction for instant ledger display. Populate at all write paths (WalletService, adjustTransaction). Read directly in wallet statement template and CSV download. Includes backfill migration SQL. Renamed walletSummart to walletSummary. |
|
/trunk/profitmandi-dao/src/main/resources/sql/migration_running_balance_wallet_history.sql
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WalletSummaryReportModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWalletController.java
|
| 36500 |
40 d 17 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
l3 and avobe show all warehouse stock |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 36401 |
51 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.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/LoiFormController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RefferalController.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
|
| 36242 |
68 d 16 h |
aman |
/trunk/ |
Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod initianl mail after store code creation |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelineTatRepositoryImpl.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/StoreTimelineTatServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-rejected.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-req.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-timeline-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history-paginated.vm
|
| 36064 |
84 d 15 h |
aman |
/trunk/ |
Fix:FULL_Stock flow , fin service mark unapplicable ,send invoice to whatsapp by default, update contact list ,Training mail issue |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/OnboardingEmail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/OnboardingEmailRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/OnboardingEmailRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.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/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-open.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
|
| 35971 |
100 d 16 h |
aman |
/trunk/ |
Feat : Loi 2.0 Enhancement and redesigning |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiFinanceOption.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FullStockPayment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/FranchiseType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/FullStockPaymentStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DelayReportItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/hdfc/LoiFinanceOptionModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFinanceOptionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFinanceOptionRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/delay-panel.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/full-stock-payment-panel.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-timeline-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/welcome-call-index.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerVerificationCheckboxes.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiForm.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiFormData.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AddWalletRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/StoreTimelinetb.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadSource.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/StoreTimeline.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnboardingVerificationRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnboardingVerificationRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelinetbRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelinetbRepositoryImpl.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/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.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/OrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/design-completed.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loi-form.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/brand-fee-collection.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/document-upload.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-design-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-design-row-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-open.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-reject.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-verification.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-deActivate-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-verification-checkbox-model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/service-not-applicable-by-partner-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wod-fin-mapping-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/panel-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
|
| 35811 |
117 d 13 h |
amit |
/trunk/ |
Centralize credit/loan summary: CreditSummary DTO, bulk query, fix stale utilization, re-enable overdue check, fix interestPaid bug, optimize fresh money (3 queries vs 21), remove dead code |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulkCreditSummary.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreditSummary.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.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/dao/repository/transaction/UserWalletHistoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.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-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java
|
| 35572 |
150 d 10 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fix: Remove duplicate persist in wallet approval
The addWalletRequest status was already being updated in memory,
and the entity is managed by Hibernate session - no explicit persist needed. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
|
| 35458 |
179 d 15 h |
amit |
/trunk/ |
Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level
Changes:
- profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true)
- profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional
- profitmandi-dao: Removed @Transactional from services/repositories
Exceptions (called from interceptors, need own transaction):
- RoleManager: @Transactional(readOnly = true) - called from interceptor for auth
- PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor
Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional
Fixed rollbackOn to rollbackFor for Spring compatibility |
|
/trunk/profitmandi-dao/pinelabs.http
/trunk/profitmandi-dao
/trunk/profitmandi-dao/build.gradle
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.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/fofo/PartnerTypeChangeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsCustomerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsPaymentMethodRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsRefundRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.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/authentication/RoleManager.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SchemeBlockedImeiServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.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/AccessManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InvoiceController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.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/LoginController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MapTrackController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.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/ScanRecordController.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/java/com/spice/profitmandi/web/controller/TrialController.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/WebHookController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebOffersController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/logix/LogixController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.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/controller/warehouse_rider/WarehouseRiderController.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
/trunk/profitmandi-fofo/src/main/resources/log4j2.xml
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BannerListingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PageController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SmartCartController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrackingController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest/GuestController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
/trunk/profitmandi-web/src/main/resources/META-INF/env.property
/trunk/profitmandi-web/src/main/resources/log4j2.xml
|