SmartDukaan – /

Rev 33243 – add signature of profitmandi exception

ranu — Sat, 20 Apr 2024 13:42:39 +0530

ranu – 11 file(s) modified
add signature of profitmandi exception

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/BrandAgeingLimit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandsRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/BrandsRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ApiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ApiRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/BrandsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BrandPCMController.java

Rev 33242 – Added changes to hold

amit.gupta — Fri, 19 Apr 2024 19:01:06 +0530

amit.gupta – 1 file(s) modified
Added changes to hold

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

Rev 33241 – Added changes to hold

amit.gupta — Fri, 19 Apr 2024 17:36:32 +0530

amit.gupta – 1 file(s) modified
Added changes to hold

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

Rev 33240 – Added changes to hold

amit.gupta — Fri, 19 Apr 2024 17:32:12 +0530

amit.gupta – 1 file(s) modified
Added changes to hold

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

Rev 33239 – Fixed changes related to warehouse management

amit.gupta — Fri, 19 Apr 2024 13:47:22 +0530

amit.gupta – 12 file(s) modified
Fixed changes related to warehouse management

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseScan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/transaction/OrderBillingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.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/warehouse/PurchaseOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryServiceImpl.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

Rev 33238 – Fixed wallet statement changes

amit.gupta — Fri, 19 Apr 2024 13:30:53 +0530

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

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

Rev 33237 – Build is breaking fixed it

amit.gupta — Thu, 18 Apr 2024 13:00:28 +0530

amit.gupta – 1 file(s) modified
Build is breaking fixed it

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

Rev 33236 – Margins would be held for partners that are inactive. Credit ...

amit.gupta — Thu, 18 Apr 2024 12:47:26 +0530

amit.gupta – 3 file(s) modified
Margins would be held for partners that are inactive.
Credit note shall be disbursed for all partners irrespective of being active or inactive

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/PriceDropImeiStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java

Rev 33235 – Added Structure for Billing from new System

amit.gupta — Thu, 18 Apr 2024 11:10:58 +0530

amit.gupta – 1 file(s) modified
Added Structure for Billing from new System

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionShipmentSequence.java

Rev 33234 – Added Structure for Billing from new System

amit.gupta — Wed, 17 Apr 2024 19:47:38 +0530

amit.gupta – 5 file(s) modified
Added Structure for Billing from new System

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/transaction
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/transaction/OrderBillingModel.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-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java

Rev 33233 – Fixed changes related to pending order search

amit.gupta — Wed, 17 Apr 2024 17:35:08 +0530

amit.gupta – 3 file(s) modified
Fixed changes related to pending order search

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js

Rev 33232 – Added new warehouse

amit.gupta — Wed, 17 Apr 2024 14:38:52 +0530

amit.gupta – 1 file(s) modified
Added new warehouse

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

Rev 33231 – Fixed Utils removed Thrift dependencies

amit.gupta — Tue, 16 Apr 2024 21:58:21 +0530

amit.gupta – 1 file(s) modified
Fixed Utils removed Thrift dependencies

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

Rev 33230 – Fixed free days logic in case of sanctions

amit.gupta — Tue, 16 Apr 2024 21:54:15 +0530

amit.gupta – 1 file(s) modified
Fixed free days logic in case of sanctions

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

Rev 33229 – Changed format added Running balance

amit.gupta — Tue, 16 Apr 2024 19:40:55 +0530

amit.gupta – 1 file(s) modified
Changed format added Running balance

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

Rev 33228 – Changed format added Running balance

amit.gupta — Tue, 16 Apr 2024 19:31:20 +0530

amit.gupta – 1 file(s) modified
Changed format added Running balance

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

Rev 33227 – Changed format added Running balance

amit.gupta — Tue, 16 Apr 2024 19:27:56 +0530

amit.gupta – 1 file(s) modified
Changed format added Running balance

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

Rev 33226 – Changed format added Running balance

amit.gupta — Tue, 16 Apr 2024 18:07:06 +0530

amit.gupta – 2 file(s) modified
Changed format added Running balance

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/resources/account-statement.xlsx

Rev 33225 – Fixed account statemnet

amit.gupta — Tue, 16 Apr 2024 15:11:35 +0530

amit.gupta – 4 file(s) modified
Fixed account statemnet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.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/WalletController.java

Rev 33224 – Previous purchases

amit.gupta — Tue, 16 Apr 2024 13:06:36 +0530

amit.gupta – 1 file(s) modified
Previous purchases

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/reports

Rev 33223 – Previous purchases

amit.gupta — Mon, 15 Apr 2024 16:23:30 +0530

amit.gupta – 1 file(s) modified
Previous purchases

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

Rev 33222 – changed request to lead

amit.gupta — Mon, 15 Apr 2024 16:06:51 +0530

amit.gupta – 2 file(s) modified
changed request to lead

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

Rev 33221 – Merged Lead controller

amit.gupta — Sat, 13 Apr 2024 19:35:57 +0530

amit.gupta – 1 file(s) modified
Merged Lead controller

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

Rev 33220 – Fixed account statement

amit.gupta — Sat, 13 Apr 2024 08:33:15 +0530

amit.gupta – 3 file(s) modified
Fixed account statement

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.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 33218 – Previous purchases

amit.gupta — Fri, 12 Apr 2024 15:53:40 +0530

amit.gupta – 1 file(s) modified
Previous purchases

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

Rev 33217 – Previous purchases

amit.gupta — Fri, 12 Apr 2024 15:46:18 +0530

amit.gupta – 1 file(s) modified
Previous purchases

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

Rev 33216 – fixed issue for custom price bulk order

tejus.lohani — Fri, 12 Apr 2024 15:40:06 +0530

tejus.lohani – 1 file(s) modified
fixed issue for custom price bulk order

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

Rev 33215 – new version 218

tejus.lohani — Fri, 12 Apr 2024 12:21:13 +0530

tejus.lohani – 1 file(s) modified
new version 218

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

Rev 33214 – add new js for transaction Approval

tejus.lohani — Fri, 12 Apr 2024 12:18:21 +0530

tejus.lohani – 1 file(s) modified
add new js for transaction Approval

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

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 33212 – Added implementation

amit.gupta — Fri, 12 Apr 2024 11:24:54 +0530

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

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

Rev 33211 – Added pending indent by date method

amit.gupta — Fri, 12 Apr 2024 11:02:36 +0530

amit.gupta – 2 file(s) modified
Added pending indent by date method

~ /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

Rev 33210 – method change auth by gmail to email and last resolution ...

ranu — Thu, 11 Apr 2024 17:38:11 +0530

ranu – 2 file(s) modified
method change auth by gmail to email and last resolution message updated on chat history

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java

Rev 33209 – Now would give one month data

amit.gupta — Thu, 11 Apr 2024 16:37:10 +0530

amit.gupta – 2 file(s) modified
Now would give one month data

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/statistics-authsuccess.vm

Rev 33208 – Previous purchases

amit.gupta — Thu, 11 Apr 2024 16:05:07 +0530

amit.gupta – 1 file(s) modified
Previous purchases

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

Rev 33207 – Previous purchases

amit.gupta — Thu, 11 Apr 2024 15:44:14 +0530

amit.gupta – 1 file(s) modified
Previous purchases

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

Rev 33206 – Added selectAll method

amit.gupta — Thu, 11 Apr 2024 14:57:07 +0530

amit.gupta – 2 file(s) modified
Added selectAll method

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CreditNoteRepositoryImpl.java

Rev 33205 – Fixed sidbi issue

amit.gupta — Thu, 11 Apr 2024 14:47:00 +0530

amit.gupta – 3 file(s) modified
Fixed sidbi issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 33204 – attatch recording on tome of chat

ranu — Thu, 11 Apr 2024 12:20:54 +0530

ranu – 4 file(s) modified
attatch recording on tome of chat

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TicketChatActivityController.java