SmartDukaan – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/

Rev 25152 –

amit.gupta — Fri, 28 Jun 2019 17:37:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 25147 –

amit.gupta — Fri, 28 Jun 2019 13:59:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 25140 – Added new Dashboard inputs

amit.gupta — Thu, 27 Jun 2019 16:23:50 +0530

amit.gupta – 4 file(s) modified
Added new Dashboard inputs

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 25137 –

amit.gupta — Wed, 26 Jun 2019 14:50:16 +0530

amit.gupta – 1 file(s) modified

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

Rev 25136 – Added new entry point A/B dashboard

amit.gupta — Wed, 26 Jun 2019 14:44:13 +0530

amit.gupta – 3 file(s) modified
Added new entry point A/B dashboard

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm (copied from /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm@25135)

Rev 25135 –

amit.gupta — Tue, 25 Jun 2019 16:36:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 25124 –

amit.gupta — Mon, 24 Jun 2019 16:16:04 +0530

amit.gupta – 1 file(s) modified

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

Rev 25123 –

amit.gupta — Mon, 24 Jun 2019 16:09:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 25093 – Fixed invoice generation

amit.gupta — Wed, 19 Jun 2019 14:54:08 +0530

amit.gupta – 5 file(s) modified
Fixed invoice generation

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm

Rev 25092 –

amit.gupta — Wed, 19 Jun 2019 14:40:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 25069 – Fixed scheme expiry logic

amit.gupta — Mon, 17 Jun 2019 12:30:51 +0530

amit.gupta – 13 file(s) modified
Fixed scheme expiry logic

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SchemeDumpRow.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/repository/catalog/SchemeRepositoryImpl.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/transaction/UserWalletRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm

Rev 25067 – change

tejbeer — Fri, 14 Jun 2019 17:56:22 +0530

tejbeer – 1 file(s) modified
change

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

Rev 25066 – change

tejbeer — Fri, 14 Jun 2019 17:10:40 +0530

tejbeer – 9 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/NotifyOrderModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyMessage.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyMessageRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyMessageRepositoryImpl.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/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify-order-modal.vm

Rev 25040 –

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

amit.gupta – 1 file(s) modified

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

Rev 25039 –

amit.gupta — Tue, 11 Jun 2019 13:30:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 25038 –

amit.gupta — Tue, 11 Jun 2019 13:10:32 +0530

amit.gupta – 1 file(s) modified

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

Rev 25037 –

amit.gupta — Tue, 11 Jun 2019 13:10:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 25025 – Added active flag to report

amit.gupta — Mon, 10 Jun 2019 17:00:40 +0530

amit.gupta – 2 file(s) modified
Added active flag to report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 25018 – change in wallet

tejbeer — Thu, 06 Jun 2019 17:41:16 +0530

tejbeer – 2 file(s) modified
change in wallet

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js

Rev 25011 – Adedd web link for team in admin and accessories ...

amit.gupta — Tue, 04 Jun 2019 11:53:57 +0530

amit.gupta – 8 file(s) modified
Adedd web link for team in admin and accessories subcategories are displayed now insted of accessories brands

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Category.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategoryRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobileapp.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 25009 –

amit.gupta — Mon, 03 Jun 2019 15:22:50 +0530

amit.gupta – 1 file(s) modified

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

Rev 25008 –

amit.gupta — Mon, 03 Jun 2019 14:41:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 25003 –

amit.gupta — Sat, 01 Jun 2019 11:00:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 25002 –

amit.gupta — Sat, 01 Jun 2019 10:54:57 +0530

amit.gupta – 1 file(s) modified

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

Rev 25001 –

amit.gupta — Sat, 01 Jun 2019 10:28:42 +0530

amit.gupta – 1 file(s) modified

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

Rev 25000 –

amit.gupta — Sat, 01 Jun 2019 10:14:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 24999 –

amit.gupta — Sat, 01 Jun 2019 09:52:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 24996 –

amit.gupta — Fri, 31 May 2019 17:45:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 24990 – Fixed history check in case of new retailer

amit.gupta — Fri, 24 May 2019 20:06:55 +0530

amit.gupta – 5 file(s) modified
Fixed history check in case of new retailer

~ /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/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 24986 – change

tejbeer — Wed, 22 May 2019 15:19:53 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js

Rev 24985 – Fixed download for taglisting added hsncode

amit.gupta — Wed, 22 May 2019 14:52:55 +0530

amit.gupta – 2 file(s) modified
Fixed download for taglisting added hsncode

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 24984 –

amit.gupta — Tue, 21 May 2019 11:45:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 24983 –

amit.gupta — Mon, 20 May 2019 18:29:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 24981 –

amit.gupta — Mon, 20 May 2019 18:10:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 24976 – Added changes related to new tab

amit.gupta — Mon, 20 May 2019 16:55:43 +0530

amit.gupta – 7 file(s) modified
Added changes related to new tab

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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/PartnerTargetController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/store.vm

Rev 24951 – change in add money in wallet

tejbeer — Tue, 14 May 2019 17:24:50 +0530

tejbeer – 3 file(s) modified
change in add money in wallet

~ /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.vm

Rev 24950 – change

tejbeer — Tue, 14 May 2019 12:14:59 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js

Rev 24942 – change in wallet edit

tejbeer — Thu, 09 May 2019 16:37:10 +0530

tejbeer – 3 file(s) modified
change in wallet edit

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet-edit.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history.vm

Rev 24917 – notify item

tejbeer — Thu, 09 May 2019 01:45:59 +0530

tejbeer – 35 file(s) modified
notify item

~ /trunk/profitmandi-admin/src/main/resources/META-INF/env.property
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomNotifyItem.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomNotifyOrder.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/NotifyItemIdModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/NotifyOrderIdModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/NotifyOrderModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InActiveFofoStore.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyColorChange.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyOrder.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
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/NotifyStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyColorChangeRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyColorChangeRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyOrderRespository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyOrderRespositoryImpl.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/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify-order-modal.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify_order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/review_order.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 24905 –

amit.gupta — Tue, 07 May 2019 14:44:30 +0530

amit.gupta – 1 file(s) modified

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