| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36372 |
3 d 21 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Wallet: SELECT FOR UPDATE on user_wallet mutations to close lost-update hole
addAmountToWallet/consumeAmountFromWallet(x2)/rollbackAmountFromWallet all
follow a read-modify-write pattern on user_wallet with no pessimistic lock
and no @Version, so two concurrent tx for the same partner both read the
same pre-snapshot amount, compute their own deltas, and commit - the second
UPDATE silently overwrites the first's credit/debit. user_wallet_history
still gets both rows, so balance drifts vs sum(history) with no exception.
Replaces the misnamed (and body-broken) selectByIdForUpdate - whose
implementation was a plain selectById, not a lock - with a new
selectByRetailerIdForUpdate that issues SELECT ... FOR UPDATE via
LockModeType.PESSIMISTIC_WRITE, mirroring the idiom already used in
GenericRepositoryImpl.selectByIdForUpdate and OrderRepositoryImpl.
Preserves the create-on-missing behavior of selectByRetailerId so
first-time partners keep working.
Switches the four read-modify-write call sites in WalletServiceImpl from
selectByRetailerId to the new locking variant. Read-only callers
(getUserWalletByUserId, getUserWalletHistoryByUserId, etc.) keep using
the non-locking selectByRetailerId - MVCC snapshot reads stay non-blocking
for display/statement endpoints.
Also drops the stale commented-out selectByIdForUpdate line in
rollbackAmountFromWallet and removes the broken method from the
UserWalletRepository interface / impl - it had zero live callers.
Blast radius: every write call to these three wallet methods now holds
an X-lock on the target user_wallet row for the rest of the outer tx.
Concurrent write tx for the same partner will briefly serialize at the
SELECT FOR UPDATE - correct serialization instead of silent drift.
Read-only traffic is unaffected (MVCC). |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 36305 |
9 d 2 h |
amit |
/trunk/profitmandi-dao/src/main/ |
Batch processing infrastructure + per-partner offer processing + partner limit optimization + investment cache eviction on billing/payment/cancellation with 3hr TTL |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CronBatch.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CronBatchItem.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/CronBatchItemStatus.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/CronBatchStatus.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchItemRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchItemRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferPartnerPayoutData.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/SellinPartnerPayoutData.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/PartnerLimitUpdateData.java /trunk/profitmandi-dao/src/main/resources/sql/create_cron_batch_tables.sql
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.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/PartnerInvestmentService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.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/order/OrderServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 35828 |
63 d 19 h |
amit |
/trunk/ |
Optimize order creation: reduce DB queries, fix Hibernate batching, move filters to SQL |
|
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/DBConfig.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/service/transaction/SDCreditServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java /trunk/profitmandi-dao/src/main/resources/META-INF/dev.properties /trunk/profitmandi-dao/src/main/resources/META-INF/prod.properties /trunk/profitmandi-dao/src/main/resources/META-INF/staging.properties /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
|
| 34966 |
235 d 16 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/ |
Removed wallet Credit |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 34752 |
297 d 10 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Fixed Activation Scheme Logic |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 34674 |
313 d 17 h |
aman.kumar |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
show the partner name when wallet amount is not sufficient on bulk order |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 34575 |
345 d 17 h |
vikas.jangra |
/trunk/ |
Liquidation/Bidding auto approval |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/BidServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.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/SchemeController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/liquidation.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
|
| 34261 |
419 d 18 h |
tejus.lohani |
/trunk/ |
Give (a pending,approved,reject)add-wallet-req report |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.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/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.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
|
| 33861 |
565 d 19 h |
tejus.lohani |
/trunk/ |
check fullStockPayment and orderDispatch and auto mark billing and fullstock payment |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.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/WalletController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
|
| 33848 |
569 d 11 h |
tejus.lohani |
/trunk/ |
fix bm approval flow - loi generate after approval |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LoiFormModel.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/service/loiForm/LoiFormServiceImpl.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/LoiFormController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm
|
| 33845 |
569 d 21 h |
tejus.lohani |
/trunk/ |
new flow of Onboarding process and wod-fin report , |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/ServiceType.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WodFinMappingModel.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loi-form.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wod-fin-mapping-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-form.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/brandFee/BrandFeeCollection.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PaymentOption.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/enumuration/dtr/StoreTimeline.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/LoiStatus.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LoiFormModel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/StoreTimelineModel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeCollectionRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerDealerRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerDealerRepositoryImpl.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/fofo/PaymentOptionRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ServiceConfigRepositoryImpl.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/repository/onboarding/LoiDocRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocsRepositoryImpl.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/TransactionRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionRepositoryImpl.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/dao/repository/user/LoiFormRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepositoryImpl.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/LoiFormService.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/serviceConfig/ServiceConfigServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.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/StoreTimelineTatService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/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/ServiceConfigContoller.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/warehouse/OrderManagementController.java /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/onboarding_timeline.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-billing-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/pendingForm.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/onboarding-form.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/service.js
|
| 33547 |
661 d 13 h |
tejus.lohani |
/trunk/ |
changes in Max negative wallet value |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 33421 |
695 d 12 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/ |
Added amount |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 33247 |
737 d 20 h |
ranu |
/trunk/ |
warehouse billing phase one and added signature exception |
|
/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-fofo/src/main/webapp/WEB-INF/views/ftl/transaction-detail.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-management.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionShipmentSequence.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.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/RetailerTagRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerTagRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SamsungUpgradeOfferRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SamsungUpgradeOfferRepositoryImpl.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/dao/repository/catalog/TagRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeOperatorRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeOperatorRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeProviderRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeProviderRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ShopAddressRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ShopAddressRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.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/inventory/SaholicInventorySnapshotRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorItemPricingRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorItemPricingRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyCancelOrderRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyCancelOrderRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyColorChangeRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyColorChangeRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyItemRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyItemRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyOrderRespository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyOrderRespositoryImpl.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/UserWalletRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMappingRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMappingRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMasterRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMasterRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.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/order/OrderServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.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/RetailerService.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/StoreTimelineTatServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MessageController.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/PerformanceController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.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/ServiceConfigContoller.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/warehouse/OrderManagementController.java /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css /trunk/profitmandi-fofo/src/main/webapp/resources/js/logistics.js
|
| 33194 |
748 d 21 h |
amit.gupta |
/trunk/ |
Added 10K for Referral |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
|
| 33180 |
753 d 20 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/ |
patch for |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 33172 |
758 d 18 h |
tejus.lohani |
/trunk/ |
add bulk order service in admin dashboard |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk_order.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/OrderController.java /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
|
| 32871 |
829 d 17 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/ |
AA |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|
| 32494 |
941 d 21 h |
amit.gupta |
/trunk/ |
Merged changes related to Smartdukaan |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.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/WalletController.java
|
| 31921 |
1087 d 20 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
Fixed scheme depenedncy issue |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
|