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

Rev 32603 – Fixed order Shipping Date(dd-MM-yyyy HH:mm:ss). Can now be updated

raveendra.bharati — Tue, 07 Nov 2023 12:16:13 +0530

raveendra.bharati – 17 file(s) modified
Fixed order Shipping Date(dd-MM-yyyy HH:mm:ss). Can now be updated

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ProviderTat.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ManualPaymentType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyCancel.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/NotifyMessage.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/entity/transaction/Payment.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/entity/transaction/Transaction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/TransferLot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm

Rev 32598 – Fixed cart

amit.gupta — Sat, 04 Nov 2023 21:28:04 +0530

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

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

Rev 32597 – Fixed cart

amit.gupta — Sat, 04 Nov 2023 21:23:48 +0530

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

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

Rev 32584 – Fixed purchase.js

raveendra.bharati — Tue, 31 Oct 2023 12:32:22 +0530

raveendra.bharati – 3 file(s) modified
Fixed purchase.js

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

Rev 32583 – Added Diwali Scratch Offer Related changes

amit.gupta — Mon, 30 Oct 2023 15:01:46 +0530

amit.gupta – 3 file(s) modified
Added Diwali Scratch Offer Related changes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/ScratchedGift.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java

Rev 32576 – Order Status should only be shipped from warehouse to be ...

amit.gupta — Thu, 26 Oct 2023 16:17:27 +0530

amit.gupta – 1 file(s) modified
Order Status should only be shipped from warehouse to be marked delivered

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

Rev 32575 – Fixed cart

amit.gupta — Wed, 25 Oct 2023 21:38:42 +0530

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

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

Rev 32574 – Fixed cart

amit.gupta — Wed, 25 Oct 2023 18:28:04 +0530

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

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

Rev 32571 – Fixed cart

amit.gupta — Sat, 21 Oct 2023 11:41:11 +0530

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

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

Rev 32570 – Fixed cart

amit.gupta — Sat, 21 Oct 2023 11:40:54 +0530

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

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

Rev 32565 – successfull popup

tejbeer — Fri, 20 Oct 2023 12:57:05 +0530

tejbeer – 7 file(s) modified
successfull popup

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/Supplier.java
+ /trunk/profitmandi-fofo/.idea/dbnavigator.xml
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/new-supplier.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/supplier.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-request.vm

Rev 32563 – Fixed cart

amit.gupta — Tue, 17 Oct 2023 12:10:55 +0530

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

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

Rev 32562 – Renamed functions

amit.gupta — Tue, 17 Oct 2023 11:44:18 +0530

amit.gupta – 1 file(s) modified
Renamed functions

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

Rev 32559 – Fixed auth issues

amit.gupta — Mon, 16 Oct 2023 12:31:41 +0530

amit.gupta – 3 file(s) modified
Fixed auth issues

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AuthServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java

Rev 32558 – Fixed cart

amit.gupta — Mon, 16 Oct 2023 12:19:26 +0530

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

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

Rev 32554 – Fixed

amit.gupta — Thu, 12 Oct 2023 00:01:19 +0530

amit.gupta – 2 file(s) modified
Fixed

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java

Rev 32553 – Fixe

amit.gupta — Wed, 11 Oct 2023 23:48:03 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32550 – Fixed null pointer exception in case of invalid state

amit.gupta — Wed, 11 Oct 2023 23:19:06 +0530

amit.gupta – 3 file(s) modified
Fixed null pointer exception in case of invalid state

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm

Rev 32547 – Fixe

amit.gupta — Wed, 11 Oct 2023 15:37:21 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32539 – Removed unnecessary warehouses. only warehouse from ProfitMandiConstants.java

amit.gupta — Tue, 10 Oct 2023 12:43:25 +0530

amit.gupta – 1 file(s) modified
Removed unnecessary warehouses. only warehouse from ProfitMandiConstants.java

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

Rev 32532 – ```Fixed order```

amit.gupta — Mon, 09 Oct 2023 15:20:49 +0530

amit.gupta – 1 file(s) modified
```Fixed order```

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

Rev 32530 – Purchase Return code has been refactored

amit.gupta — Mon, 09 Oct 2023 12:22:48 +0530

amit.gupta – 1 file(s) modified
Purchase Return code has been refactored

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

Rev 32528 – change

tejbeer — Sun, 08 Oct 2023 23:13:22 +0530

tejbeer – 5 file(s) modified
change

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sd-credit.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request-row.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request.vm

Rev 32512 – Fixed order

amit.gupta — Sun, 08 Oct 2023 03:10:14 +0530

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

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

Rev 32510 – Added TV

amit.gupta — Sat, 07 Oct 2023 18:16:34 +0530

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

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

Rev 32508 – Fixed whatsapp message sent logic

amit.gupta — Sat, 07 Oct 2023 15:29:35 +0530

amit.gupta – 2 file(s) modified
Fixed whatsapp message sent logic

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

Rev 32505 – Added logic for offer notification

amit.gupta — Thu, 05 Oct 2023 17:55:38 +0530

amit.gupta – 1 file(s) modified
Added logic for offer notification

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

Rev 32501 – Fixe

amit.gupta — Sun, 01 Oct 2023 09:24:17 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32500 – Fixe

amit.gupta — Sun, 01 Oct 2023 09:19:48 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32499 – Fixe

amit.gupta — Sun, 01 Oct 2023 09:16:49 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32495 – Fixe

amit.gupta — Fri, 29 Sep 2023 13:47:19 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32494 – Merged changes related to Smartdukaan

amit.gupta — Fri, 29 Sep 2023 13:35:34 +0530

amit.gupta – 3 file(s) modified
Merged changes related to Smartdukaan

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.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 32493 – Added changes related to auto order creation when internal po ...

amit.gupta — Fri, 29 Sep 2023 13:22:43 +0530

amit.gupta – 14 file(s) modified
Added changes related to auto order creation when internal po is created

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.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/entity/warehouse/WarehouseLineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerPositionRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepository.java@32492)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerPositionRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepositoryImpl.java@32492)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnersPositionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java

Rev 32491 – In Finance Wallet Edit and Wallet Stmt Changes

jai.hind — Thu, 28 Sep 2023 14:46:46 +0530

jai.hind – 3 file(s) modified
In Finance Wallet Edit and Wallet Stmt Changes

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

Rev 32490 – IN Finance Wallet edit and Wallet stmt add Total amount ...

jai.hind — Wed, 27 Sep 2023 13:46:08 +0530

jai.hind – 3 file(s) modified
IN Finance Wallet edit and Wallet stmt add Total amount and Availabele amount

Rev 32488 – Fixed PO Date logic

amit.gupta — Mon, 25 Sep 2023 15:28:51 +0530

amit.gupta – 2 file(s) modified
Fixed PO Date logic

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 32485 – Improved pricing related methods

amit.gupta — Sat, 23 Sep 2023 13:46:14 +0530

amit.gupta – 5 file(s) modified
Improved pricing related methods

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-catalog-pricing.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history.vm

Rev 32480 – Fixe

amit.gupta — Fri, 22 Sep 2023 00:00:52 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32478 – Fixed logic for Monitor

amit.gupta — Thu, 21 Sep 2023 22:58:22 +0530

amit.gupta – 5 file(s) modified
Fixed logic for Monitor

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.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/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java

Rev 32474 – Fixed Monitor/Targets

amit.gupta — Thu, 21 Sep 2023 16:45:09 +0530

amit.gupta – 2 file(s) modified
Fixed Monitor/Targets

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-targets.vm