Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
32629 915 d 22 h amit.gupta /trunk/ Fixed logic for invoice edit  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
27383 2009 d 5 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Removed upper case from form-control  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.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-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
26229 2305 d 4 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ change  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
26218 2306 d 7 h tejbeer /trunk/ chnage  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingListingRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listing-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
24220 2740 d 0 h amit.gupta /trunk/ Fixed velocities  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ItemLedgerServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.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-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/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.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.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-download.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-message.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-notification.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled-payments.vm
24087 2806 d 1 h amit.gupta /trunk/ Fixed issues related to prebooking.
Added price drop logic		  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-description.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderItemRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items-description.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingListingRequest.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingOrderRequest.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/fofo/PrebookingListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.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/fofo/PrebookingListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepositoryImpl.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-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.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/CustomerController.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/PrebookingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-order.js
24085 2807 d 6 h amit.gupta /trunk/  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
24056 2813 d 9 h amit.gupta /trunk/ One can add pricing now.  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.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-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
24016 2824 d 1 h amit.gupta /trunk/ Fixed attendance  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.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-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.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-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
23941 2855 d 0 h amit.gupta /trunk/ Investment popup is toughened and more annoying.  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.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-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.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-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
23918 2857 d 7 h amit.gupta /trunk/profitmandi-fofo/src/main/ Added Versioning  
/trunk/profitmandi-fofo/src/main/webapp/resources/js/bootbox.min.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.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-scheme.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.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-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
23569 2948 d 23 h govind /trunk/ Fixed bugs related to pre order booking. Updated to new logging log4j2  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.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/fofo/PrebookingListingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepositoryImpl.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-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
23419 2984 d 1 h ashik.ali /trunk/profitmandi-fofo/src/main/ New feature: Prebooking Listing, Prebooking Orders, link with orders, order details  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listing-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/tag-listing-items-description.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.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/PaymentOptionController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/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/items-description.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js