SmartDukaan – /

Rev 24276 – Fixed partner mark

amit.gupta — Tue, 11 Dec 2018 16:30:22 +0530

amit.gupta – 12 file(s) modified
Fixed partner mark

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyInvestmentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerDailyRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TargetSlabRepository.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupportController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

Rev 24275 – Fixed sales method

amit.gupta — Tue, 11 Dec 2018 12:13:15 +0530

amit.gupta – 1 file(s) modified
Fixed sales method

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

Rev 24274 –

amit.gupta — Tue, 11 Dec 2018 11:54:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 24273 –

amit.gupta — Tue, 11 Dec 2018 11:50:11 +0530

amit.gupta – 1 file(s) modified

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

Rev 24272 –

amit.gupta — Tue, 11 Dec 2018 11:42:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 24271 – Added Neeraj

amit.gupta — Tue, 11 Dec 2018 11:24:26 +0530

amit.gupta – 17 file(s) modified
Added Neeraj

~ /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/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ScanRecordRepositoryImpl.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/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/customer-return.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/dashboard.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/search-order-details.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 24270 – Fixed DOA Out

amit.gupta — Fri, 07 Dec 2018 17:14:25 +0530

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

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm

Rev 24269 – Dont add entry if wallet is not going to change

amit.gupta — Fri, 07 Dec 2018 12:35:55 +0530

amit.gupta – 1 file(s) modified
Dont add entry if wallet is not going to change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 24268 – refund only when amount is greater than 0

amit.gupta — Fri, 07 Dec 2018 11:49:44 +0530

amit.gupta – 1 file(s) modified
refund only when amount is greater than 0

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

Rev 24267 – Fixed commit

amit.gupta — Thu, 06 Dec 2018 19:49:28 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemIdTypeQuantity.java

Rev 24266 –

amit.gupta — Thu, 06 Dec 2018 19:47:34 +0530

amit.gupta – 2 file(s) modified

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

Rev 24265 – Fixed exit

amit.gupta — Thu, 06 Dec 2018 19:46:07 +0530

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

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

Rev 24264 – Added logic to cancel invoice

amit.gupta — Thu, 06 Dec 2018 19:17:41 +0530

amit.gupta – 15 file(s) modified
Added logic to cancel invoice

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CartFofo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerReturnItem.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/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.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/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 24263 – active inactive annoucements and contact us page

tejbeer — Tue, 04 Dec 2018 18:17:21 +0530

tejbeer – 9 file(s) modified
active inactive annoucements and contact us page

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/NotificationDataModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotificationData.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationPanelRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotificationPanelRepositoryImpl.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/NotificationController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 24262 – Fixed

amit.gupta — Tue, 04 Dec 2018 15:38:32 +0530

amit.gupta – 1 file(s) modified
Fixed

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

Rev 24261 – Recharge blocked for selected partners

amit.gupta — Tue, 04 Dec 2018 14:04:04 +0530

amit.gupta – 1 file(s) modified
Recharge blocked for selected partners

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

Rev 24260 –

amit.gupta — Tue, 04 Dec 2018 13:59:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 24259 – Fixed the issue with scheme

amit.gupta — Mon, 03 Dec 2018 17:56:41 +0530

amit.gupta – 1 file(s) modified
Fixed the issue with scheme

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

Rev 24258 – Fixed enddate

amit.gupta — Mon, 03 Dec 2018 17:01:01 +0530

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

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

Rev 24257 – Fixed

amit.gupta — Mon, 03 Dec 2018 16:58:05 +0530

amit.gupta – 1 file(s) modified
Fixed

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

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

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