SmartDukaan – /

Rev 24523 – 1. Added Wallet Summary for internal users. 2. Added icon ...

amit.gupta — Mon, 18 Feb 2019 16:46:51 +0530

amit.gupta – 6 file(s) modified
1. Added Wallet Summary for internal users.
2. Added icon for CRM

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/line-icons.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/icons/care1.jpg
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm

Rev 24522 –

govind — Mon, 18 Feb 2019 15:26:57 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-sub-categories.vm

Rev 24521 –

amit.gupta — Thu, 14 Feb 2019 18:03:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/view/xls/WalletStatementView.java

Rev 24520 –

amit.gupta — Thu, 14 Feb 2019 17:58:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 24519 –

amit.gupta — Thu, 14 Feb 2019 16:49:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 24518 –

amit.gupta — Thu, 14 Feb 2019 16:44:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 24517 – Removed canvas

amit.gupta — Thu, 14 Feb 2019 16:39:04 +0530

amit.gupta – 1 file(s) modified
Removed canvas

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

Rev 24516 – Fixed

amit.gupta — Thu, 14 Feb 2019 07:25:50 +0530

amit.gupta – 2 file(s) modified
Fixed

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/resources/cancelled.png

Rev 24515 –

amit.gupta — Thu, 14 Feb 2019 07:17:55 +0530

amit.gupta – 1 file(s) modified

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

Rev 24514 –

amit.gupta — Thu, 14 Feb 2019 07:13:28 +0530

amit.gupta – 1 file(s) modified

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

Rev 24513 –

amit.gupta — Thu, 14 Feb 2019 07:10:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 24512 – Fixed closing balance

amit.gupta — Wed, 13 Feb 2019 14:36:45 +0530

amit.gupta – 1 file(s) modified
Fixed closing balance

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/view/xls/WalletStatementView.java

Rev 24511 –

amit.gupta — Wed, 13 Feb 2019 14:10:46 +0530

amit.gupta – 1 file(s) modified

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

Rev 24510 –

amit.gupta — Wed, 13 Feb 2019 13:40:10 +0530

amit.gupta – 1 file(s) modified

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

Rev 24509 – Added Wallet Statement

amit.gupta — Wed, 13 Feb 2019 11:00:44 +0530

amit.gupta – 15 file(s) modified
Added Wallet Statement

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ReporticoUrlInfo.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
+ /trunk/profitmandi-common/src/main/resources/cancelled.png
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.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-fofo/build.gradle
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reportico-input-params.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reports.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm

Rev 24508 –

amit.gupta — Wed, 13 Feb 2019 10:58:41 +0530

amit.gupta – 3 file(s) modified

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/view
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/view/xls
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/view/xls/WalletStatementView.java

Rev 24507 –

amit.gupta — Wed, 13 Feb 2019 09:40:28 +0530

amit.gupta – 1 file(s) modified

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

Rev 24506 – Added changes for Cancelled

amit.gupta — Wed, 13 Feb 2019 07:33:03 +0530

amit.gupta – 1 file(s) modified
Added changes for Cancelled

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

Rev 24505 – Fixed Sales report for the day.

amit.gupta — Tue, 12 Feb 2019 13:27:16 +0530

amit.gupta – 1 file(s) modified
Fixed Sales report for the day.

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

Rev 24504 –

amit.gupta — Mon, 11 Feb 2019 15:41:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 24503 – Added RK enterprices for restrictions

amit.gupta — Mon, 11 Feb 2019 15:41:02 +0530

amit.gupta – 1 file(s) modified
Added RK enterprices for restrictions

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

Rev 24502 – Changed min brand qty.

amit.gupta — Mon, 11 Feb 2019 14:54:29 +0530

amit.gupta – 1 file(s) modified
Changed min brand qty.

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

Rev 24501 – Added RK Enterprices

amit.gupta — Fri, 08 Feb 2019 20:46:43 +0530

amit.gupta – 1 file(s) modified
Added RK Enterprices

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

Rev 24500 – Ticket Changes

govind — Fri, 08 Feb 2019 16:35:37 +0530

govind – 17 file(s) modified
Ticket Changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketAssigned.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.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-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketAssignedRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketAssignedRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cs.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-ticket-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ticket.vm

Rev 24499 –

amit.gupta — Fri, 08 Feb 2019 15:10:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java

Rev 24498 – All Partners Wallet Statement since beginning

amit.gupta — Fri, 08 Feb 2019 12:31:07 +0530

amit.gupta – 1 file(s) modified
All Partners Wallet Statement since beginning

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java

Rev 24497 –

amit.gupta — Thu, 07 Feb 2019 18:43:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 24496 – Fixed user logic

amit.gupta — Thu, 07 Feb 2019 14:26:02 +0530

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

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

Rev 24495 –

amit.gupta — Thu, 07 Feb 2019 11:05:03 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 24494 –

amit.gupta — Thu, 07 Feb 2019 11:03:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 24493 –

amit.gupta — Thu, 07 Feb 2019 08:44:36 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 24492 –

amit.gupta — Thu, 07 Feb 2019 02:02:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 24491 –

amit.gupta — Thu, 07 Feb 2019 02:02:26 +0530

amit.gupta – 3 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoParams.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 24490 – Added authuser changes

amit.gupta — Thu, 07 Feb 2019 00:21:28 +0530

amit.gupta – 3 file(s) modified
Added authuser changes

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

Rev 24489 –

amit.gupta — Wed, 06 Feb 2019 18:23:56 +0530

amit.gupta – 2 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js

Rev 24488 –

amit.gupta — Wed, 06 Feb 2019 18:22:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 24487 –

amit.gupta — Wed, 06 Feb 2019 18:18:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 24486 –

amit.gupta — Wed, 06 Feb 2019 16:38:01 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js

Rev 24485 –

amit.gupta — Wed, 06 Feb 2019 16:32:59 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm

Rev 24484 –

amit.gupta — Wed, 06 Feb 2019 16:23:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth-users-paginated.vm