SmartDukaan – /

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 19722 – Committed by Manish Sharma for Return Process Implementation on May-11-2016

manish.sharma — Wed, 11 May 2016 15:17:02 +0530

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

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

Rev 19721 – Number updated

amit.gupta — Wed, 11 May 2016 15:16:13 +0530

amit.gupta – 1 file(s) modified
Number updated

~ /trunk/Website/src/main/resources/templates/Saholic-address.vm

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 19719 – Committed by Manish Sharma for Return Process Implementation on May-10-2016

manish.sharma — Tue, 10 May 2016 18:29:53 +0530

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

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

Rev 19718 – Fixed tinxys

amit.gupta — Tue, 10 May 2016 17:44:55 +0530

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

~ /trunk/PyDTR/src/dtr/api/Service.py

Rev 19717 –

amit.gupta — Tue, 10 May 2016 15:54:06 +0530

amit.gupta – 1 file(s) modified

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

Rev 19716 – Ra

amit.gupta — Tue, 10 May 2016 15:52:50 +0530

amit.gupta – 1 file(s) modified
Ra

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

Rev 19715 – Fixed commit.

amit.gupta — Tue, 10 May 2016 12:47:49 +0530

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

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

Rev 19714 – Committed by Manish Sharma for Return Process Implementation on May-9-2016

manish.sharma — Mon, 09 May 2016 18:48:43 +0530

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

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/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/catalog/CatalogService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.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/catalog/CatalogService.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/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 19713 –

amit.gupta — Mon, 09 May 2016 18:36:26 +0530

amit.gupta – 1 file(s) modified

~ /StoreWebsite/src/main/webapp/js/entity_20130719.js

Rev 19712 –

amit.gupta — Mon, 09 May 2016 18:26:10 +0530

amit.gupta – 1 file(s) modified

~ /StoreWebsite/src/main/webapp/js/entity_20130719.js

Rev 19711 –

amit.gupta — Mon, 09 May 2016 18:23:40 +0530

amit.gupta – 1 file(s) modified

~ /StoreWebsite/src/main/webapp/js/entity_20130719.js

Rev 19710 –

amit.gupta — Mon, 09 May 2016 18:18:08 +0530

amit.gupta – 1 file(s) modified

~ /StoreWebsite/src/main/webapp/js/entity_20130719.js

Rev 19709 –

amit.gupta — Mon, 09 May 2016 18:05:09 +0530

amit.gupta – 1 file(s) modified

~ /StoreWebsite/src/main/webapp/js/entity_20130719.js

Rev 19708 –

amit.gupta — Mon, 09 May 2016 17:38:11 +0530

amit.gupta – 1 file(s) modified

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java

Rev 19707 –

amit.gupta — Mon, 09 May 2016 16:54:24 +0530

amit.gupta – 1 file(s) modified

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.java

Rev 19706 – Added rolebased authentication OCR User and Non OCR User.

amit.gupta — Mon, 09 May 2016 16:47:30 +0530

amit.gupta – 11 file(s) modified
Added rolebased authentication OCR User and Non OCR User.

~ /StoreWebsite/src/main/java/in/shop2020/serving/controllers/BaseController.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/PaymentDetailsController.java
~ /StoreWebsite/src/main/webapp/js/entity_20130719.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/order-details-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/report-index.vm
~ /StoreWebsite/src/main/webapp/WEB-INF/content/search-index.vm

Rev 19705 – fixed oos to not available

amit.gupta — Mon, 09 May 2016 15:40:34 +0530

amit.gupta – 1 file(s) modified
fixed oos to not available

~ /StoreWebsite/src/main/webapp/js/entity_20130719.js

Rev 19704 – added target

naman — Mon, 09 May 2016 14:22:10 +0530

naman – 1 file(s) modified
added target

~ /trunk/MobileHotIndia/app/Config/core.php

Rev 19703 – changed new target logic

naman — Mon, 09 May 2016 12:55:33 +0530

naman – 1 file(s) modified
changed new target logic

~ /trunk/MobileHotIndia/app/View/Users/admin_target.ctp

Rev 19702 – changed new target logic

naman — Mon, 09 May 2016 12:55:14 +0530

naman – 1 file(s) modified
changed new target logic

~ /trunk/DtrMobileAppDashboard/app/View/Users/admin_target.ctp

Rev 19701 – removed date logic from admin target

naman — Mon, 09 May 2016 12:50:48 +0530

naman – 1 file(s) modified
removed date logic from admin target

~ /trunk/MobileHotIndia/app/Controller/UsersController.php

Rev 19700 – removed date logic from admin target

naman — Mon, 09 May 2016 12:48:35 +0530

naman – 1 file(s) modified
removed date logic from admin target

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

Rev 19699 – added admin_by page

naman — Fri, 06 May 2016 18:10:23 +0530

naman – 1 file(s) modified
added admin_by page

+ /trunk/MobileHotIndia/app/View/Users/admin_by.ctp

Rev 19698 – admin_by and admin_target action added

naman — Fri, 06 May 2016 18:08:27 +0530

naman – 1 file(s) modified
admin_by and admin_target action added

~ /trunk/MobileHotIndia/app/Controller/UsersController.php

Rev 19697 – added scheme and address

naman — Fri, 06 May 2016 18:03:11 +0530

naman – 1 file(s) modified
added scheme and address

~ /trunk/MobileHotIndia/app/View/Users/admin_search.ctp

Rev 19696 – admin_target view added

naman — Fri, 06 May 2016 18:00:13 +0530

naman – 1 file(s) modified
admin_target view added

+ /trunk/MobileHotIndia/app/View/Users/admin_target.ctp

Rev 19695 – added useraddress model

naman — Fri, 06 May 2016 17:59:14 +0530

naman – 1 file(s) modified
added useraddress model

+ /trunk/MobileHotIndia/app/Model/UserAddress.php

Rev 19694 – Committed by Manish Sharma for Return Process Implementation on May-5-2016

manish.sharma — Fri, 06 May 2016 17:53:23 +0530

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

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

Rev 19693 – Committed by Manish Sharma for Return Process Implementation on May-5-2016

manish.sharma — Thu, 05 May 2016 12:41:28 +0530

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

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

Rev 19692 – changed css for offertext

naman — Thu, 05 May 2016 12:16:20 +0530

naman – 1 file(s) modified
changed css for offertext

~ /trunk/DtrMobileAppDashboard/app/webroot/css/style.css

Rev 19691 – Committed by Manish Sharma for Return Process Implementation on May-5-2016

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

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

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/DataService.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/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemCondition.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ReturnTransaction.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

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 19689 – added eventpassthrough to iscroll

naman — Wed, 04 May 2016 15:58:11 +0530

naman – 1 file(s) modified
added eventpassthrough to iscroll

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

Rev 19688 – Split order logistics cost issue fix

amit.gupta — Wed, 04 May 2016 14:03:04 +0530

amit.gupta – 1 file(s) modified
Split order logistics cost issue fix

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

Rev 19687 –

kshitij.sood — Wed, 04 May 2016 14:02:30 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityUploadController.java

Rev 19686 – Entity upload service

kshitij.sood — Wed, 04 May 2016 13:51:32 +0530

kshitij.sood – 16 file(s) modified
Entity upload service

~ /trunk/PyProj/src/shop2020/content/main/handler/ContentHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/thriftpy/content/ContentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/content/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
+ /trunk/PyProj/src/shop2020/utils/ContentUploadUtil.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/content/BulkContentUpload.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/content/BulkContentUploadResult.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/content/ContentService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BulkUploadCatalog.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/ContentService/ContentService.thrift

Rev 19685 – Entity upload

kshitij.sood — Wed, 04 May 2016 13:49:10 +0530

kshitij.sood – 11 file(s) modified
Entity upload

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
+ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityUploadController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-deny.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload-result.vm
+ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-upload.vm
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/Action.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/RoleManager.java
~ /trunk/ContentStore/src/main/java/in/shop2020/content/security/UserManager.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/EntityUtils.java

Rev 19684 – Fixed some bug realted to order billing and cancellation

amit.gupta — Tue, 03 May 2016 12:07:21 +0530

amit.gupta – 1 file(s) modified
Fixed some bug realted to order billing and cancellation

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