SmartDukaan – /

Rev 23679 –

amit.gupta — Wed, 23 May 2018 08:13:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23678 –

amit.gupta — Wed, 23 May 2018 07:55:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 23677 –

amit.gupta — Wed, 23 May 2018 07:38:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 23676 –

amit.gupta — Wed, 23 May 2018 07:18:06 +0530

amit.gupta – 1 file(s) modified

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

Rev 23675 –

amit.gupta — Tue, 22 May 2018 21:56:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 23674 –

amit.gupta — Tue, 22 May 2018 18:23:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 23673 –

amit.gupta — Tue, 22 May 2018 18:08:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 23672 –

amit.gupta — Tue, 22 May 2018 17:46:39 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java

Rev 23671 – configMonitoring for monitoring configServer.py

govind — Tue, 22 May 2018 16:28:23 +0530

govind – 1 file(s) modified
configMonitoring for monitoring configServer.py

+ /trunk/PyProj/src/NagiosMonitoring/ConfigMonitoring.py

Rev 23670 – Nagios Monitoring services python

govind — Tue, 22 May 2018 15:18:27 +0530

govind – 3 file(s) modified
Nagios Monitoring services python

+ /trunk/PyProj/src/NagiosMonitoring
+ /trunk/PyProj/src/NagiosMonitoring/CatalogMonitoring.py
+ /trunk/PyProj/src/NagiosMonitoring/HelperMonitoring.py

Rev 23669 – Monitoring service python file

govind — Tue, 22 May 2018 15:15:05 +0530

govind – 3 file(s) modified
Monitoring service python file

+ /trunk/PyProj/NagiosMonitoring
+ /trunk/PyProj/NagiosMonitoring/CatalogMonitoring.py
+ /trunk/PyProj/NagiosMonitoring/HelperMonitoring.py

Rev 23668 –

govind — Tue, 22 May 2018 11:38:38 +0530

govind – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/helpers/test/Test.py

Rev 23667 –

amit.gupta — Tue, 22 May 2018 09:02:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 23666 – Fixed recharge daily reco

amit.gupta — Tue, 22 May 2018 08:50:52 +0530

amit.gupta – 3 file(s) modified
Fixed recharge daily reco

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DailyRechargeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DailyRechargeRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java

Rev 23665 – Fixed recharge reco

amit.gupta — Tue, 22 May 2018 08:38:55 +0530

amit.gupta – 1 file(s) modified
Fixed recharge reco

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

Rev 23664 –

amit.gupta — Tue, 22 May 2018 08:30:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 23663 – Added Daily Recharge related changes.

amit.gupta — Tue, 22 May 2018 08:23:55 +0530

amit.gupta – 5 file(s) modified
Added Daily Recharge related changes.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/DailyRecharge.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DailyRechargeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DailyRechargeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/provider/ThinkWalnutDigitalRechargeProviderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/Utils.java

Rev 23662 – First run for recharge reco

amit.gupta — Tue, 22 May 2018 08:22:09 +0530

amit.gupta – 1 file(s) modified
First run for recharge reco

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

Rev 23661 – Added momentjs

amit.gupta — Mon, 21 May 2018 18:49:09 +0530

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

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

Rev 23660 –

amit.gupta — Mon, 21 May 2018 18:39:36 +0530

amit.gupta – 1 file(s) modified

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

Rev 23659 –

amit.gupta — Mon, 21 May 2018 18:30:59 +0530

amit.gupta – 1 file(s) modified

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/moment.min.js

Rev 23658 – Added momentjs

amit.gupta — Mon, 21 May 2018 17:32:28 +0530

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

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

Rev 23657 –

amit.gupta — Mon, 21 May 2018 12:40:23 +0530

amit.gupta – 1 file(s) modified

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

Rev 23656 –

amit.gupta — Mon, 21 May 2018 12:28:28 +0530

amit.gupta – 1 file(s) modified

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

Rev 23655 –

amit.gupta — Mon, 21 May 2018 09:59:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 23654 – Fixed js

amit.gupta — Mon, 21 May 2018 05:58:48 +0530

amit.gupta – 19 file(s) modified
Fixed js

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/FoiBadReturnRequest.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/fofo/CustomerCreditNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerReturnItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/SettlementType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerReturnItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerReturnItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/common/model/FoiBadReturnRequest.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/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/BadReturnRequest.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm

Rev 23653 –

amit.gupta — Thu, 17 May 2018 22:55:08 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 23652 – Fixed issue related to bean

amit.gupta — Thu, 17 May 2018 16:53:35 +0530

amit.gupta – 1 file(s) modified
Fixed issue related to bean

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

Rev 23651 –

amit.gupta — Thu, 17 May 2018 16:32:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 23650 – Added schemePayoutReport as requested by one of our partners

amit.gupta — Thu, 17 May 2018 16:07:58 +0530

amit.gupta – 9 file(s) modified
Added schemePayoutReport as requested by one of our partners

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerCreditNoteRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerCreditNoteRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerReturnItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerReturnItemRepositoryImpl.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-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 23649 – Added check to ensure that wallet amount is communicated appropriately.

amit.gupta — Thu, 17 May 2018 07:23:40 +0530

amit.gupta – 1 file(s) modified
Added check to ensure that wallet amount is communicated appropriately.

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

Rev 23648 –

amit.gupta — Wed, 16 May 2018 14:01:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java

Rev 23647 – Added static maps to minimise service calls.

amit.gupta — Wed, 16 May 2018 13:24:57 +0530

amit.gupta – 1 file(s) modified
Added static maps to minimise service calls.

~ /trunk/Crm/src/main/java/in/shop2020/serving/auth/CRMAuthorizingRealm.java

Rev 23646 –

amit.gupta — Tue, 15 May 2018 18:56:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23645 – Fixed returns

amit.gupta — Tue, 15 May 2018 17:30:10 +0530

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

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

Rev 23644 – Fixed denied issue

amit.gupta — Tue, 15 May 2018 13:40:27 +0530

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

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

Rev 23643 – Fixed bug

amit.gupta — Mon, 14 May 2018 21:34:05 +0530

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

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

Rev 23642 – fixed filter

amit.gupta — Fri, 11 May 2018 09:43:11 +0530

amit.gupta – 1 file(s) modified
fixed filter

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

Rev 23641 –

amit.gupta — Fri, 11 May 2018 09:33:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 23640 –

amit.gupta — Fri, 11 May 2018 09:18:27 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java