SmartDukaan – /

Rev 26014 – Added Access management on admin

amit.gupta — Sat, 21 Dec 2019 17:50:59 +0530

amit.gupta – 18 file(s) modified
Added Access management on admin

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/Menu.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/MenuCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuCategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuCategoryRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketCategoryRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/access-management.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/access-management.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 26013 – Fixed issue related to multiple purchase.

amit.gupta — Sat, 21 Dec 2019 17:17:19 +0530

amit.gupta – 1 file(s) modified
Fixed issue related to multiple purchase.

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

Rev 26012 –

amit.gupta — Thu, 19 Dec 2019 23:44:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 26011 –

amit.gupta — Thu, 19 Dec 2019 22:48:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 26010 –

amit.gupta — Thu, 19 Dec 2019 12:33:40 +0530

amit.gupta – 1 file(s) modified

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 26009 –

amit.gupta — Thu, 19 Dec 2019 12:23:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 26008 – Wallet amount should only be refunded if its greater than ...

amit.gupta — Tue, 17 Dec 2019 19:51:17 +0530

amit.gupta – 1 file(s) modified
Wallet amount should only be refunded if its greater than 0

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java

Rev 26007 –

amit.gupta — Tue, 17 Dec 2019 11:44:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 26006 –

amit.gupta — Tue, 17 Dec 2019 11:44:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 26005 –

amit.gupta — Tue, 17 Dec 2019 11:44:24 +0530

amit.gupta – 1 file(s) modified

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

Rev 26004 –

amit.gupta — Mon, 16 Dec 2019 13:38:35 +0530

amit.gupta – 1 file(s) modified

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

Rev 26003 –

amit.gupta — Mon, 16 Dec 2019 11:26:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

Rev 26002 –

amit.gupta — Sun, 15 Dec 2019 21:44:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

Rev 26001 –

amit.gupta — Sat, 14 Dec 2019 17:10:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java

Rev 26000 –

amit.gupta — Fri, 13 Dec 2019 13:51:22 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 25999 –

amit.gupta — Fri, 13 Dec 2019 11:32:09 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 25998 –

amit.gupta — Thu, 12 Dec 2019 16:49:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 25997 –

amit.gupta — Thu, 12 Dec 2019 16:37:17 +0530

amit.gupta – 1 file(s) modified

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

Rev 25996 –

amit.gupta — Thu, 12 Dec 2019 16:24:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 25995 –

amit.gupta — Thu, 12 Dec 2019 15:58:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 25994 –

amit.gupta — Thu, 12 Dec 2019 15:15:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 25993 –

amit.gupta — Thu, 12 Dec 2019 13:19:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 25992 – change

tejbeer — Wed, 11 Dec 2019 17:36:50 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated.vm (copied from /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated@25991)

Rev 25991 – change

tejbeer — Wed, 11 Dec 2019 16:30:43 +0530

tejbeer – 3 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close.vm

Rev 25990 – change

tejbeer — Wed, 11 Dec 2019 16:08:48 +0530

tejbeer – 1 file(s) modified
change

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

Rev 25989 – change

tejbeer — Wed, 11 Dec 2019 15:50:54 +0530

tejbeer – 1 file(s) modified
change

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

Rev 25988 – change

tejbeer — Wed, 11 Dec 2019 15:30:25 +0530

tejbeer – 10 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close.vm

Rev 25987 –

amit.gupta — Tue, 10 Dec 2019 17:22:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 25986 –

amit.gupta — Tue, 10 Dec 2019 16:02:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 25985 –

amit.gupta — Tue, 10 Dec 2019 15:11:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 25984 –

amit.gupta — Tue, 10 Dec 2019 14:55:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 25983 –

amit.gupta — Mon, 09 Dec 2019 18:40:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 25982 – Fixed Hdfc Payment Integration

amit.gupta — Mon, 09 Dec 2019 17:11:29 +0530

amit.gupta – 8 file(s) modified
Fixed Hdfc Payment Integration

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /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/model/AddPaymentRequest.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/AddPaymentRequest.java@25976)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AddPaymentResponse.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/AddPaymentResponse.java@25976)
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/AddPaymentRequest.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/AddPaymentResponse.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 25981 – change

tejbeer — Mon, 09 Dec 2019 12:51:09 +0530

tejbeer – 2 file(s) modified
change

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

Rev 25980 – chnage

tejbeer — Mon, 09 Dec 2019 12:44:41 +0530

tejbeer – 2 file(s) modified
chnage

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java

Rev 25979 – chnage

tejbeer — Mon, 09 Dec 2019 12:35:20 +0530

tejbeer – 15 file(s) modified
chnage

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadSource.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateRefferalRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeVisitRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /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/lead.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead_activity_modal.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRefferalRequest.java

Rev 25978 –

amit.gupta — Mon, 09 Dec 2019 11:41:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/build.gradle

Rev 25977 –

amit.gupta — Mon, 09 Dec 2019 11:39:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 25976 – Added hdfc payment

amit.gupta — Mon, 09 Dec 2019 11:37:23 +0530

amit.gupta – 11 file(s) modified
Added hdfc payment

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/HdfcPayment.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/HdfcPaymentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/HdfcPaymentRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/MyBasicAuthenticationEntryPoint.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebSecurityConfig.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/hdfc
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/AddPaymentRequest.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/AddPaymentResponse.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java

Rev 25975 –

amit.gupta — Sat, 07 Dec 2019 11:30:15 +0530

amit.gupta – 1 file(s) modified

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