SmartDukaan – /trunk/Support/src/main/webapp/js/

Rev 24045 –

amit.gupta — Sun, 26 Aug 2018 08:54:37 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24044 –

amit.gupta — Sun, 26 Aug 2018 08:51:28 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24043 –

amit.gupta — Sun, 26 Aug 2018 08:48:40 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24042 –

amit.gupta — Sun, 26 Aug 2018 08:42:44 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 24040 –

amit.gupta — Sun, 26 Aug 2018 08:34:30 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24039 –

amit.gupta — Sun, 26 Aug 2018 08:25:56 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 24033 – fixed data.

amit.gupta — Fri, 24 Aug 2018 16:39:28 +0530

amit.gupta – 5 file(s) modified
fixed data.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-common.js
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js

Rev 23990 –

amit.gupta — Sat, 11 Aug 2018 07:58:52 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 23989 –

amit.gupta — Sat, 11 Aug 2018 07:53:43 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 23988 –

amit.gupta — Sat, 11 Aug 2018 07:40:48 +0530

amit.gupta – 1 file(s) modified

~ /trunk/Support/src/main/webapp/js/bulk-order-common.js

Rev 22452 – Fixed bulk Order processing

amit.gupta — Sat, 16 Sep 2017 21:45:59 +0530

amit.gupta – 20 file(s) modified
Fixed bulk Order processing

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-show.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/ItemPriceQuantity.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 21092 –

kshitij.sood — Mon, 20 Mar 2017 15:11:06 +0530

kshitij.sood – 10 file(s) modified

~ /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/Support/src/main/java/in/shop2020/support/controllers/PmsaController.java
~ /trunk/Support/src/main/webapp/js/pmsa-common.js
~ /trunk/Support/src/main/webapp/js/pmsa-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-myprofile.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 21090 – PM Sales Associate

kshitij.sood — Sat, 18 Mar 2017 20:30:20 +0530

kshitij.sood – 24 file(s) modified
PM Sales Associate

~ /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.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/utils/Utils.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PmsaController.java
+ /trunk/Support/src/main/webapp/css/bootstrap.css
+ /trunk/Support/src/main/webapp/css/pmsa.css
+ /trunk/Support/src/main/webapp/css/simple-sidebar.css
+ /trunk/Support/src/main/webapp/js/bootstrap.min.js
+ /trunk/Support/src/main/webapp/js/pmsa-common.js
+ /trunk/Support/src/main/webapp/js/pmsa-events.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-add-user.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-result.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-search-results.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/pmsa-search-user.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Pmsa.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PmsaSearchFilter.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 12653 –

manish.sharma — Tue, 16 Sep 2014 18:23:01 +0530

manish.sharma – 13 file(s) modified

~ /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/Support/pom.xml
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderBillingController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
+ /trunk/Support/src/main/webapp/js/bulk-order-billing.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-billing.vm
~ /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

Rev 12449 – amazon dashboard changes

kshitij.sood — Thu, 14 Aug 2014 19:02:50 +0530

kshitij.sood – 78 file(s) modified
amazon dashboard changes

~ /trunk/AmazonFeeds/.project
~ /trunk/AmazonFeeds/pom.xml
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/AmazonItem.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelFeedSubmissionsAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelFeedSubmissionsSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelReportRequestsAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelReportRequestsSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CheckFeedSubmission.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateNonFBAInventoryAndPricingFlatFile.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateOrderAcknowledgementFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionResultAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionResultSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleCountAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleCountSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListByNextTokenAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListByNextTokenSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ManageReportScheduleAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ManageReportScheduleSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ProcessFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/RequestReportAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/RequestReportSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitAdjustmentFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAInventoryFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAListingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBBListingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFeedAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalFBBPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalNonFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAListingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeed.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeedAndFetchResults.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/UpdateReportAcknowledgementsAsyncSample.java
x /trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/UpdateReportAcknowledgementsSample.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/Support/pom.xml
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
~ /trunk/Support/src/main/java/in/shop2020/support/utils/PromotionFeed.java
+ /trunk/Support/src/main/webapp/css/jquery.datepick.css
+ /trunk/Support/src/main/webapp/js/jquery.datepick.js
+ /trunk/Support/src/main/webapp/js/jquery.plugin.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-promotion-result.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-promotion-upload.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-promotion.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-shipping-upload.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/options.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Amazonlisted.java

Rev 11122 – More fields in live data scraping

kshitij.sood — Wed, 14 May 2014 13:49:54 +0530

kshitij.sood – 3 file(s) modified
More fields in live data scraping

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealScraperController.java
~ /trunk/Support/src/main/webapp/js/snapdeal-competition-analysis-common.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/competition-details.vm

Rev 11110 – Snapdeal live data scraping

kshitij.sood — Tue, 13 May 2014 21:43:23 +0530

kshitij.sood – 5 file(s) modified
Snapdeal live data scraping

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealScraperController.java
~ /trunk/Support/src/main/webapp/js/snapdeal-competition-analysis-common.js
~ /trunk/Support/src/main/webapp/js/snapdeal-competition-analysis-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/competition-details.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-item-table.vm

Rev 11015 – snapdeal comp. analysis.

kshitij.sood — Thu, 08 May 2014 17:56:43 +0530

kshitij.sood – 20 file(s) modified
snapdeal comp. analysis.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.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/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealListController.java
+ /trunk/Support/src/main/webapp/images/add_green_button.png
+ /trunk/Support/src/main/webapp/images/minus_green_button.jpg
+ /trunk/Support/src/main/webapp/js/snapdeal-competition-analysis-common.js
+ /trunk/Support/src/main/webapp/js/snapdeal-competition-analysis-events.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/competition-details.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-competition-table.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-duplicate-records.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-item-table.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/snapdeal-list-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CompetitionCategory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/MarketplaceHistory.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 9761 – Change for showing all items with hold-inventories along with their ...

amar.kumar — Mon, 03 Feb 2014 16:54:04 +0530

amar.kumar – 12 file(s) modified
Change for showing all items with hold-inventories along with their total availability/reserved/held.
Also option to add/update hold-inventory has been provided

~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/HoldInventoryController.java
+ /trunk/Support/src/main/webapp/css/hold-inventory.css
+ /trunk/Support/src/main/webapp/css/TableTools.css
+ /trunk/Support/src/main/webapp/js/held-inventory.js
+ /trunk/Support/src/main/webapp/js/TableTools.min.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/hold-inventory-index.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift

Rev 9463 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 14:02:24 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/webapp/js/google-adwords.js

Rev 9436 – Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

manish.sharma — Thu, 16 Jan 2014 10:58:43 +0530

manish.sharma – 1 file(s) modified
Commited by Manish Sharma for Google Adwords Management on Jan-16-2014

~ /trunk/Support/src/main/webapp/js/google-adwords.js

Rev 9363 – Committed by Manish Sharma for Google Adwords Service on Jan-10-2014

manish.sharma — Fri, 10 Jan 2014 19:16:32 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Jan-10-2014

~ /trunk/Support/src/main/webapp/js/google-adwords.js

Rev 9352 – Committed by Manish Sharma for Product Data Feeds for Google ...

manish.sharma — Fri, 10 Jan 2014 13:18:37 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Product Data Feeds for Google Content API on Jan-10-2014

~ /trunk/Support/src/main/webapp/js/google-adwords.js

Rev 9231 – Committed by Manish Sharma for Google Adwords Service on Dec-24-2013

manish.sharma — Tue, 24 Dec 2013 17:33:00 +0530

manish.sharma – 1 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Dec-24-2013

~ /trunk/Support/src/main/webapp/js/google-adwords.js

Rev 9065 – Committed by Manish Sharma for Google Adwords Service on Dec-10-2013

manish.sharma — Tue, 10 Dec 2013 12:53:22 +0530

manish.sharma – 2 file(s) modified
Committed by Manish Sharma for Google Adwords Service on Dec-10-2013

+ /trunk/Support/src/main/webapp/js/google-adwords.js
+ /trunk/Support/src/main/webapp/js/jquery-ui.min.js

Rev 8171 –

kshitij.sood — Mon, 23 Sep 2013 17:00:16 +0530

kshitij.sood – 1 file(s) modified

+ /trunk/Support/src/main/webapp/js/jquery-1.5.1.min.js

Rev 7792 – - Changes to logistics provider details - Added support for ...

anupam.singh — Mon, 22 Jul 2013 15:31:31 +0530

anupam.singh – 18 file(s) modified
- Changes to logistics provider details
- Added support for uploading awb list in file as well as downloading reports in excel

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.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/script/PickupStoreReturns.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/AwbDetails.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/webapp/js/courier-details.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/ProviderDetails.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 7283 – Amazon dashboard.

kshitij.sood — Tue, 14 May 2013 18:20:26 +0530

kshitij.sood – 22 file(s) modified
Amazon dashboard.

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java
+ /trunk/Support/src/main/webapp/css/demo_page_amazon.css
+ /trunk/Support/src/main/webapp/css/demo_table_amazon.css
+ /trunk/Support/src/main/webapp/css/jquery.alerts.css
+ /trunk/Support/src/main/webapp/css/style.css
+ /trunk/Support/src/main/webapp/images/back_disabled.png
+ /trunk/Support/src/main/webapp/images/back_enabled.png
+ /trunk/Support/src/main/webapp/images/back_enabled_hover.png
+ /trunk/Support/src/main/webapp/images/bottom-line.png
+ /trunk/Support/src/main/webapp/images/center-bcg.png
+ /trunk/Support/src/main/webapp/images/center-blue.png
+ /trunk/Support/src/main/webapp/images/forward_disabled.png
+ /trunk/Support/src/main/webapp/images/forward_enabled.png
+ /trunk/Support/src/main/webapp/images/forward_enabled_hover.png
+ /trunk/Support/src/main/webapp/images/head-bcg.jpg
+ /trunk/Support/src/main/webapp/images/spinner.gif
+ /trunk/Support/src/main/webapp/images/top-light-blue.png
+ /trunk/Support/src/main/webapp/js/jquery.alerts.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/amaon-list-index.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-edit.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/amazon-list-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm

Rev 6322 – Changes for Following: 1) Option to download Order Confirmation Mail ...

amar.kumar — Sun, 11 Nov 2012 12:06:06 +0530

amar.kumar – 29 file(s) modified
Changes for Following:
1) Option to download Order Confirmation Mail from CRM
2) Option to add new pincode or update/disable serviceability for a provider from Support Reports (Cod-Reconciliation)
3) Option to get Scan Details for a given ItemId/Serial-Number from Inventory Webapp

Reviewed by Anupam Singh

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
~ /trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
~ /trunk/InventoryManager/src/main/webapp/css/common.css
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
~ /trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
+ /trunk/Support/src/main/webapp/css/pincode.css
+ /trunk/Support/src/main/webapp/js/pincode.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 5714 – Lot of improvements in the store dashboard.

rajveer — Thu, 02 Aug 2012 16:32:40 +0530

rajveer – 6 file(s) modified
Lot of improvements in the store dashboard.

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ManifestController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PickupStoreController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
+ /trunk/Support/src/main/webapp/js/jquery.colorbox-min.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-index.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/pickup-store-show.vm

Rev 5527 – Trac # 1453 B2B support Phase-1

anupam.singh — Mon, 02 Jul 2012 14:58:59 +0530

anupam.singh – 33 file(s) modified
Trac # 1453
B2B support Phase-1

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.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/Converters.py
~ /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/model/v1/order/script/ProcessTransaction.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.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/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/webapp/js/bulk-order-common.js
~ /trunk/Support/src/main/webapp/js/bulk-order-events.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickUpType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Provider.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Attribute.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderType.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
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5481 – Ticket #1428 Generate Reconciliation report for Vendor payments based on ...

phani.kumar — Fri, 22 Jun 2012 17:25:57 +0530

phani.kumar – 9 file(s) modified
Ticket #1428 Generate Reconciliation report for Vendor payments based on date range
Ticket #1427 In Vendor Reconciliation add Delhivery support
reviewer: Rajveer Singh

~ /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/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5386 – vendor reconciliation

phani.kumar — Fri, 08 Jun 2012 14:51:53 +0530

phani.kumar – 11 file(s) modified
vendor reconciliation

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ProcessReturnOrderHandler.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/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5068 – Ticket #1148 - Order Monitor report to see status wise ...

varun.gupta — Thu, 26 Apr 2012 18:33:47 +0530

varun.gupta – 3 file(s) modified
Ticket #1148 - Order Monitor report to see status wise order counts

+ /trunk/Support/src/main/java/in/shop2020/support/controllers/OrderMonitorController.java
+ /trunk/Support/src/main/webapp/js/order-monitor.js
+ /trunk/Support/src/main/webapp/WEB-INF/content/order-monitor-index.vm

Rev 4997 – Javascript to handle editing of existing quick-links

varun.gupta — Mon, 16 Apr 2012 12:05:10 +0530

varun.gupta – 1 file(s) modified
Javascript to handle editing of existing quick-links

+ /trunk/Support/src/main/webapp/js/quicklinks.js

Rev 4987 – PLB related changes Support related cahnges where we need to ...

mandeep.dhir — Sat, 14 Apr 2012 12:34:39 +0530

mandeep.dhir – 18 file(s) modified
PLB related changes
Support related cahnges where we need to process the PLB response and reset availability
Trac#1118

x /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
x /trunk/Support/src/main/java/in/shop2020/support/controllers/WarehouseController.java
~ /trunk/Support/src/main/java/in/shop2020/support/models/InventoryUpdate.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/PLBDetails.java
x /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
x /trunk/Support/src/main/webapp/js/purchase.js
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-create.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-new.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-index.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-order-show.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-index.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/raisePO-result.vm
~ /trunk/Support/src/main/webapp/WEB-INF/content/updates-lsuccess.vm
x /trunk/Support/src/main/webapp/WEB-INF/content/warehouse-index.vm

Rev 4715 – Added support for reshipped orders, refunds which do not fall ...

varun.gupta — Wed, 14 Mar 2012 21:43:43 +0530

varun.gupta – 9 file(s) modified
Added support for reshipped orders, refunds which do not fall in given date range and COD settlements from Aramex.

~ /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/VendorReconciliationController.java
+ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4497 – Trac#888 Inventory/Warehouse management for serialized items. Separeted purchase order service ...

mandeep.dhir — Tue, 14 Feb 2012 00:43:39 +0530

mandeep.dhir – 6 file(s) modified
Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/PurchaseOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/RaisePOController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/PdfPoSheetGenerator.java
+ /trunk/Support/src/main/webapp/js/purchase.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/purchase-show.vm

Rev 4390 – Was sending parameters two times both with url and as ...

rajveer — Fri, 27 Jan 2012 19:41:36 +0530

rajveer – 1 file(s) modified
Was sending parameters two times both with url and as parameters. That was resulting in concatenation of both parameter sets. Removed from one place.

~ /trunk/Support/src/main/webapp/js/courier-details.js

Rev 4386 – On courier-details dashboard gave functionality to get details given an ...

anupam.singh — Fri, 27 Jan 2012 03:00:14 +0530

anupam.singh – 20 file(s) modified
On courier-details dashboard gave functionality to get details given an AWB number.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/Converters.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.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/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.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/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
+ /trunk/Support/src/main/java/in/shop2020/support/models/AwbDetails.java
+ /trunk/Support/src/main/webapp/js/courier-details.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authsuccess.vm
+ /trunk/Support/src/main/webapp/WEB-INF/content/courier-details-info.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/Awb.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.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