SmartDukaan – /

Rev 33973 – Added super catalogs

tejus.lohani — Thu, 21 Nov 2024 19:04:32 +0530

tejus.lohani – 37 file(s) modified
Added super catalogs

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SuperCatalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/SuperCatalogMapping.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SuperCatalogModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SuperCatalogRequestModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/FofoCatalogResponse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/OxigenRechargeProviderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/ThinkWalnutDigitalRechargeProviderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/reportico
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/reportico/ReporticoService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/reportico/ReporticoServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SshServer/SSHServiceImpl.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/java/com/spice/profitmandi/web/controller/ReporticoController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SuperCatalogController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/super_catalog.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/edit.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/content.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reportico
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reportico/content.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reportico/index.vm

Rev 33972 – $request changed with required name

aman.kumar — Thu, 21 Nov 2024 19:03:09 +0530

aman.kumar – 1 file(s) modified
$request changed with required name

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/visit-request-plan.vm

Rev 33971 – $request changed with required name

aman.kumar — Thu, 21 Nov 2024 18:51:58 +0530

aman.kumar – 4 file(s) modified
$request changed with required name

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal-approve.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refferal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/select-item-color.vm

Rev 33970 – $request changed with required name

aman.kumar — Thu, 21 Nov 2024 18:41:07 +0530

aman.kumar – 3 file(s) modified
$request changed with required name

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-inactive.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm

Rev 33969 – $request changed with required name

aman.kumar — Thu, 21 Nov 2024 18:24:45 +0530

aman.kumar – 5 file(s) modified
$request changed with required name

~ /trunk/profitmandi-dao/src/main/resources/order-cancellation.vm
~ /trunk/profitmandi-dao/src/main/resources/order-confirm.vm
~ /trunk/profitmandi-dao/src/main/resources/order-delivered.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-activate-stock.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-cancel-order-modal.vm

Rev 33968 – upsell live for archana ramola

ranu — Thu, 21 Nov 2024 17:51:59 +0530

ranu – 4 file(s) modified
upsell live for archana ramola

~ /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/NotificationServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/UpSaleController.java

Rev 33967 – $request changed with required name

aman.kumar — Thu, 21 Nov 2024 17:13:59 +0530

aman.kumar – 6 file(s) modified
$request changed with required name

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/live_demo_billing.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthly-target-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notification-template.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify-order-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/notify_cancel_order_modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/online-all-order-item.vm

Rev 33966 – $request changed with required name

aman.kumar — Thu, 21 Nov 2024 15:35:52 +0530

aman.kumar – 12 file(s) modified
$request changed with required name

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused-model-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/focused_model.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/high_demand_item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/hygiene.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-wise-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/itemwise-po.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-close.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead_activity_modal.vm

Rev 33965 – ticket category trainning added on partner id map

ranu — Thu, 21 Nov 2024 15:12:42 +0530

ranu – 1 file(s) modified
ticket category trainning added on partner id map

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

Rev 33964 – mtd and today target data query correction

ranu — Thu, 21 Nov 2024 13:21:58 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33963 – error getting on today po

ranu — Thu, 21 Nov 2024 13:13:52 +0530

ranu – 1 file(s) modified
error getting on today po

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

Rev 33962 – mtd and today target data query correction

ranu — Thu, 21 Nov 2024 12:51:21 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33961 – ui corredction

ranu — Thu, 21 Nov 2024 12:40:06 +0530

ranu – 1 file(s) modified
ui corredction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33960 – mtd and today target data query correction

ranu — Thu, 21 Nov 2024 12:29:49 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33959 – $request replace with related variables in vm files

aman.kumar — Thu, 21 Nov 2024 11:58:46 +0530

aman.kumar – 5 file(s) modified
$request replace with related variables in vm files

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-combo.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/feature-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/feature.vm

Rev 33958 – ui rbm arr

ranu — Thu, 21 Nov 2024 11:49:55 +0530

ranu – 1 file(s) modified
ui rbm arr

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33957 – categorisation movement method update

ranu — Wed, 20 Nov 2024 19:47:20 +0530

ranu – 1 file(s) modified
categorisation movement method update

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

Rev 33956 – mtd and today target data query correction

ranu — Wed, 20 Nov 2024 17:08:50 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33955 – mtd and today target data query correction

ranu — Wed, 20 Nov 2024 16:59:46 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33954 – activated imei

aman.kumar — Wed, 20 Nov 2024 16:50:40 +0530

aman.kumar – 1 file(s) modified
activated imei

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

Rev 33953 – mtd and today target data query correction

ranu — Wed, 20 Nov 2024 16:48:10 +0530

ranu – 5 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po_rbm.vm

Rev 33952 – activated imei

aman.kumar — Wed, 20 Nov 2024 16:12:19 +0530

aman.kumar – 4 file(s) modified
activated imei

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

Rev 33951 – mtd and today target ui correction

ranu — Wed, 20 Nov 2024 11:13:11 +0530

ranu – 1 file(s) modified
mtd and today target ui correction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33950 – mtd and today target data query correction

ranu — Wed, 20 Nov 2024 11:11:46 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33949 – mtd and today target data query correction

ranu — Tue, 19 Nov 2024 20:04:39 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33948 – mtd and today target data query correction

ranu — Tue, 19 Nov 2024 18:33:56 +0530

ranu – 2 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CategorisedCatalog.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseMobileStockByMovementModel.java

Rev 33947 – mtd and today target data query correction

ranu — Tue, 19 Nov 2024 15:57:36 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 33946 – ui correction Arr

ranu — Tue, 19 Nov 2024 11:57:22 +0530

ranu – 1 file(s) modified
ui correction Arr

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33945 – ui corredtion in arr

ranu — Tue, 19 Nov 2024 11:50:09 +0530

ranu – 1 file(s) modified
ui corredtion in arr

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33944 – mtd and today target data query correction

ranu — Tue, 19 Nov 2024 11:45:39 +0530

ranu – 3 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayAchievedMovementModel.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33943 – persisit today targets

ranu — Mon, 18 Nov 2024 16:54:13 +0530

ranu – 1 file(s) modified
persisit today targets

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

Rev 33942 – total in show rbm arr ui

ranu — Mon, 18 Nov 2024 15:27:50 +0530

ranu – 1 file(s) modified
total in show rbm arr ui

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33941 – mtd and today target data query correction

ranu — Mon, 18 Nov 2024 14:43:08 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33940 – mtd and today target data query correction

ranu — Mon, 18 Nov 2024 12:38:24 +0530

ranu – 3 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MTDAchievedTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayAchievedMovementModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseRbmTargetModel.java

Rev 33939 – mtd and today target data query correction

ranu — Sat, 16 Nov 2024 17:12:11 +0530

ranu – 4 file(s) modified
mtd and today target data query correction

Rev 33938 – add null check at line 426 if locality is null

tejus.lohani — Sat, 16 Nov 2024 17:04:57 +0530

tejus.lohani – 1 file(s) modified
add null check at line 426 if locality is null

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

Rev 33937 – Fixed combo logic

amit.gupta — Sat, 16 Nov 2024 15:43:00 +0530

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

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

Rev 33936 – billing address id logg

ranu — Sat, 16 Nov 2024 12:10:18 +0530

ranu – 1 file(s) modified
billing address id logg

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

Rev 33935 – locality set

ranu — Sat, 16 Nov 2024 11:34:29 +0530

ranu – 1 file(s) modified
locality set

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

Rev 33934 – mtd and today target data query correction

ranu — Sat, 16 Nov 2024 02:09:14 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm