SmartDukaan – /

Rev 31361 – F

amit.gupta — Wed, 28 Dec 2022 17:20:31 +0530

amit.gupta – 4 file(s) modified
F

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /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/DashboardController.java

Rev 31360 –

tejbeer — Wed, 28 Dec 2022 16:37:11 +0530

tejbeer – 1 file(s) modified

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

Rev 31359 –

tejbeer — Wed, 28 Dec 2022 16:31:08 +0530

tejbeer – 1 file(s) modified

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

Rev 31358 –

tejbeer — Wed, 28 Dec 2022 16:26:07 +0530

tejbeer – 1 file(s) modified

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

Rev 31357 – F

amit.gupta — Wed, 28 Dec 2022 11:41:34 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31356 – F

amit.gupta — Wed, 28 Dec 2022 11:40:04 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31355 – F

amit.gupta — Wed, 28 Dec 2022 11:26:12 +0530

amit.gupta – 1 file(s) modified
F

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/last-month-imei-wise-income.vm

Rev 31354 – F

amit.gupta — Wed, 28 Dec 2022 11:03:16 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31353 – Added booster margin/ additional margins

amit.gupta — Wed, 28 Dec 2022 11:01:04 +0530

amit.gupta – 1 file(s) modified
Added booster margin/ additional margins

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

Rev 31352 – Added booster margin/ additional margins

amit.gupta — Wed, 28 Dec 2022 10:55:55 +0530

amit.gupta – 10 file(s) modified
Added booster margin/ additional margins

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/OfferPayoutImeiIncomeModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ImeiWiseIncomePairAndMapModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepositoryImpl.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/last-month-imei-wise-income.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthly-brand-wise-income.vm (copied from /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/montly-brand-wise-income.vm@31351)
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/montly-brand-wise-income.vm

Rev 31351 – Fixed issue with same item in Single PO billed in ...

amit.gupta — Fri, 23 Dec 2022 23:05:36 +0530

amit.gupta – 1 file(s) modified
Fixed issue with same item in Single PO billed in multiple invoices

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

Rev 31350 –

tejbeer — Fri, 23 Dec 2022 22:57:54 +0530

tejbeer – 1 file(s) modified

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

Rev 31349 –

tejbeer — Fri, 23 Dec 2022 22:51:06 +0530

tejbeer – 1 file(s) modified

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

Rev 31348 –

tejbeer — Fri, 23 Dec 2022 21:49:53 +0530

tejbeer – 1 file(s) modified

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

Rev 31347 –

tejbeer — Fri, 23 Dec 2022 21:43:07 +0530

tejbeer – 1 file(s) modified

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

Rev 31346 – F

amit.gupta — Fri, 23 Dec 2022 21:03:09 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31345 – F

amit.gupta — Fri, 23 Dec 2022 15:00:41 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31344 – F

amit.gupta — Fri, 23 Dec 2022 13:21:45 +0530

amit.gupta – 1 file(s) modified
F

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

Rev 31343 –

tejbeer — Fri, 23 Dec 2022 12:23:26 +0530

tejbeer – 1 file(s) modified

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

Rev 31342 – Fixed net availability to SaholicCIS Table

amit.gupta — Thu, 22 Dec 2022 18:55:54 +0530

amit.gupta – 1 file(s) modified
Fixed net availability to SaholicCIS Table

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

Rev 31341 – Fixed net availability to SaholicCIS Table

amit.gupta — Thu, 22 Dec 2022 18:51:00 +0530

amit.gupta – 1 file(s) modified
Fixed net availability to SaholicCIS Table

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

Rev 31340 – Removed unwanted files

amit.gupta — Wed, 21 Dec 2022 20:20:11 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

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

Rev 31339 –

tejbeer — Wed, 21 Dec 2022 19:38:47 +0530

tejbeer – 1 file(s) modified

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

Rev 31338 – Removed unwanted files

amit.gupta — Wed, 21 Dec 2022 19:32:59 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

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

Rev 31337 – Removed unwanted files

amit.gupta — Wed, 21 Dec 2022 19:30:01 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

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

Rev 31336 – Added logic to not consider blocked imeis in schemes

amit.gupta — Wed, 21 Dec 2022 19:13:10 +0530

amit.gupta – 1 file(s) modified
Added logic to not consider blocked imeis in schemes

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

Rev 31335 – Removed unwanted files

amit.gupta — Wed, 21 Dec 2022 16:46:58 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

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

Rev 31334 – Removed unwanted files

amit.gupta — Wed, 21 Dec 2022 15:47:52 +0530

amit.gupta – 1 file(s) modified
Removed unwanted files

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

Rev 31333 – Removed pending payments while finding sellin

amit.gupta — Tue, 20 Dec 2022 18:09:07 +0530

amit.gupta – 1 file(s) modified
Removed pending payments while finding sellin

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

Rev 31332 – Added Settlement logic for CCAvenue

amit.gupta — Tue, 20 Dec 2022 17:06:40 +0530

amit.gupta – 2 file(s) modified
Added Settlement logic for CCAvenue

~ /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 31331 – Automate payments update for init payments

amit.gupta — Tue, 20 Dec 2022 15:51:15 +0530

amit.gupta – 4 file(s) modified
Automate payments update for init payments

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPaymentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPaymentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/CCAvenuePaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java

Rev 31330 – change

tejbeer — Tue, 20 Dec 2022 13:02:14 +0530

tejbeer – 4 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.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/ContentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js

Rev 31329 –

tejbeer — Tue, 20 Dec 2022 10:44:46 +0530

tejbeer – 1 file(s) modified

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

Rev 31328 – Fixed issue with stock avaialbility

amit.gupta — Mon, 19 Dec 2022 20:33:20 +0530

amit.gupta – 2 file(s) modified
Fixed issue with stock avaialbility

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryService.java

Rev 31327 – Removed pending payments while finding sellin

amit.gupta — Mon, 19 Dec 2022 20:30:07 +0530

amit.gupta – 1 file(s) modified
Removed pending payments while finding sellin

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

Rev 31326 – Fixed Availablity logic

amit.gupta — Mon, 19 Dec 2022 20:20:15 +0530

amit.gupta – 6 file(s) modified
Fixed Availablity logic

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicCISTableRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicCISTableRepositoryImpl.java
~ /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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 31325 – Fixed deals count

amit.gupta — Mon, 19 Dec 2022 19:36:04 +0530

amit.gupta – 1 file(s) modified
Fixed deals count

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

Rev 31324 – Fixed deals count

amit.gupta — Mon, 19 Dec 2022 18:50:41 +0530

amit.gupta – 2 file(s) modified
Fixed deals count

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

Rev 31323 –

tejbeer — Mon, 19 Dec 2022 17:29:09 +0530

tejbeer – 1 file(s) modified

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

Rev 31322 –

tejbeer — Mon, 19 Dec 2022 16:43:37 +0530

tejbeer – 3 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js