SmartDukaan – //trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java

Rev 23936 – AddtoWalletRequest

tejbeer — Thu, 19 Jul 2018 17:28:47 +0530

tejbeer – 15 file(s) modified
AddtoWalletRequest

~ /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/AddWalletRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/AddWalletRequestStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.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/WalletController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/add-wallet-request.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateAddMoneyRequest.java

Rev 23568 – Fixed changes related to logging. Updated to log4j2

govind — Tue, 17 Apr 2018 17:23:28 +0530

govind – 94 file(s) modified
Fixed changes related to logging. Updated to log4j2

~ /trunk/profitmandi-common/build.gradle
~ /trunk/profitmandi-common/pom.xml
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/ResponseCodeHolder.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/HelperServiceUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/SnapdealProductPageParser.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/interceptor/SimpleCORSInterceptor.java
x /trunk/profitmandi-common/src/main/resources/log4j.xml
~ /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/transaction/TransactionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/CustomTransactionConvertorUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/LogisticsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/PaymentOptionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CronController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FofoController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.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/MongoMigrationController.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/PaymentOptionController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.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/RegisterController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/MVCResponseSender.java
+ /trunk/profitmandi-fofo/src/main/resources/log4j2.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/CodPaymentService.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/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.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/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/PaymentUtils.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/payment/WalletPaymentService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java
x /trunk/profitmandi-web/src/main/resources/log4j.xml
+ /trunk/profitmandi-web/src/main/resources/log4j2.xml

Rev 23532 – Added changes related to returns

amit.gupta — Sun, 08 Apr 2018 13:58:38 +0530

amit.gupta – 15 file(s) modified
Added changes related to returns

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DebitNotePdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.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/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 22931 –

ashik.ali — Wed, 15 Nov 2017 12:08:56 +0530

ashik.ali – 31 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPaymentService.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/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/GoogleLoginRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/JsonProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest

Rev 22372 –

amit.gupta — Sat, 02 Sep 2017 22:09:05 +0530

amit.gupta – 1 file(s) modified

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

Rev 22040 – Added exception for profitmandi

amit.gupta — Sat, 22 Jul 2017 18:09:09 +0530

amit.gupta – 2 file(s) modified
Added exception for profitmandi

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

Rev 21740 –

ashik.ali — Thu, 15 Jun 2017 19:51:36 +0530

ashik.ali – 31 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/EntityController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LogisticsTrackingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/ApiRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateRetailerRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateShopRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/GoogleLoginRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/RoleRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/model
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/JsonProcessor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/util

Rev 21735 –

ashik.ali — Thu, 15 Jun 2017 19:00:26 +0530

ashik.ali – 34 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ClicksController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LivePricingController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MasterDataController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/ApiRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateUserRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/GoogleLoginRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/RoleRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/OtpProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Role.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateAddressJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateApiJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRoleJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateUserJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GoogleLoginApiJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/UpdateApiJsonValidator.java

Rev 21734 –

ashik.ali — Thu, 15 Jun 2017 18:39:29 +0530

ashik.ali – 2 file(s) modified

x /trunk/profitmandi-api
+ /trunk/profitmandi-web (copied from /trunk/profitmandi-api@21733)

Rev 21730 –

ashik.ali — Thu, 15 Jun 2017 16:32:49 +0530

ashik.ali – 2 file(s) modified

+ /trunk/profitmandi-api (copied from /trunk/profitmandi-web@21729)
x /trunk/profitmandi-web

Rev 21699 –

ashik.ali — Tue, 13 Jun 2017 17:00:52 +0530

ashik.ali – 1 file(s) modified

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

Rev 21666 – Fixed controllers related to address

amit.gupta — Fri, 09 Jun 2017 11:13:29 +0530

amit.gupta – 10 file(s) modified
Fixed controllers related to address

+ /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-common/src/main/resources/response-codes.properties
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/FofoItemId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/impl/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java

Rev 21496 –

ashik.ali — Thu, 18 May 2017 19:51:19 +0530

ashik.ali – 32 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Brand.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Shop.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/User.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java

Rev 21448 –

ashik.ali — Thu, 11 May 2017 19:52:09 +0530

ashik.ali – 40 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerRegisteredAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/ShopAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/DocumentRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PostOfficeRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/RetailerAddBrandRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/util/ResponseSender.java

Rev 21440 –

ashik.ali — Thu, 11 May 2017 13:41:23 +0530

ashik.ali – 15 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayResponseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/OTPController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java

Rev 21431 –

ashik.ali — Wed, 10 May 2017 18:51:31 +0530

ashik.ali – 71 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomRole.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/UserInfo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Brand.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/LineItem.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Otp.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Permission.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/PostOffice.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerBrand.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerRegisteredAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RoleApi.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Shop.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/ShopAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/SocialUser.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/User.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/UserRole.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/DocumentRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Brand.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Category.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerAddressRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/LineOfBusiness.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/PayuPayResponsePojo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/RetailerAddBrandRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Shop.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java

Rev 21426 –

ashik.ali — Wed, 10 May 2017 14:42:45 +0530

ashik.ali – 74 file(s) modified

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/CustomRole.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/UserInfo.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Brand.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Document.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/LineItem.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Permission.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerBrand.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerRegisteredAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RoleApi.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Shop.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/ShopAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/SocialUser.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/UserRole.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PermissionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GlobalExceptionHandler.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerAddressRequest.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequest.java (copied from /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequestModel.java@21390)
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequestModel.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/LineOfBusiness.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/RetailerAddBrandRequest.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Role.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Shop.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/UserAddRoleRequest.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateUserJsonValidator.java
~ /trunk/profitmandi-web/src/main/resources/response-codes.properties

Rev 21390 –

ashik.ali — Sat, 06 May 2017 18:41:15 +0530

ashik.ali – 69 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Address.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Brand.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Document.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/LineItem.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Order.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Permission.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/PostOffice.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Retailer.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerAddress.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerBrand.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/RetailerRegisteredAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Shop.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/ShopAddress.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/SocialUser.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Transaction.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/DelayReason.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/OrderStatus.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/SaleValue.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/TaxType.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/TransactionStatus.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/AddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/BrandRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/DocumentRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/DocumentRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PostOfficeRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerAddressRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerBrandRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RetailerRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopAddressRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ShopRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/TransactionRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateRetailerRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/model/CreateRetailerRequestModel.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/JsonProcessor.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Address.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/CreateRetailerRequestModel.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Shop.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateAddressJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRetailerJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRoleJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateShopJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/UpdateRoleJsonValidator.java