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

Rev 24402 – Fixed date formatting

amit.gupta — Tue, 01 Jan 2019 12:39:03 +0530

amit.gupta – 15 file(s) modified
Fixed date formatting

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
~ /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/DailyRecharge.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PunchInOut.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/RechargeProviderCreditWalletHistory.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/FofoOrder.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/PartnerTargetDetails.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 23880 – Non billable items to be scan with refectoring

ashik.ali — Fri, 13 Jul 2018 14:54:14 +0530

ashik.ali – 63 file(s) modified
Non billable items to be scan with refectoring

~ /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/Role.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserAccount.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminCurrentInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminDeliveryNote.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminDeliveryNoteDetail.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminInventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/AdminScanRecord.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/InstructionItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/InstructionItemDetail.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/PartnerInventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/PartnerScanRecord.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/ScanOutPartnerItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Address.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/nonbillable
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/nonbillable/InstructionItemStatus.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/UserAccountRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepository.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/dao/repository/nonbillable/AdminCurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminCurrentInventorySnapshotRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminDeliveryNoteDetailRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminDeliveryNoteDetailRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminInventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminInventoryItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/InstructionItemDetailRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/InstructionItemDetailRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/InstructionItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/InstructionItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerCurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerCurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerInventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/PartnerInventoryItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/ScanOutPartnerItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/ScanOutPartnerItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/UserWarehouseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/UserWarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/WarehouseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/WarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AddressRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/GenericUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/VendorServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/WarehouseService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/WarehouseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.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

Rev 23585 – rechargeChanges

tejbeer — Tue, 24 Apr 2018 12:53:40 +0530

tejbeer – 8 file(s) modified
rechargeChanges

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/CreateRechargeResponse.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties

Rev 23574 –

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

ashik.ali – 12 file(s) modified

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