SmartDukaan – /

Rev 28532 –

amit.gupta — Wed, 30 Jun 2021 20:47:20 +0530

amit.gupta – 1 file(s) modified

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

Rev 28531 – Fixed changes for Investment Payout

amit.gupta — Wed, 30 Jun 2021 20:38:54 +0530

amit.gupta – 2 file(s) modified
Fixed changes for Investment Payout

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

Rev 28530 –

tejbeer — Tue, 29 Jun 2021 21:36:07 +0530

tejbeer – 1 file(s) modified

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

Rev 28529 – change

tejbeer — Tue, 29 Jun 2021 20:19:46 +0530

tejbeer – 1 file(s) modified
change

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

Rev 28528 –

tejbeer — Tue, 29 Jun 2021 20:02:59 +0530

tejbeer – 1 file(s) modified

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

Rev 28527 –

tejbeer — Tue, 29 Jun 2021 19:51:18 +0530

tejbeer – 1 file(s) modified

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

Rev 28526 –

tejbeer — Tue, 29 Jun 2021 19:25:42 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FocusedModelShortageModel.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 28525 –

amit.gupta — Tue, 29 Jun 2021 16:02:50 +0530

amit.gupta – 2 file(s) modified

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/daterangepicker/daterangepicker.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/daterangepicker/daterangepicker.min.js

Rev 28524 – Fixed date range picker issue. Security related

amit.gupta — Tue, 29 Jun 2021 15:56:44 +0530

amit.gupta – 6 file(s) modified
Fixed date range picker issue. Security related

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/daterangepicker
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
~ /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/login.vm

Rev 28523 –

tejbeer — Tue, 29 Jun 2021 15:12:30 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan.vm

Rev 28522 –

amit.gupta — Mon, 28 Jun 2021 17:06:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 28521 –

amit.gupta — Mon, 28 Jun 2021 12:20:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWallet.java

Rev 28520 –

amit.gupta — Sun, 27 Jun 2021 18:19:53 +0530

amit.gupta – 1 file(s) modified

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

Rev 28519 –

amit.gupta — Sun, 27 Jun 2021 18:19:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 28518 –

amit.gupta — Sat, 26 Jun 2021 18:19:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 28517 –

amit.gupta — Sat, 26 Jun 2021 18:19:32 +0530

amit.gupta – 1 file(s) modified

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

Rev 28516 –

amit.gupta — Sat, 26 Jun 2021 18:18:14 +0530

amit.gupta – 1 file(s) modified

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

Rev 28515 – Added Account Statement

amit.gupta — Sat, 26 Jun 2021 18:16:53 +0530

amit.gupta – 6 file(s) modified
Added Account Statement

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
+ /trunk/profitmandi-fofo/src/main/resources/account-statement.xlsx

Rev 28514 –

amit.gupta — Sat, 26 Jun 2021 18:15:25 +0530

amit.gupta – 2 file(s) modified

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

Rev 28513 –

amit.gupta — Sat, 26 Jun 2021 14:17:06 +0530

amit.gupta – 1 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/StatementDetailModel.java

Rev 28512 –

amit.gupta — Sat, 26 Jun 2021 14:16:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 28511 –

amit.gupta — Sat, 26 Jun 2021 14:15:07 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 28510 –

amit.gupta — Sat, 26 Jun 2021 14:13:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 28509 –

amit.gupta — Sat, 26 Jun 2021 12:44:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 28508 –

amit.gupta — Sat, 26 Jun 2021 12:13:31 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 28507 – change

amit.gupta — Fri, 25 Jun 2021 17:15:48 +0530

amit.gupta – 1 file(s) modified
change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/StateGstRateModel.java

Rev 28506 –

amit.gupta — Fri, 25 Jun 2021 17:11:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 28505 – Upload

amit.gupta — Fri, 25 Jun 2021 12:59:19 +0530

amit.gupta – 1 file(s) modified
Upload

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

Rev 28504 –

amit.gupta — Thu, 24 Jun 2021 23:38:04 +0530

amit.gupta – 4 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TaxationController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js

Rev 28503 –

amit.gupta — Wed, 23 Jun 2021 15:09:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 28502 –

amit.gupta — Wed, 23 Jun 2021 12:21:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 28501 – Fixed bugs related to seller creation

amit.gupta — Wed, 23 Jun 2021 12:04:19 +0530

amit.gupta – 2 file(s) modified
Fixed bugs related to seller creation

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java

Rev 28500 –

amit.gupta — Tue, 22 Jun 2021 16:56:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 28499 – Fixed seller

amit.gupta — Tue, 22 Jun 2021 16:33:31 +0530

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

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

Rev 28498 – Fixed

amit.gupta — Mon, 21 Jun 2021 13:01:22 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/ThriftConfig/build.gradle

Rev 28497 – Added org instead of readonly

amit.gupta — Mon, 21 Jun 2021 12:56:23 +0530

amit.gupta – 1 file(s) modified
Added org instead of readonly

~ /trunk/ThriftConfig/pom.xml

Rev 28496 – changwe

tejbeer — Sat, 19 Jun 2021 16:31:12 +0530

tejbeer – 1 file(s) modified
changwe

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

Rev 28495 –

tejbeer — Sat, 19 Jun 2021 16:25:04 +0530

tejbeer – 10 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GstRate.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/StateGstRate.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DocumentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DocumentRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TaxationController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TaxationRepository.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TaxationRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/margin-calculator.vm

Rev 28494 – ok

tejbeer — Sat, 19 Jun 2021 16:11:20 +0530

tejbeer – 5 file(s) modified
ok

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/new-supplier.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/supplier.vm

Rev 28493 –

tejbeer — Sat, 19 Jun 2021 16:10:06 +0530

tejbeer – 35 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/State.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/Vendor.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/Warehouse.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/organisation.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/Supplier.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/InventoryType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/WarehouseType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/OrganisationType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/CreateNewSupplier.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/WarehouseIdPrefixModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MarginCalculatorModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MonthSaleModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/WarehouseRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/WarehouseRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrganisationRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrganisationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerWarehouseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerWarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMappingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMappingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMasterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMasterRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js