SmartDukaan – /

Rev 32983 – Uncommenting auto generation

amit.gupta — Mon, 26 Feb 2024 16:24:53 +0530

amit.gupta – 1 file(s) modified
Uncommenting auto generation

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

Rev 32982 – Three invoices are processed every batch

amit.gupta — Mon, 26 Feb 2024 15:47:49 +0530

amit.gupta – 1 file(s) modified
Three invoices are processed every batch

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

Rev 32981 – Fixed bug regarding

amit.gupta — Mon, 26 Feb 2024 15:18:30 +0530

amit.gupta – 1 file(s) modified
Fixed bug regarding

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 32980 – Added IRNs to invoice scheduled to rewrite files to /SaholicInvoices

amit.gupta — Mon, 26 Feb 2024 13:18:41 +0530

amit.gupta – 6 file(s) modified
Added IRNs to invoice scheduled to rewrite files to /SaholicInvoices

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InvoicePdfModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/IrnModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 32979 – Fixed changes related to offer.

amit.gupta — Thu, 22 Feb 2024 16:15:56 +0530

amit.gupta – 8 file(s) modified
Fixed changes related to offer.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TargetSlabEntity.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemCriteriaPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme_offer.vm

Rev 32978 – Checked in some basic resources

amit.gupta — Wed, 21 Feb 2024 20:02:31 +0530

amit.gupta – 6 file(s) modified
Checked in some basic resources

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/auth/CollectionRemark.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 32977 – Fixed store

amit.gupta — Wed, 21 Feb 2024 19:56:16 +0530

amit.gupta – 6 file(s) modified
Fixed store

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/SmartPingAgentModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/smartping/SmartPingService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java

Rev 32976 – update timestamp

shampa — Tue, 20 Feb 2024 17:16:16 +0530

shampa – 1 file(s) modified
update timestamp

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm

Rev 32975 – Fixed time format

amit.gupta — Tue, 20 Feb 2024 15:38:41 +0530

amit.gupta – 1 file(s) modified
Fixed time format

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

Rev 32974 – Fixed changes

amit.gupta — Tue, 20 Feb 2024 13:50:06 +0530

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

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

Rev 32973 – Fixed changes related to shipping upload should not be before ...

amit.gupta — Mon, 19 Feb 2024 13:45:20 +0530

amit.gupta – 1 file(s) modified
Fixed changes related to shipping upload should not be before billing date

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

Rev 32972 – Fixed region specific schemes dicounted value thats erronously extended to ...

amit.gupta — Sat, 17 Feb 2024 19:32:03 +0530

amit.gupta – 3 file(s) modified
Fixed region specific schemes dicounted value thats erronously extended to all retailers

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /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

Rev 32971 – Added changes related to PartnertType sale... Overall sale of single ...

amit.gupta — Sat, 17 Feb 2024 18:01:39 +0530

amit.gupta – 1 file(s) modified
Added changes related to PartnertType sale... Overall sale of single GST should have PartnerTypeCategory as total sum

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java

Rev 32970 – Added accessories to take values automatically for internal movement

amit.gupta — Sat, 17 Feb 2024 17:58:27 +0530

amit.gupta – 1 file(s) modified
Added accessories to take values automatically for internal movement

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

Rev 32969 – Changed billing date to 90 days

amit.gupta — Sat, 17 Feb 2024 17:40:41 +0530

amit.gupta – 1 file(s) modified
Changed billing date to 90 days

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

Rev 32968 – Fixed changes

amit.gupta — Wed, 14 Feb 2024 18:07:31 +0530

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

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

Rev 32967 – Fixed changes

amit.gupta — Wed, 14 Feb 2024 17:56:10 +0530

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

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

Rev 32966 – Fixed changes

amit.gupta — Wed, 14 Feb 2024 17:47:23 +0530

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

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

Rev 32965 – Fixed changes

amit.gupta — Wed, 14 Feb 2024 17:17:17 +0530

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

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

Rev 32964 – Fixed changes

amit.gupta — Wed, 14 Feb 2024 16:05:33 +0530

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

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

Rev 32963 – Fixed changes

amit.gupta — Wed, 14 Feb 2024 15:25:55 +0530

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

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

Rev 32962 – Fixed minor bug

amit.gupta — Wed, 14 Feb 2024 15:14:24 +0530

amit.gupta – 1 file(s) modified
Fixed minor bug

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

Rev 32961 – added migration to valentine

amit.gupta — Wed, 14 Feb 2024 12:50:10 +0530

amit.gupta – 3 file(s) modified
added migration to valentine

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 32960 – Added Changes related to promotion

amit.gupta — Tue, 13 Feb 2024 20:23:15 +0530

amit.gupta – 5 file(s) modified
Added Changes related to promotion

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/ScratchedGift.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/RandomCollection.java

Rev 32959 – Fixed changes

amit.gupta — Tue, 13 Feb 2024 14:57:07 +0530

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

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

Rev 32958 – Fixed changes

amit.gupta — Tue, 13 Feb 2024 13:32:37 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java

Rev 32957 – Fixed changes

amit.gupta — Tue, 13 Feb 2024 13:11:15 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java

Rev 32956 – Done

amit.gupta — Tue, 13 Feb 2024 12:58:04 +0530

amit.gupta – 2 file(s) modified
Done

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/feature.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/content.vm

Rev 32955 – Fixed changes

amit.gupta — Tue, 13 Feb 2024 12:51:30 +0530

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

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

Rev 32954 – Fixed changes

amit.gupta — Tue, 13 Feb 2024 12:47:57 +0530

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

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java

Rev 32953 – Handled dtrUser email/mobile cant be duplicated

amit.gupta — Tue, 13 Feb 2024 12:25:39 +0530

amit.gupta – 2 file(s) modified
Handled dtrUser email/mobile cant be duplicated

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java

Rev 32952 – Added Item bulk uplaoder

amit.gupta — Tue, 13 Feb 2024 11:47:47 +0530

amit.gupta – 6 file(s) modified
Added Item bulk uplaoder

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ItemType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java

Rev 32951 – AA

amit.gupta — Mon, 12 Feb 2024 21:00:40 +0530

amit.gupta – 1 file(s) modified
AA

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

Rev 32950 – Offer payout change

amit.gupta — Mon, 12 Feb 2024 17:26:26 +0530

amit.gupta – 2 file(s) modified
Offer payout change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OfferPayoutDumpReportModel.java

Rev 32949 – query offfer payout dump

shampa — Mon, 12 Feb 2024 16:38:09 +0530

shampa – 4 file(s) modified
query offfer payout dump

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/OfferPayoutDumpReportModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java

Rev 32948 – Fixed bug regarding

amit.gupta — Mon, 12 Feb 2024 14:01:00 +0530

amit.gupta – 1 file(s) modified
Fixed bug regarding

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

Rev 32947 – Fixed issue with credit settlement

amit.gupta — Mon, 12 Feb 2024 13:46:59 +0530

amit.gupta – 2 file(s) modified
Fixed issue with credit settlement

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java

Rev 32946 – Fixed Order related bug

amit.gupta — Sat, 10 Feb 2024 16:21:10 +0530

amit.gupta – 1 file(s) modified
Fixed Order related bug

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-order-customer-details.js

Rev 32945 – code committed for agent map on constant

ranu — Sat, 10 Feb 2024 14:57:29 +0530

ranu – 2 file(s) modified
code committed for agent map on constant

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

Rev 32944 – Fixed order modal and cancellation logic

amit.gupta — Fri, 09 Feb 2024 17:54:05 +0530

amit.gupta – 2 file(s) modified
Fixed order modal and cancellation logic

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cancel-order-modal.vm