SmartDukaan – /

Rev 22580 –

ashik.ali — Mon, 09 Oct 2017 20:12:26 +0530

ashik.ali – 4 file(s) modified

~ /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/FofoLineItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22579 –

ashik.ali — Mon, 09 Oct 2017 20:12:03 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CustomFofoLineItem.java
x /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/MopPriceModel.java
+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PriceModel.java (copied from /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/MopPriceModel.java@22549)

Rev 22578 –

amit.gupta — Mon, 09 Oct 2017 20:04:30 +0530

amit.gupta – 1 file(s) modified

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

Rev 22577 – Added toString

amit.gupta — Mon, 09 Oct 2017 18:23:02 +0530

amit.gupta – 15 file(s) modified
Added toString

~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/impl/Aramex.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Address.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ArrayOfShipment.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ClientInfo.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Contact.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Dimensions.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/LabelInfo.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Money.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Party.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ScheduledDelivery.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Shipment.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentCreationRequest.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/ShipmentDetails.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Transaction.java
~ /trunk/ShipDEWebServiceClient/src/main/java/com/aramex/stub/Weight.java

Rev 22576 – Added wallet refund

amit.gupta — Mon, 09 Oct 2017 18:02:13 +0530

amit.gupta – 1 file(s) modified
Added wallet refund

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java

Rev 22575 – Added logging

amit.gupta — Mon, 09 Oct 2017 16:11:52 +0530

amit.gupta – 2 file(s) modified
Added logging

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

Rev 22574 –

ashik.ali — Mon, 09 Oct 2017 13:29:50 +0530

ashik.ali – 1 file(s) modified

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

Rev 22573 –

ashik.ali — Mon, 09 Oct 2017 12:41:43 +0530

ashik.ali – 1 file(s) modified

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

Rev 22572 –

amit.gupta — Mon, 09 Oct 2017 11:50:37 +0530

amit.gupta – 1 file(s) modified

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

Rev 22571 –

amit.gupta — Mon, 09 Oct 2017 11:45:07 +0530

amit.gupta – 1 file(s) modified

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

Rev 22570 –

amit.gupta — Mon, 09 Oct 2017 11:39:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 22569 –

amit.gupta — Mon, 09 Oct 2017 08:02:38 +0530

amit.gupta – 1 file(s) modified

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

Rev 22568 – Fixed tag issue

amit.gupta — Mon, 09 Oct 2017 07:35:57 +0530

amit.gupta – 2 file(s) modified
Fixed tag issue

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

amit.gupta — Mon, 09 Oct 2017 07:33:41 +0530

amit.gupta – 1 file(s) modified

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

Rev 22566 – Added fofo tag

amit.gupta — Mon, 09 Oct 2017 07:26:41 +0530

amit.gupta – 7 file(s) modified
Added fofo tag

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 22565 –

amit.gupta — Sun, 08 Oct 2017 14:16:59 +0530

amit.gupta – 1 file(s) modified

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

Rev 22564 –

amit.gupta — Sun, 08 Oct 2017 14:12:39 +0530

amit.gupta – 1 file(s) modified

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

Rev 22563 – Added Max discount

amit.gupta — Sun, 08 Oct 2017 13:28:13 +0530

amit.gupta – 7 file(s) modified
Added Max discount

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/request/CreateTagListingRequest.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/TagListingModel.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.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 22562 –

amit.gupta — Sun, 08 Oct 2017 11:27:04 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java

Rev 22561 – Fixed max quantity

amit.gupta — Sun, 08 Oct 2017 11:18:58 +0530

amit.gupta – 1 file(s) modified
Fixed max quantity

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

Rev 22560 –

amit.gupta — Sun, 08 Oct 2017 06:51:44 +0530

amit.gupta – 1 file(s) modified

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

Rev 22559 –

amit.gupta — Sun, 08 Oct 2017 06:49:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java

Rev 22558 –

amit.gupta — Sun, 08 Oct 2017 06:46:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java

Rev 22557 –

amit.gupta — Sun, 08 Oct 2017 06:43:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/ItemAvailabilityCacheRepositoryImpl.java

Rev 22556 –

amit.gupta — Sun, 08 Oct 2017 06:40:17 +0530

amit.gupta – 1 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java

Rev 22555 –

amit.gupta — Sun, 08 Oct 2017 05:25:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 22554 – Fixed issue related to Clicks controller

amit.gupta — Sun, 08 Oct 2017 00:57:44 +0530

amit.gupta – 6 file(s) modified
Fixed issue related to Clicks controller

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

Rev 22553 –

amit.gupta — Sun, 08 Oct 2017 00:34:48 +0530

amit.gupta – 1 file(s) modified

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

Rev 22552 – Added caching to itemavailabilitycache

amit.gupta — Sat, 07 Oct 2017 23:32:55 +0530

amit.gupta – 11 file(s) modified
Added caching to itemavailabilitycache

~ /trunk/profitmandi-admin/src/main/java/com/spice/profitmandi/web/controller/TagListingController.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ItemAvailabilityCache.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/ItemAvailabilityCacheRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/ItemAvailabilityCacheRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/inventory
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/inventory/InventoryService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/inventory/InventoryServiceImpl.java

Rev 22551 –

ashik.ali — Sat, 07 Oct 2017 17:36:16 +0530

ashik.ali – 15 file(s) modified

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FofoController.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/OrderController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property
~ /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/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js
~ /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/dashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history-paginated.vm

Rev 22550 –

ashik.ali — Sat, 07 Oct 2017 17:31:33 +0530

ashik.ali – 16 file(s) modified

~ /trunk/profitmandi-dao/pom.xml
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.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/repository/fofo/FofoOrderRepositoryImpl.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 (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepository.java@22182)
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/UserWalletRepositoryImpl.java (copied from /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepositoryImpl.java@22182)
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepository.java
x /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WalletRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java

Rev 22549 –

ashik.ali — Sat, 07 Oct 2017 17:28:44 +0530

ashik.ali – 1 file(s) modified

+ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/MopPriceModel.java

Rev 22548 – Fixed isFofo dependency of retailer.

amit.gupta — Sat, 07 Oct 2017 13:28:30 +0530

amit.gupta – 3 file(s) modified
Fixed isFofo dependency of retailer.

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

Rev 22547 – Added payu

amit.gupta — Sat, 07 Oct 2017 13:27:51 +0530

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

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

Rev 22546 –

amit.gupta — Sat, 07 Oct 2017 10:39:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22545 –

amit.gupta — Sat, 07 Oct 2017 10:16:21 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22544 –

amit.gupta — Sat, 07 Oct 2017 10:02:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22543 –

amit.gupta — Sat, 07 Oct 2017 09:51:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22542 –

amit.gupta — Sat, 07 Oct 2017 09:30:32 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py

Rev 22541 –

amit.gupta — Sat, 07 Oct 2017 08:59:50 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py