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

Rev 28492 –

amit.gupta — Wed, 16 Jun 2021 21:15:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 28491 –

amit.gupta — Wed, 16 Jun 2021 21:10:19 +0530

amit.gupta – 1 file(s) modified

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

Rev 28152 – Fixed scheme view

amit.gupta — Mon, 05 Apr 2021 16:55:43 +0530

amit.gupta – 3 file(s) modified
Fixed scheme view

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm

Rev 28138 –

amit.gupta — Wed, 31 Mar 2021 17:44:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 28136 – chnage

tejbeer — Wed, 31 Mar 2021 16:58:56 +0530

tejbeer – 7 file(s) modified
chnage

Rev 28134 – change

tejbeer — Wed, 31 Mar 2021 15:10:06 +0530

tejbeer – 5 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 28105 –

amit.gupta — Wed, 24 Mar 2021 21:31:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 27897 –

amit.gupta — Thu, 04 Mar 2021 13:02:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 27876 – Added Controllers

amit.gupta — Tue, 02 Mar 2021 16:09:58 +0530

amit.gupta – 5 file(s) modified
Added Controllers

Rev 27612 – changes

tejbeer — Fri, 08 Jan 2021 19:46:00 +0530

tejbeer – 2 file(s) modified
changes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm

Rev 27424 – change

tejbeer — Tue, 01 Dec 2020 13:27:31 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm

Rev 27416 –

amit.gupta — Thu, 26 Nov 2020 12:54:34 +0530

amit.gupta – 1 file(s) modified

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

Rev 27406 –

amit.gupta — Fri, 20 Nov 2020 17:20:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 27394 –

amit.gupta — Wed, 18 Nov 2020 11:18:28 +0530

amit.gupta – 1 file(s) modified

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

Rev 27391 – change

tejbeer — Tue, 17 Nov 2020 15:24:57 +0530

tejbeer – 2 file(s) modified
change

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

Rev 27389 –

amit.gupta — Mon, 16 Nov 2020 11:51:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 27387 – scheme change

tejbeer — Fri, 13 Nov 2020 15:12:23 +0530

tejbeer – 1 file(s) modified
scheme change

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

Rev 27377 – Added Activation Scheme Logic

amit.gupta — Tue, 10 Nov 2020 18:57:10 +0530

amit.gupta – 10 file(s) modified
Added Activation Scheme Logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/SchemeType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.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/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/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.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/SchemeController.java

Rev 27362 –

amit.gupta — Fri, 06 Nov 2020 13:18:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 27361 –

amit.gupta — Fri, 06 Nov 2020 13:10:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 27171 – change

tejbeer — Sat, 10 Oct 2020 14:24:23 +0530

tejbeer – 13 file(s) modified
change

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RefferalController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
x /trunk/profitmandi-fofo/src/main/webapp/resources/js/content-upload.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/franchisee-visit.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/jquery.cloud9carousel.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/jquery.flipster.min.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/offers.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/swiper.min.js

Rev 26912 – change

tejbeer — Sun, 09 Aug 2020 21:03:17 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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.vm

Rev 26802 – change

tejbeer — Thu, 02 Jul 2020 14:26:57 +0530

tejbeer – 4 file(s) modified
change

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 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 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 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 25505 –

amit.gupta — Sun, 08 Sep 2019 07:47:37 +0530

amit.gupta – 10 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerTypeChange.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.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

Rev 25369 –

amit.gupta — Mon, 29 Jul 2019 17:46:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 25368 –

amit.gupta — Mon, 29 Jul 2019 17:45:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 25261 –

amit.gupta — Mon, 08 Jul 2019 18:58:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 25257 –

amit.gupta — Mon, 08 Jul 2019 18:02:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 25256 –

amit.gupta — Mon, 08 Jul 2019 17:57:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 25069 – Fixed scheme expiry logic

amit.gupta — Mon, 17 Jun 2019 12:30:51 +0530

amit.gupta – 13 file(s) modified
Fixed scheme expiry logic

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeDumpRow.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.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/transaction/UserWalletRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm

Rev 24445 – Minor fixes

amit.gupta — Sat, 26 Jan 2019 08:43:44 +0530

amit.gupta – 2 file(s) modified
Minor fixes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm

Rev 24406 – Fixed changes related to item acitve/pause

amit.gupta — Thu, 03 Jan 2019 14:44:30 +0530

amit.gupta – 11 file(s) modified
Fixed changes related to item acitve/pause

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /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/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 23928 – add multiple scheme to single item or vice versa

govind — Thu, 19 Jul 2018 11:04:39 +0530

govind – 5 file(s) modified
add multiple scheme to single item or vice versa

~ /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/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm