SmartDukaan – /

Rev 25301 –

tejbeer — Mon, 15 Jul 2019 17:39:00 +0530

tejbeer – 2 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/convertor/LocalDateTimeJsonConverter.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Device.java

Rev 25300 – Device and Notification

tejbeer — Mon, 15 Jul 2019 17:38:14 +0530

tejbeer – 32 file(s) modified
Device and Notification

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/AuthController.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/NagiosMonitoringScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationCampaign.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PushNotifications.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserCampaign.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/Interface
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/Interface/Campaign.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SimpleCampaign.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SimpleCampaignParams.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/DeviceRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/DeviceRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PushNotificationRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PushNotificationRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserCampaignRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserCampaignRepositoryImpl.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/inventory/SaholicInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DevicesController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/AddDevicesRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateAddMoneyRequest.java

Rev 25299 –

amit.gupta — Mon, 15 Jul 2019 15:19:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 25298 –

amit.gupta — Mon, 15 Jul 2019 12:10:24 +0530

amit.gupta – 1 file(s) modified

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

Rev 25297 –

amit.gupta — Sat, 13 Jul 2019 14:11:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 25296 –

amit.gupta — Fri, 12 Jul 2019 15:42:20 +0530

amit.gupta – 1 file(s) modified

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

Rev 25295 – Fixed fofo changes

amit.gupta — Fri, 12 Jul 2019 12:17:54 +0530

amit.gupta – 3 file(s) modified
Fixed fofo changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java

Rev 25294 –

amit.gupta — Fri, 12 Jul 2019 11:18:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 25293 –

amit.gupta — Fri, 12 Jul 2019 10:54:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 25292 –

amit.gupta — Fri, 12 Jul 2019 10:54:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 25291 –

amit.gupta — Thu, 11 Jul 2019 18:47:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css

Rev 25290 –

amit.gupta — Thu, 11 Jul 2019 18:46:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 25289 –

amit.gupta — Thu, 11 Jul 2019 18:46:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 25288 –

amit.gupta — Thu, 11 Jul 2019 16:44:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 25287 –

amit.gupta — Thu, 11 Jul 2019 12:57:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 25286 –

amit.gupta — Thu, 11 Jul 2019 12:40:35 +0530

amit.gupta – 1 file(s) modified

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

Rev 25285 –

amit.gupta — Thu, 11 Jul 2019 12:32:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 25284 –

amit.gupta — Thu, 11 Jul 2019 12:21:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 25283 –

amit.gupta — Thu, 11 Jul 2019 11:35:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 25282 –

amit.gupta — Thu, 11 Jul 2019 11:19:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 25281 –

amit.gupta — Wed, 10 Jul 2019 18:52:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 25280 –

amit.gupta — Wed, 10 Jul 2019 18:51:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 25279 –

amit.gupta — Wed, 10 Jul 2019 18:48:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 25278 –

amit.gupta — Wed, 10 Jul 2019 18:44:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java

Rev 25277 –

amit.gupta — Wed, 10 Jul 2019 18:40:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 25276 – Fixed investment

amit.gupta — Wed, 10 Jul 2019 18:12:21 +0530

amit.gupta – 8 file(s) modified
Fixed investment

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.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/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 25275 –

amit.gupta — Wed, 10 Jul 2019 18:06:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 25274 –

amit.gupta — Wed, 10 Jul 2019 12:07:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 25273 –

amit.gupta — Wed, 10 Jul 2019 11:14:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 25272 –

amit.gupta — Tue, 09 Jul 2019 18:10:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 25271 –

amit.gupta — Tue, 09 Jul 2019 17:26:00 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java

Rev 25270 –

amit.gupta — Tue, 09 Jul 2019 17:24:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 25269 –

tejbeer — Tue, 09 Jul 2019 17:06:01 +0530

tejbeer – 3 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift

Rev 25268 –

amit.gupta — Tue, 09 Jul 2019 15:36:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 25267 –

amit.gupta — Tue, 09 Jul 2019 15:34:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 25266 – Fixed wallet Changes

amit.gupta — Tue, 09 Jul 2019 14:39:55 +0530

amit.gupta – 2 file(s) modified
Fixed wallet Changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 25265 – Fixed wallet

amit.gupta — Tue, 09 Jul 2019 14:37:14 +0530

amit.gupta – 2 file(s) modified
Fixed wallet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 25264 –

amit.gupta — Tue, 09 Jul 2019 12:55:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 25263 –

amit.gupta — Tue, 09 Jul 2019 12:27:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 25262 – Fixed run

amit.gupta — Mon, 08 Jul 2019 19:38:37 +0530

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

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