Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
35746 5 d 22 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix: Handle empty item list in searchOrderDetails endpoint

Added empty check before calling itemRepository.selectByIds() to prevent
invalid SQL IN clause exception when invoice has no items.
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35737 6 d 1 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ OrderController: fix N+1 queries, replace e.printStackTrace with LOGGER, fix string concat in logging, make accessoriesDeals static final  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35726 6 d 21 h vikas /trunk/ Pinelabs offer discovery on billing and stock page  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsOfferCacheService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.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/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/resources/message_en.properties
/trunk/profitmandi-fofo/src/main/resources/messages_en.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
35501 49 d 4 h ranu /trunk/ today offer modal done  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CatalogBrief.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCriteriaPojo.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PayoutSlabModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SchemeOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayCatalogOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferGroupKey.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WebOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-fofo-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.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/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
35269 99 d 0 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ insurance remove on same time  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35095 142 d 3 h aman /trunk/ FIx: Scratch offer impl Fix  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/GiftEntity.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/scratch/SeasonalOfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35084 144 d 1 h aman /trunk/ Fix: Diplay currency name , fix brandwise item sale and montly sale table ui fix  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
35081 144 d 4 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ invoice correction  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35076 144 d 5 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ get quote from backend  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35066 145 d 2 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Update  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35064 145 d 21 h aman /trunk/ Feat:BrandwiseSale and brandWise Item wise sale and live scratch offer  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BrandItemWisePartnerSaleModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.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/fofo/PurchaseRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.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/OrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
35019 153 d 22 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ icici payment tagging remove  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35018 153 d 22 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ icici payment tagging remove  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35004 155 d 1 h ranu /trunk/ icici lombard new api phase one deploy  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityProposalModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35003 155 d 1 h ranu /trunk/ icici lombard new api phase one deploy  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
35002 155 d 2 h ranu /trunk/ icici lombard new api phase one deploy  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityProposalWrapper.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityQuoteWrapper.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardTokenEnum.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityProposalResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityQuoteModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityQuoteResponseModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
34838 200 d 4 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Update  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
34810 211 d 4 h ranu /trunk/ icici insurance policY uploaded with live credentials  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
/trunk/profitmandi-dao/src/main/resources/icicilombard.xlsx
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
34805 214 d 21 h ranu /trunk/ icici insurance policy phase one uploaded  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/PaymentTaggingResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/PaymentTaggingResponseModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.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/repository/dtr/IciciPolicyTrackerRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IciciPolicyTrackerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityQuoteResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
34798 217 d 0 h ranu /trunk/ icici insurance policy phase one uploaded  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/IciciPolicyTracker.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/IciciPincodeMaster.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/IciciPincodeMasterRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/IciciPincodeMasterRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IciciPolicyTrackerRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IciciPolicyTrackerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardTokenEnum.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/PaymentTaggingResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/PolicyCertificateRequestModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityProposalModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityProposalResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityQuoteModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/AfinityQuoteResponseModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/CDBGTagging.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/IciciCityStatePincodeDetailModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/IciciInsurancePayloadModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/IciciJwtTokenResponse.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/PaymentEntry.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/model/PaymentTaggingModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InsuranceModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SerialNumberDetail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scratch/editScratchOffer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scratch/scratchOffer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js

Show All