Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
11173 4353 d 2 h vikram.raghav /trunk/ FBA stock estimation and sale reports changes for new FC  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AmazonFCWarehouseLocation.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFCWarehouseLocation.java
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.py
/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/DataService.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.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/test/Test.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AmazonFbaInventorySnapshot.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/AmazonFbaSalesSnapshot.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
7033 4775 d 8 h anupam.singh /trunk/PyProj/src/shop2020/model/v1/order/ Setting default insurer and insuranceAmount as 0  
/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/test/Test.py
6903 4798 d 0 h anupam.singh /trunk/ Insurance feature for our website  
/trunk/Website/src/main/resources/templates/thinheader.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-result.vm
/trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
/trunk/Website/src/main/webapp/images/insurance.png
/trunk/Website/src/main/webapp/images/insuredStamp.png
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/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/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/test/Test.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_discount_to_specific_users.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_gift_voucher_to_specific_users.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_discount_on_specific_items.py
/trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_specific_emi_discount_on_specific_items.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Insurer.java
/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/user/Line.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
/trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ProceedToPayController.java
/trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
/trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
/trunk/Website/src/main/resources/templates/shippingdetails.vm
/trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/contact-us-success.vm
/trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
/trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
/trunk/Website/src/main/webapp/css/cartflow.css
/trunk/Website/src/main/webapp/css/myaccount.css
/trunk/Website/src/main/webapp/css/shipping.css
/trunk/Website/src/main/webapp/js/cart-details.js
/trunk/Website/src/main/webapp/js/recharge.js
1124 5504 d 9 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/test/ Test server had become outdated due to schema changes long back  
/trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
483 5649 d 6 h rajveer /trunk/ Orderservice changes incorporated.
Catalogservice changes incorporated.
Logistic service changes to get logisticsinfo.
 
/trunk/PyProj/src/shop2020/logistics/service/logistics.sqlite
/trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/InventoryUpdate.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/PageContentKeys.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/SessionInfo.java
/trunk/PyProj/src/shop2020/datalogging/DataLogger.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/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/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/test/CatalogTest.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/test/Test.py
/trunk/PyProj/src/shop2020/model/v1/user/test/user.sqlite
/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/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/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/PyProj/src/shop2020/utils/OrderStatus.py
/trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/ItemInventory.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Alert.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/LineItem.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/PaymentInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Transaction.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionStatus.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
410 5735 d 8 h rajveer /trunk/ Basic implementation of Shopping cart.  
/trunk/PageLoaderServer/velocity/shoppingcart.vm
/trunk/PyProj/src/shop2020/model/v1/cart/test/ShoppingTest.py
/trunk/ThriftConfig/src/in/shop2020/serving/page/ShoppingCartPage.java
/trunk/Website/WebContent/WEB-INF/content/cart-index.vm
/trunk/Website/src/in/shop2020/serving/controllers/CartController.java
/trunk/Website/src/in/shop2020/serving/pages/fetcher/ShoppingCartPageFetcher.java
/trunk/PageLoaderServer/src/in/shop2020/serving/pageloader/PageLoaderHandler.java
/trunk/PageLoaderServer/velocity/myorders.vm
/trunk/PyProj/src/shop2020/model/v1/cart/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/ShoppingCartServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/shoppingcart/ShoppingCartService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/shoppingcart/ShoppingCartService.py
/trunk/PyProj/src/shop2020/thriftpy/serving/page/PageLoader-remote
/trunk/PyProj/src/shop2020/thriftpy/serving/page/PageLoader.py
/trunk/PyProj/src/shop2020/thriftpy/serving/page/ttypes.py
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/ShoppingCartService.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/ComparisonPage.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/PageLoader.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/SearchResultsPage.java
/trunk/ThriftConfig/src/in/shop2020/serving/page/searchRequest.java
/trunk/ThriftGen/thriftsrc/PageLoader/PageLoader.thrift
/trunk/ThriftGen/thriftsrc/ShoppingCart/ShoppingCart.thrift
/trunk/Website/.classpath
/trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
/trunk/Website/src/in/shop2020/serving/pages/PageContentKeys.java
/trunk/Website/src/in/shop2020/serving/pages/PageEnum.java
/trunk/Website/src/in/shop2020/serving/pages/PageFetcherFactory.java
304 5773 d 9 h ashish /trunk/PyProj/src/shop2020/ checking in data logging python config.  
/trunk/PyProj/src/shop2020/clients/DataLoggingClient.py
/trunk/PyProj/src/shop2020/datalogging
/trunk/PyProj/src/shop2020/datalogging/DataLogger.py
/trunk/PyProj/src/shop2020/datalogging/DataLoggingServer.py
/trunk/PyProj/src/shop2020/datalogging/Test.py
/trunk/PyProj/src/shop2020/datalogging/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger
/trunk/PyProj/src/shop2020/thriftpy/datalogger/DataLogger-remote
/trunk/PyProj/src/shop2020/thriftpy/datalogger/DataLogger.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/constants.py
/trunk/PyProj/src/shop2020/thriftpy/datalogger/ttypes.py
/trunk/PyProj/src/shop2020/clients/OrderClient.py
/trunk/PyProj/src/shop2020/clients/ShoppingCartClient.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/test/Test.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/utils/Utils.py
194 5799 d 13 h ashish /trunk/PyProj/src/shop2020/ service changes  
/trunk/PyProj/src/shop2020/model/v1/order/impl
/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/test/Test.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/utils/OrderStatus.py
/trunk/PyProj/src/shop2020/utils/Utils.py
132 5822 d 11 h ashish /trunk/ all models  
/trunk/PyProj/src/shop2020/model/v1/order/test
/trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
/trunk/PyProj/src/shop2020/model/v1/order/test/__init__.py
/trunk/ThriftGen/thriftsrc/OrderService/gen-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/user/impl/DataAccessors.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/utils/OrderStatus.py
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Billing.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/BillingInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Item.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/PaymentInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Shipment.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/ShipmentInfo.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/ShipmentStatus.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/Transaction.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionStatus.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift