SmartDukaan – /

Rev 22860 –

ashik.ali — Tue, 07 Nov 2017 16:42:13 +0530

ashik.ali – 48 file(s) modified

~ /trunk/profitmandi-fofo/build.gradle
~ /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/InventoryController.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/OrderController.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/RoleInterceptor.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/CheckItemQuantityResponse.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/ItemIdQuantityAvailability.java
x /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/Quantity.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/Utils.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin-dashboard-home-content.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-scheme.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-snapshot.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/schemes.vm
+ /trunk/profitmandi-fofo/src/test
+ /trunk/profitmandi-fofo/src/test/java
+ /trunk/profitmandi-fofo/src/test/java/com
+ /trunk/profitmandi-fofo/src/test/java/com/spice
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/scheme
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/scheme/SchemeServiceTest.java
+ /trunk/profitmandi-fofo/src/test/resources
+ /trunk/profitmandi-fofo/src/test/resources/log4j.xml
+ /trunk/profitmandi-fofo/src/test/resources/META-INF
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/dev.properties
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/env.property
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/payment-options.json
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/prod.properties
+ /trunk/profitmandi-fofo/src/test/resources/META-INF/staging.properties

Rev 22859 –

ashik.ali — Tue, 07 Nov 2017 16:39:13 +0530

ashik.ali – 88 file(s) modified

~ /trunk/profitmandi-dao/build.gradle
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/convertor/LocalDateTimeAttributeConverter.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/PinCodeTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RetailerScheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/RetailerTag.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotBuyBack.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/NotBuyBackId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerBrand.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RetailerRegisteredAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/RoleApi.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ShopAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/User.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/BadInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoItemId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItem.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItemSerialNumber.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItem.java@22725)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStoreSequenceGeneration.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeIn.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInId.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeIn.java@22725)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeOut.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeOutId.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/PrivateDealUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepository.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/catalog/RetailerSchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RetailerSchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreSequenceGenerationRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/NotBuyBackRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerRegisteredAddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CustomerAddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemSerialNumberRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemSerialNumberRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepository.java@22725)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepositoryImpl.java@22725)
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InvoiceNumberGenerationSequenceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InvoiceNumberGenerationSequenceRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PaymentOptionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepository.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInRepository.java@22725)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInRepositoryImpl.java@22725)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeOutRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeOutRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletHistoryRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/purchase
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/purchase/PurchaseService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/purchase/PurchaseServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/sale
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/sale/FofoOrderItemService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/sale/FofoOrderItemServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/sale/OrderService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/sale/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java

Rev 22858 –

ashik.ali — Tue, 07 Nov 2017 16:36:47 +0530

ashik.ali – 22 file(s) modified

~ /trunk/profitmandi-common/build.gradle
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/DateTimePattern.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CheckItemQuantityRequest.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request/CheckItemQuantityRequest.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CheckItemQuantityResponse.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/CheckItemQuantityResponse.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request/CreateOrderRequest.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateSchemeRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomAddress.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoLineItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomOrderItem.java (copied from /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomPaymentOption.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request/CustomPaymentOption.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdQuantity.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request/ItemIdQuantity.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemIdQuantityAvailability.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/ItemIdQuantityAvailability.java@22725)
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PdfModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/Quantity.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/Quantity.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScanNonSerializedRequest.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request/ScanNonSerializedRequest.java@22725)
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ScanSerializedRequest.java (copied from /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/request/ScanSerializedRequest.java@22725)
~ /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/web/util/ResponseSender.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 22857 –

ashik.ali — Tue, 07 Nov 2017 16:32:21 +0530

ashik.ali – 1 file(s) modified

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

Rev 22856 –

ashik.ali — Tue, 07 Nov 2017 16:19:48 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java

Rev 22855 – Fixed bug pertaining to different addresses

amit.gupta — Mon, 06 Nov 2017 18:17:47 +0530

amit.gupta – 1 file(s) modified
Fixed bug pertaining to different addresses

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

Rev 22854 –

amit.gupta — Mon, 06 Nov 2017 16:32:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22853 –

amit.gupta — Mon, 06 Nov 2017 16:32:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22852 –

amit.gupta — Mon, 06 Nov 2017 15:50:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Elements/adminheader.ctp

Rev 22851 –

amit.gupta — Mon, 06 Nov 2017 15:12:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Elements/adminheader.ctp

Rev 22850 –

amit.gupta — Mon, 06 Nov 2017 15:06:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Controller/RetailersController.php

Rev 22849 –

amit.gupta — Mon, 06 Nov 2017 15:06:15 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22848 –

amit.gupta — Mon, 06 Nov 2017 14:49:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Controller/RetailersController.php

Rev 22847 –

amit.gupta — Mon, 06 Nov 2017 14:45:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/Controller/RetailersController.php

Rev 22846 – Added all new retailers

amit.gupta — Mon, 06 Nov 2017 14:44:58 +0530

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

~ /trunk/DtrMobileAppDashboard/app/Controller/RetailersController.php

Rev 22845 – Added state and activation time

amit.gupta — Mon, 06 Nov 2017 10:23:10 +0530

amit.gupta – 7 file(s) modified
Added state and activation time

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/RegisteredUserInfo.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/User.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.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/UserRequest.java

Rev 22844 –

amit.gupta — Sun, 05 Nov 2017 06:47:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java

Rev 22843 –

amit.gupta — Sat, 04 Nov 2017 16:06:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 22842 – removed deals log

amit.gupta — Sat, 04 Nov 2017 15:11:32 +0530

amit.gupta – 1 file(s) modified
removed deals log

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

Rev 22841 – changes

rajender — Fri, 03 Nov 2017 15:27:30 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/res/values-v21/styles.xml

Rev 22840 – changes

rajender — Fri, 03 Nov 2017 15:26:37 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/res/values/strings.xml

Rev 22839 – changes

rajender — Fri, 03 Nov 2017 15:26:00 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/res/values/color.xml

Rev 22838 – changes

rajender — Fri, 03 Nov 2017 15:25:36 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/res/menu/menu_main.xml

Rev 22837 – changes

rajender — Fri, 03 Nov 2017 15:22:11 +0530

rajender – 8 file(s) modified
changes

~ /app/app/src/main/res/layout/actionbarprofittill.xml
~ /app/app/src/main/res/layout/actionbarsearch.xml
~ /app/app/src/main/res/layout/activity_login.xml
~ /app/app/src/main/res/layout/activity_main.xml
+ /app/app/src/main/res/layout/activity_screen.xml
~ /app/app/src/main/res/layout/activity_splash_screen.xml
+ /app/app/src/main/res/layout/fragment_how_it_works.xml
~ /app/app/src/main/res/layout/viewpager_item.xml

Rev 22836 – changes

rajender — Fri, 03 Nov 2017 15:20:48 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/java/com/saholic/profittill/Utils/UtilityFunctions.java

Rev 22835 – changes

rajender — Fri, 03 Nov 2017 15:07:06 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/java/com/saholic/profittill/MyFirebaseMessagingService.java

Rev 22834 – changes

rajender — Fri, 03 Nov 2017 15:06:05 +0530

rajender – 1 file(s) modified
changes

~ /app/app/src/main/java/com/saholic/profittill/SplashScreen.java

Rev 22833 – chnages

rajender — Fri, 03 Nov 2017 15:04:40 +0530

rajender – 1 file(s) modified
chnages

~ /app/app/src/main/java/com/saholic/profittill/main/HowItWorks.java

Rev 22832 – chnages

rajender — Fri, 03 Nov 2017 15:01:52 +0530

rajender – 1 file(s) modified
chnages

~ /app/app/src/main/java/com/saholic/profittill/main/MainActivity.java

Rev 22831 – chnages

rajender — Fri, 03 Nov 2017 14:59:55 +0530

rajender – 1 file(s) modified
chnages

~ /app/app/src/main/java/com/saholic/profittill/main/LoginActivity.java

Rev 22830 – chnages

rajender — Fri, 03 Nov 2017 14:59:20 +0530

rajender – 1 file(s) modified
chnages

~ /app/app/src/main/java/com/saholic/profittill/main/DealsHomeFragment.java

Rev 22829 – chnages

rajender — Fri, 03 Nov 2017 14:57:31 +0530

rajender – 1 file(s) modified
chnages

~ /app/app/src/main/AndroidManifest.xml

Rev 22828 – chnages

rajender — Thu, 02 Nov 2017 15:31:53 +0530

rajender – 1 file(s) modified
chnages

/app/app/src/main/java/com/saholic/profittill/Utils/CustomPageAdapter.java

Rev 22827 – new build version

rajender — Thu, 02 Nov 2017 15:28:14 +0530

rajender – 1 file(s) modified
new build version

~ /app/app/build.gradle

Rev 22826 –

amit.gupta — Wed, 01 Nov 2017 22:38:10 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22825 –

amit.gupta — Wed, 01 Nov 2017 22:33:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22824 –

amit.gupta — Wed, 01 Nov 2017 22:32:38 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22823 –

amit.gupta — Wed, 01 Nov 2017 22:23:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22822 –

amit.gupta — Wed, 01 Nov 2017 21:57:15 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp

Rev 22821 –

amit.gupta — Wed, 01 Nov 2017 21:56:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Retailers/admin_pendingretailer_new.ctp