Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
33995 533 d 20 h vikas.jangra /trunk/profitmandi-fofo/src/main/webapp/ Fix Access Management, Purchase, Partner Dashboard UI Update  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.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/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/access-management.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
32771 868 d 21 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
31986 1099 d 15 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
31805 1129 d 16 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed logic  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.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/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
30707 1401 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Added scheme in processing for specified scheme ids  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
30701 1401 d 17 h amit.gupta /trunk/ Added changes related grn ease.  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
30696 1402 d 14 h amit.gupta /trunk/ Fixed purchase imei issue  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
30694 1402 d 19 h amit.gupta /trunk/ Added bulk grn  
/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/transaction/LineItemImeisRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
29330 1686 d 20 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
27873 1898 d 18 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-listing.vm
26318 2287 d 17 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/franchisee-visit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/instruction-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reports.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/review_order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-partner-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-partner-items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm
24993 2541 d 22 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed customitem  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
23772 2899 d 5 h amit.gupta /trunk/ Fixed purchase Grn issue  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomItem.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/PurchaseServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
23342 3017 d 15 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed hovering effect. Which is not required  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bad-inventory-snapshot.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/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
23181 3045 d 17 h ashik.ali /trunk/profitmandi-fofo/src/main/webapp/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bad-inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.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/grn-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.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-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
23174 3046 d 21 h ashik.ali /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ remove new grn line, handle missing shipping details with better way  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
23167 3047 d 14 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/ Fixed branding for fofo  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bad-inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.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/grn-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.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-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
23164 3047 d 17 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/ changed branding color  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bad-inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.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/grn-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.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-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
23076 3067 d 21 h ashik.ali /trunk/profitmandi-fofo/src/main/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer-details.js
23026 3075 d 20 h ashik.ali /trunk/profitmandi-fofo/src/main/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-ledger-download.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items-description.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-download.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap-multiselect.css
/trunk/profitmandi-fofo/src/main/webapp/resources/js/bootstrap-multiselect.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer-details.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bad-inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js

Show All