SmartDukaan – /

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

Rev 32206 – Removed Kanan

amit.gupta — Fri, 14 Jul 2023 12:03:58 +0530

amit.gupta – 2 file(s) modified
Removed Kanan

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

Rev 32205 – Fixed additional scheme logic

amit.gupta — Thu, 13 Jul 2023 16:02:34 +0530

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

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

Rev 32204 – Fixed additional scheme logic

amit.gupta — Thu, 13 Jul 2023 15:54:49 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/resources/offer_margin_detail_partner.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_notify.vm (copied from /trunk/profitmandi-fofo/src/main/resources/offer_margin_detail_partner.vm@32202)

Rev 32203 – Fixed additional scheme logic

amit.gupta — Thu, 13 Jul 2023 13:42:02 +0530

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

+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm

Rev 32202 – Fixed image rendering issue caused by not escaping html special ...

amit.gupta — Thu, 13 Jul 2023 11:07:20 +0530

amit.gupta – 3 file(s) modified
Fixed image rendering issue caused by not escaping html special chars

~ /trunk/profitmandi-fofo/src/main/resources/offer_margin_detail_partner.vm
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner2.vm

Rev 32201 – Fixed additional scheme logic

amit.gupta — Wed, 12 Jul 2023 21:31:15 +0530

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

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

Rev 32200 – Fixed additional scheme logic

amit.gupta — Wed, 12 Jul 2023 20:56:51 +0530

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

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

Rev 32199 – Fixed additional scheme logic

amit.gupta — Wed, 12 Jul 2023 20:55:52 +0530

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

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

Rev 32198 – Fixed image generation issue with Velocity

amit.gupta — Wed, 12 Jul 2023 20:31:43 +0530

amit.gupta – 2 file(s) modified
Fixed image generation issue with Velocity

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

Rev 32197 – partner wise loan summary

jai.hind — Wed, 12 Jul 2023 18:23:58 +0530

jai.hind – 4 file(s) modified
partner wise loan summary

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/LoanSummaryType.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-wise-loan-summary.vm

Rev 32196 – Fixed additional scheme logic

amit.gupta — Tue, 11 Jul 2023 13:08:15 +0530

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

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

Rev 32195 –

tejbeer — Mon, 10 Jul 2023 17:53:55 +0530

tejbeer – 2 file(s) modified

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

Rev 32194 – change

tejbeer — Mon, 10 Jul 2023 17:52:26 +0530

tejbeer – 5 file(s) modified
change

~ /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/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/VendorController.java

Rev 32193 –

tejbeer — Mon, 10 Jul 2023 11:52:26 +0530

tejbeer – 2 file(s) modified

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

Rev 32192 – grn

tejbeer — Mon, 10 Jul 2023 11:35:21 +0530

tejbeer – 30 file(s) modified
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/InvoiceItemModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemQtyModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WarehouseInvoiceModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WarehouseInvoicePurchaseModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/WarehousePurchaseModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.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/WarehousePurchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseScan.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/enumuration/warehouse
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/warehouse/WarehouseInvoiceStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseNewReceiveInvoiceModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepositoryImpl.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/WarehousePurchaseOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseOrderRepositoryImpl.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-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/warehouse-invoice-validate-purchase.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-invoice-add-item.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm

Rev 32191 – change

tejbeer — Fri, 07 Jul 2023 15:13:44 +0530

tejbeer – 2 file(s) modified
change

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DigifyRetailerModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/digify/DigifyController.java

Rev 32190 – Fixed additional scheme logic

amit.gupta — Fri, 07 Jul 2023 12:10:46 +0530

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

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

Rev 32189 – Added Oppo Scheduler to process activation information

amit.gupta — Thu, 06 Jul 2023 15:51:39 +0530

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

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

Rev 32188 – Added Oppo Scheduler to process activation information

amit.gupta — Sun, 02 Jul 2023 17:43:10 +0530

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

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/config/DBConfig.java

Rev 32187 – Fixed additional scheme logic

amit.gupta — Sun, 02 Jul 2023 17:42:48 +0530

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

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

Rev 32186 – Fixed additional scheme logic

amit.gupta — Sun, 02 Jul 2023 17:38:41 +0530

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

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