SmartDukaan – /

Rev 23819 – For PriceDrop Application

govind — Wed, 27 Jun 2018 16:54:57 +0530

govind – 19 file(s) modified
For PriceDrop Application

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepositoryImpl.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/dao/repository/transaction/PriceDropIMEIRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.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/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /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/price-drop.vm

Rev 23818 –

amit.gupta — Wed, 27 Jun 2018 14:34:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/resources/orderformat.xlsx

Rev 23817 –

amit.gupta — Wed, 27 Jun 2018 13:28:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 23816 –

amit.gupta — Wed, 27 Jun 2018 13:22:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 23815 –

amit.gupta — Wed, 27 Jun 2018 13:17:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23814 – Fixed for Hot Deals

amit.gupta — Wed, 27 Jun 2018 12:28:52 +0530

amit.gupta – 2 file(s) modified
Fixed for Hot Deals

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 23813 – Added is fofo flag

amit.gupta — Wed, 27 Jun 2018 10:12:58 +0530

amit.gupta – 1 file(s) modified
Added is fofo flag

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

Rev 23812 – Added feature to reverse advance amount in wallet

amit.gupta — Wed, 27 Jun 2018 06:56:25 +0530

amit.gupta – 2 file(s) modified
Added feature to reverse advance amount in wallet

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm

Rev 23811 –

amit.gupta — Wed, 27 Jun 2018 06:53:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 23810 –

amit.gupta — Wed, 27 Jun 2018 06:48:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 23809 – Added feature to reverse advance amount in wallet

amit.gupta — Wed, 27 Jun 2018 06:38:04 +0530

amit.gupta – 3 file(s) modified
Added feature to reverse advance amount in wallet

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserWalletCreditController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm

Rev 23808 –

amit.gupta — Tue, 26 Jun 2018 18:39:50 +0530

amit.gupta – 1 file(s) modified

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

Rev 23807 –

amit.gupta — Tue, 26 Jun 2018 17:59:50 +0530

amit.gupta – 1 file(s) modified

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

Rev 23806 – hotdeal change

tejbeer — Tue, 26 Jun 2018 11:09:44 +0530

tejbeer – 4 file(s) modified
hotdeal change

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/FofoCatalogResponse.java
~ /trunk/PyDTR/src/scripts/FofoSolr.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py

Rev 23805 – Change imeis to display from 3 to 10

amit.gupta — Tue, 26 Jun 2018 05:42:17 +0530

amit.gupta – 2 file(s) modified
Change imeis to display from 3 to 10

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 23804 –

amit.gupta — Mon, 25 Jun 2018 17:46:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 23803 –

amit.gupta — Mon, 25 Jun 2018 17:41:03 +0530

amit.gupta – 1 file(s) modified

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

Rev 23802 – Fixed url in fofo section

amit.gupta — Mon, 25 Jun 2018 15:13:15 +0530

amit.gupta – 1 file(s) modified
Fixed url in fofo section

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

Rev 23801 – Fixed token issue

amit.gupta — Mon, 25 Jun 2018 12:16:06 +0530

amit.gupta – 1 file(s) modified
Fixed token issue

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

Rev 23800 –

amit.gupta — Mon, 25 Jun 2018 11:51:03 +0530

amit.gupta – 1 file(s) modified

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

Rev 23799 – Fixed roles

amit.gupta — Mon, 25 Jun 2018 10:42:11 +0530

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

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

Rev 23798 – Fixed role related changes.

amit.gupta — Mon, 25 Jun 2018 10:17:18 +0530

amit.gupta – 13 file(s) modified
Fixed role related changes.

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleManager.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java@23797)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

Rev 23797 –

amit.gupta — Mon, 25 Jun 2018 07:50:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java

Rev 23796 – Added changes related to indent

amit.gupta — Mon, 25 Jun 2018 05:53:56 +0530

amit.gupta – 18 file(s) modified
Added changes related to indent

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.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/entity/fofo/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.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/InventoryService.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/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.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

Rev 23795 – Script for Monitoring oxygen walnut balance and current sms count

govind — Fri, 22 Jun 2018 11:46:59 +0530

govind – 3 file(s) modified
Script for Monitoring oxygen walnut balance and current sms count

+ /trunk/runutils/check_current_balance.sh
+ /trunk/runutils/check_oxygen_balance.sh
+ /trunk/runutils/check_thinkWalnut_balance.sh

Rev 23794 – For Nagios Monitoring of thinkwalet smscount and oxygen balance

govind — Fri, 22 Jun 2018 11:12:04 +0530

govind – 5 file(s) modified
For Nagios Monitoring of thinkwalet smscount and oxygen balance

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/monitored/NagiosMonitorTasks.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/properties
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/properties/WriteToPropertiesFile.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

Rev 23793 – subCategorychange

tejbeer — Thu, 21 Jun 2018 14:45:11 +0530

tejbeer – 3 file(s) modified
subCategorychange

~ /trunk/profitmandi-dao/build.gradle
~ /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 23792 –

tejbeer — Wed, 20 Jun 2018 16:24:02 +0530

tejbeer – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 23791 –

amit.gupta — Tue, 19 Jun 2018 14:04:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23790 –

amit.gupta — Tue, 19 Jun 2018 12:59:23 +0530

amit.gupta – 1 file(s) modified

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

Rev 23789 –

amit.gupta — Tue, 19 Jun 2018 12:54:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 23788 – Added logging

amit.gupta — Tue, 19 Jun 2018 12:31:02 +0530

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

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

Rev 23787 – Removed services as one already present in dao.

amit.gupta — Thu, 14 Jun 2018 17:19:59 +0530

amit.gupta – 3 file(s) modified
Removed services as one already present in dao.

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserService.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

Rev 23786 – Major commit. 1. Fixed profitmandi-web refactored as per new role ...

amit.gupta — Thu, 14 Jun 2018 15:38:04 +0530

amit.gupta – 45 file(s) modified
Major commit.
1. Fixed profitmandi-web refactored as per new role management logic.
2. Added Allocation Mechanism
3. Minor bug fixes.

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/CounterSize.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BrandPerformance.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomRetailer.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdAvailability.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/StockAllocationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreSequenceGeneration.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/StockAllocation.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/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepositoryImpl.java
~ /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-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/StockAllocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepositoryImp.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bootstrap3-typeahead.min.js
~ /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/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/RoleManagerService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java

Rev 23785 – Fixed allocation

amit.gupta — Tue, 12 Jun 2018 22:16:07 +0530

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

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

Rev 23784 – Role mgmt and non billable items to be scan

ashik.ali — Fri, 08 Jun 2018 20:38:47 +0530

ashik.ali – 21 file(s) modified
Role mgmt and non billable items to be scan

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RoleController.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/VendorController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WarehouseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/LoginDetails.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/RoleManager.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/Utils.java

Rev 23783 – Role mgmt and non billable items to be scan

ashik.ali — Fri, 08 Jun 2018 20:37:24 +0530

ashik.ali – 42 file(s) modified
Role mgmt and non billable items to be scan

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-item.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-vendor.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-warehouse.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/item.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/role.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-remove-api.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-remove-role.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-api.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-duplicate-role.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-role.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/delete-api.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/delete-role.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-api.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-serial-numbers.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rename-role.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/role-apis.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-items-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-items.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-partner-items-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-partner-items.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-items-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-items.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-roles.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendors-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendors.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-items.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouses.vm

Rev 23782 – Role mgmt and non billable items to be scan

ashik.ali — Fri, 08 Jun 2018 19:36:56 +0530

ashik.ali – 19 file(s) modified
Role mgmt and non billable items to be scan

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Api.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PaymentOptionTransaction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Role.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RoleApi.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserRole.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminCurrentInventorySnapshot.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminDeliveryNote.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminInventoryItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminScanRecord.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/DeliveryNoteIdGenerationSequence.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Item.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/PartnerCurrentInventorySnapshot.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/PartnerInventoryItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/PartnerScanRecord.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/UserWarehouse.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Vendor.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Warehouse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/ThinkWalnutDigitalRechargeProviderServiceImpl.java

Rev 23781 – Role mgmt and non billable items to be scan

ashik.ali — Fri, 08 Jun 2018 19:35:55 +0530

ashik.ali – 76 file(s) modified
Role mgmt and non billable items to be scan

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.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/SchemeRepository.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/dtr/ApiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ApiRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DailyRechargeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeCommissionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleApiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleApiRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java
~ /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/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ScanRecordRepositoryImpl.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/nonbillable
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminCurrentInventorySnapshotRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminCurrentInventorySnapshotRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminDeliveryNoteRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminDeliveryNoteRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminInventoryItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminInventoryItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminScanRecordRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminScanRecordRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/DeliveryNoteIdGenerationSequenceRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/DeliveryNoteIdGenerationSequenceRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/ItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/ItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerCurrentInventorySnapshotRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerCurrentInventorySnapshotRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerInventoryItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerInventoryItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerScanRecordRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerScanRecordRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/UserWarehouseRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/UserWarehouseRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/VendorRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/VendorRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/WarehouseRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/WarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ItemLedgerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/InventoryService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/InventoryServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/VendorService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/VendorServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/WarehouseService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/WarehouseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.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-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserService.java (copied from /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserService.java@23204)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java (copied from /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java@23273)

Rev 23780 – Role mgmt and non billable items to be scan

ashik.ali — Fri, 08 Jun 2018 17:59:39 +0530

ashik.ali – 15 file(s) modified
Role mgmt and non billable items to be scan

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ItemType.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ScanType.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateItemRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateVendorRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateWarehouseRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/MapWrapper.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScanInItemRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScanOutItemRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/UserInfo.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FileUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties