SmartDukaan – /

Rev 24179 –

govind — Wed, 31 Oct 2018 17:14:49 +0530

govind – 1 file(s) modified

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

Rev 24178 –

govind — Wed, 31 Oct 2018 17:10:28 +0530

govind – 1 file(s) modified

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

Rev 24177 –

govind — Wed, 31 Oct 2018 17:03:13 +0530

govind – 3 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java

Rev 24176 – Fixed dropdown issue

amit.gupta — Wed, 31 Oct 2018 16:45:21 +0530

amit.gupta – 4 file(s) modified
Fixed dropdown issue

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 24175 –

govind — Wed, 31 Oct 2018 15:42:05 +0530

govind – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java

Rev 24174 –

govind — Wed, 31 Oct 2018 15:00:20 +0530

govind – 4 file(s) modified

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java

Rev 24173 – Partner Target

govind — Wed, 31 Oct 2018 12:01:50 +0530

govind – 4 file(s) modified
Partner Target

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java

Rev 24172 –

amit.gupta — Wed, 31 Oct 2018 11:04:13 +0530

amit.gupta – 1 file(s) modified

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

Rev 24171 – Partner Target

govind — Wed, 31 Oct 2018 10:12:07 +0530

govind – 25 file(s) modified
Partner Target

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PartnerTargetSlab.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TargetSlabModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerTarget.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/TargetSlab.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
~ /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/dao/repository/fofo/PartnerTargetRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTargetRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TargetSlabRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-target.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-target-slab.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-target-details-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-target-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-target.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/upload-partner.vm

Rev 24170 –

amit.gupta — Tue, 30 Oct 2018 17:22:45 +0530

amit.gupta – 1 file(s) modified

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

Rev 24169 – Fixed

amit.gupta — Tue, 30 Oct 2018 17:21:49 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 24168 – Fixed Item issue. Improved nonbillable scenario

amit.gupta — Tue, 30 Oct 2018 17:10:10 +0530

amit.gupta – 38 file(s) modified
Fixed Item issue. Improved nonbillable scenario

~ /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
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/DeliveryNoteIdGenerationSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Warehouse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.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/AdminDeliveryNoteRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/AdminDeliveryNoteRepositoryImpl.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
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/DeliveryNoteIdGenerationSequenceRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/nonbillable/DeliveryNoteIdGenerationSequenceRepositoryImpl.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/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/service/nonbillable/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/nonbillable/WarehouseServiceImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/item.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-drop.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/instruction-items.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-in-items.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-items.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 24167 –

amit.gupta — Tue, 30 Oct 2018 13:02:33 +0530

amit.gupta – 1 file(s) modified

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

Rev 24166 – Fixed non billable

amit.gupta — Mon, 29 Oct 2018 15:18:19 +0530

amit.gupta – 1 file(s) modified
Fixed non billable

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

Rev 24165 – Handle usecases for No GST

amit.gupta — Mon, 29 Oct 2018 13:03:33 +0530

amit.gupta – 1 file(s) modified
Handle usecases for No GST

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

Rev 24164 – Added NOGST as hsnCode

amit.gupta — Mon, 29 Oct 2018 12:10:59 +0530

amit.gupta – 1 file(s) modified
Added NOGST as hsnCode

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

Rev 24163 – Blocked Vivo billing for Partners.

amit.gupta — Fri, 26 Oct 2018 15:40:05 +0530

amit.gupta – 1 file(s) modified
Blocked Vivo billing for Partners.

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

Rev 24162 – change

tejbeer — Wed, 24 Oct 2018 10:35:18 +0530

tejbeer – 1 file(s) modified
change

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

Rev 24161 –

tejbeer — Tue, 23 Oct 2018 17:23:58 +0530

tejbeer – 1 file(s) modified

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

Rev 24160 –

tejbeer — Thu, 18 Oct 2018 10:45:51 +0530

tejbeer – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/punch-in-outs.vm

Rev 24159 – promoter Attendance

tejbeer — Wed, 17 Oct 2018 16:02:41 +0530

tejbeer – 22 file(s) modified
promoter Attendance

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/AddLocationModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PromoterDetailModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Location.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Promoter.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AttendanceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/AttendanceRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PromoterRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PromoterRepositoryImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/promoter-info.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
x /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-location-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/punch-in-outs.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm

Rev 24158 –

govind — Tue, 16 Oct 2018 11:12:23 +0530

govind – 1 file(s) modified

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

Rev 24157 –

govind — Tue, 16 Oct 2018 11:07:26 +0530

govind – 1 file(s) modified

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

Rev 24156 –

govind — Tue, 16 Oct 2018 11:03:20 +0530

govind – 1 file(s) modified

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

Rev 24155 –

govind — Tue, 16 Oct 2018 10:42:43 +0530

govind – 1 file(s) modified

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

Rev 24154 –

amit.gupta — Mon, 15 Oct 2018 16:34:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 24153 – Added items to cart

amit.gupta — Mon, 15 Oct 2018 16:20:25 +0530

amit.gupta – 1 file(s) modified
Added items to cart

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

Rev 24152 – Payment Option Editing

govind — Fri, 12 Oct 2018 17:18:33 +0530

govind – 4 file(s) modified
Payment Option Editing

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentOptionTransactionModel.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm

Rev 24151 –

amit.gupta — Thu, 11 Oct 2018 16:35:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 24150 – Added debit note status

amit.gupta — Thu, 11 Oct 2018 13:08:27 +0530

amit.gupta – 1 file(s) modified
Added debit note status

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/PurchaseReturnStatus.java

Rev 24149 – For accessories of amount less than Rs. 1000 availability would ...

amit.gupta — Wed, 10 Oct 2018 16:17:24 +0530

amit.gupta – 1 file(s) modified
For accessories of amount less than Rs. 1000 availability would be more than 10

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

Rev 24148 –

govind — Wed, 10 Oct 2018 13:05:51 +0530

govind – 1 file(s) modified

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

Rev 24147 –

govind — Wed, 10 Oct 2018 13:03:47 +0530

govind – 1 file(s) modified

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

Rev 24146 –

govind — Wed, 10 Oct 2018 12:37:16 +0530

govind – 3 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-target.vm

Rev 24145 – Changed max recharge per day to 10000

amit.gupta — Wed, 10 Oct 2018 12:09:06 +0530

amit.gupta – 1 file(s) modified
Changed max recharge per day to 10000

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

Rev 24144 – Annoucement change

tejbeer — Mon, 08 Oct 2018 12:56:45 +0530

tejbeer – 2 file(s) modified
Annoucement change

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

Rev 24143 – Fixed commit

amit.gupta — Mon, 08 Oct 2018 12:24:57 +0530

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

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

Rev 24142 – Fixed date

amit.gupta — Mon, 08 Oct 2018 12:23:18 +0530

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

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

Rev 24141 – Sale Target

govind — Mon, 08 Oct 2018 10:06:04 +0530

govind – 1 file(s) modified
Sale Target

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java

Rev 24140 – Added location

amit.gupta — Sat, 06 Oct 2018 16:23:34 +0530

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

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