SmartDukaan – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/

Rev 26771 –

amit.gupta — Tue, 23 Jun 2020 16:05:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 26770 –

amit.gupta — Tue, 23 Jun 2020 15:07:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 26769 –

amit.gupta — Tue, 23 Jun 2020 15:06:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 26766 – change

tejbeer — Mon, 22 Jun 2020 21:13:32 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RefferalRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RefferalRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RefferalController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal-approve.vm

Rev 26763 – change

tejbeer — Mon, 22 Jun 2020 01:57:51 +0530

tejbeer – 6 file(s) modified
change

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /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

Rev 26751 –

amit.gupta — Wed, 17 Jun 2020 10:14:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/HygieneController.java

Rev 26748 – change

tejbeer — Sat, 13 Jun 2020 18:24:37 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm

Rev 26743 – Added Cookies handler tomcat8 compatible

amit.gupta — Wed, 10 Jun 2020 21:10:15 +0530

amit.gupta – 2 file(s) modified
Added Cookies handler tomcat8 compatible

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java

Rev 26738 – Added new feature to add web listing

amit.gupta — Wed, 10 Jun 2020 14:42:04 +0530

amit.gupta – 10 file(s) modified
Added new feature to add web listing

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/WebProductListing.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebListingRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebProductListingRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/WebProductListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/web-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-listing.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-product-listing.vm

Rev 26737 –

amit.gupta — Wed, 10 Jun 2020 08:00:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java

Rev 26735 –

amit.gupta — Tue, 09 Jun 2020 15:28:08 +0530

amit.gupta – 1 file(s) modified

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java

Rev 26721 – change

tejbeer — Fri, 05 Jun 2020 13:01:10 +0530

tejbeer – 14 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PendingOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partners_allocation.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

Rev 26719 – change

tejbeer — Wed, 03 Jun 2020 20:55:31 +0530

tejbeer – 7 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-edit.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history_paginated.vm

Rev 26705 – change

tejbeer — Fri, 29 May 2020 20:46:51 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

Rev 26694 – change

tejbeer — Mon, 25 May 2020 15:10:18 +0530

tejbeer – 13 file(s) modified
change

+ /trunk/profitmandi-common/.settings
+ /trunk/profitmandi-common/.settings/org.eclipse.buildship.core.prefs
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 26691 –

amit.gupta — Mon, 25 May 2020 00:36:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java

Rev 26690 –

amit.gupta — Mon, 25 May 2020 00:21:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java

Rev 26689 –

amit.gupta — Mon, 25 May 2020 00:15:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java

Rev 26688 –

amit.gupta — Mon, 25 May 2020 00:02:12 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java

Rev 26675 – cg

tejbeer — Sat, 23 May 2020 11:56:24 +0530

tejbeer – 5 file(s) modified
cg

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offermargin.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.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/SchemeController.java

Rev 26674 – change

tejbeer — Sat, 23 May 2020 00:15:28 +0530

tejbeer – 8 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 26671 –

amit.gupta — Fri, 22 May 2020 08:13:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java

Rev 26670 –

amit.gupta — Fri, 22 May 2020 08:03:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java

Rev 26665 – Added MRP to store api and Spice Money retailer mapping

amit.gupta — Tue, 19 May 2020 20:29:00 +0530

amit.gupta – 4 file(s) modified
Added MRP to store api and Spice Money retailer mapping

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/spicemoney/SpiceMoneyService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AvailabilityInfo.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 26663 – change

tejbeer — Mon, 18 May 2020 14:40:10 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm

Rev 26647 – change

tejbeer — Thu, 14 May 2020 15:47:54 +0530

tejbeer – 7 file(s) modified
change

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.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

Rev 26635 –

amit.gupta — Wed, 13 May 2020 13:33:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java

Rev 26627 –

amit.gupta — Sun, 10 May 2020 01:42:14 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java

Rev 26626 –

amit.gupta — Sun, 10 May 2020 01:20:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 26625 –

amit.gupta — Sun, 10 May 2020 01:19:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 26622 –

amit.gupta — Sun, 10 May 2020 01:08:41 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java

Rev 26619 – change

tejbeer — Sat, 09 May 2020 10:17:24 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 26618 – change

tejbeer — Sat, 09 May 2020 01:46:46 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java

Rev 26605 –

amit.gupta — Wed, 06 May 2020 13:39:47 +0530

amit.gupta – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebSecurityConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java

Rev 26601 –

amit.gupta — Mon, 04 May 2020 18:36:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 26588 – offer change

tejbeer — Wed, 29 Apr 2020 19:37:06 +0530

tejbeer – 23 file(s) modified
offer change

+ /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/catalog/Offermargin.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/OfferPartner.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/ItemCriteriaType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/Interface/ItemType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountMarginModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemTypeParams.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SimpleItemType.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/catalog/OfferMarginRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferMarginRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.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/SchemeController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
~ /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-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 26582 – Added Changes for testing purposes

amit.gupta — Tue, 28 Apr 2020 19:27:25 +0530

amit.gupta – 2 file(s) modified
Added Changes for testing purposes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/spicemoney/SpiceMoneyService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java

Rev 26578 –

amit.gupta — Sat, 25 Apr 2020 13:16:16 +0530

amit.gupta – 2 file(s) modified

Rev 26569 –

amit.gupta — Tue, 21 Apr 2020 19:55:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.java

Rev 26562 –

amit.gupta — Tue, 21 Apr 2020 12:39:58 +0530

amit.gupta – 2 file(s) modified