SmartDukaan – /trunk/ThriftConfig/src/main/java/in/

Rev 14384 –

kshitij.sood — Thu, 05 Mar 2015 13:48:48 +0530

kshitij.sood – 3 file(s) modified

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/dtr
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/dtr/DtrService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/dtr/LivePricing.java

Rev 14363 –

kshitij.sood — Wed, 04 Mar 2015 22:33:00 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java

Rev 14361 –

kshitij.sood — Wed, 04 Mar 2015 22:26:21 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/LivePricing.java

Rev 14182 – Api for saholic product info (DTR)

kshitij.sood — Fri, 27 Feb 2015 02:32:36 +0530

kshitij.sood – 6 file(s) modified
Api for saholic product info (DTR)

+ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/DtrPricingController.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 14072 – Committed by Manish Sharma for PO Modifications Required by Cat ...

manish.sharma — Mon, 23 Feb 2015 17:28:49 +0530

manish.sharma – 10 file(s) modified
Committed by Manish Sharma for PO Modifications Required by Cat Team on 23-Feb-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-index.vm
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Supplier.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Supplier.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 13941 – Added API for batch Refund

amit.gupta — Wed, 18 Feb 2015 15:53:57 +0530

amit.gupta – 8 file(s) modified
Added API for batch Refund

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/WalletController.java
~ /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/WalletSource.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 13734 – Committed by Manish Sharma for HomeShop18 Order Creation Process on ...

manish.sharma — Fri, 06 Feb 2015 18:34:40 +0530

manish.sharma – 8 file(s) modified
Committed by Manish Sharma for HomeShop18 Order Creation Process on 06-Feb-2015

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HsOrderCreatorController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HsOrder.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 13709 – Committed by Manish Sharma for HomeShop18 Order Creation Process on ...

manish.sharma — Wed, 04 Feb 2015 20:42:50 +0530

manish.sharma – 13 file(s) modified
Committed by Manish Sharma for HomeShop18 Order Creation Process on 04-Feb-2015

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/HsListingController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HsOrderCreatorController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/hs-listing-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HsItem.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 13692 – Committed by Manish Sharma for HomeShop18 Order Creation Process on ...

manish.sharma — Tue, 03 Feb 2015 19:40:29 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for HomeShop18 Order Creation Process on 03-Feb-2015

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

Rev 13691 – Committed by Manish Sharma for HomeShop18 Order Creation Process on ...

manish.sharma — Tue, 03 Feb 2015 19:26:19 +0530

manish.sharma – 19 file(s) modified
Committed by Manish Sharma for HomeShop18 Order Creation Process on 03-Feb-2015

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/Support/src/main/java/in/shop2020/support/controllers/HsDashboardController.java
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/HsOrderCreatorController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/hs-dashboard-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/hs-order-creator-authsuccess.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/HsOrder.java
~ /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/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 13600 – Committed by Manish Sharma for Purchase Return Changes on 22-Jan-2015

manish.sharma — Thu, 22 Jan 2015 15:42:04 +0530

manish.sharma – 15 file(s) modified
Committed by Manish Sharma for Purchase Return Changes on 22-Jan-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/InventoryManager/src/main/webapp/js/purchase-return.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-new.vm
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturnSettlement.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PrReasonType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnSettlement.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/SettlementType.java

Rev 13584 – Committed by Manish Sharma for Flipkart FA Stock Sales Reports ...

manish.sharma — Wed, 21 Jan 2015 20:26:42 +0530

manish.sharma – 20 file(s) modified
Committed by Manish Sharma for Flipkart FA Stock Sales Reports on 21-Jan-2015

~ /trunk/Common/pom.xml
+ /trunk/Common/src/main/java/in/shop2020/serving/services/CreateSendFASalesReportExceptMobilesTablets.java
+ /trunk/Common/src/main/java/in/shop2020/serving/services/CreateSendFASalesReportForMobilesTablets.java
+ /trunk/Common/src/main/java/in/shop2020/serving/services/CreateSendFAStockEstReportEMT.java
+ /trunk/Common/src/main/java/in/shop2020/serving/services/CreateSendFAStockEstReportMT.java
+ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartFaSaleSnapshotGetter.java
+ /trunk/Common/src/main/java/in/shop2020/utils/FASalesSnapshot.java
+ /trunk/Common/src/main/java/in/shop2020/utils/FkExcelRow.java
+ /trunk/Common/src/main/java/in/shop2020/utils/FkItemSale.java
+ /trunk/Common/src/main/java/in/shop2020/utils/FkSaleComparator.java
+ /trunk/Common/src/main/java/in/shop2020/utils/FkStockEstValueComparator.java
+ /trunk/Common/src/main/java/in/shop2020/utils/FlipkartConsumer.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartFaSalesSnapshot.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartFCWarehouseLocation.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 13529 – Committed by Manish Sharma for Movement Report and Purchase Return ...

manish.sharma — Mon, 12 Jan 2015 19:02:58 +0530

manish.sharma – 10 file(s) modified
Committed by Manish Sharma for Movement Report and Purchase Return Changes on 12-Jan-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 13521 – Added changes related to No Captcha for Private Deal User

amit.gupta — Thu, 08 Jan 2015 12:29:35 +0530

amit.gupta – 12 file(s) modified
Added changes related to No Captcha for Private Deal User

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/script/ClearItemAvailabilityCache.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm

Rev 13504 – Committed by Manish Sharma for Movement Report and Purchase Return ...

manish.sharma — Tue, 06 Jan 2015 18:18:31 +0530

manish.sharma – 11 file(s) modified
Committed by Manish Sharma for Movement Report and Purchase Return Changes on 06-Jan-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 13495 –

amit.gupta — Tue, 06 Jan 2015 11:39:00 +0530

amit.gupta – 2 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 13478 – Amazon amazonFbaOrderItem struct

kshitij.sood — Tue, 30 Dec 2014 12:08:26 +0530

kshitij.sood – 3 file(s) modified
Amazon amazonFbaOrderItem struct

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaOrderItem.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 13441 – Added new payment options

amit.gupta — Wed, 24 Dec 2014 17:13:54 +0530

amit.gupta – 3 file(s) modified
Added new payment options

~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 13422 – Added to crm

amit.gupta — Mon, 22 Dec 2014 10:59:18 +0530

amit.gupta – 4 file(s) modified
Added to crm

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/thriftpy/payments/constants.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Constants.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 13276 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Wed, 10 Dec 2014 12:31:05 +0530

manish.sharma – 35 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 10-Dec-2014

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReceiveReturnEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrdersByMasterOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SearchOrdersByMasterOrderEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketNewInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ReceiveReturnBox.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SearchOrdersByMasterOrderIdBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchFlipkartOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchOrdersByMasterOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LoadAcceptOrdersRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LoadAcceptOrdersResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SearchOrdersByMasterOrderIdRequest.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 13214 – Campaign & gosf

kshitij.sood — Sat, 06 Dec 2014 16:01:44 +0530

kshitij.sood – 8 file(s) modified
Campaign & gosf

~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Campaigns.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift

Rev 13154 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Fri, 28 Nov 2014 12:06:40 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 28-Nov-2014

+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartFaSalesSnapshot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 13146 – Committed by Manish Sharma for Bulk Shipment Creation Process on ...

manish.sharma — Thu, 27 Nov 2014 18:10:59 +0530

manish.sharma – 41 file(s) modified
Committed by Manish Sharma for Bulk Shipment Creation Process on 27-Nov-2014

+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptPackageOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AcceptPackageOrderEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AcceptOrderConfirmationBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptPackageOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptPackageOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AcceptPackageOrderResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.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/user/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AwbUploadController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/awb-upload-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 13136 – Added changes related to counter coupon.

amit.gupta — Wed, 26 Nov 2014 16:08:19 +0530

amit.gupta – 8 file(s) modified
Added changes related to counter coupon.

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

Rev 13114 –

kshitij.sood — Tue, 25 Nov 2014 14:21:40 +0530

kshitij.sood – 2 file(s) modified

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

Rev 12980 – Service changes related to async recharge

kshitij.sood — Mon, 03 Nov 2014 17:09:49 +0530

kshitij.sood – 4 file(s) modified
Service changes related to async recharge

~ /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/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12979 – Service changes related to async recharge

kshitij.sood — Mon, 03 Nov 2014 16:48:07 +0530

kshitij.sood – 10 file(s) modified
Service changes related to async recharge

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/RechargeService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/utils/Utils.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeMode.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12947 – Small change

kshitij.sood — Fri, 17 Oct 2014 16:24:08 +0530

kshitij.sood – 6 file(s) modified
Small change

~ /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/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 12913 – Committed by Manish Sharma for Adding Gujrat State on 13-Oct-2014

manish.sharma — Mon, 13 Oct 2014 12:19:53 +0530

manish.sharma – 6 file(s) modified
Committed by Manish Sharma for Adding Gujrat State on 13-Oct-2014

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 12895 – Committed by Manish Sharma for Not Assigning Orders to Telangana ...

manish.sharma — Fri, 10 Oct 2014 11:21:50 +0530

manish.sharma – 6 file(s) modified
Committed by Manish Sharma for Not Assigning Orders to Telangana 10-Oct-2014

~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 12892 –

kshitij.sood — Fri, 10 Oct 2014 00:05:44 +0530

kshitij.sood – 2 file(s) modified

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java

Rev 12888 – FC Gurgaon change

kshitij.sood — Thu, 09 Oct 2014 23:15:02 +0530

kshitij.sood – 12 file(s) modified
FC Gurgaon change

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CheckFeedSubmission.java
+ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBGListingFeed.java
+ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBGPricingFeedAndFetchResults.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 12872 – Added gurgaon for Amazon Warehouse FC Location.

amit.gupta — Thu, 09 Oct 2014 13:19:23 +0530

amit.gupta – 6 file(s) modified
Added gurgaon for Amazon Warehouse FC Location.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AmazonFCWarehouseLocation.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFCWarehouseLocation.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12800 – Committed by Manish Sharma for New Inventory Age Report Logic ...

manish.sharma — Mon, 29 Sep 2014 18:39:09 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for New Inventory Age Report Logic on 29-Sep-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InvAgeConsiderItems.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 12783 – Committed by Manish Sharma for New Invoice Creation Logic for ...

manish.sharma — Fri, 26 Sep 2014 20:39:39 +0530

manish.sharma – 3 file(s) modified
Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 12776 – Committed by Manish Sharma for New Invoice Creation Logic for ...

manish.sharma — Fri, 26 Sep 2014 16:42:01 +0530

manish.sharma – 6 file(s) modified
Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014

Rev 12772 – Committed by Manish Sharma for New Invoice Creation Logic for ...

manish.sharma — Fri, 26 Sep 2014 13:09:26 +0530

manish.sharma – 11 file(s) modified
Committed by Manish Sharma for New Invoice Creation Logic for Direct to Retail on 26-Sep-2014

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.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/FlipkartAdvantageOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12722 – Added user search api

amit.gupta — Tue, 23 Sep 2014 19:18:23 +0530

amit.gupta – 13 file(s) modified
Added user search api

+ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CounterController.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_private_deals.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 12696 – Added Counter Registration logic

amit.gupta — Mon, 22 Sep 2014 10:36:26 +0530

amit.gupta – 26 file(s) modified
Added Counter Registration logic

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/ForgotPasswordController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/pojos/NotificationPojo.java
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Counter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PrivateDealUser.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuth.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/DealerAuthRole.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/Location.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 12691 – Committed by Manish Sharma for Sms Integration on 18-Sep-2014

manish.sharma — Thu, 18 Sep 2014 16:58:06 +0530

manish.sharma – 15 file(s) modified
Committed by Manish Sharma for Sms Integration on 18-Sep-2014

~ /trunk/PyProj/src/shop2020/helpers/impl/Converters.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/DataService.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
+ /trunk/PyProj/src/shop2020/helpers/impl/SmsSender.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsDeliveryStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/SmsType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserSms.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/UserSmsInfo.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift