Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
7293 4626 d 8 h anupam.singh / - Changes related to StoreWebsite
- Added source to "change_transaction_status" method		  
/StoreWebsite/src/main/webapp/WEB-INF/content/order-success.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/StoreWebsite/src/main/webapp/WEB-INF/content/create-order-index.vm
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/EstimateController.java
/StoreWebsite/src/main/java/in/shop2020/serving/controllers/PaymentDetailsController.java
/StoreWebsite/src/main/webapp/WEB-INF/content/order-details-index.vm
/StoreWebsite/src/main/webapp/WEB-INF/content/payment-details-index.vm
/StoreWebsite/src/main/webapp/js/storewebsite.js
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.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/CreateRTGSBulkOrders.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
5583 4935 d 7 h anupam.singh /trunk/PyProj/src/shop2020/model/v1/order/script/ Reviewer : Mandeep
Added orderType in commandline arguments		  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
5527 4945 d 7 h anupam.singh /trunk/ Trac # 1453
B2B support Phase-1		  
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/PickUpType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Attribute.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderType.java
/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/WEB-INF/content/bulk-order-editNew.vm
/trunk/Support/src/main/webapp/js/bulk-order-common.js
/trunk/Support/src/main/webapp/js/bulk-order-events.js
/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/model/v1/order/Order.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
4090 5173 d 3 h chandranshu /trunk/PyProj/src/shop2020/ Added comments  
/trunk/PyProj/src/shop2020/model/v1/catalog/script/BestDealDataLoader.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/BestSellerDataLoader.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/DuplicateChecker.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/ProductGroupDetailLoader.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/VendorItemKeyGenerator.py
/trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberLoader.py
/trunk/PyProj/src/shop2020/logistics/service/script/DestinationProviderAllocationLoader.py
/trunk/PyProj/src/shop2020/logistics/service/script/HolidaysLoader.py
/trunk/PyProj/src/shop2020/logistics/service/script/ServiceDetailsLoader.py
/trunk/PyProj/src/shop2020/logistics/service/script/WarehouseAllocationLoader.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/CompareInventory.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/GenerateJungleeData.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/InitialInventoryLoader.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
/trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
/trunk/PyProj/src/shop2020/model/v1/order/script/MarkOrdersAsFailed.py
/trunk/PyProj/src/shop2020/model/v1/order/script/MoveOrdersToPendingQueue.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
/trunk/PyProj/src/shop2020/model/v1/order/script/UndeliveredOrdersReport.py
/trunk/PyProj/src/shop2020/model/v1/order/script/UpdateRtoData.py
/trunk/PyProj/src/shop2020/warehouse/main/script/ItemNumberLoader.py
4016 5181 d 5 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Added support to process orders lying in a different database  
/trunk/PyProj/src/shop2020/model/v1/order/script/EditOrderDetails.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ExpectedAndActualDeliveryReport.py
/trunk/PyProj/src/shop2020/model/v1/order/script/MarkOrdersAsFailed.py
/trunk/PyProj/src/shop2020/model/v1/order/script/MoveOrdersToPendingQueue.py
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
3243 5243 d 3 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Added an option to process COD transactions  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2277 5322 d 5 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Started reading coupon code directly from the transaction table instead of from the cart since a user can remove coupon from the cart after applying it.  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2247 5326 d 3 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ More traceback related upgrades  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2246 5326 d 3 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Started printing the stack trace  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2245 5326 d 3 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Coalesced two exception clauses  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2241 5326 d 7 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Renamed coupon_code to couponCode  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2240 5326 d 7 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Corrected some minor bugs  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2186 5329 d 5 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/script/ moved imports below  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2185 5329 d 5 h rajveer /trunk/PyProj/src/shop2020/model/v1/order/script/ Added calls to reset cart and trac coupon  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py
2133 5333 d 8 h chandranshu /trunk/PyProj/src/shop2020/model/v1/order/script/ Added a script to make a transaction successful  
/trunk/PyProj/src/shop2020/model/v1/order/script/ProcessTransaction.py