Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
19166 3591 d 16 h manish.sharma /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Committed by Manish Sharma for Dashboard Changes on Mar-17-2016  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
19060 3600 d 16 h manish.sharma /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Committed by Manish Sharma for Dashboard Changes on Mar-08-2016  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
19059 3600 d 16 h manish.sharma /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Committed by Manish Sharma for Dashboard Changes on Mar-08-2016  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
19057 3600 d 17 h manish.sharma /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Committed by Manish Sharma for Dashboard Changes on Mar-08-2016  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
19004 3604 d 20 h manish.sharma /trunk/ Committed by Manish Sharma for Hotspot Dashboard Color Coding on Mar-04-2016  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/OrderPromisedShippingComparator.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderAlert.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
8717 4453 d 14 h amar.kumar /trunk/ Changes for billing of bad Inventory  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ProductCondition.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.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/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/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/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
7422 4605 d 14 h rajveer /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/ Changes made for all invoice related.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
5387 4969 d 17 h rajveer /trunk/ Added support to handle self pickup. Also provided support to display quantity in OM dashboard.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/logistics/service/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/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
/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
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
4671 5060 d 16 h rajveer /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Corrected the promised shipping date.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
4670 5060 d 16 h rajveer /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Corrected spacing.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
4666 5060 d 18 h rajveer /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/ 1) Added lost in transit flow for the order.
2) Removed Batch No and Serial No from the order table.
3) Added Promised shipping date.
 
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LostInTransitEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LostInTransitEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/LostInTransitHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LostInTransitRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LostInTransitResponse.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/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.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/OrderDetailsHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/RejectOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
4398 5099 d 17 h rajveer /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/ Changed name of Alert to OrderAlert to accommodate generic Alerts.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderAlert.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Alert.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
4361 5106 d 16 h rajveer /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/ Added support to print multiple invoices at one time. Also display the list of all orders when user clicks at All Pending. Display counts of ordertype also.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderCountsEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderCountsEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderCountsHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderCountsRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderCountsResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderListEvent.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/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java
4175 5158 d 16 h rajveer /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Added Deal Text at the top of the product name.  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
4133 5166 d 12 h chandranshu /trunk/ Added support for pagination to OM Dashboard's order lists  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/data/Constants.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllOrdersListEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadAllOrdersListEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AllOrderListHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllOrderListRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AllOrderListResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenter.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderListEvent.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/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderResponse.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
4125 5166 d 19 h chandranshu /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Adjusted column widths and added some comments  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
4124 5166 d 19 h chandranshu /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ Started using DataGrid for displaying orders. This and the last commit lay down the groundwork for pagination  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
4004 5182 d 17 h chandranshu /trunk/ Added support to highlight delayed orders in the OM dashboard  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Alert.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/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
3994 5187 d 16 h chandranshu /trunk/ Added support for the warehouse admin to specify the delay as no. of business days rather than actual no. of days  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
3065 5256 d 13 h chandranshu /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/ Changes for COD  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/VerifyOrderEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/VerifyOrderEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/VerifyOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/VerifyOrderRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/VerifyOrderResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/MarkOrdersAsManifestedEvent.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/MarkOrdersAsManifestedConfirmationBox.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/OrderList.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProviderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/ProviderDetails.ui.xml
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.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/MarkOrdersAsManifestedHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/OrderDetailsHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/DetailsMask.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/MarkOrdersAsManifestedRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java

Show All