SmartDukaan – /

Rev 24203 – Gifts can now be biilled

amit.gupta — Fri, 02 Nov 2018 19:42:45 +0530

amit.gupta – 9 file(s) modified
Gifts can now be biilled

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.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/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scan-out-partner-items.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java

Rev 24202 –

amit.gupta — Fri, 02 Nov 2018 19:14:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 24201 –

govind — Fri, 02 Nov 2018 17:38:13 +0530

govind – 1 file(s) modified

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

Rev 24200 – Handled non billable items

amit.gupta — Fri, 02 Nov 2018 14:27:47 +0530

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

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

Rev 24199 –

amit.gupta — Fri, 02 Nov 2018 14:25:54 +0530

amit.gupta – 1 file(s) modified

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

Rev 24198 – Fixed Nonbillable items addition to cart.

amit.gupta — Fri, 02 Nov 2018 13:43:48 +0530

amit.gupta – 1 file(s) modified
Fixed Nonbillable items addition to cart.

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

Rev 24197 –

amit.gupta — Fri, 02 Nov 2018 13:03:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 24196 –

govind — Fri, 02 Nov 2018 12:21:53 +0530

govind – 1 file(s) modified

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

Rev 24195 –

govind — Fri, 02 Nov 2018 11:01:00 +0530

govind – 1 file(s) modified

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

Rev 24194 –

govind — Fri, 02 Nov 2018 10:25:28 +0530

govind – 1 file(s) modified

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

Rev 24193 –

govind — Fri, 02 Nov 2018 10:15:16 +0530

govind – 2 file(s) modified

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

govind — Fri, 02 Nov 2018 10:03:35 +0530

govind – 2 file(s) modified

~ /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 24191 – Fixed item search type ahead

amit.gupta — Fri, 02 Nov 2018 00:36:52 +0530

amit.gupta – 4 file(s) modified
Fixed item search type ahead

~ /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-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js

Rev 24190 –

govind — Thu, 01 Nov 2018 18:24:11 +0530

govind – 1 file(s) modified

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

Rev 24189 –

govind — Thu, 01 Nov 2018 18:13:55 +0530

govind – 4 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/Application.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 24188 –

govind — Thu, 01 Nov 2018 17:39:57 +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/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 24187 –

govind — Thu, 01 Nov 2018 16:33:36 +0530

govind – 1 file(s) modified

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

Rev 24186 –

govind — Thu, 01 Nov 2018 16:15:43 +0530

govind – 1 file(s) modified

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

Rev 24185 –

govind — Thu, 01 Nov 2018 16:08:02 +0530

govind – 1 file(s) modified

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

Rev 24184 –

govind — Thu, 01 Nov 2018 16:03:10 +0530

govind – 4 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/TargetSlabService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/slab/TargetSlabServiceImpl.java

Rev 24183 –

govind — Thu, 01 Nov 2018 12:47:30 +0530

govind – 3 file(s) modified

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

govind — Thu, 01 Nov 2018 10:52:35 +0530

govind – 1 file(s) modified

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

Rev 24181 –

govind — Thu, 01 Nov 2018 10:05:23 +0530

govind – 1 file(s) modified

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

Rev 24180 – Fixed price drop

amit.gupta — Wed, 31 Oct 2018 17:21:46 +0530

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

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

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