Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
21090 3225 d 7 h kshitij.sood /trunk/ PM Sales Associate  
/trunk/Support/src/main/java/in/shop2020/support/controllers/PmsaController.java
/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/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Pmsa.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/PmsaSearchFilter.java
/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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
13486 4034 d 13 h kshitij.sood /trunk/PyProj/src/shop2020/utils/ Migration of all operators to cyberplat  
/trunk/PyProj/src/shop2020/utils/Utils.py
13268 4055 d 10 h kshitij.sood /trunk/PyProj/src/shop2020/utils/  
/trunk/PyProj/src/shop2020/utils/Utils.py
13265 4055 d 10 h kshitij.sood /trunk/PyProj/src/shop2020/utils/  
/trunk/PyProj/src/shop2020/utils/Utils.py
13263 4055 d 11 h kshitij.sood /trunk/PyProj/src/shop2020/utils/  
/trunk/PyProj/src/shop2020/utils/Utils.py
12979 4091 d 11 h kshitij.sood /trunk/ Service changes related to async recharge  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeMode.java
/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/order/impl/RechargeService.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/RechargeOrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
4247 5133 d 15 h rajveer /trunk/PyProj/src/shop2020/ Ticket #770. Support of new order management flow.  
/trunk/PyProj/src/shop2020/utils/OrderStatus.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/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
2286 5322 d 10 h ankur.singhal /trunk/PyProj/src/shop2020/ added methods to mark/unmark item's risky flag and log the risky flag change.  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.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/utils/Utils.py
738 5462 d 8 h chandranshu /trunk/PyProj/src/ Removed the unnecessary and unintuitive usage of get_c_status and get_t_status for order and txn statuses. Added support for the second address line  
/trunk/PyProj/src/samplesheets/BlueDartServiceableLocations.xls
/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/CartDataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/utils/Utils.py
434 5607 d 10 h ashish /trunk/PyProj/src/shop2020/ pyproj commits. various changes  
/trunk/PyProj/src/shop2020/clients/TransactionClient.py
/trunk/PyProj/src/shop2020/logistics/service/impl/AramexParser.py
/trunk/PyProj/src/shop2020/clients/ShoppingCartClient.py
/trunk/PyProj/src/shop2020/logistics/external/ExternalServer.py
/trunk/PyProj/src/shop2020/logistics/external/xlsprocessor.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/ShoppingCartServiceHandler.py
/trunk/PyProj/src/shop2020/utils/Utils.py
304 5680 d 11 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 5706 d 15 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
155 5722 d 17 h ashish /trunk/PyProj/src/shop2020/ adding python clients to various services  
/trunk/PyProj/src/shop2020/clients
/trunk/PyProj/src/shop2020/clients/BasicClient.py
/trunk/PyProj/src/shop2020/clients/InventoryClient.py
/trunk/PyProj/src/shop2020/clients/OrderClient.py
/trunk/PyProj/src/shop2020/clients/ShoppingCartClient.py
/trunk/PyProj/src/shop2020/clients/UserClient.py
/trunk/PyProj/src/shop2020/clients/__init__.py
/trunk/PyProj/src/shop2020/model/v1/cart
/trunk/PyProj/src/shop2020/model/v1/cart/__init__.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl
/trunk/PyProj/src/shop2020/model/v1/cart/impl/Converters.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/ShoppingCartServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/__init__.py
/trunk/PyProj/src/shop2020/model/v1/cart/impl/cart.sqlite
/trunk/PyProj/src/shop2020/model/v1/cart/test
/trunk/PyProj/src/shop2020/model/v1/cart/test/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/shoppingcart/ttypes.py
/trunk/PyProj/src/shop2020/utils/Utils.py
122 5742 d 9 h ashish /trunk/PyProj/src/shop2020/ working inventory service  
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/inventory.sqlite
/trunk/PyProj/src/shop2020/payment
/trunk/PyProj/src/shop2020/payment/PaymentService-remote
/trunk/PyProj/src/shop2020/payment/PaymentService.py
/trunk/PyProj/src/shop2020/payment/__init__.py
/trunk/PyProj/src/shop2020/payment/constants.py
/trunk/PyProj/src/shop2020/payment/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/model/v1/catalog/impl/CatalogServiceHandler.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/model/v1/catalog/CatalogServer.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/test/CatalogTest.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/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/PyProj/src/shop2020/utils/Utils.py
115 5757 d 11 h ashish /trunk/ Committing shopping cart apis and othe minor changes.  
/trunk/PyProj/src/shop2020/model/v1/order/TransactionServer.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Order.sqlite
/trunk/PyProj/src/shop2020/thriftpy/model/v1/shoppingcart
/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/model/v1/shoppingcart/__init__.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/shoppingcart/constants.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/shoppingcart/ttypes.py
/trunk/PyProj/src/shop2020/utils/Mail.py
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/Cart.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/CartStatus.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/Line.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/LineStatus.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/ShadowCart.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/ShoppingCartException.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/shoppingcart/ShoppingCartService.java
/trunk/ThriftGen/thriftsrc/ShoppingCart
/trunk/ThriftGen/thriftsrc/ShoppingCart/ShoppingCart.thrift
/trunk/Common/conf/shop2020.cfg
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/utils/Utils.py
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
104 5769 d 15 h ashish /trunk/PyProj/src/shop2020/ TransactionService server side checkin.  
/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/utils/OrderStatus.py
/trunk/PyProj/src/shop2020/utils/Utils.py
103 5771 d 17 h ashish /trunk/ Checking in modified CatelogService Server.  
/trunk/PyProj/src/shop2020/utils
/trunk/PyProj/src/shop2020/utils/Utils.py
/trunk/PyProj/src/shop2020/utils/__init__.py
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/status.java
/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-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Category.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/Vendor.java
/trunk/ThriftConfig/src/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift