SmartDukaan – /

Rev 23948 – Updated scheme

amit.gupta — Thu, 26 Jul 2018 13:37:06 +0530

amit.gupta – 1 file(s) modified
Updated scheme

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

Rev 23947 – date changes

tejbeer — Wed, 25 Jul 2018 13:12:41 +0530

tejbeer – 3 file(s) modified
date changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AddWalletRequest.java
~ /trunk/profitmandi-web/build.gradle
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java

Rev 23946 – Fixed changes related to PriceDrop

amit.gupta — Mon, 23 Jul 2018 19:15:58 +0530

amit.gupta – 7 file(s) modified
Fixed changes related to PriceDrop

~ /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/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/empty.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm

Rev 23945 – Fixed changes related to PriceDrop

amit.gupta — Mon, 23 Jul 2018 19:15:24 +0530

amit.gupta – 12 file(s) modified
Fixed changes related to PriceDrop

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ClosingStockOnDate.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GrnPendingDataModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/Location.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PartnerImeiNotSold.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ReporticoResponseModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.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/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

Rev 23944 – Fixed logic to show error

amit.gupta — Mon, 23 Jul 2018 18:58:30 +0530

amit.gupta – 1 file(s) modified
Fixed logic to show error

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

Rev 23943 –

tejbeer — Fri, 20 Jul 2018 17:51:49 +0530

tejbeer – 1 file(s) modified

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

Rev 23942 – Addmoneytowallet

tejbeer — Fri, 20 Jul 2018 17:44:07 +0530

tejbeer – 6 file(s) modified
Addmoneytowallet

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.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-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 23941 – Investment popup is toughened and more annoying.

amit.gupta — Fri, 20 Jul 2018 16:55:48 +0530

amit.gupta – 15 file(s) modified
Investment popup is toughened and more annoying.

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /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

Rev 23940 – Fixed item aging

amit.gupta — Fri, 20 Jul 2018 14:55:37 +0530

amit.gupta – 1 file(s) modified
Fixed item aging

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

Rev 23939 – OK

amit.gupta — Fri, 20 Jul 2018 06:42:48 +0530

amit.gupta – 1 file(s) modified
OK

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

Rev 23938 – Removed logging

amit.gupta — Thu, 19 Jul 2018 20:50:40 +0530

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

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

Rev 23937 –

amit.gupta — Thu, 19 Jul 2018 17:37:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 23936 – AddtoWalletRequest

tejbeer — Thu, 19 Jul 2018 17:28:47 +0530

tejbeer – 15 file(s) modified
AddtoWalletRequest

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AddWalletRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/AddWalletRequestStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.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/WalletController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateAddMoneyRequest.java

Rev 23935 –

amit.gupta — Thu, 19 Jul 2018 16:06:39 +0530

amit.gupta – 2 file(s) modified

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

Rev 23934 –

amit.gupta — Thu, 19 Jul 2018 15:59:03 +0530

amit.gupta – 1 file(s) modified

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

Rev 23933 –

amit.gupta — Thu, 19 Jul 2018 15:17:47 +0530

amit.gupta – 1 file(s) modified

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

Rev 23932 –

amit.gupta — Thu, 19 Jul 2018 15:15:20 +0530

amit.gupta – 1 file(s) modified

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

Rev 23931 –

amit.gupta — Thu, 19 Jul 2018 15:02:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 23930 –

amit.gupta — Thu, 19 Jul 2018 15:00:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 23929 – Fixed mailSending

amit.gupta — Thu, 19 Jul 2018 13:18:31 +0530

amit.gupta – 5 file(s) modified
Fixed mailSending

~ /trunk/profitmandi-common/build.gradle
~ /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/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 23928 – add multiple scheme to single item or vice versa

govind — Thu, 19 Jul 2018 11:04:39 +0530

govind – 5 file(s) modified
add multiple scheme to single item or vice versa

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /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/scheme-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm

Rev 23927 –

amit.gupta — Thu, 19 Jul 2018 08:03:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-ledger-download.vm

Rev 23926 – Added 7678 as warehouse for UP

amit.gupta — Wed, 18 Jul 2018 19:09:54 +0530

amit.gupta – 3 file(s) modified
Added 7678 as warehouse for UP

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 23925 –

amit.gupta — Wed, 18 Jul 2018 18:04:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 23924 –

amit.gupta — Wed, 18 Jul 2018 17:21:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 23923 – Fixed alert mechanism for non partners

amit.gupta — Wed, 18 Jul 2018 12:25:24 +0530

amit.gupta – 1 file(s) modified
Fixed alert mechanism for non partners

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

Rev 23922 – Fixed Date Time

amit.gupta — Wed, 18 Jul 2018 12:14:48 +0530

amit.gupta – 1 file(s) modified
Fixed Date Time

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

Rev 23921 – Fixed

amit.gupta — Wed, 18 Jul 2018 11:39:08 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 23920 –

amit.gupta — Wed, 18 Jul 2018 10:52:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 23919 – Fixed alert message

amit.gupta — Wed, 18 Jul 2018 10:33:14 +0530

amit.gupta – 1 file(s) modified
Fixed alert message

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

Rev 23918 – Added Versioning

amit.gupta — Wed, 18 Jul 2018 10:20:04 +0530

amit.gupta – 18 file(s) modified
Added Versioning

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bootbox.min.js
~ /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

Rev 23917 –

amit.gupta — Tue, 17 Jul 2018 18:32:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 23916 – search by only date

govind — Tue, 17 Jul 2018 18:14:59 +0530

govind – 1 file(s) modified
search by only date

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

Rev 23915 –

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

amit.gupta – 1 file(s) modified

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

Rev 23914 – Extend EndDate Scheme by All and by schemeId. Delete ItemId ...

govind — Tue, 17 Jul 2018 17:16:46 +0530

govind – 10 file(s) modified
Extend EndDate Scheme by All and by schemeId.
Delete ItemId by SchemeId.
Add ItemId to SchemeId.
change dateRangePicker.
Create Scheme With Multiple Brand and Multiple Items.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeProviderCreditWalletHistory.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm

Rev 23913 –

amit.gupta — Tue, 17 Jul 2018 16:20:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 23912 –

amit.gupta — Tue, 17 Jul 2018 16:16:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 23911 –

amit.gupta — Tue, 17 Jul 2018 16:15:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 23910 – Fixed send mail

amit.gupta — Tue, 17 Jul 2018 16:13:29 +0530

amit.gupta – 2 file(s) modified
Fixed send mail

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

Rev 23909 – Fixed Data

amit.gupta — Tue, 17 Jul 2018 15:43:16 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java