SmartDukaan – //trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote

Rev 17470 – Committed by Manish Sharma for Bulk Order Creation and Shipping ...

manish.sharma — Mon, 16 Nov 2015 08:52:39 +0530

manish.sharma – 22 file(s) modified
Committed by Manish Sharma for Bulk Order Creation and Shipping Charges Implementation on 16-Nov-2015

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/MobileSite/application/widgets/cart/views/carts.php
~ /trunk/MobileSite/application/widgets/checkout/views/shipping_process.php
~ /trunk/MobileSite/application/widgets/productinfo/views/product_details_b.php
~ /trunk/MobileSite/application/widgets/productinfo/views/product_details_d.php
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/CommonPaymentService.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.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/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Transaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.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 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 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 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 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

Rev 12653 –

manish.sharma — Tue, 16 Sep 2014 18:23:01 +0530

manish.sharma – 13 file(s) modified

~ /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/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderBillingController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
+ /trunk/Support/src/main/webapp/js/bulk-order-billing.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-billing.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12614 – Added Junglee specific changes.

amit.gupta — Tue, 09 Sep 2014 23:12:54 +0530

amit.gupta – 13 file(s) modified
Added Junglee specific changes.

~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
~ /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateOrderAcknowledgementFeed.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJob.java
~ /trunk/AmazonOrders/src/main/java/com/amazonservices/mws/orders/samples/Test.java
~ /trunk/JungleeOrders/src/main/java/com/amazonservices/mws/orders/samples/FetchOrderUpdatesJobandAcknowledge.java
~ /trunk/JungleeOrders/src/main/java/com/amazonservices/mws/orders/samples/Test.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12589 – Committed by Manish Sharma for Flipkart FA Changes and also ...

manish.sharma — Wed, 03 Sep 2014 18:34:14 +0530

manish.sharma – 10 file(s) modified
Committed by Manish Sharma for Flipkart FA Changes and also related to Hold Orders on 03-Sep-2014

+ /trunk/Common/src/main/java/in/shop2020/serving/model/FreebieItem.java
~ /trunk/Common/src/main/java/in/shop2020/serving/model/Order.java
~ /trunk/Common/src/main/java/in/shop2020/serving/services/FetchNewFlipCartOrders.java
+ /trunk/Common/src/main/java/in/shop2020/serving/services/FlipkartHoldOrdersReconciliation.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12580 – Added new Source.

amit.gupta — Tue, 02 Sep 2014 17:36:01 +0530

amit.gupta – 5 file(s) modified
Added new Source.

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12103 – Committed by Manish Sharma for Amazon FBA Sale Return Report ...

manish.sharma — Wed, 16 Jul 2014 20:15:10 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for Amazon FBA Sale Return Report on 16-Jul-2014

+ /trunk/AmazonReports/src/main/java/com/amazonaws/mws/samples/FetchAmazonOrderReturnsData.java
~ /trunk/Common/src/main/java/in/shop2020/utils/GmailUtils.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/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/AmazonFbaOrderReturns.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FbaSkuSaleReturnDetail.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

Rev 11896 – Added logic of store affiliate.

amit.gupta — Thu, 03 Jul 2014 18:20:53 +0530

amit.gupta – 11 file(s) modified
Added logic of store affiliate.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/PaySuccessController.java
~ /trunk/MobileWebsiteApi/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm

Rev 11526 – Added mobile as source while creating orders. Logging related changes.

amit.gupta — Mon, 02 Jun 2014 12:53:42 +0530

amit.gupta – 20 file(s) modified
Added mobile as source while creating orders. Logging related changes.

~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/AddressController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/CartController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EbsPayController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/EntityController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/LoginController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/OrderController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/controllers/RegisterController.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/interceptors/UserInterceptor.java
~ /trunk/MobileWebsiteApi/src/main/java/in/shop2020/mobileapi/serving/services/ContentServingService.java
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/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/order/OrderSource.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java

Rev 10136 – Option to decide whether to scan the freebie also, for ...

anupam.singh — Tue, 11 Mar 2014 12:44:25 +0530

anupam.singh – 10 file(s) modified
Option to decide whether to scan the freebie also, for returned/RTO/DOA orders

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/ReceiveReturnEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ReceiveReturnBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ReceiveReturnHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/ReceiveReturnRequest.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9945 – Flipkart Inventory feed changes.

vikram.raghav — Thu, 20 Feb 2014 17:24:48 +0530

vikram.raghav – 17 file(s) modified
Flipkart Inventory feed changes.

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /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/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.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/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/FlipkartItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9882 – Committed by Manish Sharma for Snapdeal Order Status Reconciliation on ...

manish.sharma — Thu, 13 Feb 2014 17:08:34 +0530

manish.sharma – 5 file(s) modified
Committed by Manish Sharma for Snapdeal Order Status Reconciliation on Feb-13-2014

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 9801 – Committed by Manish Sharma for XML Implementation for Amazon FBA ...

manish.sharma — Thu, 06 Feb 2014 18:17:36 +0530

manish.sharma – 6 file(s) modified
Committed by Manish Sharma for XML Implementation for Amazon FBA Sales Snapshot on Feb-06-2014

Rev 9652 – Committed by Manish Sharma for User Creation for other sources ...

manish.sharma — Mon, 27 Jan 2014 18:46:08 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for User Creation for other sources and Tracking Reconciliation on Jan-27-2014

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote

Rev 9630 – Changed data type of suborderid in snapdeal

vikram.raghav — Sat, 25 Jan 2014 13:32:24 +0530

vikram.raghav – 5 file(s) modified
Changed data type of suborderid in snapdeal

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/SnapDealFeeds/src/main/java/in/shop2020/ProcessSnapdealOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9571 – Snapdeal inventory feed creation changes for pending orders

vikram.raghav — Wed, 22 Jan 2014 14:19:30 +0530

vikram.raghav – 7 file(s) modified
Snapdeal inventory feed creation changes for pending orders

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

Rev 9404 – Changes to create snapdeal inventory feed

vikram.raghav — Tue, 14 Jan 2014 11:09:36 +0530

vikram.raghav – 29 file(s) modified
Changes to create snapdeal inventory feed

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.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/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/SnapDealFeeds/pom.xml
+ /trunk/SnapDealFeeds/src/main/java/in/shop2020/CreateSnapDealInventoryFeed.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/Inventory.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/InventoryItems.java
x /trunk/SnapDealFeeds/src/main/java/inventory/ObjectFactory.java
x /trunk/SnapDealFeeds/src/main/java/inventory/SaholicAPI.java
+ /trunk/SnapDealFeeds/src/main/java/inventory/SnapdealItemForInventory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/SnapdealItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/SnapdealInventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 9107 – Changes to update awb and shipbydate for a confirmed flipkartorder

vikram.raghav — Thu, 12 Dec 2013 12:32:07 +0530

vikram.raghav – 6 file(s) modified
Changes to update awb and shipbydate for a confirmed flipkartorder

Rev 8990 – Created method getflipkartorder to be used in om dashboard

vikram.raghav — Fri, 06 Dec 2013 10:43:59 +0530

vikram.raghav – 7 file(s) modified
Created method getflipkartorder to be used in om dashboard

Rev 8961 – Changes to create Flipkart Order.

vikram.raghav — Wed, 04 Dec 2013 20:03:46 +0530

vikram.raghav – 14 file(s) modified
Changes to create Flipkart Order.

~ /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/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/flipkart-upload-orders.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 8942 – Made changes as per new EMI guidelines of RBI.

rajveer — Tue, 03 Dec 2013 12:09:40 +0530

rajveer – 15 file(s) modified
Made changes as per new EMI guidelines of RBI.

~ /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/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EmiScheme.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/InnovitiPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/InnovitiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java

Rev 8282 – Changes to Estimate Amazon FBA Stock.

kshitij.sood — Fri, 04 Oct 2013 12:01:30 +0530

kshitij.sood – 21 file(s) modified
Changes to Estimate Amazon FBA Stock.

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.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/thriftpy/model/v1/inventory/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/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/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AmazonFbaInventorySnapshot.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.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/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7967 – Send emails to all stores where no recharge happened on ...

anupam.singh — Mon, 12 Aug 2013 18:40:59 +0530

anupam.singh – 12 file(s) modified
Send emails to all stores where no recharge happened on a given day.

~ /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/order/script/ProcessRechargeTransaction.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/HotspotServiceMatrix.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/hotspotServiceMatrix.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7730 – Added option to convert "pickup-in-store" orders to "normal" orders

anupam.singh — Wed, 10 Jul 2013 19:43:27 +0530

anupam.singh – 11 file(s) modified
Added option to convert "pickup-in-store" orders to "normal" orders

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7715 – Added amazonorder to store Purchase Date On Amazon

vikram.raghav — Mon, 08 Jul 2013 16:56:06 +0530

vikram.raghav – 8 file(s) modified
Added amazonorder to store Purchase Date On Amazon

Rev 7645 – RTO, Return and DOA flow for Store orders.

anupam.singh — Thu, 27 Jun 2013 18:13:10 +0530

anupam.singh – 10 file(s) modified
RTO, Return and DOA flow for Store orders.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/tickets-edit.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7607 – Adding methods "getOrdersByMobile" and getOrderByAmazonOrderId

anupam.singh — Sun, 23 Jun 2013 12:59:12 +0530

anupam.singh – 4 file(s) modified
Adding methods "getOrdersByMobile" and getOrderByAmazonOrderId

Rev 7560 – Added method to change courier provider.

rajveer — Tue, 18 Jun 2013 14:19:18 +0530

rajveer – 6 file(s) modified
Added method to change courier provider.

Rev 7542 –

vikram.raghav — Sat, 15 Jun 2013 17:40:25 +0530

vikram.raghav – 7 file(s) modified

Rev 7427 – Bug fixes

anupam.singh — Sun, 09 Jun 2013 03:58:11 +0530

anupam.singh – 23 file(s) modified
Bug fixes

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
x /StoreWebsite/src/main/webapp/css/entity.css
+ /StoreWebsite/src/main/webapp/css/entity_20130608.css (copied from /StoreWebsite/src/main/webapp/css/entity.css@7426)
x /StoreWebsite/src/main/webapp/js/entity.js
+ /StoreWebsite/src/main/webapp/js/entity_20130608.js (copied from /StoreWebsite/src/main/webapp/js/entity.js@7426)
x /StoreWebsite/src/main/webapp/js/storewebsite.js
+ /StoreWebsite/src/main/webapp/js/storewebsite_20130608.js (copied from /StoreWebsite/src/main/webapp/js/storewebsite.js@7426)
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/error-result.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /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/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7393 – Added options in CRM to cancel storeWebsite orders

anupam.singh — Wed, 05 Jun 2013 16:47:44 +0530

anupam.singh – 17 file(s) modified
Added options in CRM to cancel storeWebsite orders

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
~ /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/StoreOrderDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7386 – Changes for store website

anupam.singh — Wed, 05 Jun 2013 12:05:09 +0530

anupam.singh – 32 file(s) modified
Changes for store website

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/HomeController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderSuccessController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/SearchController.java
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
~ /StoreWebsite/src/main/webapp/js/entity.js
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/logout.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /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/StoreOrderDetail.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/StorePaymentStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7371 – Added ability to add OperatorSeries

anupam.singh — Thu, 30 May 2013 02:16:23 +0530

anupam.singh – 9 file(s) modified
Added ability to add OperatorSeries

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AddSeriesController.java
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/add-series-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7370 – Provision to add/update FRC. Differentiating between normal and admin user ...

anupam.singh — Wed, 29 May 2013 20:36:43 +0530

anupam.singh – 13 file(s) modified
Provision to add/update FRC. Differentiating between normal and admin user on login.

+ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AddFrcController.java
~ /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/AdminController.java
+ /RechargeDashboard/src/main/webapp/WEB-INF/content/add-frc-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/admin-show.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/delete-frc-index.vm
~ /RechargeDashboard/src/main/webapp/WEB-INF/content/report-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeTransaction.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7363 – Added support to add recharge balance

rajveer — Tue, 28 May 2013 13:48:34 +0530

rajveer – 7 file(s) modified
Added support to add recharge balance

~ /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/RechargeTopupController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/recharge-topup-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 7343 – Changes for Store Website

anupam.singh — Fri, 24 May 2013 12:12:12 +0530

anupam.singh – 21 file(s) modified
Changes for Store Website

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/OrderSuccessController.java
~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
+ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java
~ /StoreWebsite/src/main/webapp/css/storewebsite.css
+ /StoreWebsite/src/main/webapp/images/rupee-symbol.png
~ /StoreWebsite/src/main/webapp/js/storewebsite.js
~ /StoreWebsite/src/main/webapp/WEB-INF/content/entity-show.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/home-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/order-success-index.vm (copied from /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm@7327)
x /StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
+ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift