SmartDukaan – /

Rev 32348 – Design Related Issue Resolved

jai.hind — Wed, 23 Aug 2023 15:36:52 +0530

jai.hind – 12 file(s) modified
Design Related Issue Resolved

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-open.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/public-provider-holiday.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/store.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/supplier-in-active.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled-payments.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm

Rev 32347 – Fixed Text visibility

amit.gupta — Wed, 23 Aug 2023 11:50:51 +0530

amit.gupta – 1 file(s) modified
Fixed Text visibility

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-open-purchase-order.vm

Rev 32346 –

tejbeer — Tue, 22 Aug 2023 12:07:24 +0530

tejbeer – 1 file(s) modified

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

Rev 32345 – Fixed Sellin processing

amit.gupta — Tue, 22 Aug 2023 11:55:49 +0530

amit.gupta – 3 file(s) modified
Fixed Sellin processing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 32344 –

tejbeer — Mon, 21 Aug 2023 15:07:57 +0530

tejbeer – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/combo.js
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 32343 – Added Oppo Scheduler to process activation information

amit.gupta — Mon, 21 Aug 2023 12:24:05 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java

Rev 32342 – Added Oppo Scheduler to process activation information

amit.gupta — Mon, 21 Aug 2023 11:31:34 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java

Rev 32341 – Added Oppo Scheduler to process activation information

amit.gupta — Mon, 21 Aug 2023 11:29:06 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java

Rev 32340 – Added Oppo Scheduler to process activation information

amit.gupta — Mon, 21 Aug 2023 11:22:31 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java

Rev 32339 – combo change

tejbeer — Sat, 19 Aug 2023 16:38:54 +0530

tejbeer – 16 file(s) modified
combo change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ComboMappedModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ComboModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ComboOption.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ComboMappedModelRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ComboMappedModelRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ComboModelRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ComboOptionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ComboOptionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/Combo.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ComboOptionModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/MappedComboModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/combo.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-combo.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 32338 – Fixed information of partner total income and removed price drop

amit.gupta — Fri, 18 Aug 2023 19:35:54 +0530

amit.gupta – 2 file(s) modified
Fixed information of partner total income and removed price drop

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-total-income.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 32337 – Restart Server

jai.hind — Wed, 16 Aug 2023 18:31:00 +0530

jai.hind – 5 file(s) modified
Restart Server

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/restart-server-page.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/restart-server-page.vm

Rev 32336 – Restart Server

jai.hind — Wed, 16 Aug 2023 12:11:16 +0530

jai.hind – 7 file(s) modified
Restart Server

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/restart-server-page.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/restart-server-page.vm

Rev 32335 – Fixe

amit.gupta — Mon, 14 Aug 2023 16:15:06 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32334 – Fixe

amit.gupta — Mon, 14 Aug 2023 12:39:23 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehousePurchaseGrnRequest.java

Rev 32333 – Fixe

amit.gupta — Mon, 14 Aug 2023 11:19:33 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32332 – Fixe

amit.gupta — Mon, 14 Aug 2023 11:14:17 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32331 – Added changes related to schemes

amit.gupta — Mon, 14 Aug 2023 11:13:40 +0530

amit.gupta – 9 file(s) modified
Added changes related to schemes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/SchemeSummaryModel.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-circular-table.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-partner.vm

Rev 32330 – Fixe

amit.gupta — Fri, 11 Aug 2023 17:41:51 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css

Rev 32329 – Fixed orders

amit.gupta — Fri, 11 Aug 2023 16:25:45 +0530

amit.gupta – 4 file(s) modified
Fixed orders

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 32328 – Fixe

amit.gupta — Fri, 11 Aug 2023 15:09:00 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32327 – Fixe

amit.gupta — Fri, 11 Aug 2023 14:48:18 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32326 – Fixe

amit.gupta — Fri, 11 Aug 2023 13:14:06 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32325 – Fixe

amit.gupta — Thu, 10 Aug 2023 18:58:32 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32324 – Fixed changes related to Grn.

amit.gupta — Thu, 10 Aug 2023 15:02:51 +0530

amit.gupta – 2 file(s) modified
Fixed changes related to Grn.

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

Rev 32323 – Fixe

amit.gupta — Thu, 10 Aug 2023 12:27:15 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32322 – Fixe

amit.gupta — Thu, 10 Aug 2023 12:25:05 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32321 – Fixe

amit.gupta — Thu, 10 Aug 2023 08:48:00 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32320 – Fixe

amit.gupta — Thu, 10 Aug 2023 08:40:57 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32319 – Fixe

amit.gupta — Wed, 09 Aug 2023 19:29:02 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32318 – Fixe

amit.gupta — Wed, 09 Aug 2023 19:12:24 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32317 – Fixe

amit.gupta — Wed, 09 Aug 2023 19:04:40 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32316 – Added warehouses fix

amit.gupta — Wed, 09 Aug 2023 18:22:46 +0530

amit.gupta – 2 file(s) modified
Added warehouses fix

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm

Rev 32315 – Resolved the issue with any color

amit.gupta — Wed, 09 Aug 2023 12:04:15 +0530

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

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

Rev 32314 – Added Oppo Scheduler to process activation information

amit.gupta — Wed, 09 Aug 2023 07:27:06 +0530

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

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

Rev 32313 –

tejbeer — Tue, 08 Aug 2023 17:43:18 +0530

tejbeer – 1 file(s) modified

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

Rev 32312 – Added warehouses

amit.gupta — Tue, 08 Aug 2023 13:41:34 +0530

amit.gupta – 4 file(s) modified
Added warehouses

~ /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-editNew.vm

Rev 32311 – changes

tejbeer — Mon, 07 Aug 2023 11:16:37 +0530

tejbeer – 11 file(s) modified
changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/DebitNoteType.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/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/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges.vm
~ /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-receive-invoice-add-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm

Rev 32310 – Fixe

amit.gupta — Sun, 06 Aug 2023 22:21:31 +0530

amit.gupta – 1 file(s) modified
Fixe

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java

Rev 32309 – Fixe

amit.gupta — Sun, 06 Aug 2023 22:19:13 +0530

amit.gupta – 2 file(s) modified
Fixe

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