SmartDukaan – /

Rev 720 – Added a new status content complete for items. Added a ...

chandranshu — Mon, 31 Jan 2011 19:01:21 +0530

chandranshu – 1 file(s) modified
Added a new status content complete for items. Added a method to the service to mark all items with the same entity id as such.Added the xfer_price field

~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 719 – HDFC Payment gateway integration

rajveer — Mon, 31 Jan 2011 18:31:36 +0530

rajveer – 12 file(s) modified
HDFC Payment gateway integration

~ /trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/PayErrorController.java
x /trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/PaySuccessController.java (copied from /trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java@712)
+ /trunk/Website/WebContent/WEB-INF/content/hdfc-pay-response-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/pay-error-index.vm
x /trunk/Website/WebContent/WEB-INF/content/pay-response-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/pay-success-index.vm (copied from /trunk/Website/WebContent/WEB-INF/content/pay-response-index.vm@713)
~ /trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/register-index.vm

Rev 718 – adding updated python script

rajveer — Mon, 31 Jan 2011 12:43:11 +0530

rajveer – 1 file(s) modified
adding updated python script

~ /trunk/runutils/start-py-services.sh

Rev 717 – minor fixes

rajveer — Mon, 31 Jan 2011 11:23:29 +0530

rajveer – 3 file(s) modified
minor fixes

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/payments/impl/PaymentsHandler.py

Rev 716 – changed itemid from string to in. order status changes and ...

rajveer — Fri, 28 Jan 2011 16:05:15 +0530

rajveer – 5 file(s) modified
changed itemid from string to in. order status changes and cart bug fixes.

~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py

Rev 715 – changed itemid from string to int

rajveer — Fri, 28 Jan 2011 16:03:08 +0530

rajveer – 1 file(s) modified
changed itemid from string to int

~ /trunk/ThriftConfig/src/in/shop2020/logistics/LogisticsService.java

Rev 714 – changed itemid from string to int

rajveer — Fri, 28 Jan 2011 16:01:54 +0530

rajveer – 1 file(s) modified
changed itemid from string to int

~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift

Rev 713 – Payment gateway integration after testing

rajveer — Fri, 28 Jan 2011 16:01:02 +0530

rajveer – 5 file(s) modified
Payment gateway integration after testing

~ /trunk/Website/.classpath
~ /trunk/Website/.project
+ /trunk/Website/WebContent/WEB-INF/content/hdfc-pay-success.vm
+ /trunk/Website/WebContent/WEB-INF/content/pay-response-index.vm (copied from /trunk/Website/WebContent/WEB-INF/content/pay-response-show.vm@690)
+ /trunk/Website/WebContent/WEB-INF/content/pay-response-success.vm

Rev 712 – Payment gateway integration after testing

rajveer — Fri, 28 Jan 2011 16:00:23 +0530

rajveer – 5 file(s) modified
Payment gateway integration after testing

~ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java
x /trunk/Website/WebContent/WEB-INF/content/pay-response-show.vm

Rev 711 – Removed an unnecessary import to get rid of Eclipse error

chandranshu — Fri, 28 Jan 2011 14:41:12 +0530

chandranshu – 1 file(s) modified
Removed an unnecessary import to get rid of Eclipse error

~ /trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java

Rev 710 – Changed the output folder for the build path so that ...

chandranshu — Fri, 28 Jan 2011 14:37:42 +0530

chandranshu – 2 file(s) modified
Changed the output folder for the build path so that the Eclipse compilation doesn't conflict with ant compilation

~ /trunk/Support
~ /trunk/Support/.classpath

Rev 709 – changed quantity from long to double

rajveer — Fri, 28 Jan 2011 14:37:09 +0530

rajveer – 1 file(s) modified
changed quantity from long to double

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 708 – changed quantity from long to double

rajveer — Fri, 28 Jan 2011 14:36:23 +0530

rajveer – 1 file(s) modified
changed quantity from long to double

~ /trunk/ThriftConfig/src/in/shop2020/model/v1/user/UserContextService.java

Rev 707 – changed quantity from long to double

rajveer — Fri, 28 Jan 2011 14:35:46 +0530

rajveer – 1 file(s) modified
changed quantity from long to double

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 706 – Changed SKU id to item ID

chandranshu — Fri, 28 Jan 2011 14:30:46 +0530

chandranshu – 3 file(s) modified
Changed SKU id to item ID

~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/in/shop2020/hotspot/dashbaord/shared/actions/Order.java

Rev 705 – Changed type of merchant txn Id

chandranshu — Fri, 28 Jan 2011 14:29:41 +0530

chandranshu – 1 file(s) modified
Changed type of merchant txn Id

~ /trunk/ThriftConfig/src/in/shop2020/payments/Payment.java

Rev 704 – Changed the type of merchantTxnId from string to long

chandranshu — Fri, 28 Jan 2011 14:28:04 +0530

chandranshu – 1 file(s) modified
Changed the type of merchantTxnId from string to long

~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 703 – Removed some extraneous commas from the data service

chandranshu — Fri, 28 Jan 2011 14:20:00 +0530

chandranshu – 1 file(s) modified
Removed some extraneous commas from the data service

~ /trunk/PyProj/src/shop2020/payments/impl/DataService.py

Rev 702 – changed sku_id in lineItem to item_id

chandranshu — Fri, 28 Jan 2011 14:15:09 +0530

chandranshu – 1 file(s) modified
changed sku_id in lineItem to item_id

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 701 – Implemented all methods of the payment service

chandranshu — Fri, 28 Jan 2011 14:13:14 +0530

chandranshu – 5 file(s) modified
Implemented all methods of the payment service

~ /trunk/PyProj/src/shop2020/payments/impl/converters.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/payments/impl/DataService.py
~ /trunk/PyProj/src/shop2020/payments/impl/PaymentsHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py

Rev 700 – Changed skuId to itemId in LineItem

chandranshu — Fri, 28 Jan 2011 12:35:54 +0530

chandranshu – 1 file(s) modified
Changed skuId to itemId in LineItem

~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py

Rev 699 – Changed skuId to itemId in LineItem

chandranshu — Fri, 28 Jan 2011 12:35:10 +0530

chandranshu – 2 file(s) modified
Changed skuId to itemId in LineItem

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py

Rev 698 – Changed skuID to itemId in LineItem

chandranshu — Fri, 28 Jan 2011 12:34:43 +0530

chandranshu – 1 file(s) modified
Changed skuID to itemId in LineItem

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 697 – Changed skuId to itemId in LineItem

chandranshu — Fri, 28 Jan 2011 12:34:20 +0530

chandranshu – 1 file(s) modified
Changed skuId to itemId in LineItem

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

Rev 696 – payment services added

rajveer — Thu, 27 Jan 2011 19:38:19 +0530

rajveer – 3 file(s) modified
payment services added

~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py

Rev 695 – Payment service updated

rajveer — Thu, 27 Jan 2011 19:37:07 +0530

rajveer – 4 file(s) modified
Payment service updated

+ /trunk/ThriftConfig/src/in/shop2020/payments/Attribute.java
~ /trunk/ThriftConfig/src/in/shop2020/payments/Payment.java
~ /trunk/ThriftConfig/src/in/shop2020/payments/PaymentGateway.java
~ /trunk/ThriftConfig/src/in/shop2020/payments/PaymentService.java

Rev 694 – modified payment service

rajveer — Thu, 27 Jan 2011 19:34:32 +0530

rajveer – 1 file(s) modified
modified payment service

~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift

Rev 693 – Modified payment classes.

rajveer — Thu, 27 Jan 2011 19:33:37 +0530

rajveer – 4 file(s) modified
Modified payment classes.

~ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/PayErrorController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java

Rev 692 – Shipping controller now adds a checked out timestamp to the ...

chandranshu — Thu, 27 Jan 2011 19:25:07 +0530

chandranshu – 1 file(s) modified
Shipping controller now adds a checked out timestamp to the cart

~ /trunk/Website/src/in/shop2020/serving/controllers/ShippingController.java

Rev 691 – Implemented checkout and resetCart methods

chandranshu — Thu, 27 Jan 2011 19:24:00 +0530

chandranshu – 2 file(s) modified
Implemented checkout and resetCart methods

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.py

Rev 690 – Changed the logic of creating orders for a cart. Started ...

chandranshu — Thu, 27 Jan 2011 18:45:13 +0530

chandranshu – 8 file(s) modified
Changed the logic of creating orders for a cart. Started updating the status of orders when the payment is received

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.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/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py

Rev 689 – Changes to accommodate the rename of commitCart to createOrders

chandranshu — Thu, 27 Jan 2011 18:41:54 +0530

chandranshu – 2 file(s) modified
Changes to accommodate the rename of commitCart to createOrders

~ /trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java

Rev 688 – Generated Java files from thrift IDL

chandranshu — Thu, 27 Jan 2011 18:40:58 +0530

chandranshu – 2 file(s) modified
Generated Java files from thrift IDL

~ /trunk/ThriftConfig/src/in/shop2020/model/v1/user/Cart.java
~ /trunk/ThriftConfig/src/in/shop2020/model/v1/user/UserContextService.java

Rev 687 – Added methods for resetting a cart and renamed the method ...

chandranshu — Thu, 27 Jan 2011 18:39:44 +0530

chandranshu – 1 file(s) modified
Added methods for resetting a cart and renamed the method to create orders

~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 686 – Removed responses to paymentInfo

chandranshu — Thu, 27 Jan 2011 17:46:56 +0530

chandranshu – 1 file(s) modified
Removed responses to paymentInfo

~ /trunk/Website/src/in/shop2020/serving/controllers/PayResponseController.java

Rev 685 – Changes corresponding to changes in the Order service structs

chandranshu — Thu, 27 Jan 2011 17:43:57 +0530

chandranshu – 7 file(s) modified
Changes corresponding to changes in the Order service structs

~ /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/user/impl/CartDataAccessors.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/OrderStatus.py

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 683 – Added Payment pending and Payment failed statuses

chandranshu — Thu, 27 Jan 2011 17:38:43 +0530

chandranshu – 1 file(s) modified
Added Payment pending and Payment failed statuses

~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 682 – changed name of paycontroller

rajveer — Thu, 27 Jan 2011 17:07:30 +0530

rajveer – 1 file(s) modified
changed name of paycontroller

+ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.java (copied from /trunk/Website/src/in/shop2020/serving/controllers/PayController.java@679)

Rev 681 – "Refacturing errors"

rajveer — Thu, 27 Jan 2011 17:06:44 +0530

rajveer – 5 file(s) modified
"Refacturing errors"

~ /trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
x /trunk/Website/src/in/shop2020/serving/controllers/PayController.java
~ /trunk/Website/src/in/shop2020/serving/services/AramexTrackingService.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/in/shop2020/serving/utils/Utils.java