Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
20536 3326 d 1 h kshitij.sood /trunk/Support/  
/trunk/Support/pom.xml
12653 4138 d 2 h manish.sharma /trunk/  
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderBillingController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-billing.vm
/trunk/Support/src/main/webapp/js/bulk-order-billing.js
/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/BulkOrderController.java
/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
12449 4171 d 2 h kshitij.sood /trunk/ amazon dashboard changes  
/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/css/jquery.datepick.css
/trunk/Support/src/main/webapp/js/jquery.datepick.js
/trunk/Support/src/main/webapp/js/jquery.plugin.js
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/AmazonItem.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelFeedSubmissionsAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelFeedSubmissionsSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelReportRequestsAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CancelReportRequestsSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CheckFeedSubmission.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateNonFBAInventoryAndPricingFlatFile.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateOrderAcknowledgementFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/CreateandSubmitOrderAcknowledgementFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionCountAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionCountSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListByNextTokenAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListByNextTokenSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionListSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionResultAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetFeedSubmissionResultSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportCountAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportCountSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListByNextTokenAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListByNextTokenSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportListSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestCountAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestCountSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListByNextTokenAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListByNextTokenSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportRequestListSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleCountAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleCountSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListByNextTokenAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListByNextTokenSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/GetReportScheduleListSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ManageReportScheduleAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ManageReportScheduleSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/ProcessFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/RequestReportAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/RequestReportSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitAdjustmentFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAInventoryFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAListingFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBAPricingFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFBBListingFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFeedAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitFulfillmentFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalFBAPricingFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalFBBPricingFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitIncrementalNonFBAPricingFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAInventoryFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAListingFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeed.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/SubmitNonFBAPricingFeedAndFetchResults.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/UpdateReportAcknowledgementsAsyncSample.java
/trunk/AmazonFeeds/src/main/java/com/amazonaws/mws/samples/UpdateReportAcknowledgementsSample.java
/trunk/AmazonFeeds/.project
/trunk/AmazonFeeds/pom.xml
/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/WEB-INF/content/amazon-list-edit.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
9063 4418 d 8 h manish.sharma /trunk/Support/ Committed by Manish Sharma for Google Adwords Service on Dec-10-2013  
/trunk/Support/pom.xml
8961 4424 d 1 h vikram.raghav /trunk/ Changes to create Flipkart Order.  
/trunk/Support/src/main/java/in/shop2020/support/controllers/FlipkartDashboardController.java
/trunk/Support/src/main/webapp/WEB-INF/content/flipkart-options.vm
/trunk/Support/src/main/webapp/WEB-INF/content/flipkart-upload-orders.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/FlipkartOrder.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/Support/pom.xml
/trunk/Support/src/main/webapp/WEB-INF/content/reports-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
8615 4459 d 4 h vikram.raghav /trunk/Support/ Added controller to process snapdeal orders  
/trunk/Support/pom.xml
5885 4891 d 7 h mandeep.dhir /trunk/ Sarvottam inventory autoupdate
COD cut off fot store pick up
 
/trunk/InventoryManager/src/main/resources/supplier-inventory-exceptions.cfg
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/EffectiveAvailabilityComputer.java
/trunk/InventoryManager/src/main/resources/shiro.ini
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/Support/pom.xml
/trunk/Support/src/main/java/in/shop2020/support/controllers/FileArchiveController.java
5020 5019 d 4 h varun.gupta /trunk/Support/ Ticket #1137 - Vendor Reconciliation Report generator tool can handle string values for reference Id and amount  
/trunk/Support/pom.xml
/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
/trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
3435 5223 d 10 h rajveer /trunk/ Updated thrift dependency  
/trunk/ContentCreation/pom.xml
/trunk/ContentStore/pom.xml
/trunk/Crm/pom.xml
/trunk/HotspotDashboard/pom.xml
/trunk/Social/pom.xml
/trunk/Support/pom.xml
3388 5229 d 9 h varun.gupta /trunk/Support/ Added dependency for org.json  
/trunk/Support/pom.xml
2784 5280 d 6 h chandranshu /trunk/Support/ Added support for our own billing.  
/trunk/Support/pom.xml
/trunk/Support/src/main/java/in/shop2020/support/controllers/InvoiceController.java
/trunk/Support/src/main/java/in/shop2020/support/services/InvoiceGenerationService.java
/trunk/Support/src/main/webapp/WEB-INF/content/courier-details-authfail.vm
1434 5385 d 5 h chandranshu /trunk/Support/ Removed duplicate dependency declaration  
/trunk/Support/pom.xml
1283 5397 d 9 h chandranshu /trunk/Support/ Added the version for maven compiler plugin to avoid a warning  
/trunk/Support/pom.xml
1027 5417 d 7 h chandranshu /trunk/Support/ Moved around resources from the WebContent folder to src/main/resources  
/trunk/Support/src/main/resources/C39TXME.TTF
/trunk/Support/src/main/resources/aramex
/trunk/Support/src/main/resources/bluedart
/trunk/Support/src/main/resources/logo.jpg
/trunk/Support/src/main/resources/logo.png
/trunk/Support/src/main/resources/struts.xml
/trunk/Support/src/main/webapp
/trunk/Support/src/main/webapp/WEB-INF
/trunk/Support/src/main/webapp/WEB-INF/web.xml
/trunk/Support/WebContent/WEB-INF/classes/C39TXME.TTF
/trunk/Support/WebContent/WEB-INF/classes/aramex
/trunk/Support/WebContent/WEB-INF/classes/bluedart
/trunk/Support/WebContent/WEB-INF/classes/logo.jpg
/trunk/Support/WebContent/WEB-INF/classes/logo.png
/trunk/Support/WebContent/WEB-INF/web.xml
/trunk/Support/conf
/trunk/Support
/trunk/Support/build.properties
/trunk/Support/pom.xml
1023 5417 d 9 h chandranshu /trunk/Support/ Removed unused jar files from build declaration  
/trunk/Support/pom.xml
/trunk/Support/src/main
/trunk/Support/src/main/java
/trunk/Support/src/main/java/in
/trunk/Support/src/main/resources
/trunk/Support/src/in
/trunk/Support/.classpath
/trunk/Support/build.properties
/trunk/Support/build.xml