SmartDukaan – /

Rev 21812 – Fixed services in profitmandi admin

amit.gupta — Mon, 26 Jun 2017 21:32:30 +0530

amit.gupta – 17 file(s) modified
Fixed services in profitmandi admin

~ /trunk/profitmandi-admin/pom.xml
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/admin
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/admin/util
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/AuthController.java
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/interceptor
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
+ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/request/EmailPassword.java
x /trunk/profitmandi-admin/src/main/webapp/resources
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomTransaction.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/Department.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 21811 – Only status 2,4,5,6 are entertained

amit.gupta — Sat, 24 Jun 2017 09:50:04 +0530

amit.gupta – 1 file(s) modified
Only status 2,4,5,6 are entertained

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java

Rev 21810 –

amit.gupta — Sat, 24 Jun 2017 09:40:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java

Rev 21809 –

amit.gupta — Sat, 24 Jun 2017 09:26:32 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21808 –

amit.gupta — Fri, 23 Jun 2017 19:17:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21807 – Fixed descending order

amit.gupta — Fri, 23 Jun 2017 19:12:56 +0530

amit.gupta – 1 file(s) modified
Fixed descending order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21806 –

amit.gupta — Fri, 23 Jun 2017 19:02:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java

Rev 21805 – Add payment mode

amit.gupta — Fri, 23 Jun 2017 13:49:27 +0530

amit.gupta – 7 file(s) modified
Add payment mode

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PaymentStatusResponse.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CommonPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java

Rev 21804 – Fixed minor issue

amit.gupta — Fri, 23 Jun 2017 09:14:32 +0530

amit.gupta – 1 file(s) modified
Fixed minor issue

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

Rev 21803 – Provide pricing as max if pricing not found

amit.gupta — Thu, 22 Jun 2017 18:06:27 +0530

amit.gupta – 1 file(s) modified
Provide pricing as max if pricing not found

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 21802 – Added Payment method

amit.gupta — Thu, 22 Jun 2017 17:24:16 +0530

amit.gupta – 1 file(s) modified
Added Payment method

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

Rev 21801 –

ashik.ali — Thu, 22 Jun 2017 15:28:25 +0530

ashik.ali – 8 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RetailerTagRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RetailerTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TagListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java

Rev 21800 –

amit.gupta — Thu, 22 Jun 2017 15:01:35 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java

Rev 21799 –

ashik.ali — Thu, 22 Jun 2017 14:57:56 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 21798 –

ashik.ali — Thu, 22 Jun 2017 14:57:31 +0530

ashik.ali – 2 file(s) modified

Rev 21797 – Added order descending

amit.gupta — Thu, 22 Jun 2017 13:39:38 +0530

amit.gupta – 1 file(s) modified
Added order descending

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepositoryImpl.java

Rev 21796 – Removed subrefernce type

amit.gupta — Thu, 22 Jun 2017 13:32:30 +0530

amit.gupta – 1 file(s) modified
Removed subrefernce type

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/res/UserWalletHistoryResponse.java

Rev 21795 –

amit.gupta — Thu, 22 Jun 2017 13:30:01 +0530

amit.gupta – 1 file(s) modified

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

Rev 21794 – Removed sub reference type

amit.gupta — Thu, 22 Jun 2017 13:23:38 +0530

amit.gupta – 1 file(s) modified
Removed sub reference type

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java

Rev 21793 –

ashik.ali — Thu, 22 Jun 2017 11:23:05 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/request/CreateTagListingRequest.java

Rev 21792 –

ashik.ali — Thu, 22 Jun 2017 11:22:31 +0530

ashik.ali – 1 file(s) modified

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

Rev 21791 –

amit.gupta — Wed, 21 Jun 2017 23:31:57 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java

Rev 21790 –

ashik.ali — Wed, 21 Jun 2017 17:55:00 +0530

ashik.ali – 1 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java

Rev 21789 –

ashik.ali — Wed, 21 Jun 2017 17:54:40 +0530

ashik.ali – 5 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/tag/TagServiceImpl.java

Rev 21788 –

ashik.ali — Wed, 21 Jun 2017 17:19:58 +0530

ashik.ali – 1 file(s) modified

x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service

Rev 21787 –

ashik.ali — Wed, 21 Jun 2017 17:03:17 +0530

ashik.ali – 9 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PinCodeTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RetailerTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TagListing.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/fofo/PinCodeTagRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinCodeTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RetailerTagRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TagRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/TagRepositoryImpl.java

Rev 21786 –

ashik.ali — Wed, 21 Jun 2017 17:01:16 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-common/pom.xml
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TagListingModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 21785 –

ashik.ali — Wed, 21 Jun 2017 16:59:23 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/PinCodeTagController.java
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/RetailerTagController.java
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java

Rev 21784 – Added code for retailer activation

amit.gupta — Wed, 21 Jun 2017 13:31:20 +0530

amit.gupta – 1 file(s) modified
Added code for retailer activation

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

Rev 21783 –

ashik.ali — Tue, 20 Jun 2017 19:01:42 +0530

ashik.ali – 1 file(s) modified

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

Rev 21782 –

ashik.ali — Tue, 20 Jun 2017 18:58:30 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerRepositoryImpl.java

Rev 21781 –

ashik.ali — Tue, 20 Jun 2017 18:58:16 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerRepository.java

Rev 21780 –

ashik.ali — Tue, 20 Jun 2017 18:58:01 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/request/CreateTagRequest.java

Rev 21779 –

ashik.ali — Tue, 20 Jun 2017 18:49:44 +0530

ashik.ali – 1 file(s) modified

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

Rev 21778 –

ashik.ali — Tue, 20 Jun 2017 16:27:48 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/request/CreateTagRequest.java

Rev 21777 –

ashik.ali — Tue, 20 Jun 2017 16:27:35 +0530

ashik.ali – 1 file(s) modified

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

Rev 21776 –

amit.gupta — Tue, 20 Jun 2017 16:08:36 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21775 – Added new status

amit.gupta — Tue, 20 Jun 2017 14:57:56 +0530

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

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21774 – Derived fields should now create status

amit.gupta — Tue, 20 Jun 2017 14:47:40 +0530

amit.gupta – 1 file(s) modified
Derived fields should now create status

~ /trunk/PyDTR/src/dtr/main.py

Rev 21773 –

amit.gupta — Tue, 20 Jun 2017 13:59:49 +0530

amit.gupta – 1 file(s) modified

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