SmartDukaan – /

Rev 23453 –

amit.gupta — Tue, 20 Mar 2018 12:03:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 23452 – Added new email ids

amit.gupta — Tue, 20 Mar 2018 11:57:50 +0530

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

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

Rev 23451 –

amit.gupta — Mon, 19 Mar 2018 22:32:17 +0530

amit.gupta – 1 file(s) modified

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

Rev 23450 –

amit.gupta — Mon, 19 Mar 2018 22:32:09 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 23449 –

amit.gupta — Mon, 19 Mar 2018 22:20:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 23448 –

amit.gupta — Mon, 19 Mar 2018 20:51:21 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py

Rev 23447 –

amit.gupta — Mon, 19 Mar 2018 20:42:34 +0530

amit.gupta – 1 file(s) modified

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

Rev 23446 – Added changes related to fofo.

amit.gupta — Mon, 19 Mar 2018 20:37:05 +0530

amit.gupta – 18 file(s) modified
Added changes related to fofo.

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipkartOrdersNew.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticUtils.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 23445 – Removed pooja

amit.gupta — Mon, 19 Mar 2018 12:59:49 +0530

amit.gupta – 1 file(s) modified
Removed pooja

~ /trunk/ContentStore/src/xml/model/users.xml

Rev 23444 – Fixed wallet entry for scheme in.

amit.gupta — Mon, 19 Mar 2018 08:34:33 +0530

amit.gupta – 3 file(s) modified
Fixed wallet entry for scheme in.

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

Rev 23443 – fixed bug related to inventory

amit.gupta — Sun, 18 Mar 2018 18:02:37 +0530

amit.gupta – 13 file(s) modified
fixed bug related to inventory

~ /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/fofo/SchemeInOutRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/util/MigrationUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 23442 – Fixed Issues warehouse change

amit.gupta — Fri, 16 Mar 2018 20:02:49 +0530

amit.gupta – 2 file(s) modified
Fixed Issues warehouse change

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

Rev 23441 – Rolled back

amit.gupta — Fri, 16 Mar 2018 18:07:27 +0530

amit.gupta – 1 file(s) modified
Rolled back

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java

Rev 23440 – Bug : Otp verified prompt when creaating order

ashik.ali — Fri, 16 Mar 2018 18:03:29 +0530

ashik.ali – 1 file(s) modified
Bug : Otp verified prompt when creaating order

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 23439 – Bug fixed : profitmandi-web domain is getting localhost

ashik.ali — Fri, 16 Mar 2018 16:19:34 +0530

ashik.ali – 1 file(s) modified
Bug fixed : profitmandi-web domain is getting localhost

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/staging.properties

Rev 23438 – Bug fixed : profitmandi-web domain is getting localhost

ashik.ali — Fri, 16 Mar 2018 16:18:59 +0530

ashik.ali – 1 file(s) modified
Bug fixed : profitmandi-web domain is getting localhost

~ /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties

Rev 23437 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:58:54 +0530

ashik.ali – 3 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 23436 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:57:05 +0530

ashik.ali – 1 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 23435 –

ashik.ali — Thu, 15 Mar 2018 19:55:39 +0530

ashik.ali – 1 file(s) modified

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

Rev 23434 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:54:23 +0530

ashik.ali – 5 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm

Rev 23433 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:53:16 +0530

ashik.ali – 1 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23432 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:50:55 +0530

ashik.ali – 3 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java

Rev 23431 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:49:58 +0530

ashik.ali – 2 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java

Rev 23430 – Bug Fixed from 26 - 33 from bug sheet

ashik.ali — Thu, 15 Mar 2018 19:39:19 +0530

ashik.ali – 2 file(s) modified
Bug Fixed from 26 - 33 from bug sheet

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 23429 –

amit.gupta — Thu, 15 Mar 2018 15:15:08 +0530

amit.gupta – 1 file(s) modified

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

Rev 23428 –

amit.gupta — Thu, 15 Mar 2018 13:05:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 23427 – Fixed issue with order creation

amit.gupta — Wed, 14 Mar 2018 20:25:49 +0530

amit.gupta – 1 file(s) modified
Fixed issue with order creation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23426 – Tempered glasses moq hardcoded to 5

amit.gupta — Wed, 14 Mar 2018 19:27:20 +0530

amit.gupta – 2 file(s) modified
Tempered glasses moq hardcoded to 5

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java

Rev 23425 –

amit.gupta — Wed, 14 Mar 2018 15:51:09 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/xml/model/users.xml

Rev 23424 –

amit.gupta — Wed, 14 Mar 2018 15:42:21 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/xml/model/users.xml

Rev 23423 –

amit.gupta — Wed, 14 Mar 2018 15:41:54 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ContentStore/src/xml/model/users.xml

Rev 23422 – Bug : Schems and Retails tabs not showing in dashboard ...

ashik.ali — Tue, 13 Mar 2018 16:48:44 +0530

ashik.ali – 1 file(s) modified
Bug : Schems and Retails tabs not showing in dashboard menu

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm

Rev 23421 – Getting error when itemIds are empty

ashik.ali — Tue, 13 Mar 2018 16:32:04 +0530

ashik.ali – 1 file(s) modified
Getting error when itemIds are empty

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 23420 – Refectoring

ashik.ali — Tue, 13 Mar 2018 16:05:50 +0530

ashik.ali – 1 file(s) modified
Refectoring

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

Rev 23419 – New feature: Prebooking Listing, Prebooking Orders, link with orders, order ...

ashik.ali — Tue, 13 Mar 2018 16:03:52 +0530

ashik.ali – 31 file(s) modified
New feature: Prebooking Listing, Prebooking Orders, link with orders, order details

~ /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/PaymentOptionController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PrebookingController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-listing.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-prebooking-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/prebooking.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wallet.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-listing.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.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/items-description.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listing-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-listings.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-order-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders-paginated.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/tag-listing-items-description.vm

Rev 23418 – New feature: Prebooking Listing, Prebooking Orders, link with orders, order ...

ashik.ali — Tue, 13 Mar 2018 15:11:16 +0530

ashik.ali – 27 file(s) modified
New feature: Prebooking Listing, Prebooking Orders, link with orders, order details

~ /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/User.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingListing.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrderItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/OtpType.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/dtr/OtpRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/OtpRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerBrandRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPartnerPaymentOptionRepositoryImpl.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/PrebookingListingRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingListingRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PrebookingOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 23417 – New feature: Prebooking Listing, Prebooking Orders, link with orders, order ...

ashik.ali — Tue, 13 Mar 2018 13:44:50 +0530

ashik.ali – 7 file(s) modified
New feature: Prebooking Listing, Prebooking Orders, link with orders, order details

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingListingRequest.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePrebookingOrderRequest.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomCustomer.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/ProfitMandiConstants.java
~ /trunk/profitmandi-common/src/main/resources/response-codes.properties

Rev 23416 –

amit.gupta — Mon, 12 Mar 2018 14:44:46 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseServiceImpl.java

Rev 23415 – Fixed issue with scanning

amit.gupta — Sun, 11 Mar 2018 13:47:07 +0530

amit.gupta – 3 file(s) modified
Fixed issue with scanning

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java

Rev 23414 –

amit.gupta — Sun, 11 Mar 2018 13:40:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-common/src/main/resources/response-codes.properties