SmartDukaan – /trunk/PyDTR/src/scripts/ActivityReport.py

Rev 24383 – Added major commit to remove dtr-data

amit.gupta — Thu, 27 Dec 2018 17:32:47 +0530

amit.gupta – 53 file(s) modified
Added major commit to remove dtr-data

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/AuthUser.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Activity.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Ticket.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/TicketSubCategory.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivityType.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/ActivityRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketCategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketCategoryRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketSubCategoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/Mongo.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/user/UserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AuthUserController.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/LoginController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/login.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth-users-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/change-auth-user-password.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-auth-user.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/forget-password.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/login.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/user-profile.vm
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/staging.properties
~ /trunk/PyDTR/src/scripts/ActivityReport.py
~ /trunk/PyDTR/src/scripts/ProfitMandiPushNotificationSender.py
~ /trunk/PyDTR/src/scripts/pushbatchcreditnotification.py
~ /trunk/PyDTR/src/scripts/UserSegmentationLinksMaster.py

Rev 22281 –

amit.gupta — Wed, 16 Aug 2017 17:35:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 20689 –

kshitij.sood — Sat, 07 Jan 2017 16:23:25 +0530

kshitij.sood – 7 file(s) modified

~ /trunk/PyDTR/ProfitMandiNotificationSenderStart.sh
~ /trunk/PyDTR/ProfitMandiSmsSenderStart.sh
~ /trunk/PyDTR/ProfitMandiSmsStatusProcessStart.sh
~ /trunk/PyDTR/src/dtr/storage/Mongo.py
~ /trunk/PyDTR/src/scripts/ActivityReport.py
~ /trunk/PyDTR/src/scripts/pushbatchcreditnotification.py
~ /trunk/PyDTR/src/scripts/UserSegmentationLinksMaster.py

Rev 20172 – added kushal.bhatia@saholic.com where rajneesh.arora@saholic.com is present and replaced manoj.kumar@saholic.com with ...

aman.kumar — Fri, 15 Jul 2016 17:57:20 +0530

aman.kumar – 39 file(s) modified
added kushal.bhatia@saholic.com where rajneesh.arora@saholic.com is present and replaced manoj.kumar@saholic.com with ritesh.chauhan@saholic.com at some places

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
~ /trunk/PyDTR/src/dtr/main.py
~ /trunk/PyDTR/src/dtr/reports/acquisition/crmacqreport.py
~ /trunk/PyDTR/src/dtr/reports/acquisition/dtrcohortanalysis.py
~ /trunk/PyDTR/src/dtr/reports/affiliatereco.py
~ /trunk/PyDTR/src/dtr/reports/AppApprovedTransactionData.py
~ /trunk/PyDTR/src/dtr/reports/crmoutbound.py
~ /trunk/PyDTR/src/dtr/reports/usersegmentation.py
~ /trunk/PyDTR/src/dtr/sources/spice.py
~ /trunk/PyDTR/src/dtr/storage/Mongo.py
~ /trunk/PyDTR/src/dtr/utils/DealSheet.py
~ /trunk/PyDTR/src/dtr/utils/UserSpecificDeals.py
~ /trunk/PyDTR/src/scripts/ActivityReport.py
~ /trunk/PyDTR/src/scripts/AmazonBestSellers.py
~ /trunk/PyDTR/src/scripts/FlipkartBestSeller.py
~ /trunk/PyDTR/src/scripts/FreeBOfferFetcher.py
~ /trunk/PyDTR/src/scripts/HomeShopBestSellers.py
~ /trunk/PyDTR/src/scripts/IgnorePricingItems.py
~ /trunk/PyDTR/src/scripts/NegativeItems.py
~ /trunk/PyDTR/src/scripts/NoNlcAlert.py
~ /trunk/PyDTR/src/scripts/PaytmBestSellers.py
~ /trunk/PyDTR/src/scripts/SaholicBestSellers.py
~ /trunk/PyDTR/src/scripts/ShopCluesBestSellers.py
~ /trunk/PyDTR/src/scripts/SnapdealBestSellers.py
~ /trunk/PyDTR/src/scripts/UserInviteCode.py
~ /trunk/PyDTR/src/scripts/walletrefundreport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/DTRReports.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/HighVolumeCustomerRecharge.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/InsuranceDeclaration.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/OneAssistData.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/RechargeUnknownReport.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/SourceWiseItemReturnReportExceptMobilesTab.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/SourceWiseSaleReturn.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/PendingPurchaseOrderReport.py
~ /trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py

Rev 20046 – Added rajender, himanshu and khushal.

rajender — Thu, 16 Jun 2016 16:19:59 +0530

rajender – 11 file(s) modified
Added rajender, himanshu and khushal.

~ /trunk/PyDTR/src/dtr/reports/acquisition/dtrcohortanalysis.py
~ /trunk/PyDTR/src/dtr/reports/AppApprovedTransactionData.py
~ /trunk/PyDTR/src/dtr/reports/crmoutbound.py
~ /trunk/PyDTR/src/dtr/utils/utils.py
~ /trunk/PyDTR/src/scripts/ActivityReport.py
~ /trunk/PyDTR/src/scripts/FavoritesReports.py
~ /trunk/PyDTR/src/scripts/monthlyoffercashback.py
~ /trunk/PyDTR/src/scripts/ProfitMandiUserDataUpdationRequest.py
~ /trunk/PyDTR/src/scripts/UserInviteCode.py
~ /trunk/PyDTR/src/scripts/UserRegistrationReport.py
~ /trunk/PyDTR/src/scripts/walletrefundreport.py

Rev 18468 – Fixed cutoff month logic it should be 12 not 0 ...

amit.gupta — Tue, 02 Feb 2016 11:46:12 +0530

amit.gupta – 1 file(s) modified
Fixed cutoff month logic it should be 12 not 0 when Cutoff month is december.

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

Rev 18309 – Ignoring when there is no activation daily

manas — Wed, 20 Jan 2016 07:21:02 +0530

manas – 1 file(s) modified
Ignoring when there is no activation daily

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

Rev 18201 – Adding users with url for cartdetails in report

manas — Fri, 08 Jan 2016 12:44:53 +0530

manas – 1 file(s) modified
Adding users with url for cartdetails in report

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

Rev 18162 – Changes in monthwise orders

manas — Sun, 03 Jan 2016 20:52:28 +0530

manas – 1 file(s) modified
Changes in monthwise orders

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

Rev 18155 –

manas — Fri, 01 Jan 2016 20:51:14 +0530

manas – 1 file(s) modified

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

Rev 18154 – Changes for grouping year wise.

manas — Fri, 01 Jan 2016 20:49:12 +0530

manas – 1 file(s) modified
Changes for grouping year wise.

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

Rev 18021 – Adding total orders for saholic and for saholic accessories

manas — Fri, 18 Dec 2015 15:07:00 +0530

manas – 1 file(s) modified
Adding total orders for saholic and for saholic accessories

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

Rev 18012 – Adding accessories related details for the saholic orders

manas — Thu, 17 Dec 2015 17:52:40 +0530

manas – 1 file(s) modified
Adding accessories related details for the saholic orders

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

Rev 17765 – Fix for orders not getting captured when user id is ...

manas — Thu, 03 Dec 2015 13:14:37 +0530

manas – 1 file(s) modified
Fix for orders not getting captured when user id is null in flipkart case.

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

Rev 17443 – Committed by Manish Sharma for Mail Sending Issue on 05-Nov-2015

manish.sharma — Thu, 05 Nov 2015 15:20:41 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Mail Sending Issue on 05-Nov-2015

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

Rev 17396 – Changed the logic for fetching from Mongo to Mysql the ...

manas — Sat, 31 Oct 2015 09:15:50 +0530

manas – 1 file(s) modified
Changed the logic for fetching from Mongo to Mysql the order details from the allorder table.

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

Rev 17275 – Added for last month only

amit.gupta — Mon, 19 Oct 2015 11:44:51 +0530

amit.gupta – 1 file(s) modified
Added for last month only

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

Rev 17269 – Added flipkart orders value and volume in weekly report

manas — Thu, 15 Oct 2015 12:25:11 +0530

manas – 1 file(s) modified
Added flipkart orders value and volume in weekly report

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

Rev 17266 –

manas — Thu, 15 Oct 2015 08:13:02 +0530

manas – 1 file(s) modified

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

Rev 17265 – Changed total registered users and weekly queries.

manas — Thu, 15 Oct 2015 08:11:03 +0530

manas – 1 file(s) modified
Changed total registered users and weekly queries.

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

Rev 17217 – Changes pertaining to cutoff date.

manas — Mon, 12 Oct 2015 11:42:17 +0530

manas – 1 file(s) modified
Changes pertaining to cutoff date.

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

Rev 17209 – Added past 2 months + current month runnung

amit.gupta — Thu, 08 Oct 2015 14:44:21 +0530

amit.gupta – 1 file(s) modified
Added past 2 months + current month runnung

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

Rev 17171 – Fixed dates

amit.gupta — Mon, 05 Oct 2015 15:29:17 +0530

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

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

Rev 17158 –

amit.gupta — Sat, 03 Oct 2015 15:43:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 17157 –

amit.gupta — Sat, 03 Oct 2015 15:42:23 +0530

amit.gupta – 1 file(s) modified

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

Rev 17135 –

amit.gupta — Thu, 01 Oct 2015 16:17:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 17134 – Added update for last hours

amit.gupta — Thu, 01 Oct 2015 16:13:41 +0530

amit.gupta – 1 file(s) modified
Added update for last hours

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

Rev 17128 – Reverted back to previous version

manas — Thu, 01 Oct 2015 12:12:32 +0530

manas – 1 file(s) modified
Reverted back to previous version

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

Rev 17126 –

manas — Thu, 01 Oct 2015 10:38:15 +0530

manas – 1 file(s) modified

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

Rev 17125 – Changed date print method

manas — Thu, 01 Oct 2015 08:25:32 +0530

manas – 1 file(s) modified
Changed date print method

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

Rev 17116 – removed comments

manas — Tue, 29 Sep 2015 13:13:02 +0530

manas – 1 file(s) modified
removed comments

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

Rev 17032 –

manas — Tue, 22 Sep 2015 17:40:28 +0530

manas – 1 file(s) modified

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

Rev 17031 – updated condition from created to activation time

manas — Tue, 22 Sep 2015 17:08:46 +0530

manas – 1 file(s) modified
updated condition from created to activation time

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

Rev 16973 – Updated email id

manas — Wed, 16 Sep 2015 13:30:08 +0530

manas – 1 file(s) modified
Updated email id

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

Rev 16965 –

manas — Tue, 15 Sep 2015 14:36:44 +0530

manas – 1 file(s) modified

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

Rev 16964 – Added saholic orders volume and value

manas — Tue, 15 Sep 2015 14:32:16 +0530

manas – 1 file(s) modified
Added saholic orders volume and value

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

Rev 16933 –

manas — Fri, 11 Sep 2015 23:28:51 +0530

manas – 1 file(s) modified

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

Rev 16931 –

manas — Fri, 11 Sep 2015 22:54:28 +0530

manas – 1 file(s) modified

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

Rev 15551 – Updated Activity Report with flipkart order details and monthly reports

manas — Fri, 12 Jun 2015 18:09:04 +0530

manas – 1 file(s) modified
Updated Activity Report with flipkart order details and monthly reports

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

Rev 15244 – Changed condition for order status and user count with the ...

manas — Wed, 20 May 2015 18:39:20 +0530

manas – 1 file(s) modified
Changed condition for order status and user count with the campaign value

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