SmartDukaan – /

Rev 24256 – Added monthly processing for schemes

amit.gupta — Mon, 03 Dec 2018 16:54:31 +0530

amit.gupta – 7 file(s) modified
Added monthly processing for schemes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.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/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java

Rev 24255 –

govind — Mon, 03 Dec 2018 10:07:33 +0530

govind – 1 file(s) modified

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

Rev 24254 –

govind — Fri, 30 Nov 2018 15:57:33 +0530

govind – 1 file(s) modified

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

Rev 24253 – Added invoice Number

amit.gupta — Wed, 28 Nov 2018 17:35:01 +0530

amit.gupta – 1 file(s) modified
Added invoice Number

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

Rev 24252 – Fixed email

amit.gupta — Wed, 28 Nov 2018 14:53:57 +0530

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

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

Rev 24251 – Fixed formatDate

amit.gupta — Wed, 28 Nov 2018 13:49:42 +0530

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

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

Rev 24250 – Fixed Formatting

amit.gupta — Wed, 28 Nov 2018 12:57:04 +0530

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

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

Rev 24249 – Trying to generate sheet for validating XLS

amit.gupta — Wed, 28 Nov 2018 11:44:55 +0530

amit.gupta – 1 file(s) modified
Trying to generate sheet for validating XLS

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

Rev 24248 – Changes in target and Profile

govind — Mon, 26 Nov 2018 18:23:18 +0530

govind – 13 file(s) modified
Changes in target and Profile

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerTargetDetails.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/PartnerTargetRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.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/RetailerServiceImpl.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/PartnerTargetController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
~ /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.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm

Rev 24247 – Fixed commit

amit.gupta — Mon, 26 Nov 2018 15:28:41 +0530

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

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

Rev 24246 – Fixed Scheme Out Processing

amit.gupta — Thu, 22 Nov 2018 09:34:19 +0530

amit.gupta – 1 file(s) modified
Fixed Scheme Out Processing

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

Rev 24245 – Fixed Out Param.

amit.gupta — Thu, 22 Nov 2018 09:22:02 +0530

amit.gupta – 2 file(s) modified
Fixed Out Param.

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

Rev 24244 – Fixed Checking

amit.gupta — Tue, 20 Nov 2018 16:14:57 +0530

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

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

Rev 24243 – Fixed scan Record

amit.gupta — Tue, 20 Nov 2018 15:39:50 +0530

amit.gupta – 2 file(s) modified
Fixed scan Record

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

Rev 24242 –

amit.gupta — Tue, 20 Nov 2018 15:37:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 24241 – Added scheme monitoring for type AMOUNT

amit.gupta — Tue, 20 Nov 2018 12:55:48 +0530

amit.gupta – 2 file(s) modified
Added scheme monitoring for type AMOUNT

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

Rev 24240 –

amit.gupta — Mon, 19 Nov 2018 18:26:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 24239 –

amit.gupta — Mon, 19 Nov 2018 16:41:47 +0530

amit.gupta – 1 file(s) modified

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

Rev 24238 –

amit.gupta — Mon, 19 Nov 2018 16:35:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 24237 – Added invoice migration

amit.gupta — Mon, 19 Nov 2018 16:31:23 +0530

amit.gupta – 1 file(s) modified
Added invoice migration

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

Rev 24236 – Fixed Invoice generation sequence

amit.gupta — Mon, 19 Nov 2018 15:41:33 +0530

amit.gupta – 1 file(s) modified
Fixed Invoice generation sequence

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

Rev 24235 – Fixed

amit.gupta — Mon, 19 Nov 2018 13:14:56 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 24234 –

amit.gupta — Sun, 18 Nov 2018 09:55:53 +0530

amit.gupta – 1 file(s) modified

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

Rev 24233 – Fixed headers

amit.gupta — Sun, 18 Nov 2018 09:43:22 +0530

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

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

Rev 24232 – Fixed

amit.gupta — Sun, 18 Nov 2018 09:01:23 +0530

amit.gupta – 2 file(s) modified
Fixed

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

Rev 24231 – Missed commit

amit.gupta — Sat, 17 Nov 2018 19:34:04 +0530

amit.gupta – 2 file(s) modified
Missed commit

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java

Rev 24230 – Added version number.

amit.gupta — Sat, 17 Nov 2018 19:32:04 +0530

amit.gupta – 1 file(s) modified
Added version number.

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

Rev 24229 – Fixed indent

amit.gupta — Sat, 17 Nov 2018 19:30:11 +0530

amit.gupta – 13 file(s) modified
Fixed indent

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CatalogListingModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/StockAllocationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/StockAllocation.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.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/inventory/StockAllocationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StockAllocationRepositoryImp.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/StockAllocationServiceImpl.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

Rev 24228 –

amit.gupta — Thu, 15 Nov 2018 16:45:56 +0530

amit.gupta – 1 file(s) modified

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

Rev 24227 – In case order is from backend do not charge shipping ...

amit.gupta — Thu, 15 Nov 2018 16:45:22 +0530

amit.gupta – 1 file(s) modified
In case order is from backend do not charge shipping cost.

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

Rev 24226 – fixed changes related to security

amit.gupta — Thu, 15 Nov 2018 12:59:46 +0530

amit.gupta – 3 file(s) modified
fixed changes related to security

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 24225 – Added new version

amit.gupta — Wed, 14 Nov 2018 16:49:57 +0530

amit.gupta – 1 file(s) modified
Added new version

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

Rev 24224 – Changed password

amit.gupta — Tue, 13 Nov 2018 10:47:47 +0530

amit.gupta – 1 file(s) modified
Changed password

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/ReporticoService.java

Rev 24223 –

amit.gupta — Mon, 12 Nov 2018 17:05:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 24222 –

amit.gupta — Mon, 12 Nov 2018 17:02:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 24221 –

amit.gupta — Mon, 12 Nov 2018 16:38:46 +0530

amit.gupta – 1 file(s) modified

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

Rev 24220 – Fixed velocities

amit.gupta — Mon, 12 Nov 2018 16:37:38 +0530

amit.gupta – 17 file(s) modified
Fixed velocities

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ItemLedgerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge-commission.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-vendor.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-warehouse.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-ledger-download.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/items.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-download.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-message.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/send-notification.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/unsettled-payments.vm

Rev 24219 – Fixed

amit.gupta — Mon, 12 Nov 2018 15:28:58 +0530

amit.gupta – 2 file(s) modified
Fixed

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

Rev 24218 –

amit.gupta — Mon, 12 Nov 2018 15:25:06 +0530

amit.gupta – 1 file(s) modified

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

Rev 24217 –

amit.gupta — Mon, 12 Nov 2018 15:21:03 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-ledger-download.vm