SmartDukaan – /

Rev 22054 –

amit.gupta — Mon, 24 Jul 2017 08:23:34 +0530

amit.gupta – 1 file(s) modified

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

Rev 22053 –

amit.gupta — Mon, 24 Jul 2017 00:18:47 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm

Rev 22052 –

amit.gupta — Mon, 24 Jul 2017 00:12:42 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm

Rev 22051 –

amit.gupta — Mon, 24 Jul 2017 00:06:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 22050 –

amit.gupta — Mon, 24 Jul 2017 00:04:22 +0530

amit.gupta – 2 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWalletHistory.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 22049 –

amit.gupta — Sun, 23 Jul 2017 23:57:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 22048 –

amit.gupta — Sun, 23 Jul 2017 23:55:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 22047 –

amit.gupta — Sun, 23 Jul 2017 23:54:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 22046 –

amit.gupta — Sun, 23 Jul 2017 23:48:43 +0530

amit.gupta – 1 file(s) modified

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

Rev 22045 –

amit.gupta — Sun, 23 Jul 2017 23:45:12 +0530

amit.gupta – 1 file(s) modified

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

Rev 22044 – Added changes in wallet report

amit.gupta — Sun, 23 Jul 2017 23:36:27 +0530

amit.gupta – 6 file(s) modified
Added changes in wallet report

~ /trunk/Support/.classpath
~ /trunk/Support/.project
+ /trunk/Support/.settings/org.eclipse.m2e.core.prefs
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UserWalletCreditController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-asin-upload.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/user-wallet-credit-edit.vm

Rev 22043 – Added changes in wallet report

amit.gupta — Sun, 23 Jul 2017 20:58:56 +0530

amit.gupta – 9 file(s) modified
Added changes in wallet report

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/model/UserWalletHistory.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/UserWalletHistory.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 22042 –

amit.gupta — Sat, 22 Jul 2017 22:37:51 +0530

amit.gupta – 1 file(s) modified

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.java

Rev 22041 – Fixed retailer creation

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

amit.gupta – 1 file(s) modified
Fixed retailer creation

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.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 22039 –

amit.gupta — Sat, 22 Jul 2017 17:44:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 22038 –

amit.gupta — Sat, 22 Jul 2017 17:44:06 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java

Rev 22037 – Added exception class for controller

amit.gupta — Sat, 22 Jul 2017 14:39:13 +0530

amit.gupta – 21 file(s) modified
Added exception class for controller

~ /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/TagController.java
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/GrnHistoryController.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/PurchaseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.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/FileUploaderController.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/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/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

Rev 22036 –

ashik.ali — Fri, 21 Jul 2017 18:39:29 +0530

ashik.ali – 1 file(s) modified

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

Rev 22035 –

ashik.ali — Fri, 21 Jul 2017 18:25:14 +0530

ashik.ali – 1 file(s) modified

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

Rev 22034 –

ashik.ali — Fri, 21 Jul 2017 18:09:50 +0530

ashik.ali – 1 file(s) modified

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

Rev 22033 –

ashik.ali — Fri, 21 Jul 2017 18:03:11 +0530

ashik.ali – 1 file(s) modified

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

Rev 22032 –

ashik.ali — Fri, 21 Jul 2017 18:02:45 +0530

ashik.ali – 1 file(s) modified

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

Rev 22031 – Bluedart is marked temporariry unserviceable

amit.gupta — Fri, 21 Jul 2017 15:45:21 +0530

amit.gupta – 1 file(s) modified
Bluedart is marked temporariry unserviceable

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py

Rev 22030 – Form is now posted as json body

amit.gupta — Fri, 21 Jul 2017 15:16:54 +0530

amit.gupta – 1 file(s) modified
Form is now posted as json body

~ /trunk/DtrApi/src/main/webapp/js/reqformvalidator.js

Rev 22029 – Added Changes for new NSSPL Account for Aramex

amit.gupta — Fri, 21 Jul 2017 15:09:27 +0530

amit.gupta – 1 file(s) modified
Added Changes for new NSSPL Account for Aramex

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java

Rev 22028 –

ashik.ali — Fri, 21 Jul 2017 14:29:02 +0530

ashik.ali – 1 file(s) modified

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

Rev 22027 –

ashik.ali — Fri, 21 Jul 2017 14:19:33 +0530

ashik.ali – 1 file(s) modified

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

Rev 22026 –

ashik.ali — Fri, 21 Jul 2017 14:19:18 +0530

ashik.ali – 2 file(s) modified

~ /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

Rev 22025 –

ashik.ali — Fri, 21 Jul 2017 14:18:51 +0530

ashik.ali – 2 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoOrderItem.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 22024 –

ashik.ali — Thu, 20 Jul 2017 17:33:04 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java

Rev 22023 –

ashik.ali — Thu, 20 Jul 2017 17:32:45 +0530

ashik.ali – 1 file(s) modified

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

Rev 22022 –

ashik.ali — Thu, 20 Jul 2017 17:32:29 +0530

ashik.ali – 1 file(s) modified

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

Rev 22021 –

ashik.ali — Thu, 20 Jul 2017 17:17:23 +0530

ashik.ali – 1 file(s) modified

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

Rev 22020 –

ashik.ali — Thu, 20 Jul 2017 16:48:56 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/service/UserServiceImpl.java

Rev 22019 –

ashik.ali — Thu, 20 Jul 2017 16:48:09 +0530

ashik.ali – 2 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ActivationCode.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivationCode.java@22009)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivationCode.java

Rev 22018 –

ashik.ali — Thu, 20 Jul 2017 16:46:27 +0530

ashik.ali – 1 file(s) modified

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

Rev 22017 – Fixed user account

amit.gupta — Thu, 20 Jul 2017 16:46:26 +0530

amit.gupta – 6 file(s) modified
Fixed user account

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserAccountRepository.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/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration/UserStatus.java

Rev 22016 –

ashik.ali — Thu, 20 Jul 2017 14:31:10 +0530

ashik.ali – 1 file(s) modified

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

Rev 22015 –

ashik.ali — Thu, 20 Jul 2017 13:48:47 +0530

ashik.ali – 1 file(s) modified

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