SmartDukaan – /

Rev 23532 – Added changes related to returns

amit.gupta — Sun, 08 Apr 2018 13:58:38 +0530

amit.gupta – 15 file(s) modified
Added changes related to returns

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DebitNotePdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.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/DebitNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.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 23531 – Bug : getting int value of amount_type from recharge_commission

ashik.ali — Fri, 06 Apr 2018 18:20:01 +0530

ashik.ali – 1 file(s) modified
Bug : getting int value of amount_type from recharge_commission

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

Rev 23530 – Feature : Recharge Commission, some improvements, recharge live integration

ashik.ali — Fri, 06 Apr 2018 14:39:52 +0530

ashik.ali – 1 file(s) modified
Feature : Recharge Commission, some improvements, recharge live integration

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

Rev 23529 – Feature : Recharge Commission, some improvements, recharge live integration

ashik.ali — Fri, 06 Apr 2018 14:38:43 +0530

ashik.ali – 1 file(s) modified
Feature : Recharge Commission, some improvements, recharge live integration

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

Rev 23528 – Feature : Recharge Commission, some improvements, recharge live integration

ashik.ali — Fri, 06 Apr 2018 13:36:02 +0530

ashik.ali – 20 file(s) modified
Feature : Recharge Commission, some improvements, recharge live integration

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/GoogleTokenUtil.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-recharge-commission.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-recharge.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/recharge.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-commission-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-commissions-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-commissions.vm

Rev 23527 – Feature : Recharge Commission, some improvements, recharge live integration

ashik.ali — Fri, 06 Apr 2018 13:27:33 +0530

ashik.ali – 16 file(s) modified
Feature : Recharge Commission, some improvements, recharge live integration

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeCommission.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeTransaction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/AmountType.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/SchemeAmountType.java@23026)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/catalog/SchemeAmountType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeCommissionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeCommissionRepositoryImpl.java
~ /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/service/inventory/PurchaseServiceImpl.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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 23526 – Feature : Recharge Commission, some improvements, recharge live integration

ashik.ali — Fri, 06 Apr 2018 13:06:56 +0530

ashik.ali – 7 file(s) modified
Feature : Recharge Commission, some improvements, recharge live integration

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/RechargeCommissionRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/RechargeCredential.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/InsuranceUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 23525 –

amit.gupta — Fri, 06 Apr 2018 12:18:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23524 –

amit.gupta — Fri, 06 Apr 2018 12:17:11 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23523 –

amit.gupta — Fri, 06 Apr 2018 12:10:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23522 –

amit.gupta — Fri, 06 Apr 2018 12:08:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23521 –

amit.gupta — Fri, 06 Apr 2018 12:06:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23520 –

amit.gupta — Fri, 06 Apr 2018 11:50:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23519 –

amit.gupta — Fri, 06 Apr 2018 11:43:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 23518 –

amit.gupta — Fri, 06 Apr 2018 11:20:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23517 – Fixed insurance bug

amit.gupta — Fri, 06 Apr 2018 11:02:46 +0530

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

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

Rev 23516 – Rolledback changes

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

amit.gupta – 1 file(s) modified
Rolledback changes

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

Rev 23515 – After color change invoke move to correct warehouse

amit.gupta — Fri, 06 Apr 2018 08:01:37 +0530

amit.gupta – 1 file(s) modified
After color change invoke move to correct warehouse

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23514 – MoveWarehouse will now actually try to move only from virtual ...

amit.gupta — Fri, 06 Apr 2018 07:49:48 +0530

amit.gupta – 1 file(s) modified
MoveWarehouse will now actually try to move only from virtual to actual warehouse

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23513 – Fixed change color.

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

amit.gupta – 1 file(s) modified
Fixed change color.

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

Rev 23512 – Fixed schemes out message

amit.gupta — Thu, 05 Apr 2018 17:58:12 +0530

amit.gupta – 1 file(s) modified
Fixed schemes out message

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

Rev 23511 – Added scheme out

amit.gupta — Thu, 05 Apr 2018 15:39:33 +0530

amit.gupta – 4 file(s) modified
Added scheme out

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java

Rev 23510 –

amit.gupta — Thu, 05 Apr 2018 08:53:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java

Rev 23509 – Checking in Returns and added cron like behaviour to profitmandi

amit.gupta — Thu, 05 Apr 2018 08:05:17 +0530

amit.gupta – 31 file(s) modified
Checking in Returns and added cron like behaviour to profitmandi

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/PurchaseReturnStatus.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DebitNotePdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.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/fofo/DebitNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepositoryImpl.java
~ /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-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepositoryImpl.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/dao/repository/user/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/indent/IndentServiceImpl.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/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.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/src/main/resources/META-INF/prod.properties

Rev 23508 –

amit.gupta — Thu, 05 Apr 2018 07:49:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 23507 –

amit.gupta — Thu, 05 Apr 2018 07:46:04 +0530

amit.gupta – 1 file(s) modified

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

Rev 23506 – Added changes related to Schemes

amit.gupta — Thu, 05 Apr 2018 07:44:19 +0530

amit.gupta – 12 file(s) modified
Added changes related to Schemes

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnables.vm

Rev 23505 –

ashik.ali — Tue, 03 Apr 2018 12:43:17 +0530

ashik.ali – 16 file(s) modified

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/GoogleTokenUtil.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-recharge.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/recharge.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-operators.vm

Rev 23504 – Feature : Recharge integration

ashik.ali — Tue, 03 Apr 2018 12:33:43 +0530

ashik.ali – 23 file(s) modified
Feature : Recharge integration

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeOperator.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/RechargeRequestIdSequenceGeneration.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeTransaction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemIdSum.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeOperatorRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeOperatorRepositoryImpl.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/dtr/RechargeRequestIdSequenceGenerationRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RechargeRequestIdSequenceGenerationRepositoryImpl.java
+ /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/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/inventory/PurchaseServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge
+ /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
~ /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

Rev 23503 – fixed issue

amit.gupta — Tue, 03 Apr 2018 12:15:15 +0530

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

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

Rev 23502 – Feature : Recharge integration

ashik.ali — Tue, 03 Apr 2018 11:54:56 +0530

ashik.ali – 8 file(s) modified
Feature : Recharge integration

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/RechargeStatus.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/OperatorType.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/RechargeRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/RechargeResponse.java
~ /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-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java

Rev 23501 – Retailer document can not be viewed by panel owner, Some ...

ashik.ali — Mon, 02 Apr 2018 19:25:40 +0530

ashik.ali – 1 file(s) modified
Retailer document can not be viewed by panel owner, Some js optimizations

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

Rev 23500 – Retailer document can not be viewed by panel owner, Some ...

ashik.ali — Mon, 02 Apr 2018 19:23:22 +0530

ashik.ali – 12 file(s) modified
Retailer document can not be viewed by panel owner, Some js optimizations

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/user-profile.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 23499 – Retailer document can not be viewed by panel owner

ashik.ali — Mon, 02 Apr 2018 19:18:36 +0530

ashik.ali – 1 file(s) modified
Retailer document can not be viewed by panel owner

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

Rev 23498 – Retailer document can not be uploaded

ashik.ali — Mon, 02 Apr 2018 18:47:08 +0530

ashik.ali – 1 file(s) modified
Retailer document can not be uploaded

~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 23497 – Retailer document can not be uploaded

ashik.ali — Mon, 02 Apr 2018 11:31:26 +0530

ashik.ali – 1 file(s) modified
Retailer document can not be uploaded

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

Rev 23496 –

amit.gupta — Sat, 31 Mar 2018 12:03:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 23495 – Retailer uploaded document can be viewed, some bug fixed

ashik.ali — Fri, 30 Mar 2018 17:07:30 +0530

ashik.ali – 1 file(s) modified
Retailer uploaded document can be viewed, some bug fixed

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js

Rev 23494 – Retailer uploaded document can be viewed, some bug fixed

ashik.ali — Fri, 30 Mar 2018 15:25:58 +0530

ashik.ali – 4 file(s) modified
Retailer uploaded document can be viewed, some bug fixed

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 23493 – Fixed refunding to wallet post billing, most of the scenarios ...

amit.gupta — Thu, 29 Mar 2018 21:25:54 +0530

amit.gupta – 1 file(s) modified
Fixed refunding to wallet post billing, most of the scenarios are covered.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py