SmartDukaan – /

Rev 33183 – show all vendors data report without select any particular vendor. ...

shampa — Fri, 05 Apr 2024 19:23:42 +0530

shampa – 9 file(s) modified
show all vendors data report without select any particular vendor. Add download csv file.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.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/catalog/ItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
~ /trunk/profitmandi-fofo/src/main/resources/log4j2.xml
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-price-circular-view.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-price-circular.vm

Rev 33182 – add fields in price drop table. Add purchase billing summery ...

shampa — Thu, 04 Apr 2024 18:55:23 +0530

shampa – 7 file(s) modified
add fields in price drop table. Add purchase billing summery and sale summery table.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemSaleSummaryModel.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/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm

Rev 33181 – Fixed invoices

amit.gupta — Thu, 04 Apr 2024 15:26:21 +0530

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

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

Rev 33180 – patch for

amit.gupta — Thu, 04 Apr 2024 14:38:41 +0530

amit.gupta – 1 file(s) modified
patch for

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 33179 – add Amount field in offer payout report

tejus.lohani — Thu, 04 Apr 2024 11:24:32 +0530

tejus.lohani – 1 file(s) modified
add Amount field in offer payout report

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.vm

Rev 33178 – fix amount formate in sales report

tejus.lohani — Wed, 03 Apr 2024 19:11:49 +0530

tejus.lohani – 1 file(s) modified
fix amount formate in sales report

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

Rev 33177 – Fix quantity and serial number related issue in salas report

tejus.lohani — Wed, 03 Apr 2024 18:17:22 +0530

tejus.lohani – 2 file(s) modified
Fix quantity and serial number related issue in salas report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm

Rev 33176 – removed imei 868494052222110

amit.gupta — Tue, 02 Apr 2024 22:24:09 +0530

amit.gupta – 1 file(s) modified
removed imei 868494052222110

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 33175 – Fixed Logic to avoid duplicate payments based on utr number

amit.gupta — Mon, 01 Apr 2024 20:17:17 +0530

amit.gupta – 2 file(s) modified
Fixed Logic to avoid duplicate payments based on utr number

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

Rev 33174 – updated contact list

shampa — Mon, 01 Apr 2024 16:54:22 +0530

shampa – 1 file(s) modified
updated contact list

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

Rev 33173 – Fixed ExcelUtils dependencies

amit.gupta — Sat, 30 Mar 2024 16:27:28 +0530

amit.gupta – 2 file(s) modified
Fixed ExcelUtils dependencies

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java

Rev 33172 – add bulk order service in admin dashboard

tejus.lohani — Sat, 30 Mar 2024 16:09:22 +0530

tejus.lohani – 11 file(s) modified
add bulk order service in admin dashboard

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk_order.vm

Rev 33171 – Merged Lead controller

amit.gupta — Sat, 30 Mar 2024 13:37:51 +0530

amit.gupta – 1 file(s) modified
Merged Lead controller

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 33170 – Fetch only recent loan statements

amit.gupta — Sat, 30 Mar 2024 13:36:14 +0530

amit.gupta – 2 file(s) modified
Fetch only recent loan statements

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java

Rev 33169 – Fixed Constants

amit.gupta — Fri, 29 Mar 2024 18:53:03 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 33168 – patch for

amit.gupta — Fri, 29 Mar 2024 16:38:48 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33167 – Fixed bug related to online order billing

amit.gupta — Fri, 29 Mar 2024 16:36:33 +0530

amit.gupta – 4 file(s) modified
Fixed bug related to online order billing

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm

Rev 33166 – Fixed date

amit.gupta — Fri, 29 Mar 2024 11:20:31 +0530

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

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

Rev 33165 – Enabled targets

amit.gupta — Fri, 29 Mar 2024 11:12:36 +0530

amit.gupta – 1 file(s) modified
Enabled targets

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 33164 – patch for

amit.gupta — Thu, 28 Mar 2024 15:29:34 +0530

amit.gupta – 1 file(s) modified
patch for

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 33163 – Fixed loan settlement

amit.gupta — Thu, 28 Mar 2024 13:19:52 +0530

amit.gupta – 1 file(s) modified
Fixed loan settlement

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

Rev 33162 – also added state name on email

ranu — Thu, 28 Mar 2024 13:11:34 +0530

ranu – 1 file(s) modified
also added state name on email

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

Rev 33161 – added some additional info (as per arindam mukerji mail)

ranu — Thu, 28 Mar 2024 12:53:45 +0530

ranu – 4 file(s) modified
added some additional info (as per arindam mukerji mail)

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/FofoRBMReportingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java

Rev 33160 – Added to find ageing summary by fofoIds

amit.gupta — Thu, 28 Mar 2024 09:13:37 +0530

amit.gupta – 4 file(s) modified
Added to find ageing summary by fofoIds

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/AgeingSummaryModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.java

Rev 33159 – Added changes to handle order fixing amount if it can ...

amit.gupta — Wed, 27 Mar 2024 20:29:42 +0530

amit.gupta – 1 file(s) modified
Added changes to handle order fixing amount if it can be settled thoroughly

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

Rev 33158 – Added new Method

amit.gupta — Wed, 27 Mar 2024 20:15:28 +0530

amit.gupta – 2 file(s) modified
Added new Method

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepositoryImpl.java

Rev 33157 – Removed unused imports

amit.gupta — Wed, 27 Mar 2024 19:58:26 +0530

amit.gupta – 1 file(s) modified
Removed unused imports

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 33156 – Added credit account repository method

amit.gupta — Wed, 27 Mar 2024 19:47:02 +0530

amit.gupta – 2 file(s) modified
Added credit account repository method

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditAccountRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/CreditAccountRepositoryImpl.java

Rev 33155 – patch for smartdukaan

amit.gupta — Wed, 27 Mar 2024 19:31:57 +0530

amit.gupta – 2 file(s) modified
patch for smartdukaan

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

Rev 33154 – Added logic for orders

amit.gupta — Wed, 27 Mar 2024 19:20:57 +0530

amit.gupta – 3 file(s) modified
Added logic for orders

~ /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/warehouse/OrderManagementController.java

Rev 33153 – Comment play video section

shampa — Wed, 27 Mar 2024 17:53:30 +0530

shampa – 1 file(s) modified
Comment play video section

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-price-circular.vm

Rev 33152 – only red water bottle will show

ranu — Wed, 27 Mar 2024 11:35:21 +0530

ranu – 1 file(s) modified
only red water bottle will show

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 33151 – expired time is only one day after unlock coupon

ranu — Wed, 27 Mar 2024 10:48:19 +0530

ranu – 2 file(s) modified
expired time is only one day after unlock coupon

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 33150 – js version change

ranu — Fri, 22 Mar 2024 17:58:02 +0530

ranu – 1 file(s) modified
js version change

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

Rev 33149 – added 40000 selling price 1 percent on protection plan

ranu — Fri, 22 Mar 2024 17:50:34 +0530

ranu – 3 file(s) modified
added 40000 selling price 1 percent on protection plan

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/oneassist/OneAssistService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js

Rev 33148 – patch for

amit.gupta — Fri, 22 Mar 2024 16:51:39 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33147 – patch for

amit.gupta — Fri, 22 Mar 2024 16:12:20 +0530

amit.gupta – 1 file(s) modified
patch for

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

Rev 33146 – Added report for Scratched Report

tejus.lohani — Fri, 22 Mar 2024 16:04:55 +0530

tejus.lohani – 1 file(s) modified
Added report for Scratched Report

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

Rev 33145 – add some fields in rprice_drop_report for fetch and Download

tejus.lohani — Fri, 22 Mar 2024 15:29:22 +0530

tejus.lohani – 1 file(s) modified
add some fields in rprice_drop_report for fetch and Download

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 33144 – patch for

amit.gupta — Fri, 22 Mar 2024 15:16:09 +0530

amit.gupta – 1 file(s) modified
patch for

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java