SmartDukaan – /

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

Rev 23840 –

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

ashik.ali – 1 file(s) modified

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

Rev 23839 – changed mail domain profitmandi.com -> smartdukaan.com

amit.gupta — Tue, 03 Jul 2018 11:15:44 +0530

amit.gupta – 30 file(s) modified
changed mail domain profitmandi.com -> smartdukaan.com

~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMEmailProcessor.java
~ /trunk/Crm/src/main/java/in/shop2020/util/EmailReader.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/nonbillable/Warehouse.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ContactUsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/PyDTR/src/scripts/AmazonBestSellers.py
~ /trunk/PyDTR/src/scripts/FlipkartBestSeller.py
~ /trunk/PyDTR/src/scripts/HomeShopBestSellers.py
~ /trunk/PyDTR/src/scripts/PaytmBestSellers.py
~ /trunk/PyDTR/src/scripts/ProfitMandiUserDataUpdationRequest.py
~ /trunk/PyDTR/src/scripts/SaholicBestSellers.py
~ /trunk/PyDTR/src/scripts/ShopCluesBestSellers.py
~ /trunk/PyDTR/src/scripts/SnapdealBestSellers.py
~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
~ /trunk/PyProj/src/shop2020/logistics/service/script/EcomAwbUpdater.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/EcomExpressLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/ProfitMandiSalesAssociate.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/RQuickLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/PendingPurchaseOrderReport.py
~ /trunk/PyProj/src/shop2020/utils/EmailAttachmentSender.py
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java

Rev 23838 – Punch In Punch out functionality

ashik.ali — Tue, 03 Jul 2018 10:57:55 +0530

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

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

Rev 23837 – Punch In Punch out functionality

ashik.ali — Mon, 02 Jul 2018 18:45:13 +0530

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

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

Rev 23836 – Punch In Punch out functionality

ashik.ali — Mon, 02 Jul 2018 18:44:24 +0530

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

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

Rev 23835 – Punch In Punch out functionality

ashik.ali — Mon, 02 Jul 2018 18:38:32 +0530

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

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

Rev 23834 – Punch In Punch out functionality

ashik.ali — Mon, 02 Jul 2018 18:37:56 +0530

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

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/punch-in-out.js

Rev 23833 –

ashik.ali — Mon, 02 Jul 2018 18:37:21 +0530

ashik.ali – 1 file(s) modified

+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.java

Rev 23832 – Punch In Punch out functionality

ashik.ali — Mon, 02 Jul 2018 18:36:33 +0530

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

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/PunchInOutService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/PunchInOutServiceImpl.java

Rev 23831 – Punch In Punch out functionality

ashik.ali — Mon, 02 Jul 2018 18:36:03 +0530

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

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PunchInOutRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PunchInOutRepositoryImpl.java

Rev 23830 – Punch In Punch out functionality

ashik.ali — Mon, 02 Jul 2018 18:35:17 +0530

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

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/PunchInOut.java

Rev 23829 – Fixed phone number while creating New partners.

amit.gupta — Mon, 02 Jul 2018 17:53:06 +0530

amit.gupta – 2 file(s) modified
Fixed phone number while creating New partners.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js

Rev 23828 –

amit.gupta — Mon, 02 Jul 2018 12:34:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java

Rev 23827 – Reversed orders

amit.gupta — Sun, 01 Jul 2018 11:44:40 +0530

amit.gupta – 1 file(s) modified
Reversed orders

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

Rev 23826 –

amit.gupta — Sat, 30 Jun 2018 17:52:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 23825 – Fixed

amit.gupta — Sat, 30 Jun 2018 17:24:55 +0530

amit.gupta – 2 file(s) modified
Fixed

Rev 23824 – Fixed Line Item Imei

amit.gupta — Sat, 30 Jun 2018 09:25:40 +0530

amit.gupta – 10 file(s) modified
Fixed Line Item Imei

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LineItemImei.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/transaction/LineItemImeisRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java

Rev 23823 – Fixed reports.

amit.gupta — Fri, 29 Jun 2018 17:16:33 +0530

amit.gupta – 6 file(s) modified
Fixed reports.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.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/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java

Rev 23822 –

amit.gupta — Fri, 29 Jun 2018 11:10:20 +0530

amit.gupta – 1 file(s) modified

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

Rev 23821 – Fixed Hot Deals

amit.gupta — Fri, 29 Jun 2018 08:16:17 +0530

amit.gupta – 5 file(s) modified
Fixed Hot Deals

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PriceModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 23820 –

amit.gupta — Fri, 29 Jun 2018 08:11:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23819 – For PriceDrop Application

govind — Wed, 27 Jun 2018 16:54:57 +0530

govind – 19 file(s) modified
For PriceDrop Application

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LineItemImeisRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropIMEIRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/PriceDropRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.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/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop.vm

Rev 23818 –

amit.gupta — Wed, 27 Jun 2018 14:34:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/resources/orderformat.xlsx

Rev 23817 –

amit.gupta — Wed, 27 Jun 2018 13:28:58 +0530

amit.gupta – 1 file(s) modified

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

Rev 23816 –

amit.gupta — Wed, 27 Jun 2018 13:22:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 23815 –

amit.gupta — Wed, 27 Jun 2018 13:17:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23814 – Fixed for Hot Deals

amit.gupta — Wed, 27 Jun 2018 12:28:52 +0530

amit.gupta – 2 file(s) modified
Fixed for Hot Deals

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 23813 – Added is fofo flag

amit.gupta — Wed, 27 Jun 2018 10:12:58 +0530

amit.gupta – 1 file(s) modified
Added is fofo flag

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

Rev 23812 – Added feature to reverse advance amount in wallet

amit.gupta — Wed, 27 Jun 2018 06:56:25 +0530

amit.gupta – 2 file(s) modified
Added feature to reverse advance amount in wallet

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm

Rev 23811 –

amit.gupta — Wed, 27 Jun 2018 06:53:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 23810 –

amit.gupta — Wed, 27 Jun 2018 06:48:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 23809 – Added feature to reverse advance amount in wallet

amit.gupta — Wed, 27 Jun 2018 06:38:04 +0530

amit.gupta – 3 file(s) modified
Added feature to reverse advance amount in wallet

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserWalletCreditController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm

Rev 23808 –

amit.gupta — Tue, 26 Jun 2018 18:39:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/FofoSolr.py

Rev 23807 –

amit.gupta — Tue, 26 Jun 2018 17:59:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/FofoSolr.py