Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36912 1 m amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/ Internal PO: block billing-warehouse change for PO-mapped orders

Throw if the order's transaction is mapped to an internal PO before changing warehouse in changeBillingWarehouse.		  
36911 1 m amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ Internal PO: block billing-warehouse change for PO-mapped orders

Throw if the order's transaction is mapped to an internal PO before changing warehouse in changeBillingWarehouse.		  
36910 1 m amit /trunk/profitmandi-dao/src/main/ Internal PO: map created transaction to PO; block warehouse change for PO-mapped orders

- WarehousePurchaseOrder: add transactionId column + selectByTransactionId
- createOrderInternally returns txn id; createPurchaseOrder maps it onto the PO
- Block order.setWarehouseId for PO-mapped orders in changeFulfillmentWarehouse; cron moveOrders skips them
- Migration: add warehouse.purchaseorder.transactionId		  
36909 16 h 13 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ deploy rating performace dashboard  
36908 16 h 15 m ranu /trunk/profitmandi-fofo/src/main/ deploy rating performace dashboard  
36907 16 h 37 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ deploy rating performace dashboard  
36906 16 h 40 m ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/ deploy rating performace dashboard  
36905 18 h 39 m vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36904 19 h 9 m aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix FSP wallet approval blocked by cross-store reference collision

Scope the duplicate-reference guard in /addAmountToWallet to the same retailer.
Reference numbers (e.g. cheque no '000310') are not globally unique, so an
already-approved request from a different store falsely tripped 'Entry already
Approved Please reject' and blocked a legitimate Full Stock Payment approval.		  
36903 21 h 0 m vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36902 1 d 16 h amit /trunk/profitmandi-fofo/src/main/ HID requested-allocations: fully-batched HID/Current (no per-partner query) + server-side pagination on both Pending and Approved tabs (50/page); bump js version  
36901 1 d 16 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ HID requested-allocations: fully batch HID computation (batched tier + SUM(current_qty) + 2-day sales per pair, replacing per-partner query) and add Pending list pagination  
36900 1 d 17 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/ code committed for some change on app  
36899 1 d 17 h amit /trunk/profitmandi-fofo/src/main/ HID requested-allocations: batched HID/Current/Bill-Act lookups, server-side pagination on Approved tab (50/page), generate-request fixes (qty>0 + derive trusted fofoId via isAdmin); bump js version  
36898 1 d 17 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ HID allocation: batch the requested-allocations screen (catalog-filtered HID query + batched billed/activated serial lookups) and add approved-list pagination (50/page) reusing GenericRepository paginated+count helpers  
36897 1 d 18 h vikas /trunk/ Location Tracking Dashboard  
36896 1 d 20 h vikas /trunk/ Mark Agenda Filled: Update logic  
36895 1 d 20 h amit /trunk/profitmandi-fofo/src/main/ HID allocation edit screen: add HID Qty / Bill-Act 5d / Current Qty / Excess-Short (colored) / Requestor / Approver columns; requested qty now additional one-time qty over current stock; null-row guard + qty>0 validation; track approver  
36894 1 d 20 h amit /trunk/profitmandi-dao/src/main/ HID allocation: requested qty is now an additional one-time allowance (purchase-limit override, HID target unchanged); add approved_by column; add 5-day billed/activated serial lookups for the edit screen  
36893 1 d 21 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Contact-Us editors: remove neha.sharma, keep only kangan.monga and gaurav.mathur1  

←Prev12Next→

Show All