SmartDukaan – /

Rev 20032 –

kshitij.sood — Thu, 16 Jun 2016 12:35:35 +0530

kshitij.sood – 1 file(s) modified

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

Rev 20031 – Fixed field variables

amit.gupta — Thu, 16 Jun 2016 12:29:22 +0530

amit.gupta – 1 file(s) modified
Fixed field variables

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

Rev 20030 –

kshitij.sood — Thu, 16 Jun 2016 12:28:22 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 20029 –

kshitij.sood — Thu, 16 Jun 2016 12:20:30 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 20028 – Option to add delay in bulk.

kshitij.sood — Thu, 16 Jun 2016 12:18:19 +0530

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

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ShipmentDelayDetail.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 20027 –

amit.gupta — Thu, 16 Jun 2016 11:30:40 +0530

amit.gupta – 1 file(s) modified

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

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 20025 – Added changes related to company details/warehouse address

amit.gupta — Thu, 16 Jun 2016 09:03:01 +0530

amit.gupta – 18 file(s) modified
Added changes related to company details/warehouse address

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /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/purchase/main/model/PurchaseOrder.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/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/BuyerInfo.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/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 20024 – Removed warranty and expiry

kshitij.sood — Wed, 15 Jun 2016 17:23:36 +0530

kshitij.sood – 1 file(s) modified
Removed warranty and expiry

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

Rev 20023 – Added status code to check package location at destination city.

kshitij.sood — Wed, 15 Jun 2016 16:40:30 +0530

kshitij.sood – 1 file(s) modified
Added status code to check package location at destination city.

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java

Rev 20022 – changed url in linkdeal and getlinkdeal for exclusive and ...

naman — Wed, 15 Jun 2016 15:39:38 +0530

naman – 1 file(s) modified
changed url in linkdeal and getlinkdeal for exclusive and below 1000

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php

Rev 20021 – loader issue && fixes for refund transaction and refund order ...

aman.kumar — Wed, 15 Jun 2016 15:28:29 +0530

aman.kumar – 3 file(s) modified
loader issue && fixes for refund transaction and refund order scenario

~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 20020 – Updated AR TO AF (local_connected_orders)

kshitij.sood — Wed, 15 Jun 2016 14:51:56 +0530

kshitij.sood – 1 file(s) modified
Updated AR TO AF (local_connected_orders)

~ /trunk/Common/src/main/java/in/shop2020/serving/services/FedExTrackingService.java

Rev 20019 – Added source filter

kshitij.sood — Wed, 15 Jun 2016 11:49:09 +0530

kshitij.sood – 1 file(s) modified
Added source filter

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 20018 – added check for saholic in linkdeal and getlinkdeal

naman — Wed, 15 Jun 2016 11:21:40 +0530

naman – 1 file(s) modified
added check for saholic in linkdeal and getlinkdeal

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php

Rev 20017 – changed text for below 1000

naman — Wed, 15 Jun 2016 11:05:22 +0530

naman – 1 file(s) modified
changed text for below 1000

~ /trunk/DtrMobileAppDashboard/app/View/Categories/linkdeal.ctp

Rev 20016 – removed clearance sale

naman — Wed, 15 Jun 2016 11:04:55 +0530

naman – 1 file(s) modified
removed clearance sale

~ /trunk/DtrMobileAppDashboard/app/View/Categories/view.ctp

Rev 20015 – added sort=available_price&direction=1 in url

naman — Tue, 14 Jun 2016 20:31:23 +0530

naman – 1 file(s) modified
added sort=available_price&direction=1 in url

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php

Rev 20014 – changed order of link

naman — Tue, 14 Jun 2016 20:22:52 +0530

naman – 1 file(s) modified
changed order of link

~ /trunk/DtrMobileAppDashboard/app/View/Categories/view.ctp

Rev 20013 –

naman — Tue, 14 Jun 2016 20:20:54 +0530

naman – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Categories/linkdeal.ctp

Rev 20012 – added direction in url

naman — Tue, 14 Jun 2016 20:19:20 +0530

naman – 1 file(s) modified
added direction in url

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php

Rev 20011 –

kshitij.sood — Tue, 14 Jun 2016 20:16:13 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 20010 – added condition for exclusive and below1000 and removed getpin

naman — Tue, 14 Jun 2016 20:07:36 +0530

naman – 1 file(s) modified
added condition for exclusive and below1000 and removed getpin

~ /trunk/DtrMobileAppDashboard/app/Controller/CategoriesController.php

Rev 20009 – Added price filter ,changed filter logic to step filteration.

kshitij.sood — Tue, 14 Jun 2016 19:57:22 +0530

kshitij.sood – 1 file(s) modified
Added price filter ,changed filter logic to step filteration.

~ /trunk/PyDTR/src/dtr/storage/Mongo.py

Rev 20008 – added condition for scroll3 and removed height for wrapper3

naman — Tue, 14 Jun 2016 19:44:53 +0530

naman – 1 file(s) modified
added condition for scroll3 and removed height for wrapper3

~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp

Rev 20007 – removed quickclick

naman — Tue, 14 Jun 2016 19:40:54 +0530

naman – 1 file(s) modified
removed quickclick

~ /trunk/DtrMobileAppDashboard/app/View/Categories/view.ctp

Rev 20006 – added condition for exclusive and below1000

naman — Tue, 14 Jun 2016 19:26:29 +0530

naman – 1 file(s) modified
added condition for exclusive and below1000

~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp

Rev 20005 – added scroll in link

naman — Tue, 14 Jun 2016 19:22:58 +0530

naman – 1 file(s) modified
added scroll in link

~ /trunk/DtrMobileAppDashboard/app/View/Categories/view.ctp

Rev 20004 – added css and js for wrapper3

naman — Tue, 14 Jun 2016 19:20:58 +0530

naman – 1 file(s) modified
added css and js for wrapper3

~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp

Rev 20003 – Removed sandeep's id and add khushal's and himanshu's id

aman.kumar — Tue, 14 Jun 2016 19:06:32 +0530

aman.kumar – 7 file(s) modified
Removed sandeep's id and add khushal's and himanshu's id

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/StockSheetSender.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/HotspotStockReportSender.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InTransitInventoryReportSender.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InventoryMismatchGenerator.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 20002 –

kshitij.sood — Tue, 14 Jun 2016 18:07:38 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/shopclues.py

Rev 20001 – Adding led lights sub_cat

kshitij.sood — Tue, 14 Jun 2016 16:51:48 +0530

kshitij.sood – 1 file(s) modified
Adding led lights sub_cat

~ /trunk/PyDTR/src/dtr/utils/utils.py

Rev 20000 – added led light

naman — Tue, 14 Jun 2016 16:51:20 +0530

naman – 1 file(s) modified
added led light

~ /trunk/DtrMobileAppDashboard/app/Config/live.php

Rev 19999 –

kshitij.sood — Tue, 14 Jun 2016 16:47:47 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java

Rev 19998 – Added USB Devices

amit.gupta — Tue, 14 Jun 2016 16:40:15 +0530

amit.gupta – 1 file(s) modified
Added USB Devices

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

Rev 19997 –

kshitij.sood — Tue, 14 Jun 2016 16:29:33 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkAddController.java

Rev 19996 – added 38 => 'LED Light'

naman — Tue, 14 Jun 2016 15:38:17 +0530

naman – 1 file(s) modified
added 38 => 'LED Light'

~ /trunk/DtrMobileAppDashboard/app/Config/staging.php

Rev 19995 – Added USB Lights

amit.gupta — Tue, 14 Jun 2016 15:27:59 +0530

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

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

Rev 19994 – Added USB Lights

amit.gupta — Tue, 14 Jun 2016 15:20:07 +0530

amit.gupta – 4 file(s) modified
Added USB Lights

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

Rev 19993 – Logging didnt worked as expected. Need to have a fresh ...

amit.gupta — Mon, 13 Jun 2016 19:59:32 +0530

amit.gupta – 1 file(s) modified
Logging didnt worked as expected. Need to have a fresh look at it.

~ /trunk/PyProj/src/shop2020/utils/daemon.py