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

Rev 20026 – Option to add delay in bulk.

kshitij.sood — Thu, 16 Jun 2016 11:29:16 +0530

kshitij.sood – 8 file(s) modified
Option to add delay in bulk.

~ /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/ShipmentDelayUpload.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessShipmentDelay.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessShipmentDelayServlet.java
~ /trunk/HotspotDashboard/src/main/webapp/HotspotDashboard.html
~ /trunk/HotspotDashboard/src/main/webapp/WEB-INF/web.xml

Rev 19985 –

amit.gupta — Mon, 13 Jun 2016 09:47:50 +0530

amit.gupta – 1 file(s) modified

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

Rev 19980 – Added address_id to order table

amit.gupta — Sun, 12 Jun 2016 22:26:14 +0530

amit.gupta – 13 file(s) modified
Added address_id to order table

~ /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/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/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddress.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddressMapping.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19979 – Syntax fix

amit.gupta — Sun, 12 Jun 2016 16:54:54 +0530

amit.gupta – 1 file(s) modified
Syntax fix

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

Rev 19976 – Tin number should be fetched from seller info

amit.gupta — Sun, 12 Jun 2016 15:12:58 +0530

amit.gupta – 1 file(s) modified
Tin number should be fetched from seller info

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

Rev 19973 – Added changes related to company invoice

amit.gupta — Sun, 12 Jun 2016 14:57:06 +0530

amit.gupta – 13 file(s) modified
Added changes related to company invoice

~ /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/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/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SellerInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19965 –

amit.gupta — Fri, 10 Jun 2016 16:34:00 +0530

amit.gupta – 1 file(s) modified

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

Rev 19964 –

amit.gupta — Fri, 10 Jun 2016 16:24:31 +0530

amit.gupta – 1 file(s) modified

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

Rev 19963 –

amit.gupta — Fri, 10 Jun 2016 16:17:18 +0530

amit.gupta – 1 file(s) modified

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

Rev 19962 – Added logs

amit.gupta — Fri, 10 Jun 2016 16:10:38 +0530

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

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

Rev 19961 –

amit.gupta — Fri, 10 Jun 2016 16:01:04 +0530

amit.gupta – 1 file(s) modified

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

Rev 19958 – Fixed cutoff logic

amit.gupta — Fri, 10 Jun 2016 14:32:40 +0530

amit.gupta – 3 file(s) modified
Fixed cutoff logic

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SearchOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py

Rev 19957 –

amit.gupta — Fri, 10 Jun 2016 00:37:25 +0530

amit.gupta – 2 file(s) modified

Rev 19955 – Fixed warehouseId

amit.gupta — Thu, 09 Jun 2016 23:43:21 +0530

amit.gupta – 1 file(s) modified
Fixed warehouseId

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java

Rev 19954 – Only in case of saholic order set warehouse 7151 to ...

amit.gupta — Thu, 09 Jun 2016 22:20:57 +0530

amit.gupta – 1 file(s) modified
Only in case of saholic order set warehouse 7151 to 7

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

Rev 19950 – added changes related to new company

amit.gupta — Thu, 09 Jun 2016 17:13:57 +0530

amit.gupta – 7 file(s) modified
added changes related to new company

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /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

Rev 19832 – Added unaccept order feature.

amit.gupta — Mon, 23 May 2016 12:31:00 +0530

amit.gupta – 12 file(s) modified
Added unaccept order feature.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/UnacceptConfirmationBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/UnacceptOrderhandler.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/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PendingStoreOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19723 – Committed by Manish Sharma for Change in Customer Care Number ...

manish.sharma — Wed, 11 May 2016 15:19:16 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Change in Customer Care Number on May-11-2016

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

Rev 19720 – Committed by Manish Sharma for Return Process Implementation on May-11-2016

manish.sharma — Wed, 11 May 2016 11:24:10 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Return Process Implementation on May-11-2016

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

Rev 19690 – Committed by Manish Sharma for Acceptance Issue on May-5-2016

manish.sharma — Thu, 05 May 2016 11:05:33 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Acceptance Issue on May-5-2016

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

Rev 19579 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Thu, 21 Apr 2016 13:17:02 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-21-2016

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

Rev 19578 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Thu, 21 Apr 2016 13:15:59 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-21-2016

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

Rev 19540 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Tue, 19 Apr 2016 15:55:44 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-19-2016

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

Rev 19516 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Mon, 18 Apr 2016 18:29:36 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-18-2016

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

Rev 19515 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Mon, 18 Apr 2016 18:25:07 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-18-2016

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

Rev 19513 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Mon, 18 Apr 2016 18:14:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-18-2016

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

Rev 19430 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Mon, 11 Apr 2016 17:31:06 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-11-2016

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

Rev 19429 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Mon, 11 Apr 2016 17:29:07 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-11-2016

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

Rev 19421 – Committed by Manish Sharma for Logistics Costing Related Changes on ...

manish.sharma — Mon, 11 Apr 2016 14:52:46 +0530

manish.sharma – 23 file(s) modified
Committed by Manish Sharma for Logistics Costing Related Changes on Apr-11-2016

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptOrderhandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AcceptPackageOrderHandler.java
~ /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/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/order/ttypes.py
~ /trunk/ShipDEWebServiceClient/src/main/java/com/ShipWebServiceClient.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
~ /trunk/Support/src/main/webapp/Docs/DataUpdationSheet.xls
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/DeliveryEstimateAndCosting.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsLocationInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19296 – Committed by Manish Sharma for Dashboard Changes on Mar-30-2016

manish.sharma — Thu, 31 Mar 2016 12:08:24 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-30-2016

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

Rev 19279 – Committed by Manish Sharma for Dashboard Changes on Mar-30-2016

manish.sharma — Wed, 30 Mar 2016 12:24:30 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-30-2016

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

Rev 19277 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 18:43:34 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

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

Rev 19276 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 18:32:40 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

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

Rev 19269 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 16:27:37 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java

Rev 19268 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 16:09:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

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

Rev 19267 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 16:08:28 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderListEvent.java

Rev 19266 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 16:08:14 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadOrderCountsEvent.java

Rev 19265 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 16:08:05 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/OrderType.java

Rev 19263 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 15:42:02 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

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

Rev 19262 – Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

manish.sharma — Tue, 29 Mar 2016 15:31:38 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Dashboard Changes on Mar-29-2016

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