| 37792 |
9 d 1 h |
amit |
/trunk/profitmandi-dao/src/ |
feat(cart): carry bag at Rs 1 per smartphone over Rs 12,000, extras at listing price
One carry bag (item 32046) is priced at Rs 1 for each smartphone (category
10006) in the cart selling above Rs 12,000; bags beyond that count are priced
at the carry bag's listing price, and Bronze partners pay listing for all.
Closes the leak where bag-only carts of hundreds of bags at Rs 1 were placed
from the old app. CarryBagQuote (via CartService.getCarryBagQuote) is the
single rule; the cart carries it as one line at a blended price.
- CartService/CartServiceImpl, CartResponse, OpenCartValidationResult: expose
the quote on the cart.
- OrderLineAllocator: an item may now have more than one cart line (the flat
and listing-priced parts); its units fill the lines in order.
- TransactionServiceImpl: item quantities merge instead of failing on a
duplicate item id.
- PurchaseServiceImpl: partner GRN creates one stock record per billed price;
the GRN screen shows the blended unit price; dead
createScannedNonSerializedItem removed.
- PurchaseReturnServiceImpl: debit-note PDF picks the order billed at the
returned stock's price; refundOrder spreads a non-serialized return over the
item's orders with room left (same price first) instead of loading it all
on the first order.
Tests: CarryBagQuoteTest 6/6, OrderLineAllocatorTest 13/13.
Deploy with profitmandi-web (same change) and the partner apps. |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CarryBagQuote.java
/trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/dao/model/CarryBagQuoteTest.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/dao/cart/v2/OpenCartValidationResult.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartResponse.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/OrderLineAllocator.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/transaction/OrderLineAllocatorTest.java
|
| 28653 |
1905 d 4 h |
amit.gupta |
/trunk/ |
Added Changes to order creation |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Payment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartMessage.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PaymentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PaymentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/CartItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartMessages.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CartItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CartItemRepositoryImpl.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CodPaymentService.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.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/dao/entity/catalog/Item.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/InventoryWarehouse.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Cart.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartItemResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartResponse.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/WarehouseRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/WarehouseRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepositoryImpl.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/warehouse/BrandRegionMappingRepository.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/transaction/TransactionService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.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/checkout/CommonPaymentService.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
|
| 26607 |
2344 d 1 h |
amit.gupta |
/trunk/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AddCartRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartItemResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartMessages.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CartResponse.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/AddCartRequest.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CartItems.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartItems.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartMessages.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartResponse.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/ValidateCartResponse.java
|