SmartDukaan – /

Rev 23997 –

tejbeer — Mon, 13 Aug 2018 16:57:57 +0530

tejbeer – 1 file(s) modified

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

Rev 23996 – email change

tejbeer — Mon, 13 Aug 2018 16:56:31 +0530

tejbeer – 1 file(s) modified
email change

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

Rev 23995 – Fixed price drop amount.

amit.gupta — Mon, 13 Aug 2018 14:30:58 +0530

amit.gupta – 7 file(s) modified
Fixed price drop amount.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.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/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 23994 – change in panigation

govind — Mon, 13 Aug 2018 12:31:20 +0530

govind – 1 file(s) modified
change in panigation

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history-paginated.vm

Rev 23993 – Add wallet request changes

tejbeer — Mon, 13 Aug 2018 12:01:21 +0530

tejbeer – 6 file(s) modified
Add wallet request changes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
+ /trunk/profitmandi-web/src/main/resources/application.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/env.property

Rev 23992 – Fixed js issue

amit.gupta — Sun, 12 Aug 2018 16:54:44 +0530

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

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

Rev 23991 –

amit.gupta — Sat, 11 Aug 2018 16:57:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 23990 –

amit.gupta — Sat, 11 Aug 2018 07:58:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 23989 –

amit.gupta — Sat, 11 Aug 2018 07:53:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 23988 –

amit.gupta — Sat, 11 Aug 2018 07:40:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 23987 – Fixed issue related to price drop currentPrice.

amit.gupta — Fri, 10 Aug 2018 18:39:17 +0530

amit.gupta – 1 file(s) modified
Fixed issue related to price drop currentPrice.

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

Rev 23986 – Changes in

amit.gupta — Fri, 10 Aug 2018 16:59:19 +0530

amit.gupta – 2 file(s) modified
Changes in

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 23985 – AddWalletRequestchanges

tejbeer — Fri, 10 Aug 2018 16:19:02 +0530

tejbeer – 8 file(s) modified
AddWalletRequestchanges

~ /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/AddWalletRequestRepositoryImpl.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/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
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 23984 – instructionsItem modified

govind — Thu, 09 Aug 2018 17:47:34 +0530

govind – 3 file(s) modified
instructionsItem modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemController.java

Rev 23983 – Fixed price drop

amit.gupta — Thu, 09 Aug 2018 16:52:12 +0530

amit.gupta – 9 file(s) modified
Fixed price drop

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.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/service/inventory/InventoryServiceImpl.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-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.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

Rev 23982 – Fixed

amit.gupta — Wed, 08 Aug 2018 10:26:48 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 23981 –

amit.gupta — Tue, 07 Aug 2018 18:06:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 23980 – Fixed issue

amit.gupta — Tue, 07 Aug 2018 13:16:58 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm

Rev 23979 –

amit.gupta — Tue, 07 Aug 2018 13:13:27 +0530

amit.gupta – 1 file(s) modified

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

Rev 23978 –

amit.gupta — Mon, 06 Aug 2018 19:36:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java

Rev 23977 – Fixed price drop

amit.gupta — Mon, 06 Aug 2018 16:23:18 +0530

amit.gupta – 1 file(s) modified
Fixed price drop

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

Rev 23976 – Fixed bug related to pricedrop.

amit.gupta — Mon, 06 Aug 2018 16:06:57 +0530

amit.gupta – 3 file(s) modified
Fixed bug related to pricedrop.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.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/WarehouseServiceImpl.java

Rev 23975 – wallet request

tejbeer — Mon, 06 Aug 2018 11:30:40 +0530

tejbeer – 1 file(s) modified
wallet request

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

Rev 23974 – Fixed recharge operator.

amit.gupta — Fri, 03 Aug 2018 18:20:26 +0530

amit.gupta – 2 file(s) modified
Fixed recharge operator.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeOperator.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/ThinkWalnutDigitalRechargeProviderServiceImpl.java

Rev 23973 – search sale History by different parameter

govind — Fri, 03 Aug 2018 12:07:31 +0530

govind – 6 file(s) modified
search sale History by different parameter

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/SearchType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm

Rev 23972 – Retailer info update

govind — Thu, 02 Aug 2018 16:41:49 +0530

govind – 2 file(s) modified
Retailer info update

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 23971 –

amit.gupta — Tue, 31 Jul 2018 18:03:04 +0530

amit.gupta – 1 file(s) modified

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

Rev 23970 –

amit.gupta — Tue, 31 Jul 2018 17:39:24 +0530

amit.gupta – 1 file(s) modified

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

Rev 23969 –

amit.gupta — Tue, 31 Jul 2018 16:04:25 +0530

amit.gupta – 1 file(s) modified

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

Rev 23968 – Fixed price drop

amit.gupta — Tue, 31 Jul 2018 15:24:25 +0530

amit.gupta – 19 file(s) modified
Fixed price drop

~ /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/ImeiDropSummaryModel.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/PriceDropProcessModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.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/fofo/InventoryItemRepository.java
~ /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/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/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.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/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.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 23967 –

amit.gupta — Tue, 31 Jul 2018 14:54:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 23966 –

amit.gupta — Tue, 31 Jul 2018 12:30:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 23965 – Fixed issue with valiate cards

amit.gupta — Sat, 28 Jul 2018 17:59:33 +0530

amit.gupta – 4 file(s) modified
Fixed issue with valiate cards

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/AddCartRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartItems.java

Rev 23964 –

amit.gupta — Sat, 28 Jul 2018 15:29:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartItems.java

Rev 23963 –

amit.gupta — Sat, 28 Jul 2018 15:27:12 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartItems.java

Rev 23962 –

amit.gupta — Sat, 28 Jul 2018 15:24:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartItems.java

Rev 23961 –

amit.gupta — Sat, 28 Jul 2018 15:21:01 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartItems.java

Rev 23960 –

amit.gupta — Sat, 28 Jul 2018 15:16:41 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CartItems.java

Rev 23959 – Fixed cart issue. Temporary fix

amit.gupta — Sat, 28 Jul 2018 15:04:07 +0530

amit.gupta – 2 file(s) modified
Fixed cart issue. Temporary fix

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/AddCartRequest.java

Rev 23958 – Fixed minor bug

amit.gupta — Fri, 27 Jul 2018 22:44:14 +0530

amit.gupta – 1 file(s) modified
Fixed minor bug

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