SmartDukaan – /

Rev 22011 –

ashik.ali — Wed, 19 Jul 2017 19:11:30 +0530

ashik.ali – 5 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.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/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/UserAddRoleRequest.java

Rev 22010 –

ashik.ali — Wed, 19 Jul 2017 19:05:54 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-common/pom.xml
~ /trunk/profitmandi-dao/pom.xml
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java

Rev 22009 –

ashik.ali — Wed, 19 Jul 2017 19:05:21 +0530

ashik.ali – 61 file(s) modified

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Api.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Brand.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Click.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Document.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Otp.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Permission.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Retailer.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
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/Role.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/Shop.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/SocialUser.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/dtr/UserAccounts.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/UserRole.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivationCode.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
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Customer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CustomerAddress.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoLineItem.java
~ /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/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItemPricing.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/PaymentOption.java
~ /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/Purchase.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/ScanRecord.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Tag.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/entity/logistics/PostOffice.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/Provider.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/transaction/Order.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/entity/transaction/UserWallet.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/Address.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PermissionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PermissionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleApiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleApiRepositoryImpl.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RoleRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/UserRoleRepository.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/TagListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/UserToRetailerMigrationUtil.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 22008 –

ashik.ali — Wed, 19 Jul 2017 18:40:53 +0530

ashik.ali – 2 file(s) modified

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

Rev 22007 –

ashik.ali — Wed, 19 Jul 2017 18:15:11 +0530

ashik.ali – 1 file(s) modified

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java

Rev 22006 –

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

ashik.ali – 3 file(s) modified

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRetailerJsonValidator.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRoleJsonValidator.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateShopJsonValidator.java

Rev 22005 –

ashik.ali — Wed, 19 Jul 2017 18:13:57 +0530

ashik.ali – 1 file(s) modified

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/req/Role.java

Rev 22004 –

ashik.ali — Wed, 19 Jul 2017 18:13:41 +0530

ashik.ali – 5 file(s) modified

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/ApiRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateRetailerRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateShopRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateUserRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/RoleRequestInterceptor.java

Rev 22003 – change

rajender — Wed, 19 Jul 2017 17:30:10 +0530

rajender – 1 file(s) modified
change

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/Storage/Mongo.java

Rev 22002 – change

rajender — Wed, 19 Jul 2017 17:28:36 +0530

rajender – 1 file(s) modified
change

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/RegisterController.java

Rev 22001 –

rajender — Wed, 19 Jul 2017 17:23:30 +0530

rajender – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-edit.vm

Rev 22000 –

rajender — Wed, 19 Jul 2017 17:09:33 +0530

rajender – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21999 – change

rajender — Wed, 19 Jul 2017 17:07:54 +0530

rajender – 1 file(s) modified
change

+ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/UploadController.java

Rev 21998 – changes

rajender — Wed, 19 Jul 2017 17:05:58 +0530

rajender – 1 file(s) modified
changes

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

Rev 21997 – changes

rajender — Wed, 19 Jul 2017 17:03:21 +0530

rajender – 1 file(s) modified
changes

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-edit.vm

Rev 21996 – change

rajender — Wed, 19 Jul 2017 17:00:47 +0530

rajender – 1 file(s) modified
change

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-form.vm

Rev 21995 – Added Fofo.

amit.gupta — Wed, 19 Jul 2017 15:51:57 +0530

amit.gupta – 1 file(s) modified
Added Fofo.

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

Rev 21994 –

kshitij.sood — Wed, 19 Jul 2017 04:44:12 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21993 –

kshitij.sood — Wed, 19 Jul 2017 04:27:08 +0530

kshitij.sood – 3 file(s) modified

+ /trunk/PyProj/src/shop2020/model/v1/order/impl/AccountApiMcomm.xml
+ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeApiMcomm.xml
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py

Rev 21992 –

amit.gupta — Tue, 18 Jul 2017 20:43:16 +0530

amit.gupta – 1 file(s) modified

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

Rev 21991 – Fixed empty issue

amit.gupta — Tue, 18 Jul 2017 20:37:08 +0530

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

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

Rev 21990 – Temporary change have to relook it

amit.gupta — Tue, 18 Jul 2017 17:16:03 +0530

amit.gupta – 1 file(s) modified
Temporary change have to relook it

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/convertor/LocalDateTimeAttributeConverter.java

Rev 21989 –

amit.gupta — Tue, 18 Jul 2017 17:00:28 +0530

amit.gupta – 1 file(s) modified

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

Rev 21988 –

kshitij.sood — Tue, 18 Jul 2017 13:50:18 +0530

kshitij.sood – 2 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java

Rev 21987 –

kshitij.sood — Tue, 18 Jul 2017 13:08:51 +0530

kshitij.sood – 27 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/SpringWebAppInitializer.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/PurchaseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/response/ValidateCart.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/line-icons.css
~ /trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/no_image_available.png
~ /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/WEB-INF/views/ftl/bad-inventory-snapshot.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/cart.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/current-item-availability.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-details.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/purchase.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/test.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/validate-cart.vm

Rev 21986 –

kshitij.sood — Tue, 18 Jul 2017 13:03:19 +0530

kshitij.sood – 5 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CartFofo.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCurrentInventorySnapshot.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.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

Rev 21985 –

kshitij.sood — Tue, 18 Jul 2017 12:31:48 +0530

kshitij.sood – 1 file(s) modified

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

Rev 21984 –

kshitij.sood — Tue, 18 Jul 2017 12:29:27 +0530

kshitij.sood – 11 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Customer.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/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/Purchase.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/PaymentOptionType.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/PurchaseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.java

Rev 21983 –

amit.gupta — Tue, 18 Jul 2017 11:38:25 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/utils/PdfGenerator.java

Rev 21982 –

amit.gupta — Tue, 18 Jul 2017 11:06:42 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/utils/PdfGenerator.java

Rev 21981 –

amit.gupta — Tue, 18 Jul 2017 10:54:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrApi/pom.xml

Rev 21980 –

amit.gupta — Sat, 15 Jul 2017 15:11:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/GSTInvoiceGenerationService.java

Rev 21979 –

amit.gupta — Sat, 15 Jul 2017 14:33:07 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-index.vm

Rev 21978 –

amit.gupta — Sat, 15 Jul 2017 14:24:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-index.vm

Rev 21977 –

amit.gupta — Sat, 15 Jul 2017 14:17:58 +0530

amit.gupta – 3 file(s) modified

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/FileDisplayController.java
~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/utils/PdfGenerator.java
~ /trunk/DtrApi/src/main/webapp/WEB-INF/content/fofo-index.vm

Rev 21976 – Added PDF Document

ashik.ali — Fri, 14 Jul 2017 20:23:34 +0530

ashik.ali – 1 file(s) modified
Added PDF Document

+ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/FileDisplayController.java

Rev 21975 –

ashik.ali — Fri, 14 Jul 2017 19:59:07 +0530

ashik.ali – 1 file(s) modified

~ /trunk/DtrApi/pom.xml

Rev 21974 –

ashik.ali — Fri, 14 Jul 2017 19:58:52 +0530

ashik.ali – 4 file(s) modified

~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/controllers/FofoController.java
~ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/Storage/Mongo.java
+ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/utils/HttpClientUtil.java
+ /trunk/DtrApi/src/main/java/in/shop2020/dtrapi/utils/PdfGenerator.java

Rev 21973 –

amit.gupta — Fri, 14 Jul 2017 16:26:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/GSTInvoiceGenerationService.java

Rev 21972 –

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

amit.gupta – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/GSTInvoiceGenerationService.java