SmartDukaan – /

Rev 22595 –

ashik.ali — Tue, 10 Oct 2017 12:06:18 +0530

ashik.ali – 1 file(s) modified

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

Rev 22594 –

ashik.ali — Tue, 10 Oct 2017 11:53:35 +0530

ashik.ali – 1 file(s) modified

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

Rev 22593 –

ashik.ali — Tue, 10 Oct 2017 11:44:54 +0530

ashik.ali – 1 file(s) modified

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

Rev 22592 –

ashik.ali — Tue, 10 Oct 2017 11:04:55 +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/webapp/resources/js/common.js

Rev 22591 –

ashik.ali — Tue, 10 Oct 2017 11:04:02 +0530

ashik.ali – 3 file(s) modified

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PricingServiceImpl.java

Rev 22590 –

amit.gupta — Tue, 10 Oct 2017 10:31:02 +0530

amit.gupta – 1 file(s) modified

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

Rev 22589 – Fixed missing call to bulk processing

amit.gupta — Tue, 10 Oct 2017 09:02:58 +0530

amit.gupta – 1 file(s) modified
Fixed missing call to bulk processing

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

Rev 22588 –

amit.gupta — Tue, 10 Oct 2017 08:33:21 +0530

amit.gupta – 1 file(s) modified

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

Rev 22587 –

amit.gupta — Tue, 10 Oct 2017 07:31:49 +0530

amit.gupta – 1 file(s) modified

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

Rev 22586 – Pickup wont change if selfPickup is assigned

amit.gupta — Tue, 10 Oct 2017 07:19:04 +0530

amit.gupta – 1 file(s) modified
Pickup wont change if selfPickup is assigned

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

Rev 22585 – SUPPORT has true value for live

amit.gupta — Mon, 09 Oct 2017 20:51:54 +0530

amit.gupta – 1 file(s) modified
SUPPORT has true value for live

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 22584 –

amit.gupta — Mon, 09 Oct 2017 20:51:29 +0530

amit.gupta – 1 file(s) modified

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

Rev 22583 –

amit.gupta — Mon, 09 Oct 2017 20:15:26 +0530

amit.gupta – 1 file(s) modified

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

Rev 22582 –

ashik.ali — Mon, 09 Oct 2017 20:14:08 +0530

ashik.ali – 1 file(s) modified

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

Rev 22581 –

ashik.ali — Mon, 09 Oct 2017 20:13:16 +0530

ashik.ali – 4 file(s) modified

~ /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/webapp/resources/js/common.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/events.js

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