SmartDukaan – /

Rev 32207 – Category changes rights restricted to Special List

amit.gupta — Fri, 14 Jul 2023 12:18:04 +0530

amit.gupta – 2 file(s) modified
Category changes rights restricted to Special List

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/store-investment.vm

Rev 32206 – Removed Kanan

amit.gupta — Fri, 14 Jul 2023 12:03:58 +0530

amit.gupta – 2 file(s) modified
Removed Kanan

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

Rev 32205 – Fixed additional scheme logic

amit.gupta — Thu, 13 Jul 2023 16:02:34 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

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

Rev 32204 – Fixed additional scheme logic

amit.gupta — Thu, 13 Jul 2023 15:54:49 +0530

amit.gupta – 3 file(s) modified
Fixed additional scheme logic

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/resources/offer_margin_detail_partner.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_notify.vm (copied from /trunk/profitmandi-fofo/src/main/resources/offer_margin_detail_partner.vm@32202)

Rev 32203 – Fixed additional scheme logic

amit.gupta — Thu, 13 Jul 2023 13:42:02 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm

Rev 32202 – Fixed image rendering issue caused by not escaping html special ...

amit.gupta — Thu, 13 Jul 2023 11:07:20 +0530

amit.gupta – 3 file(s) modified
Fixed image rendering issue caused by not escaping html special chars

~ /trunk/profitmandi-fofo/src/main/resources/offer_margin_detail_partner.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner2.vm

Rev 32201 – Fixed additional scheme logic

amit.gupta — Wed, 12 Jul 2023 21:31:15 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

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

Rev 32200 – Fixed additional scheme logic

amit.gupta — Wed, 12 Jul 2023 20:56:51 +0530

amit.gupta – 2 file(s) modified
Fixed additional scheme logic

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

Rev 32199 – Fixed additional scheme logic

amit.gupta — Wed, 12 Jul 2023 20:55:52 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java

Rev 32198 – Fixed image generation issue with Velocity

amit.gupta — Wed, 12 Jul 2023 20:31:43 +0530

amit.gupta – 2 file(s) modified
Fixed image generation issue with Velocity

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

Rev 32197 – partner wise loan summary

jai.hind — Wed, 12 Jul 2023 18:23:58 +0530

jai.hind – 4 file(s) modified
partner wise loan summary

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/LoanSummaryType.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-wise-loan-summary.vm

Rev 32196 – Fixed additional scheme logic

amit.gupta — Tue, 11 Jul 2023 13:08:15 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

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

Rev 32195 –

tejbeer — Mon, 10 Jul 2023 17:53:55 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 32194 – change

tejbeer — Mon, 10 Jul 2023 17:52:26 +0530

tejbeer – 5 file(s) modified
change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java

Rev 32193 –

tejbeer — Mon, 10 Jul 2023 11:52:26 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 32192 – grn

tejbeer — Mon, 10 Jul 2023 11:35:21 +0530

tejbeer – 30 file(s) modified
grn

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/GrnModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InvoiceItemModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemQtyModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WarehouseInvoiceModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WarehouseInvoicePurchaseModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WarehousePurchaseModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInvoiceItem.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/entity/warehouse/WarehousePurchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseScan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/warehouse
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/warehouse/WarehouseInvoiceStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseNewReceiveInvoiceModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseLineItemRespository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseLineItemRespositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoice-validate-purchase.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-lineitem.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-invoice-add-item.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm

Rev 32191 – change

tejbeer — Fri, 07 Jul 2023 15:13:44 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DigifyRetailerModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/digify/DigifyController.java

Rev 32190 – Fixed additional scheme logic

amit.gupta — Fri, 07 Jul 2023 12:10:46 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

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

Rev 32189 – Added Oppo Scheduler to process activation information

amit.gupta — Thu, 06 Jul 2023 15:51:39 +0530

amit.gupta – 1 file(s) modified
Added Oppo Scheduler to process activation information

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 32188 – Added Oppo Scheduler to process activation information

amit.gupta — Sun, 02 Jul 2023 17:43:10 +0530

amit.gupta – 1 file(s) modified
Added Oppo Scheduler to process activation information

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

Rev 32187 – Fixed additional scheme logic

amit.gupta — Sun, 02 Jul 2023 17:42:48 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

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

Rev 32186 – Fixed additional scheme logic

amit.gupta — Sun, 02 Jul 2023 17:38:41 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

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

Rev 32185 – Added Oppo Scheduler to process activation information

amit.gupta — Sun, 02 Jul 2023 17:37:57 +0530

amit.gupta – 1 file(s) modified
Added Oppo Scheduler to process activation information

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

Rev 32184 – Fixed additional scheme logic

amit.gupta — Sat, 01 Jul 2023 17:42:44 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 32183 – Fixed additional scheme logic

amit.gupta — Sat, 01 Jul 2023 16:13:36 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 32182 – Handle logic for price drop corner case when order is ...

amit.gupta — Sat, 01 Jul 2023 16:07:09 +0530

amit.gupta – 2 file(s) modified
Handle logic for price drop corner case when order is billed in between PD Affected Date and PD create date

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

Rev 32181 – Fixed additional scheme logic

amit.gupta — Fri, 30 Jun 2023 17:17:06 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 32180 – Added jaihind

amit.gupta — Fri, 30 Jun 2023 11:58:50 +0530

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

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

Rev 32179 – Fixed activation logic

amit.gupta — Thu, 29 Jun 2023 21:32:39 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 32178 – Fixed additional scheme logic

amit.gupta — Thu, 29 Jun 2023 20:59:14 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 32177 – Fixed additional scheme logic

amit.gupta — Thu, 29 Jun 2023 19:01:28 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

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

Rev 32176 – Fixed additional scheme logic

amit.gupta — Thu, 29 Jun 2023 18:33:18 +0530

amit.gupta – 1 file(s) modified
Fixed additional scheme logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java

Rev 32175 –

tejbeer — Thu, 29 Jun 2023 18:06:03 +0530

tejbeer – 1 file(s) modified

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

Rev 32174 –

tejbeer — Thu, 29 Jun 2023 18:02:07 +0530

tejbeer – 1 file(s) modified

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

Rev 32173 – change

tejbeer — Thu, 29 Jun 2023 17:16:09 +0530

tejbeer – 1 file(s) modified
change

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

Rev 32172 – Added Loan summary details

jai.hind — Thu, 29 Jun 2023 14:55:55 +0530

jai.hind – 6 file(s) modified
Added Loan summary details

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanAggregation.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanSummary.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm

Rev 32171 – Loan summary reversed

jai.hind — Thu, 29 Jun 2023 11:33:41 +0530

jai.hind – 25 file(s) modified
Loan summary reversed

~ /trunk/profitmandi-common/.settings/org.eclipse.buildship.core.prefs
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanAggregation.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanSummary.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanAggregationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PerformanceServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
x /trunk/profitmandi-fofo/.idea/uiDesigner.xml
~ /trunk/profitmandi-fofo/build.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/focused_model.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused_model.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_brand_stock.vm
~ /trunk/ThriftConfig/.classpath
~ /trunk/ThriftConfig/.project
~ /trunk/ThriftConfig/.settings/org.eclipse.jdt.core.prefs

Rev 32170 – Loan summary

jai.hind — Tue, 27 Jun 2023 13:41:44 +0530

jai.hind – 25 file(s) modified
Loan summary

~ /trunk/profitmandi-common/.settings/org.eclipse.buildship.core.prefs
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanAggregation.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanSummary.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanAggregationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PerformanceServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
+ /trunk/profitmandi-fofo/.idea/uiDesigner.xml
~ /trunk/profitmandi-fofo/build.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/focused_model.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused_model.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_brand_stock.vm
~ /trunk/ThriftConfig/.classpath
~ /trunk/ThriftConfig/.project
~ /trunk/ThriftConfig/.settings/org.eclipse.jdt.core.prefs

Rev 32169 – Duplicate entry reversal code migration

amit.gupta — Fri, 23 Jun 2023 17:05:17 +0530

amit.gupta – 1 file(s) modified
Duplicate entry reversal code migration

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

Rev 32168 – Added changes related to New Warehouse

amit.gupta — Fri, 23 Jun 2023 16:53:18 +0530

amit.gupta – 5 file(s) modified
Added changes related to New Warehouse

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
~ /trunk/InventoryManager/src/main/webapp/js/common.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm