SmartDukaan – //trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1886 – Ticket #380. Added Last 10 Orders to Statistics page.

ankur.singhal — Wed, 18 May 2011 19:05:27 +0530

ankur.singhal – 8 file(s) modified
Ticket #380. Added Last 10 Orders to Statistics page.

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

Rev 1731 – optimisation of methods for getting max, min amounts of orders ...

ankur.singhal — Thu, 05 May 2011 16:24:31 +0530

ankur.singhal – 12 file(s) modified
optimisation of methods for getting max, min amounts of orders and payments. These methods are used for statistics (Support).

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/payments/impl/PaymentsHandler.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/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StatisticsController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 1629 – added methods in Payments and Transaction service for getting statistics ...

ankur.singhal — Mon, 02 May 2011 11:24:45 +0530

ankur.singhal – 2 file(s) modified
added methods in Payments and Transaction service for getting statistics data. (max & min order amount, max & min payment amount, distinct customers who have bought)

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java

Rev 1598 – Added methods for getting registered users count and valid orders ...

ankur.singhal — Fri, 29 Apr 2011 12:08:49 +0530

ankur.singhal – 3 file(s) modified
Added methods for getting registered users count and valid orders count. These methods will be used for statistics in Support.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserType.java

Rev 1529 – Ref: Ticket#279 --> customer can view only his/her order & ...

ankur.singhal — Tue, 26 Apr 2011 15:51:40 +0530

ankur.singhal – 2 file(s) modified
Ref: Ticket#279 --> customer can view only his/her order & payment details. Added method getOrderForCustomer --> for single order and modified getOrdersForTransaction to take customerid as input.

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 1406 – added getUndelivered orders

ankur.singhal — Fri, 15 Apr 2011 15:20:19 +0530

ankur.singhal – 1 file(s) modified
added getUndelivered orders

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1398 – Functionality to enqueue transaction info email implemented

varun.gupta — Wed, 13 Apr 2011 18:28:49 +0530

varun.gupta – 6 file(s) modified
Functionality to enqueue transaction info email implemented

~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 1382 – Two methods added to return cancellable & returnable orders of ...

varun.gupta — Wed, 13 Apr 2011 11:01:49 +0530

varun.gupta – 6 file(s) modified
Two methods added to return cancellable & returnable orders of a user

~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 1245 – Added a method to update non-delivery reason

chandranshu — Sun, 03 Apr 2011 17:04:15 +0530

chandranshu – 1 file(s) modified
Added a method to update non-delivery reason

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1221 – Added batchNo and serialNo columns to order and support for ...

chandranshu — Thu, 31 Mar 2011 14:09:20 +0530

chandranshu – 2 file(s) modified
Added batchNo and serialNo columns to order and support for batching orders

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1209 – Added support for a out of stock timestamp

chandranshu — Wed, 30 Mar 2011 18:52:55 +0530

chandranshu – 2 file(s) modified
Added support for a out of stock timestamp

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1148 – Splitted the addBillingDetails method to add jacket number separately

chandranshu — Fri, 25 Mar 2011 16:23:51 +0530

chandranshu – 1 file(s) modified
Splitted the addBillingDetails method to add jacket number separately

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1133 – Added a field for receiver and calls to update the ...

chandranshu — Thu, 24 Mar 2011 18:45:54 +0530

chandranshu – 2 file(s) modified
Added a field for receiver and calls to update the delivery and failure state of an order

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1114 – Added pickup timestamp and a method to set it

chandranshu — Wed, 23 Mar 2011 14:44:53 +0530

chandranshu – 2 file(s) modified
Added pickup timestamp and a method to set it

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1022 – Added transfer_price to LineItem

varun.gupta — Thu, 17 Mar 2011 11:45:58 +0530

varun.gupta – 2 file(s) modified
Added transfer_price to LineItem

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java

Rev 1013 – Configured Thriftconfig to use maven and cleaned up the build.xml

chandranshu — Wed, 16 Mar 2011 19:17:07 +0530

chandranshu – 8 file(s) modified
Configured Thriftconfig to use maven and cleaned up the build.xml

~ /trunk/ThriftConfig/.classpath
~ /trunk/ThriftConfig/.settings/org.eclipse.wst.common.component
~ /trunk/ThriftConfig/build.xml
+ /trunk/ThriftConfig/pom.xml
x /trunk/ThriftConfig/src/in
+ /trunk/ThriftConfig/src/main
+ /trunk/ThriftConfig/src/main/java
+ /trunk/ThriftConfig/src/main/java/in (copied from /trunk/ThriftConfig/src/in@981)

Rev 923 – Added acceptOrder and billOrder methods.

rajveer — Fri, 04 Mar 2011 16:30:50 +0530

rajveer – 1 file(s) modified
Added acceptOrder and billOrder methods.

~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java

Rev 764 – Added closeSession function in all services

rajveer — Wed, 09 Feb 2011 17:25:55 +0530

rajveer – 8 file(s) modified
Added closeSession function in all services

~ /trunk/ThriftConfig/src/in/shop2020/datalogger/DataLogger.java
~ /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/order/OrderStatus.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/user/UserContextService.java
~ /trunk/ThriftConfig/src/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftConfig/src/in/shop2020/utils/HelperService.java

Rev 758 – Added a method to mark all billed orders as shipped

chandranshu — Fri, 04 Feb 2011 15:28:53 +0530

chandranshu – 1 file(s) modified
Added a method to mark all billed orders as shipped

~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java

Rev 684 – generated files for order service

chandranshu — Thu, 27 Jan 2011 17:40:07 +0530

chandranshu – 4 file(s) modified
generated files for order service

~ /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/model/v1/order/Transaction.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java

Rev 640 – Added jacket number to the order. Changes to the txn ...

chandranshu — Tue, 25 Jan 2011 13:10:44 +0530

chandranshu – 2 file(s) modified
Added jacket number to the order. Changes to the txn service to accommodate the same

~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java

Rev 495 – Addes user authentication Small changes in order service

rajveer — Fri, 12 Nov 2010 12:27:59 +0530

rajveer – 7 file(s) modified
Addes user authentication
Small changes in order service

~ /trunk/Common/conf/shop2020.cfg
~ /trunk/Common/src/in/shop2020/thrift/clients/HelperServiceClient.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/in/shop2020/utils/HelperService.java
~ /trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 483 – Orderservice changes incorporated. Catalogservice changes incorporated. Logistic service changes to ...

rajveer — Sat, 30 Oct 2010 19:20:28 +0530

rajveer – 45 file(s) modified
Orderservice changes incorporated.
Catalogservice changes incorporated.
Logistic service changes to get logisticsinfo.

~ /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/logistics/service/logistics.sqlite
~ /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/LogisticsInfo.java
~ /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/InventoryUpdate.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/Order.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderStatus.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/ThriftConfig/src/in/shop2020/serving/page/PageContentKeys.java
+ /trunk/ThriftConfig/src/in/shop2020/serving/page/SessionInfo.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 358 – fixing warehouse bug in order service.

ashish — Mon, 19 Jul 2010 12:59:34 +0530

ashish – 10 file(s) modified
fixing warehouse bug in order service.

Rev 305 – java stbs for data logging

ashish — Mon, 28 Jun 2010 16:29:59 +0530

ashish – 6 file(s) modified
java stbs for data logging

+ /trunk/ThriftConfig/src/in/shop2020/datalogger
+ /trunk/ThriftConfig/src/in/shop2020/datalogger/DataLogger.java
+ /trunk/ThriftConfig/src/in/shop2020/datalogger/MsgType.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/Alert.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/ExtraOrderInfo.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionService.java

Rev 132 – all models

ashish — Mon, 10 May 2010 14:41:16 +0530

ashish – 24 file(s) modified
all models

~ /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
+ /trunk/PyProj/src/shop2020/model/v1/order/test/Test.py
+ /trunk/PyProj/src/shop2020/model/v1/order/test/__init__.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
x /trunk/ThriftGen/thriftsrc/OrderService/gen-py
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 68 – Thrift interfaces for ordering service, and client wrapper for the ...

ashish — Tue, 09 Mar 2010 11:04:42 +0530

ashish – 43 file(s) modified
Thrift interfaces for ordering service, and client wrapper for the same.

~ /trunk/Common/.settings/org.eclipse.jdt.core.prefs
~ /trunk/Common/src/in/shop2020/thrift/clients/config/ConfigClient.java
+ /trunk/Common/src/in/shop2020/thrift/clients/GenericServiceClient.java
+ /trunk/Common/src/in/shop2020/thrift/clients/TransactionServiceClient.java
~ /trunk/Common/src/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/Common/src/in/shop2020/utils/Utils.java
~ /trunk/ConfigServerPy/src/shop2020/config/ConfigServer.py
~ /trunk/ConfigServerPy/src/shop2020/config/impl/ConfigServerHandler.py
~ /trunk/ThriftConfig/.settings/org.eclipse.jdt.core.prefs
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order
+ /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/LineItem.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/OrderInfo.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/Payment.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/PaymentInfo.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/PaymentStatus.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/TransactionServiceException.java
+ /trunk/ThriftConfig/src/in/shop2020/model/v1/order/TransactionStatus.java
x /trunk/ThriftConfigPy/src/shop2020
~ /trunk/ThriftGen/thriftsrc/ConfigServer/ConfigServer.thrift
x /trunk/ThriftGen/thriftsrc/ConfigServer/gen-py
x /trunk/ThriftGen/thriftsrc/gen-javabean
x /trunk/ThriftGen/thriftsrc/gen-py
+ /trunk/ThriftGen/thriftsrc/OrderService
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order/model
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order/model/constants.py
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order/model/TransactionService-remote
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order/model/TransactionService.py
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order/model/ttypes.py
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order/model/__init__.py
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/order/__init__.py
+ /trunk/ThriftGen/thriftsrc/OrderService/gen-py/__init__.py
+ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/UserContextService/.settings/org.eclipse.jdt.core.prefs