SmartDukaan – /

Rev 24035 – Fixed deals

amit.gupta — Fri, 24 Aug 2018 17:22:55 +0530

amit.gupta – 1 file(s) modified
Fixed deals

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

Rev 24034 – OK

amit.gupta — Fri, 24 Aug 2018 17:11:48 +0530

amit.gupta – 1 file(s) modified
OK

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

Rev 24033 – fixed data.

amit.gupta — Fri, 24 Aug 2018 16:39:28 +0530

amit.gupta – 5 file(s) modified
fixed data.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-common.js
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24032 –

amit.gupta — Fri, 24 Aug 2018 16:12:14 +0530

amit.gupta – 1 file(s) modified

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

Rev 24031 – Fixed Solr and mongo to handle partner brand/listing

amit.gupta — Fri, 24 Aug 2018 15:47:42 +0530

amit.gupta – 2 file(s) modified
Fixed Solr and mongo to handle partner brand/listing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 24030 – Added category

amit.gupta — Fri, 24 Aug 2018 15:06:07 +0530

amit.gupta – 1 file(s) modified
Added category

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 24029 –

amit.gupta — Fri, 24 Aug 2018 13:26:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 24028 – Added create_timestamp

amit.gupta — Fri, 24 Aug 2018 13:23:20 +0530

amit.gupta – 1 file(s) modified
Added create_timestamp

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 24027 – CHANGE

tejbeer — Tue, 21 Aug 2018 18:25:31 +0530

tejbeer – 1 file(s) modified
CHANGE

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-message.vm

Rev 24026 – send message change

tejbeer — Tue, 21 Aug 2018 18:08:41 +0530

tejbeer – 5 file(s) modified
send message change

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SendMessageModel.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MessageController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/send-message.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-message.vm

Rev 24025 – fixed distance issue

amit.gupta — Tue, 21 Aug 2018 16:01:52 +0530

amit.gupta – 2 file(s) modified
fixed distance issue

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24024 –

amit.gupta — Tue, 21 Aug 2018 15:04:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 24023 –

amit.gupta — Tue, 21 Aug 2018 13:41:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 24022 – Fixed favicon

amit.gupta — Tue, 21 Aug 2018 12:19:07 +0530

amit.gupta – 3 file(s) modified
Fixed favicon

+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/favicon.png
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 24021 – Fixed

amit.gupta — Tue, 21 Aug 2018 12:13:12 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24020 –

amit.gupta — Tue, 21 Aug 2018 12:10:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24019 – Provided MOP option from price drop

amit.gupta — Tue, 21 Aug 2018 11:13:17 +0530

amit.gupta – 5 file(s) modified
Provided MOP option from price drop

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/datetime-moment.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/price-drop.vm

Rev 24018 – change

tejbeer — Tue, 21 Aug 2018 10:53:12 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationCampaigns.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java

Rev 24017 – Fixed http for favion.ico

amit.gupta — Mon, 20 Aug 2018 23:31:21 +0530

amit.gupta – 2 file(s) modified
Fixed http for favion.ico

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 24016 – Fixed attendance

amit.gupta — Mon, 20 Aug 2018 16:27:07 +0530

amit.gupta – 19 file(s) modified
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/resources/js/common.js
~ /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-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 24015 – change

tejbeer — Mon, 20 Aug 2018 16:26:29 +0530

tejbeer – 1 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-notification.vm

Rev 24014 – change

tejbeer — Mon, 20 Aug 2018 15:39:12 +0530

tejbeer – 5 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SendNotificationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationCampaigns.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/send-notification.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-notification.vm

Rev 24013 –

tejbeer — Mon, 20 Aug 2018 12:26:26 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SendNotificationModel.java

Rev 24012 – Added Code for samsung models

amit.gupta — Mon, 20 Aug 2018 08:25:58 +0530

amit.gupta – 2 file(s) modified
Added Code for samsung models

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/POExcelGenerator.java

Rev 24011 – Notification panel

tejbeer — Fri, 17 Aug 2018 18:02:59 +0530

tejbeer – 11 file(s) modified
Notification panel

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SendNotificationModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationCampaigns.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/send-notification.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-notification.vm
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java

Rev 24010 – notification constant

tejbeer — Fri, 17 Aug 2018 11:09:34 +0530

tejbeer – 1 file(s) modified
notification constant

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 24009 –

amit.gupta — Fri, 17 Aug 2018 09:13:20 +0530

amit.gupta – 1 file(s) modified

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

Rev 24008 –

amit.gupta — Thu, 16 Aug 2018 21:05:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 24007 – Removed active flag

amit.gupta — Thu, 16 Aug 2018 21:02:31 +0530

amit.gupta – 1 file(s) modified
Removed active flag

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 24006 –

amit.gupta — Thu, 16 Aug 2018 15:46:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java

Rev 24005 – Minor migration

amit.gupta — Thu, 16 Aug 2018 15:15:59 +0530

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

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 24004 –

amit.gupta — Wed, 15 Aug 2018 19:39:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 24003 –

amit.gupta — Wed, 15 Aug 2018 19:36:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 24002 – Fixed drop issue

amit.gupta — Wed, 15 Aug 2018 17:24:42 +0530

amit.gupta – 3 file(s) modified
Fixed drop issue

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 24001 –

amit.gupta — Wed, 15 Aug 2018 14:00:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 24000 –

amit.gupta — Tue, 14 Aug 2018 15:30:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 23999 – Fixed returns

amit.gupta — Tue, 14 Aug 2018 11:02:05 +0530

amit.gupta – 1 file(s) modified
Fixed returns

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 23998 –

amit.gupta — Mon, 13 Aug 2018 17:30:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 23997 –

tejbeer — Mon, 13 Aug 2018 16:57:57 +0530

tejbeer – 1 file(s) modified

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

Rev 23996 – email change

tejbeer — Mon, 13 Aug 2018 16:56:31 +0530

tejbeer – 1 file(s) modified
email change

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