SmartDukaan – /

Rev 23627 – Add money to recharge local wallet, check local and remote ...

ashik.ali — Thu, 03 May 2018 15:21:20 +0530

ashik.ali – 17 file(s) modified
Add money to recharge local wallet, check local and remote wallet balance, daily recharges tracking

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/DailyRecharge.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeProvider.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeProviderCreditWalletHistory.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/dao/repository/dtr/RechargeProviderCreditWalletHistoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeProviderCreditWalletHistoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeProviderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeProviderRepositoryImpl.java
~ /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/recharge/provider/OxigenRechargeProviderService.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/ThinkWalnutDigitalRechargeProviderService.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/recharge/RechargeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java

Rev 23626 –

amit.gupta — Thu, 03 May 2018 08:20:51 +0530

amit.gupta – 1 file(s) modified

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

Rev 23625 –

amit.gupta — Thu, 03 May 2018 08:12:10 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 23624 –

amit.gupta — Thu, 03 May 2018 08:03:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 23623 –

amit.gupta — Thu, 03 May 2018 08:01:27 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 23622 –

amit.gupta — Thu, 03 May 2018 07:59:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 23621 –

amit.gupta — Thu, 03 May 2018 07:52:40 +0530

amit.gupta – 1 file(s) modified

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

Rev 23620 –

amit.gupta — Thu, 03 May 2018 07:45:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 23619 – Added cron for recharge request updation

amit.gupta — Thu, 03 May 2018 07:26:45 +0530

amit.gupta – 1 file(s) modified
Added cron for recharge request updation

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

Rev 23618 – Added cron for recharge request updation

amit.gupta — Thu, 03 May 2018 07:14:32 +0530

amit.gupta – 6 file(s) modified
Added cron for recharge request updation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeTransactionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeTransactionRepositoryImpl.java
~ /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/recharge/RechargeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java

Rev 23617 – fixed convertor

amit.gupta — Wed, 02 May 2018 16:24:41 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py

Rev 23616 – added non-serialised items

amit.gupta — Wed, 02 May 2018 12:53:08 +0530

amit.gupta – 1 file(s) modified
added non-serialised items

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

Rev 23615 – Added changes related to purchase return for non-serialised. More to ...

amit.gupta — Wed, 02 May 2018 09:41:40 +0530

amit.gupta – 6 file(s) modified
Added changes related to purchase return for non-serialised.
More to add

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/InvoiceWarehouseInfo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm

Rev 23614 – Fixed Recharge

amit.gupta — Tue, 01 May 2018 11:06:01 +0530

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

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

Rev 23613 – Added Non-serialised to returnables.

amit.gupta — Mon, 30 Apr 2018 15:45:41 +0530

amit.gupta – 4 file(s) modified
Added Non-serialised to returnables.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 23612 – Added report changes + changes in cash collection

amit.gupta — Mon, 30 Apr 2018 07:12:22 +0530

amit.gupta – 7 file(s) modified
Added report changes + changes in cash collection

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/ReporticoProject.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PaymentOptionTransaction.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/CronController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java

Rev 23611 –

amit.gupta — Fri, 27 Apr 2018 18:08:00 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 23610 –

amit.gupta — Fri, 27 Apr 2018 14:55:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PaymentOptionTransaction.java

Rev 23609 – trigger time changed in log4j2.xml

govind — Fri, 27 Apr 2018 13:07:28 +0530

govind – 2 file(s) modified
trigger time changed in log4j2.xml

~ /trunk/profitmandi-fofo/src/main/resources/log4j2.xml
~ /trunk/profitmandi-web/src/main/resources/log4j2.xml

Rev 23608 –

amit.gupta — Fri, 27 Apr 2018 12:53:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 23607 – Added oreo

amit.gupta — Fri, 27 Apr 2018 11:56:24 +0530

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

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 23606 –

amit.gupta — Fri, 27 Apr 2018 06:52:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 23605 – trigger time changed in log4j2.xml

govind — Thu, 26 Apr 2018 12:46:52 +0530

govind – 1 file(s) modified
trigger time changed in log4j2.xml

~ /trunk/profitmandi-fofo/src/main/resources/log4j2.xml

Rev 23604 – trigger time changed in log4j2.xml

govind — Thu, 26 Apr 2018 12:45:26 +0530

govind – 1 file(s) modified
trigger time changed in log4j2.xml

~ /trunk/profitmandi-web/src/main/resources/log4j2.xml

Rev 23603 – changestaging

tejbeer — Thu, 26 Apr 2018 12:33:26 +0530

tejbeer – 1 file(s) modified
changestaging

~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

Rev 23602 – Fixed Api calls for Gadget Cop Damage Protection

amit.gupta — Thu, 26 Apr 2018 12:16:04 +0530

amit.gupta – 3 file(s) modified
Fixed Api calls for Gadget Cop Damage Protection

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/InsuranceUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 23601 –

amit.gupta — Thu, 26 Apr 2018 08:40:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/clean-content.sh

Rev 23600 –

amit.gupta — Thu, 26 Apr 2018 08:34:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/clean-content.sh

Rev 23599 –

amit.gupta — Thu, 26 Apr 2018 08:32:34 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/clean-content.sh

Rev 23598 –

amit.gupta — Thu, 26 Apr 2018 08:10:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/clean-content.sh

Rev 23597 –

amit.gupta — Wed, 25 Apr 2018 15:42:25 +0530

amit.gupta – 3 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/model/LoginDetails.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties

Rev 23596 – Fofo order invoice unable to download by admin

ashik.ali — Wed, 25 Apr 2018 12:25:06 +0530

ashik.ali – 1 file(s) modified
Fofo order invoice unable to download by admin

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

Rev 23595 – Fofo order invoice unable to download by admin

ashik.ali — Wed, 25 Apr 2018 12:24:53 +0530

ashik.ali – 1 file(s) modified
Fofo order invoice unable to download by admin

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

Rev 23594 – Fofo order invoice unable to download by admin

ashik.ali — Wed, 25 Apr 2018 12:24:40 +0530

ashik.ali – 1 file(s) modified
Fofo order invoice unable to download by admin

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

Rev 23593 –

amit.gupta — Tue, 24 Apr 2018 23:29:16 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/ContentUpdationManager.sh

Rev 23592 – recharge Changes

tejbeer — Tue, 24 Apr 2018 23:24:15 +0530

tejbeer – 3 file(s) modified
recharge Changes

Rev 23591 –

amit.gupta — Tue, 24 Apr 2018 21:18:18 +0530

amit.gupta – 1 file(s) modified

~ /trunk/runutils/ContentUpdationManager.sh

Rev 23590 –

amit.gupta — Tue, 24 Apr 2018 19:24:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py

Rev 23589 – prodchange

tejbeer — Tue, 24 Apr 2018 16:59:06 +0530

tejbeer – 1 file(s) modified
prodchange

~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties

Rev 23588 – prod

tejbeer — Tue, 24 Apr 2018 16:07:18 +0530

tejbeer – 1 file(s) modified
prod

~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties