Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
34516 377 d 16 h ranu /trunk/ code committed for customer offer additional info  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOfferItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomerOfferItemModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularItemModelNew.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/UpgradeOffersList.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upgrade-customer-offer-model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer-model.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-offer.js
33795 596 d 12 h ranu /trunk/ upgrade offer live  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/OfferType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/UpgradeOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/UpgradeOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/UpgradeOfferRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upgrade-customer-offer-model.vm
/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-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOfferItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomerOfferItemModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepositoryImpl.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/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.vm
/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/customer-offer.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
31147 1276 d 19 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomerOfferItemModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomerOfferModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOfferItem.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/CustomerOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-index-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-offer.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
30601 1435 d 0 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Added velocity  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/performance-weekly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/12dashboard34.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/catalog-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/chart-filter-lms.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-insurance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-index-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.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/grn-history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.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/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/map-info.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify-order-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order.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/placement-plan.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/price-drop.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-provider-wallet-add-money.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/scheme_offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-download.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order.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/team-commitment.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled-payments.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upload-partner.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-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer-edit.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer.vm
29850 1581 d 16 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-index-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.vm
29707 1604 d 23 h tejbeer /trunk/ billing change  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomItemModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SamsungUpgradeOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOfferItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SamsungUpgradeOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/UpgradeOfferStatus.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BrandAmountModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomCustomerOffer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomPriceModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SamsungUpgradeOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpgradeOfferItemDetailModel.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/CustomerOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SamsungUpgradeOfferRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SamsungUpgradeOfferRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-insurance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-index-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/samsung-upgrade-offer-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/samsung-upgrade-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upgrade-offer-item-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upgrade-offer-tabular.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-offer.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LeadIvoryModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InsuranceModel.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/Offer.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/InsurancePolicy.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/PaymentOptionReferenceType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomerOrderDetail.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/dtr/InsurancePolicyRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/InsurancePolicyRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadActivityRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepositoryImpl.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/integrations/zest/InsuranceServiceImpl.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/DashboardController.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/OrderController.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-partner-po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java