SmartDukaan – /

Rev 32246 – change grn

tejbeer — Fri, 28 Jul 2023 11:45:29 +0530

tejbeer – 38 file(s) modified
change 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/InvoicePdfModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/InventoryWarehouse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemPricingHistory.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/entity/inventory/VendorItemPricing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/Warehouse.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/DebitNoteType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseDebitNote.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseDebitNoteLine.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/WarehousePurchaseGrnRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehousePurchaseGrnRequestItems.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/warehouse/WarehouseGrnRequestStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/warehouse/WarehouseMismatchType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateWarehousePurchaseOrderModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemWisePurchaseModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/WarehouseInvoicePurchaseModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/WarehousePurchaseModel.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/repository/warehouse/WarehouseDebitNoteLineRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseDebitNoteLineRepositoryImpl.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/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/WarehousePurchaseGrnRequestItemsRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseGrnRequestItemsRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseGrnRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseGrnRequestRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseRepositoryImpl.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

Rev 32245 – Add Two Column On Partner Critical Matrix

jai.hind — Thu, 27 Jul 2023 19:29:29 +0530

jai.hind – 3 file(s) modified
Add Two Column On Partner Critical Matrix

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PerformanceServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/filtered-retailer.vm

Rev 32244 – Fixed additional scheme logic

amit.gupta — Thu, 27 Jul 2023 18:41:58 +0530

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

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

Rev 32243 – Fixed additional scheme logic

amit.gupta — Thu, 27 Jul 2023 18:36:29 +0530

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

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

Rev 32242 – Fixed additional scheme logic

amit.gupta — Thu, 27 Jul 2023 18:35:04 +0530

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

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

Rev 32241 – Fixed additional scheme logic

amit.gupta — Thu, 27 Jul 2023 18:33:30 +0530

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

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

Rev 32240 – Fixed additional scheme logic

amit.gupta — Thu, 27 Jul 2023 18:28:15 +0530

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

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

Rev 32239 – Fixed additional scheme logic

amit.gupta — Thu, 27 Jul 2023 18:20:23 +0530

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

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

Rev 32238 – Added public url for sample invoice for whatsapp

amit.gupta — Thu, 27 Jul 2023 18:08:59 +0530

amit.gupta – 2 file(s) modified
Added public url for sample invoice for whatsapp

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

Rev 32237 – Fixed additional scheme logic

amit.gupta — Wed, 26 Jul 2023 16:27:16 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java

Rev 32236 – Fixed additional scheme logic

amit.gupta — Wed, 26 Jul 2023 13:41:30 +0530

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

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

Rev 32235 – Fixed additional scheme logic

amit.gupta — Wed, 26 Jul 2023 13:36:33 +0530

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

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

Rev 32234 – Fixed additional scheme logic

amit.gupta — Tue, 25 Jul 2023 19:26:30 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java

Rev 32233 – Fixed additional scheme logic

amit.gupta — Tue, 25 Jul 2023 19:25:55 +0530

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

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

Rev 32232 – Fixed my income

amit.gupta — Tue, 25 Jul 2023 19:22:58 +0530

amit.gupta – 5 file(s) modified
Fixed my income

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ImeiWiseIncomePairAndMapModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastMonthFrontEndImeiModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-credited-income.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthly-brand-wise-income.vm

Rev 32231 – Fixed additional scheme logic

amit.gupta — Tue, 25 Jul 2023 19:12:27 +0530

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

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

Rev 32230 – Added focused model in item

amit.gupta — Tue, 25 Jul 2023 17:02:33 +0530

amit.gupta – 4 file(s) modified
Added focused model in item

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/model/WarehouseStockQtyModel.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-stock-qty-container.vm

Rev 32229 – Fixed additional scheme logic

amit.gupta — Mon, 24 Jul 2023 16:48:17 +0530

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

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

Rev 32228 – Fixed additional scheme logic

amit.gupta — Mon, 24 Jul 2023 16:48:02 +0530

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

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

Rev 32227 – Added state and activationtype

amit.gupta — Mon, 24 Jul 2023 16:33:41 +0530

amit.gupta – 3 file(s) modified
Added state and activationtype

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RetailerFilterModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RetailerPeformanceFilterModel.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/filtered-retailer.vm

Rev 32226 – Changed mop to dp

amit.gupta — Mon, 24 Jul 2023 13:22:07 +0530

amit.gupta – 1 file(s) modified
Changed mop to dp

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

Rev 32225 – Added Oppo Scheduler to process activation information

amit.gupta — Mon, 24 Jul 2023 06:42:15 +0530

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

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

Rev 32224 – Added Oppo Scheduler to process activation information

amit.gupta — Mon, 24 Jul 2023 06:35:56 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService1Impl.java

Rev 32223 – Added changes related to ScheduledTasks

amit.gupta — Mon, 24 Jul 2023 06:33:38 +0530

amit.gupta – 2 file(s) modified
Added changes related to ScheduledTasks

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

Rev 32222 – Addded internal file

amit.gupta — Mon, 24 Jul 2023 06:15:36 +0530

amit.gupta – 1 file(s) modified
Addded internal file

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

Rev 32221 – Added Oppo Scheduler to process activation information

amit.gupta — Mon, 24 Jul 2023 06:14:45 +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/warehouse/WarehouseInventoryItem.java

Rev 32220 – change

tejbeer — Sat, 22 Jul 2023 10:41:09 +0530

tejbeer – 1 file(s) modified
change

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

Rev 32219 –

tejbeer — Sat, 22 Jul 2023 02:10:57 +0530

tejbeer – 1 file(s) modified

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

Rev 32218 –

tejbeer — Sat, 22 Jul 2023 02:04:38 +0530

tejbeer – 5 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/ScratchedGift.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepositoryImpl.java
~ /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 32217 – Fixed logic for tax rate

amit.gupta — Fri, 21 Jul 2023 15:06:17 +0530

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

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

Rev 32216 – cron-tecno-itel-imei-activation

jai.hind — Thu, 20 Jul 2023 12:47:40 +0530

jai.hind – 2 file(s) modified
cron-tecno-itel-imei-activation

Rev 32215 – Added Oppo Scheduler to process activation information

amit.gupta — Thu, 20 Jul 2023 07:45:57 +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/warehouse/WarehouseInventoryItem.java

Rev 32214 – cron-Itel-Imei-Activation

jai.hind — Wed, 19 Jul 2023 16:51:30 +0530

jai.hind – 4 file(s) modified
cron-Itel-Imei-Activation

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/itelImeiActivation/ItelImeiActivationNewService.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 32213 – Added models for amazon purchase service

amit.gupta — Tue, 18 Jul 2023 19:35:14 +0530

amit.gupta – 2 file(s) modified
Added models for amazon purchase service

+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/amazon/shop/model/OrderRow.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/amazon/shop/OrderSummary.java

Rev 32212 – Added Oppo Scheduler to process activation information

amit.gupta — Tue, 18 Jul 2023 19:31:24 +0530

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

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/amazon/shop/AmazonPurchaseService.java

Rev 32211 – Improved amazon purchase code, now successfully places orders most of ...

amit.gupta — Tue, 18 Jul 2023 19:25:25 +0530

amit.gupta – 2 file(s) modified
Improved amazon purchase code, now successfully places orders most of the time

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/amazon/shop/AmazonPurchaseService.java

Rev 32210 – cron-Itel

jai.hind — Tue, 18 Jul 2023 13:45:36 +0530

jai.hind – 2 file(s) modified
cron-Itel

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

Rev 32209 – Fixed additional scheme logic

amit.gupta — Sat, 15 Jul 2023 12:54:25 +0530

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

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

Rev 32208 – Fixed additional scheme logic

amit.gupta — Fri, 14 Jul 2023 16:30:58 +0530

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

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

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