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

Rev 33907 – Fixed case when no offers are running

amit.gupta — Mon, 04 Nov 2024 12:19:54 +0530

amit.gupta – 1 file(s) modified
Fixed case when no offers are running

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

Rev 33822 – fix upgrade offer by end Date

ranu — Mon, 30 Sep 2024 11:12:55 +0530

ranu – 2 file(s) modified
fix upgrade offer by end Date

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

Rev 33818 – fix upgrade offer by end Date

ranu — Fri, 27 Sep 2024 21:16:10 +0530

ranu – 2 file(s) modified
fix upgrade offer by end Date

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

Rev 33795 – upgrade offer live

ranu — Tue, 24 Sep 2024 23:24:27 +0530

ranu – 21 file(s) modified
upgrade offer live

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/OfferType.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CustomerOfferItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/UpgradeOffer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CustomerOfferItemModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/UpgradeOfferRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/UpgradeOfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-offer.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/customer-offer.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upgrade-customer-offer-model.vm

Rev 33715 – upsell phase one completed with whole code

ranu — Thu, 29 Aug 2024 11:22:14 +0530

ranu – 35 file(s) modified
upsell phase one completed with whole code

~ /trunk/profitmandi-dao/build.gradle
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleAgentCollection.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleCall.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpSaleOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellCallDetail.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellRazorpayPaymentStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/UpSaleCallStatus.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
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleAgentCollectionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleAgentCollectionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleCallRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleCallRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleOrderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSaleOrderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSellCallDetailRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSellCallDetailRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpsellRazorpayPaymentStatusRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSellRazorpayPaymentStatusRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/kommuno/KommunoService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/RazorpayPaymentService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/UpSaleController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-pending-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/suggested-monthly-po.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/up-sale.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/up-sale-call.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upsale-create-insurance-model.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upsell-payment-confirmation.vm

Rev 33696 – Added changes related to Narration and fixing loan creation while ...

amit.gupta — Fri, 23 Aug 2024 10:33:02 +0530

amit.gupta – 9 file(s) modified
Added changes related to Narration and fixing loan creation while billing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 33687 – Fixed wallet

amit.gupta — Tue, 20 Aug 2024 17:50:09 +0530

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

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

Rev 33437 – b2c online order process modified

ranu — Thu, 06 Jun 2024 11:51:47 +0530

ranu – 6 file(s) modified
b2c online order process 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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm

Rev 33419 – Changes related to order

amit.gupta — Sat, 01 Jun 2024 17:09:47 +0530

amit.gupta – 6 file(s) modified
Changes related to order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail-row.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail.vm

Rev 33400 – complete spilit order and payment by l2 of pending order ...

ranu — Mon, 27 May 2024 14:50:01 +0530

ranu – 11 file(s) modified
complete spilit order and payment by l2 of pending order item

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/billed_order_item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/claim_raised_order_item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/settled_order_item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled_order_item.vm

Rev 33374 – add search box on change partner

ranu — Wed, 15 May 2024 17:43:41 +0530

ranu – 2 file(s) modified
add search box on change partner

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/change-partner-po.vm

Rev 33367 – fix webOffer layout and fix online order change by pincode

ranu — Mon, 13 May 2024 13:40:53 +0530

ranu – 9 file(s) modified
fix webOffer layout and fix online order change by pincode

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/BrandRegionMapping.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/web-offer-product.vm

Rev 33336 – bulk order reject and money refund code

tejus.lohani — Wed, 08 May 2024 15:44:26 +0530

tejus.lohani – 1 file(s) modified
bulk order reject and money refund code

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

Rev 33247 – warehouse billing phase one and added signature exception

ranu — Sat, 20 Apr 2024 14:12:25 +0530

ranu – 99 file(s) modified
warehouse billing phase one and added signature exception

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionShipmentSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/MenuRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.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/OfferTargetSlabRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerTagRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SamsungUpgradeOfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SamsungUpgradeOfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationCampaignRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeOperatorRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeOperatorRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeProviderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeProviderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ShopAddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ShopAddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.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-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorItemPricingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorItemPricingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyCancelOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyCancelOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyColorChangeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyColorChangeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyOrderRespository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/NotifyOrderRespositoryImpl.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-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionShipmentSequenceRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionShipmentSequenceRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMappingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMappingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMasterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMasterRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.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/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/UserServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MessageController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/logistics.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction-detail.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-management.vm

Rev 33219 – work on bulk order

tejus.lohani — Fri, 12 Apr 2024 17:30:38 +0530

tejus.lohani – 2 file(s) modified
work on bulk order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 33213 – new feature -Bulk order and Approval add our System

tejus.lohani — Fri, 12 Apr 2024 12:16:57 +0530

tejus.lohani – 18 file(s) modified
new feature -Bulk order and Approval add our System

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/LineItemModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TransctionApprovalModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionApproval.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/TransactionApprovalStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionApprovalRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionApprovalRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/TransactionApprovalService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionApprovalServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/transaction-approval.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk-order.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update_PartnerCriteria.vm

Rev 33172 – add bulk order service in admin dashboard

tejus.lohani — Sat, 30 Mar 2024 16:09:22 +0530

tejus.lohani – 11 file(s) modified
add bulk order service in admin dashboard

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/BulkOrderModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/CartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/placement-plan.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk_order.vm

Rev 33102 – FIX reports Download problem (download report was Empty) on admin ...

tejus.lohani — Fri, 15 Mar 2024 12:26:20 +0530

tejus.lohani – 3 file(s) modified
FIX reports Download problem (download report was Empty) on admin dashboard

Rev 33092 – Add partner reports option on side bar of Admin Dashboard

tejus.lohani — Wed, 13 Mar 2024 17:15:53 +0530

tejus.lohani – 9 file(s) modified
Add partner reports option on side bar of Admin Dashboard

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 33091 – scheme and offer report

shampa — Wed, 13 Mar 2024 16:57:40 +0530

shampa – 4 file(s) modified
scheme and offer report

Rev 33067 – reports fetch and requested by in add wallet

shampa — Thu, 07 Mar 2024 19:46:23 +0530

shampa – 11 file(s) modified
reports fetch and requested by in add wallet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AddWalletRequest.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-billing-summary-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 33010 – offer payout dumb report created new ui and api , ...

shampa — Tue, 27 Feb 2024 18:55:21 +0530

shampa – 7 file(s) modified
offer payout dumb report created new ui and api , and my sales add fetch report api

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer-payout-dump-report.vm

Rev 32908 – download report

shampa — Fri, 02 Feb 2024 11:38:40 +0530

shampa – 1 file(s) modified
download report

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

Rev 32855 – Added changes related to smartdukaan.

amit.gupta — Tue, 16 Jan 2024 17:28:40 +0530

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

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

Rev 32761 – Fixed devki issue

amit.gupta — Thu, 21 Dec 2023 11:37:02 +0530

amit.gupta – 1 file(s) modified
Fixed devki issue

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

Rev 32758 – Fixed missing orders

amit.gupta — Wed, 20 Dec 2023 15:49:53 +0530

amit.gupta – 1 file(s) modified
Fixed missing orders

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

Rev 32757 – Fixed missing orders

amit.gupta — Wed, 20 Dec 2023 15:45:47 +0530

amit.gupta – 1 file(s) modified
Fixed missing orders

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

Rev 32756 – Fixed missing orders

amit.gupta — Wed, 20 Dec 2023 15:35:56 +0530

amit.gupta – 2 file(s) modified
Fixed missing orders

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending_fofo_order.vm

Rev 32750 – online pending order aasign to partner

ranu — Tue, 19 Dec 2023 15:30:25 +0530

ranu – 3 file(s) modified
online pending order aasign to partner

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/zest/InsuranceServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 32731 – online order is not showing

ranu — Thu, 14 Dec 2023 11:40:56 +0530

ranu – 3 file(s) modified
online order is not showing

Rev 32711 – removed tr

amit.gupta — Mon, 11 Dec 2023 11:23:14 +0530

amit.gupta – 1 file(s) modified
removed tr

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

Rev 32710 – Added Logging

amit.gupta — Mon, 11 Dec 2023 11:15:10 +0530

amit.gupta – 1 file(s) modified
Added Logging

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

Rev 32697 – vendor info not coming in online order (fixed)

ranu — Tue, 05 Dec 2023 14:48:39 +0530

ranu – 4 file(s) modified
vendor info not coming in online order (fixed)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-order-item.vm

Rev 32637 – Fixed address issue

amit.gupta — Thu, 16 Nov 2023 16:16:31 +0530

amit.gupta – 1 file(s) modified
Fixed address issue

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

Rev 32627 – order and invoice genrate without address select

ranu — Fri, 10 Nov 2023 17:52:07 +0530

ranu – 5 file(s) modified
order and invoice genrate without address select

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm

Rev 32508 – Fixed whatsapp message sent logic

amit.gupta — Sat, 07 Oct 2023 15:29:35 +0530

amit.gupta – 2 file(s) modified
Fixed whatsapp message sent logic

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

Rev 32409 – Fixed whatsapp logic

amit.gupta — Thu, 07 Sep 2023 09:42:36 +0530

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

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

Rev 32405 – Whatsapp Message

jai.hind — Wed, 06 Sep 2023 15:24:24 +0530

jai.hind – 11 file(s) modified
Whatsapp Message

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/whatsapp
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/whatsapp/WhatsappMessage.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/whatsapp
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/whatsapp/WhatsappMessageRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/whatsapp/WhatsappMessageRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappMessageService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/whatsapp/WhatsappMessageServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

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 32271 – Fixed additional scheme logic

amit.gupta — Mon, 31 Jul 2023 23:11:16 +0530

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

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