| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36628 |
58 d 17 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
fix: /schemes/update endpoint now uses addSchemeItemWithDates to prevent duplicate scheme_item rows
The old code directly persisted SchemeItem with NULL start_date/end_date, which bypassed the unique constraint (MySQL treats NULLs as distinct). Now uses the same service method as /addItemToScheme, which sets dates from scheme window and checks for overlapping entries before insert. |
|
| 36627 |
58 d 19 h |
amit |
/trunk/profitmandi-cron/ |
Thrift cleanup: remove ThriftConfig from settings, clean unused Thrift imports
- Removed ThriftConfig from settings.gradle
- TransactionRelatedTasks: removed unused Scan import
- POScheduler: removed unused PurchaseOrder import |
|
| 36626 |
58 d 19 h |
amit |
/trunk/profitmandi-fofo/ |
Thrift cleanup: remove ThriftConfig from settings, clean Thrift imports
- Removed ThriftConfig from settings.gradle
- IndentController: removed Thrift client and type imports
- InventoryController: removed Thrift imports |
|
| 36625 |
58 d 19 h |
amit |
/trunk/profitmandi-web/ |
Thrift cleanup: remove ThriftConfig from settings, clean dead Thrift code
- Removed ThriftConfig from settings.gradle
- LivePricingController: removed DtrClient RPC calls and Thrift imports
- RetailerController: replaced Thrift StateInfo with DAO State lookup
- TrackingController: removed TException import
- PayuHandler: removed dead getDescription/validatePaymentParams using Thrift types
- PayuPayResponseController: removed dead validatePaymentParams using Thrift Payment
- PaymentUtils: removed dead getPaymentType method and Thrift imports
- V2FofoIndentController, V2FofoInventoryController, V2HomeController: removed Thrift imports |
|
| 36624 |
58 d 19 h |
amit |
/trunk/profitmandi-dao/src/main/java/ |
Thrift cleanup: migrate types, remove dead code, add moved files
- Added Affiliate.java POJO (replaces Thrift struct)
- Moved from profitmandi-common: WalletHistoryModel, ExcelUtils, CustomOrder
- Removed dead createReturnTransaction method from ReturnService/Impl
- Removed dead getPartnerStockOnDate from InventoryService/Impl
- Replaced CatalogServiceException with Exception in PdfPoSheetGenerator
- Removed Thrift client imports from UserServiceImpl |
|
| 36623 |
58 d 19 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 |
|
| 36622 |
58 d 22 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
route plan map |
|
| 36621 |
58 d 22 h |
ranu |
/trunk/ |
route plan map |
|
| 36620 |
58 d 22 h |
amit |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ |
refactor: remove Thrift RPC calls from RechargeController and OrderController
- RechargeController: replaced TransactionClient.getRcgOrderStatus() in pollRechargeResult
with local DAO lookup via RechargeTransactionRepository. Gutted unused getAllDenominations,
myRecharges, getServiceProvider endpoints (return empty). Removed dead variable declarations.
- OrderController: deleted CancellableRequest method (Thrift-dependent, unused).
- V2OrderController: removed CancellableRequest wrapper, added direct JPA address creation. |
|
| 36619 |
58 d 22 h |
amit |
/trunk/profitmandi-dao/src/main/java/in/ |
refactor: migrate Thrift enums/models to profitmandi-dao under in.shop2020 package
Moved 22 enum files and 2 model classes (Address, OrderStatusGroups) from ThriftConfig
to profitmandi-dao with same package structure. Stripped all org.apache.thrift dependencies
(TEnum interface, TBase, read/write/validate methods). OrderStatusGroups rewritten as clean
POJO keeping only constructor defaults and getter methods used by callers. |
|
| 36618 |
58 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
route plan map |
|
| 36617 |
59 d 10 h |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ |
Location Tracking Report: Add Travel Row and added Company Office Repository Implementation |
|
| 36616 |
59 d 10 h |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ |
Location Tracking Report: Add Travel Row and added Company Office Repository Implementation |
|
| 36615 |
59 d 13 h |
aman |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/ |
Fix:Ui fix |
|
| 36614 |
59 d 14 h |
aman |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Fix:Date Formatter |
|
| 36613 |
59 d 15 h |
aman |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ |
Fix:Update L3 to L4 for first po approval mail |
|
| 36612 |
59 d 15 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
increase sidebar menu font-size by 1px for better readability |
|
| 36611 |
59 d 19 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ |
Allow GRN corrections for SALE_RET items in addition to PURCHASE - serial correction, serialized item change, and non-serialized item change paths all now accept SALE_RET scan type since the item is back in warehouse custody |
|
| 36610 |
59 d 22 h |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ |
Location Tracking Report: Add Travel Row and added Company Office Repository Implementation |
|
| 36609 |
59 d 22 h |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ |
Location Tracking Report: Add Travel Row and added Company Office Repository Implementation |
|