SmartDukaan – /

Rev 19988 –

kshitij.sood — Mon, 13 Jun 2016 16:37:02 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-add-options.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/download-virtual-div.vm

Rev 19987 –

amit.gupta — Mon, 13 Jun 2016 16:07:13 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 19986 – Added change for Company 1 is set for now

amit.gupta — Mon, 13 Jun 2016 15:54:53 +0530

amit.gupta – 1 file(s) modified
Added change for Company 1 is set for now

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

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 19984 –

amit.gupta — Mon, 13 Jun 2016 09:24:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 19983 –

amit.gupta — Mon, 13 Jun 2016 08:18:49 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py

Rev 19982 –

amit.gupta — Sun, 12 Jun 2016 23:53:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 19981 –

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

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

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 19978 – Added unique constraint for label

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

amit.gupta – 1 file(s) modified
Added unique constraint for label

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 19977 –

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

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

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 19975 –

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

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 19974 –

amit.gupta — Sun, 12 Jun 2016 14:59:20 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.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 19972 – Removed sandeep and manish, added shiv and himanshu.

amit.gupta — Sat, 11 Jun 2016 18:22:09 +0530

amit.gupta – 1 file(s) modified
Removed sandeep and manish, added shiv and himanshu.

~ /trunk/PyProj/src/shop2020/model/v1/order/script/DelayedOrdersReport.py

Rev 19971 –

amit.gupta — Sat, 11 Jun 2016 14:47:51 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/scripts/addressupdate.py

Rev 19970 – Fixed address logic

amit.gupta — Sat, 11 Jun 2016 14:44:01 +0530

amit.gupta – 1 file(s) modified
Fixed address logic

~ /trunk/PyDTR/src/scripts/addressupdate.py

Rev 19969 –

amit.gupta — Sat, 11 Jun 2016 12:18:16 +0530

amit.gupta – 1 file(s) modified

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

Rev 19968 –

amit.gupta — Sat, 11 Jun 2016 12:16:53 +0530

amit.gupta – 1 file(s) modified

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

Rev 19967 – Added LED Lights

amit.gupta — Sat, 11 Jun 2016 12:13:17 +0530

amit.gupta – 1 file(s) modified
Added LED Lights

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

Rev 19966 – Added LED Lights

amit.gupta — Sat, 11 Jun 2016 10:55:03 +0530

amit.gupta – 2 file(s) modified
Added LED Lights

~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/categoryslidesequence.xml

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 19960 –

amit.gupta — Fri, 10 Jun 2016 14:47:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 19959 – Fixed convertor

amit.gupta — Fri, 10 Jun 2016 14:44:53 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py

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 19956 – Fixed cutoff logic

amit.gupta — Fri, 10 Jun 2016 00:33:45 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py

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 19953 – added changes related to new company

amit.gupta — Thu, 09 Jun 2016 19:22:13 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 19952 – Added missing imports

amit.gupta — Thu, 09 Jun 2016 18:08:50 +0530

amit.gupta – 1 file(s) modified
Added missing imports

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py

Rev 19951 –

amit.gupta — Thu, 09 Jun 2016 17:32:29 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py

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 19949 – added padding in button

naman — Thu, 09 Jun 2016 12:41:55 +0530

naman – 1 file(s) modified
added padding in button

~ /trunk/DtrMobileAppDashboard/app/View/Abouts/trip.ctp