SmartDukaan – /

Rev 23577 – Recharge Request with multithreading, recharge provider choosen dynamically based on ...

ashik.ali — Thu, 19 Apr 2018 18:54:57 +0530

ashik.ali – 5 file(s) modified
Recharge Request with multithreading, recharge provider choosen dynamically based on priority and commission_amount

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/recharge.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges-paginated.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/recharge-commissions-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/recharge-commissions.vm

Rev 23576 – Recharge Request with multithreading, recharge provider choosen dynamically based on ...

ashik.ali — Thu, 19 Apr 2018 18:53:53 +0530

ashik.ali – 3 file(s) modified
Recharge Request with multithreading, recharge provider choosen dynamically based on priority and commission_amount

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

Rev 23575 – Recharge Request with multithreading, recharge provider choosen dynamically based on ...

ashik.ali — Thu, 19 Apr 2018 18:50:14 +0530

ashik.ali – 2 file(s) modified
Recharge Request with multithreading, recharge provider choosen dynamically based on priority and commission_amount

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

Rev 23574 –

ashik.ali — Thu, 19 Apr 2018 18:45:51 +0530

ashik.ali – 12 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RechargeCommission.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/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/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 23573 –

ashik.ali — Thu, 19 Apr 2018 18:37:37 +0530

ashik.ali – 1 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/task/DoRequestCallableTask.java

Rev 23572 – Recharge Request with multithreading, recharge provider choosen dynamically based on ...

ashik.ali — Thu, 19 Apr 2018 18:35:50 +0530

ashik.ali – 3 file(s) modified
Recharge Request with multithreading, recharge provider choosen dynamically based on priority and commission_amount

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/RestRequestType.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/task

Rev 23571 –

amit.gupta — Wed, 18 Apr 2018 18:43:18 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java

Rev 23570 – Added scheme response properly

amit.gupta — Wed, 18 Apr 2018 16:38:47 +0530

amit.gupta – 1 file(s) modified
Added scheme response properly

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

Rev 23569 – Fixed bugs related to pre order booking. Updated to new ...

govind — Tue, 17 Apr 2018 17:48:34 +0530

govind – 15 file(s) modified
Fixed bugs related to pre order booking. Updated to new logging log4j2

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepositoryImpl.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/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/inventory/PrebookingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm

Rev 23568 – Fixed changes related to logging. Updated to log4j2

govind — Tue, 17 Apr 2018 17:23:28 +0530

govind – 94 file(s) modified
Fixed changes related to logging. Updated to log4j2

~ /trunk/profitmandi-common/build.gradle
~ /trunk/profitmandi-common/pom.xml
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/ResponseCodeHolder.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/SnapdealProductPageParser.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.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/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.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/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java
x /trunk/profitmandi-common/src/main/resources/log4j.xml
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/TransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.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/CustomerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.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/PaymentOptionController.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/RechargeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
+ /trunk/profitmandi-fofo/src/main/resources/log4j2.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CodPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CommonPaymentService.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/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.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/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/WalletPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java
x /trunk/profitmandi-web/src/main/resources/log4j.xml
+ /trunk/profitmandi-web/src/main/resources/log4j2.xml

Rev 23567 – Unable to do recharge

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

ashik.ali – 1 file(s) modified
Unable to do recharge

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

Rev 23566 – Fixed purchase return

amit.gupta — Tue, 17 Apr 2018 11:12:18 +0530

amit.gupta – 4 file(s) modified
Fixed purchase return

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.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/service/order/OrderServiceImpl.java

Rev 23565 –

amit.gupta — Tue, 17 Apr 2018 11:09:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property

Rev 23564 –

amit.gupta — Mon, 16 Apr 2018 23:04:23 +0530

amit.gupta – 1 file(s) modified

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

Rev 23563 –

amit.gupta — Mon, 16 Apr 2018 22:47:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 23562 – One time recharge request submit when click on recharge button

ashik.ali — Mon, 16 Apr 2018 19:24:59 +0530

ashik.ali – 1 file(s) modified
One time recharge request submit when click on recharge button

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

Rev 23561 – Integrated new recharge provider think walnut digital and some code ...

ashik.ali — Mon, 16 Apr 2018 12:49:38 +0530

ashik.ali – 4 file(s) modified
Integrated new recharge provider think walnut digital and some code refectoring

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/RechargeCredential.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 23560 – Integrated new recharge provider think walnut digital and some code ...

ashik.ali — Mon, 16 Apr 2018 12:48:07 +0530

ashik.ali – 9 file(s) modified
Integrated new recharge provider think walnut digital and some code refectoring

~ /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/service/recharge/provider
+ /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 23559 – Integrated new recharge provider think walnut digital and some code ...

ashik.ali — Mon, 16 Apr 2018 12:46:30 +0530

ashik.ali – 5 file(s) modified
Integrated new recharge provider think walnut digital and some code refectoring

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.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

Rev 23558 – Fixed pdf with payment options

amit.gupta — Mon, 16 Apr 2018 09:25:41 +0530

amit.gupta – 3 file(s) modified
Fixed pdf with payment options

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.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

Rev 23557 – Added update schemes

amit.gupta — Sun, 15 Apr 2018 16:56:41 +0530

amit.gupta – 4 file(s) modified
Added update schemes

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SchemeItems.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm

Rev 23556 – Updated recharge commissions

amit.gupta — Fri, 13 Apr 2018 17:18:42 +0530

amit.gupta – 9 file(s) modified
Updated recharge commissions

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.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/repository/dtr/RechargeCommissionRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.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
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/update-schemes-page.vm

Rev 23555 –

amit.gupta — Fri, 13 Apr 2018 07:01:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/reports/acquisition/dtrcohortanalysis.py

Rev 23554 –

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

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/reports/acquisition/dtrcohortanalysis.py

Rev 23553 –

amit.gupta — Wed, 11 Apr 2018 23:52:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 23552 – Fixed changes related to debit note and invoice

amit.gupta — Wed, 11 Apr 2018 19:57:31 +0530

amit.gupta – 7 file(s) modified
Fixed changes related to debit note and invoice

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomPaymentOption.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepositoryImpl.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/PurchaseReturnController.java

Rev 23551 – Fixed

amit.gupta — Wed, 11 Apr 2018 17:41:36 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 23550 –

amit.gupta — Wed, 11 Apr 2018 09:29:15 +0530

amit.gupta – 1 file(s) modified

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

Rev 23549 – Fixed debit note

amit.gupta — Wed, 11 Apr 2018 09:08:18 +0530

amit.gupta – 2 file(s) modified
Fixed debit note

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

Rev 23548 – Recharge Payment Option, recharge limit, enhancement

ashik.ali — Tue, 10 Apr 2018 19:01:43 +0530

ashik.ali – 3 file(s) modified
Recharge Payment Option, recharge limit, enhancement

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.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/RechargeController.java

Rev 23547 – Recharge Payment Option, recharge limit, enhancement

ashik.ali — Tue, 10 Apr 2018 19:01:13 +0530

ashik.ali – 8 file(s) modified
Recharge Payment Option, recharge limit, enhancement

~ /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.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/sale-details.vm

Rev 23546 – Recharge Payment Option, recharge limit, enhancement

ashik.ali — Tue, 10 Apr 2018 18:55:43 +0530

ashik.ali – 7 file(s) modified
Recharge Payment Option, recharge limit, enhancement

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/PaymentOptionReferenceType.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/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java

Rev 23545 – Recharge Payment Option, recharge limit, enhancement

ashik.ali — Tue, 10 Apr 2018 18:55:02 +0530

ashik.ali – 2 file(s) modified
Recharge Payment Option, recharge limit, enhancement

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PaymentOptionTransaction.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderPaymentOption.java@23365)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderPaymentOption.java

Rev 23544 – Recharge Payment Option, recharge limit, enhancement

ashik.ali — Tue, 10 Apr 2018 18:53:28 +0530

ashik.ali – 4 file(s) modified
Recharge Payment Option, recharge limit, enhancement

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PaymentOptionTransactionRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderPaymentOptionRepository.java@23365)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PaymentOptionTransactionRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderPaymentOptionRepositoryImpl.java@23365)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderPaymentOptionRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderPaymentOptionRepositoryImpl.java

Rev 23543 – Recharge Payment Option, recharge limit, enhancement

ashik.ali — Tue, 10 Apr 2018 18:40:45 +0530

ashik.ali – 4 file(s) modified
Recharge Payment Option, recharge limit, enhancement

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/RechargeStatus.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/resources/response-codes.properties

Rev 23542 – Added changes related to purchase

amit.gupta — Tue, 10 Apr 2018 18:32:23 +0530

amit.gupta – 3 file(s) modified
Added changes related to purchase

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java

Rev 23541 –

amit.gupta — Tue, 10 Apr 2018 13:58:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 23540 – Fixed itemdesc

amit.gupta — Tue, 10 Apr 2018 13:57:21 +0530

amit.gupta – 2 file(s) modified
Fixed itemdesc

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js

Rev 23539 – Added debit notes for return

amit.gupta — Tue, 10 Apr 2018 13:06:59 +0530

amit.gupta – 14 file(s) modified
Added debit notes for return

~ /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-common/src/main/java/com/spice/profitmandi/common/util/Test.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.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/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/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/service/recharge/RechargeServiceImpl.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-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes.vm

Rev 23538 – Fixed inventory item.

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

amit.gupta – 1 file(s) modified
Fixed inventory item.

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