SmartDukaan – /

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 32492 – hold order date

tejbeer — Thu, 28 Sep 2023 16:56:34 +0530

tejbeer – 1 file(s) modified
hold order date

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-order-hold.vm

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 32489 – Fixe

amit.gupta — Mon, 25 Sep 2023 15:37:42 +0530

amit.gupta – 1 file(s) modified
Fixe

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

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 32487 – Fixed vendor pricing log

amit.gupta — Mon, 25 Sep 2023 15:00:40 +0530

amit.gupta – 2 file(s) modified
Fixed vendor pricing log

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/VendorCatalogPricingLog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java

Rev 32486 – Added Logger

amit.gupta — Sun, 24 Sep 2023 11:19:11 +0530

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

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

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 32484 – Fixed logic for whatsapp messages

amit.gupta — Sat, 23 Sep 2023 13:40:34 +0530

amit.gupta – 2 file(s) modified
Fixed logic for whatsapp messages

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappMessageServiceImpl.java

Rev 32483 – Scheduled Task

amit.gupta — Sat, 23 Sep 2023 13:38:05 +0530

amit.gupta – 1 file(s) modified
Scheduled Task

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

Rev 32482 – Added new structure to migrations

amit.gupta — Sat, 23 Sep 2023 13:37:10 +0530

amit.gupta – 12 file(s) modified
Added new structure to migrations

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/runnables
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/runnables/CatalogMigration.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/runnables/PurchaseMigration.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/VendorCatalogPricingLog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.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/inventory/VendorCatalogPricingLogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 32481 – Added Catalog Id to item search

amit.gupta — Fri, 22 Sep 2023 17:29:32 +0530

amit.gupta – 2 file(s) modified
Added Catalog Id to item search

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

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 32479 – Fixed logic for Monitor

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

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

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/IdAmountModel.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 32477 –

tejbeer — Thu, 21 Sep 2023 17:57:15 +0530

tejbeer – 1 file(s) modified

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

Rev 32476 –

tejbeer — Thu, 21 Sep 2023 17:56:51 +0530

tejbeer – 1 file(s) modified

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

Rev 32475 – Fixe

amit.gupta — Thu, 21 Sep 2023 16:47:05 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerMonthlySaleModel.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

Rev 32473 –

tejbeer — Thu, 21 Sep 2023 16:11:02 +0530

tejbeer – 1 file(s) modified

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

Rev 32472 –

tejbeer — Thu, 21 Sep 2023 15:44:25 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateLeacdActivityRequest.java

Rev 32471 –

tejbeer — Thu, 21 Sep 2023 15:42:24 +0530

tejbeer – 5 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 32470 – Fixe

amit.gupta — Thu, 21 Sep 2023 13:34:27 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32469 – Fixed logic to add total

amit.gupta — Wed, 20 Sep 2023 16:25:10 +0530

amit.gupta – 2 file(s) modified
Fixed logic to add total

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js

Rev 32468 – Fixed logic in case of multiple items

amit.gupta — Wed, 20 Sep 2023 15:20:48 +0530

amit.gupta – 2 file(s) modified
Fixed logic in case of multiple items

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

Rev 32467 – Fixe

amit.gupta — Wed, 20 Sep 2023 15:20:05 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32466 – Resolved the issue with any color

amit.gupta — Wed, 20 Sep 2023 12:50:54 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

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

Rev 32465 –

tejbeer — Wed, 20 Sep 2023 12:06:19 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateRefferalRequest.java

Rev 32464 –

tejbeer — Wed, 20 Sep 2023 12:05:07 +0530

tejbeer – 4 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm

Rev 32463 – Add ImageUrl On HRMS

jai.hind — Tue, 19 Sep 2023 18:57:55 +0530

jai.hind – 5 file(s) modified
Add ImageUrl On HRMS

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth-users-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm

Rev 32462 – Fixe

amit.gupta — Tue, 19 Sep 2023 17:15:28 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java

Rev 32461 – Fixe

amit.gupta — Tue, 19 Sep 2023 17:07:23 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32460 – Fixed formatting of milestone

amit.gupta — Tue, 19 Sep 2023 16:10:53 +0530

amit.gupta – 3 file(s) modified
Fixed formatting of milestone

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Milestone.java
~ /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

Rev 32459 –

tejbeer — Tue, 19 Sep 2023 13:26:13 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sd-credit.js

Rev 32458 – Resolved the issue with any color

amit.gupta — Tue, 19 Sep 2023 12:12:44 +0530

amit.gupta – 1 file(s) modified
Resolved the issue with any color

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

Rev 32457 – TicketIssues and Loan count

jai.hind — Mon, 18 Sep 2023 22:50:04 +0530

jai.hind – 19 file(s) modified
TicketIssues and Loan count

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/banner-listing.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-partner-region.vm
~ /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-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket-category.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-ticket-sub-category.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/design-completed.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/employee-form.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/high_demand_item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inactive-stores.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-wise-loan-summary.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal-approve.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-download.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-message.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-notification.vm

Rev 32456 – fixed changes

jai.hind — Mon, 18 Sep 2023 19:46:22 +0530

jai.hind – 1 file(s) modified
fixed changes

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

Rev 32455 –

tejbeer — Mon, 18 Sep 2023 18:56:23 +0530

tejbeer – 1 file(s) modified

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