SmartDukaan – /

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 23879 – Non billable items to be scan with refectoring

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

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

~ /trunk/profitmandi-common/build.gradle
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/InstructionItemRequest.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/ScanInItemRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScanInPartnerItemRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScanOutItemRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScanOutPartnerItemRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/task/DoRequestCallableTask.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 23878 – Added mapper

amit.gupta — Fri, 13 Jul 2018 12:07:08 +0530

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

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java

Rev 23877 –

amit.gupta — Fri, 13 Jul 2018 11:17:06 +0530

amit.gupta – 1 file(s) modified

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

Rev 23876 –

amit.gupta — Fri, 13 Jul 2018 10:42:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 23875 –

amit.gupta — Fri, 13 Jul 2018 10:41:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23874 – Fixed price drop

amit.gupta — Thu, 12 Jul 2018 14:54:50 +0530

amit.gupta – 1 file(s) modified
Fixed price drop

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java

Rev 23873 – Added check with item Type

amit.gupta — Thu, 12 Jul 2018 12:34:20 +0530

amit.gupta – 1 file(s) modified
Added check with item Type

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

Rev 23872 –

amit.gupta — Tue, 10 Jul 2018 17:39:28 +0530

amit.gupta – 1 file(s) modified

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

Rev 23871 – Added static date time formatters to viewResolver

amit.gupta — Tue, 10 Jul 2018 17:32:42 +0530

amit.gupta – 1 file(s) modified
Added static date time formatters to viewResolver

~ /trunk/profitmandi-fofo/build.gradle

Rev 23870 – Added static date time formatters to viewResolver

amit.gupta — Tue, 10 Jul 2018 17:32:19 +0530

amit.gupta – 1 file(s) modified
Added static date time formatters to viewResolver

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

Rev 23869 – Added static date time formatters to viewResolver

amit.gupta — Tue, 10 Jul 2018 17:31:19 +0530

amit.gupta – 1 file(s) modified
Added static date time formatters to viewResolver

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 23868 –

amit.gupta — Fri, 06 Jul 2018 17:22:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 23867 – Fixed Debit note fetch for admin

amit.gupta — Fri, 06 Jul 2018 16:23:01 +0530

amit.gupta – 1 file(s) modified
Fixed Debit note fetch for admin

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

Rev 23866 –

amit.gupta — Thu, 05 Jul 2018 16:50:59 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java

Rev 23865 – Added cron to run once.

amit.gupta — Thu, 05 Jul 2018 16:41:40 +0530

amit.gupta – 1 file(s) modified
Added cron to run once.

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java

Rev 23864 – Added LineItem Imei

amit.gupta — Thu, 05 Jul 2018 15:44:54 +0530

amit.gupta – 1 file(s) modified
Added LineItem Imei

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

Rev 23863 – Added line item imei

amit.gupta — Thu, 05 Jul 2018 15:42:12 +0530

amit.gupta – 1 file(s) modified
Added line item imei

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

Rev 23862 – Fixed issue with wasted tokens.

amit.gupta — Wed, 04 Jul 2018 20:34:07 +0530

amit.gupta – 1 file(s) modified
Fixed issue with wasted tokens.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 23861 – Fixed Hot deals

amit.gupta — Wed, 04 Jul 2018 18:20:56 +0530

amit.gupta – 1 file(s) modified
Fixed Hot deals

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

Rev 23860 –

ashik.ali — Wed, 04 Jul 2018 17:03:27 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 23859 –

ashik.ali — Wed, 04 Jul 2018 16:47:17 +0530

ashik.ali – 1 file(s) modified

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

Rev 23858 –

ashik.ali — Wed, 04 Jul 2018 16:46:11 +0530

ashik.ali – 1 file(s) modified

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

Rev 23857 –

amit.gupta — Wed, 04 Jul 2018 16:34:24 +0530

amit.gupta – 1 file(s) modified

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

Rev 23856 –

amit.gupta — Wed, 04 Jul 2018 15:59:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 23855 – Added feature to pause listing

amit.gupta — Wed, 04 Jul 2018 10:36:23 +0530

amit.gupta – 7 file(s) modified
Added feature to pause listing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/TagListingRepositoryImpl.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/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/open-indent.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm

Rev 23854 –

amit.gupta — Tue, 03 Jul 2018 18:01:22 +0530

amit.gupta – 1 file(s) modified

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

Rev 23853 – Fixed Rquick Generation

amit.gupta — Tue, 03 Jul 2018 17:47:50 +0530

amit.gupta – 2 file(s) modified
Fixed Rquick Generation

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Item.java

Rev 23852 – Punch In Punch out functionality

ashik.ali — Tue, 03 Jul 2018 14:46:55 +0530

ashik.ali – 1 file(s) modified
Punch In Punch out functionality

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

Rev 23851 – Punch In Punch out functionality

ashik.ali — Tue, 03 Jul 2018 14:46:17 +0530

ashik.ali – 1 file(s) modified
Punch In Punch out functionality

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

Rev 23850 – Punch In Punch out functionality

ashik.ali — Tue, 03 Jul 2018 14:45:27 +0530

ashik.ali – 1 file(s) modified
Punch In Punch out functionality

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/UserInfo.java

Rev 23849 –

ashik.ali — Tue, 03 Jul 2018 11:50:30 +0530

ashik.ali – 1 file(s) modified

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

Rev 23848 –

ashik.ali — Tue, 03 Jul 2018 11:45:02 +0530

ashik.ali – 1 file(s) modified

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

Rev 23847 –

ashik.ali — Tue, 03 Jul 2018 11:42:51 +0530

ashik.ali – 1 file(s) modified

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

Rev 23846 –

ashik.ali — Tue, 03 Jul 2018 11:42:07 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java

Rev 23845 –

ashik.ali — Tue, 03 Jul 2018 11:33:43 +0530

ashik.ali – 2 file(s) modified

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

Rev 23844 – Fixed

amit.gupta — Tue, 03 Jul 2018 11:30:02 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 23843 –

ashik.ali — Tue, 03 Jul 2018 11:28:22 +0530

ashik.ali – 1 file(s) modified

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

Rev 23842 –

ashik.ali — Tue, 03 Jul 2018 11:26:23 +0530

ashik.ali – 1 file(s) modified

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

Rev 23841 – Fixed Skeleton

amit.gupta — Tue, 03 Jul 2018 11:22:32 +0530

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

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java