Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
35728 91 d 20 h vikas /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Hide 0 Tenure Offers for PineLabs  
/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
35726 92 d 13 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
35620 104 d 16 h vikas /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ separate  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
34159 473 d 15 h ranu /trunk/ emeies to bill showing more for acceseries  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
33725 621 d 13 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ minor jira bugs fix  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead_activity_modal.vm
33627 655 d 16 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Added scheme  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
33612 657 d 19 h amit.gupta /trunk/ Fixed logic to bill only top 5  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ImeiAgeingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-order-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
33167 775 d 16 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed bug related to online order billing  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
32771 868 d 20 h raveendra.bharati /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ translation english to hindi  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-inactive.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-partner-po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/empty.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/insurance-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-billing-summary-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-total-income.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/performance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/product-compare.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/punch-in-outs.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reports.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
32678 895 d 13 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ add catogry of partner ui on dashboard  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
32653 907 d 14 h ranu /trunk/profitmandi-fofo/src/main/webapp/ checkout page step skip with billing  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
32639 909 d 14 h ranu /trunk/profitmandi-fofo/src/main/webapp/ aad item to beg solve imies problem and direct checkout to cart  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
31986 1099 d 14 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/product-compare.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
30603 1434 d 20 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/  
/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/web-offer-model.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/web-offers.js
27620 1947 d 21 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
27583 1955 d 16 h tejbeer /trunk/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-similar-Id.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ContentPojo.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.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/fofo/CurrentInventorySnapshotRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.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/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/resources/js/inventory.js
26316 2288 d 15 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ change  
/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
24446 2665 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Minor fixes  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.ftl
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
24203 2749 d 13 h amit.gupta /trunk/ Gifts can now be biilled  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-partner-items.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
23405 2989 d 20 h amit.gupta /trunk/ Added changes related to indent and imei selection  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/IndentStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Indent.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/IndentItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/IndentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/indent
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/indent/IndentService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/indent/IndentServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.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/dtr/UserRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.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/LoginController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/response.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

←Prev12Next→

Show All