SmartDukaan – /

Rev 32367 – thriwe change

tejbeer — Fri, 25 Aug 2023 22:44:34 +0530

tejbeer – 23 file(s) modified
thriwe change

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefit
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefit/Benefit.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefit/BenefitGroup.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefit/BenefitResponse.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefit/Images.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefit/Partner.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefit/Service.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/AllocationDetails.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/BenefitConfiguration.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/BenefitConfigurationResponse.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/BookingType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/CarType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/Category.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/Coin.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/Images.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/RedemptionType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/thriwe/benefitConfiguration/Tat.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/thriwe
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/thriwe/ThriweService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/thriwe/ThriweServiceImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ThriweController.java

Rev 32366 – Fixed front end related issues with add/remove row

amit.gupta — Fri, 25 Aug 2023 19:39:13 +0530

amit.gupta – 2 file(s) modified
Fixed front end related issues with add/remove row

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

Rev 32365 – Fixed front end related issues with add/remove row

amit.gupta — Fri, 25 Aug 2023 14:21:41 +0530

amit.gupta – 1 file(s) modified
Fixed front end related issues with add/remove row

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

Rev 32364 – Fixed front end related issues with add/remove row

amit.gupta — Fri, 25 Aug 2023 14:21:09 +0530

amit.gupta – 1 file(s) modified
Fixed front end related issues with add/remove row

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

Rev 32363 – Fixed front end related issues with add/remove row

amit.gupta — Fri, 25 Aug 2023 14:19:21 +0530

amit.gupta – 1 file(s) modified
Fixed front end related issues with add/remove row

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

Rev 32362 – Fixed front end related issues with add/remove row

amit.gupta — Fri, 25 Aug 2023 13:45:12 +0530

amit.gupta – 1 file(s) modified
Fixed front end related issues with add/remove row

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

Rev 32361 – Fixed front end related issues with add/remove row

amit.gupta — Fri, 25 Aug 2023 13:40:06 +0530

amit.gupta – 1 file(s) modified
Fixed front end related issues with add/remove row

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

Rev 32360 – Fixed front end related issues with add/remove row

amit.gupta — Fri, 25 Aug 2023 13:02:21 +0530

amit.gupta – 2 file(s) modified
Fixed front end related issues with add/remove row

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm

Rev 32359 – Formatted

amit.gupta — Fri, 25 Aug 2023 08:49:38 +0530

amit.gupta – 1 file(s) modified
Formatted

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

Rev 32358 – Fixed js file

amit.gupta — Fri, 25 Aug 2023 08:48:42 +0530

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

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

Rev 32357 – Fixe

amit.gupta — Thu, 24 Aug 2023 19:30:18 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32356 – Fixe

amit.gupta — Thu, 24 Aug 2023 19:24:21 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32355 – Fixed Warehouse Purchase

amit.gupta — Thu, 24 Aug 2023 19:22:25 +0530

amit.gupta – 1 file(s) modified
Fixed Warehouse Purchase

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

Rev 32354 – Fixe

amit.gupta — Thu, 24 Aug 2023 19:05:56 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32353 – Fixe

amit.gupta — Thu, 24 Aug 2023 16:53:59 +0530

amit.gupta – 1 file(s) modified
Fixe

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

Rev 32352 – Focus issues

amit.gupta — Thu, 24 Aug 2023 16:52:07 +0530

amit.gupta – 1 file(s) modified
Focus issues

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

Rev 32351 – Fixed

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

amit.gupta – 1 file(s) modified
Fixed

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

Rev 32350 – Scheduled Task

amit.gupta — Wed, 23 Aug 2023 19:43:54 +0530

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

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

Rev 32349 – Fixed PurchaseOrder bugs

amit.gupta — Wed, 23 Aug 2023 19:18:41 +0530

amit.gupta – 19 file(s) modified
Fixed PurchaseOrder bugs

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Lead.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/WarehouseSupplierInvoice.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseDebitNoteRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseDebitNoteRepositoryImpl.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-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.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/new-supplier.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-debit-note.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-edit-purchase-order.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-invoice-view.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-new-invoice.vm

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